rsuite 5.12.0 → 5.14.0

package/esm/Picker/utils.d.ts

@@ -101,7 +101,7 @@ export declare function useSearch(props: SearchProps): {
     filteredData: import("../CheckTreePicker/utils").TreeNodeType[];
     updateFilteredData: (nextData: ItemDataType[]) => void;
     setSearchKeyword: React.Dispatch<React.SetStateAction<string>>;
-    checkShouldDisplay: (item: ItemDataType, keyword?: string | undefined) => boolean;
+    checkShouldDisplay: (item: ItemDataType, keyword?: string) => boolean;
     handleSearch: (searchKeyword: string, event: React.SyntheticEvent) => void;
 };
 interface PickerDependentParameters {

package/esm/Picker/utils.js

@@ -2,7 +2,6 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import React, { useState, useImperativeHandle, useCallback } from 'react';
 import kebabCase from 'lodash/kebabCase';
 import trim from 'lodash/trim';
-import isNil from 'lodash/isNil';
 import isFunction from 'lodash/isFunction';
 import isUndefined from 'lodash/isUndefined';
 import omit from 'lodash/omit';
@@ -174,20 +173,29 @@ export var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue,
       return [];
     }
 
-    var menu = isFunction(target) ? target() : target;
     var currentKeys = keys;
 
-    if (currentKeys.length === 0 && !isNil(menu)) {
-      currentKeys = Array.from(menu.querySelectorAll(focusableQueryKey)).map(function (item) {
-        var _item$dataset;
+    if (layer < 1) {
+      var popup = isFunction(target) ? target() : target;
+      var rootMenu = popup === null || popup === void 0 ? void 0 : popup.querySelector('[data-layer="0"]');
 
-        return (_item$dataset = item.dataset) === null || _item$dataset === void 0 ? void 0 : _item$dataset.key;
-      });
-      setKeys(currentKeys);
-    }
+      if (rootMenu) {
+        var _rootMenu$querySelect;
 
-    if (currentKeys.length === 0) {
-      return [];
+        currentKeys = Array.from((_rootMenu$querySelect = rootMenu.querySelectorAll(focusableQueryKey)) !== null && _rootMenu$querySelect !== void 0 ? _rootMenu$querySelect : []).map(function (item) {
+          var _item$dataset;
+
+          return (_item$dataset = item.dataset) === null || _item$dataset === void 0 ? void 0 : _item$dataset.key;
+        });
+      } else {
+        var _popup$querySelectorA;
+
+        currentKeys = Array.from((_popup$querySelectorA = popup === null || popup === void 0 ? void 0 : popup.querySelectorAll(focusableQueryKey)) !== null && _popup$querySelectorA !== void 0 ? _popup$querySelectorA : []).map(function (item) {
+          var _item$dataset2;
+
+          return (_item$dataset2 = item.dataset) === null || _item$dataset2 === void 0 ? void 0 : _item$dataset2.key;
+        });
+      }
     } // 1. It is necessary to traverse the `keys` instead of `data` here to preserve the order of the array.
     // 2. The values ​​in `keys` are all string, so the corresponding value of `data` should also be converted to string
 
@@ -197,7 +205,7 @@ export var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue,
         return "" + i[valueKey] === key;
       });
     });
-  }, [data, focusableQueryKey, keys, target, valueKey]);
+  }, [data, focusableQueryKey, keys, target, valueKey, layer]);
   /**
    * Get the index of the focus item.
    */
@@ -246,9 +254,9 @@ export var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue,
       var _Array$from;
 
       return (_Array$from = Array.from(subMenu.querySelectorAll(focusableQueryKey))) === null || _Array$from === void 0 ? void 0 : _Array$from.map(function (item) {
-        var _item$dataset2;
+        var _item$dataset3;
 
-        return (_item$dataset2 = item.dataset) === null || _item$dataset2 === void 0 ? void 0 : _item$dataset2.key;
+        return (_item$dataset3 = item.dataset) === null || _item$dataset3 === void 0 ? void 0 : _item$dataset3.key;
       });
     }
 

package/esm/Popover/Popover.d.ts

@@ -7,6 +7,8 @@ export interface PopoverProps extends WithAsProps {
     visible?: boolean;
     /** The content full the container */
     full?: boolean;
+    /** Whether show the arrow indicator */
+    arrow?: boolean;
 }
 declare const Popover: RsRefForwardingComponent<'div', PopoverProps>;
 export default Popover;

package/esm/Popover/Popover.js

@@ -18,7 +18,9 @@ var Popover = /*#__PURE__*/React.forwardRef(function (props, ref) {
       visible = props.visible,
       className = props.className,
       full = props.full,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "classPrefix", "title", "children", "style", "visible", "className", "full"]);
+      _props$arrow = props.arrow,
+      arrow = _props$arrow === void 0 ? true : _props$arrow,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "classPrefix", "title", "children", "style", "visible", "className", "full", "arrow"]);
 
   var _useClassNames = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -40,7 +42,7 @@ var Popover = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ref: ref,
     className: classes,
     style: styles
-  }), /*#__PURE__*/React.createElement("div", {
+  }), arrow && /*#__PURE__*/React.createElement("div", {
     className: prefix(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["arrow"]))),
     "aria-hidden": true
   }), title && /*#__PURE__*/React.createElement("h3", {
@@ -58,6 +60,7 @@ Popover.propTypes = {
   style: PropTypes.object,
   visible: PropTypes.bool,
   className: PropTypes.string,
-  full: PropTypes.bool
+  full: PropTypes.bool,
+  arrow: PropTypes.bool
 };
 export default Popover;

package/esm/Sidenav/ExpandedSidenavDropdown.d.ts

@@ -0,0 +1,43 @@
+import React from 'react';
+import { TypeAttributes, WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import { IconProps } from '@rsuite/icons/lib/Icon';
+export interface SidenavDropdownProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'title'> {
+    /** Define the title as a submenu */
+    title?: React.ReactNode;
+    /** Set the icon */
+    icon?: React.ReactElement<IconProps>;
+    /** The placement of Menu */
+    placement?: TypeAttributes.Placement8;
+    /** Whether or not component is disabled */
+    disabled?: boolean;
+    /** The style of the menu */
+    menuStyle?: React.CSSProperties;
+    /** A css class to apply to the Toggle DOM node */
+    toggleClassName?: string;
+    /** The value of the current option */
+    eventKey?: T;
+    /** You can use a custom element type for this toggle component */
+    toggleAs?: React.ElementType;
+    /** No caret variation */
+    noCaret?: boolean;
+    /**
+     * Open the menu and control it
+     * @deprecated
+     */
+    open?: boolean;
+    /**
+     * Custom title
+     * @deprecated Use `renderToggle` instead.
+     */
+    renderTitle?: (children?: React.ReactNode) => React.ReactNode;
+    /** Custom Toggle */
+    renderToggle?: (props: WithAsProps, ref: React.Ref<any>) => any;
+    /** The callback function that the menu closes */
+    onClose?: () => void;
+    /** Menu Pop-up callback function */
+    onOpen?: () => void;
+    /** Callback function for menu state switching */
+    onToggle?: (open: boolean) => void;
+}
+declare const ExpandedSidenavDropdown: RsRefForwardingComponent<'li', SidenavDropdownProps>;
+export default ExpandedSidenavDropdown;

package/esm/Sidenav/ExpandedSidenavDropdown.js

@@ -0,0 +1,140 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React, { useContext, useCallback } from 'react';
+import PropTypes from 'prop-types';
+import kebabCase from 'lodash/kebabCase';
+import omit from 'lodash/omit';
+import { useClassNames, placementPolyfill, PLACEMENT_8, mergeRefs } from '../utils';
+import { SidenavContext } from './Sidenav';
+import deprecatePropType from '../utils/deprecatePropType';
+import SidenavDropdownCollapse from './SidenavDropdownCollapse';
+import Disclosure from '../Disclosure/Disclosure';
+import useInternalId from '../utils/useInternalId';
+import SidenavDropdownToggle from './SidenavDropdownToggle';
+import { NavMenuContext } from '../Nav/NavMenu';
+import NavContext from '../Nav/NavContext';
+var ExpandedSidenavDropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var sidenav = useContext(SidenavContext);
+  var nav = useContext(NavContext);
+  var navMenu = useContext(NavMenuContext);
+
+  if (!sidenav || !nav || !navMenu) {
+    throw new Error('<SidenavDropdown> component is not supposed to be used standalone. Use <Nav.Menu> inside <Sidenav> instead.');
+  }
+
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
+      title = props.title,
+      children = props.children,
+      className = props.className,
+      menuStyle = props.menuStyle,
+      disabled = props.disabled,
+      renderTitle = props.renderTitle,
+      renderToggle = props.renderToggle,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown' : _props$classPrefix,
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
+      toggleClassName = props.toggleClassName,
+      icon = props.icon,
+      eventKey = props.eventKey,
+      toggleAs = props.toggleAs,
+      noCaret = props.noCaret,
+      style = props.style,
+      onOpen = props.onOpen,
+      onClose = props.onClose,
+      openProp = props.open,
+      onToggle = props.onToggle,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "title", "children", "className", "menuStyle", "disabled", "renderTitle", "renderToggle", "classPrefix", "placement", "toggleClassName", "icon", "eventKey", "toggleAs", "noCaret", "style", "onOpen", "onClose", "open", "onToggle"]);
+
+  var _useClassNames = useClassNames(classPrefix),
+      merge = _useClassNames.merge,
+      withClassPrefix = _useClassNames.withClassPrefix;
+
+  var internalId = useInternalId('SidenavDropdown');
+  var uniqueKey = eventKey !== null && eventKey !== void 0 ? eventKey : internalId;
+  var _sidenav$openKeys = sidenav.openKeys,
+      openKeys = _sidenav$openKeys === void 0 ? [] : _sidenav$openKeys,
+      onOpenChange = sidenav.onOpenChange;
+  var items = navMenu[0].items;
+  var hasSelectedItems = // has items that is active indicated by <Nav activeKey>
+  nav.activeKey && items.some(function (item) {
+    return item.eventKey === nav.activeKey;
+  }) || // has items that is active indicated by <Nav.Item active>
+  items.some(function (item) {
+    return item.active;
+  });
+  var handleToggleDisclosure = useCallback(function (open, event) {
+    if (open) {
+      onClose === null || onClose === void 0 ? void 0 : onClose();
+    } else {
+      onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+    }
+
+    onToggle === null || onToggle === void 0 ? void 0 : onToggle(open);
+    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(uniqueKey, event);
+  }, [onClose, onOpen, onToggle, uniqueKey, onOpenChange]);
+  var open = openProp !== null && openProp !== void 0 ? openProp : openKeys.includes(uniqueKey);
+  return /*#__PURE__*/React.createElement(Disclosure, {
+    open: open,
+    onToggle: handleToggleDisclosure
+  }, function (_ref, containerRef) {
+    var _withClassPrefix;
+
+    var open = _ref.open;
+    var classes = merge(className, withClassPrefix((_withClassPrefix = {}, _withClassPrefix["placement-" + kebabCase(placementPolyfill(placement))] = placement, _withClassPrefix[open ? 'expand' : 'collapse'] = true, _withClassPrefix.disabled = disabled, _withClassPrefix['selected-within'] = hasSelectedItems, _withClassPrefix['no-caret'] = noCaret, _withClassPrefix)));
+    return /*#__PURE__*/React.createElement(Component, _extends({
+      ref: mergeRefs(ref, containerRef),
+      style: style,
+      className: classes
+    }, rest, {
+      "data-event-key": eventKey
+    }), /*#__PURE__*/React.createElement(Disclosure.Button, null, function (buttonProps, buttonRef) {
+      return /*#__PURE__*/React.createElement(SidenavDropdownToggle, _extends({
+        ref: buttonRef,
+        as: toggleAs,
+        noCaret: noCaret,
+        className: toggleClassName,
+        renderToggle: renderToggle,
+        icon: icon,
+        placement: placement
+      }, omit(buttonProps, ['open'])), title);
+    }), /*#__PURE__*/React.createElement(Disclosure.Content, null, function (_ref2) {
+      var open = _ref2.open;
+      return /*#__PURE__*/React.createElement(SidenavDropdownCollapse, {
+        open: open,
+        style: menuStyle
+      }, children);
+    }));
+  });
+});
+ExpandedSidenavDropdown.displayName = 'Sidenav.Dropdown';
+ExpandedSidenavDropdown.propTypes = {
+  activeKey: PropTypes.any,
+  classPrefix: PropTypes.string,
+  placement: PropTypes.oneOf(PLACEMENT_8),
+  title: PropTypes.node,
+  disabled: PropTypes.bool,
+  icon: PropTypes.node,
+  menuStyle: PropTypes.object,
+  className: PropTypes.string,
+  toggleClassName: PropTypes.string,
+  children: PropTypes.node,
+  tabIndex: PropTypes.number,
+  open: deprecatePropType(PropTypes.bool),
+  eventKey: PropTypes.any,
+  as: PropTypes.elementType,
+  toggleAs: PropTypes.elementType,
+  noCaret: PropTypes.bool,
+  style: PropTypes.object,
+  onClose: PropTypes.func,
+  onOpen: PropTypes.func,
+  onToggle: PropTypes.func,
+  onMouseEnter: PropTypes.func,
+  onMouseLeave: PropTypes.func,
+  onContextMenu: PropTypes.func,
+  onClick: PropTypes.func,
+  renderTitle: deprecatePropType(PropTypes.func),
+  renderToggle: PropTypes.func
+};
+export default ExpandedSidenavDropdown;

package/esm/Sidenav/ExpandedSidenavDropdownItem.d.ts

@@ -0,0 +1,31 @@
+import React from 'react';
+import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
+import { IconProps } from '@rsuite/icons/lib/Icon';
+export interface SidenavDropdownItemProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {
+    /** Active the current option */
+    active?: boolean;
+    /** Primary content */
+    children?: React.ReactNode;
+    /** You can use a custom element for this component */
+    as?: React.ElementType;
+    /** Whether to display the divider */
+    divider?: boolean;
+    /** Disable the current option */
+    disabled?: boolean;
+    /** The value of the current option */
+    eventKey?: T;
+    /** Displays a custom panel */
+    panel?: boolean;
+    /** Set the icon */
+    icon?: React.ReactElement<IconProps>;
+    /** Whether the submenu is expanded, used in Sidenav. */
+    expanded?: boolean;
+    /** Select the callback function for the current option  */
+    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
+}
+/**
+ * Tree View Node
+ * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
+ */
+declare const ExpandedSidenavDropdownItem: RsRefForwardingComponent<'li', SidenavDropdownItemProps>;
+export default ExpandedSidenavDropdownItem;

package/esm/Sidenav/ExpandedSidenavDropdownItem.js

@@ -0,0 +1,120 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React, { useCallback, useContext } from 'react';
+import isNil from 'lodash/isNil';
+import { createChainedFunction, shallowEqual, useClassNames } from '../utils';
+import { SidenavContext } from './Sidenav';
+import PropTypes from 'prop-types';
+import Ripple from '../Ripple';
+import SafeAnchor from '../SafeAnchor';
+import NavContext from '../Nav/NavContext';
+import { useRenderDropdownItem } from '../Dropdown/useRenderDropdownItem';
+
+/**
+ * Tree View Node
+ * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
+ */
+var ExpandedSidenavDropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var sidenav = useContext(SidenavContext);
+  var nav = useContext(NavContext);
+
+  if (!sidenav || !nav) {
+    throw new Error('<SidenavDropdownItem> component is not supposed to be used standalone. Use <Nav.Item> within <Sidenav> instead.');
+  }
+
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'li' : _props$as,
+      activeProp = props.active,
+      children = props.children,
+      disabled = props.disabled,
+      divider = props.divider,
+      panel = props.panel,
+      className = props.className,
+      style = props.style,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-item' : _props$classPrefix,
+      icon = props.icon,
+      eventKey = props.eventKey,
+      onClick = props.onClick,
+      onSelect = props.onSelect,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "active", "children", "disabled", "divider", "panel", "className", "style", "classPrefix", "icon", "eventKey", "onClick", "onSelect"]);
+
+  var _useClassNames = useClassNames(classPrefix),
+      merge = _useClassNames.merge,
+      withClassPrefix = _useClassNames.withClassPrefix,
+      prefix = _useClassNames.prefix;
+
+  var selected = activeProp !== null && activeProp !== void 0 ? activeProp : !isNil(eventKey) && (shallowEqual(eventKey, sidenav.activeKey) || shallowEqual(nav.activeKey, eventKey));
+  var classes = merge(className, withClassPrefix({
+    'with-icon': icon,
+    active: selected,
+    disabled: disabled
+  }));
+  var handleClick = useCallback(function (event) {
+    var _nav$onSelect, _sidenav$onSelect;
+
+    if (disabled) return;
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(eventKey, event);
+    (_nav$onSelect = nav.onSelect) === null || _nav$onSelect === void 0 ? void 0 : _nav$onSelect.call(nav, eventKey, event);
+    (_sidenav$onSelect = sidenav.onSelect) === null || _sidenav$onSelect === void 0 ? void 0 : _sidenav$onSelect.call(sidenav, eventKey, event);
+  }, [disabled, onSelect, sidenav, eventKey, nav]);
+  var menuitemEventHandlers = {
+    onClick: createChainedFunction(handleClick, onClick)
+  };
+  var renderDropdownItem = useRenderDropdownItem(Component);
+
+  if (divider) {
+    return renderDropdownItem(_extends({
+      ref: ref,
+      role: 'separator',
+      style: style,
+      className: merge(prefix('divider'), className)
+    }, rest));
+  }
+
+  if (panel) {
+    return renderDropdownItem(_extends({
+      ref: ref,
+      role: 'none presentation',
+      style: style,
+      className: merge(prefix('panel'), className)
+    }, rest, {
+      children: children
+    }));
+  }
+
+  return renderDropdownItem(_extends({
+    ref: ref
+  }, rest, {
+    style: style,
+    className: classes,
+    'aria-current': selected || undefined
+  }, menuitemEventHandlers, {
+    children: /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.cloneElement(icon, {
+      className: prefix('menu-icon')
+    }), children, /*#__PURE__*/React.createElement(Ripple, null))
+  }), SafeAnchor);
+});
+ExpandedSidenavDropdownItem.displayName = 'Sidenav.Dropdown.Item';
+ExpandedSidenavDropdownItem.propTypes = {
+  as: PropTypes.elementType,
+  expanded: PropTypes.bool,
+  active: PropTypes.bool,
+  divider: PropTypes.bool,
+  panel: PropTypes.bool,
+  disabled: PropTypes.bool,
+  submenu: PropTypes.element,
+  onSelect: PropTypes.func,
+  onClick: PropTypes.func,
+  icon: PropTypes.node,
+  eventKey: PropTypes.any,
+  className: PropTypes.string,
+  style: PropTypes.object,
+  children: PropTypes.node,
+  classPrefix: PropTypes.string,
+  tabIndex: PropTypes.number,
+  title: PropTypes.node,
+  onMouseOver: PropTypes.func,
+  onMouseOut: PropTypes.func
+};
+export default ExpandedSidenavDropdownItem;

package/esm/Sidenav/ExpandedSidenavDropdownMenu.d.ts

@@ -0,0 +1,26 @@
+import React from 'react';
+import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
+import { IconProps } from '@rsuite/icons/lib/Icon';
+export interface SidenavDropdownMenuProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLLIElement>, 'title' | 'onSelect'> {
+    /** Primary content */
+    children?: React.ReactNode;
+    /** You can use a custom element for this component */
+    as?: React.ElementType;
+    /** Disable the current option */
+    disabled?: boolean;
+    /** The value of the current option */
+    eventKey?: T;
+    /** Set the icon */
+    icon?: React.ReactElement<IconProps>;
+    /** Whether the submenu is expanded, used in Sidenav. */
+    expanded?: boolean;
+    /** Select the callback function for the current option  */
+    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
+    title?: React.ReactNode;
+}
+/**
+ * Tree View Node
+ * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
+ */
+declare const ExpandedSidenavDropdownMenu: RsRefForwardingComponent<'li', SidenavDropdownMenuProps>;
+export default ExpandedSidenavDropdownMenu;

package/esm/Sidenav/ExpandedSidenavDropdownMenu.js

@@ -0,0 +1,121 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _taggedTemplateLiteralLoose from "@babel/runtime/helpers/esm/taggedTemplateLiteralLoose";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+
+var _templateObject, _templateObject2;
+
+import React, { useCallback, useContext } from 'react';
+import isNil from 'lodash/isNil';
+import omit from 'lodash/omit';
+import { createChainedFunction, useClassNames } from '../utils';
+import { SidenavContext } from './Sidenav';
+import useCustom from '../utils/useCustom';
+import ArrowLeftLine from '@rsuite/icons/ArrowLeftLine';
+import ArrowRightLine from '@rsuite/icons/ArrowRightLine';
+import PropTypes from 'prop-types';
+import SidenavDropdownCollapse from './SidenavDropdownCollapse';
+import Ripple from '../Ripple';
+import Disclosure from '../Disclosure/Disclosure';
+
+/**
+ * Tree View Node
+ * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
+ */
+var ExpandedSidenavDropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var sidenavContext = useContext(SidenavContext);
+
+  if (!sidenavContext) {
+    throw new Error('<SidenavDropdownMenu> component is not supposed to be used standalone. Use <Nav.Menu> inside <Sidenav> instead.');
+  }
+
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'li' : _props$as,
+      children = props.children,
+      disabled = props.disabled,
+      className = props.className,
+      style = props.style,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-item' : _props$classPrefix,
+      tabIndex = props.tabIndex,
+      icon = props.icon,
+      title = props.title,
+      eventKey = props.eventKey,
+      onClick = props.onClick,
+      onSelect = props.onSelect,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "children", "disabled", "className", "style", "classPrefix", "tabIndex", "icon", "title", "eventKey", "onClick", "onSelect"]);
+
+  var _useCustom = useCustom('DropdownMenu'),
+      rtl = _useCustom.rtl;
+
+  var _useClassNames = useClassNames(classPrefix),
+      merge = _useClassNames.merge,
+      withClassPrefix = _useClassNames.withClassPrefix,
+      prefix = _useClassNames.prefix;
+
+  var _sidenavContext$openK = sidenavContext.openKeys,
+      openKeys = _sidenavContext$openK === void 0 ? [] : _sidenavContext$openK,
+      onOpenChange = sidenavContext.onOpenChange,
+      onSidenavSelect = sidenavContext.onSelect;
+  var handleClick = useCallback(function (event) {
+    if (disabled) return;
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(eventKey, event);
+    onSidenavSelect === null || onSidenavSelect === void 0 ? void 0 : onSidenavSelect(eventKey, event);
+  }, [disabled, onSelect, onSidenavSelect, eventKey]);
+  var menuitemEventHandlers = {
+    onClick: createChainedFunction(handleClick, onClick)
+  };
+  var Icon = rtl ? ArrowLeftLine : ArrowRightLine;
+  return /*#__PURE__*/React.createElement(Disclosure, {
+    open: !isNil(eventKey) && openKeys.includes(eventKey),
+    onToggle: function onToggle(_, event) {
+      return onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(eventKey, event);
+    }
+  }, function (_ref) {
+    var open = _ref.open;
+    var classes = merge(className, prefix('submenu'), prefix("pull-" + (rtl ? 'left' : 'right')), prefix(open ? 'expand' : 'collapse'), withClassPrefix({
+      'with-icon': icon,
+      // open,
+      disabled: disabled
+    }));
+    return /*#__PURE__*/React.createElement(Component, _extends({
+      ref: ref
+    }, rest, {
+      tabIndex: disabled ? -1 : tabIndex,
+      style: style,
+      className: classes
+    }, menuitemEventHandlers), /*#__PURE__*/React.createElement(Disclosure.Button, null, function (buttonProps) {
+      return /*#__PURE__*/React.createElement("button", _extends({
+        className: prefix(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["toggle"]))),
+        onClick: handleClick
+      }, omit(buttonProps, ['open'])), icon && /*#__PURE__*/React.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), title, /*#__PURE__*/React.createElement(Icon, {
+        className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["toggle-icon"])))
+      }), /*#__PURE__*/React.createElement(Ripple, null));
+    }), /*#__PURE__*/React.createElement(Disclosure.Content, null, function (_ref2) {
+      var open = _ref2.open;
+      return /*#__PURE__*/React.createElement(SidenavDropdownCollapse, {
+        open: open
+      }, children);
+    }));
+  });
+});
+ExpandedSidenavDropdownMenu.displayName = 'Sidenav.Dropdown.Menu';
+ExpandedSidenavDropdownMenu.propTypes = {
+  as: PropTypes.elementType,
+  expanded: PropTypes.bool,
+  disabled: PropTypes.bool,
+  onSelect: PropTypes.func,
+  onClick: PropTypes.func,
+  icon: PropTypes.node,
+  eventKey: PropTypes.any,
+  className: PropTypes.string,
+  style: PropTypes.object,
+  children: PropTypes.node,
+  classPrefix: PropTypes.string,
+  tabIndex: PropTypes.number,
+  title: PropTypes.node,
+  onMouseOver: PropTypes.func,
+  onMouseOut: PropTypes.func
+};
+export default ExpandedSidenavDropdownMenu;

package/esm/Sidenav/Sidenav.d.ts

@@ -21,17 +21,23 @@ export interface SidenavProps<T = string> extends WithAsProps {
     onOpenChange?: (openKeys: T[], event: React.SyntheticEvent) => void;
     /**
      * Select the callback function for the menu
-     * @deprecated Use <Sidenav onSelect> instead
+     * @deprecated Use <Nav onSelect> instead
      */
     onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
 export declare const SidenavContext: React.Context<SidenavContextType<string> | null>;
 export interface SidenavContextType<T = string> {
     openKeys: T[];
-    activeKey: T | null;
+    /**
+     * @deprecated Use activeKey from NavContext instead
+     */
+    activeKey: T | undefined;
     sidenav: boolean;
     expanded: boolean;
     onOpenChange: (eventKey: T, event: React.SyntheticEvent) => void;
+    /**
+     * @deprecated Use onSelect from NavContext instead
+     */
     onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
 export interface SidenavComponent extends RsRefForwardingComponent<'div', SidenavProps> {

package/esm/Sidenav/Sidenav.js

@@ -22,8 +22,7 @@ var Sidenav = /*#__PURE__*/React.forwardRef(function (props, ref) {
       appearance = _props$appearance === void 0 ? 'default' : _props$appearance,
       _props$expanded = props.expanded,
       expanded = _props$expanded === void 0 ? true : _props$expanded,
-      _props$activeKey = props.activeKey,
-      activeKey = _props$activeKey === void 0 ? null : _props$activeKey,
+      activeKey = props.activeKey,
       _props$defaultOpenKey = props.defaultOpenKeys,
       defaultOpenKeys = _props$defaultOpenKey === void 0 ? emptyArray : _props$defaultOpenKey,
       openKeysProp = props.openKeys,