downshift 9.1.0-alpha.5 → 9.1.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "downshift",
-  "version": "9.1.0-alpha.5",
+  "version": "9.1.0-alpha.6",
   "description": "🏎 A set of primitives to build simple, flexible, WAI-ARIA compliant React autocomplete, combobox or select dropdown components.",
   "main": "dist/downshift.cjs.js",
   "react-native": "dist/downshift.native.cjs.js",

package/preact/dist/downshift.cjs.js

@@ -4123,27 +4123,20 @@ var _useTagGroup = function useTagGroup(userProps) {
     tagGroupId: props.tagGroupId
   });
   var itemRefs = React.useRef({});
+  var previousActiveIndexRef = React.useRef(activeIndex);
   var previousItemsLengthRef = React.useRef(items.length);
-  var isInitialMount = useIsInitialMount();
 
   /* Effects */
 
   useAccessibleDescription((_props$environment = props.environment) == null ? void 0 : _props$environment.document, props.removeElementDescription);
   React.useEffect(function () {
-    if (isInitialMount) {
-      return;
-    }
-    if (previousItemsLengthRef.current < items.length) {
-      return;
-    }
-    if (activeIndex >= 0 && activeIndex < Object.keys(itemRefs.current).length) {
+    if (activeIndex !== -1 && previousActiveIndexRef.current !== -1 && activeIndex !== previousActiveIndexRef.current || previousItemsLengthRef.current === items.length + 1) {
       var _itemRefs$current$ele;
       (_itemRefs$current$ele = itemRefs.current[elementIds.getTagId(activeIndex)]) == null || _itemRefs$current$ele.focus();
     }
-  }, [activeIndex, elementIds, isInitialMount, items.length]);
-  React.useEffect(function () {
+    previousActiveIndexRef.current = activeIndex;
     previousItemsLengthRef.current = items.length;
-  });
+  }, [activeIndex, elementIds, items]);
 
   /* Getter functions */
 

package/preact/dist/downshift.esm.js

@@ -4101,27 +4101,20 @@ var _useTagGroup = function useTagGroup(userProps) {
     tagGroupId: props.tagGroupId
   });
   var itemRefs = useRef({});
+  var previousActiveIndexRef = useRef(activeIndex);
   var previousItemsLengthRef = useRef(items.length);
-  var isInitialMount = useIsInitialMount();
 
   /* Effects */
 
   useAccessibleDescription((_props$environment = props.environment) == null ? void 0 : _props$environment.document, props.removeElementDescription);
   useEffect(function () {
-    if (isInitialMount) {
-      return;
-    }
-    if (previousItemsLengthRef.current < items.length) {
-      return;
-    }
-    if (activeIndex >= 0 && activeIndex < Object.keys(itemRefs.current).length) {
+    if (activeIndex !== -1 && previousActiveIndexRef.current !== -1 && activeIndex !== previousActiveIndexRef.current || previousItemsLengthRef.current === items.length + 1) {
       var _itemRefs$current$ele;
       (_itemRefs$current$ele = itemRefs.current[elementIds.getTagId(activeIndex)]) == null || _itemRefs$current$ele.focus();
     }
-  }, [activeIndex, elementIds, isInitialMount, items.length]);
-  useEffect(function () {
+    previousActiveIndexRef.current = activeIndex;
     previousItemsLengthRef.current = items.length;
-  });
+  }, [activeIndex, elementIds, items]);
 
   /* Getter functions */
 

package/preact/dist/downshift.umd.js

@@ -4376,27 +4376,20 @@
       tagGroupId: props.tagGroupId
     });
     var itemRefs = React.useRef({});
+    var previousActiveIndexRef = React.useRef(activeIndex);
     var previousItemsLengthRef = React.useRef(items.length);
-    var isInitialMount = useIsInitialMount();
 
     /* Effects */
 
     useAccessibleDescription((_props$environment = props.environment) == null ? void 0 : _props$environment.document, props.removeElementDescription);
     React.useEffect(function () {
-      if (isInitialMount) {
-        return;
-      }
-      if (previousItemsLengthRef.current < items.length) {
-        return;
-      }
-      if (activeIndex >= 0 && activeIndex < Object.keys(itemRefs.current).length) {
+      if (activeIndex !== -1 && previousActiveIndexRef.current !== -1 && activeIndex !== previousActiveIndexRef.current || previousItemsLengthRef.current === items.length + 1) {
         var _itemRefs$current$ele;
         (_itemRefs$current$ele = itemRefs.current[elementIds.getTagId(activeIndex)]) == null || _itemRefs$current$ele.focus();
       }
-    }, [activeIndex, elementIds, isInitialMount, items.length]);
-    React.useEffect(function () {
+      previousActiveIndexRef.current = activeIndex;
       previousItemsLengthRef.current = items.length;
-    });
+    }, [activeIndex, elementIds, items]);
 
     /* Getter functions */