fix(select): fixed issue in selected group options

core-ds · Oct 21, 2024 · a438626 · a438626
1 parent 9097936
commit a438626
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/packages/select/src/components/options-list/Component.tsx b/packages/select/src/components/options-list/Component.tsx
@@ -11,14 +11,9 @@ import { GroupShape, OptionShape, OptionsListProps } from '../../typings';
 import { isGroup, useVisibleOptions } from '../../utils';
 import { Optgroup as DefaultOptgroup } from '../optgroup';
 
-import styles from './index.module.css';
-
-const createCounter = () => {
-    let count = 0;
+import { createCounter, getSelectedItemsInGroup } from './utils';
 
-    // eslint-disable-next-line no-plusplus
-    return () => count++;
-};
+import styles from './index.module.css';
 
 export const OptionsList = forwardRef<HTMLDivElement, OptionsListProps>(
     (
@@ -85,15 +80,9 @@ export const OptionsList = forwardRef<HTMLDivElement, OptionsListProps>(
         const scrollbarRef = useRef<HTMLDivElement>(null);
         const counter = createCounter();
         const renderGroup = (group: GroupShape) => {
-            const groupSelectedItems = selectedItems?.filter((item) =>
-                group.options.includes(item),
-            );
+            const groupSelectedItems = getSelectedItemsInGroup(selectedItems, group);
             const handleSelectedItems = (items: OptionShape[]) => {
-                setSelectedItems(
-                    (selectedItems?.filter((item) => !group.options.includes(item)) ?? []).concat(
-                        items,
-                    ),
-                );
+                setSelectedItems(getSelectedItemsInGroup(selectedItems, group).concat(items));
             };
 
             return (

diff --git a/packages/select/src/components/options-list/utils.ts b/packages/select/src/components/options-list/utils.ts
@@ -0,0 +1,18 @@
+import { GroupShape, OptionsListProps } from '../../typings';
+
+export const getSelectedItemsInGroup = (
+    selectedItems: OptionsListProps['selectedItems'],
+    group: GroupShape,
+) =>
+    selectedItems === undefined
+        ? []
+        : selectedItems.filter(({ key: selectedItemKey }) =>
+              group.options.some((option) => option.key === selectedItemKey),
+          );
+
+export const createCounter = () => {
+    let count = 0;
+
+    // eslint-disable-next-line no-plusplus
+    return () => count++;
+};