react-core-ts 2.1.36 → 2.1.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-core-ts",
-  "version": "2.1.36",
+  "version": "2.1.37",
   "description": "React Components",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AutoComplete.tsx

@@ -12,6 +12,7 @@ import { useSuggestions } from './utilities/autosuggestions';
 import { debounce } from './utilities/debounce';
 import { deepEqual } from './utilities/deepEqual';
 import { filterSuggestions } from './utilities/filterSuggestions';
+import { isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 import { Close, DropArrow, Search, Spinner } from './utilities/icons';
 import Tooltip from './utilities/tooltip';
 
@@ -283,12 +284,12 @@ const AutoComplete = forwardRef<HTMLInputElement, AutoSuggestionInputProps>(
       selectedItems: ValueProps[] | string,
     ): boolean => {
       if (Array.isArray(selectedItems)) {
-        return selectedItems.some(
-          (selectedItem) => selectedItem[desc] === item[desc],
+        return selectedItems.some((selectedItem) =>
+          isSelectionMatch(selectedItem, item, desc, descId),
         );
-      } else {
-        return item[desc] === selectedItems;
       }
+
+      return isSelectionMatchValue(item, selectedItems, desc, descId);
     };
 
     const handleLoadMore = () => {

package/src/AutoCompleteWithSelectedList.tsx

@@ -18,7 +18,7 @@ import { deepEqual } from './utilities/deepEqual';
 import { filterSuggestions } from './utilities/filterSuggestions';
 import { AllDropArrow, DropArrow, Search, Spinner } from './utilities/icons';
 import { default as Tooltip } from './utilities/NewTooltip';
-import { getKeyValue, safeToLowerString } from './utilities/getKeyValue';
+import { getKeyValue, isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 import {
   clampDropdownToViewportPreferRightAlign,
   MAX_DROPDOWN_WIDTH_WITH_TABS_PX,
@@ -648,17 +648,12 @@ const AutoCompleteWithSelectedList = forwardRef<
       selectedItems: ValueProps[] | string
     ): boolean => {
       if (Array.isArray(selectedItems)) {
-        return selectedItems.some(
-          (selectedItem) =>
-            getKeyValue(selectedItem, desc, 'name') === getKeyValue(item, desc, 'name') ||
-            getKeyValue(selectedItem, descId, 'id') === getKeyValue(item, descId, 'id')
-        );
-      } else {
-        return (
-          getKeyValue(item, desc, 'name') === safeToLowerString(selectedItems) ||
-          getKeyValue(item, descId, 'id') === safeToLowerString(selectedItems)
+        return selectedItems.some((selectedItem) =>
+          isSelectionMatch(selectedItem, item, desc, descId),
         );
       }
+
+      return isSelectionMatchValue(item, selectedItems, desc, descId);
     };
 
     const handleLoadMore = () => {

package/src/AutoCompleteWithTabFilter.tsx

@@ -16,7 +16,7 @@ import { deepEqual } from './utilities/deepEqual';
 import { filterSuggestions } from './utilities/filterSuggestions';
 import { AllDropArrow, DropArrow, Search, Spinner, Tools } from './utilities/icons';
 import { default as Tooltip } from './utilities/NewTooltip';
-import { getKeyValue, safeToLowerString } from './utilities/getKeyValue';
+import { getKeyValue, isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 import {
     clampDropdownToViewportPreferRightAlign,
     MAX_DROPDOWN_WIDTH_WITH_TABS_PX,
@@ -710,17 +710,12 @@ const AutoCompleteWithTabFilter = forwardRef<
             selectedItems: ValueProps[] | string
         ): boolean => {
             if (Array.isArray(selectedItems)) {
-                return selectedItems.some(
-                    (selectedItem) =>
-                        getKeyValue(selectedItem, desc, 'name') === getKeyValue(item, desc, 'name') ||
-                        getKeyValue(selectedItem, descId, 'id') === getKeyValue(item, descId, 'id')
-                );
-            } else {
-                return (
-                    getKeyValue(item, desc, 'name') === safeToLowerString(selectedItems) ||
-                    getKeyValue(item, descId, 'id') === safeToLowerString(selectedItems)
+                return selectedItems.some((selectedItem) =>
+                    isSelectionMatch(selectedItem, item, desc, descId),
                 );
             }
+
+            return isSelectionMatchValue(item, selectedItems, desc, descId);
         };
 
         const handleLoadMore = () => {

package/src/AutoCompleteWithTreeStructure.tsx

@@ -10,6 +10,7 @@ import { buildTree } from './utilities/convertFlatArraytoTreeStructure';
 import { deepEqual } from './utilities/deepEqual';
 import { default as Tooltip } from './utilities/expandableTootltip';
 import { Search, Spinner } from './utilities/icons';
+import { isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 
 type ValueProps = {
   [key: string]: string;
@@ -196,14 +197,12 @@ const AutoCompleteWithTreeStructure = forwardRef<
       selectedItems: ValueProps[] | string
     ): boolean => {
       if (Array.isArray(selectedItems)) {
-        return selectedItems.some(
-          (selectedItem) =>
-            selectedItem[desc] === item[desc] ||
-            selectedItem[descId] === item[descId]
+        return selectedItems.some((selectedItem) =>
+          isSelectionMatch(selectedItem, item, desc, descId),
         );
-      } else {
-        return item[desc] === selectedItems;
       }
+
+      return isSelectionMatchValue(item, selectedItems, desc, descId);
     };
     useEffect(() => {
       if (!deepEqual(selectedItems, propsSeelctedItems))

package/src/ExpandableAutoComplete.tsx

@@ -19,7 +19,7 @@ import { deepEqual } from './utilities/deepEqual';
 import { default as Tooltip } from './utilities/NewTooltip';
 import { filterSuggestions } from './utilities/filterSuggestions';
 import { AllDropArrow, Search, Spinner } from './utilities/icons';
-import { getKeyValue, safeToLowerString } from './utilities/getKeyValue';
+import { getKeyValue, isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 
 
 type ValueProps = {
@@ -456,17 +456,12 @@ const ExpandableAutoComplete = forwardRef<
       selectedItems: ValueProps[] | string
     ): boolean => {
       if (Array.isArray(selectedItems)) {
-        return selectedItems.some(
-          (selectedItem) =>
-            getKeyValue(selectedItem, desc, 'name') === getKeyValue(item, desc, 'name') ||
-            getKeyValue(selectedItem, descId, 'id') === getKeyValue(item, descId, 'id')
-        );
-      } else {
-        return (
-          getKeyValue(item, desc, 'name') === safeToLowerString(selectedItems) ||
-          getKeyValue(item, descId, 'id') === safeToLowerString(selectedItems)
+        return selectedItems.some((selectedItem) =>
+          isSelectionMatch(selectedItem, item, desc, descId),
         );
       }
+
+      return isSelectionMatchValue(item, selectedItems, desc, descId);
     };
 
     const handleLoadMore = () => {

package/src/dropdownFilterTabs.tsx

@@ -17,7 +17,7 @@ import { deepEqual } from './utilities/deepEqual';
 import { filterSuggestions } from './utilities/filterSuggestions';
 import { AllDropArrow, DropArrow, Search, Spinner } from './utilities/icons';
 import { default as Tooltip } from './utilities/NewTooltip';
-import { getKeyValue, safeToLowerString } from './utilities/getKeyValue';
+import { getKeyValue, isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 import {
   clampDropdownToViewportPreferRightAlign,
   MAX_DROPDOWN_WIDTH_WITH_TABS_PX,
@@ -736,19 +736,11 @@ const DropdownFilterTabs = forwardRef<
             }
           }
 
-          return (
-            getKeyValue(selectedItem, desc, 'name') ===
-              getKeyValue(item, desc, 'name') ||
-            getKeyValue(selectedItem, descId, 'id') ===
-              getKeyValue(item, descId, 'id')
-          );
+          return isSelectionMatch(selectedItem, item, desc, descId);
         });
-      } else {
-        return (
-          getKeyValue(item, desc, 'name') === safeToLowerString(selectedItems) ||
-          getKeyValue(item, descId, 'id') === safeToLowerString(selectedItems)
-        );
       }
+
+      return isSelectionMatchValue(item, selectedItems, desc, descId);
     }, [tab, currentTabId, desc, descId]);
 
     const handleLoadMore = () => {

package/src/dummyAutoCompleteWithSelectedList.tsx

@@ -9,6 +9,7 @@ import { debounce } from './utilities/debounce';
 import { deepEqual } from './utilities/deepEqual';
 import { default as Tooltip } from './utilities/expandableTootltip';
 import { filterSuggestions } from './utilities/filterSuggestions';
+import { isSelectionMatch, isSelectionMatchValue } from './utilities/getKeyValue';
 import { DropArrow, Search, Spinner } from './utilities/icons';
 
 const AutoCompleteWithSelectedList = forwardRef<
@@ -333,12 +334,12 @@ const AutoCompleteWithSelectedList = forwardRef<
       selectedItems: ValueProps[] | string
     ): boolean => {
       if (Array.isArray(selectedItems)) {
-        return selectedItems.some(
-          (selectedItem) => selectedItem[desc] === item[desc]
+        return selectedItems.some((selectedItem) =>
+          isSelectionMatch(selectedItem, item, desc, descId),
         );
-      } else {
-        return item[desc] === selectedItems;
       }
+
+      return isSelectionMatchValue(item, selectedItems, desc, descId);
     };
 
     const handleLoadMore = () => {

package/src/utilities/getKeyValue.ts

@@ -11,4 +11,38 @@ export function getKeyValue(obj: any, key: any, fallbackKey: string): string {
 export function safeToLowerString(val: any): string {
   if (val === undefined || val === null) return '';
   return String(val).toLowerCase();
+}
+
+/** Match selected item to a suggestion — id when both exist, otherwise desc. */
+export function isSelectionMatch(
+  selectedItem: any,
+  item: any,
+  desc: string,
+  descId: string,
+): boolean {
+  const selectedId = getKeyValue(selectedItem, descId, 'id');
+  const itemId = getKeyValue(item, descId, 'id');
+
+  if (selectedId && itemId) {
+    return selectedId === itemId;
+  }
+
+  return (
+    getKeyValue(selectedItem, desc, 'name') === getKeyValue(item, desc, 'name')
+  );
+}
+
+/** Match a suggestion to a string value (single-select input). */
+export function isSelectionMatchValue(
+  item: any,
+  selectedValue: string,
+  desc: string,
+  descId: string,
+): boolean {
+  const normalized = safeToLowerString(selectedValue);
+  const itemId = getKeyValue(item, descId, 'id');
+  if (itemId && itemId === normalized) {
+    return true;
+  }
+  return getKeyValue(item, desc, 'name') === normalized;
 }