downshift 6.0.16 → 6.1.0

package/README.md

@@ -57,7 +57,7 @@ has been around for a while. It established a successful pattern for making
 components accessible and functional while giving developers complete freedom
 when building the UI.
 
-The `README` on this page convers only the component while each hook has its own
+The `README` on this page covers only the component while each hook has its own
 `README` page. You can navigate to the [hooks page][hooks-readme] or go directly
 to the hook you need by using the links in the list above.
 

package/dist/downshift.cjs.js

@@ -867,12 +867,16 @@ var Downshift = /*#__PURE__*/function () {
         Home: function Home(event) {
           var _this4 = this;
 
-          event.preventDefault();
-          var itemCount = this.getItemCount();
-
           var _this$getState3 = this.getState(),
               isOpen = _this$getState3.isOpen;
 
+          if (!isOpen) {
+            return;
+          }
+
+          event.preventDefault();
+          var itemCount = this.getItemCount();
+
           if (itemCount <= 0 || !isOpen) {
             return;
           } // get next non-disabled starting downwards from 0 if that's disabled.
@@ -888,12 +892,16 @@ var Downshift = /*#__PURE__*/function () {
         End: function End(event) {
           var _this5 = this;
 
-          event.preventDefault();
-          var itemCount = this.getItemCount();
-
           var _this$getState4 = this.getState(),
               isOpen = _this$getState4.isOpen;
 
+          if (!isOpen) {
+            return;
+          }
+
+          event.preventDefault();
+          var itemCount = this.getItemCount();
+
           if (itemCount <= 0 || !isOpen) {
             return;
           } // get next non-disabled starting upwards from last index if that's disabled.
@@ -3162,7 +3170,7 @@ function downshiftUseComboboxReducer(state, action) {
       } else {
         changes = {
           highlightedIndex: getHighlightedIndexOnOpen(props, state, 1, action.getItemNodeFromIndex),
-          isOpen: true
+          isOpen: props.items.length >= 0
         };
       }
 
@@ -3176,7 +3184,7 @@ function downshiftUseComboboxReducer(state, action) {
       } else {
         changes = {
           highlightedIndex: getHighlightedIndexOnOpen(props, state, -1, action.getItemNodeFromIndex),
-          isOpen: true
+          isOpen: props.items.length >= 0
         };
       }
 
@@ -3202,28 +3210,25 @@ function downshiftUseComboboxReducer(state, action) {
       break;
 
     case InputKeyDownHome:
-      changes = _extends__default['default']({}, state.isOpen && {
+      changes = {
         highlightedIndex: getNextNonDisabledIndex(1, 0, props.items.length, action.getItemNodeFromIndex, false)
-      });
+      };
       break;
 
     case InputKeyDownEnd:
-      changes = _extends__default['default']({}, state.isOpen && {
+      changes = {
         highlightedIndex: getNextNonDisabledIndex(-1, props.items.length - 1, props.items.length, action.getItemNodeFromIndex, false)
-      });
+      };
       break;
 
     case InputBlur:
-      if (state.isOpen) {
-        changes = _extends__default['default']({
-          isOpen: false,
-          highlightedIndex: -1
-        }, state.highlightedIndex >= 0 && action.selectItem && {
-          selectedItem: props.items[state.highlightedIndex],
-          inputValue: props.itemToString(props.items[state.highlightedIndex])
-        });
-      }
-
+      changes = _extends__default['default']({
+        isOpen: false,
+        highlightedIndex: -1
+      }, state.highlightedIndex >= 0 && action.selectItem && {
+        selectedItem: props.items[state.highlightedIndex],
+        inputValue: props.itemToString(props.items[state.highlightedIndex])
+      });
       break;
 
     case InputChange:
@@ -3390,6 +3395,10 @@ function useCombobox(userProps) {
         });
       },
       Home: function Home(event) {
+        if (!latest.current.state.isOpen) {
+          return;
+        }
+
         event.preventDefault();
         dispatch({
           type: InputKeyDownHome,
@@ -3397,6 +3406,10 @@ function useCombobox(userProps) {
         });
       },
       End: function End(event) {
+        if (!latest.current.state.isOpen) {
+          return;
+        }
+
         event.preventDefault();
         dispatch({
           type: InputKeyDownEnd,
@@ -3404,22 +3417,23 @@ function useCombobox(userProps) {
         });
       },
       Escape: function Escape() {
-        dispatch({
-          type: InputKeyDownEscape
-        });
-      },
-      Enter: function Enter(event) {
-        // if IME composing, wait for next Enter keydown event.
-        if (event.which === 229) {
-          return;
-        }
-
         var latestState = latest.current.state;
 
-        if (latestState.isOpen) {
-          event.preventDefault();
+        if (latestState.isOpen || latestState.inputValue || latestState.selectedItem || latestState.highlightedIndex > -1) {
+          dispatch({
+            type: InputKeyDownEscape
+          });
         }
+      },
+      Enter: function Enter(event) {
+        var latestState = latest.current.state; // if closed or no highlighted index, do nothing.
 
+        if (!latestState.isOpen || latestState.highlightedIndex < 0 || event.which === 229 // if IME composing, wait for next Enter keydown event.
+        ) {
+            return;
+          }
+
+        event.preventDefault();
         dispatch({
           type: InputKeyDownEnter,
           getItemNodeFromIndex: getItemNodeFromIndex
@@ -3579,7 +3593,7 @@ function useCombobox(userProps) {
 
     var inputHandleBlur = function inputHandleBlur() {
       /* istanbul ignore else */
-      if (!mouseAndTouchTrackersRef.current.isMouseDown) {
+      if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
         dispatch({
           type: InputBlur,
           selectItem: true

package/dist/downshift.esm.js

@@ -854,12 +854,16 @@ var Downshift = /*#__PURE__*/function () {
         Home: function Home(event) {
           var _this4 = this;
 
-          event.preventDefault();
-          var itemCount = this.getItemCount();
-
           var _this$getState3 = this.getState(),
               isOpen = _this$getState3.isOpen;
 
+          if (!isOpen) {
+            return;
+          }
+
+          event.preventDefault();
+          var itemCount = this.getItemCount();
+
           if (itemCount <= 0 || !isOpen) {
             return;
           } // get next non-disabled starting downwards from 0 if that's disabled.
@@ -875,12 +879,16 @@ var Downshift = /*#__PURE__*/function () {
         End: function End(event) {
           var _this5 = this;
 
-          event.preventDefault();
-          var itemCount = this.getItemCount();
-
           var _this$getState4 = this.getState(),
               isOpen = _this$getState4.isOpen;
 
+          if (!isOpen) {
+            return;
+          }
+
+          event.preventDefault();
+          var itemCount = this.getItemCount();
+
           if (itemCount <= 0 || !isOpen) {
             return;
           } // get next non-disabled starting upwards from last index if that's disabled.
@@ -3149,7 +3157,7 @@ function downshiftUseComboboxReducer(state, action) {
       } else {
         changes = {
           highlightedIndex: getHighlightedIndexOnOpen(props, state, 1, action.getItemNodeFromIndex),
-          isOpen: true
+          isOpen: props.items.length >= 0
         };
       }
 
@@ -3163,7 +3171,7 @@ function downshiftUseComboboxReducer(state, action) {
       } else {
         changes = {
           highlightedIndex: getHighlightedIndexOnOpen(props, state, -1, action.getItemNodeFromIndex),
-          isOpen: true
+          isOpen: props.items.length >= 0
         };
       }
 
@@ -3189,28 +3197,25 @@ function downshiftUseComboboxReducer(state, action) {
       break;
 
     case InputKeyDownHome:
-      changes = _extends({}, state.isOpen && {
+      changes = {
         highlightedIndex: getNextNonDisabledIndex(1, 0, props.items.length, action.getItemNodeFromIndex, false)
-      });
+      };
       break;
 
     case InputKeyDownEnd:
-      changes = _extends({}, state.isOpen && {
+      changes = {
         highlightedIndex: getNextNonDisabledIndex(-1, props.items.length - 1, props.items.length, action.getItemNodeFromIndex, false)
-      });
+      };
       break;
 
     case InputBlur:
-      if (state.isOpen) {
-        changes = _extends({
-          isOpen: false,
-          highlightedIndex: -1
-        }, state.highlightedIndex >= 0 && action.selectItem && {
-          selectedItem: props.items[state.highlightedIndex],
-          inputValue: props.itemToString(props.items[state.highlightedIndex])
-        });
-      }
-
+      changes = _extends({
+        isOpen: false,
+        highlightedIndex: -1
+      }, state.highlightedIndex >= 0 && action.selectItem && {
+        selectedItem: props.items[state.highlightedIndex],
+        inputValue: props.itemToString(props.items[state.highlightedIndex])
+      });
       break;
 
     case InputChange:
@@ -3377,6 +3382,10 @@ function useCombobox(userProps) {
         });
       },
       Home: function Home(event) {
+        if (!latest.current.state.isOpen) {
+          return;
+        }
+
         event.preventDefault();
         dispatch({
           type: InputKeyDownHome,
@@ -3384,6 +3393,10 @@ function useCombobox(userProps) {
         });
       },
       End: function End(event) {
+        if (!latest.current.state.isOpen) {
+          return;
+        }
+
         event.preventDefault();
         dispatch({
           type: InputKeyDownEnd,
@@ -3391,22 +3404,23 @@ function useCombobox(userProps) {
         });
       },
       Escape: function Escape() {
-        dispatch({
-          type: InputKeyDownEscape
-        });
-      },
-      Enter: function Enter(event) {
-        // if IME composing, wait for next Enter keydown event.
-        if (event.which === 229) {
-          return;
-        }
-
         var latestState = latest.current.state;
 
-        if (latestState.isOpen) {
-          event.preventDefault();
+        if (latestState.isOpen || latestState.inputValue || latestState.selectedItem || latestState.highlightedIndex > -1) {
+          dispatch({
+            type: InputKeyDownEscape
+          });
         }
+      },
+      Enter: function Enter(event) {
+        var latestState = latest.current.state; // if closed or no highlighted index, do nothing.
 
+        if (!latestState.isOpen || latestState.highlightedIndex < 0 || event.which === 229 // if IME composing, wait for next Enter keydown event.
+        ) {
+            return;
+          }
+
+        event.preventDefault();
         dispatch({
           type: InputKeyDownEnter,
           getItemNodeFromIndex: getItemNodeFromIndex
@@ -3566,7 +3580,7 @@ function useCombobox(userProps) {
 
     var inputHandleBlur = function inputHandleBlur() {
       /* istanbul ignore else */
-      if (!mouseAndTouchTrackersRef.current.isMouseDown) {
+      if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
         dispatch({
           type: InputBlur,
           selectItem: true

package/dist/downshift.native.cjs.js

@@ -867,12 +867,16 @@ var Downshift = /*#__PURE__*/function () {
         Home: function Home(event) {
           var _this4 = this;
 
-          event.preventDefault();
-          var itemCount = this.getItemCount();
-
           var _this$getState3 = this.getState(),
               isOpen = _this$getState3.isOpen;
 
+          if (!isOpen) {
+            return;
+          }
+
+          event.preventDefault();
+          var itemCount = this.getItemCount();
+
           if (itemCount <= 0 || !isOpen) {
             return;
           } // get next non-disabled starting downwards from 0 if that's disabled.
@@ -888,12 +892,16 @@ var Downshift = /*#__PURE__*/function () {
         End: function End(event) {
           var _this5 = this;
 
-          event.preventDefault();
-          var itemCount = this.getItemCount();
-
           var _this$getState4 = this.getState(),
               isOpen = _this$getState4.isOpen;
 
+          if (!isOpen) {
+            return;
+          }
+
+          event.preventDefault();
+          var itemCount = this.getItemCount();
+
           if (itemCount <= 0 || !isOpen) {
             return;
           } // get next non-disabled starting upwards from last index if that's disabled.
@@ -3095,7 +3103,7 @@ function downshiftUseComboboxReducer(state, action) {
       } else {
         changes = {
           highlightedIndex: getHighlightedIndexOnOpen(props, state, 1, action.getItemNodeFromIndex),
-          isOpen: true
+          isOpen: props.items.length >= 0
         };
       }
 
@@ -3109,7 +3117,7 @@ function downshiftUseComboboxReducer(state, action) {
       } else {
         changes = {
           highlightedIndex: getHighlightedIndexOnOpen(props, state, -1, action.getItemNodeFromIndex),
-          isOpen: true
+          isOpen: props.items.length >= 0
         };
       }
 
@@ -3135,28 +3143,25 @@ function downshiftUseComboboxReducer(state, action) {
       break;
 
     case InputKeyDownHome:
-      changes = _extends__default['default']({}, state.isOpen && {
+      changes = {
         highlightedIndex: getNextNonDisabledIndex(1, 0, props.items.length, action.getItemNodeFromIndex, false)
-      });
+      };
       break;
 
     case InputKeyDownEnd:
-      changes = _extends__default['default']({}, state.isOpen && {
+      changes = {
         highlightedIndex: getNextNonDisabledIndex(-1, props.items.length - 1, props.items.length, action.getItemNodeFromIndex, false)
-      });
+      };
       break;
 
     case InputBlur:
-      if (state.isOpen) {
-        changes = _extends__default['default']({
-          isOpen: false,
-          highlightedIndex: -1
-        }, state.highlightedIndex >= 0 && action.selectItem && {
-          selectedItem: props.items[state.highlightedIndex],
-          inputValue: props.itemToString(props.items[state.highlightedIndex])
-        });
-      }
-
+      changes = _extends__default['default']({
+        isOpen: false,
+        highlightedIndex: -1
+      }, state.highlightedIndex >= 0 && action.selectItem && {
+        selectedItem: props.items[state.highlightedIndex],
+        inputValue: props.itemToString(props.items[state.highlightedIndex])
+      });
       break;
 
     case InputChange:
@@ -3323,6 +3328,10 @@ function useCombobox(userProps) {
         });
       },
       Home: function Home(event) {
+        if (!latest.current.state.isOpen) {
+          return;
+        }
+
         event.preventDefault();
         dispatch({
           type: InputKeyDownHome,
@@ -3330,6 +3339,10 @@ function useCombobox(userProps) {
         });
       },
       End: function End(event) {
+        if (!latest.current.state.isOpen) {
+          return;
+        }
+
         event.preventDefault();
         dispatch({
           type: InputKeyDownEnd,
@@ -3337,22 +3350,23 @@ function useCombobox(userProps) {
         });
       },
       Escape: function Escape() {
-        dispatch({
-          type: InputKeyDownEscape
-        });
-      },
-      Enter: function Enter(event) {
-        // if IME composing, wait for next Enter keydown event.
-        if (event.which === 229) {
-          return;
-        }
-
         var latestState = latest.current.state;
 
-        if (latestState.isOpen) {
-          event.preventDefault();
+        if (latestState.isOpen || latestState.inputValue || latestState.selectedItem || latestState.highlightedIndex > -1) {
+          dispatch({
+            type: InputKeyDownEscape
+          });
         }
+      },
+      Enter: function Enter(event) {
+        var latestState = latest.current.state; // if closed or no highlighted index, do nothing.
 
+        if (!latestState.isOpen || latestState.highlightedIndex < 0 || event.which === 229 // if IME composing, wait for next Enter keydown event.
+        ) {
+            return;
+          }
+
+        event.preventDefault();
         dispatch({
           type: InputKeyDownEnter,
           getItemNodeFromIndex: getItemNodeFromIndex
@@ -3520,7 +3534,7 @@ function useCombobox(userProps) {
 
     var inputHandleBlur = function inputHandleBlur() {
       /* istanbul ignore else */
-      if (!mouseAndTouchTrackersRef.current.isMouseDown) {
+      if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
         dispatch({
           type: InputBlur,
           selectItem: true

package/dist/downshift.umd.js

@@ -2308,12 +2308,16 @@
           Home: function Home(event) {
             var _this4 = this;
 
-            event.preventDefault();
-            var itemCount = this.getItemCount();
-
             var _this$getState3 = this.getState(),
                 isOpen = _this$getState3.isOpen;
 
+            if (!isOpen) {
+              return;
+            }
+
+            event.preventDefault();
+            var itemCount = this.getItemCount();
+
             if (itemCount <= 0 || !isOpen) {
               return;
             } // get next non-disabled starting downwards from 0 if that's disabled.
@@ -2329,12 +2333,16 @@
           End: function End(event) {
             var _this5 = this;
 
-            event.preventDefault();
-            var itemCount = this.getItemCount();
-
             var _this$getState4 = this.getState(),
                 isOpen = _this$getState4.isOpen;
 
+            if (!isOpen) {
+              return;
+            }
+
+            event.preventDefault();
+            var itemCount = this.getItemCount();
+
             if (itemCount <= 0 || !isOpen) {
               return;
             } // get next non-disabled starting upwards from last index if that's disabled.
@@ -4593,7 +4601,7 @@
         } else {
           changes = {
             highlightedIndex: getHighlightedIndexOnOpen(props, state, 1, action.getItemNodeFromIndex),
-            isOpen: true
+            isOpen: props.items.length >= 0
           };
         }
 
@@ -4607,7 +4615,7 @@
         } else {
           changes = {
             highlightedIndex: getHighlightedIndexOnOpen(props, state, -1, action.getItemNodeFromIndex),
-            isOpen: true
+            isOpen: props.items.length >= 0
           };
         }
 
@@ -4633,28 +4641,25 @@
         break;
 
       case InputKeyDownHome:
-        changes = _extends({}, state.isOpen && {
+        changes = {
           highlightedIndex: getNextNonDisabledIndex(1, 0, props.items.length, action.getItemNodeFromIndex, false)
-        });
+        };
         break;
 
       case InputKeyDownEnd:
-        changes = _extends({}, state.isOpen && {
+        changes = {
           highlightedIndex: getNextNonDisabledIndex(-1, props.items.length - 1, props.items.length, action.getItemNodeFromIndex, false)
-        });
+        };
         break;
 
       case InputBlur:
-        if (state.isOpen) {
-          changes = _extends({
-            isOpen: false,
-            highlightedIndex: -1
-          }, state.highlightedIndex >= 0 && action.selectItem && {
-            selectedItem: props.items[state.highlightedIndex],
-            inputValue: props.itemToString(props.items[state.highlightedIndex])
-          });
-        }
-
+        changes = _extends({
+          isOpen: false,
+          highlightedIndex: -1
+        }, state.highlightedIndex >= 0 && action.selectItem && {
+          selectedItem: props.items[state.highlightedIndex],
+          inputValue: props.itemToString(props.items[state.highlightedIndex])
+        });
         break;
 
       case InputChange:
@@ -4821,6 +4826,10 @@
           });
         },
         Home: function Home(event) {
+          if (!latest.current.state.isOpen) {
+            return;
+          }
+
           event.preventDefault();
           dispatch({
             type: InputKeyDownHome,
@@ -4828,6 +4837,10 @@
           });
         },
         End: function End(event) {
+          if (!latest.current.state.isOpen) {
+            return;
+          }
+
           event.preventDefault();
           dispatch({
             type: InputKeyDownEnd,
@@ -4835,22 +4848,23 @@
           });
         },
         Escape: function Escape() {
-          dispatch({
-            type: InputKeyDownEscape
-          });
-        },
-        Enter: function Enter(event) {
-          // if IME composing, wait for next Enter keydown event.
-          if (event.which === 229) {
-            return;
-          }
-
           var latestState = latest.current.state;
 
-          if (latestState.isOpen) {
-            event.preventDefault();
+          if (latestState.isOpen || latestState.inputValue || latestState.selectedItem || latestState.highlightedIndex > -1) {
+            dispatch({
+              type: InputKeyDownEscape
+            });
           }
+        },
+        Enter: function Enter(event) {
+          var latestState = latest.current.state; // if closed or no highlighted index, do nothing.
 
+          if (!latestState.isOpen || latestState.highlightedIndex < 0 || event.which === 229 // if IME composing, wait for next Enter keydown event.
+          ) {
+              return;
+            }
+
+          event.preventDefault();
           dispatch({
             type: InputKeyDownEnter,
             getItemNodeFromIndex: getItemNodeFromIndex
@@ -5010,7 +5024,7 @@
 
       var inputHandleBlur = function inputHandleBlur() {
         /* istanbul ignore else */
-        if (!mouseAndTouchTrackersRef.current.isMouseDown) {
+        if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
           dispatch({
             type: InputBlur,
             selectItem: true