downshift 9.0.1 → 9.0.3

package/dist/downshift.cjs.js

@@ -1799,6 +1799,7 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   var items = props.items,
     initialHighlightedIndex = props.initialHighlightedIndex,
     defaultHighlightedIndex = props.defaultHighlightedIndex,
+    isItemDisabled = props.isItemDisabled,
     itemToKey = props.itemToKey;
   var selectedItem = state.selectedItem,
     highlightedIndex = state.highlightedIndex;
@@ -1807,10 +1808,10 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   }
 
   // initialHighlightedIndex will give value to highlightedIndex on initial state only.
-  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex) {
+  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex])) {
     return initialHighlightedIndex;
   }
-  if (defaultHighlightedIndex !== undefined) {
+  if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex])) {
     return defaultHighlightedIndex;
   }
   if (selectedItem) {
@@ -1818,10 +1819,13 @@ function getHighlightedIndexOnOpen(props, state, offset) {
       return itemToKey(selectedItem) === itemToKey(item);
     });
   }
-  if (offset === 0) {
-    return -1;
+  if (offset < 0 && !isItemDisabled(items[items.length - 1])) {
+    return items.length - 1;
+  }
+  if (offset > 0 && !isItemDisabled(items[0])) {
+    return 0;
   }
-  return offset < 0 ? items.length - 1 : 0;
+  return -1;
 }
 /**
  * Tracks mouse and touch events, such as mouseDown, touchMove and touchEnd.

package/dist/downshift.esm.js

@@ -1787,6 +1787,7 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   var items = props.items,
     initialHighlightedIndex = props.initialHighlightedIndex,
     defaultHighlightedIndex = props.defaultHighlightedIndex,
+    isItemDisabled = props.isItemDisabled,
     itemToKey = props.itemToKey;
   var selectedItem = state.selectedItem,
     highlightedIndex = state.highlightedIndex;
@@ -1795,10 +1796,10 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   }
 
   // initialHighlightedIndex will give value to highlightedIndex on initial state only.
-  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex) {
+  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex])) {
     return initialHighlightedIndex;
   }
-  if (defaultHighlightedIndex !== undefined) {
+  if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex])) {
     return defaultHighlightedIndex;
   }
   if (selectedItem) {
@@ -1806,10 +1807,13 @@ function getHighlightedIndexOnOpen(props, state, offset) {
       return itemToKey(selectedItem) === itemToKey(item);
     });
   }
-  if (offset === 0) {
-    return -1;
+  if (offset < 0 && !isItemDisabled(items[items.length - 1])) {
+    return items.length - 1;
+  }
+  if (offset > 0 && !isItemDisabled(items[0])) {
+    return 0;
   }
-  return offset < 0 ? items.length - 1 : 0;
+  return -1;
 }
 /**
  * Tracks mouse and touch events, such as mouseDown, touchMove and touchEnd.

package/dist/downshift.native.cjs.js

@@ -1695,6 +1695,7 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   var items = props.items,
     initialHighlightedIndex = props.initialHighlightedIndex,
     defaultHighlightedIndex = props.defaultHighlightedIndex,
+    isItemDisabled = props.isItemDisabled,
     itemToKey = props.itemToKey;
   var selectedItem = state.selectedItem,
     highlightedIndex = state.highlightedIndex;
@@ -1703,10 +1704,10 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   }
 
   // initialHighlightedIndex will give value to highlightedIndex on initial state only.
-  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex) {
+  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex])) {
     return initialHighlightedIndex;
   }
-  if (defaultHighlightedIndex !== undefined) {
+  if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex])) {
     return defaultHighlightedIndex;
   }
   if (selectedItem) {
@@ -1714,10 +1715,13 @@ function getHighlightedIndexOnOpen(props, state, offset) {
       return itemToKey(selectedItem) === itemToKey(item);
     });
   }
-  if (offset === 0) {
-    return -1;
+  if (offset < 0 && !isItemDisabled(items[items.length - 1])) {
+    return items.length - 1;
+  }
+  if (offset > 0 && !isItemDisabled(items[0])) {
+    return 0;
   }
-  return offset < 0 ? items.length - 1 : 0;
+  return -1;
 }
 /**
  * Tracks mouse and touch events, such as mouseDown, touchMove and touchEnd.

package/dist/downshift.nativeweb.cjs.js

@@ -1794,6 +1794,7 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   var items = props.items,
     initialHighlightedIndex = props.initialHighlightedIndex,
     defaultHighlightedIndex = props.defaultHighlightedIndex,
+    isItemDisabled = props.isItemDisabled,
     itemToKey = props.itemToKey;
   var selectedItem = state.selectedItem,
     highlightedIndex = state.highlightedIndex;
@@ -1802,10 +1803,10 @@ function getHighlightedIndexOnOpen(props, state, offset) {
   }
 
   // initialHighlightedIndex will give value to highlightedIndex on initial state only.
-  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex) {
+  if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex])) {
     return initialHighlightedIndex;
   }
-  if (defaultHighlightedIndex !== undefined) {
+  if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex])) {
     return defaultHighlightedIndex;
   }
   if (selectedItem) {
@@ -1813,10 +1814,13 @@ function getHighlightedIndexOnOpen(props, state, offset) {
       return itemToKey(selectedItem) === itemToKey(item);
     });
   }
-  if (offset === 0) {
-    return -1;
+  if (offset < 0 && !isItemDisabled(items[items.length - 1])) {
+    return items.length - 1;
+  }
+  if (offset > 0 && !isItemDisabled(items[0])) {
+    return 0;
   }
-  return offset < 0 ? items.length - 1 : 0;
+  return -1;
 }
 /**
  * Tracks mouse and touch events, such as mouseDown, touchMove and touchEnd.

package/dist/downshift.umd.js

@@ -3147,6 +3147,7 @@
     var items = props.items,
       initialHighlightedIndex = props.initialHighlightedIndex,
       defaultHighlightedIndex = props.defaultHighlightedIndex,
+      isItemDisabled = props.isItemDisabled,
       itemToKey = props.itemToKey;
     var selectedItem = state.selectedItem,
       highlightedIndex = state.highlightedIndex;
@@ -3155,10 +3156,10 @@
     }
 
     // initialHighlightedIndex will give value to highlightedIndex on initial state only.
-    if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex) {
+    if (initialHighlightedIndex !== undefined && highlightedIndex === initialHighlightedIndex && !isItemDisabled(items[initialHighlightedIndex])) {
       return initialHighlightedIndex;
     }
-    if (defaultHighlightedIndex !== undefined) {
+    if (defaultHighlightedIndex !== undefined && !isItemDisabled(items[defaultHighlightedIndex])) {
       return defaultHighlightedIndex;
     }
     if (selectedItem) {
@@ -3166,10 +3167,13 @@
         return itemToKey(selectedItem) === itemToKey(item);
       });
     }
-    if (offset === 0) {
-      return -1;
+    if (offset < 0 && !isItemDisabled(items[items.length - 1])) {
+      return items.length - 1;
+    }
+    if (offset > 0 && !isItemDisabled(items[0])) {
+      return 0;
     }
-    return offset < 0 ? items.length - 1 : 0;
+    return -1;
   }
   /**
    * Tracks mouse and touch events, such as mouseDown, touchMove and touchEnd.