downshift 6.1.10 → 6.1.12

package/dist/downshift.cjs.js

@@ -2204,7 +2204,7 @@ function downshiftCommonReducer(state, action, stateChangeTypes) {
   switch (type) {
     case stateChangeTypes.ItemMouseMove:
       changes = {
-        highlightedIndex: action.index
+        highlightedIndex: action.disabled ? -1 : action.index
       };
       break;
 
@@ -2953,6 +2953,7 @@ function useSelect(userProps) {
       onClick,
       refKey = 'ref',
       ref,
+      disabled,
       ...rest
     } = _temp5 === void 0 ? {} : _temp5;
     const {
@@ -2968,7 +2969,8 @@ function useSelect(userProps) {
       shouldScrollRef.current = false;
       dispatch({
         type: ItemMouseMove$1,
-        index
+        index,
+        disabled
       });
     };
 
@@ -2986,6 +2988,7 @@ function useSelect(userProps) {
     }
 
     const itemProps = {
+      disabled,
       role: 'option',
       'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
       id: elementIds.getItemId(itemIndex),
@@ -2997,11 +3000,11 @@ function useSelect(userProps) {
       ...rest
     };
 
-    if (!rest.disabled) {
-      itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
+    if (!disabled) {
       itemProps.onClick = callAllEventHandlers(onClick, itemHandleClick);
     }
 
+    itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
     return itemProps;
   }, [dispatch, latest, shouldScrollRef, elementIds]);
   return {
@@ -3526,8 +3529,10 @@ function useCombobox(userProps) {
       refKey = 'ref',
       ref,
       onMouseMove,
+      onMouseDown,
       onClick,
       onPress,
+      disabled,
       ...rest
     } = _temp3 === void 0 ? {} : _temp3;
     const {
@@ -3551,7 +3556,8 @@ function useCombobox(userProps) {
       shouldScrollRef.current = false;
       dispatch({
         type: ItemMouseMove,
-        index
+        index,
+        disabled
       });
     };
 
@@ -3560,25 +3566,25 @@ function useCombobox(userProps) {
         type: ItemClick,
         index
       });
-
-      if (inputRef.current) {
-        inputRef.current.focus();
-      }
     };
 
+    const itemHandleMouseDown = e => e.preventDefault();
+
     return {
       [refKey]: handleRefs(ref, itemNode => {
         if (itemNode) {
           itemRefs.current[elementIds.getItemId(itemIndex)] = itemNode;
         }
       }),
+      disabled,
       role: 'option',
       'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
       id: elementIds.getItemId(itemIndex),
-      ...(!rest.disabled && {
-        onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+      ...(!disabled && {
         [onSelectKey]: callAllEventHandlers(customClickHandler, itemHandleClick)
       }),
+      onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+      onMouseDown: callAllEventHandlers(onMouseDown, itemHandleMouseDown),
       ...rest
     };
   }, [dispatch, latest, shouldScrollRef, elementIds]);

package/dist/downshift.esm.js

@@ -2195,7 +2195,7 @@ function downshiftCommonReducer(state, action, stateChangeTypes) {
   switch (type) {
     case stateChangeTypes.ItemMouseMove:
       changes = {
-        highlightedIndex: action.index
+        highlightedIndex: action.disabled ? -1 : action.index
       };
       break;
 
@@ -2944,6 +2944,7 @@ function useSelect(userProps) {
       onClick,
       refKey = 'ref',
       ref,
+      disabled,
       ...rest
     } = _temp5 === void 0 ? {} : _temp5;
     const {
@@ -2959,7 +2960,8 @@ function useSelect(userProps) {
       shouldScrollRef.current = false;
       dispatch({
         type: ItemMouseMove$1,
-        index
+        index,
+        disabled
       });
     };
 
@@ -2977,6 +2979,7 @@ function useSelect(userProps) {
     }
 
     const itemProps = {
+      disabled,
       role: 'option',
       'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
       id: elementIds.getItemId(itemIndex),
@@ -2988,11 +2991,11 @@ function useSelect(userProps) {
       ...rest
     };
 
-    if (!rest.disabled) {
-      itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
+    if (!disabled) {
       itemProps.onClick = callAllEventHandlers(onClick, itemHandleClick);
     }
 
+    itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
     return itemProps;
   }, [dispatch, latest, shouldScrollRef, elementIds]);
   return {
@@ -3517,8 +3520,10 @@ function useCombobox(userProps) {
       refKey = 'ref',
       ref,
       onMouseMove,
+      onMouseDown,
       onClick,
       onPress,
+      disabled,
       ...rest
     } = _temp3 === void 0 ? {} : _temp3;
     const {
@@ -3542,7 +3547,8 @@ function useCombobox(userProps) {
       shouldScrollRef.current = false;
       dispatch({
         type: ItemMouseMove,
-        index
+        index,
+        disabled
       });
     };
 
@@ -3551,25 +3557,25 @@ function useCombobox(userProps) {
         type: ItemClick,
         index
       });
-
-      if (inputRef.current) {
-        inputRef.current.focus();
-      }
     };
 
+    const itemHandleMouseDown = e => e.preventDefault();
+
     return {
       [refKey]: handleRefs(ref, itemNode => {
         if (itemNode) {
           itemRefs.current[elementIds.getItemId(itemIndex)] = itemNode;
         }
       }),
+      disabled,
       role: 'option',
       'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
       id: elementIds.getItemId(itemIndex),
-      ...(!rest.disabled && {
-        onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+      ...(!disabled && {
         [onSelectKey]: callAllEventHandlers(customClickHandler, itemHandleClick)
       }),
+      onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+      onMouseDown: callAllEventHandlers(onMouseDown, itemHandleMouseDown),
       ...rest
     };
   }, [dispatch, latest, shouldScrollRef, elementIds]);

package/dist/downshift.native.cjs.js

@@ -2135,7 +2135,7 @@ function downshiftCommonReducer(state, action, stateChangeTypes) {
   switch (type) {
     case stateChangeTypes.ItemMouseMove:
       changes = {
-        highlightedIndex: action.index
+        highlightedIndex: action.disabled ? -1 : action.index
       };
       break;
 
@@ -2884,6 +2884,7 @@ function useSelect(userProps) {
       onClick,
       refKey = 'ref',
       ref,
+      disabled,
       ...rest
     } = _temp5 === void 0 ? {} : _temp5;
     const {
@@ -2899,7 +2900,8 @@ function useSelect(userProps) {
       shouldScrollRef.current = false;
       dispatch({
         type: ItemMouseMove$1,
-        index
+        index,
+        disabled
       });
     };
 
@@ -2917,6 +2919,7 @@ function useSelect(userProps) {
     }
 
     const itemProps = {
+      disabled,
       role: 'option',
       'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
       id: elementIds.getItemId(itemIndex),
@@ -2928,11 +2931,11 @@ function useSelect(userProps) {
       ...rest
     };
 
-    if (!rest.disabled) {
-      itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
+    if (!disabled) {
       itemProps.onClick = callAllEventHandlers(onClick, itemHandleClick);
     }
 
+    itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
     return itemProps;
   }, [dispatch, latest, shouldScrollRef, elementIds]);
   return {
@@ -3457,8 +3460,10 @@ function useCombobox(userProps) {
       refKey = 'ref',
       ref,
       onMouseMove,
+      onMouseDown,
       onClick,
       onPress,
+      disabled,
       ...rest
     } = _temp3 === void 0 ? {} : _temp3;
     const {
@@ -3484,7 +3489,8 @@ function useCombobox(userProps) {
       shouldScrollRef.current = false;
       dispatch({
         type: ItemMouseMove,
-        index
+        index,
+        disabled
       });
     };
 
@@ -3493,25 +3499,25 @@ function useCombobox(userProps) {
         type: ItemClick,
         index
       });
-
-      if (inputRef.current) {
-        inputRef.current.focus();
-      }
     };
 
+    const itemHandleMouseDown = e => e.preventDefault();
+
     return {
       [refKey]: handleRefs(ref, itemNode => {
         if (itemNode) {
           itemRefs.current[elementIds.getItemId(itemIndex)] = itemNode;
         }
       }),
+      disabled,
       role: 'option',
       'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
       id: elementIds.getItemId(itemIndex),
-      ...(!rest.disabled && {
-        onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+      ...(!disabled && {
         [onSelectKey]: callAllEventHandlers(customClickHandler, itemHandleClick)
       }),
+      onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+      onMouseDown: callAllEventHandlers(onMouseDown, itemHandleMouseDown),
       ...rest
     };
   }, [dispatch, latest, shouldScrollRef, elementIds]);

package/dist/downshift.umd.js

@@ -3446,7 +3446,7 @@
     switch (type) {
       case stateChangeTypes.ItemMouseMove:
         changes = {
-          highlightedIndex: action.index
+          highlightedIndex: action.disabled ? -1 : action.index
         };
         break;
 
@@ -4221,6 +4221,7 @@
         onClick,
         refKey = 'ref',
         ref,
+        disabled,
         ...rest
       } = _temp5 === void 0 ? {} : _temp5;
       const {
@@ -4236,7 +4237,8 @@
         shouldScrollRef.current = false;
         dispatch({
           type: ItemMouseMove$1,
-          index
+          index,
+          disabled
         });
       };
 
@@ -4254,6 +4256,7 @@
       }
 
       const itemProps = {
+        disabled,
         role: 'option',
         'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
         id: elementIds.getItemId(itemIndex),
@@ -4265,11 +4268,11 @@
         ...rest
       };
 
-      if (!rest.disabled) {
-        itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
+      if (!disabled) {
         itemProps.onClick = callAllEventHandlers(onClick, itemHandleClick);
       }
 
+      itemProps.onMouseMove = callAllEventHandlers(onMouseMove, itemHandleMouseMove);
       return itemProps;
     }, [dispatch, latest, shouldScrollRef, elementIds]);
     return {
@@ -4794,8 +4797,10 @@
         refKey = 'ref',
         ref,
         onMouseMove,
+        onMouseDown,
         onClick,
         onPress,
+        disabled,
         ...rest
       } = _temp3 === void 0 ? {} : _temp3;
       const {
@@ -4819,7 +4824,8 @@
         shouldScrollRef.current = false;
         dispatch({
           type: ItemMouseMove,
-          index
+          index,
+          disabled
         });
       };
 
@@ -4828,25 +4834,25 @@
           type: ItemClick,
           index
         });
-
-        if (inputRef.current) {
-          inputRef.current.focus();
-        }
       };
 
+      const itemHandleMouseDown = e => e.preventDefault();
+
       return {
         [refKey]: handleRefs(ref, itemNode => {
           if (itemNode) {
             itemRefs.current[elementIds.getItemId(itemIndex)] = itemNode;
           }
         }),
+        disabled,
         role: 'option',
         'aria-selected': `${itemIndex === latestState.highlightedIndex}`,
         id: elementIds.getItemId(itemIndex),
-        ...(!rest.disabled && {
-          onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+        ...(!disabled && {
           [onSelectKey]: callAllEventHandlers(customClickHandler, itemHandleClick)
         }),
+        onMouseMove: callAllEventHandlers(onMouseMove, itemHandleMouseMove),
+        onMouseDown: callAllEventHandlers(onMouseDown, itemHandleMouseDown),
         ...rest
       };
     }, [dispatch, latest, shouldScrollRef, elementIds]);