fix(useMultipleSelect): removeSelectedItem adding duplicate items to …

…selected items (#1353) * fix removeSelectedItem adding duplicate items to selected items fixes #1316 * fix: remove unnecessary spread
downshift-js · Aug 11, 2022 · bf709b9 · bf709b9
1 parent efba7f2
commit bf709b9
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/src/hooks/useMultipleSelection/__tests__/returnProps.test.js b/src/hooks/useMultipleSelection/__tests__/returnProps.test.js
@@ -60,6 +60,34 @@ describe('returnProps', () => {
       expect(result.current.activeIndex).toEqual(0)
     })
 
+    test('removeSelectedItem handles undefined item without modifying the selected array or the active index', () => {
+      const {result} = renderUseMultipleSelection({
+        initialSelectedItems: ['test', 'more test'],
+        initialActiveIndex: 1,
+      })
+
+      act(() => {
+        result.current.removeSelectedItem(undefined)
+      })
+
+      expect(result.current.selectedItems).toStrictEqual(['test', 'more test'])
+      expect(result.current.activeIndex).toEqual(1)
+    })
+
+    test('removeSelectedItem handles null item without modifying the selected array or the active index', () => {
+      const {result} = renderUseMultipleSelection({
+        initialSelectedItems: ['test', 'more test'],
+        initialActiveIndex: 1,
+      })
+
+      act(() => {
+        result.current.removeSelectedItem(null)
+      })
+
+      expect(result.current.selectedItems).toStrictEqual(['test', 'more test'])
+      expect(result.current.activeIndex).toEqual(1)
+    })
+
     test('setActiveIndex sets activeIndex', () => {
       const {result} = renderUseMultipleSelection()
 

diff --git a/src/hooks/useMultipleSelection/reducer.js b/src/hooks/useMultipleSelection/reducer.js
@@ -71,18 +71,20 @@ export default function downshiftMultipleSelectionReducer(state, action) {
       let newActiveIndex = activeIndex
       const selectedItemIndex = selectedItems.indexOf(selectedItem)
 
-      if (selectedItems.length === 1) {
-        newActiveIndex = -1
-      } else if (selectedItemIndex === selectedItems.length - 1) {
-        newActiveIndex = selectedItems.length - 2
-      }
+      if (selectedItemIndex >= 0) {
+        if (selectedItems.length === 1) {
+          newActiveIndex = -1
+        } else if (selectedItemIndex === selectedItems.length - 1) {
+          newActiveIndex = selectedItems.length - 2
+        }
 
-      changes = {
-        selectedItems: [
-          ...selectedItems.slice(0, selectedItemIndex),
-          ...selectedItems.slice(selectedItemIndex + 1),
-        ],
-        ...{activeIndex: newActiveIndex},
+        changes = {
+          selectedItems: [
+            ...selectedItems.slice(0, selectedItemIndex),
+            ...selectedItems.slice(selectedItemIndex + 1),
+          ],
+          activeIndex: newActiveIndex,
+        }
       }
       break
     }