downshift 9.3.4 → 9.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dist/downshift.cjs.cjs +11 -16
  2. package/dist/downshift.d.ts +14 -48
  3. package/dist/downshift.esm.mjs +11 -16
  4. package/dist/downshift.native.cjs.cjs +11 -16
  5. package/dist/downshift.nativeweb.cjs.cjs +11 -16
  6. package/dist/downshift.umd.js +11 -16
  7. package/dist/downshift.umd.js.map +1 -1
  8. package/dist/downshift.umd.min.js +1 -1
  9. package/dist/downshift.umd.min.js.map +1 -1
  10. package/dist/hooks/testUtils/interactions.d.ts +7 -7
  11. package/dist/hooks/useCombobox/__tests__/utils/renderCombobox.d.ts +2 -59
  12. package/dist/hooks/useCombobox/__tests__/utils/renderUseCombobox.d.ts +1 -1
  13. package/dist/hooks/useCombobox/index.types.d.ts +0 -2
  14. package/dist/hooks/useCombobox/utils/getInitialState.d.ts +1 -6
  15. package/dist/hooks/useCombobox/utils/propTypes.d.ts +1 -43
  16. package/dist/hooks/useSelect/__tests__/utils/getItemIndexByCharacter.d.ts +1 -1
  17. package/dist/hooks/useSelect/__tests__/utils/renderSelect.d.ts +1 -58
  18. package/dist/hooks/useSelect/__tests__/utils/renderUseSelect.d.ts +1 -1
  19. package/dist/hooks/useSelect/__tests__/utils/stateChangeTestCases.d.ts +29 -50
  20. package/dist/hooks/useSelect/utils/propTypes.d.ts +1 -38
  21. package/dist/hooks/useTagGroup/__tests__/utils/renderTagGroup.d.ts +1 -63
  22. package/dist/hooks/useTagGroup/__tests__/utils/renderUseTagGroup.d.ts +2 -2
  23. package/dist/hooks/useTagGroup/index.types.d.ts +0 -1
  24. package/dist/hooks/utils/dropdownDefaultProps.d.ts +1 -2
  25. package/package.json +1 -1
  26. package/preact/dist/downshift.cjs.cjs +11 -16
  27. package/preact/dist/downshift.esm.mjs +11 -16
  28. package/preact/dist/downshift.umd.js +11 -16
  29. package/preact/dist/downshift.umd.js.map +1 -1
  30. package/preact/dist/downshift.umd.min.js +1 -1
  31. package/preact/dist/downshift.umd.min.js.map +1 -1
  32. package/dist/hooks/useMultipleSelection/index.d.ts +0 -58
  33. package/dist/hooks/useMultipleSelection/reducer.d.ts +0 -1
  34. package/dist/hooks/useMultipleSelection/stateChangeTypes.d.ts +0 -13
  35. package/dist/hooks/useMultipleSelection/utils.d.ts +0 -44
@@ -1927,10 +1927,10 @@ function getHighlightedIndexOnOpen(items, initialHighlightedIndex, defaultHighli
1927
1927
  }
1928
1928
 
1929
1929
  // initialHighlightedIndex will give value to highlightedIndex on initial state only.
1930
- if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && items[initialHighlightedIndex] && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex)) {
1930
+ if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && (initialHighlightedIndex === -1 || items[initialHighlightedIndex] !== undefined && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex))) {
1931
1931
  return initialHighlightedIndex;
1932
1932
  }
1933
- if (defaultHighlightedIndex !== undefined && items[defaultHighlightedIndex] && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex)) {
1933
+ if (defaultHighlightedIndex !== undefined && (defaultHighlightedIndex === -1 || items[defaultHighlightedIndex] !== undefined && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex))) {
1934
1934
  return defaultHighlightedIndex;
1935
1935
  }
1936
1936
  if (selectedItem) {
@@ -2402,7 +2402,7 @@ function downshiftSelectReducer(state, action) {
2402
2402
 
2403
2403
  var _excluded$3 = ["onClick"],
2404
2404
  _excluded2$3 = ["onMouseLeave", "refKey", "ref", "aria-label"],
2405
- _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref", "disabled"],
2405
+ _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2406
2406
  _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2407
2407
  useSelect.stateChangeTypes = stateChangeTypes$3;
2408
2408
  function useSelect(userProps) {
@@ -2626,7 +2626,6 @@ function useSelect(userProps) {
2626
2626
  _ref4$refKey = _ref4.refKey,
2627
2627
  refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2628
2628
  ref = _ref4.ref,
2629
- disabled = _ref4.disabled,
2630
2629
  rest = _objectWithoutPropertiesLoose(_ref4, _excluded3$2);
2631
2630
  var _ref5 = otherProps != null ? otherProps : {},
2632
2631
  _ref5$suppressRefErro = _ref5.suppressRefError,
@@ -2657,8 +2656,8 @@ function useSelect(userProps) {
2657
2656
  };
2658
2657
  var toggleProps = _extends((_extends3 = {}, _extends3[refKey] = handleRefs(ref, function (toggleButtonNode) {
2659
2658
  toggleButtonRef.current = toggleButtonNode;
2660
- }), _extends3['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends3['aria-controls'] = elementIds.menuId, _extends3['aria-expanded'] = latest.current.state.isOpen, _extends3['aria-haspopup'] = 'listbox', _extends3['aria-labelledby'] = rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends3.id = elementIds.toggleButtonId, _extends3.role = 'combobox', _extends3.tabIndex = 0, _extends3.onBlur = callAllEventHandlers(onBlur, toggleButtonHandleBlur), _extends3.disabled = disabled, _extends3), rest);
2661
- if (!disabled) {
2659
+ }), _extends3['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends3['aria-controls'] = elementIds.menuId, _extends3['aria-expanded'] = latest.current.state.isOpen, _extends3['aria-haspopup'] = 'listbox', _extends3['aria-labelledby'] = rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends3.id = elementIds.toggleButtonId, _extends3.role = 'combobox', _extends3.tabIndex = 0, _extends3.onBlur = callAllEventHandlers(onBlur, toggleButtonHandleBlur), _extends3), rest);
2660
+ if (!rest.disabled) {
2662
2661
  /* istanbul ignore if (react-native) */
2663
2662
  {
2664
2663
  Object.assign(toggleProps, {
@@ -3020,8 +3019,8 @@ function downshiftUseComboboxReducer(state, action) {
3020
3019
 
3021
3020
  var _excluded$2 = ["onMouseLeave", "refKey", "ref", "aria-label"],
3022
3021
  _excluded2$2 = ["item", "index", "refKey", "ref", "onMouseMove", "onMouseDown", "onClick", "onPress", "disabled"],
3023
- _excluded3$1 = ["onClick", "onPress", "refKey", "ref", "disabled"],
3024
- _excluded4 = ["aria-label", "disabled", "onKeyDown", "onChange", "onInput", "onBlur", "onChangeText", "onClick", "refKey", "ref"];
3022
+ _excluded3$1 = ["onClick", "onPress", "refKey", "ref"],
3023
+ _excluded4 = ["aria-label", "onKeyDown", "onChange", "onInput", "onBlur", "onChangeText", "onClick", "refKey", "ref"];
3025
3024
  useCombobox.stateChangeTypes = stateChangeTypes$2;
3026
3025
  function useCombobox(userProps) {
3027
3026
  if (userProps === void 0) {
@@ -3278,7 +3277,6 @@ function useCombobox(userProps) {
3278
3277
  var _ref5$refKey = _ref5.refKey,
3279
3278
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
3280
3279
  ref = _ref5.ref,
3281
- disabled = _ref5.disabled,
3282
3280
  rest = _objectWithoutPropertiesLoose(_ref5, _excluded3$1);
3283
3281
  var latestState = latest.current.state;
3284
3282
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
@@ -3288,17 +3286,14 @@ function useCombobox(userProps) {
3288
3286
  };
3289
3287
  return _extends((_extends4 = {}, _extends4[refKey] = handleRefs(ref, function (toggleButtonNode) {
3290
3288
  toggleButtonRef.current = toggleButtonNode;
3291
- }), _extends4['aria-controls'] = elementIds.menuId, _extends4['aria-expanded'] = latestState.isOpen, _extends4.id = elementIds.toggleButtonId, _extends4.tabIndex = -1, _extends4), !disabled && _extends({}, {
3289
+ }), _extends4['aria-controls'] = elementIds.menuId, _extends4['aria-expanded'] = latestState.isOpen, _extends4.id = elementIds.toggleButtonId, _extends4.tabIndex = -1, _extends4), !rest.disabled && _extends({}, {
3292
3290
  onClick: callAllEventHandlers(onClick, toggleButtonHandleClick)
3293
- }), {
3294
- disabled: disabled
3295
- }, rest);
3291
+ }), rest);
3296
3292
  }, [dispatch, latest, elementIds]);
3297
3293
  var getInputProps = React.useCallback(function (inputProps, otherProps) {
3298
3294
  var _extends5;
3299
3295
  var _ref6 = inputProps != null ? inputProps : {},
3300
3296
  ariaLabel = _ref6['aria-label'],
3301
- disabled = _ref6.disabled,
3302
3297
  onKeyDown = _ref6.onKeyDown,
3303
3298
  onChange = _ref6.onChange,
3304
3299
  onInput = _ref6.onInput,
@@ -3346,13 +3341,13 @@ function useCombobox(userProps) {
3346
3341
  /* istanbul ignore next (preact) */
3347
3342
  var onChangeKey = 'onInput' ;
3348
3343
  var eventHandlers = {};
3349
- if (!disabled) {
3344
+ if (!rest.disabled) {
3350
3345
  var _eventHandlers;
3351
3346
  eventHandlers = (_eventHandlers = {}, _eventHandlers[onChangeKey] = callAllEventHandlers(onChange, onInput, inputHandleChange), _eventHandlers.onKeyDown = callAllEventHandlers(onKeyDown, inputHandleKeyDown), _eventHandlers.onBlur = callAllEventHandlers(onBlur, inputHandleBlur), _eventHandlers.onClick = callAllEventHandlers(onClick, inputHandleClick), _eventHandlers);
3352
3347
  }
3353
3348
  return _extends((_extends5 = {}, _extends5[refKey] = handleRefs(ref, function (inputNode) {
3354
3349
  inputRef.current = inputNode;
3355
- }), _extends5['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends5['aria-autocomplete'] = 'list', _extends5['aria-controls'] = elementIds.menuId, _extends5['aria-expanded'] = latestState.isOpen, _extends5['aria-labelledby'] = ariaLabel ? undefined : elementIds.labelId, _extends5['aria-label'] = ariaLabel, _extends5.autoComplete = 'off', _extends5.disabled = disabled, _extends5.id = elementIds.inputId, _extends5.role = 'combobox', _extends5.value = latestState.inputValue, _extends5), eventHandlers, rest);
3350
+ }), _extends5['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends5['aria-autocomplete'] = 'list', _extends5['aria-controls'] = elementIds.menuId, _extends5['aria-expanded'] = latestState.isOpen, _extends5['aria-labelledby'] = ariaLabel ? undefined : elementIds.labelId, _extends5['aria-label'] = ariaLabel, _extends5.autoComplete = 'off', _extends5.id = elementIds.inputId, _extends5.role = 'combobox', _extends5.value = latestState.inputValue, _extends5), eventHandlers, rest);
3356
3351
  }, [dispatch, elementIds, environment, inputKeyDownHandlers, latest, mouseAndTouchTrackers, setGetterPropCallInfo]);
3357
3352
 
3358
3353
  // returns
@@ -1905,10 +1905,10 @@ function getHighlightedIndexOnOpen(items, initialHighlightedIndex, defaultHighli
1905
1905
  }
1906
1906
 
1907
1907
  // initialHighlightedIndex will give value to highlightedIndex on initial state only.
1908
- if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && items[initialHighlightedIndex] && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex)) {
1908
+ if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && (initialHighlightedIndex === -1 || items[initialHighlightedIndex] !== undefined && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex))) {
1909
1909
  return initialHighlightedIndex;
1910
1910
  }
1911
- if (defaultHighlightedIndex !== undefined && items[defaultHighlightedIndex] && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex)) {
1911
+ if (defaultHighlightedIndex !== undefined && (defaultHighlightedIndex === -1 || items[defaultHighlightedIndex] !== undefined && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex))) {
1912
1912
  return defaultHighlightedIndex;
1913
1913
  }
1914
1914
  if (selectedItem) {
@@ -2380,7 +2380,7 @@ function downshiftSelectReducer(state, action) {
2380
2380
 
2381
2381
  var _excluded$3 = ["onClick"],
2382
2382
  _excluded2$3 = ["onMouseLeave", "refKey", "ref", "aria-label"],
2383
- _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref", "disabled"],
2383
+ _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2384
2384
  _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2385
2385
  useSelect.stateChangeTypes = stateChangeTypes$3;
2386
2386
  function useSelect(userProps) {
@@ -2604,7 +2604,6 @@ function useSelect(userProps) {
2604
2604
  _ref4$refKey = _ref4.refKey,
2605
2605
  refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2606
2606
  ref = _ref4.ref,
2607
- disabled = _ref4.disabled,
2608
2607
  rest = _objectWithoutPropertiesLoose(_ref4, _excluded3$2);
2609
2608
  var _ref5 = otherProps != null ? otherProps : {},
2610
2609
  _ref5$suppressRefErro = _ref5.suppressRefError,
@@ -2635,8 +2634,8 @@ function useSelect(userProps) {
2635
2634
  };
2636
2635
  var toggleProps = _extends((_extends3 = {}, _extends3[refKey] = handleRefs(ref, function (toggleButtonNode) {
2637
2636
  toggleButtonRef.current = toggleButtonNode;
2638
- }), _extends3['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends3['aria-controls'] = elementIds.menuId, _extends3['aria-expanded'] = latest.current.state.isOpen, _extends3['aria-haspopup'] = 'listbox', _extends3['aria-labelledby'] = rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends3.id = elementIds.toggleButtonId, _extends3.role = 'combobox', _extends3.tabIndex = 0, _extends3.onBlur = callAllEventHandlers(onBlur, toggleButtonHandleBlur), _extends3.disabled = disabled, _extends3), rest);
2639
- if (!disabled) {
2637
+ }), _extends3['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends3['aria-controls'] = elementIds.menuId, _extends3['aria-expanded'] = latest.current.state.isOpen, _extends3['aria-haspopup'] = 'listbox', _extends3['aria-labelledby'] = rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends3.id = elementIds.toggleButtonId, _extends3.role = 'combobox', _extends3.tabIndex = 0, _extends3.onBlur = callAllEventHandlers(onBlur, toggleButtonHandleBlur), _extends3), rest);
2638
+ if (!rest.disabled) {
2640
2639
  /* istanbul ignore if (react-native) */
2641
2640
  {
2642
2641
  Object.assign(toggleProps, {
@@ -2998,8 +2997,8 @@ function downshiftUseComboboxReducer(state, action) {
2998
2997
 
2999
2998
  var _excluded$2 = ["onMouseLeave", "refKey", "ref", "aria-label"],
3000
2999
  _excluded2$2 = ["item", "index", "refKey", "ref", "onMouseMove", "onMouseDown", "onClick", "onPress", "disabled"],
3001
- _excluded3$1 = ["onClick", "onPress", "refKey", "ref", "disabled"],
3002
- _excluded4 = ["aria-label", "disabled", "onKeyDown", "onChange", "onInput", "onBlur", "onChangeText", "onClick", "refKey", "ref"];
3000
+ _excluded3$1 = ["onClick", "onPress", "refKey", "ref"],
3001
+ _excluded4 = ["aria-label", "onKeyDown", "onChange", "onInput", "onBlur", "onChangeText", "onClick", "refKey", "ref"];
3003
3002
  useCombobox.stateChangeTypes = stateChangeTypes$2;
3004
3003
  function useCombobox(userProps) {
3005
3004
  if (userProps === void 0) {
@@ -3256,7 +3255,6 @@ function useCombobox(userProps) {
3256
3255
  var _ref5$refKey = _ref5.refKey,
3257
3256
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
3258
3257
  ref = _ref5.ref,
3259
- disabled = _ref5.disabled,
3260
3258
  rest = _objectWithoutPropertiesLoose(_ref5, _excluded3$1);
3261
3259
  var latestState = latest.current.state;
3262
3260
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
@@ -3266,17 +3264,14 @@ function useCombobox(userProps) {
3266
3264
  };
3267
3265
  return _extends((_extends4 = {}, _extends4[refKey] = handleRefs(ref, function (toggleButtonNode) {
3268
3266
  toggleButtonRef.current = toggleButtonNode;
3269
- }), _extends4['aria-controls'] = elementIds.menuId, _extends4['aria-expanded'] = latestState.isOpen, _extends4.id = elementIds.toggleButtonId, _extends4.tabIndex = -1, _extends4), !disabled && _extends({}, {
3267
+ }), _extends4['aria-controls'] = elementIds.menuId, _extends4['aria-expanded'] = latestState.isOpen, _extends4.id = elementIds.toggleButtonId, _extends4.tabIndex = -1, _extends4), !rest.disabled && _extends({}, {
3270
3268
  onClick: callAllEventHandlers(onClick, toggleButtonHandleClick)
3271
- }), {
3272
- disabled: disabled
3273
- }, rest);
3269
+ }), rest);
3274
3270
  }, [dispatch, latest, elementIds]);
3275
3271
  var getInputProps = useCallback(function (inputProps, otherProps) {
3276
3272
  var _extends5;
3277
3273
  var _ref6 = inputProps != null ? inputProps : {},
3278
3274
  ariaLabel = _ref6['aria-label'],
3279
- disabled = _ref6.disabled,
3280
3275
  onKeyDown = _ref6.onKeyDown,
3281
3276
  onChange = _ref6.onChange,
3282
3277
  onInput = _ref6.onInput,
@@ -3324,13 +3319,13 @@ function useCombobox(userProps) {
3324
3319
  /* istanbul ignore next (preact) */
3325
3320
  var onChangeKey = 'onInput' ;
3326
3321
  var eventHandlers = {};
3327
- if (!disabled) {
3322
+ if (!rest.disabled) {
3328
3323
  var _eventHandlers;
3329
3324
  eventHandlers = (_eventHandlers = {}, _eventHandlers[onChangeKey] = callAllEventHandlers(onChange, onInput, inputHandleChange), _eventHandlers.onKeyDown = callAllEventHandlers(onKeyDown, inputHandleKeyDown), _eventHandlers.onBlur = callAllEventHandlers(onBlur, inputHandleBlur), _eventHandlers.onClick = callAllEventHandlers(onClick, inputHandleClick), _eventHandlers);
3330
3325
  }
3331
3326
  return _extends((_extends5 = {}, _extends5[refKey] = handleRefs(ref, function (inputNode) {
3332
3327
  inputRef.current = inputNode;
3333
- }), _extends5['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends5['aria-autocomplete'] = 'list', _extends5['aria-controls'] = elementIds.menuId, _extends5['aria-expanded'] = latestState.isOpen, _extends5['aria-labelledby'] = ariaLabel ? undefined : elementIds.labelId, _extends5['aria-label'] = ariaLabel, _extends5.autoComplete = 'off', _extends5.disabled = disabled, _extends5.id = elementIds.inputId, _extends5.role = 'combobox', _extends5.value = latestState.inputValue, _extends5), eventHandlers, rest);
3328
+ }), _extends5['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends5['aria-autocomplete'] = 'list', _extends5['aria-controls'] = elementIds.menuId, _extends5['aria-expanded'] = latestState.isOpen, _extends5['aria-labelledby'] = ariaLabel ? undefined : elementIds.labelId, _extends5['aria-label'] = ariaLabel, _extends5.autoComplete = 'off', _extends5.id = elementIds.inputId, _extends5.role = 'combobox', _extends5.value = latestState.inputValue, _extends5), eventHandlers, rest);
3334
3329
  }, [dispatch, elementIds, environment, inputKeyDownHandlers, latest, mouseAndTouchTrackers, setGetterPropCallInfo]);
3335
3330
 
3336
3331
  // returns
@@ -2188,10 +2188,10 @@
2188
2188
  }
2189
2189
 
2190
2190
  // initialHighlightedIndex will give value to highlightedIndex on initial state only.
2191
- if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && items[initialHighlightedIndex] && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex)) {
2191
+ if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && (initialHighlightedIndex === -1 || items[initialHighlightedIndex] !== undefined && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex))) {
2192
2192
  return initialHighlightedIndex;
2193
2193
  }
2194
- if (defaultHighlightedIndex !== undefined && items[defaultHighlightedIndex] && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex)) {
2194
+ if (defaultHighlightedIndex !== undefined && (defaultHighlightedIndex === -1 || items[defaultHighlightedIndex] !== undefined && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex))) {
2195
2195
  return defaultHighlightedIndex;
2196
2196
  }
2197
2197
  if (selectedItem) {
@@ -2663,7 +2663,7 @@
2663
2663
 
2664
2664
  var _excluded$3 = ["onClick"],
2665
2665
  _excluded2$3 = ["onMouseLeave", "refKey", "ref", "aria-label"],
2666
- _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref", "disabled"],
2666
+ _excluded3$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2667
2667
  _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2668
2668
  useSelect.stateChangeTypes = stateChangeTypes$3;
2669
2669
  function useSelect(userProps) {
@@ -2887,7 +2887,6 @@
2887
2887
  _ref4$refKey = _ref4.refKey,
2888
2888
  refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2889
2889
  ref = _ref4.ref,
2890
- disabled = _ref4.disabled,
2891
2890
  rest = _objectWithoutPropertiesLoose(_ref4, _excluded3$2);
2892
2891
  var _ref5 = otherProps != null ? otherProps : {},
2893
2892
  _ref5$suppressRefErro = _ref5.suppressRefError,
@@ -2918,8 +2917,8 @@
2918
2917
  };
2919
2918
  var toggleProps = _extends((_extends3 = {}, _extends3[refKey] = handleRefs(ref, function (toggleButtonNode) {
2920
2919
  toggleButtonRef.current = toggleButtonNode;
2921
- }), _extends3['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends3['aria-controls'] = elementIds.menuId, _extends3['aria-expanded'] = latest.current.state.isOpen, _extends3['aria-haspopup'] = 'listbox', _extends3['aria-labelledby'] = rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends3.id = elementIds.toggleButtonId, _extends3.role = 'combobox', _extends3.tabIndex = 0, _extends3.onBlur = callAllEventHandlers(onBlur, toggleButtonHandleBlur), _extends3.disabled = disabled, _extends3), rest);
2922
- if (!disabled) {
2920
+ }), _extends3['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends3['aria-controls'] = elementIds.menuId, _extends3['aria-expanded'] = latest.current.state.isOpen, _extends3['aria-haspopup'] = 'listbox', _extends3['aria-labelledby'] = rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends3.id = elementIds.toggleButtonId, _extends3.role = 'combobox', _extends3.tabIndex = 0, _extends3.onBlur = callAllEventHandlers(onBlur, toggleButtonHandleBlur), _extends3), rest);
2921
+ if (!rest.disabled) {
2923
2922
  /* istanbul ignore if (react-native) */
2924
2923
  {
2925
2924
  Object.assign(toggleProps, {
@@ -3281,8 +3280,8 @@
3281
3280
 
3282
3281
  var _excluded$2 = ["onMouseLeave", "refKey", "ref", "aria-label"],
3283
3282
  _excluded2$2 = ["item", "index", "refKey", "ref", "onMouseMove", "onMouseDown", "onClick", "onPress", "disabled"],
3284
- _excluded3$1 = ["onClick", "onPress", "refKey", "ref", "disabled"],
3285
- _excluded4 = ["aria-label", "disabled", "onKeyDown", "onChange", "onInput", "onBlur", "onChangeText", "onClick", "refKey", "ref"];
3283
+ _excluded3$1 = ["onClick", "onPress", "refKey", "ref"],
3284
+ _excluded4 = ["aria-label", "onKeyDown", "onChange", "onInput", "onBlur", "onChangeText", "onClick", "refKey", "ref"];
3286
3285
  useCombobox.stateChangeTypes = stateChangeTypes$2;
3287
3286
  function useCombobox(userProps) {
3288
3287
  if (userProps === void 0) {
@@ -3539,7 +3538,6 @@
3539
3538
  var _ref5$refKey = _ref5.refKey,
3540
3539
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
3541
3540
  ref = _ref5.ref,
3542
- disabled = _ref5.disabled,
3543
3541
  rest = _objectWithoutPropertiesLoose(_ref5, _excluded3$1);
3544
3542
  var latestState = latest.current.state;
3545
3543
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
@@ -3549,17 +3547,14 @@
3549
3547
  };
3550
3548
  return _extends((_extends4 = {}, _extends4[refKey] = handleRefs(ref, function (toggleButtonNode) {
3551
3549
  toggleButtonRef.current = toggleButtonNode;
3552
- }), _extends4['aria-controls'] = elementIds.menuId, _extends4['aria-expanded'] = latestState.isOpen, _extends4.id = elementIds.toggleButtonId, _extends4.tabIndex = -1, _extends4), !disabled && _extends({}, {
3550
+ }), _extends4['aria-controls'] = elementIds.menuId, _extends4['aria-expanded'] = latestState.isOpen, _extends4.id = elementIds.toggleButtonId, _extends4.tabIndex = -1, _extends4), !rest.disabled && _extends({}, {
3553
3551
  onClick: callAllEventHandlers(onClick, toggleButtonHandleClick)
3554
- }), {
3555
- disabled: disabled
3556
- }, rest);
3552
+ }), rest);
3557
3553
  }, [dispatch, latest, elementIds]);
3558
3554
  var getInputProps = React.useCallback(function (inputProps, otherProps) {
3559
3555
  var _extends5;
3560
3556
  var _ref6 = inputProps != null ? inputProps : {},
3561
3557
  ariaLabel = _ref6['aria-label'],
3562
- disabled = _ref6.disabled,
3563
3558
  onKeyDown = _ref6.onKeyDown,
3564
3559
  onChange = _ref6.onChange,
3565
3560
  onInput = _ref6.onInput,
@@ -3607,13 +3602,13 @@
3607
3602
  /* istanbul ignore next (preact) */
3608
3603
  var onChangeKey = 'onInput' ;
3609
3604
  var eventHandlers = {};
3610
- if (!disabled) {
3605
+ if (!rest.disabled) {
3611
3606
  var _eventHandlers;
3612
3607
  eventHandlers = (_eventHandlers = {}, _eventHandlers[onChangeKey] = callAllEventHandlers(onChange, onInput, inputHandleChange), _eventHandlers.onKeyDown = callAllEventHandlers(onKeyDown, inputHandleKeyDown), _eventHandlers.onBlur = callAllEventHandlers(onBlur, inputHandleBlur), _eventHandlers.onClick = callAllEventHandlers(onClick, inputHandleClick), _eventHandlers);
3613
3608
  }
3614
3609
  return _extends((_extends5 = {}, _extends5[refKey] = handleRefs(ref, function (inputNode) {
3615
3610
  inputRef.current = inputNode;
3616
- }), _extends5['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends5['aria-autocomplete'] = 'list', _extends5['aria-controls'] = elementIds.menuId, _extends5['aria-expanded'] = latestState.isOpen, _extends5['aria-labelledby'] = ariaLabel ? undefined : elementIds.labelId, _extends5['aria-label'] = ariaLabel, _extends5.autoComplete = 'off', _extends5.disabled = disabled, _extends5.id = elementIds.inputId, _extends5.role = 'combobox', _extends5.value = latestState.inputValue, _extends5), eventHandlers, rest);
3611
+ }), _extends5['aria-activedescendant'] = latestState.isOpen && latestState.highlightedIndex > -1 ? elementIds.getItemId(latestState.highlightedIndex) : '', _extends5['aria-autocomplete'] = 'list', _extends5['aria-controls'] = elementIds.menuId, _extends5['aria-expanded'] = latestState.isOpen, _extends5['aria-labelledby'] = ariaLabel ? undefined : elementIds.labelId, _extends5['aria-label'] = ariaLabel, _extends5.autoComplete = 'off', _extends5.id = elementIds.inputId, _extends5.role = 'combobox', _extends5.value = latestState.inputValue, _extends5), eventHandlers, rest);
3617
3612
  }, [dispatch, elementIds, environment, inputKeyDownHandlers, latest, mouseAndTouchTrackers, setGetterPropCallInfo]);
3618
3613
 
3619
3614
  // returns