downshift 8.2.4-alpha.3 → 8.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -492,7 +492,7 @@ var stateChangeTypes$3 = /*#__PURE__*/Object.freeze({
492
492
  var _excluded$4 = ["refKey", "ref"],
493
493
  _excluded2$3 = ["onClick", "onPress", "onKeyDown", "onKeyUp", "onBlur"],
494
494
  _excluded3$2 = ["onKeyDown", "onBlur", "onChange", "onInput", "onChangeText"],
495
- _excluded4$1 = ["refKey", "ref"],
495
+ _excluded4$2 = ["refKey", "ref"],
496
496
  _excluded5 = ["onMouseMove", "onMouseDown", "onClick", "onPress", "index", "item"];
497
497
  var Downshift = /*#__PURE__*/function () {
498
498
  var Downshift = /*#__PURE__*/function (_Component) {
@@ -997,7 +997,7 @@ var Downshift = /*#__PURE__*/function () {
997
997
  _ref5$refKey = _ref5.refKey,
998
998
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
999
999
  ref = _ref5.ref,
1000
- props = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded4$1);
1000
+ props = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded4$2);
1001
1001
  var _ref6 = _temp6 === void 0 ? {} : _temp6,
1002
1002
  _ref6$suppressRefErro = _ref6.suppressRefError,
1003
1003
  suppressRefError = _ref6$suppressRefErro === void 0 ? false : _ref6$suppressRefErro;
@@ -1723,19 +1723,12 @@ function useEnhancedReducer(reducer, props, createInitialState, isStateEqual) {
1723
1723
  }, [propsRef]);
1724
1724
  var action = actionRef.current;
1725
1725
  React.useEffect(function () {
1726
- console.log('effect');
1727
1726
  var shouldCallOnChangeProps = action && prevStateRef.current && !isStateEqual(prevStateRef.current, state);
1728
- console.log('passed', prevStateRef.current, state);
1729
1727
  if (shouldCallOnChangeProps) {
1730
1728
  callOnChangeProps(action, getState(prevStateRef.current, action.props), state);
1731
1729
  }
1732
1730
  prevStateRef.current = state;
1733
1731
  }, [state, action, isStateEqual]);
1734
- React.useEffect(function () {
1735
- if (props) {
1736
- prevStateRef.current = getState(prevStateRef.current, props);
1737
- }
1738
- }, [props]);
1739
1732
  return [state, dispatchWithProps];
1740
1733
  }
1741
1734
 
@@ -2348,9 +2341,10 @@ function downshiftSelectReducer(state, action) {
2348
2341
  }
2349
2342
  /* eslint-enable complexity */
2350
2343
 
2351
- var _excluded$2 = ["onMouseLeave", "refKey", "ref"],
2352
- _excluded2$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2353
- _excluded3$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2344
+ var _excluded$2 = ["onClick"],
2345
+ _excluded2$2 = ["onMouseLeave", "refKey", "ref"],
2346
+ _excluded3$1 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2347
+ _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2354
2348
  useSelect.stateChangeTypes = stateChangeTypes$2;
2355
2349
  function useSelect(userProps) {
2356
2350
  if (userProps === void 0) {
@@ -2606,23 +2600,31 @@ function useSelect(userProps) {
2606
2600
  });
2607
2601
  }, [dispatch]);
2608
2602
  // Getter functions.
2609
- var getLabelProps = React.useCallback(function (labelProps) {
2603
+ var getLabelProps = React.useCallback(function (_temp) {
2604
+ var _ref = _temp === void 0 ? {} : _temp,
2605
+ onClick = _ref.onClick,
2606
+ labelProps = _objectWithoutPropertiesLoose__default["default"](_ref, _excluded$2);
2607
+ var labelHandleClick = function labelHandleClick() {
2608
+ var _toggleButtonRef$curr;
2609
+ (_toggleButtonRef$curr = toggleButtonRef.current) == null || _toggleButtonRef$curr.focus();
2610
+ };
2610
2611
  return _extends__default["default"]({
2611
2612
  id: elementIds.labelId,
2612
- htmlFor: elementIds.toggleButtonId
2613
+ htmlFor: elementIds.toggleButtonId,
2614
+ onClick: callAllEventHandlers(onClick, labelHandleClick)
2613
2615
  }, labelProps);
2614
2616
  }, [elementIds]);
2615
- var getMenuProps = React.useCallback(function (_temp, _temp2) {
2617
+ var getMenuProps = React.useCallback(function (_temp2, _temp3) {
2616
2618
  var _extends2;
2617
- var _ref = _temp === void 0 ? {} : _temp,
2618
- onMouseLeave = _ref.onMouseLeave,
2619
- _ref$refKey = _ref.refKey,
2620
- refKey = _ref$refKey === void 0 ? 'ref' : _ref$refKey,
2621
- ref = _ref.ref,
2622
- rest = _objectWithoutPropertiesLoose__default["default"](_ref, _excluded$2);
2623
2619
  var _ref2 = _temp2 === void 0 ? {} : _temp2,
2624
- _ref2$suppressRefErro = _ref2.suppressRefError,
2625
- suppressRefError = _ref2$suppressRefErro === void 0 ? false : _ref2$suppressRefErro;
2620
+ onMouseLeave = _ref2.onMouseLeave,
2621
+ _ref2$refKey = _ref2.refKey,
2622
+ refKey = _ref2$refKey === void 0 ? 'ref' : _ref2$refKey,
2623
+ ref = _ref2.ref,
2624
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref2, _excluded2$2);
2625
+ var _ref3 = _temp3 === void 0 ? {} : _temp3,
2626
+ _ref3$suppressRefErro = _ref3.suppressRefError,
2627
+ suppressRefError = _ref3$suppressRefErro === void 0 ? false : _ref3$suppressRefErro;
2626
2628
  var menuHandleMouseLeave = function menuHandleMouseLeave() {
2627
2629
  dispatch({
2628
2630
  type: MenuMouseLeave$1
@@ -2633,20 +2635,20 @@ function useSelect(userProps) {
2633
2635
  menuRef.current = menuNode;
2634
2636
  }), _extends2.id = elementIds.menuId, _extends2.role = 'listbox', _extends2['aria-labelledby'] = rest && rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends2.onMouseLeave = callAllEventHandlers(onMouseLeave, menuHandleMouseLeave), _extends2), rest);
2635
2637
  }, [dispatch, setGetterPropCallInfo, elementIds]);
2636
- var getToggleButtonProps = React.useCallback(function (_temp3, _temp4) {
2638
+ var getToggleButtonProps = React.useCallback(function (_temp4, _temp5) {
2637
2639
  var _extends3;
2638
- var _ref3 = _temp3 === void 0 ? {} : _temp3,
2639
- onBlur = _ref3.onBlur,
2640
- onClick = _ref3.onClick;
2641
- _ref3.onPress;
2642
- var onKeyDown = _ref3.onKeyDown,
2643
- _ref3$refKey = _ref3.refKey,
2644
- refKey = _ref3$refKey === void 0 ? 'ref' : _ref3$refKey,
2645
- ref = _ref3.ref,
2646
- rest = _objectWithoutPropertiesLoose__default["default"](_ref3, _excluded2$2);
2647
2640
  var _ref4 = _temp4 === void 0 ? {} : _temp4,
2648
- _ref4$suppressRefErro = _ref4.suppressRefError,
2649
- suppressRefError = _ref4$suppressRefErro === void 0 ? false : _ref4$suppressRefErro;
2641
+ onBlur = _ref4.onBlur,
2642
+ onClick = _ref4.onClick;
2643
+ _ref4.onPress;
2644
+ var onKeyDown = _ref4.onKeyDown,
2645
+ _ref4$refKey = _ref4.refKey,
2646
+ refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2647
+ ref = _ref4.ref,
2648
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref4, _excluded3$1);
2649
+ var _ref5 = _temp5 === void 0 ? {} : _temp5,
2650
+ _ref5$suppressRefErro = _ref5.suppressRefError,
2651
+ suppressRefError = _ref5$suppressRefErro === void 0 ? false : _ref5$suppressRefErro;
2650
2652
  var latestState = latest.current.state;
2651
2653
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
2652
2654
  dispatch({
@@ -2684,20 +2686,20 @@ function useSelect(userProps) {
2684
2686
  setGetterPropCallInfo('getToggleButtonProps', suppressRefError, refKey, toggleButtonRef);
2685
2687
  return toggleProps;
2686
2688
  }, [latest, elementIds, setGetterPropCallInfo, dispatch, mouseAndTouchTrackersRef, toggleButtonKeyDownHandlers]);
2687
- var getItemProps = React.useCallback(function (_temp5) {
2689
+ var getItemProps = React.useCallback(function (_temp6) {
2688
2690
  var _extends4;
2689
- var _ref5 = _temp5 === void 0 ? {} : _temp5,
2690
- itemProp = _ref5.item,
2691
- indexProp = _ref5.index,
2692
- onMouseMove = _ref5.onMouseMove,
2693
- onClick = _ref5.onClick,
2694
- onMouseDown = _ref5.onMouseDown;
2695
- _ref5.onPress;
2696
- var _ref5$refKey = _ref5.refKey,
2697
- refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
2698
- disabledProp = _ref5.disabled,
2699
- ref = _ref5.ref,
2700
- rest = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded3$1);
2691
+ var _ref6 = _temp6 === void 0 ? {} : _temp6,
2692
+ itemProp = _ref6.item,
2693
+ indexProp = _ref6.index,
2694
+ onMouseMove = _ref6.onMouseMove,
2695
+ onClick = _ref6.onClick,
2696
+ onMouseDown = _ref6.onMouseDown;
2697
+ _ref6.onPress;
2698
+ var _ref6$refKey = _ref6.refKey,
2699
+ refKey = _ref6$refKey === void 0 ? 'ref' : _ref6$refKey,
2700
+ disabledProp = _ref6.disabled,
2701
+ ref = _ref6.ref,
2702
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref6, _excluded4$1);
2701
2703
  if (disabledProp !== undefined) {
2702
2704
  console.warn('Passing "disabled" as an argument to getItemProps is not supported anymore. Please use the isItemDisabled prop from useSelect.');
2703
2705
  }
@@ -479,7 +479,7 @@ var stateChangeTypes$3 = /*#__PURE__*/Object.freeze({
479
479
  var _excluded$4 = ["refKey", "ref"],
480
480
  _excluded2$3 = ["onClick", "onPress", "onKeyDown", "onKeyUp", "onBlur"],
481
481
  _excluded3$2 = ["onKeyDown", "onBlur", "onChange", "onInput", "onChangeText"],
482
- _excluded4$1 = ["refKey", "ref"],
482
+ _excluded4$2 = ["refKey", "ref"],
483
483
  _excluded5 = ["onMouseMove", "onMouseDown", "onClick", "onPress", "index", "item"];
484
484
  var Downshift = /*#__PURE__*/function () {
485
485
  var Downshift = /*#__PURE__*/function (_Component) {
@@ -984,7 +984,7 @@ var Downshift = /*#__PURE__*/function () {
984
984
  _ref5$refKey = _ref5.refKey,
985
985
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
986
986
  ref = _ref5.ref,
987
- props = _objectWithoutPropertiesLoose(_ref5, _excluded4$1);
987
+ props = _objectWithoutPropertiesLoose(_ref5, _excluded4$2);
988
988
  var _ref6 = _temp6 === void 0 ? {} : _temp6,
989
989
  _ref6$suppressRefErro = _ref6.suppressRefError,
990
990
  suppressRefError = _ref6$suppressRefErro === void 0 ? false : _ref6$suppressRefErro;
@@ -1710,19 +1710,12 @@ function useEnhancedReducer(reducer, props, createInitialState, isStateEqual) {
1710
1710
  }, [propsRef]);
1711
1711
  var action = actionRef.current;
1712
1712
  useEffect(function () {
1713
- console.log('effect');
1714
1713
  var shouldCallOnChangeProps = action && prevStateRef.current && !isStateEqual(prevStateRef.current, state);
1715
- console.log('passed', prevStateRef.current, state);
1716
1714
  if (shouldCallOnChangeProps) {
1717
1715
  callOnChangeProps(action, getState(prevStateRef.current, action.props), state);
1718
1716
  }
1719
1717
  prevStateRef.current = state;
1720
1718
  }, [state, action, isStateEqual]);
1721
- useEffect(function () {
1722
- if (props) {
1723
- prevStateRef.current = getState(prevStateRef.current, props);
1724
- }
1725
- }, [props]);
1726
1719
  return [state, dispatchWithProps];
1727
1720
  }
1728
1721
 
@@ -2335,9 +2328,10 @@ function downshiftSelectReducer(state, action) {
2335
2328
  }
2336
2329
  /* eslint-enable complexity */
2337
2330
 
2338
- var _excluded$2 = ["onMouseLeave", "refKey", "ref"],
2339
- _excluded2$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2340
- _excluded3$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2331
+ var _excluded$2 = ["onClick"],
2332
+ _excluded2$2 = ["onMouseLeave", "refKey", "ref"],
2333
+ _excluded3$1 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2334
+ _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2341
2335
  useSelect.stateChangeTypes = stateChangeTypes$2;
2342
2336
  function useSelect(userProps) {
2343
2337
  if (userProps === void 0) {
@@ -2593,23 +2587,31 @@ function useSelect(userProps) {
2593
2587
  });
2594
2588
  }, [dispatch]);
2595
2589
  // Getter functions.
2596
- var getLabelProps = useCallback(function (labelProps) {
2590
+ var getLabelProps = useCallback(function (_temp) {
2591
+ var _ref = _temp === void 0 ? {} : _temp,
2592
+ onClick = _ref.onClick,
2593
+ labelProps = _objectWithoutPropertiesLoose(_ref, _excluded$2);
2594
+ var labelHandleClick = function labelHandleClick() {
2595
+ var _toggleButtonRef$curr;
2596
+ (_toggleButtonRef$curr = toggleButtonRef.current) == null || _toggleButtonRef$curr.focus();
2597
+ };
2597
2598
  return _extends({
2598
2599
  id: elementIds.labelId,
2599
- htmlFor: elementIds.toggleButtonId
2600
+ htmlFor: elementIds.toggleButtonId,
2601
+ onClick: callAllEventHandlers(onClick, labelHandleClick)
2600
2602
  }, labelProps);
2601
2603
  }, [elementIds]);
2602
- var getMenuProps = useCallback(function (_temp, _temp2) {
2604
+ var getMenuProps = useCallback(function (_temp2, _temp3) {
2603
2605
  var _extends2;
2604
- var _ref = _temp === void 0 ? {} : _temp,
2605
- onMouseLeave = _ref.onMouseLeave,
2606
- _ref$refKey = _ref.refKey,
2607
- refKey = _ref$refKey === void 0 ? 'ref' : _ref$refKey,
2608
- ref = _ref.ref,
2609
- rest = _objectWithoutPropertiesLoose(_ref, _excluded$2);
2610
2606
  var _ref2 = _temp2 === void 0 ? {} : _temp2,
2611
- _ref2$suppressRefErro = _ref2.suppressRefError,
2612
- suppressRefError = _ref2$suppressRefErro === void 0 ? false : _ref2$suppressRefErro;
2607
+ onMouseLeave = _ref2.onMouseLeave,
2608
+ _ref2$refKey = _ref2.refKey,
2609
+ refKey = _ref2$refKey === void 0 ? 'ref' : _ref2$refKey,
2610
+ ref = _ref2.ref,
2611
+ rest = _objectWithoutPropertiesLoose(_ref2, _excluded2$2);
2612
+ var _ref3 = _temp3 === void 0 ? {} : _temp3,
2613
+ _ref3$suppressRefErro = _ref3.suppressRefError,
2614
+ suppressRefError = _ref3$suppressRefErro === void 0 ? false : _ref3$suppressRefErro;
2613
2615
  var menuHandleMouseLeave = function menuHandleMouseLeave() {
2614
2616
  dispatch({
2615
2617
  type: MenuMouseLeave$1
@@ -2620,20 +2622,20 @@ function useSelect(userProps) {
2620
2622
  menuRef.current = menuNode;
2621
2623
  }), _extends2.id = elementIds.menuId, _extends2.role = 'listbox', _extends2['aria-labelledby'] = rest && rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends2.onMouseLeave = callAllEventHandlers(onMouseLeave, menuHandleMouseLeave), _extends2), rest);
2622
2624
  }, [dispatch, setGetterPropCallInfo, elementIds]);
2623
- var getToggleButtonProps = useCallback(function (_temp3, _temp4) {
2625
+ var getToggleButtonProps = useCallback(function (_temp4, _temp5) {
2624
2626
  var _extends3;
2625
- var _ref3 = _temp3 === void 0 ? {} : _temp3,
2626
- onBlur = _ref3.onBlur,
2627
- onClick = _ref3.onClick;
2628
- _ref3.onPress;
2629
- var onKeyDown = _ref3.onKeyDown,
2630
- _ref3$refKey = _ref3.refKey,
2631
- refKey = _ref3$refKey === void 0 ? 'ref' : _ref3$refKey,
2632
- ref = _ref3.ref,
2633
- rest = _objectWithoutPropertiesLoose(_ref3, _excluded2$2);
2634
2627
  var _ref4 = _temp4 === void 0 ? {} : _temp4,
2635
- _ref4$suppressRefErro = _ref4.suppressRefError,
2636
- suppressRefError = _ref4$suppressRefErro === void 0 ? false : _ref4$suppressRefErro;
2628
+ onBlur = _ref4.onBlur,
2629
+ onClick = _ref4.onClick;
2630
+ _ref4.onPress;
2631
+ var onKeyDown = _ref4.onKeyDown,
2632
+ _ref4$refKey = _ref4.refKey,
2633
+ refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2634
+ ref = _ref4.ref,
2635
+ rest = _objectWithoutPropertiesLoose(_ref4, _excluded3$1);
2636
+ var _ref5 = _temp5 === void 0 ? {} : _temp5,
2637
+ _ref5$suppressRefErro = _ref5.suppressRefError,
2638
+ suppressRefError = _ref5$suppressRefErro === void 0 ? false : _ref5$suppressRefErro;
2637
2639
  var latestState = latest.current.state;
2638
2640
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
2639
2641
  dispatch({
@@ -2671,20 +2673,20 @@ function useSelect(userProps) {
2671
2673
  setGetterPropCallInfo('getToggleButtonProps', suppressRefError, refKey, toggleButtonRef);
2672
2674
  return toggleProps;
2673
2675
  }, [latest, elementIds, setGetterPropCallInfo, dispatch, mouseAndTouchTrackersRef, toggleButtonKeyDownHandlers]);
2674
- var getItemProps = useCallback(function (_temp5) {
2676
+ var getItemProps = useCallback(function (_temp6) {
2675
2677
  var _extends4;
2676
- var _ref5 = _temp5 === void 0 ? {} : _temp5,
2677
- itemProp = _ref5.item,
2678
- indexProp = _ref5.index,
2679
- onMouseMove = _ref5.onMouseMove,
2680
- onClick = _ref5.onClick,
2681
- onMouseDown = _ref5.onMouseDown;
2682
- _ref5.onPress;
2683
- var _ref5$refKey = _ref5.refKey,
2684
- refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
2685
- disabledProp = _ref5.disabled,
2686
- ref = _ref5.ref,
2687
- rest = _objectWithoutPropertiesLoose(_ref5, _excluded3$1);
2678
+ var _ref6 = _temp6 === void 0 ? {} : _temp6,
2679
+ itemProp = _ref6.item,
2680
+ indexProp = _ref6.index,
2681
+ onMouseMove = _ref6.onMouseMove,
2682
+ onClick = _ref6.onClick,
2683
+ onMouseDown = _ref6.onMouseDown;
2684
+ _ref6.onPress;
2685
+ var _ref6$refKey = _ref6.refKey,
2686
+ refKey = _ref6$refKey === void 0 ? 'ref' : _ref6$refKey,
2687
+ disabledProp = _ref6.disabled,
2688
+ ref = _ref6.ref,
2689
+ rest = _objectWithoutPropertiesLoose(_ref6, _excluded4$1);
2688
2690
  if (disabledProp !== undefined) {
2689
2691
  console.warn('Passing "disabled" as an argument to getItemProps is not supported anymore. Please use the isItemDisabled prop from useSelect.');
2690
2692
  }
@@ -462,7 +462,7 @@ var stateChangeTypes$3 = /*#__PURE__*/Object.freeze({
462
462
  var _excluded$4 = ["refKey", "ref"],
463
463
  _excluded2$3 = ["onClick", "onPress", "onKeyDown", "onKeyUp", "onBlur"],
464
464
  _excluded3$2 = ["onKeyDown", "onBlur", "onChange", "onInput", "onChangeText"],
465
- _excluded4$1 = ["refKey", "ref"],
465
+ _excluded4$2 = ["refKey", "ref"],
466
466
  _excluded5 = ["onMouseMove", "onMouseDown", "onClick", "onPress", "index", "item"];
467
467
  var Downshift = /*#__PURE__*/function () {
468
468
  var Downshift = /*#__PURE__*/function (_Component) {
@@ -969,7 +969,7 @@ var Downshift = /*#__PURE__*/function () {
969
969
  _ref5$refKey = _ref5.refKey,
970
970
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
971
971
  ref = _ref5.ref,
972
- props = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded4$1);
972
+ props = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded4$2);
973
973
  var _ref6 = _temp6 === void 0 ? {} : _temp6,
974
974
  _ref6$suppressRefErro = _ref6.suppressRefError,
975
975
  suppressRefError = _ref6$suppressRefErro === void 0 ? false : _ref6$suppressRefErro;
@@ -1619,19 +1619,12 @@ function useEnhancedReducer(reducer, props, createInitialState, isStateEqual) {
1619
1619
  }, [propsRef]);
1620
1620
  var action = actionRef.current;
1621
1621
  React.useEffect(function () {
1622
- console.log('effect');
1623
1622
  var shouldCallOnChangeProps = action && prevStateRef.current && !isStateEqual(prevStateRef.current, state);
1624
- console.log('passed', prevStateRef.current, state);
1625
1623
  if (shouldCallOnChangeProps) {
1626
1624
  callOnChangeProps(action, getState(prevStateRef.current, action.props), state);
1627
1625
  }
1628
1626
  prevStateRef.current = state;
1629
1627
  }, [state, action, isStateEqual]);
1630
- React.useEffect(function () {
1631
- if (props) {
1632
- prevStateRef.current = getState(prevStateRef.current, props);
1633
- }
1634
- }, [props]);
1635
1628
  return [state, dispatchWithProps];
1636
1629
  }
1637
1630
 
@@ -2203,9 +2196,10 @@ function downshiftSelectReducer(state, action) {
2203
2196
  }
2204
2197
  /* eslint-enable complexity */
2205
2198
 
2206
- var _excluded$2 = ["onMouseLeave", "refKey", "ref"],
2207
- _excluded2$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2208
- _excluded3$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2199
+ var _excluded$2 = ["onClick"],
2200
+ _excluded2$2 = ["onMouseLeave", "refKey", "ref"],
2201
+ _excluded3$1 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2202
+ _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2209
2203
  useSelect.stateChangeTypes = stateChangeTypes$2;
2210
2204
  function useSelect(userProps) {
2211
2205
  if (userProps === void 0) {
@@ -2457,23 +2451,31 @@ function useSelect(userProps) {
2457
2451
  });
2458
2452
  }, [dispatch]);
2459
2453
  // Getter functions.
2460
- var getLabelProps = React.useCallback(function (labelProps) {
2454
+ var getLabelProps = React.useCallback(function (_temp) {
2455
+ var _ref = _temp === void 0 ? {} : _temp,
2456
+ onClick = _ref.onClick,
2457
+ labelProps = _objectWithoutPropertiesLoose__default["default"](_ref, _excluded$2);
2458
+ var labelHandleClick = function labelHandleClick() {
2459
+ var _toggleButtonRef$curr;
2460
+ (_toggleButtonRef$curr = toggleButtonRef.current) == null || _toggleButtonRef$curr.focus();
2461
+ };
2461
2462
  return _extends__default["default"]({
2462
2463
  id: elementIds.labelId,
2463
- htmlFor: elementIds.toggleButtonId
2464
+ htmlFor: elementIds.toggleButtonId,
2465
+ onClick: callAllEventHandlers(onClick, labelHandleClick)
2464
2466
  }, labelProps);
2465
2467
  }, [elementIds]);
2466
- var getMenuProps = React.useCallback(function (_temp, _temp2) {
2468
+ var getMenuProps = React.useCallback(function (_temp2, _temp3) {
2467
2469
  var _extends2;
2468
- var _ref = _temp === void 0 ? {} : _temp,
2469
- onMouseLeave = _ref.onMouseLeave,
2470
- _ref$refKey = _ref.refKey,
2471
- refKey = _ref$refKey === void 0 ? 'ref' : _ref$refKey,
2472
- ref = _ref.ref,
2473
- rest = _objectWithoutPropertiesLoose__default["default"](_ref, _excluded$2);
2474
2470
  var _ref2 = _temp2 === void 0 ? {} : _temp2,
2475
- _ref2$suppressRefErro = _ref2.suppressRefError,
2476
- suppressRefError = _ref2$suppressRefErro === void 0 ? false : _ref2$suppressRefErro;
2471
+ onMouseLeave = _ref2.onMouseLeave,
2472
+ _ref2$refKey = _ref2.refKey,
2473
+ refKey = _ref2$refKey === void 0 ? 'ref' : _ref2$refKey,
2474
+ ref = _ref2.ref,
2475
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref2, _excluded2$2);
2476
+ var _ref3 = _temp3 === void 0 ? {} : _temp3,
2477
+ _ref3$suppressRefErro = _ref3.suppressRefError,
2478
+ suppressRefError = _ref3$suppressRefErro === void 0 ? false : _ref3$suppressRefErro;
2477
2479
  var menuHandleMouseLeave = function menuHandleMouseLeave() {
2478
2480
  dispatch({
2479
2481
  type: MenuMouseLeave$1
@@ -2484,20 +2486,20 @@ function useSelect(userProps) {
2484
2486
  menuRef.current = menuNode;
2485
2487
  }), _extends2.id = elementIds.menuId, _extends2.role = 'listbox', _extends2['aria-labelledby'] = rest && rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends2.onMouseLeave = callAllEventHandlers(onMouseLeave, menuHandleMouseLeave), _extends2), rest);
2486
2488
  }, [dispatch, setGetterPropCallInfo, elementIds]);
2487
- var getToggleButtonProps = React.useCallback(function (_temp3, _temp4) {
2489
+ var getToggleButtonProps = React.useCallback(function (_temp4, _temp5) {
2488
2490
  var _extends3;
2489
- var _ref3 = _temp3 === void 0 ? {} : _temp3,
2490
- onBlur = _ref3.onBlur;
2491
- _ref3.onClick;
2492
- var onPress = _ref3.onPress;
2493
- _ref3.onKeyDown;
2494
- var _ref3$refKey = _ref3.refKey,
2495
- refKey = _ref3$refKey === void 0 ? 'ref' : _ref3$refKey,
2496
- ref = _ref3.ref,
2497
- rest = _objectWithoutPropertiesLoose__default["default"](_ref3, _excluded2$2);
2498
2491
  var _ref4 = _temp4 === void 0 ? {} : _temp4,
2499
- _ref4$suppressRefErro = _ref4.suppressRefError,
2500
- suppressRefError = _ref4$suppressRefErro === void 0 ? false : _ref4$suppressRefErro;
2492
+ onBlur = _ref4.onBlur;
2493
+ _ref4.onClick;
2494
+ var onPress = _ref4.onPress;
2495
+ _ref4.onKeyDown;
2496
+ var _ref4$refKey = _ref4.refKey,
2497
+ refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2498
+ ref = _ref4.ref,
2499
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref4, _excluded3$1);
2500
+ var _ref5 = _temp5 === void 0 ? {} : _temp5,
2501
+ _ref5$suppressRefErro = _ref5.suppressRefError,
2502
+ suppressRefError = _ref5$suppressRefErro === void 0 ? false : _ref5$suppressRefErro;
2501
2503
  var latestState = latest.current.state;
2502
2504
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
2503
2505
  dispatch({
@@ -2523,20 +2525,20 @@ function useSelect(userProps) {
2523
2525
  setGetterPropCallInfo('getToggleButtonProps', suppressRefError, refKey, toggleButtonRef);
2524
2526
  return toggleProps;
2525
2527
  }, [latest, elementIds, setGetterPropCallInfo, dispatch, mouseAndTouchTrackersRef, toggleButtonKeyDownHandlers]);
2526
- var getItemProps = React.useCallback(function (_temp5) {
2528
+ var getItemProps = React.useCallback(function (_temp6) {
2527
2529
  var _extends4;
2528
- var _ref5 = _temp5 === void 0 ? {} : _temp5,
2529
- itemProp = _ref5.item,
2530
- indexProp = _ref5.index,
2531
- onMouseMove = _ref5.onMouseMove;
2532
- _ref5.onClick;
2533
- var onMouseDown = _ref5.onMouseDown,
2534
- onPress = _ref5.onPress,
2535
- _ref5$refKey = _ref5.refKey,
2536
- refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
2537
- disabledProp = _ref5.disabled,
2538
- ref = _ref5.ref,
2539
- rest = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded3$1);
2530
+ var _ref6 = _temp6 === void 0 ? {} : _temp6,
2531
+ itemProp = _ref6.item,
2532
+ indexProp = _ref6.index,
2533
+ onMouseMove = _ref6.onMouseMove;
2534
+ _ref6.onClick;
2535
+ var onMouseDown = _ref6.onMouseDown,
2536
+ onPress = _ref6.onPress,
2537
+ _ref6$refKey = _ref6.refKey,
2538
+ refKey = _ref6$refKey === void 0 ? 'ref' : _ref6$refKey,
2539
+ disabledProp = _ref6.disabled,
2540
+ ref = _ref6.ref,
2541
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref6, _excluded4$1);
2540
2542
  if (disabledProp !== undefined) {
2541
2543
  console.warn('Passing "disabled" as an argument to getItemProps is not supported anymore. Please use the isItemDisabled prop from useSelect.');
2542
2544
  }
@@ -492,7 +492,7 @@ var stateChangeTypes$3 = /*#__PURE__*/Object.freeze({
492
492
  var _excluded$4 = ["refKey", "ref"],
493
493
  _excluded2$3 = ["onClick", "onPress", "onKeyDown", "onKeyUp", "onBlur"],
494
494
  _excluded3$2 = ["onKeyDown", "onBlur", "onChange", "onInput", "onChangeText"],
495
- _excluded4$1 = ["refKey", "ref"],
495
+ _excluded4$2 = ["refKey", "ref"],
496
496
  _excluded5 = ["onMouseMove", "onMouseDown", "onClick", "onPress", "index", "item"];
497
497
  var Downshift = /*#__PURE__*/function () {
498
498
  var Downshift = /*#__PURE__*/function (_Component) {
@@ -995,7 +995,7 @@ var Downshift = /*#__PURE__*/function () {
995
995
  _ref5$refKey = _ref5.refKey,
996
996
  refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
997
997
  ref = _ref5.ref,
998
- props = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded4$1);
998
+ props = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded4$2);
999
999
  var _ref6 = _temp6 === void 0 ? {} : _temp6,
1000
1000
  _ref6$suppressRefErro = _ref6.suppressRefError,
1001
1001
  suppressRefError = _ref6$suppressRefErro === void 0 ? false : _ref6$suppressRefErro;
@@ -1718,19 +1718,12 @@ function useEnhancedReducer(reducer, props, createInitialState, isStateEqual) {
1718
1718
  }, [propsRef]);
1719
1719
  var action = actionRef.current;
1720
1720
  React.useEffect(function () {
1721
- console.log('effect');
1722
1721
  var shouldCallOnChangeProps = action && prevStateRef.current && !isStateEqual(prevStateRef.current, state);
1723
- console.log('passed', prevStateRef.current, state);
1724
1722
  if (shouldCallOnChangeProps) {
1725
1723
  callOnChangeProps(action, getState(prevStateRef.current, action.props), state);
1726
1724
  }
1727
1725
  prevStateRef.current = state;
1728
1726
  }, [state, action, isStateEqual]);
1729
- React.useEffect(function () {
1730
- if (props) {
1731
- prevStateRef.current = getState(prevStateRef.current, props);
1732
- }
1733
- }, [props]);
1734
1727
  return [state, dispatchWithProps];
1735
1728
  }
1736
1729
 
@@ -2343,9 +2336,10 @@ function downshiftSelectReducer(state, action) {
2343
2336
  }
2344
2337
  /* eslint-enable complexity */
2345
2338
 
2346
- var _excluded$2 = ["onMouseLeave", "refKey", "ref"],
2347
- _excluded2$2 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2348
- _excluded3$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2339
+ var _excluded$2 = ["onClick"],
2340
+ _excluded2$2 = ["onMouseLeave", "refKey", "ref"],
2341
+ _excluded3$1 = ["onBlur", "onClick", "onPress", "onKeyDown", "refKey", "ref"],
2342
+ _excluded4$1 = ["item", "index", "onMouseMove", "onClick", "onMouseDown", "onPress", "refKey", "disabled", "ref"];
2349
2343
  useSelect.stateChangeTypes = stateChangeTypes$2;
2350
2344
  function useSelect(userProps) {
2351
2345
  if (userProps === void 0) {
@@ -2601,23 +2595,31 @@ function useSelect(userProps) {
2601
2595
  });
2602
2596
  }, [dispatch]);
2603
2597
  // Getter functions.
2604
- var getLabelProps = React.useCallback(function (labelProps) {
2598
+ var getLabelProps = React.useCallback(function (_temp) {
2599
+ var _ref = _temp === void 0 ? {} : _temp,
2600
+ onClick = _ref.onClick,
2601
+ labelProps = _objectWithoutPropertiesLoose__default["default"](_ref, _excluded$2);
2602
+ var labelHandleClick = function labelHandleClick() {
2603
+ var _toggleButtonRef$curr;
2604
+ (_toggleButtonRef$curr = toggleButtonRef.current) == null || _toggleButtonRef$curr.focus();
2605
+ };
2605
2606
  return _extends__default["default"]({
2606
2607
  id: elementIds.labelId,
2607
- htmlFor: elementIds.toggleButtonId
2608
+ htmlFor: elementIds.toggleButtonId,
2609
+ onClick: callAllEventHandlers(onClick, labelHandleClick)
2608
2610
  }, labelProps);
2609
2611
  }, [elementIds]);
2610
- var getMenuProps = React.useCallback(function (_temp, _temp2) {
2612
+ var getMenuProps = React.useCallback(function (_temp2, _temp3) {
2611
2613
  var _extends2;
2612
- var _ref = _temp === void 0 ? {} : _temp,
2613
- onMouseLeave = _ref.onMouseLeave,
2614
- _ref$refKey = _ref.refKey,
2615
- refKey = _ref$refKey === void 0 ? 'ref' : _ref$refKey,
2616
- ref = _ref.ref,
2617
- rest = _objectWithoutPropertiesLoose__default["default"](_ref, _excluded$2);
2618
2614
  var _ref2 = _temp2 === void 0 ? {} : _temp2,
2619
- _ref2$suppressRefErro = _ref2.suppressRefError,
2620
- suppressRefError = _ref2$suppressRefErro === void 0 ? false : _ref2$suppressRefErro;
2615
+ onMouseLeave = _ref2.onMouseLeave,
2616
+ _ref2$refKey = _ref2.refKey,
2617
+ refKey = _ref2$refKey === void 0 ? 'ref' : _ref2$refKey,
2618
+ ref = _ref2.ref,
2619
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref2, _excluded2$2);
2620
+ var _ref3 = _temp3 === void 0 ? {} : _temp3,
2621
+ _ref3$suppressRefErro = _ref3.suppressRefError,
2622
+ suppressRefError = _ref3$suppressRefErro === void 0 ? false : _ref3$suppressRefErro;
2621
2623
  var menuHandleMouseLeave = function menuHandleMouseLeave() {
2622
2624
  dispatch({
2623
2625
  type: MenuMouseLeave$1
@@ -2628,20 +2630,20 @@ function useSelect(userProps) {
2628
2630
  menuRef.current = menuNode;
2629
2631
  }), _extends2.id = elementIds.menuId, _extends2.role = 'listbox', _extends2['aria-labelledby'] = rest && rest['aria-label'] ? undefined : "" + elementIds.labelId, _extends2.onMouseLeave = callAllEventHandlers(onMouseLeave, menuHandleMouseLeave), _extends2), rest);
2630
2632
  }, [dispatch, setGetterPropCallInfo, elementIds]);
2631
- var getToggleButtonProps = React.useCallback(function (_temp3, _temp4) {
2633
+ var getToggleButtonProps = React.useCallback(function (_temp4, _temp5) {
2632
2634
  var _extends3;
2633
- var _ref3 = _temp3 === void 0 ? {} : _temp3,
2634
- onBlur = _ref3.onBlur;
2635
- _ref3.onClick;
2636
- var onPress = _ref3.onPress;
2637
- _ref3.onKeyDown;
2638
- var _ref3$refKey = _ref3.refKey,
2639
- refKey = _ref3$refKey === void 0 ? 'ref' : _ref3$refKey,
2640
- ref = _ref3.ref,
2641
- rest = _objectWithoutPropertiesLoose__default["default"](_ref3, _excluded2$2);
2642
2635
  var _ref4 = _temp4 === void 0 ? {} : _temp4,
2643
- _ref4$suppressRefErro = _ref4.suppressRefError,
2644
- suppressRefError = _ref4$suppressRefErro === void 0 ? false : _ref4$suppressRefErro;
2636
+ onBlur = _ref4.onBlur;
2637
+ _ref4.onClick;
2638
+ var onPress = _ref4.onPress;
2639
+ _ref4.onKeyDown;
2640
+ var _ref4$refKey = _ref4.refKey,
2641
+ refKey = _ref4$refKey === void 0 ? 'ref' : _ref4$refKey,
2642
+ ref = _ref4.ref,
2643
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref4, _excluded3$1);
2644
+ var _ref5 = _temp5 === void 0 ? {} : _temp5,
2645
+ _ref5$suppressRefErro = _ref5.suppressRefError,
2646
+ suppressRefError = _ref5$suppressRefErro === void 0 ? false : _ref5$suppressRefErro;
2645
2647
  var latestState = latest.current.state;
2646
2648
  var toggleButtonHandleClick = function toggleButtonHandleClick() {
2647
2649
  dispatch({
@@ -2667,20 +2669,20 @@ function useSelect(userProps) {
2667
2669
  setGetterPropCallInfo('getToggleButtonProps', suppressRefError, refKey, toggleButtonRef);
2668
2670
  return toggleProps;
2669
2671
  }, [latest, elementIds, setGetterPropCallInfo, dispatch, mouseAndTouchTrackersRef, toggleButtonKeyDownHandlers]);
2670
- var getItemProps = React.useCallback(function (_temp5) {
2672
+ var getItemProps = React.useCallback(function (_temp6) {
2671
2673
  var _extends4;
2672
- var _ref5 = _temp5 === void 0 ? {} : _temp5,
2673
- itemProp = _ref5.item,
2674
- indexProp = _ref5.index,
2675
- onMouseMove = _ref5.onMouseMove;
2676
- _ref5.onClick;
2677
- var onMouseDown = _ref5.onMouseDown,
2678
- onPress = _ref5.onPress,
2679
- _ref5$refKey = _ref5.refKey,
2680
- refKey = _ref5$refKey === void 0 ? 'ref' : _ref5$refKey,
2681
- disabledProp = _ref5.disabled,
2682
- ref = _ref5.ref,
2683
- rest = _objectWithoutPropertiesLoose__default["default"](_ref5, _excluded3$1);
2674
+ var _ref6 = _temp6 === void 0 ? {} : _temp6,
2675
+ itemProp = _ref6.item,
2676
+ indexProp = _ref6.index,
2677
+ onMouseMove = _ref6.onMouseMove;
2678
+ _ref6.onClick;
2679
+ var onMouseDown = _ref6.onMouseDown,
2680
+ onPress = _ref6.onPress,
2681
+ _ref6$refKey = _ref6.refKey,
2682
+ refKey = _ref6$refKey === void 0 ? 'ref' : _ref6$refKey,
2683
+ disabledProp = _ref6.disabled,
2684
+ ref = _ref6.ref,
2685
+ rest = _objectWithoutPropertiesLoose__default["default"](_ref6, _excluded4$1);
2684
2686
  if (disabledProp !== undefined) {
2685
2687
  console.warn('Passing "disabled" as an argument to getItemProps is not supported anymore. Please use the isItemDisabled prop from useSelect.');
2686
2688
  }