rsuite 5.19.1 → 5.20.0-beta.6

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [5.20.0](https://github.com/rsuite/rsuite/compare/v5.19.1...v5.20.0) (2022-10-21)
+
+### Bug Fixes
+
+- **DatePicker:** reset calendar selection after closing picker menu ([#2807](https://github.com/rsuite/rsuite/issues/2807)) ([1ef91a8](https://github.com/rsuite/rsuite/commit/1ef91a846fc6d99c7479e96994aa50da2af9ef9e))
+- **Form.Control:** when shouldResetWithUnmount should remove value and error ([#2802](https://github.com/rsuite/rsuite/issues/2802)) ([f8d108a](https://github.com/rsuite/rsuite/commit/f8d108aed3e94811491be63e3373008d12e83b60))
+
+### Features
+
+- **SelectPicker,CheckPicker:** add `loading` prop ([#2808](https://github.com/rsuite/rsuite/issues/2808)) ([3a5e5d5](https://github.com/rsuite/rsuite/commit/3a5e5d5d4b891373c8a05ec4d642103f75920f10))
+
 ## [5.19.1](https://github.com/rsuite/rsuite/compare/v5.19.0...v5.19.1) (2022-10-13)
 
 ### Bug Fixes

package/Picker/styles/index.less

@@ -18,6 +18,10 @@
     max-width: 100%;
   }
 
+  &-toggle {
+    min-width: 75px;
+  }
+
   &-toggle.rs-btn {
     .rs-ripple-pond {
       display: none !important;

package/Windowing/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "rsuite/Windowing",
+  "private": true,
+  "main": "../cjs/Windowing/index.js",
+  "module": "../esm/Windowing/index.js",
+  "types": "../esm/Windowing/index.d.ts"
+}

package/cjs/Calendar/MonthDropdown.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
 export interface MonthDropdownProps extends WithAsProps {
     show?: boolean;
+    limitStartYear?: number;
     limitEndYear?: number;
     height?: number;
     width?: number;

package/cjs/Calendar/MonthDropdown.js

@@ -15,7 +15,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _VirtualizedList = require("../Picker/VirtualizedList");
+var _Windowing = require("../Windowing");
 
 var _utils = require("../utils");
 
@@ -24,22 +24,6 @@ var _MonthDropdownItem = _interopRequireDefault(require("./MonthDropdownItem"));
 var _CalendarContext = require("./CalendarContext");
 
 var monthMap = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
-/**
- * Set the row height.
- * Add 1px to the first and last lines.
- */
-
-function getRowHeight(count) {
-  return function (_ref) {
-    var index = _ref.index;
-
-    if (index === 0 || count - 1 === index) {
-      return 75 + 1;
-    }
-
-    return 75;
-  };
-}
 
 var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
@@ -47,6 +31,7 @@ var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       className = props.className,
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? 'calendar-month-dropdown' : _props$classPrefix,
+      limitStartYear = props.limitStartYear,
       _props$limitEndYear = props.limitEndYear,
       limitEndYear = _props$limitEndYear === void 0 ? 5 : _props$limitEndYear,
       show = props.show,
@@ -55,7 +40,7 @@ var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       _props$width = props.width,
       defaultWidth = _props$width === void 0 ? 256 : _props$width,
       disabledMonth = props.disabledMonth,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "limitEndYear", "show", "height", "width", "disabledMonth"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "limitStartYear", "limitEndYear", "show", "height", "width", "disabledMonth"]);
 
   var _useCalendarContext = (0, _CalendarContext.useCalendarContext)(),
       _useCalendarContext$d = _useCalendarContext.date,
@@ -66,9 +51,13 @@ var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       merge = _useClassNames.merge,
       withClassPrefix = _useClassNames.withClassPrefix;
 
-  var getRowCount = (0, _react.useCallback)(function () {
-    return _utils.DateUtils.getYear(new Date()) + limitEndYear;
-  }, [limitEndYear]);
+  var thisYear = _utils.DateUtils.getYear(new Date());
+
+  var startYear = limitStartYear ? thisYear - limitStartYear : 1900;
+  var rowCount = (0, _react.useMemo)(function () {
+    var endYear = thisYear + limitEndYear;
+    return endYear - startYear;
+  }, [limitEndYear, startYear, thisYear]);
   var isMonthDisabled = (0, _react.useCallback)(function (year, month) {
     if (disabledMonth) {
       var days = _utils.DateUtils.getDaysInMonth(new Date(year, month)); // If all dates in a month are disabled, disable the current month
@@ -86,29 +75,26 @@ var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     return false;
   }, [disabledMonth]);
 
-  var rowRenderer = function rowRenderer(_ref2) {
-    var index = _ref2.index,
-        key = _ref2.key,
-        style = _ref2.style;
+  var rowRenderer = function rowRenderer(_ref) {
+    var index = _ref.index,
+        style = _ref.style;
 
     var selectedMonth = _utils.DateUtils.getMonth(date);
 
     var selectedYear = _utils.DateUtils.getYear(date);
 
-    var year = index + 1;
+    var year = startYear + index;
     var isSelectedYear = year === selectedYear;
-    var count = getRowCount();
     var titleClassName = prefix('year', {
       'year-active': isSelectedYear
     });
     var rowClassName = merge(prefix('row'), {
       'first-row': index === 0,
-      'last-row': index === count - 1
+      'last-row': index === rowCount - 1
     });
     return /*#__PURE__*/_react.default.createElement("div", {
       className: rowClassName,
       role: "row",
-      key: key,
       style: style
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: titleClassName,
@@ -127,10 +113,12 @@ var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     })));
   };
 
-  var count = getRowCount();
   var classes = merge(className, withClassPrefix(), {
     show: show
   });
+  var itemSize = 75;
+  var initialItemIndex = _utils.DateUtils.getYear(date) - startYear;
+  var initialScrollOffset = itemSize * initialItemIndex;
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     role: "menu"
   }, rest, {
@@ -140,21 +128,20 @@ var MonthDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     className: prefix('content')
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: prefix('scroll')
-  }, show && /*#__PURE__*/_react.default.createElement(_VirtualizedList.AutoSizer, {
+  }, show && /*#__PURE__*/_react.default.createElement(_Windowing.AutoSizer, {
     defaultHeight: defaultHeight,
     defaultWidth: defaultWidth
-  }, function (_ref3) {
-    var height = _ref3.height,
-        width = _ref3.width;
-    return /*#__PURE__*/_react.default.createElement(_VirtualizedList.List, {
+  }, function (_ref2) {
+    var height = _ref2.height,
+        width = _ref2.width;
+    return /*#__PURE__*/_react.default.createElement(_Windowing.FixedSizeList, {
       className: prefix('row-wrapper'),
       width: width || defaultWidth,
       height: height || defaultHeight,
-      rowHeight: getRowHeight(count),
-      rowCount: count,
-      scrollToIndex: _utils.DateUtils.getYear(date),
-      rowRenderer: rowRenderer
-    });
+      itemSize: itemSize,
+      itemCount: rowCount,
+      initialScrollOffset: initialScrollOffset
+    }, rowRenderer);
   }))));
 });
 

package/cjs/Cascader/Cascader.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PickerLocale } from '../locales';
-import { PickerInstance } from '../Picker';
+import { PickerHandle } 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<T>> {
@@ -33,7 +33,7 @@ export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T |
 }
 export interface CascaderComponent {
     <T>(props: CascaderProps<T> & {
-        ref?: React.Ref<PickerInstance>;
+        ref?: React.Ref<PickerHandle>;
     }): JSX.Element | null;
     displayName?: string;
     propTypes?: React.WeakValidationMap<CascaderProps<any>>;

package/cjs/Cascader/DropdownMenu.js

@@ -68,7 +68,10 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
   var classes = merge(className, prefix('items'));
   var rootRef = (0, _react.useRef)();
-  var rtl = (0, _utils.useCustom)('DropdownMenu');
+
+  var _useCustom = (0, _utils.useCustom)('DropdownMenu'),
+      rtl = _useCustom.rtl;
+
   (0, _react.useEffect)(function () {
     var _rootRef$current;
 
@@ -119,7 +122,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }); // Use `value` in keys when If `value` is string or number
 
     var onlyKey = typeof value === 'number' || typeof value === 'string' ? value : index;
-    var Icon = node.loading ? _Spinner.default : rtl ? _AngleRight.default : _AngleLeft.default;
+    var Icon = node.loading ? _Spinner.default : rtl ? _AngleLeft.default : _AngleRight.default;
     return /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenuItem, {
       classPrefix: "picker-cascader-menu-item",
       as: 'li',

package/cjs/CheckPicker/CheckPicker.d.ts

@@ -1,6 +1,6 @@
 import React, { Ref } from 'react';
 import { PickerLocale } from '../locales';
-import { PickerInstance, PickerToggleProps } from '../Picker';
+import { PickerHandle, PickerToggleProps } from '../Picker';
 import { ItemDataType, FormControlPickerProps } from '../@types/common';
 import type { MultipleSelectProps } from '../SelectPicker';
 export declare type ValueType = (number | string)[];
@@ -12,7 +12,7 @@ export interface CheckPickerProps<T> extends FormControlPickerProps<T[], PickerL
 }
 export interface CheckPickerComponent {
     <T>(props: CheckPickerProps<T> & {
-        ref?: Ref<PickerInstance>;
+        ref?: Ref<PickerHandle>;
     }): JSX.Element | null;
     displayName?: string;
     propTypes?: React.WeakValidationMap<CheckPickerProps<any>>;

package/cjs/CheckPicker/CheckPicker.js

@@ -104,6 +104,7 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var targetRef = (0, _react.useRef)(null);
   var overlayRef = (0, _react.useRef)(null);
   var searchInputRef = (0, _react.useRef)(null);
+  var listRef = (0, _react.useRef)(null);
 
   var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
       locale = _useCustom.locale;
@@ -258,7 +259,8 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   (0, _Picker.usePublicMethods)(ref, {
     triggerRef: triggerRef,
     overlayRef: overlayRef,
-    targetRef: targetRef
+    targetRef: targetRef,
+    listRef: listRef
   });
   var selectedItems = data.filter(function (item) {
     return value === null || value === void 0 ? void 0 : value.some(function (val) {
@@ -329,6 +331,7 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var menu = items.length || filteredStickyItems.length ? /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenu, {
       id: id ? id + "-listbox" : undefined,
       listProps: listProps,
+      listRef: listRef,
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
       labelKey: labelKey,

package/cjs/CheckTreePicker/CheckTreePicker.js

@@ -29,7 +29,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _VirtualizedList = require("../Picker/VirtualizedList");
+var _Windowing = require("../Windowing");
 
 var _CheckTreeNode = _interopRequireDefault(require("./CheckTreeNode"));
 
@@ -45,6 +45,10 @@ var _utils2 = require("./utils");
 
 var emptyArray = [];
 
+var itemSize = function itemSize() {
+  return 36;
+};
+
 var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -626,34 +630,31 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }, nodeProps));
   };
 
-  var renderVirtualListNode = function renderVirtualListNode(nodes) {
-    return function (_ref3) {
-      var key = _ref3.key,
-          index = _ref3.index,
-          style = _ref3.style;
-      var node = nodes[index];
-      var layer = node.layer,
-          refKey = node.refKey,
-          visible = node.visible;
-      var expand = (0, _treeUtils.getExpandWhenSearching)(searchKeywordState, expandItemValues.includes(node[valueKey]));
-      var nodeProps = (0, _extends2.default)({}, getTreeNodeProps((0, _extends2.default)({}, node, {
-        /**
-         * spread operator don't copy unenumerable properties
-         * so we need to copy them manually
-         */
-        parent: node.parent,
-        expand: expand
-      }), layer), {
-        hasChildren: node.hasChildren
-      });
-      return visible && /*#__PURE__*/_react.default.createElement(_CheckTreeNode.default, (0, _extends2.default)({
-        style: style,
-        key: key,
-        ref: function ref(_ref4) {
-          return saveTreeNodeRef(_ref4, refKey);
-        }
-      }, nodeProps));
-    };
+  var renderVirtualListNode = function renderVirtualListNode(_ref3) {
+    var index = _ref3.index,
+        style = _ref3.style,
+        data = _ref3.data;
+    var node = data[index];
+    var layer = node.layer,
+        refKey = node.refKey,
+        visible = node.visible;
+    var expand = (0, _treeUtils.getExpandWhenSearching)(searchKeywordState, expandItemValues.includes(node[valueKey]));
+    var nodeProps = (0, _extends2.default)({}, getTreeNodeProps((0, _extends2.default)({}, node, {
+      /**
+       * spread operator don't copy unenumerable properties
+       * so we need to copy them manually
+       */
+      parent: node.parent,
+      expand: expand
+    }), layer), {
+      hasChildren: node.hasChildren
+    });
+    return visible && /*#__PURE__*/_react.default.createElement(_CheckTreeNode.default, (0, _extends2.default)({
+      style: style,
+      ref: function ref(_ref4) {
+        return saveTreeNodeRef(_ref4, refKey);
+      }
+    }, nodeProps));
   };
 
   var renderCheckTree = function renderCheckTree() {
@@ -685,7 +686,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       onKeyDown: inline ? handleTreeKeydown : undefined
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: treeNodesClass
-    }, virtualized ? /*#__PURE__*/_react.default.createElement(_VirtualizedList.AutoSizer, {
+    }, virtualized ? /*#__PURE__*/_react.default.createElement(_Windowing.AutoSizer, {
       defaultHeight: inline ? height : menuMaxHeight,
       style: {
         width: 'auto',
@@ -694,15 +695,14 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }, function (_ref5) {
       var height = _ref5.height,
           width = _ref5.width;
-      return /*#__PURE__*/_react.default.createElement(_VirtualizedList.List, (0, _extends2.default)({
+      return /*#__PURE__*/_react.default.createElement(_Windowing.List, (0, _extends2.default)({
         ref: listRef,
         width: width,
         height: height,
-        rowHeight: 36,
-        rowCount: formattedNodes.length,
-        rowRenderer: renderVirtualListNode(formattedNodes),
-        scrollToAlignment: "center"
-      }, listProps));
+        itemSize: itemSize,
+        itemCount: formattedNodes.length,
+        itemData: formattedNodes
+      }, listProps), renderVirtualListNode);
     }) : formattedNodes));
   };