rsuite 5.12.0 → 5.13.0

package/cjs/Sidenav/SidenavDropdown.js

@@ -15,11 +15,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _kebabCase = _interopRequireDefault(require("lodash/kebabCase"));
-
 var _omit = _interopRequireDefault(require("lodash/omit"));
 
-var _DropdownToggle = _interopRequireDefault(require("../Dropdown/DropdownToggle"));
+var _pick = _interopRequireDefault(require("lodash/pick"));
 
 var _utils = require("../utils");
 
@@ -27,106 +25,180 @@ var _Sidenav = require("./Sidenav");
 
 var _deprecatePropType = _interopRequireDefault(require("../utils/deprecatePropType"));
 
-var _SidenavDropdownCollapse = _interopRequireDefault(require("./SidenavDropdownCollapse"));
+var _Menu = _interopRequireDefault(require("../Menu/Menu"));
+
+var _MenuItem = _interopRequireDefault(require("../Menu/MenuItem"));
+
+var _kebabCase = _interopRequireDefault(require("lodash/kebabCase"));
+
+var _ExpandedSidenavDropdown = _interopRequireDefault(require("./ExpandedSidenavDropdown"));
 
-var _Disclosure = _interopRequireDefault(require("../Disclosure/Disclosure"));
+var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
 
-var _DropdownContext = _interopRequireDefault(require("../Dropdown/DropdownContext"));
+var _NavDropdownItem = _interopRequireDefault(require("../Nav/NavDropdownItem"));
 
-var _useInternalId = _interopRequireDefault(require("../utils/useInternalId"));
+var _NavDropdownMenu = _interopRequireDefault(require("../Nav/NavDropdownMenu"));
 
+var _SidenavDropdownToggle = _interopRequireDefault(require("./SidenavDropdownToggle"));
+
+var _NavMenu = require("../Nav/NavMenu");
+
+/**
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Menu> within a <Sidenav>
+ *
+ * <Sidenav>
+ *   <Nav>
+ *     <Nav.Menu> -> This submenu will render <SidenavDropdown> component
+ *     </Nav.Menu>
+ *   </Nav>
+ * </Sidenav>
+ */
 var SidenavDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
+  var nav = (0, _react.useContext)(_NavContext.default);
+  var navMenu = (0, _react.useContext)(_NavMenu.NavMenuContext);
+
+  if (!sidenav || !nav || !navMenu) {
+    throw new Error('<Sidenav.Dropdown> must be rendered within a <Nav> component within a <Sidenav> component.');
+  }
+
   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,
+      onClose = props.onClose,
+      onOpen = props.onOpen,
+      onToggle = props.onToggle,
+      eventKey = props.eventKey,
+      _props$trigger = props.trigger,
+      trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
       _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,
+      toggleClassName = props.toggleClassName,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown' : _props$classPrefix,
+      className = props.className,
+      disabled = props.disabled,
+      children = props.children,
+      menuStyle = props.menuStyle,
       style = props.style,
-      onOpen = props.onOpen,
-      onClose = props.onClose,
-      openProp = props.open,
-      onToggle = props.onToggle,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "title", "children", "className", "menuStyle", "disabled", "renderTitle", "renderToggle", "classPrefix", "placement", "toggleClassName", "icon", "eventKey", "toggleAs", "noCaret", "style", "onOpen", "onClose", "open", "onToggle"]);
-  var sidenavContext = (0, _react.useContext)(_Sidenav.SidenavContext);
-  var dropdownContext = (0, _react.useContext)(_DropdownContext.default);
+      toggleProps = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "title", "onClose", "onOpen", "onToggle", "eventKey", "trigger", "placement", "toggleAs", "toggleClassName", "classPrefix", "className", "disabled", "children", "menuStyle", "style"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       merge = _useClassNames.merge,
-      withClassPrefix = _useClassNames.withClassPrefix;
+      withClassPrefix = _useClassNames.withClassPrefix,
+      prefix = _useClassNames.prefix;
+
+  var _useClassNames2 = (0, _utils.useClassNames)('dropdown-menu'),
+      withMenuClassPrefix = _useClassNames2.withClassPrefix,
+      mergeMenuClassName = _useClassNames2.merge;
+
+  var _useClassNames3 = (0, _utils.useClassNames)('nav-item'),
+      withNavItemClassPrefix = _useClassNames3.withClassPrefix,
+      mergeNavItemClassNames = _useClassNames3.merge;
+
+  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 menuButtonTriggers = (0, _react.useMemo)(function () {
+    if (!trigger) {
+      return undefined;
+    }
+
+    var triggerMap = {
+      hover: 'mouseover',
+      click: 'click',
+      contextMenu: 'contextmenu'
+    };
 
-  var internalId = (0, _useInternalId.default)('SidenavDropdown');
-  var uniqueKey = eventKey !== null && eventKey !== void 0 ? eventKey : internalId;
+    if (!Array.isArray(trigger)) {
+      return [triggerMap[trigger]];
+    }
+
+    return trigger.map(function (t) {
+      return triggerMap[t];
+    });
+  }, [trigger]); // Render a disclosure when inside expanded <Sidenav>
 
-  if (!sidenavContext || !dropdownContext) {
-    throw new Error('<SidenavDropdown> component is not supposed to be used standalone. Use <Dropdown> inside <Sidenav> instead.');
+  if (sidenav.expanded) {
+    return /*#__PURE__*/_react.default.createElement(_ExpandedSidenavDropdown.default, (0, _extends2.default)({
+      ref: ref
+    }, props));
   }
 
-  var _sidenavContext$openK = sidenavContext.openKeys,
-      openKeys = _sidenavContext$openK === void 0 ? [] : _sidenavContext$openK,
-      onOpenChange = sidenavContext.onOpenChange;
-  var hasSelectedItem = dropdownContext.hasSelectedItem;
-  var handleToggleDisclosure = (0, _react.useCallback)(function (open, event) {
-    if (open) {
-      onClose === null || onClose === void 0 ? void 0 : onClose();
-    } else {
-      onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+  var renderMenuButton = function renderMenuButton(menuButtonProps, buttonRef) {
+    return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
+      disabled: disabled
+    }, function (_ref, menuitemRef) {
+      var active = _ref.active,
+          menuitemProps = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["active"]);
+      return /*#__PURE__*/_react.default.createElement(_SidenavDropdownToggle.default, (0, _extends2.default)({
+        ref: (0, _utils.mergeRefs)(buttonRef, menuitemRef),
+        as: toggleAs,
+        className: mergeNavItemClassNames(toggleClassName, withNavItemClassPrefix({
+          focus: active
+        }))
+      }, menuButtonProps, (0, _omit.default)(menuitemProps, ['onClick']), (0, _omit.default)(toggleProps, 'data-testid')), title);
+    });
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_Menu.default, {
+    menuButtonText: title,
+    renderMenuButton: renderMenuButton,
+    openMenuOn: menuButtonTriggers,
+    renderMenuPopup: function renderMenuPopup(_ref2, popupRef) {
+      var open = _ref2.open,
+          popupProps = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["open"]);
+      var menuClassName = mergeMenuClassName(className, withMenuClassPrefix({})); // When inside a collapsed <Sidenav>, render a header in menu
+
+      var showHeader = !!sidenav;
+      return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
+        ref: popupRef,
+        className: menuClassName,
+        style: menuStyle,
+        hidden: !open
+      }, popupProps), showHeader && /*#__PURE__*/_react.default.createElement("div", {
+        className: prefix('header')
+      }, title), children);
+    },
+    onToggleMenu: function onToggleMenu(open, event) {
+      onToggle === null || onToggle === void 0 ? void 0 : onToggle(open, eventKey, event);
+      sidenav === null || sidenav === void 0 ? void 0 : sidenav.onOpenChange(eventKey, event);
+
+      if (open) {
+        onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+      } else {
+        onClose === null || onClose === void 0 ? void 0 : onClose();
+      }
     }
-
-    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.default.createElement(_Disclosure.default, {
-    open: open,
-    onToggle: handleToggleDisclosure
-  }, function (_ref, containerRef) {
+  }, function (_ref3, menuContainerRef) {
     var _withClassPrefix;
 
-    var open = _ref.open;
-    var classes = merge(className, withClassPrefix((_withClassPrefix = {}, _withClassPrefix["placement-" + (0, _kebabCase.default)((0, _utils.placementPolyfill)(placement))] = placement, _withClassPrefix[open ? 'expand' : 'collapse'] = true, _withClassPrefix.disabled = disabled, _withClassPrefix['selected-within'] = hasSelectedItem, _withClassPrefix['no-caret'] = noCaret, _withClassPrefix)));
+    var open = _ref3.open,
+        menuContainer = (0, _objectWithoutPropertiesLoose2.default)(_ref3, ["open"]);
+    var classes = merge(className, withClassPrefix((_withClassPrefix = {}, _withClassPrefix["placement-" + (0, _kebabCase.default)((0, _utils.placementPolyfill)(placement))] = !!placement, _withClassPrefix.disabled = disabled, _withClassPrefix.open = open, _withClassPrefix.submenu = true, _withClassPrefix['selected-within'] = hasSelectedItems, _withClassPrefix)));
     return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
-      ref: (0, _utils.mergeRefs)(ref, containerRef),
-      style: style,
+      ref: (0, _utils.mergeRefs)(ref, menuContainerRef),
       className: classes
-    }, rest, {
-      "data-event-key": eventKey
-    }), /*#__PURE__*/_react.default.createElement(_Disclosure.default.Button, null, function (buttonProps, buttonRef) {
-      return /*#__PURE__*/_react.default.createElement(_DropdownToggle.default, (0, _extends2.default)({
-        ref: buttonRef,
-        as: toggleAs,
-        noCaret: noCaret,
-        className: toggleClassName,
-        renderToggle: renderToggle,
-        icon: icon,
-        placement: placement
-      }, (0, _omit.default)(buttonProps, ['open'])), title);
-    }), /*#__PURE__*/_react.default.createElement(_Disclosure.default.Content, null, function (_ref2) {
-      var open = _ref2.open;
-      return /*#__PURE__*/_react.default.createElement(_SidenavDropdownCollapse.default, {
-        open: open,
-        style: menuStyle
-      }, children);
+    }, menuContainer, (0, _pick.default)(toggleProps, ['data-testid']), {
+      style: style
     }));
   });
 });
 
+SidenavDropdown.Item = _NavDropdownItem.default;
+SidenavDropdown.Menu = _NavDropdownMenu.default;
 SidenavDropdown.displayName = 'Sidenav.Dropdown';
 SidenavDropdown.propTypes = {
   activeKey: _propTypes.default.any,
   classPrefix: _propTypes.default.string,
+  trigger: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.oneOf(['click', 'hover', 'contextMenu'])]),
   placement: _propTypes.default.oneOf(_utils.PLACEMENT_8),
   title: _propTypes.default.node,
   disabled: _propTypes.default.bool,
@@ -135,7 +207,6 @@ SidenavDropdown.propTypes = {
   className: _propTypes.default.string,
   toggleClassName: _propTypes.default.string,
   children: _propTypes.default.node,
-  tabIndex: _propTypes.default.number,
   open: (0, _deprecatePropType.default)(_propTypes.default.bool),
   eventKey: _propTypes.default.any,
   as: _propTypes.default.elementType,
@@ -145,11 +216,11 @@ SidenavDropdown.propTypes = {
   onClose: _propTypes.default.func,
   onOpen: _propTypes.default.func,
   onToggle: _propTypes.default.func,
+  onSelect: _propTypes.default.func,
   onMouseEnter: _propTypes.default.func,
   onMouseLeave: _propTypes.default.func,
   onContextMenu: _propTypes.default.func,
   onClick: _propTypes.default.func,
-  renderTitle: (0, _deprecatePropType.default)(_propTypes.default.func),
   renderToggle: _propTypes.default.func
 };
 var _default = SidenavDropdown;

package/cjs/Sidenav/SidenavDropdownItem.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
+import React from 'react';
 import { IconProps } from '@rsuite/icons/lib/Icon';
 export interface SidenavDropdownItemProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {
     /** Active the current option */
@@ -20,14 +20,31 @@ export interface SidenavDropdownItemProps<T = any> extends WithAsProps, Omit<Rea
     icon?: React.ReactElement<IconProps>;
     /** The submenu that this menuitem controls (if exists) */
     submenu?: React.ReactElement;
-    /** Whether the submenu is expanded, used in Sidenav. */
-    expanded?: boolean;
+    /**
+     * The sub-level menu appears from the right side by default, and when `pullLeft` is set, it appears from the left.
+     * @deprecated Submenus are now pointing the same direction.
+     */
+    pullLeft?: boolean;
+    /**
+     * Whether the submenu is opened.
+     * @deprecated
+     * @internal
+     */
+    open?: 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
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Item> within a <Sidenav>
+ *
+ * <Sidenav>
+ *   <Nav>
+ *     <Nav.Menu>
+ *       <Nav.Item></Nav.Item> -> This will render <SidenavDropdownItem> component
+ *     </Nav.Menu>
+ *   </Nav>
+ * </Sidenav>
  */
 declare const SidenavDropdownItem: RsRefForwardingComponent<'li', SidenavDropdownItemProps>;
 export default SidenavDropdownItem;

package/cjs/Sidenav/SidenavDropdownItem.js

@@ -13,121 +13,140 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _isNil = _interopRequireDefault(require("lodash/isNil"));
-
-var _utils = require("../utils");
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _Sidenav = require("./Sidenav");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _deprecatePropType = _interopRequireDefault(require("../utils/deprecatePropType"));
 
-var _Ripple = _interopRequireDefault(require("../Ripple"));
+var _MenuItem = _interopRequireDefault(require("../Menu/MenuItem"));
 
-var _SafeAnchor = _interopRequireDefault(require("../SafeAnchor"));
+var _isNil = _interopRequireDefault(require("lodash/isNil"));
 
-var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
+var _utils = require("../utils");
 
-var _DropdownContext = _interopRequireDefault(require("../Dropdown/DropdownContext"));
+var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
 
 var _useRenderDropdownItem = require("../Dropdown/useRenderDropdownItem");
 
+var _ExpandedSidenavDropdownItem = _interopRequireDefault(require("./ExpandedSidenavDropdownItem"));
+
 /**
- * Tree View Node
- * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Item> within a <Sidenav>
+ *
+ * <Sidenav>
+ *   <Nav>
+ *     <Nav.Menu>
+ *       <Nav.Item></Nav.Item> -> This will render <SidenavDropdownItem> component
+ *     </Nav.Menu>
+ *   </Nav>
+ * </Sidenav>
  */
 var SidenavDropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  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 = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "active", "children", "disabled", "divider", "panel", "className", "style", "classPrefix", "icon", "eventKey", "onClick", "onSelect"]);
-  var sidenavContext = (0, _react.useContext)(_Sidenav.SidenavContext);
-  var dropdown = (0, _react.useContext)(_DropdownContext.default);
+  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
+  var nav = (0, _react.useContext)(_NavContext.default);
 
-  if (!sidenavContext || !dropdown) {
-    throw new Error('<SidenavDropdownItem> component is not supposed to be used standalone. Use <Dropdown.Item> within <Sidenav> instead.');
+  if (!sidenav || !nav) {
+    throw new Error('<Sidenav.Dropdown.Item> must be used within a <Nav> within a <Sidenav> component.');
   }
 
-  var activeKey = sidenavContext.activeKey,
-      onSidenavSelect = sidenavContext.onSelect;
-  var nav = (0, _react.useContext)(_NavContext.default);
+  var _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-item' : _props$classPrefix,
+      className = props.className,
+      activeProp = props.active,
+      eventKey = props.eventKey,
+      onSelect = props.onSelect,
+      icon = props.icon,
+      _props$as = props.as,
+      Component = _props$as === void 0 ? 'li' : _props$as,
+      divider = props.divider,
+      panel = props.panel,
+      children = props.children,
+      disabled = props.disabled,
+      restProps = (0, _objectWithoutPropertiesLoose2.default)(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon", "as", "divider", "panel", "children", "disabled"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       merge = _useClassNames.merge,
       withClassPrefix = _useClassNames.withClassPrefix,
       prefix = _useClassNames.prefix;
 
-  var selected = activeProp !== null && activeProp !== void 0 ? activeProp : !(0, _isNil.default)(eventKey) && ((0, _utils.shallowEqual)(eventKey, activeKey) || (0, _utils.shallowEqual)(nav === null || nav === void 0 ? void 0 : nav.activeKey, eventKey));
-  var classes = merge(className, withClassPrefix({
-    'with-icon': icon,
-    active: selected,
-    disabled: disabled
-  }));
-  var handleClick = (0, _react.useCallback)(function (event) {
-    var _dropdown$onSelect;
+  var handleSelectItem = (0, _react.useCallback)(function (event) {
+    var _nav$onSelect;
 
-    if (disabled) return;
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(eventKey, event);
-    (_dropdown$onSelect = dropdown.onSelect) === null || _dropdown$onSelect === void 0 ? void 0 : _dropdown$onSelect.call(dropdown, eventKey, event);
-    onSidenavSelect === null || onSidenavSelect === void 0 ? void 0 : onSidenavSelect(eventKey, event);
-  }, [disabled, onSelect, onSidenavSelect, eventKey, dropdown]);
-  var menuitemEventHandlers = {
-    onClick: (0, _utils.createChainedFunction)(handleClick, onClick)
-  };
+    (_nav$onSelect = nav.onSelect) === null || _nav$onSelect === void 0 ? void 0 : _nav$onSelect.call(nav, eventKey, event);
+  }, [onSelect, eventKey, nav]);
+  var selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(nav === null || nav === void 0 ? void 0 : nav.activeKey, eventKey);
   var renderDropdownItem = (0, _useRenderDropdownItem.useRenderDropdownItem)(Component);
 
+  if (sidenav.expanded) {
+    return /*#__PURE__*/_react.default.createElement(_ExpandedSidenavDropdownItem.default, (0, _extends2.default)({
+      ref: ref
+    }, props));
+  }
+
   if (divider) {
     return renderDropdownItem((0, _extends2.default)({
       ref: ref,
       role: 'separator',
-      style: style,
       className: merge(prefix('divider'), className)
-    }, rest));
+    }, restProps));
   }
 
   if (panel) {
     return renderDropdownItem((0, _extends2.default)({
       ref: ref,
-      role: 'none presentation',
-      style: style,
-      className: merge(prefix('panel'), className)
-    }, rest, {
+      className: merge(prefix('panel'), className),
       children: children
-    }));
+    }, restProps));
   }
 
-  return renderDropdownItem((0, _extends2.default)({
-    ref: ref
-  }, rest, {
-    style: style,
-    className: classes,
-    'aria-current': selected || undefined
-  }, menuitemEventHandlers, {
-    children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-      className: prefix('menu-icon')
-    }), children, /*#__PURE__*/_react.default.createElement(_Ripple.default, null))
-  }), _SafeAnchor.default);
+  return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
+    selected: selected,
+    disabled: disabled,
+    onActivate: handleSelectItem
+  }, function (_ref, menuitemRef) {
+    var selected = _ref.selected,
+        active = _ref.active,
+        menuitem = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["selected", "active"]);
+    var classes = merge(className, withClassPrefix({
+      'with-icon': icon,
+      active: selected,
+      disabled: disabled,
+      focus: active,
+      divider: divider,
+      panel: panel
+    }));
+    var dataAttributes = {
+      'data-event-key': eventKey
+    };
+
+    if (!(0, _isNil.default)(eventKey) && typeof eventKey !== 'string') {
+      dataAttributes['data-event-key-type'] = typeof eventKey;
+    }
+
+    return renderDropdownItem((0, _extends2.default)({
+      ref: (0, _utils.mergeRefs)(ref, menuitemRef),
+      className: classes
+    }, menuitem, dataAttributes, restProps, {
+      children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), children)
+    }));
+  });
 });
 
 SidenavDropdownItem.displayName = 'Sidenav.Dropdown.Item';
 SidenavDropdownItem.propTypes = {
   as: _propTypes.default.elementType,
-  expanded: _propTypes.default.bool,
-  active: _propTypes.default.bool,
   divider: _propTypes.default.bool,
   panel: _propTypes.default.bool,
+  trigger: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.oneOf(['click', 'hover'])]),
+  open: (0, _deprecatePropType.default)(_propTypes.default.bool),
+  active: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
+  pullLeft: (0, _deprecatePropType.default)(_propTypes.default.bool),
   submenu: _propTypes.default.element,
   onSelect: _propTypes.default.func,
   onClick: _propTypes.default.func,
@@ -137,10 +156,7 @@ SidenavDropdownItem.propTypes = {
   style: _propTypes.default.object,
   children: _propTypes.default.node,
   classPrefix: _propTypes.default.string,
-  tabIndex: _propTypes.default.number,
-  title: _propTypes.default.node,
-  onMouseOver: _propTypes.default.func,
-  onMouseOut: _propTypes.default.func
+  tabIndex: _propTypes.default.number
 };
 var _default = SidenavDropdownItem;
 exports.default = _default;

package/cjs/Sidenav/SidenavDropdownMenu.d.ts

@@ -1,26 +1,36 @@
 import React from 'react';
-import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
+import { StandardProps } 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 */
+export interface SidenavDropdownMenuProps<T = any> extends StandardProps {
+    /** Define the title as a submenu */
+    title?: React.ReactNode;
+    /** The submenu expands from the left and defaults to the right */
+    pullLeft?: boolean;
+    /**
+     *  Only used for setting the default expand state when it's a submenu.
+     */
     eventKey?: T;
     /** Set the icon */
     icon?: React.ReactElement<IconProps>;
-    /** Whether the submenu is expanded, used in Sidenav. */
+    open?: boolean;
+    collapsible?: boolean;
     expanded?: boolean;
-    /** Select the callback function for the current option  */
-    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
-    title?: React.ReactNode;
+    active?: boolean;
+    disabled?: boolean;
+    activeKey?: T;
+    onToggle?: (open: boolean, eventKey?: T | undefined, event?: React.SyntheticEvent) => void;
 }
 /**
- * Tree View Node
- * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Menu> within a <Sidenav>
+ *
+ * <Sidenav>
+ *   <Nav>
+ *     <Nav.Menu>
+ *       <Nav.Menu></Nav.Menu> -> This submenu will render <SidenavDropdownMenu> component
+ *     </Nav.Menu>
+ *   </Nav>
+ * </Sidenav>
  */
-declare const SidenavDropdownMenu: RsRefForwardingComponent<'li', SidenavDropdownMenuProps>;
+declare const SidenavDropdownMenu: React.ForwardRefExoticComponent<SidenavDropdownMenuProps<any> & Omit<React.HTMLAttributes<HTMLUListElement>, "title" | "onSelect"> & React.RefAttributes<HTMLElement>>;
 export default SidenavDropdownMenu;