downshift 7.3.4 → 7.4.1

package/dist/downshift.cjs.js

@@ -2748,6 +2748,7 @@ function getInitialState$1(props) {
 var propTypes$1 = {
   items: PropTypes__default["default"].array.isRequired,
   itemToString: PropTypes__default["default"].func,
+  selectedItemChanged: PropTypes__default["default"].func,
   getA11yStatusMessage: PropTypes__default["default"].func,
   getA11ySelectionMessage: PropTypes__default["default"].func,
   highlightedIndex: PropTypes__default["default"].number,
@@ -2805,16 +2806,18 @@ function useControlledReducer(reducer, initialState, props) {
 
   // ToDo: if needed, make same approach as selectedItemChanged from Downshift.
   react.useEffect(function () {
-    if (isControlledProp(props, 'selectedItem')) {
-      if (previousSelectedItemRef.current !== props.selectedItem) {
-        dispatch({
-          type: ControlledPropUpdatedSelectedItem,
-          inputValue: props.itemToString(props.selectedItem)
-        });
-      }
-      previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+    if (!isControlledProp(props, 'selectedItem')) {
+      return;
     }
-  }, [props.selectedItem, state.selectedItem]);
+    if (props.selectedItemChanged(previousSelectedItemRef.current, props.selectedItem)) {
+      dispatch({
+        type: ControlledPropUpdatedSelectedItem,
+        inputValue: props.itemToString(props.selectedItem)
+      });
+    }
+    previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [state.selectedItem, props.selectedItem]);
   return [getState(state, props), dispatch];
 }
 
@@ -2827,6 +2830,9 @@ if (process.env.NODE_ENV !== 'production') {
   };
 }
 var defaultProps$1 = _extends__default["default"]({}, defaultProps$3, {
+  selectedItemChanged: function selectedItemChanged(prevItem, item) {
+    return prevItem !== item;
+  },
   getA11yStatusMessage: getA11yStatusMessage$1
 });
 
@@ -3276,12 +3282,12 @@ function useCombobox(userProps) {
         inputValue: event.target.value
       });
     };
-    var inputHandleBlur = function inputHandleBlur() {
+    var inputHandleBlur = function inputHandleBlur(event) {
       /* istanbul ignore else */
       if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
         dispatch({
           type: InputBlur,
-          selectItem: true
+          selectItem: event.relatedTarget !== null
         });
       }
     };

package/dist/downshift.esm.js

@@ -2735,6 +2735,7 @@ function getInitialState$1(props) {
 var propTypes$1 = {
   items: PropTypes.array.isRequired,
   itemToString: PropTypes.func,
+  selectedItemChanged: PropTypes.func,
   getA11yStatusMessage: PropTypes.func,
   getA11ySelectionMessage: PropTypes.func,
   highlightedIndex: PropTypes.number,
@@ -2792,16 +2793,18 @@ function useControlledReducer(reducer, initialState, props) {
 
   // ToDo: if needed, make same approach as selectedItemChanged from Downshift.
   useEffect(function () {
-    if (isControlledProp(props, 'selectedItem')) {
-      if (previousSelectedItemRef.current !== props.selectedItem) {
-        dispatch({
-          type: ControlledPropUpdatedSelectedItem,
-          inputValue: props.itemToString(props.selectedItem)
-        });
-      }
-      previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+    if (!isControlledProp(props, 'selectedItem')) {
+      return;
     }
-  }, [props.selectedItem, state.selectedItem]);
+    if (props.selectedItemChanged(previousSelectedItemRef.current, props.selectedItem)) {
+      dispatch({
+        type: ControlledPropUpdatedSelectedItem,
+        inputValue: props.itemToString(props.selectedItem)
+      });
+    }
+    previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [state.selectedItem, props.selectedItem]);
   return [getState(state, props), dispatch];
 }
 
@@ -2814,6 +2817,9 @@ if (process.env.NODE_ENV !== 'production') {
   };
 }
 var defaultProps$1 = _extends({}, defaultProps$3, {
+  selectedItemChanged: function selectedItemChanged(prevItem, item) {
+    return prevItem !== item;
+  },
   getA11yStatusMessage: getA11yStatusMessage$1
 });
 
@@ -3263,12 +3269,12 @@ function useCombobox(userProps) {
         inputValue: event.target.value
       });
     };
-    var inputHandleBlur = function inputHandleBlur() {
+    var inputHandleBlur = function inputHandleBlur(event) {
       /* istanbul ignore else */
       if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
         dispatch({
           type: InputBlur,
-          selectItem: true
+          selectItem: event.relatedTarget !== null
         });
       }
     };

package/dist/downshift.native.cjs.js

@@ -2670,6 +2670,7 @@ function getInitialState$1(props) {
 var propTypes$1 = {
   items: PropTypes__default["default"].array.isRequired,
   itemToString: PropTypes__default["default"].func,
+  selectedItemChanged: PropTypes__default["default"].func,
   getA11yStatusMessage: PropTypes__default["default"].func,
   getA11ySelectionMessage: PropTypes__default["default"].func,
   highlightedIndex: PropTypes__default["default"].number,
@@ -2727,16 +2728,18 @@ function useControlledReducer(reducer, initialState, props) {
 
   // ToDo: if needed, make same approach as selectedItemChanged from Downshift.
   react.useEffect(function () {
-    if (isControlledProp(props, 'selectedItem')) {
-      if (previousSelectedItemRef.current !== props.selectedItem) {
-        dispatch({
-          type: ControlledPropUpdatedSelectedItem,
-          inputValue: props.itemToString(props.selectedItem)
-        });
-      }
-      previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+    if (!isControlledProp(props, 'selectedItem')) {
+      return;
     }
-  }, [props.selectedItem, state.selectedItem]);
+    if (props.selectedItemChanged(previousSelectedItemRef.current, props.selectedItem)) {
+      dispatch({
+        type: ControlledPropUpdatedSelectedItem,
+        inputValue: props.itemToString(props.selectedItem)
+      });
+    }
+    previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [state.selectedItem, props.selectedItem]);
   return [getState(state, props), dispatch];
 }
 
@@ -2749,6 +2752,9 @@ if (process.env.NODE_ENV !== 'production') {
   };
 }
 var defaultProps$1 = _extends__default["default"]({}, defaultProps$3, {
+  selectedItemChanged: function selectedItemChanged(prevItem, item) {
+    return prevItem !== item;
+  },
   getA11yStatusMessage: getA11yStatusMessage$1
 });
 
@@ -3198,12 +3204,12 @@ function useCombobox(userProps) {
         inputValue: /* istanbul ignore next (react-native) */event.nativeEvent.text 
       });
     };
-    var inputHandleBlur = function inputHandleBlur() {
+    var inputHandleBlur = function inputHandleBlur(event) {
       /* istanbul ignore else */
       if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
         dispatch({
           type: InputBlur,
-          selectItem: true
+          selectItem: event.relatedTarget !== null
         });
       }
     };

package/dist/downshift.umd.js

@@ -4060,6 +4060,7 @@
   var propTypes$1 = {
     items: PropTypes.array.isRequired,
     itemToString: PropTypes.func,
+    selectedItemChanged: PropTypes.func,
     getA11yStatusMessage: PropTypes.func,
     getA11ySelectionMessage: PropTypes.func,
     highlightedIndex: PropTypes.number,
@@ -4117,16 +4118,18 @@
 
     // ToDo: if needed, make same approach as selectedItemChanged from Downshift.
     react.useEffect(function () {
-      if (isControlledProp(props, 'selectedItem')) {
-        if (previousSelectedItemRef.current !== props.selectedItem) {
-          dispatch({
-            type: ControlledPropUpdatedSelectedItem,
-            inputValue: props.itemToString(props.selectedItem)
-          });
-        }
-        previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+      if (!isControlledProp(props, 'selectedItem')) {
+        return;
       }
-    }, [props.selectedItem, state.selectedItem]);
+      if (props.selectedItemChanged(previousSelectedItemRef.current, props.selectedItem)) {
+        dispatch({
+          type: ControlledPropUpdatedSelectedItem,
+          inputValue: props.itemToString(props.selectedItem)
+        });
+      }
+      previousSelectedItemRef.current = state.selectedItem === previousSelectedItemRef.current ? props.selectedItem : state.selectedItem;
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [state.selectedItem, props.selectedItem]);
     return [getState(state, props), dispatch];
   }
 
@@ -4139,6 +4142,9 @@
     };
   }
   var defaultProps$1 = _extends({}, defaultProps$3, {
+    selectedItemChanged: function selectedItemChanged(prevItem, item) {
+      return prevItem !== item;
+    },
     getA11yStatusMessage: getA11yStatusMessage$1
   });
 
@@ -4588,12 +4594,12 @@
           inputValue: event.target.value
         });
       };
-      var inputHandleBlur = function inputHandleBlur() {
+      var inputHandleBlur = function inputHandleBlur(event) {
         /* istanbul ignore else */
         if (latestState.isOpen && !mouseAndTouchTrackersRef.current.isMouseDown) {
           dispatch({
             type: InputBlur,
-            selectItem: true
+            selectItem: event.relatedTarget !== null
           });
         }
       };