fix: defaultValue broken when setting mutiple to false

#9
jeffwcx · Oct 29, 2024 · b8ed1ea · b8ed1ea
1 parent 302c5c2
commit b8ed1ea
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git a/src/useSelect.ts b/src/useSelect.ts
@@ -161,15 +161,20 @@ export function useSelect<Value, Multiple extends boolean>(
     }
     const targetOption = displayItems[cursor];
     if (isSelectable(targetOption)) {
-      if (targetOption.checked) {
-        const currentSelection = selections.current.filter(
-          (op) => !equals(targetOption.value, op.value),
-        );
-        setBehavior('deselect', true);
-        selections.current = currentSelection;
+      if (multiple) {
+        if (targetOption.checked) {
+          const currentSelection = selections.current.filter(
+            (op) => !equals(targetOption.value, op.value),
+          );
+          setBehavior('deselect', true);
+          selections.current = currentSelection;
+        } else {
+          setBehavior('select', true);
+          selections.current = [...selections.current, { ...targetOption }];
+        }
       } else {
         setBehavior('select', true);
-        selections.current = [...selections.current, { ...targetOption }];
+        selections.current = [{ ...targetOption }];
       }
       if (enableFilter && !targetOption.checked && clearInput) {
         clearFilterInput(rl);
@@ -297,21 +302,33 @@ export function useSelect<Value, Multiple extends boolean>(
       return;
     }
     const ss = [...selections.current];
-    const finalItems = items.map((item) => {
+    let firstChecked = -1;
+    let firstSelectable = -1;
+    const finalItems = items.map((item, index) => {
       const finalItem = { ...item };
       if (isSelectable(finalItem)) {
+        if (firstSelectable < 0) {
+          firstSelectable = index;
+        }
         ss.forEach((op) => {
           if (equals(op.value, finalItem.value)) {
             finalItem.checked = true;
             op.name = finalItem.name;
+            if (firstChecked < 0) {
+              firstChecked = index;
+            }
           }
         });
       }
       return finalItem;
     });
     setDisplayItems(finalItems);
     selections.current = ss;
-    setCursor(finalItems.findIndex(isSelectable));
+    if (multiple) {
+      setCursor(firstSelectable);
+    } else {
+      setCursor(firstChecked < 0 ? firstSelectable : firstChecked);
+    }
   }
 
   async function loadData() {

diff --git a/tests/index.spec.ts b/tests/index.spec.ts
@@ -494,17 +494,19 @@ describe('inquirer-select-pro', () => {
       // @ts-ignore
       await renderPrompt({
         ...optionsForDisplayValue,
-        defaultValue: 'a',
+        defaultValue: 1,
         multiple: false,
       });
       await waitForInteraction();
       expect(getScreen()).toMatchInlineSnapshot(`
         "? Choose movie:
-        >> a
-        > a
-          One
+        >> One
+          a
+        > One
           [object Object]"
       `);
+      events.keypress('enter');
+      expect(await answer).toMatchInlineSnapshot(`1`);
     });
 
     it('should throw error when `defaultValue` is non-array in multiple selection mode', async () => {