downshift 7.0.5 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "downshift",
-  "version": "7.0.5",
+  "version": "7.1.1",
   "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

@@ -1965,12 +1965,11 @@ function getItemIndexByCharacterKey(_a) {
     var keysSoFar = _a.keysSoFar, highlightedIndex = _a.highlightedIndex, items = _a.items, itemToString = _a.itemToString, getItemNodeFromIndex = _a.getItemNodeFromIndex;
     var lowerCasedKeysSoFar = keysSoFar.toLowerCase();
     for (var index = 0; index < items.length; index++) {
-        var offsetIndex = (index + highlightedIndex + 1) % items.length;
+        // if we already have a search query in progress, we also consider the current highlighted item.
+        var offsetIndex = (index + highlightedIndex + (keysSoFar.length < 2 ? 1 : 0)) % items.length;
         var item = items[offsetIndex];
         if (item !== undefined &&
-            itemToString(item)
-                .toLowerCase()
-                .startsWith(lowerCasedKeysSoFar)) {
+            itemToString(item).toLowerCase().startsWith(lowerCasedKeysSoFar)) {
             var element = getItemNodeFromIndex(offsetIndex);
             if (!(element === null || element === void 0 ? void 0 : element.hasAttribute('disabled'))) {
                 return offsetIndex;
@@ -2415,9 +2414,24 @@ function useSelect(userProps) {
     },
     ' '(event) {
       event.preventDefault();
-      dispatch({
-        type: latest.current.state.isOpen ? ToggleButtonKeyDownSpaceButton : ToggleButtonClick$1
-      });
+      const currentState = latest.current.state;
+      if (!currentState.isOpen) {
+        dispatch({
+          type: ToggleButtonClick$1
+        });
+        return;
+      }
+      if (currentState.inputValue) {
+        dispatch({
+          type: ToggleButtonKeyDownCharacter,
+          key: ' ',
+          getItemNodeFromIndex
+        });
+      } else {
+        dispatch({
+          type: ToggleButtonKeyDownSpaceButton
+        });
+      }
     }
   }), [dispatch, getItemNodeFromIndex, latest]);
 
@@ -3569,6 +3583,9 @@ function downshiftMultipleSelectionReducer(state, action) {
     case SelectedItemKeyDownBackspace:
     case SelectedItemKeyDownDelete:
       {
+        if (activeIndex < 0) {
+          break;
+        }
         let newActiveIndex = activeIndex;
         if (selectedItems.length === 1) {
           newActiveIndex = -1;
@@ -3607,17 +3624,18 @@ function downshiftMultipleSelectionReducer(state, action) {
       {
         let newActiveIndex = activeIndex;
         const selectedItemIndex = selectedItems.indexOf(selectedItem);
-        if (selectedItemIndex >= 0) {
-          if (selectedItems.length === 1) {
-            newActiveIndex = -1;
-          } else if (selectedItemIndex === selectedItems.length - 1) {
-            newActiveIndex = selectedItems.length - 2;
-          }
-          changes = {
-            selectedItems: [...selectedItems.slice(0, selectedItemIndex), ...selectedItems.slice(selectedItemIndex + 1)],
-            activeIndex: newActiveIndex
-          };
+        if (selectedItemIndex < 0) {
+          break;
         }
+        if (selectedItems.length === 1) {
+          newActiveIndex = -1;
+        } else if (selectedItemIndex === selectedItems.length - 1) {
+          newActiveIndex = selectedItems.length - 2;
+        }
+        changes = {
+          selectedItems: [...selectedItems.slice(0, selectedItemIndex), ...selectedItems.slice(selectedItemIndex + 1)],
+          activeIndex: newActiveIndex
+        };
         break;
       }
     case FunctionSetSelectedItems:

package/preact/dist/downshift.esm.js

@@ -1956,12 +1956,11 @@ function getItemIndexByCharacterKey(_a) {
     var keysSoFar = _a.keysSoFar, highlightedIndex = _a.highlightedIndex, items = _a.items, itemToString = _a.itemToString, getItemNodeFromIndex = _a.getItemNodeFromIndex;
     var lowerCasedKeysSoFar = keysSoFar.toLowerCase();
     for (var index = 0; index < items.length; index++) {
-        var offsetIndex = (index + highlightedIndex + 1) % items.length;
+        // if we already have a search query in progress, we also consider the current highlighted item.
+        var offsetIndex = (index + highlightedIndex + (keysSoFar.length < 2 ? 1 : 0)) % items.length;
         var item = items[offsetIndex];
         if (item !== undefined &&
-            itemToString(item)
-                .toLowerCase()
-                .startsWith(lowerCasedKeysSoFar)) {
+            itemToString(item).toLowerCase().startsWith(lowerCasedKeysSoFar)) {
             var element = getItemNodeFromIndex(offsetIndex);
             if (!(element === null || element === void 0 ? void 0 : element.hasAttribute('disabled'))) {
                 return offsetIndex;
@@ -2406,9 +2405,24 @@ function useSelect(userProps) {
     },
     ' '(event) {
       event.preventDefault();
-      dispatch({
-        type: latest.current.state.isOpen ? ToggleButtonKeyDownSpaceButton : ToggleButtonClick$1
-      });
+      const currentState = latest.current.state;
+      if (!currentState.isOpen) {
+        dispatch({
+          type: ToggleButtonClick$1
+        });
+        return;
+      }
+      if (currentState.inputValue) {
+        dispatch({
+          type: ToggleButtonKeyDownCharacter,
+          key: ' ',
+          getItemNodeFromIndex
+        });
+      } else {
+        dispatch({
+          type: ToggleButtonKeyDownSpaceButton
+        });
+      }
     }
   }), [dispatch, getItemNodeFromIndex, latest]);
 
@@ -3560,6 +3574,9 @@ function downshiftMultipleSelectionReducer(state, action) {
     case SelectedItemKeyDownBackspace:
     case SelectedItemKeyDownDelete:
       {
+        if (activeIndex < 0) {
+          break;
+        }
         let newActiveIndex = activeIndex;
         if (selectedItems.length === 1) {
           newActiveIndex = -1;
@@ -3598,17 +3615,18 @@ function downshiftMultipleSelectionReducer(state, action) {
       {
         let newActiveIndex = activeIndex;
         const selectedItemIndex = selectedItems.indexOf(selectedItem);
-        if (selectedItemIndex >= 0) {
-          if (selectedItems.length === 1) {
-            newActiveIndex = -1;
-          } else if (selectedItemIndex === selectedItems.length - 1) {
-            newActiveIndex = selectedItems.length - 2;
-          }
-          changes = {
-            selectedItems: [...selectedItems.slice(0, selectedItemIndex), ...selectedItems.slice(selectedItemIndex + 1)],
-            activeIndex: newActiveIndex
-          };
+        if (selectedItemIndex < 0) {
+          break;
         }
+        if (selectedItems.length === 1) {
+          newActiveIndex = -1;
+        } else if (selectedItemIndex === selectedItems.length - 1) {
+          newActiveIndex = selectedItems.length - 2;
+        }
+        changes = {
+          selectedItems: [...selectedItems.slice(0, selectedItemIndex), ...selectedItems.slice(selectedItemIndex + 1)],
+          activeIndex: newActiveIndex
+        };
         break;
       }
     case FunctionSetSelectedItems:

package/preact/dist/downshift.umd.js

@@ -2220,12 +2220,11 @@
       var keysSoFar = _a.keysSoFar, highlightedIndex = _a.highlightedIndex, items = _a.items, itemToString = _a.itemToString, getItemNodeFromIndex = _a.getItemNodeFromIndex;
       var lowerCasedKeysSoFar = keysSoFar.toLowerCase();
       for (var index = 0; index < items.length; index++) {
-          var offsetIndex = (index + highlightedIndex + 1) % items.length;
+          // if we already have a search query in progress, we also consider the current highlighted item.
+          var offsetIndex = (index + highlightedIndex + (keysSoFar.length < 2 ? 1 : 0)) % items.length;
           var item = items[offsetIndex];
           if (item !== undefined &&
-              itemToString(item)
-                  .toLowerCase()
-                  .startsWith(lowerCasedKeysSoFar)) {
+              itemToString(item).toLowerCase().startsWith(lowerCasedKeysSoFar)) {
               var element = getItemNodeFromIndex(offsetIndex);
               if (!(element === null || element === void 0 ? void 0 : element.hasAttribute('disabled'))) {
                   return offsetIndex;
@@ -2670,9 +2669,24 @@
       },
       ' '(event) {
         event.preventDefault();
-        dispatch({
-          type: latest.current.state.isOpen ? ToggleButtonKeyDownSpaceButton : ToggleButtonClick$1
-        });
+        const currentState = latest.current.state;
+        if (!currentState.isOpen) {
+          dispatch({
+            type: ToggleButtonClick$1
+          });
+          return;
+        }
+        if (currentState.inputValue) {
+          dispatch({
+            type: ToggleButtonKeyDownCharacter,
+            key: ' ',
+            getItemNodeFromIndex
+          });
+        } else {
+          dispatch({
+            type: ToggleButtonKeyDownSpaceButton
+          });
+        }
       }
     }), [dispatch, getItemNodeFromIndex, latest]);
 
@@ -3824,6 +3838,9 @@
       case SelectedItemKeyDownBackspace:
       case SelectedItemKeyDownDelete:
         {
+          if (activeIndex < 0) {
+            break;
+          }
           let newActiveIndex = activeIndex;
           if (selectedItems.length === 1) {
             newActiveIndex = -1;
@@ -3862,17 +3879,18 @@
         {
           let newActiveIndex = activeIndex;
           const selectedItemIndex = selectedItems.indexOf(selectedItem);
-          if (selectedItemIndex >= 0) {
-            if (selectedItems.length === 1) {
-              newActiveIndex = -1;
-            } else if (selectedItemIndex === selectedItems.length - 1) {
-              newActiveIndex = selectedItems.length - 2;
-            }
-            changes = {
-              selectedItems: [...selectedItems.slice(0, selectedItemIndex), ...selectedItems.slice(selectedItemIndex + 1)],
-              activeIndex: newActiveIndex
-            };
+          if (selectedItemIndex < 0) {
+            break;
           }
+          if (selectedItems.length === 1) {
+            newActiveIndex = -1;
+          } else if (selectedItemIndex === selectedItems.length - 1) {
+            newActiveIndex = selectedItems.length - 2;
+          }
+          changes = {
+            selectedItems: [...selectedItems.slice(0, selectedItemIndex), ...selectedItems.slice(selectedItemIndex + 1)],
+            activeIndex: newActiveIndex
+          };
           break;
         }
       case FunctionSetSelectedItems: