rsuite 5.11.0 → 5.13.1

package/esm/Nav/NavDropdown.js

@@ -0,0 +1,170 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React, { useContext, useMemo, useReducer } from 'react';
+import PropTypes from 'prop-types';
+import omit from 'lodash/omit';
+import pick from 'lodash/pick';
+import { mergeRefs, PLACEMENT_8, placementPolyfill, useClassNames } from '../utils';
+import deprecatePropType from '../utils/deprecatePropType';
+import { initialState, reducer } from '../Dropdown/DropdownState';
+import Menu from '../Menu/Menu';
+import kebabCase from 'lodash/kebabCase';
+import NavContext from './NavContext';
+import NavDropdownItem from './NavDropdownItem';
+import NavDropdownMenu from './NavDropdownMenu';
+import NavDropdownToggle from './NavDropdownToggle';
+
+/**
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Menu> call
+ *
+ * <Nav>
+ *   <Nav.Menu> -> This will render <NavDropdown> component
+ *   </Nav.Menu>
+ * </Nav>
+ */
+var NavDropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var nav = useContext(NavContext);
+
+  if (!nav) {
+    throw new Error('<Nav.Dropdown> must be rendered within a <Nav> component.');
+  }
+
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? 'div' : _props$as,
+      title = props.title,
+      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,
+      toggleAs = props.toggleAs,
+      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,
+      toggleProps = _objectWithoutPropertiesLoose(props, ["as", "title", "onClose", "onOpen", "onToggle", "eventKey", "trigger", "placement", "toggleAs", "toggleClassName", "classPrefix", "className", "disabled", "children", "menuStyle", "style"]);
+
+  var _useClassNames = useClassNames(classPrefix),
+      merge = _useClassNames.merge,
+      withClassPrefix = _useClassNames.withClassPrefix;
+
+  var _useClassNames2 = useClassNames('dropdown-menu'),
+      withMenuClassPrefix = _useClassNames2.withClassPrefix,
+      mergeMenuClassName = _useClassNames2.merge;
+
+  var menuButtonTriggers = useMemo(function () {
+    if (!trigger) {
+      return undefined;
+    }
+
+    var triggerMap = {
+      hover: 'mouseover',
+      click: 'click',
+      contextMenu: 'contextmenu'
+    };
+
+    if (!Array.isArray(trigger)) {
+      return [triggerMap[trigger]];
+    }
+
+    return trigger.map(function (t) {
+      return triggerMap[t];
+    });
+  }, [trigger]);
+
+  var _useReducer = useReducer(reducer, initialState),
+      items = _useReducer[0].items;
+
+  var hasSelectedItem = useMemo(function () {
+    return items.some(function (item) {
+      return item.props.selected;
+    });
+  }, [items]);
+
+  var renderMenuButton = function renderMenuButton(menuButtonProps, menuButtonRef) {
+    return /*#__PURE__*/React.createElement(NavDropdownToggle, _extends({
+      ref: menuButtonRef,
+      as: toggleAs,
+      className: toggleClassName,
+      placement: placement,
+      disabled: disabled
+    }, omit(menuButtonProps, ['open']), omit(toggleProps, ['data-testid'])), title);
+  };
+
+  return /*#__PURE__*/React.createElement(Menu, {
+    renderMenuButton: renderMenuButton,
+    openMenuOn: menuButtonTriggers,
+    renderMenuPopup: function renderMenuPopup(_ref, popupRef) {
+      var open = _ref.open,
+          popupProps = _objectWithoutPropertiesLoose(_ref, ["open"]);
+
+      var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
+      return /*#__PURE__*/React.createElement("ul", _extends({
+        ref: popupRef,
+        className: menuClassName,
+        style: menuStyle,
+        hidden: !open
+      }, popupProps), children);
+    },
+    onToggleMenu: function onToggleMenu(open, event) {
+      onToggle === null || onToggle === void 0 ? void 0 : onToggle(open, eventKey, event);
+
+      if (open) {
+        onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+      } else {
+        onClose === null || onClose === void 0 ? void 0 : onClose();
+      }
+    }
+  }, function (_ref2, menuContainerRef) {
+    var _withClassPrefix;
+
+    var open = _ref2.open,
+        menuContainer = _objectWithoutPropertiesLoose(_ref2, ["open"]);
+
+    var classes = merge(className, withClassPrefix((_withClassPrefix = {}, _withClassPrefix["placement-" + kebabCase(placementPolyfill(placement))] = !!placement, _withClassPrefix.disabled = disabled, _withClassPrefix.open = open, _withClassPrefix['selected-within'] = hasSelectedItem, _withClassPrefix)));
+    return /*#__PURE__*/React.createElement(Component, _extends({
+      ref: mergeRefs(ref, menuContainerRef),
+      className: classes
+    }, menuContainer, pick(toggleProps, ['data-testid']), {
+      style: style
+    }));
+  });
+});
+NavDropdown.Item = NavDropdownItem;
+NavDropdown.Menu = NavDropdownMenu;
+NavDropdown.displayName = 'Nav.Dropdown';
+NavDropdown.propTypes = {
+  classPrefix: PropTypes.string,
+  trigger: PropTypes.oneOfType([PropTypes.array, PropTypes.oneOf(['click', 'hover', 'contextMenu'])]),
+  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,
+  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,
+  renderToggle: PropTypes.func
+};
+export default NavDropdown;

package/esm/Nav/NavDropdownItem.d.ts

@@ -0,0 +1,39 @@
+import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
+import React from 'react';
+import { IconProps } from '@rsuite/icons/lib/Icon';
+export interface NavDropdownItemProps<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>;
+    /**
+     * 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;
+}
+/**
+ * @private
+ */
+declare const NavDropdownItem: RsRefForwardingComponent<'li', NavDropdownItemProps>;
+export default NavDropdownItem;

package/esm/Nav/NavDropdownItem.js

@@ -0,0 +1,123 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React, { useCallback, useContext } from 'react';
+import PropTypes from 'prop-types';
+import deprecatePropType from '../utils/deprecatePropType';
+import MenuItem from '../Menu/MenuItem';
+import isNil from 'lodash/isNil';
+import { mergeRefs, shallowEqual, useClassNames } from '../utils';
+import NavContext from './NavContext';
+import { useRenderDropdownItem } from '../Dropdown/useRenderDropdownItem';
+
+/**
+ * @private
+ */
+var NavDropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var nav = useContext(NavContext);
+
+  if (!nav) {
+    throw new Error('<Nav.Dropdown.Item> should be used within a <Nav> component.');
+  }
+
+  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 = _objectWithoutPropertiesLoose(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon", "as", "divider", "panel", "children", "disabled"]);
+
+  var activeKey = nav.activeKey,
+      onSelectFromNav = nav.onSelect;
+
+  var _useClassNames = useClassNames(classPrefix),
+      merge = _useClassNames.merge,
+      withClassPrefix = _useClassNames.withClassPrefix,
+      prefix = _useClassNames.prefix;
+
+  var selected = activeProp || !isNil(eventKey) && shallowEqual(activeKey, eventKey);
+  var handleSelectItem = useCallback(function (event) {
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(eventKey, event);
+    onSelectFromNav === null || onSelectFromNav === void 0 ? void 0 : onSelectFromNav(eventKey, event);
+  }, [onSelect, eventKey, onSelectFromNav]);
+  var renderDropdownItem = useRenderDropdownItem(Component);
+
+  if (divider) {
+    return renderDropdownItem(_extends({
+      ref: ref,
+      role: 'separator',
+      className: merge(prefix('divider'), className)
+    }, restProps));
+  }
+
+  if (panel) {
+    return renderDropdownItem(_extends({
+      ref: ref,
+      className: merge(prefix('panel'), className),
+      children: children
+    }, restProps));
+  }
+
+  return /*#__PURE__*/React.createElement(MenuItem, {
+    selected: selected,
+    disabled: disabled,
+    onActivate: handleSelectItem
+  }, function (_ref, menuitemRef) {
+    var selected = _ref.selected,
+        active = _ref.active,
+        menuitem = _objectWithoutPropertiesLoose(_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 (!isNil(eventKey) && typeof eventKey !== 'string') {
+      dataAttributes['data-event-key-type'] = typeof eventKey;
+    }
+
+    return renderDropdownItem(_extends({
+      ref: mergeRefs(ref, menuitemRef),
+      className: classes
+    }, menuitem, dataAttributes, restProps, {
+      children: /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), children)
+    }));
+  });
+});
+NavDropdownItem.displayName = 'Nav.Dropdown.Item';
+NavDropdownItem.propTypes = {
+  as: PropTypes.elementType,
+  divider: PropTypes.bool,
+  panel: PropTypes.bool,
+  trigger: PropTypes.oneOfType([PropTypes.array, PropTypes.oneOf(['click', 'hover'])]),
+  open: deprecatePropType(PropTypes.bool),
+  active: PropTypes.bool,
+  disabled: PropTypes.bool,
+  pullLeft: deprecatePropType(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
+};
+export default NavDropdownItem;

package/esm/Nav/NavDropdownMenu.d.ts

@@ -0,0 +1,26 @@
+import React from 'react';
+import { StandardProps } from '../@types/common';
+import { IconProps } from '@rsuite/icons/lib/Icon';
+export interface NavDropdownMenuProps<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>;
+    open?: boolean;
+    collapsible?: boolean;
+    expanded?: boolean;
+    active?: boolean;
+    disabled?: boolean;
+    onToggle?: (open: boolean, eventKey?: T | undefined, event?: React.SyntheticEvent) => void;
+}
+/**
+ * @private
+ */
+declare const NavDropdownMenu: React.ForwardRefExoticComponent<NavDropdownMenuProps<any> & Omit<React.HTMLAttributes<HTMLUListElement>, "title" | "onSelect"> & React.RefAttributes<HTMLElement>>;
+export default NavDropdownMenu;

package/esm/Nav/NavDropdownMenu.js

@@ -0,0 +1,138 @@
+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 omit from 'lodash/omit';
+import Menu from '../Menu/Menu';
+import MenuItem from '../Menu/MenuItem';
+import { mergeRefs, useClassNames } from '../utils';
+import PropTypes from 'prop-types';
+import AngleLeft from '@rsuite/icons/legacy/AngleLeft';
+import AngleRight from '@rsuite/icons/legacy/AngleRight';
+import useCustom from '../utils/useCustom';
+import NavContext from './NavContext';
+
+/**
+ * @private
+ */
+var NavDropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var nav = useContext(NavContext);
+
+  if (!nav) {
+    throw new Error('<Nav.Dropdown.Menu> should be used within a <Nav> component.');
+  }
+
+  var onToggle = props.onToggle,
+      eventKey = props.eventKey,
+      title = props.title,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-menu' : _props$classPrefix,
+      children = props.children,
+      rest = _objectWithoutPropertiesLoose(props, ["onToggle", "eventKey", "title", "classPrefix", "children"]);
+
+  var _useCustom = useCustom('DropdownMenu'),
+      rtl = _useCustom.rtl;
+
+  var handleToggleSubmenu = useCallback(function (open, event) {
+    onToggle === null || onToggle === void 0 ? void 0 : onToggle(open, eventKey, event);
+  }, [eventKey, onToggle]);
+
+  var _useClassNames = useClassNames(classPrefix),
+      prefix = _useClassNames.prefix;
+
+  var _useClassNames2 = useClassNames('dropdown-menu'),
+      withMenuClassPrefix = _useClassNames2.withClassPrefix,
+      mergeMenuClassName = _useClassNames2.merge;
+
+  var _useClassNames3 = useClassNames('dropdown-item'),
+      mergeItemClassNames = _useClassNames3.merge,
+      withItemClassPrefix = _useClassNames3.withClassPrefix,
+      prefixItemClassName = _useClassNames3.prefix; // Parent menu exists. This is a submenu.
+  // Should render a `menuitem` that controls this submenu.
+
+
+  var _omit = omit(rest, ['trigger']),
+      icon = _omit.icon,
+      className = _omit.className,
+      disabled = _omit.disabled,
+      menuProps = _objectWithoutPropertiesLoose(_omit, ["icon", "className", "disabled"]);
+
+  var Icon = rtl ? AngleLeft : AngleRight;
+  return /*#__PURE__*/React.createElement(Menu, {
+    openMenuOn: ['mouseover', 'click'],
+    renderMenuButton: function renderMenuButton(_ref, buttonRef) {
+      var open = _ref.open,
+          menuButtonProps = _objectWithoutPropertiesLoose(_ref, ["open"]);
+
+      return /*#__PURE__*/React.createElement(MenuItem, {
+        disabled: disabled
+      }, function (_ref2, menuitemRef) {
+        var selected = _ref2.selected,
+            active = _ref2.active,
+            menuitem = _objectWithoutPropertiesLoose(_ref2, ["selected", "active"]);
+
+        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["toggle"]))), withItemClassPrefix({
+          'with-icon': icon,
+          open: open,
+          active: selected,
+          disabled: disabled,
+          focus: active
+        }));
+        return /*#__PURE__*/React.createElement("div", _extends({
+          ref: mergeRefs(buttonRef, menuitemRef),
+          className: classes,
+          "data-event-key": eventKey,
+          "data-event-key-type": typeof eventKey
+        }, menuitem, omit(menuButtonProps, ['role'])), icon && /*#__PURE__*/React.cloneElement(icon, {
+          className: prefix('menu-icon')
+        }), title, /*#__PURE__*/React.createElement(Icon, {
+          className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["toggle-icon"])))
+        }));
+      });
+    },
+    renderMenuPopup: function renderMenuPopup(_ref3, popupRef) {
+      var open = _ref3.open,
+          popupProps = _objectWithoutPropertiesLoose(_ref3, ["open"]);
+
+      var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
+      return /*#__PURE__*/React.createElement("ul", _extends({
+        ref: popupRef,
+        className: menuClassName,
+        hidden: !open
+      }, popupProps, menuProps), children);
+    },
+    onToggleMenu: handleToggleSubmenu
+  }, function (_ref4, menuContainerRef) {
+    var open = _ref4.open,
+        menuContainer = _objectWithoutPropertiesLoose(_ref4, ["open"]);
+
+    var classes = mergeItemClassNames(className, withItemClassPrefix({
+      disabled: disabled,
+      open: open,
+      submenu: true
+    }));
+    return /*#__PURE__*/React.createElement("li", _extends({
+      ref: mergeRefs(ref, menuContainerRef),
+      className: classes
+    }, menuContainer));
+  });
+});
+NavDropdownMenu.displayName = 'Nav.Dropdown.Menu';
+NavDropdownMenu.propTypes = {
+  active: PropTypes.bool,
+  className: PropTypes.string,
+  children: PropTypes.node,
+  icon: PropTypes.any,
+  classPrefix: PropTypes.string,
+  pullLeft: PropTypes.bool,
+  title: PropTypes.node,
+  open: PropTypes.bool,
+  eventKey: PropTypes.any,
+  expanded: PropTypes.bool,
+  collapsible: PropTypes.bool,
+  onToggle: PropTypes.func
+};
+export default NavDropdownMenu;

package/esm/Nav/NavDropdownToggle.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import Button from '../Button';
+import { WithAsProps, RsRefForwardingComponent, TypeAttributes } from '../@types/common';
+import { NavItemProps } from './NavItem';
+export interface NavDropdownToggleProps extends WithAsProps {
+    icon?: NavItemProps['icon'];
+    noCaret?: boolean;
+    renderToggle?: (props: WithAsProps, ref: React.Ref<any>) => any;
+    placement?: TypeAttributes.Placement8;
+}
+/**
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Menu> call
+ *
+ * <Nav>
+ *   <Nav.Menu> -> This will render <NavDropdown> component that renders a <NavDropdownToggle>
+ *   </Nav.Menu>
+ * </Nav>
+ */
+declare const NavDropdownToggle: RsRefForwardingComponent<typeof Button, NavDropdownToggleProps>;
+export default NavDropdownToggle;

package/esm/Nav/NavDropdownToggle.js

@@ -0,0 +1,57 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React from 'react';
+import PropTypes from 'prop-types';
+import ArrowDownLineIcon from '@rsuite/icons/ArrowDownLine';
+import { useClassNames } from '../utils';
+import NavItem from './NavItem';
+
+/**
+ * @private this component is not supposed to be used directly
+ *          Instead it's rendered by a <Nav.Menu> call
+ *
+ * <Nav>
+ *   <Nav.Menu> -> This will render <NavDropdown> component that renders a <NavDropdownToggle>
+ *   </Nav.Menu>
+ * </Nav>
+ */
+var NavDropdownToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _props$as = props.as,
+      Component = _props$as === void 0 ? NavItem : _props$as,
+      className = props.className,
+      _props$classPrefix = props.classPrefix,
+      classPrefix = _props$classPrefix === void 0 ? 'dropdown-toggle' : _props$classPrefix,
+      renderToggle = props.renderToggle,
+      children = props.children,
+      noCaret = props.noCaret,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "renderToggle", "children", "noCaret"]);
+
+  var _useClassNames = useClassNames(classPrefix),
+      withClassPrefix = _useClassNames.withClassPrefix,
+      merge = _useClassNames.merge;
+
+  var _useClassNames2 = useClassNames('nav-item'),
+      prefixNavItem = _useClassNames2.prefix;
+
+  var classes = merge(className, withClassPrefix({
+    'no-caret': noCaret
+  }));
+  var toggle = /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
+    ref: ref,
+    className: classes
+  }), children, !noCaret && /*#__PURE__*/React.createElement(ArrowDownLineIcon, {
+    className: prefixNavItem('caret')
+  }));
+  return renderToggle ? renderToggle(rest, ref) : toggle;
+});
+NavDropdownToggle.displayName = 'Nav.Dropdown.Toggle';
+NavDropdownToggle.propTypes = {
+  className: PropTypes.string,
+  children: PropTypes.node,
+  classPrefix: PropTypes.string,
+  noCaret: PropTypes.bool,
+  as: PropTypes.elementType,
+  renderToggle: PropTypes.func,
+  placement: PropTypes.oneOf(['bottomStart', 'bottomEnd', 'topStart', 'topEnd', 'leftStart', 'rightStart', 'leftEnd', 'rightEnd'])
+};
+export default NavDropdownToggle;

package/esm/Nav/NavItem.d.ts

@@ -21,6 +21,8 @@ export interface NavItemProps<T = string> extends WithAsProps, Omit<React.HTMLAt
 }
 /**
  * The <Nav.Item> API
+ * When used as direct child of <Nav>, render the NavItem
+ * When used within a <Nav.Menu>, render the NavDropdownItem
  */
 declare const NavItem: RsRefForwardingComponent<'a', NavItemProps>;
 export default NavItem;

package/esm/Nav/NavItem.js

@@ -6,16 +6,20 @@ import isNil from 'lodash/isNil';
 import Ripple from '../Ripple';
 import SafeAnchor from '../SafeAnchor';
 import { shallowEqual, useClassNames } from '../utils';
-import { SidenavContext } from '../Sidenav/Sidenav';
 import NavContext from './NavContext';
-import { NavbarContext } from '../Navbar/Navbar';
-import SidenavItem from '../Sidenav/SidenavItem';
-import NavbarItem from '../Navbar/NavbarItem';
 
 /**
  * The <Nav.Item> API
+ * When used as direct child of <Nav>, render the NavItem
+ * When used within a <Nav.Menu>, render the NavDropdownItem
  */
 var NavItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var nav = useContext(NavContext);
+
+  if (!nav) {
+    throw new Error('<Nav.Item> must be rendered within a <Nav> component.');
+  }
+
   var _props$as = props.as,
       Component = _props$as === void 0 ? SafeAnchor : _props$as,
       activeProp = props.active,
@@ -33,17 +37,13 @@ var NavItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onSelectProp = props.onSelect,
       rest = _objectWithoutPropertiesLoose(props, ["as", "active", "disabled", "eventKey", "className", "classPrefix", "style", "children", "icon", "divider", "panel", "onClick", "onSelect"]);
 
-  var _useContext = useContext(NavContext),
-      activeKey = _useContext.activeKey,
-      onSelectFromNav = _useContext.onSelect;
-
+  var activeKey = nav.activeKey,
+      onSelectFromNav = nav.onSelect;
   var active = activeProp !== null && activeProp !== void 0 ? activeProp : !isNil(eventKey) && shallowEqual(eventKey, activeKey);
   var emitSelect = useCallback(function (event) {
     onSelectProp === null || onSelectProp === void 0 ? void 0 : onSelectProp(eventKey, event);
     onSelectFromNav === null || onSelectFromNav === void 0 ? void 0 : onSelectFromNav(eventKey, event);
   }, [eventKey, onSelectProp, onSelectFromNav]);
-  var navbar = useContext(NavbarContext);
-  var sidenav = useContext(SidenavContext);
 
   var _useClassNames = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -61,10 +61,6 @@ var NavItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [disabled, emitSelect, onClick]);
 
-  if (sidenav) {
-    return /*#__PURE__*/React.createElement(SidenavItem, props);
-  }
-
   if (divider) {
     return /*#__PURE__*/React.createElement("div", _extends({
       ref: ref,
@@ -82,12 +78,6 @@ var NavItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, rest), children);
   }
 
-  if (navbar) {
-    return /*#__PURE__*/React.createElement(NavbarItem, _extends({
-      ref: ref
-    }, props));
-  }
-
   return /*#__PURE__*/React.createElement(Component, _extends({
     ref: ref,
     tabIndex: disabled ? -1 : undefined
@@ -96,7 +86,9 @@ var NavItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClick: handleClick,
     style: style,
     "aria-selected": active || undefined
-  }), icon, children, /*#__PURE__*/React.createElement(Ripple, null));
+  }), icon && /*#__PURE__*/React.cloneElement(icon, {
+    className: prefix('icon')
+  }), children, /*#__PURE__*/React.createElement(Ripple, null));
 });
 NavItem.displayName = 'Nav.Item';
 NavItem.propTypes = {