rsuite 5.8.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 */
@@ -31,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

@@ -80,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,
@@ -392,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,

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/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/package.json

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