rsuite 5.7.0 → 5.8.1

package/esm/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/esm/Cascader/Cascader.js

@@ -51,6 +51,7 @@ var Cascader = /*#__PURE__*/React.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,
@@ -63,7 +64,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onClose = props.onClose,
       onOpen = props.onOpen,
       getChildren = props.getChildren,
-      rest = _objectWithoutPropertiesLoose(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 = _objectWithoutPropertiesLoose(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 = useState(false),
@@ -79,9 +80,9 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var targetRef = useRef(null);
   var searchInputRef = useRef(null);
 
-  var _useControlled = useControlled(valueProp, defaultValue),
-      value = _useControlled[0],
-      setValue = _useControlled[1];
+  var _ref = useControlled(valueProp, defaultValue),
+      value = _ref[0],
+      setValue = _ref[1];
 
   var _usePaths = usePaths({
     data: data,
@@ -357,6 +358,12 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       'cascader-row-disabled': disabled,
       'cascader-row-focus': item[valueKey] === focusItemValue
     });
+    var label = formattedNodes.map(function (node, index) {
+      return /*#__PURE__*/React.createElement("span", {
+        key: "col-" + index,
+        className: prefix('cascader-col')
+      }, node[labelKey]);
+    });
     return /*#__PURE__*/React.createElement("div", {
       key: key,
       "aria-disabled": disabled,
@@ -367,12 +374,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
           handleSearchRowSelect(item, nodes, event);
         }
       }
-    }, formattedNodes.map(function (node, index) {
-      return /*#__PURE__*/React.createElement("span", {
-        key: "col-" + index,
-        className: prefix('cascader-col')
-      }, node[labelKey]);
-    }));
+    }, renderSearchItem ? renderSearchItem(label, nodes) : label);
   };
 
   var renderSearchResultPanel = function renderSearchResultPanel() {
@@ -390,10 +392,10 @@ var Cascader = /*#__PURE__*/React.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 = _extends({}, menuStyle, {
       left: left,
@@ -510,6 +512,7 @@ Cascader.propTypes = _extends({}, listPickerPropTypes, {
   onSearch: PropTypes.func,
   cleanable: PropTypes.bool,
   renderMenuItem: PropTypes.func,
+  renderSearchItem: PropTypes.func,
   menuWidth: PropTypes.number,
   menuHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   searchable: PropTypes.bool,

package/esm/Cascader/test/Cascader.test.d.ts

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

package/esm/Cascader/test/Cascader.test.js

@@ -0,0 +1,59 @@
+import React from 'react';
+import { expectType } from 'ts-expect';
+import Cascader from '../Cascader'; // Infer value and onChange types from data
+
+var numberValuedData = [{
+  label: 'One',
+  value: 1
+}];
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  data: numberValuedData,
+  value: 1
+}); // @ts-expect-error should not accept string value
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  data: numberValuedData,
+  value: "1"
+});
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  data: numberValuedData,
+  onChange: function onChange(newValue) {
+    expectType(newValue);
+  }
+});
+var stringValuedData = [{
+  label: 'One',
+  value: 'One'
+}];
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  data: stringValuedData,
+  value: "1"
+}); // @ts-expect-error should not accept number value
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  data: stringValuedData,
+  value: 1
+});
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  data: stringValuedData,
+  onChange: function onChange(newValue) {
+    expectType(newValue);
+  }
+});
+var pickerRef = /*#__PURE__*/React.createRef();
+
+/*#__PURE__*/
+React.createElement(Cascader, {
+  ref: pickerRef,
+  data: []
+});

package/esm/Checkbox/Checkbox.js

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

package/esm/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/esm/InputNumber/InputNumber.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useState, useCallback, useEffect, useRef } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import isNil from 'lodash/isNil';
 import AngleUpIcon from '@rsuite/icons/legacy/AngleUp';
@@ -53,7 +53,7 @@ function decimals() {
  */
 
 
-function disableMaxValue(value, max) {
+function valueReachesMax(value, max) {
   if (!isNil(value)) {
     return +value >= max;
   }
@@ -67,7 +67,7 @@ function disableMaxValue(value, max) {
  */
 
 
-function disableMinValue(value, min) {
+function valueReachesMin(value, min) {
   if (!isNil(value)) {
     return +value <= min;
   }
@@ -108,18 +108,6 @@ var InputNumber = /*#__PURE__*/React.forwardRef(function (props, ref) {
       value = _useControlled[0],
       setValue = _useControlled[1];
 
-  var _useState = useState(function () {
-    return disableMaxValue(value, max);
-  }),
-      disabledUpButton = _useState[0],
-      setDisabledUpButton = _useState[1];
-
-  var _useState2 = useState(function () {
-    return disableMinValue(value, min);
-  }),
-      disabledDownButton = _useState2[0],
-      setDisabledDownButton = _useState2[1];
-
   var _useClassNames = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
       merge = _useClassNames.merge,
@@ -134,14 +122,10 @@ var InputNumber = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var inputRef = useRef();
   var handleChangeValue = 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 = useCallback(function (value) {
     if (!Number.isNaN(value)) {
       if (+value > max) {
@@ -156,27 +140,34 @@ var InputNumber = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
 
     return value.toString();
-  }, [max, min]);
-  var handlePlus = useCallback(function (event) {
+  }, [max, min]); // Increment value by step
+
+  var handleStepUp = 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 = useCallback(function (event) {
+  }, [getSafeValue, handleChangeValue, step, value]); // Decrement value by step
+
+  var handleStepDown = 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 = useCallback(function (event) {
     switch (event.key) {
       case KEY_VALUES.UP:
         event.preventDefault();
-        handlePlus(event);
+        handleStepUp(event);
         break;
 
       case KEY_VALUES.DOWN:
         event.preventDefault();
-        handleMinus(event);
+        handleStepDown(event);
         break;
 
       case KEY_VALUES.HOME:
@@ -195,23 +186,23 @@ var InputNumber = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
         break;
     }
-  }, [handlePlus, handleMinus, minProp, maxProp, handleChangeValue, getSafeValue]);
+  }, [handleStepUp, handleStepDown, minProp, maxProp, handleChangeValue, getSafeValue]);
   var handleWheel = 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 = useCallback(function (value, event) {
     if (!/^-?(?:\d+)?(\.)?\d*$/.test(value) && value !== '') {
       return;
@@ -270,14 +261,16 @@ var InputNumber = /*#__PURE__*/React.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.createElement(AngleUpIcon, null)), /*#__PURE__*/React.createElement(Button, {
     tabIndex: -1,
     appearance: buttonAppearance,
     className: prefix('touchspin-down'),
-    onClick: handleMinus,
-    disabled: disabledDownButton || disabled || readOnly
+    onClick: handleStepDown,
+    disabled: stepDownDisabled,
+    "aria-label": "Decrement"
   }, /*#__PURE__*/React.createElement(AngleDownIcon, null))), postfix && /*#__PURE__*/React.createElement(InputGroupAddon, null, postfix));
 });
 InputNumber.displayName = 'InputNumber';

package/esm/Menu/MenuItem.js

@@ -99,6 +99,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/esm/RangeSlider/RangeSlider.js

@@ -255,7 +255,9 @@ var RangeSlider = /*#__PURE__*/React.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/esm/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/esm/SelectPicker/SelectPicker.js

@@ -182,8 +182,9 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var handleExited = 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 = useCallback(function () {
     setActive(true);
     setFocusItemValue(value);

package/esm/Toggle/Toggle.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { useClassNames, useControlled, useCustom } from '../utils';
+import { partitionHTMLProps, useClassNames, useControlled, useCustom } from '../utils';
 import Plaintext from '../Plaintext';
 import Loader from '../Loader';
 var Toggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -46,6 +46,11 @@ var Toggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }));
   var inner = checked ? checkedChildren : unCheckedChildren;
   var label = checked ? locale.on : locale.off;
+
+  var _partitionHTMLProps = partitionHTMLProps(rest),
+      htmlInputProps = _partitionHTMLProps[0],
+      restProps = _partitionHTMLProps[1];
+
   var handleInputChange = useCallback(function (e) {
     if (disabled || readOnly || loading) {
       return;
@@ -63,7 +68,7 @@ var Toggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("label", _extends({
     ref: ref,
     className: classes
-  }, rest), /*#__PURE__*/React.createElement("input", {
+  }, restProps), /*#__PURE__*/React.createElement("input", _extends({}, htmlInputProps, {
     ref: inputRef,
     type: "checkbox",
     checked: checkedProp,
@@ -77,7 +82,7 @@ var Toggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     "aria-disabled": disabled,
     "aria-label": typeof inner === 'string' ? inner : label,
     "aria-busy": loading || undefined
-  }), /*#__PURE__*/React.createElement(Component, {
+  })), /*#__PURE__*/React.createElement(Component, {
     className: prefix('presentation')
   }, /*#__PURE__*/React.createElement("span", {
     className: prefix('inner')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.7.0",
+  "version": "5.8.1",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",