rsuite 5.16.6 → 5.17.0-beta.2

package/esm/DateRangePicker/DateRangePicker.js

@@ -9,6 +9,8 @@ import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { FormattedDate } from '../CustomProvider';
 import Toolbar from '../DatePicker/Toolbar';
+import PredefinedRanges from '../DatePicker/PredefinedRanges';
+import Stack from '../Stack';
 import { omitTriggerPropKeys, PickerOverlay, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
 import { createChainedFunction, DATERANGE_DISABLED_TARGET, DateUtils, mergeRefs, useClassNames, useControlled, useCustom } from '../utils';
 import { addMonths, compareAsc, isSameMonth } from '../utils/dateUtils';
@@ -391,10 +393,17 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       closeOverlay = false;
     }
 
-    handleValueUpdate(event, value, closeOverlay); // End unfinished selections.
+    updateCalendarDateRange(value);
+
+    if (closeOverlay) {
+      handleValueUpdate(event, value, closeOverlay);
+    } else {
+      setSelectedDates(value !== null && value !== void 0 ? value : []);
+    } // End unfinished selections.
+
 
     hasDoneSelect.current = true;
-  }, [handleValueUpdate]);
+  }, [handleValueUpdate, updateCalendarDateRange]);
   var handleOK = useCallback(function (event) {
     handleValueUpdate(event, selectedDates);
     onOk === null || onOk === void 0 ? void 0 : onOk(selectedDates, event);
@@ -563,13 +572,27 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       renderTitle: renderTitle
     };
     return /*#__PURE__*/React.createElement(PickerOverlay, {
+      role: "dialog",
       className: classes,
       ref: mergeRefs(overlayRef, speakerRef),
       target: triggerRef,
       style: styles
     }, /*#__PURE__*/React.createElement("div", {
       className: panelClasses
-    }, /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement(Stack, {
+      alignItems: "flex-start"
+    }, /*#__PURE__*/React.createElement(PredefinedRanges, {
+      direction: "column",
+      spacing: 0,
+      className: prefix('daterange-predefined'),
+      ranges: (ranges === null || ranges === void 0 ? void 0 : ranges.filter(function (range) {
+        return (range === null || range === void 0 ? void 0 : range.placement) === 'left';
+      })) || [],
+      calendarDate: calendarDate,
+      locale: locale,
+      disabledShortcut: disabledShortcutButton,
+      onClickShortcut: handleShortcutPageDate
+    }), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: prefix('daterange-content')
     }, /*#__PURE__*/React.createElement("div", {
       className: prefix('daterange-header')
@@ -587,8 +610,10 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       hideOkBtn: oneTap,
       onOk: handleOK,
       onClickShortcut: handleShortcutPageDate,
-      ranges: ranges
-    })));
+      ranges: ranges === null || ranges === void 0 ? void 0 : ranges.filter(function (range) {
+        return (range === null || range === void 0 ? void 0 : range.placement) === 'bottom' || (range === null || range === void 0 ? void 0 : range.placement) === undefined;
+      })
+    })))));
   };
 
   var hasValue = !isNil(value) && value.length > 1;

package/esm/DateRangePicker/types.d.ts

@@ -4,8 +4,9 @@ export declare type ValueType = [Date?, Date?];
 export declare type DateRange = [Date, Date];
 export interface RangeType {
     label: React.ReactNode;
-    closeOverlay?: boolean;
     value: DateRange | ((value?: ValueType) => DateRange);
+    closeOverlay?: boolean;
+    placement?: 'bottom' | 'left';
 }
 export declare type DisabledDateFunction = (
 /** Date used to determine if disabling is required. */

package/esm/Disclosure/Disclosure.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import DisclosureButton from './DisclosureButton';
 import DisclosureContent from './DisclosureContent';
-export declare type DisclosureTrigger = 'click' | 'mouseover';
-export interface DisclosureRenderProps extends Pick<React.HTMLAttributes<HTMLElement>, 'onMouseOver' | 'onMouseOut'> {
+export declare type DisclosureTrigger = 'click' | 'hover';
+export interface DisclosureRenderProps extends Pick<React.HTMLAttributes<HTMLElement>, 'onMouseEnter' | 'onMouseLeave'> {
     open: boolean;
 }
 export interface DisclosureProps {

package/esm/Disclosure/Disclosure.js

@@ -59,7 +59,7 @@ var Disclosure = /*#__PURE__*/React.memo(function (props) {
       });
     }
   });
-  var onMouseOver = useCallback(function (event) {
+  var onMouseEnter = useCallback(function (event) {
     if (!open) {
       dispatch({
         type: DisclosureActionTypes.Show
@@ -67,7 +67,7 @@ var Disclosure = /*#__PURE__*/React.memo(function (props) {
       onToggle === null || onToggle === void 0 ? void 0 : onToggle(true, event);
     }
   }, [open, dispatch, onToggle]);
-  var onMouseOut = useCallback(function (event) {
+  var onMouseLeave = useCallback(function (event) {
     if (open) {
       dispatch({
         type: DisclosureActionTypes.Hide
@@ -98,13 +98,13 @@ var Disclosure = /*#__PURE__*/React.memo(function (props) {
       open: open
     };
 
-    if (trigger.includes('mouseover')) {
-      renderProps.onMouseOver = onMouseOver;
-      renderProps.onMouseOut = onMouseOut;
+    if (trigger.includes('hover')) {
+      renderProps.onMouseEnter = onMouseEnter;
+      renderProps.onMouseLeave = onMouseLeave;
     }
 
     return renderProps;
-  }, [open, trigger, onMouseOver, onMouseOut]);
+  }, [open, trigger, onMouseEnter, onMouseLeave]);
   return /*#__PURE__*/React.createElement(DisclosureContext.Provider, {
     value: contextValue
   }, children(renderProps, containerElementRef));

package/esm/InputPicker/InputPicker.js

@@ -112,6 +112,7 @@ var InputPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var targetRef = useRef(null);
   var triggerRef = useRef(null);
   var inputRef = useRef();
+  var listRef = useRef(null);
 
   var _useCustom = useCustom(['Picker', 'InputPicker'], overrideLocale),
       locale = _useCustom.locale;
@@ -403,7 +404,8 @@ var InputPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   usePublicMethods(ref, {
     triggerRef: triggerRef,
     overlayRef: overlayRef,
-    targetRef: targetRef
+    targetRef: targetRef,
+    listRef: listRef
   });
   /**
    * Remove the last item, after pressing the back key on the keyboard.
@@ -605,6 +607,7 @@ var InputPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var menu = items.length ? /*#__PURE__*/React.createElement(DropdownMenu, {
       id: id ? id + "-listbox" : undefined,
       listProps: listProps,
+      listRef: listRef,
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
       labelKey: labelKey,

package/esm/MultiCascader/DropdownMenu.js

@@ -50,7 +50,10 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       prefix = _useClassNames.prefix;
 
   var classes = merge(className, prefix('items'));
-  var rtl = useCustom('DropdownMenu');
+
+  var _useCustom = useCustom('DropdownMenu'),
+      rtl = _useCustom.rtl;
+
   var getCascadePaths = useCallback(function (layer, node) {
     var paths = [];
 
@@ -77,7 +80,7 @@ var DropdownMenu = /*#__PURE__*/React.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 ? SpinnerIcon : rtl ? AngleRightIcon : AngleLeftIcon;
+    var Icon = node.loading ? SpinnerIcon : rtl ? AngleLeftIcon : AngleRightIcon;
     var active = value.some(function (v) {
       return v === nodeValue;
     });

package/esm/Navbar/NavbarDropdownMenu.js

@@ -5,12 +5,12 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 var _templateObject, _templateObject2;
 
 import React, { useContext } from 'react';
-import omit from 'lodash/omit';
-import { mergeRefs, useClassNames } from '../utils';
 import PropTypes from 'prop-types';
+import omit from 'lodash/omit';
+import isNil from 'lodash/isNil';
 import AngleLeft from '@rsuite/icons/legacy/AngleLeft';
 import AngleRight from '@rsuite/icons/legacy/AngleRight';
-import useCustom from '../utils/useCustom';
+import { mergeRefs, useClassNames, useCustom } from '../utils';
 import { NavbarContext } from '.';
 import Disclosure from '../Disclosure';
 import NavContext from '../Nav/NavContext';
@@ -73,7 +73,7 @@ var NavbarDropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var Icon = rtl ? AngleLeft : AngleRight;
   return /*#__PURE__*/React.createElement(Disclosure, {
     hideOnClickOutside: true,
-    trigger: ['click', 'mouseover'],
+    trigger: ['click', 'hover'],
     onToggle: function onToggle(open, event) {
       return _onToggle === null || _onToggle === void 0 ? void 0 : _onToggle(open, undefined, event);
     }
@@ -98,12 +98,18 @@ var NavbarDropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
         open: open,
         disabled: disabled
       }));
+      var dataAttributes = {
+        'data-event-key': eventKey
+      };
+
+      if (!isNil(eventKey) && typeof eventKey !== 'string') {
+        dataAttributes['data-event-key-type'] = typeof eventKey;
+      }
+
       return /*#__PURE__*/React.createElement("div", _extends({
         ref: mergeRefs(buttonRef, buttonRef),
-        className: classes,
-        "data-event-key": eventKey,
-        "data-event-key-type": typeof eventKey
-      }, buttonProps), icon && /*#__PURE__*/React.cloneElement(icon, {
+        className: classes
+      }, dataAttributes, buttonProps), icon && /*#__PURE__*/React.cloneElement(icon, {
         className: prefix('menu-icon')
       }), title, /*#__PURE__*/React.createElement(Icon, {
         className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["toggle-icon"])))

package/esm/Overlay/OverlayTrigger.d.ts

@@ -63,11 +63,11 @@ export interface OverlayTriggerProps extends StandardProps, AnimationEventProps
     /** Whether speaker to follow the cursor */
     followCursor?: boolean;
 }
-export interface OverlayTriggerInstance {
+export interface OverlayTriggerHandle {
     root: HTMLElement | undefined;
     updatePosition: () => void;
     open: (delay?: number) => void;
     close: (delay?: number) => void;
 }
-declare const OverlayTrigger: React.ForwardRefExoticComponent<OverlayTriggerProps & React.RefAttributes<OverlayTriggerInstance>>;
+declare const OverlayTrigger: React.ForwardRefExoticComponent<OverlayTriggerProps & React.RefAttributes<OverlayTriggerHandle>>;
 export default OverlayTrigger;

package/esm/Picker/DropdownMenu.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ListProps } from './VirtualizedList';
+import { ListProps, ListHandle } from '../Windowing';
 import { StandardProps, ItemDataType } from '../@types/common';
 export interface DropdownMenuProps<Multiple = false> extends StandardProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'onSelect'> {
     classPrefix: string;
@@ -20,6 +20,7 @@ export interface DropdownMenuProps<Multiple = false> extends StandardProps, Omit
     rowGroupHeight?: number;
     virtualized?: boolean;
     listProps?: Partial<ListProps>;
+    listRef?: React.Ref<ListHandle>;
     /** Custom selected option */
     renderMenuItem?: (itemLabel: React.ReactNode, item: any) => React.ReactNode;
     renderMenuGroup?: (title: React.ReactNode, item: any) => React.ReactNode;

package/esm/Picker/DropdownMenu.js

@@ -13,9 +13,9 @@ import getPosition from 'dom-lib/getPosition';
 import scrollTop from 'dom-lib/scrollTop';
 import getHeight from 'dom-lib/getHeight';
 import classNames from 'classnames';
-import { List, AutoSizer } from './VirtualizedList';
+import { List, AutoSizer, VariableSizeList } from '../Windowing';
 import shallowEqual from '../utils/shallowEqual';
-import { mergeRefs, useClassNames } from '../utils';
+import { mergeRefs, useClassNames, useMount } from '../utils';
 import DropdownMenuGroup from './DropdownMenuGroup';
 import { KEY_GROUP, KEY_GROUP_TITLE } from '../utils/getDataGroupBy';
 var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -36,6 +36,7 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       labelKey = _props$labelKey === void 0 ? 'label' : _props$labelKey,
       virtualized = props.virtualized,
       listProps = props.listProps,
+      virtualizedListRef = props.listRef,
       className = props.className,
       style = props.style,
       focusItemValue = props.focusItemValue,
@@ -49,7 +50,7 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       renderMenuItem = props.renderMenuItem,
       onGroupTitleClick = props.onGroupTitleClick,
       onSelect = props.onSelect,
-      rest = _objectWithoutPropertiesLoose(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
+      rest = _objectWithoutPropertiesLoose(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "listRef", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
 
   var _useClassNames = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -59,12 +60,8 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classes = merge(className, withClassPrefix('items', {
     grouped: group
   }));
-
-  var styles = _extends({}, style, {
-    maxHeight: maxHeight
-  });
-
   var menuBodyContainerRef = useRef(null);
+  var listRef = useRef(null);
 
   var _useState = useState([]),
       foldedGroupKeys = _useState[0],
@@ -86,8 +83,7 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value, item, event, checked);
   }, [onSelect]);
 
-  var getRowHeight = function getRowHeight(list, _ref) {
-    var index = _ref.index;
+  var getRowHeight = function getRowHeight(list, index) {
     var item = list[index];
 
     if (group && item[KEY_GROUP] && index !== 0) {
@@ -125,10 +121,13 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [focusItemValue, menuBodyContainerRef, prefix]);
 
-  var renderItem = function renderItem(list, _ref2) {
-    var index = _ref2.index,
-        style = _ref2.style;
-    var item = list[index];
+  var renderItem = function renderItem(_ref) {
+    var _ref$index = _ref.index,
+        index = _ref$index === void 0 ? 0 : _ref$index,
+        style = _ref.style,
+        data = _ref.data,
+        itemData = _ref.item;
+    var item = itemData || data[index];
     var value = item[valueKey];
     var label = item[labelKey];
 
@@ -187,40 +186,45 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return key === ((_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent[KEY_GROUP_TITLE]);
     }));
   }) : data;
-  var rowCount = filteredItems.length; // Check whether the height of the data exceeds the height of the container.
+  var rowCount = filteredItems.length;
+  useMount(function () {
+    var _listRef$current, _listRef$current$scro;
 
-  var useVirtualized = virtualized && rowCount * rowHeight > maxHeight;
+    var itemIndex = findIndex(filteredItems, function (item) {
+      return item[valueKey] === (activeItemValues === null || activeItemValues === void 0 ? void 0 : activeItemValues[0]);
+    });
+    (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : (_listRef$current$scro = _listRef$current.scrollToItem) === null || _listRef$current$scro === void 0 ? void 0 : _listRef$current$scro.call(_listRef$current, itemIndex);
+  });
   return /*#__PURE__*/React.createElement("div", _extends({
-    role: !useVirtualized ? 'listbox' : undefined
+    role: "listbox"
   }, rest, {
     className: classes,
     ref: mergeRefs(menuBodyContainerRef, ref),
-    style: styles
-  }), useVirtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
+    style: _extends({}, style, {
+      maxHeight: maxHeight
+    })
+  }), virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
     defaultHeight: maxHeight,
     style: {
       width: 'auto',
       height: 'auto'
     }
-  }, function (_ref3) {
-    var height = _ref3.height,
-        width = _ref3.width;
+  }, function (_ref2) {
+    var height = _ref2.height,
+        width = _ref2.width;
     return /*#__PURE__*/React.createElement(List, _extends({
-      role: "listbox",
-      containerRole: '',
-      "aria-readonly": undefined,
+      as: VariableSizeList,
+      ref: mergeRefs(listRef, virtualizedListRef),
       width: width,
       height: height || maxHeight,
-      scrollToIndex: findIndex(data, function (item) {
-        return item[valueKey] === (activeItemValues === null || activeItemValues === void 0 ? void 0 : activeItemValues[0]);
-      }),
-      rowCount: rowCount,
-      rowHeight: getRowHeight.bind(_this, filteredItems),
-      rowRenderer: renderItem.bind(null, filteredItems)
-    }, listProps));
-  }) : filteredItems.map(function (_item, index) {
-    return renderItem(filteredItems, {
-      index: index
+      itemCount: rowCount,
+      itemData: filteredItems,
+      itemSize: getRowHeight.bind(_this, filteredItems)
+    }, listProps), renderItem);
+  }) : filteredItems.map(function (item, index) {
+    return renderItem({
+      index: index,
+      item: item
     });
   }));
 });

package/esm/Picker/PickerOverlay.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
-import { OverlayTriggerInstance } from '../Picker';
+import { OverlayTriggerHandle } from '../Picker';
 export interface PickerOverlayProps extends WithAsProps {
     placement?: string;
     autoWidth?: boolean;
     children?: React.ReactNode;
-    target?: React.RefObject<OverlayTriggerInstance>;
+    target?: React.RefObject<OverlayTriggerHandle>;
     onKeyDown?: (event: React.KeyboardEvent) => void;
 }
 declare const PickerOverlay: RsRefForwardingComponent<'div', PickerOverlayProps>;

package/esm/Picker/PickerToggleTrigger.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { OverlayTriggerInstance, OverlayTriggerProps, OverlayTriggerType } from '../Overlay/OverlayTrigger';
+import { OverlayTriggerHandle, OverlayTriggerProps, OverlayTriggerType } from '../Overlay/OverlayTrigger';
 import { PositionChildProps } from '../Overlay/Position';
 import { TypeAttributes, AnimationEventProps } from '../@types/common';
-export type { OverlayTriggerInstance, PositionChildProps };
+export type { OverlayTriggerHandle, PositionChildProps };
 export interface PickerToggleTriggerProps extends Omit<AnimationEventProps, 'onEntering' | 'onExiting'>, Pick<OverlayTriggerProps, 'speaker'> {
     placement?: TypeAttributes.Placement;
     pickerProps: any;

package/esm/Picker/index.d.ts

@@ -1,6 +1,6 @@
-import { pickTriggerPropKeys, omitTriggerPropKeys, OverlayTriggerInstance, PositionChildProps } from './PickerToggleTrigger';
+import { pickTriggerPropKeys, omitTriggerPropKeys, OverlayTriggerHandle, PositionChildProps } from './PickerToggleTrigger';
 import { PickerToggleProps } from './PickerToggle';
-import { PickerInstance, PickerComponent } from './types';
+import { PickerHandle, PickerComponent } from './types';
 export { default as DropdownMenu } from './DropdownMenu';
 export { default as DropdownMenuCheckItem } from './DropdownMenuCheckItem';
 export { default as DropdownMenuGroup } from './DropdownMenuGroup';
@@ -11,6 +11,6 @@ export { default as PickerToggleTrigger } from './PickerToggleTrigger';
 export { default as SearchBar } from './SearchBar';
 export { default as SelectedElement } from './SelectedElement';
 export { pickTriggerPropKeys, omitTriggerPropKeys };
-export type { OverlayTriggerInstance, PositionChildProps, PickerInstance, PickerComponent, PickerToggleProps };
+export type { OverlayTriggerHandle, PositionChildProps, PickerHandle, PickerComponent, PickerToggleProps };
 export * from './utils';
 export * from './propTypes';

package/esm/Picker/types.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="react" />
 import { RsRefForwardingComponent } from '../@types/common';
-export interface PickerInstance {
-    root?: Element;
-    overlay?: Element;
-    target?: HTMLElement;
+import type { ListHandle } from '../Windowing';
+export interface PickerHandle {
+    root: HTMLElement | null;
+    list?: ListHandle;
+    overlay?: HTMLElement | null;
+    target?: HTMLElement | null;
     updatePosition?: () => void;
     open?: () => void;
     close?: () => void;
 }
 export declare type PickerComponent<P> = RsRefForwardingComponent<'div', P & {
-    ref?: React.Ref<PickerInstance>;
+    ref?: React.Ref<PickerHandle>;
 }>;