@pushwoosh/dumb-components 2.9.17 → 2.9.19

package/Combobox/Combobox.js

@@ -201,26 +201,28 @@ function SelectCombobox({
   const selectedKey = hasValue ? getKey(value) : null;
   const inputValue = isOpen ? query : valueLabel;
   const userMovedRef = useRef(false);
+  const selectedIndex = sourceItems.findIndex(it => getKey(it) === selectedKey);
+  const activateSelected = useCallback(() => {
+    userMovedRef.current = false;
+    setActiveIndex(selectedIndex >= 0 ? selectedIndex : 0);
+  }, [selectedIndex, setActiveIndex]);
   const open = useCallback(() => {
     if (isOpen) return;
     setIsOpen(true);
     setQuery('');
-    userMovedRef.current = false;
-    const idx = sourceItems.findIndex(it => getKey(it) === selectedKey);
-    setActiveIndex(idx >= 0 ? idx : 0);
-  }, [isOpen, sourceItems, getKey, selectedKey, setActiveIndex]);
+    activateSelected();
+  }, [isOpen, activateSelected]);
   useEffect(() => {
-    if (!isOpen || query || userMovedRef.current) return;
-    const idx = sourceItems.findIndex(it => getKey(it) === selectedKey);
-    if (idx >= 0) setActiveIndex(idx);
-  }, [isOpen, query, sourceItems, getKey, selectedKey, setActiveIndex]);
+    if (!isOpen || query || userMovedRef.current || selectedIndex < 0) return;
+    setActiveIndex(selectedIndex);
+  }, [isOpen, query, selectedIndex, setActiveIndex]);
   const moveActive = useCallback(next => {
     userMovedRef.current = true;
     setActiveIndex(next);
   }, [setActiveIndex]);
   const search = event => {
     setQuery(event.target.value);
-    moveActive(0);
+    if (event.target.value) moveActive(0);else activateSelected();
   };
   const close = useCallback(() => {
     setIsOpen(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "2.9.17",
+  "version": "2.9.19",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",
@@ -40,7 +40,7 @@
     "@lezer/highlight": "^1.2.1",
     "@pushwoosh/kit-constants": "^2.1.0",
     "@pushwoosh/kit-helpers": "^4.12.7",
-    "@pushwoosh/kit-icons": "^2.3.3",
+    "@pushwoosh/kit-icons": "^2.3.7",
     "@pushwoosh/kit-typography": "^1.8.7",
     "@tippyjs/react": "^4.2.6",
     "@uiw/codemirror-themes": "^4.23.8",