downshift 9.0.4 → 9.0.5

package/dist/downshift.esm.js

@@ -2,7 +2,7 @@ import _objectWithoutPropertiesLoose from '@babel/runtime/helpers/esm/objectWith
 import _extends from '@babel/runtime/helpers/esm/extends';
 import _inheritsLoose from '@babel/runtime/helpers/esm/inheritsLoose';
 import PropTypes from 'prop-types';
-import React, { cloneElement, Component, useRef, useEffect, useCallback, useLayoutEffect, useReducer, useMemo } from 'react';
+import React, { cloneElement, Component, useRef, useEffect, useLayoutEffect, useCallback, useReducer, useMemo } from 'react';
 import { isForwardRef } from 'react-is';
 import { compute } from 'compute-scroll-into-view';
 import { __assign } from 'tslib';
@@ -470,23 +470,23 @@ var touchEnd = process.env.NODE_ENV !== "production" ? '__autocomplete_touchend_
 
 var stateChangeTypes$3 = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  unknown: unknown,
-  mouseUp: mouseUp,
+  blurButton: blurButton,
+  blurInput: blurInput,
+  changeInput: changeInput,
+  clickButton: clickButton,
+  clickItem: clickItem,
+  controlledPropUpdatedSelectedItem: controlledPropUpdatedSelectedItem,
   itemMouseEnter: itemMouseEnter,
-  keyDownArrowUp: keyDownArrowUp,
   keyDownArrowDown: keyDownArrowDown,
-  keyDownEscape: keyDownEscape,
+  keyDownArrowUp: keyDownArrowUp,
+  keyDownEnd: keyDownEnd,
   keyDownEnter: keyDownEnter,
+  keyDownEscape: keyDownEscape,
   keyDownHome: keyDownHome,
-  keyDownEnd: keyDownEnd,
-  clickItem: clickItem,
-  blurInput: blurInput,
-  changeInput: changeInput,
   keyDownSpaceButton: keyDownSpaceButton,
-  clickButton: clickButton,
-  blurButton: blurButton,
-  controlledPropUpdatedSelectedItem: controlledPropUpdatedSelectedItem,
-  touchEnd: touchEnd
+  mouseUp: mouseUp,
+  touchEnd: touchEnd,
+  unknown: unknown
 });
 
 var _excluded$3 = ["refKey", "ref"],
@@ -1772,7 +1772,7 @@ function getInitialValue$1(props, propKey, defaultStateValues) {
 function getInitialState$2(props) {
   var selectedItem = getInitialValue$1(props, 'selectedItem');
   var isOpen = getInitialValue$1(props, 'isOpen');
-  var highlightedIndex = getInitialValue$1(props, 'highlightedIndex');
+  var highlightedIndex = getInitialHighlightedIndex(props);
   var inputValue = getInitialValue$1(props, 'inputValue');
   return {
     highlightedIndex: highlightedIndex < 0 && selectedItem && isOpen ? props.items.findIndex(function (item) {
@@ -1796,10 +1796,10 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   }
 
   // initialHighlightedIndex will give value to highlightedIndex on initial state only.
-  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex])) {
+  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex], initialHighlightedIndex)) {
     return initialHighlightedIndex;
   }
-  if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex])) {
+  if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex], defaultHighlightedIndex)) {
     return defaultHighlightedIndex;
   }
   if (selectedItem) {
@@ -1807,10 +1807,10 @@ function getHighlightedIndexOnOpen(props, state, offset) {
       return itemToKey(selectedItem) === itemToKey(item);
     });
   }
-  if (offset < 0 && !isItemDisabled(items[items.length - 1])) {
+  if (offset < 0 && !isItemDisabled(items[items.length - 1], items.length - 1)) {
     return items.length - 1;
   }
-  if (offset > 0 && !isItemDisabled(items[0])) {
+  if (offset > 0 && !isItemDisabled(items[0], 0)) {
     return 0;
   }
   return -1;
@@ -2058,6 +2058,34 @@ function useIsInitialMount() {
   return isInitialMountRef.current;
 }
 
+/**
+ * Returns the new highlightedIndex based on the defaultHighlightedIndex prop, if it's not disabled.
+ *
+ * @param {Object} props Props from useCombobox or useSelect.
+ * @returns {number} The highlighted index.
+ */
+function getDefaultHighlightedIndex(props) {
+  var highlightedIndex = getDefaultValue$1(props, 'highlightedIndex');
+  if (highlightedIndex > -1 && props.isItemDisabled(props.items[highlightedIndex], highlightedIndex)) {
+    return -1;
+  }
+  return highlightedIndex;
+}
+
+/**
+ * Returns the new highlightedIndex based on the initialHighlightedIndex prop, if not disabled.
+ *
+ * @param {Object} props Props from useCombobox or useSelect.
+ * @returns {number} The highlighted index.
+ */
+function getInitialHighlightedIndex(props) {
+  var highlightedIndex = getInitialValue$1(props, 'highlightedIndex');
+  if (highlightedIndex > -1 && props.isItemDisabled(props.items[highlightedIndex], highlightedIndex)) {
+    return -1;
+  }
+  return highlightedIndex;
+}
+
 // Shared between all exports.
 var commonPropTypes = {
   environment: PropTypes.shape({
@@ -2135,7 +2163,7 @@ function downshiftCommonReducer(state, action, stateChangeTypes) {
       break;
     case stateChangeTypes.FunctionSetHighlightedIndex:
       changes = {
-        highlightedIndex: action.highlightedIndex
+        highlightedIndex: props.isItemDisabled(props.items[action.highlightedIndex], action.highlightedIndex) ? -1 : action.highlightedIndex
       };
       break;
     case stateChangeTypes.FunctionSetInputValue:
@@ -2145,7 +2173,7 @@ function downshiftCommonReducer(state, action, stateChangeTypes) {
       break;
     case stateChangeTypes.FunctionReset:
       changes = {
-        highlightedIndex: getDefaultValue$1(props, 'highlightedIndex'),
+        highlightedIndex: getDefaultHighlightedIndex(props),
         isOpen: getDefaultValue$1(props, 'isOpen'),
         selectedItem: getDefaultValue$1(props, 'selectedItem'),
         inputValue: getDefaultValue$1(props, 'inputValue')
@@ -2211,28 +2239,28 @@ var FunctionReset$2 = process.env.NODE_ENV !== "production" ? '__function_reset_
 
 var stateChangeTypes$2 = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  FunctionCloseMenu: FunctionCloseMenu$1,
+  FunctionOpenMenu: FunctionOpenMenu$1,
+  FunctionReset: FunctionReset$2,
+  FunctionSelectItem: FunctionSelectItem$1,
+  FunctionSetHighlightedIndex: FunctionSetHighlightedIndex$1,
+  FunctionSetInputValue: FunctionSetInputValue$1,
+  FunctionToggleMenu: FunctionToggleMenu$1,
+  ItemClick: ItemClick$1,
+  ItemMouseMove: ItemMouseMove$1,
+  MenuMouseLeave: MenuMouseLeave$1,
+  ToggleButtonBlur: ToggleButtonBlur,
   ToggleButtonClick: ToggleButtonClick$1,
   ToggleButtonKeyDownArrowDown: ToggleButtonKeyDownArrowDown,
   ToggleButtonKeyDownArrowUp: ToggleButtonKeyDownArrowUp,
   ToggleButtonKeyDownCharacter: ToggleButtonKeyDownCharacter,
-  ToggleButtonKeyDownEscape: ToggleButtonKeyDownEscape,
-  ToggleButtonKeyDownHome: ToggleButtonKeyDownHome,
   ToggleButtonKeyDownEnd: ToggleButtonKeyDownEnd,
   ToggleButtonKeyDownEnter: ToggleButtonKeyDownEnter,
-  ToggleButtonKeyDownSpaceButton: ToggleButtonKeyDownSpaceButton,
-  ToggleButtonKeyDownPageUp: ToggleButtonKeyDownPageUp,
+  ToggleButtonKeyDownEscape: ToggleButtonKeyDownEscape,
+  ToggleButtonKeyDownHome: ToggleButtonKeyDownHome,
   ToggleButtonKeyDownPageDown: ToggleButtonKeyDownPageDown,
-  ToggleButtonBlur: ToggleButtonBlur,
-  MenuMouseLeave: MenuMouseLeave$1,
-  ItemMouseMove: ItemMouseMove$1,
-  ItemClick: ItemClick$1,
-  FunctionToggleMenu: FunctionToggleMenu$1,
-  FunctionOpenMenu: FunctionOpenMenu$1,
-  FunctionCloseMenu: FunctionCloseMenu$1,
-  FunctionSetHighlightedIndex: FunctionSetHighlightedIndex$1,
-  FunctionSelectItem: FunctionSelectItem$1,
-  FunctionSetInputValue: FunctionSetInputValue$1,
-  FunctionReset: FunctionReset$2
+  ToggleButtonKeyDownPageUp: ToggleButtonKeyDownPageUp,
+  ToggleButtonKeyDownSpaceButton: ToggleButtonKeyDownSpaceButton
 });
 
 /* eslint-disable complexity */
@@ -2246,7 +2274,7 @@ function downshiftSelectReducer(state, action) {
     case ItemClick$1:
       changes = {
         isOpen: getDefaultValue$1(props, 'isOpen'),
-        highlightedIndex: getDefaultValue$1(props, 'highlightedIndex'),
+        highlightedIndex: getDefaultHighlightedIndex(props),
         selectedItem: props.items[action.index]
       };
       break;
@@ -2762,29 +2790,29 @@ var ControlledPropUpdatedSelectedItem = process.env.NODE_ENV !== "production" ?
 
 var stateChangeTypes$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  ControlledPropUpdatedSelectedItem: ControlledPropUpdatedSelectedItem,
+  FunctionCloseMenu: FunctionCloseMenu,
+  FunctionOpenMenu: FunctionOpenMenu,
+  FunctionReset: FunctionReset$1,
+  FunctionSelectItem: FunctionSelectItem,
+  FunctionSetHighlightedIndex: FunctionSetHighlightedIndex,
+  FunctionSetInputValue: FunctionSetInputValue,
+  FunctionToggleMenu: FunctionToggleMenu,
+  InputBlur: InputBlur,
+  InputChange: InputChange,
+  InputClick: InputClick,
   InputKeyDownArrowDown: InputKeyDownArrowDown,
   InputKeyDownArrowUp: InputKeyDownArrowUp,
+  InputKeyDownEnd: InputKeyDownEnd,
+  InputKeyDownEnter: InputKeyDownEnter,
   InputKeyDownEscape: InputKeyDownEscape,
   InputKeyDownHome: InputKeyDownHome,
-  InputKeyDownEnd: InputKeyDownEnd,
-  InputKeyDownPageUp: InputKeyDownPageUp,
   InputKeyDownPageDown: InputKeyDownPageDown,
-  InputKeyDownEnter: InputKeyDownEnter,
-  InputChange: InputChange,
-  InputBlur: InputBlur,
-  InputClick: InputClick,
-  MenuMouseLeave: MenuMouseLeave,
-  ItemMouseMove: ItemMouseMove,
+  InputKeyDownPageUp: InputKeyDownPageUp,
   ItemClick: ItemClick,
-  ToggleButtonClick: ToggleButtonClick,
-  FunctionToggleMenu: FunctionToggleMenu,
-  FunctionOpenMenu: FunctionOpenMenu,
-  FunctionCloseMenu: FunctionCloseMenu,
-  FunctionSetHighlightedIndex: FunctionSetHighlightedIndex,
-  FunctionSelectItem: FunctionSelectItem,
-  FunctionSetInputValue: FunctionSetInputValue,
-  FunctionReset: FunctionReset$1,
-  ControlledPropUpdatedSelectedItem: ControlledPropUpdatedSelectedItem
+  ItemMouseMove: ItemMouseMove,
+  MenuMouseLeave: MenuMouseLeave,
+  ToggleButtonClick: ToggleButtonClick
 });
 
 function getInitialState$1(props) {
@@ -2872,7 +2900,7 @@ function downshiftUseComboboxReducer(state, action) {
     case ItemClick:
       changes = {
         isOpen: getDefaultValue$1(props, 'isOpen'),
-        highlightedIndex: getDefaultValue$1(props, 'highlightedIndex'),
+        highlightedIndex: getDefaultHighlightedIndex(props),
         selectedItem: props.items[action.index],
         inputValue: props.itemToString(props.items[action.index])
       };
@@ -2949,7 +2977,7 @@ function downshiftUseComboboxReducer(state, action) {
     case InputChange:
       changes = {
         isOpen: true,
-        highlightedIndex: getDefaultValue$1(props, 'highlightedIndex'),
+        highlightedIndex: getDefaultHighlightedIndex(props),
         inputValue: action.inputValue
       };
       break;
@@ -3507,19 +3535,19 @@ var FunctionReset = process.env.NODE_ENV !== "production" ? '__function_reset__'
 
 var stateChangeTypes = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  SelectedItemClick: SelectedItemClick,
-  SelectedItemKeyDownDelete: SelectedItemKeyDownDelete,
-  SelectedItemKeyDownBackspace: SelectedItemKeyDownBackspace,
-  SelectedItemKeyDownNavigationNext: SelectedItemKeyDownNavigationNext,
-  SelectedItemKeyDownNavigationPrevious: SelectedItemKeyDownNavigationPrevious,
-  DropdownKeyDownNavigationPrevious: DropdownKeyDownNavigationPrevious,
-  DropdownKeyDownBackspace: DropdownKeyDownBackspace,
   DropdownClick: DropdownClick,
+  DropdownKeyDownBackspace: DropdownKeyDownBackspace,
+  DropdownKeyDownNavigationPrevious: DropdownKeyDownNavigationPrevious,
   FunctionAddSelectedItem: FunctionAddSelectedItem,
   FunctionRemoveSelectedItem: FunctionRemoveSelectedItem,
-  FunctionSetSelectedItems: FunctionSetSelectedItems,
+  FunctionReset: FunctionReset,
   FunctionSetActiveIndex: FunctionSetActiveIndex,
-  FunctionReset: FunctionReset
+  FunctionSetSelectedItems: FunctionSetSelectedItems,
+  SelectedItemClick: SelectedItemClick,
+  SelectedItemKeyDownBackspace: SelectedItemKeyDownBackspace,
+  SelectedItemKeyDownDelete: SelectedItemKeyDownDelete,
+  SelectedItemKeyDownNavigationNext: SelectedItemKeyDownNavigationNext,
+  SelectedItemKeyDownNavigationPrevious: SelectedItemKeyDownNavigationPrevious
 });
 
 /* eslint-disable complexity */