Merge pull request #43 from szhsin/feat/onchange-type

feat: close on enter
szhsin · Jul 8, 2024 · 064009b · 064009b
2 parents 631a966 + 1a2aa01
commit 064009b
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 62 deletions.
diff --git a/dist/cjs/index.js b/dist/cjs/index.js
@@ -266,8 +266,12 @@ const autocompleteLite = ({
             }
             break;
           case 'Enter':
-            if (open && focusItem) {
-              resetState(selectItemOrAction(focusItem));
+            if (open) {
+              if (focusItem) {
+                resetState(selectItemOrAction(focusItem));
+              } else if (!select) {
+                resetState(true);
+              }
             }
             break;
           case 'Escape':
@@ -488,15 +492,10 @@ const autoInline = ({
   })
 });
 
-const supercomplete = ({
-  getFocusItem,
-  ...rest
-}) => mergeModules(autocomplete({
-  ...rest,
+const supercomplete = props => mergeModules(autocomplete({
+  ...props,
   rovingText: true
-}), autoInline({
-  getFocusItem
-}));
+}), autoInline(props));
 
 const linearTraversal = ({
   traverseInput,
@@ -542,11 +541,7 @@ const groupedTraversal = ({
   ...restProps
 }) => {
   const groups = isArray(groupedItems) ? groupedItems : Object.values(groupedItems);
-  const items = [];
-  groups.forEach(group => {
-    const itemsInGroup = isArray(group) ? group : getItemsInGroup ? getItemsInGroup(group) : [];
-    items.push(...itemsInGroup);
-  });
+  const items = groups.reduce((accu, group) => accu.concat(isArray(group) ? group : getItemsInGroup ? getItemsInGroup(group) : []), []);
   return linearTraversal({
     ...restProps,
     items

diff --git a/dist/esm/features/atom/autocompleteLite.js b/dist/esm/features/atom/autocompleteLite.js
@@ -112,8 +112,12 @@ const autocompleteLite = ({
             }
             break;
           case 'Enter':
-            if (open && focusItem) {
-              resetState(selectItemOrAction(focusItem));
+            if (open) {
+              if (focusItem) {
+                resetState(selectItemOrAction(focusItem));
+              } else if (!select) {
+                resetState(true);
+              }
             }
             break;
           case 'Escape':

diff --git a/dist/esm/features/molecule/supercomplete.js b/dist/esm/features/molecule/supercomplete.js
@@ -2,14 +2,9 @@ import { mergeModules } from '../../utils/mergeModules.js';
 import { autocomplete } from './autocomplete.js';
 import { autoInline } from '../atom/autoInline.js';
 
-const supercomplete = ({
-  getFocusItem,
-  ...rest
-}) => mergeModules(autocomplete({
-  ...rest,
+const supercomplete = props => mergeModules(autocomplete({
+  ...props,
   rovingText: true
-}), autoInline({
-  getFocusItem
-}));
+}), autoInline(props));
 
 export { supercomplete };
diff --git a/dist/esm/traversals/groupedTraversal.js b/dist/esm/traversals/groupedTraversal.js
@@ -7,11 +7,7 @@ const groupedTraversal = ({
   ...restProps
 }) => {
   const groups = isArray(groupedItems) ? groupedItems : Object.values(groupedItems);
-  const items = [];
-  groups.forEach(group => {
-    const itemsInGroup = isArray(group) ? group : getItemsInGroup ? getItemsInGroup(group) : [];
-    items.push(...itemsInGroup);
-  });
+  const items = groups.reduce((accu, group) => accu.concat(isArray(group) ? group : getItemsInGroup ? getItemsInGroup(group) : []), []);
   return linearTraversal({
     ...restProps,
     items

diff --git a/src/features/atom/autocompleteLite.ts b/src/features/atom/autocompleteLite.ts
@@ -143,8 +143,12 @@ const autocompleteLite =
               }
               break;
             case 'Enter':
-              if (open && focusItem) {
-                resetState(selectItemOrAction(focusItem));
+              if (open) {
+                if (focusItem) {
+                  resetState(selectItemOrAction(focusItem));
+                } else if (!select) {
+                  resetState(true);
+                }
               }
               break;
             case 'Escape':

diff --git a/src/features/molecule/supercomplete.ts b/src/features/molecule/supercomplete.ts
@@ -8,21 +8,17 @@ type SupercompleteFeature<T> = MergedFeature<
   [AutocompleteFeature<T>, AutoInlineFeature<T>]
 >;
 
-const supercomplete = <T>({
-  getFocusItem,
-  ...rest
-}: Pick<
-  FeatureProps<T>,
-  | 'getFocusItem'
-  | 'select'
-  | 'selectOnBlur'
-  | 'deselectOnClear'
-  | 'deselectOnChange'
-  | 'closeOnSelect'
->): SupercompleteFeature<T> =>
-  mergeModules(
-    autocomplete<T>({ ...rest, rovingText: true }),
-    autoInline<T>({ getFocusItem })
-  );
+const supercomplete = <T>(
+  props: Pick<
+    FeatureProps<T>,
+    | 'getFocusItem'
+    | 'select'
+    | 'selectOnBlur'
+    | 'deselectOnClear'
+    | 'deselectOnChange'
+    | 'closeOnSelect'
+  >
+): SupercompleteFeature<T> =>
+  mergeModules(autocomplete<T>({ ...props, rovingText: true }), autoInline<T>(props));
 
 export { type SupercompleteFeature, supercomplete };
diff --git a/src/hooks/useAutocomplete.ts b/src/hooks/useAutocomplete.ts
@@ -1,5 +1,5 @@
 import { useState, useRef } from 'react';
-import type { AutocompleteProps, AutocompleteState } from '../common';
+import type { AutocompleteProps, AutocompleteState, Contextual } from '../common';
 
 const useAutocomplete = <T, FeatureYield extends object>({
   value,
@@ -21,11 +21,11 @@ const useAutocomplete = <T, FeatureYield extends object>({
     setOpen
   };
 
-  const contextual = {
+  const contextual: Contextual<T> = {
     tmpValue,
     setTmpValue,
     value,
-    onChange: (newValue?: string | undefined) => value != newValue && onChange?.(newValue),
+    onChange: (newValue) => value != newValue && onChange?.(newValue),
     ...passthrough,
     ...state
   };

diff --git a/src/traversals/groupedTraversal.ts b/src/traversals/groupedTraversal.ts
@@ -14,16 +14,11 @@ const groupedTraversal = <G, T>({
   ...restProps
 }: GroupedTraversalProps<G, T>): Traversal<T> => {
   const groups = isArray(groupedItems) ? groupedItems : Object.values(groupedItems);
-
-  const items: T[] = [];
-  groups.forEach((group) => {
-    const itemsInGroup = isArray(group)
-      ? group
-      : getItemsInGroup
-      ? getItemsInGroup(group)
-      : [];
-    items.push(...itemsInGroup);
-  });
+  const items = groups.reduce<T[]>(
+    (accu, group) =>
+      accu.concat(isArray(group) ? group : getItemsInGroup ? getItemsInGroup(group) : []),
+    []
+  );
 
   return linearTraversal({ ...restProps, items });
 };

diff --git a/types/features/molecule/supercomplete.d.ts b/types/features/molecule/supercomplete.d.ts
@@ -5,5 +5,5 @@ type SupercompleteFeature<T> = MergedFeature<T, [
     AutocompleteFeature<T>,
     AutoInlineFeature<T>
 ]>;
-declare const supercomplete: <T>({ getFocusItem, ...rest }: Pick<FeatureProps<T>, "select" | "selectOnBlur" | "deselectOnClear" | "deselectOnChange" | "closeOnSelect" | "getFocusItem">) => SupercompleteFeature<T>;
+declare const supercomplete: <T>(props: Pick<FeatureProps<T>, "select" | "selectOnBlur" | "deselectOnClear" | "deselectOnChange" | "closeOnSelect" | "getFocusItem">) => SupercompleteFeature<T>;
 export { type SupercompleteFeature, supercomplete };