downshift 9.3.0 → 9.3.2

package/preact/dist/downshift.umd.js

@@ -2139,54 +2139,6 @@
 
   // istanbul ignore next
   var useIsomorphicLayoutEffect = typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof window.document.createElement !== 'undefined' ? React__namespace.useLayoutEffect : React__namespace.useEffect;
-
-  // istanbul ignore next
-  var useElementIds$1 = 'useId' in React__namespace // Avoid conditional useId call
-  ? function useElementIds(_ref) {
-    var id = _ref.id,
-      labelId = _ref.labelId,
-      menuId = _ref.menuId,
-      getItemId = _ref.getItemId,
-      toggleButtonId = _ref.toggleButtonId,
-      inputId = _ref.inputId;
-    // Avoid conditional useId call
-    var reactId = "downshift-" + React__namespace.useId();
-    if (!id) {
-      id = reactId;
-    }
-    var elementIds = React__namespace.useMemo(function () {
-      return {
-        labelId: labelId || id + "-label",
-        menuId: menuId || id + "-menu",
-        getItemId: getItemId || function (index) {
-          return id + "-item-" + index;
-        },
-        toggleButtonId: toggleButtonId || id + "-toggle-button",
-        inputId: inputId || id + "-input"
-      };
-    }, [getItemId, id, inputId, labelId, menuId, toggleButtonId]);
-    return elementIds;
-  } : function useElementIds(_ref2) {
-    var _ref2$id = _ref2.id,
-      id = _ref2$id === void 0 ? "downshift-" + generateId() : _ref2$id,
-      labelId = _ref2.labelId,
-      menuId = _ref2.menuId,
-      getItemId = _ref2.getItemId,
-      toggleButtonId = _ref2.toggleButtonId,
-      inputId = _ref2.inputId;
-    var elementIds = React__namespace.useMemo(function () {
-      return {
-        labelId: labelId || id + "-label",
-        menuId: menuId || id + "-menu",
-        getItemId: getItemId || function (index) {
-          return id + "-item-" + index;
-        },
-        toggleButtonId: toggleButtonId || id + "-toggle-button",
-        inputId: inputId || id + "-input"
-      };
-    }, [getItemId, id, inputId, labelId, menuId, toggleButtonId]);
-    return elementIds;
-  };
   function isAcceptedCharacterKey(key) {
     return /^\S{1}$/.test(key);
   }
@@ -2349,13 +2301,13 @@
       return setGetterPropCallInfo;
     };
   }
-  function useScrollIntoView(_ref3) {
-    var highlightedIndex = _ref3.highlightedIndex,
-      isOpen = _ref3.isOpen,
-      itemRefs = _ref3.itemRefs,
-      getItemNodeFromIndex = _ref3.getItemNodeFromIndex,
-      menuElement = _ref3.menuElement,
-      scrollIntoViewProp = _ref3.scrollIntoView;
+  function useScrollIntoView(_ref) {
+    var highlightedIndex = _ref.highlightedIndex,
+      isOpen = _ref.isOpen,
+      itemRefs = _ref.itemRefs,
+      getItemNodeFromIndex = _ref.getItemNodeFromIndex,
+      menuElement = _ref.menuElement,
+      scrollIntoViewProp = _ref.scrollIntoView;
     // used not to scroll on highlight by mouse.
     var shouldScrollRef = React__namespace.useRef(true);
     // Scroll on highlighted item if change comes from keyboard.
@@ -2377,9 +2329,9 @@
   var useControlPropsValidator = noop;
   /* istanbul ignore next */
   {
-    useControlPropsValidator = function useControlPropsValidator(_ref4) {
-      var props = _ref4.props,
-        state = _ref4.state;
+    useControlPropsValidator = function useControlPropsValidator(_ref2) {
+      var props = _ref2.props,
+        state = _ref2.state;
       // used for checking when props are moving from controlled to uncontrolled.
       var prevPropsRef = React__namespace.useRef(props);
       var isInitialMount = useIsInitialMount();
@@ -2702,6 +2654,57 @@
   }
   /* eslint-enable complexity */
 
+  // https://github.com/downshift-js/downshift/issues/1674#issuecomment-3924320872
+  var SafeReact$1 = _extends({}, React__namespace);
+  var reactUseId$1 = SafeReact$1.useId;
+  var useElementIds$1 = typeof reactUseId$1 === 'function' ? useElementIdsR18$1 : useElementIdsLegacy$1;
+  function useElementIdsR18$1(_ref) {
+    var id = _ref.id,
+      labelId = _ref.labelId,
+      menuId = _ref.menuId,
+      getItemId = _ref.getItemId,
+      toggleButtonId = _ref.toggleButtonId,
+      inputId = _ref.inputId;
+    var reactId = "downshift-" + reactUseId$1();
+    if (!id) {
+      id = reactId;
+    }
+    var elementIds = React__namespace.useMemo(function () {
+      return {
+        labelId: labelId != null ? labelId : id + "-label",
+        menuId: menuId != null ? menuId : id + "-menu",
+        getItemId: getItemId != null ? getItemId : function (index) {
+          return id + "-item-" + index;
+        },
+        toggleButtonId: toggleButtonId != null ? toggleButtonId : id + "-toggle-button",
+        inputId: inputId != null ? inputId : id + "-input"
+      };
+    }, [getItemId, id, inputId, labelId, menuId, toggleButtonId]);
+    return elementIds;
+  }
+  function useElementIdsLegacy$1(_ref2) {
+    var id = _ref2.id,
+      labelId = _ref2.labelId,
+      menuId = _ref2.menuId,
+      getItemId = _ref2.getItemId,
+      toggleButtonId = _ref2.toggleButtonId,
+      inputId = _ref2.inputId;
+    var baseIdRef = React__namespace.useRef(id != null ? id : "downshift-" + generateId());
+    var baseId = baseIdRef.current;
+    var elementIds = React__namespace.useMemo(function () {
+      return {
+        labelId: labelId != null ? labelId : baseId + "-label",
+        menuId: menuId != null ? menuId : baseId + "-menu",
+        getItemId: getItemId != null ? getItemId : function (index) {
+          return baseId + "-item-" + index;
+        },
+        toggleButtonId: toggleButtonId != null ? toggleButtonId : baseId + "-toggle-button",
+        inputId: inputId != null ? inputId : baseId + "-input"
+      };
+    }, [getItemId, inputId, labelId, menuId, toggleButtonId, baseId]);
+    return elementIds;
+  }
+
   var _excluded$3 = ["onClick"],
     _excluded2$3 = ["onMouseLeave", "refKey", "ref"],
     _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
@@ -4273,38 +4276,45 @@
     return _extends({}, state, changes);
   }
 
+  // https://github.com/downshift-js/downshift/issues/1674#issuecomment-3924320872
+  var SafeReact = _extends({}, React__namespace);
+  var reactUseId = SafeReact.useId;
+
   // istanbul ignore next
-  var useElementIds = 'useId' in React__namespace // Avoid conditional useId call
-  ? useElementIdsR18 : useElementIdsLegacy;
+  var useElementIds = typeof reactUseId === 'function' ? useElementIdsR18 : useElementIdsLegacy;
   function useElementIdsR18(_ref) {
     var id = _ref.id,
       tagGroupId = _ref.tagGroupId,
       getTagId = _ref.getTagId;
-    // Avoid conditional useId call
-    var reactId = "downshift-" + React__namespace.useId();
+    var reactId = "downshift-" + reactUseId();
     if (!id) {
       id = reactId;
     }
-    var elementIdsRef = React__namespace.useRef({
-      tagGroupId: tagGroupId != null ? tagGroupId : id + "-tag-group",
-      getTagId: getTagId != null ? getTagId : function (index) {
-        return id + "-tag-" + index;
-      }
-    });
-    return elementIdsRef.current;
+    var elementIds = React__namespace.useMemo(function () {
+      return {
+        tagGroupId: tagGroupId != null ? tagGroupId : id + "-tag-group",
+        getTagId: getTagId != null ? getTagId : function (index) {
+          return id + "-tag-" + index;
+        }
+      };
+    }, [getTagId, id, tagGroupId]);
+    return elementIds;
   }
   function useElementIdsLegacy(_ref2) {
-    var _ref2$id = _ref2.id,
-      id = _ref2$id === void 0 ? "downshift-" + generateId() : _ref2$id,
+    var id = _ref2.id,
       getTagId = _ref2.getTagId,
       tagGroupId = _ref2.tagGroupId;
-    var elementIdsRef = React__namespace.useRef({
-      tagGroupId: tagGroupId != null ? tagGroupId : id + "-tag-group",
-      getTagId: getTagId != null ? getTagId : function (index) {
-        return id + "-tag-" + index;
-      }
-    });
-    return elementIdsRef.current;
+    var baseIdRef = React__namespace.useRef(id != null ? id : "downshift-" + generateId());
+    var baseId = baseIdRef.current;
+    var elementIds = React__namespace.useMemo(function () {
+      return {
+        tagGroupId: tagGroupId != null ? tagGroupId : baseId + "-tag-group",
+        getTagId: getTagId != null ? getTagId : function (index) {
+          return baseId + "-tag-" + index;
+        }
+      };
+    }, [getTagId, baseId, tagGroupId]);
+    return elementIds;
   }
 
   function getInitialState(props) {