react-core-ts 2.1.36 → 2.1.38

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/styles/components/autocomplete.css

@@ -156,7 +156,7 @@ body * {
 }
 
 .qbs-autocomplete-notfound {
-  cursor: pointer;
+  cursor: default;
   padding: 6px 8px;
   border-radius: 6px;
   font-size: 12px;

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;
 }