@homecode/ui 5.3.0 → 5.3.1

package/dist/esm/src/components/Autocomplete/Autocomplete.js

@@ -167,6 +167,8 @@ function Autocomplete(props) {
         return true;
     };
     const handleSelect = (option) => {
+        if (!option)
+            return;
         if (selectable) {
             setSelectedId(option.id);
             setSelectedLabel(option.label);
@@ -196,7 +198,12 @@ function Autocomplete(props) {
     const { focusedIndex, setFocusedIndex } = useListKeyboardControl({
         isActive: isPopupOpenForInput,
         itemsCount: displayItems.length,
-        onSelect: index => handleSelect(displayItems[index]),
+        onSelect: index => {
+            const option = displayItems[index];
+            if (!option)
+                return;
+            handleSelect(option);
+        },
     });
     const fetchOptionsCore = useCallback(async (filter, offset) => {
         const requestKey = `${filter}:${offset}`;

package/dist/esm/src/hooks/useListKeyboardControl.js

@@ -26,7 +26,11 @@ const useListKeyboardControl = ({ isActive, itemsCount, onSelect, }) => {
             return;
         }
         if (e.key === 'Enter') {
-            onSelect(newIndex);
+            if (newIndex < 0 || newIndex >= itemsCount)
+                return;
+            e.preventDefault();
+            e.stopPropagation();
+            onSelect?.(newIndex);
             return;
         }
     }, [focusedIndex, itemsCount, onSelect]);
@@ -37,10 +41,14 @@ const useListKeyboardControl = ({ isActive, itemsCount, onSelect, }) => {
         isActive,
     });
     useEffect(() => {
-        if (itemsCount < focusedIndex) {
+        if (itemsCount <= 0) {
+            setFocusedIndex(-1);
+            return;
+        }
+        if (focusedIndex >= itemsCount) {
             setFocusedIndex(itemsCount - 1);
         }
-    }, [itemsCount]);
+    }, [itemsCount, focusedIndex]);
     return {
         focusedIndex,
         setFocusedIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homecode/ui",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "React UI components library",
   "scripts": {
     "tests": "jest",