rsuite 5.17.0-beta.1 → 5.17.0-beta.2

package/esm/TreePicker/TreePicker.js

@@ -7,7 +7,7 @@ import _omit from "lodash/omit";
 import _pick from "lodash/pick";
 import React, { useState, useRef, useEffect, useCallback, useContext } from 'react';
 import PropTypes from 'prop-types';
-import { List, AutoSizer } from '../Picker/VirtualizedList';
+import { List, AutoSizer } from '../Windowing';
 import TreeNode from './TreeNode';
 import { getTreeNodeIndent } from '../utils/treeUtils';
 import { createChainedFunction, useClassNames, useCustom, useControlled, TREE_NODE_DROP_POSITION, KEY_VALUES, mergeRefs, shallowEqual } from '../utils';
@@ -17,6 +17,11 @@ import TreeContext from '../Tree/TreeContext'; // default value for virtualized
 
 export var maxTreeHeight = 320;
 var emptyArray = [];
+
+var itemSize = function itemSize() {
+  return 36;
+};
+
 var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -574,34 +579,31 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, 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,
-          visible = node.visible;
-      var expand = getExpandWhenSearching(searchKeywordState, expandItemValues.includes(node[valueKey]));
-
-      if (!node.visible) {
-        return null;
-      }
+  var renderVirtualListNode = function renderVirtualListNode(_ref3) {
+    var index = _ref3.index,
+        style = _ref3.style,
+        data = _ref3.data;
+    var node = data[index];
+    var layer = node.layer,
+        visible = node.visible;
+    var expand = getExpandWhenSearching(searchKeywordState, expandItemValues.includes(node[valueKey]));
 
-      var nodeProps = _extends({}, getTreeNodeProps(_extends({}, node, {
-        expand: expand
-      }), layer), {
-        style: style,
-        hasChildren: node.hasChildren
-      });
+    if (!node.visible) {
+      return null;
+    }
 
-      return visible && /*#__PURE__*/React.createElement(TreeNode, _extends({
-        ref: function ref(_ref4) {
-          return saveTreeNodeRef(_ref4, node.refKey);
-        },
-        key: key
-      }, nodeProps));
-    };
+    var nodeProps = _extends({}, getTreeNodeProps(_extends({}, node, {
+      expand: expand
+    }), layer), {
+      style: style,
+      hasChildren: node.hasChildren
+    });
+
+    return visible && /*#__PURE__*/React.createElement(TreeNode, _extends({
+      ref: function ref(_ref4) {
+        return saveTreeNodeRef(_ref4, node.refKey);
+      }
+    }, nodeProps));
   };
 
   var renderTree = function renderTree() {
@@ -634,11 +636,10 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         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));
   };
 

package/esm/TreePicker/test/TreePicker.test.js

@@ -7,4 +7,18 @@ React.createElement(TreePicker, {
     return /*#__PURE__*/React.createElement("div", null);
   },
   data: []
+});
+
+/*#__PURE__*/
+React.createElement(TreePicker, {
+  data: [],
+  listProps: {
+    itemSize: 30,
+    onItemsRendered: function onItemsRendered() {
+      console.log('onItemsRendered');
+    },
+    onScroll: function onScroll() {
+      console.log('onScroll');
+    }
+  }
 });

package/esm/Whisper/Whisper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { OverlayTriggerInstance } from '../Overlay/OverlayTrigger';
+import { OverlayTriggerHandle } from '../Overlay/OverlayTrigger';
 import { OverlayTriggerProps } from '../Overlay/OverlayTrigger';
 export declare type WhisperProps = OverlayTriggerProps;
-export declare type WhisperInstance = OverlayTriggerInstance;
-declare const Whisper: React.ForwardRefExoticComponent<OverlayTriggerProps & React.RefAttributes<OverlayTriggerInstance>>;
+export declare type WhisperInstance = OverlayTriggerHandle;
+declare const Whisper: React.ForwardRefExoticComponent<OverlayTriggerProps & React.RefAttributes<OverlayTriggerHandle>>;
 export default Whisper;

package/esm/Windowing/AutoSizer.d.ts

@@ -0,0 +1,25 @@
+import React from 'react';
+export interface Size {
+    height: number;
+    width: number;
+}
+export interface AutoSizerProps {
+    /** Function responsible for rendering children. */
+    children: (size: Size) => React.ReactNode;
+    /** Optional custom CSS class name to attach to root AutoSizer element.    */
+    className?: string | undefined;
+    /** Default height to use for initial render; useful for SSR */
+    defaultHeight?: number | undefined;
+    /** Default width to use for initial render; useful for SSR */
+    defaultWidth?: number | undefined;
+    /** Disable dynamic :height property */
+    disableHeight?: boolean | undefined;
+    /** Disable dynamic :width property */
+    disableWidth?: boolean | undefined;
+    /** Optional inline style */
+    style?: React.CSSProperties | undefined;
+    /** Callback to be invoked on-resize */
+    onResize?: ((size: Size) => void) | undefined;
+}
+declare const AutoSizer: React.ForwardRefExoticComponent<AutoSizerProps & React.RefAttributes<HTMLDivElement>>;
+export default AutoSizer;

package/esm/Windowing/AutoSizer.js

@@ -0,0 +1,92 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React, { useState, useRef } from 'react';
+import { useCallback } from 'react';
+import getStyle from 'dom-lib/getStyle';
+import { mergeRefs, useElementResize, useMount } from '../utils';
+var AutoSizer = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var children = props.children,
+      className = props.className,
+      disableHeight = props.disableHeight,
+      disableWidth = props.disableWidth,
+      defaultHeight = props.defaultHeight,
+      defaultWidth = props.defaultWidth,
+      style = props.style,
+      onResize = props.onResize,
+      rest = _objectWithoutPropertiesLoose(props, ["children", "className", "disableHeight", "disableWidth", "defaultHeight", "defaultWidth", "style", "onResize"]);
+
+  var _useState = useState(defaultHeight || 0),
+      height = _useState[0],
+      setHeight = _useState[1];
+
+  var _useState2 = useState(defaultWidth || 0),
+      width = _useState2[0],
+      setWidth = _useState2[1];
+
+  var rootRef = useRef(null);
+  var getParentNode = useCallback(function () {
+    var _rootRef$current;
+
+    if ((_rootRef$current = rootRef.current) !== null && _rootRef$current !== void 0 && _rootRef$current.parentNode && rootRef.current.parentNode.ownerDocument && rootRef.current.parentNode.ownerDocument.defaultView && rootRef.current.parentNode instanceof rootRef.current.parentNode.ownerDocument.defaultView.HTMLElement) {
+      return rootRef.current.parentNode;
+    }
+
+    return null;
+  }, []);
+  var handleResize = useCallback(function () {
+    var parentNode = getParentNode();
+
+    if (parentNode) {
+      var offsetHeight = parentNode.offsetHeight || 0;
+      var offsetWidth = parentNode.offsetWidth || 0;
+
+      var _style = getStyle(parentNode);
+
+      var paddingLeft = parseInt(_style.paddingLeft, 10) || 0;
+      var paddingRight = parseInt(_style.paddingRight, 10) || 0;
+      var paddingTop = parseInt(_style.paddingTop, 10) || 0;
+      var paddingBottom = parseInt(_style.paddingBottom, 10) || 0;
+      var newHeight = offsetHeight - paddingTop - paddingBottom;
+      var newWidth = offsetWidth - paddingLeft - paddingRight;
+
+      if (!disableHeight && height !== newHeight || !disableWidth && width !== newWidth) {
+        setHeight(offsetHeight - paddingTop - paddingBottom);
+        setWidth(offsetWidth - paddingLeft - paddingRight);
+        onResize === null || onResize === void 0 ? void 0 : onResize({
+          height: offsetHeight,
+          width: offsetWidth
+        });
+      }
+    }
+  }, [disableHeight, disableWidth, getParentNode, height, onResize, width]);
+  useMount(function () {
+    if (getParentNode()) {
+      handleResize();
+    }
+  });
+  useElementResize(getParentNode, handleResize);
+  var outerStyle = {
+    overflow: 'visible'
+  };
+  var childParams = {
+    width: 0,
+    height: 0
+  };
+
+  if (!disableHeight) {
+    outerStyle.height = 0;
+    childParams.height = height;
+  }
+
+  if (!disableWidth) {
+    outerStyle.width = 0;
+    childParams.width = width;
+  }
+
+  return /*#__PURE__*/React.createElement("div", _extends({
+    className: className,
+    ref: mergeRefs(rootRef, ref),
+    style: _extends({}, outerStyle, style)
+  }, rest), children(childParams));
+});
+export default AutoSizer;

package/esm/Windowing/List.d.ts

@@ -0,0 +1,45 @@
+import { VariableSizeList, ListItemKeySelector, ListOnScrollProps, ListOnItemsRenderedProps } from 'react-window';
+import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
+export interface ListProps<T = any> extends WithAsProps {
+    /**
+     * @deprecated use itemSize instead
+     * Either a fixed row height (number) or a function that returns the height of a row given its index: ({ index: number }): number
+     */
+    rowHeight?: number | (({ index: number }: {
+        index: any;
+    }) => number);
+    /**
+     * Size of a item in the direction being windowed.
+     */
+    itemSize: number | ((index: number) => number);
+    /**
+     * Scroll offset for initial render.
+     */
+    initialScrollOffset?: number;
+    /**
+     * By default, lists will use an item's index as its key. This is okay if:
+     *
+     * - Your collections of items is never sorted or modified
+     * - Your item renderer is not stateful and does not extend PureComponent
+     *
+     * If your list does not satisfy the above constraints, use the itemKey property to specify your own keys for items
+     */
+    itemKey?: ListItemKeySelector<T>;
+    /**
+     * Called when the items rendered by the list change.
+     */
+    onItemsRendered?: (props: ListOnItemsRenderedProps) => void;
+    /**
+     * Called when the list scroll positions changes, as a result of user scrolling or scroll-to method calls.
+     */
+    onScroll?: (props: ListOnScrollProps) => void;
+}
+export interface ListHandle extends Partial<VariableSizeList> {
+    /**
+     * @deprecated use scrollToItem instead
+     * Ensure row is visible. This method can be used to safely scroll back to a cell that a user has scrolled away from even if it was previously scrolled to.
+     */
+    scrollToRow?: (index: number) => void;
+}
+declare const List: RsRefForwardingComponent<'div', ListProps>;
+export default List;

package/esm/Windowing/List.js

@@ -0,0 +1,58 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React, { useRef, useImperativeHandle, useCallback } from 'react';
+import { VariableSizeList } from 'react-window';
+import { useCustom } from '../utils';
+var List = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var rowHeight = props.rowHeight,
+      _props$as = props.as,
+      Component = _props$as === void 0 ? VariableSizeList : _props$as,
+      rest = _objectWithoutPropertiesLoose(props, ["rowHeight", "as"]);
+
+  var listRef = useRef(null);
+
+  var _useCustom = useCustom(),
+      rtl = _useCustom.rtl;
+
+  useImperativeHandle(ref, function () {
+    return {
+      resetAfterIndex: function resetAfterIndex(index, shouldForceUpdate) {
+        var _listRef$current, _listRef$current$rese;
+
+        (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : (_listRef$current$rese = _listRef$current.resetAfterIndex) === null || _listRef$current$rese === void 0 ? void 0 : _listRef$current$rese.call(_listRef$current, index, shouldForceUpdate);
+      },
+      scrollTo: function scrollTo(scrollOffset) {
+        var _listRef$current2, _listRef$current2$scr;
+
+        (_listRef$current2 = listRef.current) === null || _listRef$current2 === void 0 ? void 0 : (_listRef$current2$scr = _listRef$current2.scrollTo) === null || _listRef$current2$scr === void 0 ? void 0 : _listRef$current2$scr.call(_listRef$current2, scrollOffset);
+      },
+      scrollToItem: function scrollToItem(index, align) {
+        var _listRef$current3, _listRef$current3$scr;
+
+        (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 ? void 0 : (_listRef$current3$scr = _listRef$current3.scrollToItem) === null || _listRef$current3$scr === void 0 ? void 0 : _listRef$current3$scr.call(_listRef$current3, index, align);
+      },
+      scrollToRow: function scrollToRow(index) {
+        var _listRef$current4, _listRef$current4$scr;
+
+        (_listRef$current4 = listRef.current) === null || _listRef$current4 === void 0 ? void 0 : (_listRef$current4$scr = _listRef$current4.scrollToItem) === null || _listRef$current4$scr === void 0 ? void 0 : _listRef$current4$scr.call(_listRef$current4, index);
+      }
+    };
+  });
+  var setRowHeight = useCallback(function (index) {
+    return typeof rowHeight === 'function' ? rowHeight({
+      index: index
+    }) : rowHeight || 0;
+  }, [rowHeight]);
+
+  var compatibleProps = _extends({}, rest);
+
+  if (rowHeight) {
+    compatibleProps.itemSize = Component === VariableSizeList ? setRowHeight : rowHeight;
+  }
+
+  return /*#__PURE__*/React.createElement(Component, _extends({
+    ref: listRef,
+    direction: rtl ? 'rtl' : 'ltr'
+  }, compatibleProps));
+});
+export default List;

package/esm/Windowing/index.d.ts

@@ -0,0 +1,5 @@
+export { default as AutoSizer } from './AutoSizer';
+export { default as List } from './List';
+export { FixedSizeList, VariableSizeList } from 'react-window';
+export type { ListChildComponentProps } from 'react-window';
+export type { ListProps, ListHandle } from './List';

package/esm/Windowing/index.js

@@ -0,0 +1,3 @@
+export { default as AutoSizer } from './AutoSizer';
+export { default as List } from './List';
+export { FixedSizeList, VariableSizeList } from 'react-window';

package/esm/index.d.ts

@@ -155,3 +155,4 @@ export type { AffixProps } from './Affix';
 export { default as CustomProvider } from './CustomProvider';
 export type { CustomProviderProps } from './CustomProvider';
 export type { Locale, CalendarLocale, PlaintextLocale, PaginationLocale, TableLocale, DatePickerLocale, DateRangePickerLocale, PickerLocale, InputPickerLocale, UploaderLocale, BreadcrumbLocale, ToggleLocale } from './locales';
+export type { PickerHandle } from './Picker';

package/esm/utils/dateUtils.d.ts

@@ -35,6 +35,7 @@ export { default as startOfWeek } from 'date-fns/startOfWeek';
 export { default as subDays } from 'date-fns/subDays';
 export { default as isMatch } from 'date-fns/isMatch';
 export { default as isValid } from 'date-fns/isValid';
+export { default as set } from 'date-fns/set';
 export declare type CalendarOnlyPropsType = 'disabledHours' | 'disabledMinutes' | 'disabledSeconds' | 'hideHours' | 'hideMinutes' | 'hideSeconds';
 export declare const calendarOnlyProps: CalendarOnlyPropsType[];
 /**

package/esm/utils/dateUtils.js

@@ -42,6 +42,7 @@ export { default as startOfWeek } from 'date-fns/startOfWeek';
 export { default as subDays } from 'date-fns/subDays';
 export { default as isMatch } from 'date-fns/isMatch';
 export { default as isValid } from 'date-fns/isValid';
+export { default as set } from 'date-fns/set';
 var disabledTimeProps = ['disabledHours', 'disabledMinutes', 'disabledSeconds'];
 var hideTimeProps = ['hideHours', 'hideMinutes', 'hideSeconds'];
 export var calendarOnlyProps = disabledTimeProps.concat(hideTimeProps);

package/esm/utils/treeUtils.d.ts

@@ -4,7 +4,7 @@ import { TREE_NODE_DROP_POSITION } from '../utils';
 import { CheckTreePickerProps } from '../CheckTreePicker/CheckTreePicker';
 import { ItemDataType } from '../@types/common';
 import { TreePickerProps } from '../TreePicker/TreePicker';
-import { ListInstance } from '../Picker/VirtualizedList';
+import { ListHandle } from '../Windowing';
 declare type PartialTreeProps = Partial<TreePickerProps | CheckTreePickerProps>;
 /**
  * according node parentNode expand state decide node whether to show
@@ -236,7 +236,7 @@ export interface FocusToTreeNodeProps {
     activeNode: any;
     virtualized: boolean;
     container: HTMLElement | null;
-    list: ListInstance;
+    list: ListHandle;
     formattedNodes: TreeNodeType[];
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.17.0-beta.1",
+  "version": "5.17.0-beta.2",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -30,14 +30,14 @@
     "@types/chai": "^4.2.18",
     "@types/lodash": "^4.14.134",
     "@types/prop-types": "^15.7.4",
-    "@types/react-virtualized": "^9.21.11",
+    "@types/react-window": "^1.8.5",
     "classnames": "^2.3.1",
     "date-fns": "^2.13.0",
     "dom-lib": "^3.1.2",
     "lodash": "^4.17.11",
     "prop-types": "^15.8.1",
-    "react-virtualized": "^9.22.3",
-    "rsuite-table": "^5.6.0",
+    "react-window": "^1.8.7",
+    "rsuite-table": "^5.7.0",
     "schema-typed": "^2.0.3"
   },
   "peerDependencies": {

package/cjs/Picker/VirtualizedList.d.ts

@@ -1,37 +0,0 @@
-import React from 'react';
-import { ListProps, ListRowProps } from 'react-virtualized/dist/commonjs/List';
-import { AutoSizerProps } from 'react-virtualized/dist/commonjs/AutoSizer';
-import type { Alignment } from 'react-virtualized';
-export interface ListInstance {
-    /**
-     * Forcefully re-render the inner Grid component.
-     */
-    forceUpdateGrid(): void;
-    /**
-     * Gets offset for a given row and alignment.
-     */
-    getOffsetForRow(params: {
-        alignment?: Alignment;
-        index?: number;
-    }): number;
-    /**
-     * Pre-measure all rows in a List.
-     */
-    measureAllRows(): void;
-    /**
-     * Recompute row heights and offsets after the specified index (defaults to 0).
-     */
-    recomputeRowHeights(index?: number): void;
-    /**
-     * Scroll to the specified offset. Useful for animating position changes.
-     */
-    scrollToPosition(scrollTop?: number): void;
-    /**
-     * Ensure row is visible. This method can be used to safely scroll back to a cell
-     * that a user has scrolled away from even if it was previously scrolled to.
-     */
-    scrollToRow(index?: number): void;
-}
-export type { ListProps, AutoSizerProps, ListRowProps };
-export declare const List: React.ComponentType<ListProps>;
-export declare const AutoSizer: React.ComponentType<AutoSizerProps>;

package/cjs/Picker/VirtualizedList.js

@@ -1,15 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.AutoSizer = exports.List = void 0;
-
-var _List = _interopRequireDefault(require("react-virtualized/dist/commonjs/List"));
-
-var _AutoSizer = _interopRequireDefault(require("react-virtualized/dist/commonjs/AutoSizer"));
-
-var List = _List.default;
-exports.List = List;
-var AutoSizer = _AutoSizer.default;
-exports.AutoSizer = AutoSizer;

package/esm/Picker/VirtualizedList.d.ts

@@ -1,37 +0,0 @@
-import React from 'react';
-import { ListProps, ListRowProps } from 'react-virtualized/dist/commonjs/List';
-import { AutoSizerProps } from 'react-virtualized/dist/commonjs/AutoSizer';
-import type { Alignment } from 'react-virtualized';
-export interface ListInstance {
-    /**
-     * Forcefully re-render the inner Grid component.
-     */
-    forceUpdateGrid(): void;
-    /**
-     * Gets offset for a given row and alignment.
-     */
-    getOffsetForRow(params: {
-        alignment?: Alignment;
-        index?: number;
-    }): number;
-    /**
-     * Pre-measure all rows in a List.
-     */
-    measureAllRows(): void;
-    /**
-     * Recompute row heights and offsets after the specified index (defaults to 0).
-     */
-    recomputeRowHeights(index?: number): void;
-    /**
-     * Scroll to the specified offset. Useful for animating position changes.
-     */
-    scrollToPosition(scrollTop?: number): void;
-    /**
-     * Ensure row is visible. This method can be used to safely scroll back to a cell
-     * that a user has scrolled away from even if it was previously scrolled to.
-     */
-    scrollToRow(index?: number): void;
-}
-export type { ListProps, AutoSizerProps, ListRowProps };
-export declare const List: React.ComponentType<ListProps>;
-export declare const AutoSizer: React.ComponentType<AutoSizerProps>;

package/esm/Picker/VirtualizedList.js

@@ -1,4 +0,0 @@
-import VirtualizedList from 'react-virtualized/dist/commonjs/List';
-import VirtualizedAutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
-export var List = VirtualizedList;
-export var AutoSizer = VirtualizedAutoSizer;