rsuite 5.7.0 → 5.8.1

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [5.8.1](https://github.com/rsuite/rsuite/compare/v5.8.0...v5.8.1) (2022-04-15)
+
+### Bug Fixes
+
+- **Cascader:** infer value and onChange types from data ([#2449](https://github.com/rsuite/rsuite/issues/2449)) ([2a8ef48](https://github.com/rsuite/rsuite/commit/2a8ef481e49dec2570868982e0dbbba808efbc03))
+- **Dropdown.Menu:** de-highlight item when mouse leaving ([#2443](https://github.com/rsuite/rsuite/issues/2443)) ([0d7b963](https://github.com/rsuite/rsuite/commit/0d7b96350b79a41557d1a7b67140c9654755194e))
+
+# [5.8.0](https://github.com/rsuite/rsuite/compare/v5.7.1...v5.8.0) (2022-04-07)
+
+### Bug Fixes
+
+- **RangeSlider:** fix RangeSlider progress bar misalignment ([#2435](https://github.com/rsuite/rsuite/issues/2435)) ([e612ee3](https://github.com/rsuite/rsuite/commit/e612ee3b6bb97217ad08744c6b57b47e21397944))
+- **SelectPicker:** call onSearch with empty string when closed ([#2411](https://github.com/rsuite/rsuite/issues/2411)) ([c6e5d54](https://github.com/rsuite/rsuite/commit/c6e5d54bdda0cdc61b65fbed78518ccef5d7672f))
+- **Toggle:** add missing properties to onChange event target ([#2422](https://github.com/rsuite/rsuite/issues/2422)) ([5d1d5a2](https://github.com/rsuite/rsuite/commit/5d1d5a29a03f642c88aa66851163c9bb20d69684))
+
+### Features
+
+- **Cascader:** add `renderSearchItem` for customizing search result ([#2427](https://github.com/rsuite/rsuite/issues/2427)) ([e1b1dbd](https://github.com/rsuite/rsuite/commit/e1b1dbd2fd6cde10dfb1e041d9483b6748a0855f))
+- **DateRangePicker:** export type definition ([#2434](https://github.com/rsuite/rsuite/issues/2434)) ([76e4bc3](https://github.com/rsuite/rsuite/commit/76e4bc38e8e939ae6ffbcf5bc154281b4ec9360c))
+
+## [5.7.1](https://github.com/rsuite/rsuite/compare/v5.7.0...v5.7.1) (2022-04-02)
+
+### Bug Fixes
+
+- **Checkbox:** correct checked state in onChange callback ([#2430](https://github.com/rsuite/rsuite/issues/2430)) ([c6819f9](https://github.com/rsuite/rsuite/commit/c6819f98fe33e197376ecd1e301eaa471c6c2178))
+
 # [5.7.0](https://github.com/rsuite/rsuite/compare/v5.6.6...v5.7.0) (2022-03-31)
 
 ### Bug Fixes

package/cjs/Cascader/Cascader.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 import { PickerLocale } from '../locales';
-import { PickerComponent } from '../Picker';
+import { PickerInstance } from '../Picker';
 import { ItemDataType, FormControlPickerProps } from '../@types/common';
 export declare type ValueType = number | string;
-export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T | null, PickerLocale, ItemDataType> {
+export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T | null, PickerLocale, ItemDataType<T>> {
     /** Sets the width of the menu */
     menuWidth?: number;
     /** Sets the height of the menu */
@@ -18,6 +18,8 @@ export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T |
     renderMenu?: (items: ItemDataType[], menu: React.ReactNode, parentNode?: any, layer?: number) => React.ReactNode;
     /** Custom render menu items */
     renderMenuItem?: (itemLabel: React.ReactNode, item: ItemDataType) => React.ReactNode;
+    /** Custom render search items */
+    renderSearchItem?: (itemLabel: React.ReactNode, items: ItemDataType[]) => React.ReactNode;
     /** Custom render selected items */
     renderValue?: (value: T, selectedPaths: ItemDataType[], selectedElement: React.ReactNode) => React.ReactNode;
     /** Called when the option is selected */
@@ -29,5 +31,12 @@ export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T |
     /** Asynchronously load the children of the tree node. */
     getChildren?: (node: ItemDataType) => ItemDataType[] | Promise<ItemDataType[]>;
 }
-declare const Cascader: PickerComponent<CascaderProps>;
+export interface CascaderComponent {
+    <T>(props: CascaderProps<T> & {
+        ref?: React.Ref<PickerInstance>;
+    }): JSX.Element | null;
+    displayName?: string;
+    propTypes?: React.WeakValidationMap<CascaderProps<any>>;
+}
+declare const Cascader: CascaderComponent;
 export default Cascader;

package/cjs/Cascader/Cascader.js

@@ -75,6 +75,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
       id = props.id,
       renderMenuItem = props.renderMenuItem,
+      renderSearchItem = props.renderSearchItem,
       renderValue = props.renderValue,
       renderMenu = props.renderMenu,
       renderExtraFooter = props.renderExtraFooter,
@@ -87,7 +88,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onClose = props.onClose,
       onOpen = props.onOpen,
       getChildren = props.getChildren,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "data", "classPrefix", "childrenKey", "valueKey", "labelKey", "defaultValue", "placeholder", "disabled", "disabledItemValues", "appearance", "cleanable", "locale", "toggleAs", "style", "value", "inline", "menuClassName", "menuStyle", "menuWidth", "menuHeight", "searchable", "parentSelectable", "placement", "id", "renderMenuItem", "renderValue", "renderMenu", "renderExtraFooter", "onEnter", "onExited", "onClean", "onChange", "onSelect", "onSearch", "onClose", "onOpen", "getChildren"]); // Use component active state to support keyboard events.
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "data", "classPrefix", "childrenKey", "valueKey", "labelKey", "defaultValue", "placeholder", "disabled", "disabledItemValues", "appearance", "cleanable", "locale", "toggleAs", "style", "value", "inline", "menuClassName", "menuStyle", "menuWidth", "menuHeight", "searchable", "parentSelectable", "placement", "id", "renderMenuItem", "renderSearchItem", "renderValue", "renderMenu", "renderExtraFooter", "onEnter", "onExited", "onClean", "onChange", "onSelect", "onSearch", "onClose", "onOpen", "getChildren"]); // Use component active state to support keyboard events.
 
   var _useState = (0, _react.useState)(false),
       active = _useState[0],
@@ -102,9 +103,9 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var targetRef = (0, _react.useRef)(null);
   var searchInputRef = (0, _react.useRef)(null);
 
-  var _useControlled = (0, _utils2.useControlled)(valueProp, defaultValue),
-      value = _useControlled[0],
-      setValue = _useControlled[1];
+  var _ref = (0, _utils2.useControlled)(valueProp, defaultValue),
+      value = _ref[0],
+      setValue = _ref[1];
 
   var _usePaths = (0, _utils.usePaths)({
     data: data,
@@ -380,6 +381,12 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       'cascader-row-disabled': disabled,
       'cascader-row-focus': item[valueKey] === focusItemValue
     });
+    var label = formattedNodes.map(function (node, index) {
+      return /*#__PURE__*/_react.default.createElement("span", {
+        key: "col-" + index,
+        className: prefix('cascader-col')
+      }, node[labelKey]);
+    });
     return /*#__PURE__*/_react.default.createElement("div", {
       key: key,
       "aria-disabled": disabled,
@@ -390,12 +397,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
           handleSearchRowSelect(item, nodes, event);
         }
       }
-    }, formattedNodes.map(function (node, index) {
-      return /*#__PURE__*/_react.default.createElement("span", {
-        key: "col-" + index,
-        className: prefix('cascader-col')
-      }, node[labelKey]);
-    }));
+    }, renderSearchItem ? renderSearchItem(label, nodes) : label);
   };
 
   var renderSearchResultPanel = function renderSearchResultPanel() {
@@ -413,10 +415,10 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   };
 
   var renderDropdownMenu = function renderDropdownMenu(positionProps, speakerRef) {
-    var _ref = positionProps || {},
-        left = _ref.left,
-        top = _ref.top,
-        className = _ref.className;
+    var _ref2 = positionProps || {},
+        left = _ref2.left,
+        top = _ref2.top,
+        className = _ref2.className;
 
     var styles = (0, _extends3.default)({}, menuStyle, {
       left: left,
@@ -533,6 +535,7 @@ Cascader.propTypes = (0, _extends3.default)({}, _Picker.listPickerPropTypes, {
   onSearch: _propTypes.default.func,
   cleanable: _propTypes.default.bool,
   renderMenuItem: _propTypes.default.func,
+  renderSearchItem: _propTypes.default.func,
   menuWidth: _propTypes.default.number,
   menuHeight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   searchable: _propTypes.default.bool,

package/cjs/Cascader/test/Cascader.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/Cascader/test/Cascader.test.js

@@ -0,0 +1,70 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _tsExpect = require("ts-expect");
+
+var _Cascader = _interopRequireDefault(require("../Cascader"));
+
+// Infer value and onChange types from data
+var numberValuedData = [{
+  label: 'One',
+  value: 1
+}];
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  data: numberValuedData,
+  value: 1
+}); // @ts-expect-error should not accept string value
+
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  data: numberValuedData,
+  value: "1"
+});
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  data: numberValuedData,
+  onChange: function onChange(newValue) {
+    (0, _tsExpect.expectType)(newValue);
+  }
+});
+
+var stringValuedData = [{
+  label: 'One',
+  value: 'One'
+}];
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  data: stringValuedData,
+  value: "1"
+}); // @ts-expect-error should not accept number value
+
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  data: stringValuedData,
+  value: 1
+});
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  data: stringValuedData,
+  onChange: function onChange(newValue) {
+    (0, _tsExpect.expectType)(newValue);
+  }
+});
+
+var pickerRef = /*#__PURE__*/_react.default.createRef();
+
+/*#__PURE__*/
+_react.default.createElement(_Cascader.default, {
+  ref: pickerRef,
+  data: []
+});

package/cjs/Checkbox/Checkbox.js

@@ -112,7 +112,7 @@ var Checkbox = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }
 
   var handleChange = (0, _react.useCallback)(function (event) {
-    var nextChecked = !event.target.checked;
+    var nextChecked = event.target.checked;
 
     if (disabled || readOnly) {
       return;

package/cjs/DateRangePicker/index.d.ts

@@ -1,3 +1,4 @@
 import DateRangePicker from './DateRangePicker';
 export type { DateRangePicker, DateRangePickerProps } from './DateRangePicker';
+export type { ValueType, DateRange, RangeType, DisabledDateFunction } from './types';
 export default DateRangePicker;

package/cjs/InputNumber/InputNumber.js

@@ -74,7 +74,7 @@ function decimals() {
  */
 
 
-function disableMaxValue(value, max) {
+function valueReachesMax(value, max) {
   if (!(0, _isNil.default)(value)) {
     return +value >= max;
   }
@@ -88,7 +88,7 @@ function disableMaxValue(value, max) {
  */
 
 
-function disableMinValue(value, min) {
+function valueReachesMin(value, min) {
   if (!(0, _isNil.default)(value)) {
     return +value <= min;
   }
@@ -128,18 +128,6 @@ var InputNumber = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       value = _useControlled[0],
       setValue = _useControlled[1];
 
-  var _useState = (0, _react.useState)(function () {
-    return disableMaxValue(value, max);
-  }),
-      disabledUpButton = _useState[0],
-      setDisabledUpButton = _useState[1];
-
-  var _useState2 = (0, _react.useState)(function () {
-    return disableMinValue(value, min);
-  }),
-      disabledDownButton = _useState2[0],
-      setDisabledDownButton = _useState2[1];
-
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
       merge = _useClassNames.merge,
@@ -154,14 +142,10 @@ var InputNumber = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var inputRef = (0, _react.useRef)();
   var handleChangeValue = (0, _react.useCallback)(function (currentValue, event) {
     if (currentValue !== value) {
-      // Disable the up button when the value is greater than the maximum value.
-      setDisabledUpButton(disableMaxValue(currentValue, max)); // Disable the down button when the value is greater than the minimum value.
-
-      setDisabledDownButton(disableMinValue(currentValue, min));
       setValue(currentValue);
       onChange === null || onChange === void 0 ? void 0 : onChange(currentValue, event);
     }
-  }, [max, min, onChange, setValue, value]);
+  }, [onChange, setValue, value]);
   var getSafeValue = (0, _react.useCallback)(function (value) {
     if (!Number.isNaN(value)) {
       if (+value > max) {
@@ -176,27 +160,34 @@ var InputNumber = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return value.toString();
-  }, [max, min]);
-  var handlePlus = (0, _react.useCallback)(function (event) {
+  }, [max, min]); // Increment value by step
+
+  var handleStepUp = (0, _react.useCallback)(function (event) {
     var val = +(value || 0);
     var bit = decimals(val, step);
     handleChangeValue(getSafeValue((val + step).toFixed(bit)), event);
-  }, [getSafeValue, handleChangeValue, step, value]);
-  var handleMinus = (0, _react.useCallback)(function (event) {
+  }, [getSafeValue, handleChangeValue, step, value]); // Decrement value by step
+
+  var handleStepDown = (0, _react.useCallback)(function (event) {
     var val = +(value || 0);
     var bit = decimals(val, step);
     handleChangeValue(getSafeValue((val - step).toFixed(bit)), event);
-  }, [getSafeValue, handleChangeValue, step, value]);
+  }, [getSafeValue, handleChangeValue, step, value]); // Disables step up/down button when
+  // - InputNumber is disabled/readonly
+  // - value reaches max/min limits
+
+  var stepUpDisabled = disabled || readOnly || valueReachesMax(value, max);
+  var stepDownDisabled = disabled || readOnly || valueReachesMin(value, min);
   var handleKeyDown = (0, _react.useCallback)(function (event) {
     switch (event.key) {
       case _utils.KEY_VALUES.UP:
         event.preventDefault();
-        handlePlus(event);
+        handleStepUp(event);
         break;
 
       case _utils.KEY_VALUES.DOWN:
         event.preventDefault();
-        handleMinus(event);
+        handleStepDown(event);
         break;
 
       case _utils.KEY_VALUES.HOME:
@@ -215,23 +206,23 @@ var InputNumber = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
         break;
     }
-  }, [handlePlus, handleMinus, minProp, maxProp, handleChangeValue, getSafeValue]);
+  }, [handleStepUp, handleStepDown, minProp, maxProp, handleChangeValue, getSafeValue]);
   var handleWheel = (0, _react.useCallback)(function (event) {
     if (!disabled && !readOnly && event.target === document.activeElement) {
       event.preventDefault();
       var delta = event['wheelDelta'] || -event.deltaY || -(event === null || event === void 0 ? void 0 : event.detail);
 
       if (delta > 0) {
-        handleMinus(event);
+        handleStepDown(event);
       }
 
       if (delta < 0) {
-        handlePlus(event);
+        handleStepUp(event);
       }
     }
 
     onWheel === null || onWheel === void 0 ? void 0 : onWheel(event);
-  }, [disabled, handleMinus, handlePlus, onWheel, readOnly]);
+  }, [disabled, handleStepDown, handleStepUp, onWheel, readOnly]);
   var handleChange = (0, _react.useCallback)(function (value, event) {
     if (!/^-?(?:\d+)?(\.)?\d*$/.test(value) && value !== '') {
       return;
@@ -291,14 +282,16 @@ var InputNumber = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     tabIndex: -1,
     appearance: buttonAppearance,
     className: prefix('touchspin-up'),
-    onClick: handlePlus,
-    disabled: disabledUpButton || disabled || readOnly
+    onClick: handleStepUp,
+    disabled: stepUpDisabled,
+    "aria-label": "Increment"
   }, /*#__PURE__*/_react.default.createElement(_AngleUp.default, null)), /*#__PURE__*/_react.default.createElement(_Button.default, {
     tabIndex: -1,
     appearance: buttonAppearance,
     className: prefix('touchspin-down'),
-    onClick: handleMinus,
-    disabled: disabledDownButton || disabled || readOnly
+    onClick: handleStepDown,
+    disabled: stepDownDisabled,
+    "aria-label": "Decrement"
   }, /*#__PURE__*/_react.default.createElement(_AngleDown.default, null))), postfix && /*#__PURE__*/_react.default.createElement(_InputGroupAddon.default, null, postfix));
 });
 

package/cjs/Menu/MenuItem.js

@@ -112,6 +112,7 @@ function MenuItem(props) {
   if ((menuState === null || menuState === void 0 ? void 0 : menuState.role) === 'menubar') {
     menuitemProps.onMouseDown = handleMouseDown;
     menuitemProps.onMouseOver = handleMouseMove;
+    menuitemProps.onMouseLeave = handleMouseLeave;
   }
 
   return children(menuitemProps, menuitemRef);

package/cjs/RangeSlider/RangeSlider.js

@@ -278,7 +278,9 @@ var RangeSlider = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       end = v;
     }
 
-    var nextValue = getValidValue([start, end].sort());
+    var nextValue = getValidValue([start, end].sort(function (a, b) {
+      return a - b;
+    }));
 
     if (isRangeMatchingConstraint(nextValue)) {
       setValue(nextValue);

package/cjs/SelectPicker/SelectPicker.d.ts

@@ -32,7 +32,7 @@ export interface SelectProps<T> {
     /** Called after clicking the group title */
     onGroupTitleClick?: (event: React.SyntheticEvent) => void;
     /** Called when searching */
-    onSearch?: (searchKeyword: string, event: React.SyntheticEvent) => void;
+    onSearch?: (searchKeyword: string, event?: React.SyntheticEvent) => void;
     /** Called when clean */
     onClean?: (event: React.SyntheticEvent) => void;
 }

package/cjs/SelectPicker/SelectPicker.js

@@ -202,8 +202,9 @@ var SelectPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   var handleExited = (0, _react.useCallback)(function () {
     setSearchKeyword('');
     setActive(false);
+    onSearch === null || onSearch === void 0 ? void 0 : onSearch('');
     onClose === null || onClose === void 0 ? void 0 : onClose();
-  }, [onClose, setSearchKeyword]);
+  }, [onClose, setSearchKeyword, onSearch]);
   var handleEntered = (0, _react.useCallback)(function () {
     setActive(true);
     setFocusItemValue(value);

package/cjs/Toggle/Toggle.js

@@ -61,6 +61,11 @@ var Toggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }));
   var inner = checked ? checkedChildren : unCheckedChildren;
   var label = checked ? locale.on : locale.off;
+
+  var _partitionHTMLProps = (0, _utils.partitionHTMLProps)(rest),
+      htmlInputProps = _partitionHTMLProps[0],
+      restProps = _partitionHTMLProps[1];
+
   var handleInputChange = (0, _react.useCallback)(function (e) {
     if (disabled || readOnly || loading) {
       return;
@@ -78,7 +83,7 @@ var Toggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement("label", (0, _extends2.default)({
     ref: ref,
     className: classes
-  }, rest), /*#__PURE__*/_react.default.createElement("input", {
+  }, restProps), /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, htmlInputProps, {
     ref: inputRef,
     type: "checkbox",
     checked: checkedProp,
@@ -92,7 +97,7 @@ var Toggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     "aria-disabled": disabled,
     "aria-label": typeof inner === 'string' ? inner : label,
     "aria-busy": loading || undefined
-  }), /*#__PURE__*/_react.default.createElement(Component, {
+  })), /*#__PURE__*/_react.default.createElement(Component, {
     className: prefix('presentation')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: prefix('inner')