rsuite 5.12.0 → 5.14.0

package/cjs/Dropdown/DropdownMenu.js

@@ -25,8 +25,6 @@ var _utils = require("../utils");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _Sidenav = require("../Sidenav/Sidenav");
-
 var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"));
 
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
@@ -35,15 +33,15 @@ var _useCustom2 = _interopRequireDefault(require("../utils/useCustom"));
 
 var _DropdownContext = _interopRequireDefault(require("./DropdownContext"));
 
-var _Navbar = require("../Navbar");
-
 var _Menubar = _interopRequireDefault(require("../Menu/Menubar"));
 
-var _SidenavDropdownMenu = _interopRequireDefault(require("../Sidenav/SidenavDropdownMenu"));
+var _Nav = _interopRequireDefault(require("../Nav"));
+
+var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
 
-var _Disclosure = _interopRequireDefault(require("../Disclosure"));
+var _warnOnce = _interopRequireDefault(require("../utils/warnOnce"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2;
 
 /**
  * The <Dropdown.Menu> API
@@ -73,9 +71,8 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       classPrefix = _props$classPrefix === void 0 ? 'dropdown-menu' : _props$classPrefix,
       children = props.children,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "activeKey", "onSelect", "classPrefix", "children"]);
+  var nav = (0, _react.useContext)(_NavContext.default);
   var dropdown = (0, _react.useContext)(_DropdownContext.default);
-  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
-  var withinNavbar = Boolean((0, _react.useContext)(_Navbar.NavbarContext));
 
   var _useCustom = (0, _useCustom2.default)('DropdownMenu'),
       rtl = _useCustom.rtl;
@@ -103,9 +100,18 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       activeKey: activeKey,
       onSelect: onSelect
     };
-  }, [activeKey, onSelect]); // <Dropdown.Menu> is used outside of <Dropdown>
+  }, [activeKey, onSelect]); // If rendered within a <Nav>
+  // Suggest <Nav.Menu>
+
+  if (nav) {
+    (0, _warnOnce.default)('Usage of <Dropdown.Menu> within <Nav> is deprecated. Replace with <Nav.Menu>');
+    return /*#__PURE__*/_react.default.createElement(_Nav.default.Menu, (0, _extends2.default)({
+      ref: ref
+    }, props));
+  } // <Dropdown.Menu> is used outside of <Dropdown>
   // renders a vertical `menubar`
 
+
   if (!dropdown) {
     var classes = merge(props.className, withClassPrefix());
     return /*#__PURE__*/_react.default.createElement(_DropdownContext.default.Provider, {
@@ -118,10 +124,6 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         className: classes
       }, menubar, rest), children);
     }));
-  }
-
-  if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
-    return /*#__PURE__*/_react.default.createElement(_SidenavDropdownMenu.default, (0, _omit2.default)(props, 'classPrefix'));
   } // Parent menu exists. This is a submenu.
   // Should render a `menuitem` that controls this submenu.
 
@@ -132,65 +134,19 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       disabled = _omit.disabled,
       menuProps = (0, _objectWithoutPropertiesLoose2.default)(_omit, ["icon", "className", "disabled"]);
 
-  var Icon = rtl ? _AngleLeft.default : _AngleRight.default; // Renders a disclosure when used within <Navbar>
-
-  if (withinNavbar) {
-    return /*#__PURE__*/_react.default.createElement(_Disclosure.default, {
-      hideOnClickOutside: true,
-      trigger: ['click', 'mouseover']
-    }, function (_ref, containerRef) {
-      var open = _ref.open,
-          props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["open"]);
-      var classes = mergeItemClassNames(className, withItemClassPrefix({
-        disabled: disabled,
-        open: open,
-        submenu: true
-      }));
-      return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
-        ref: (0, _utils.mergeRefs)(ref, containerRef),
-        className: classes
-      }, props), /*#__PURE__*/_react.default.createElement(_Disclosure.default.Button, null, function (_ref2, buttonRef) {
-        var open = _ref2.open,
-            buttonProps = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["open"]);
-        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["toggle"]))), withItemClassPrefix({
-          'with-icon': icon,
-          open: open,
-          disabled: disabled
-        }));
-        return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-          ref: (0, _utils.mergeRefs)(buttonRef, buttonRef),
-          className: classes,
-          "data-event-key": eventKey,
-          "data-event-key-type": typeof eventKey
-        }, buttonProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-          className: prefix('menu-icon')
-        }), title, /*#__PURE__*/_react.default.createElement(Icon, {
-          className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
-        }));
-      }), /*#__PURE__*/_react.default.createElement(_Disclosure.default.Content, null, function (_ref3, elementRef) {
-        var open = _ref3.open;
-        var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
-        return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
-          ref: elementRef,
-          className: menuClassName,
-          hidden: !open
-        }, menuProps), children);
-      }));
-    });
-  }
-
+  var Icon = rtl ? _AngleLeft.default : _AngleRight.default;
   return /*#__PURE__*/_react.default.createElement(_Menu.default, {
     openMenuOn: ['mouseover', 'click'],
-    renderMenuButton: function renderMenuButton(_ref4, buttonRef) {
-      var open = _ref4.open,
-          menuButtonProps = (0, _objectWithoutPropertiesLoose2.default)(_ref4, ["open"]);
+    renderMenuButton: function renderMenuButton(_ref, buttonRef) {
+      var open = _ref.open,
+          menuButtonProps = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["open"]);
       return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
         disabled: disabled
-      }, function (_ref5, menuitemRef) {
-        var selected = _ref5.selected,
-            active = _ref5.active,
-            menuitem = (0, _objectWithoutPropertiesLoose2.default)(_ref5, ["selected", "active"]);
-        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["toggle"]))), withItemClassPrefix({
+      }, function (_ref2, menuitemRef) {
+        var selected = _ref2.selected,
+            active = _ref2.active,
+            menuitem = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["selected", "active"]);
+        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["toggle"]))), withItemClassPrefix({
           'with-icon': icon,
           open: open,
           active: selected,
@@ -205,13 +161,13 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         }, menuitem, (0, _omit2.default)(menuButtonProps, ['role'])), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
           className: prefix('menu-icon')
         }), title, /*#__PURE__*/_react.default.createElement(Icon, {
-          className: prefix(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
+          className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
         }));
       });
     },
-    renderMenuPopup: function renderMenuPopup(_ref6, popupRef) {
-      var open = _ref6.open,
-          popupProps = (0, _objectWithoutPropertiesLoose2.default)(_ref6, ["open"]);
+    renderMenuPopup: function renderMenuPopup(_ref3, popupRef) {
+      var open = _ref3.open,
+          popupProps = (0, _objectWithoutPropertiesLoose2.default)(_ref3, ["open"]);
       var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
       return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
         ref: popupRef,
@@ -220,9 +176,9 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       }, popupProps, menuProps), children);
     },
     onToggleMenu: handleToggleSubmenu
-  }, function (_ref7, menuContainerRef) {
-    var open = _ref7.open,
-        menuContainer = (0, _objectWithoutPropertiesLoose2.default)(_ref7, ["open"]);
+  }, function (_ref4, menuContainerRef) {
+    var open = _ref4.open,
+        menuContainer = (0, _objectWithoutPropertiesLoose2.default)(_ref4, ["open"]);
     var classes = mergeItemClassNames(className, withItemClassPrefix({
       disabled: disabled,
       open: open,

package/cjs/Dropdown/DropdownToggle.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -11,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -21,10 +19,6 @@ var _utils = require("../utils");
 
 var _useToggleCaret = _interopRequireDefault(require("../utils/useToggleCaret"));
 
-var _Sidenav = require("../Sidenav/Sidenav");
-
-var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
-
 var DropdownToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? _Button.default : _props$as,
@@ -38,10 +32,6 @@ var DropdownToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "renderToggle", "children", "icon", "noCaret", "placement"]);
-  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
-
-  var _useContext = (0, _react.useContext)(_NavContext.default),
-      withinNav = _useContext.withinNav;
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       prefix = _useClassNames.prefix,
@@ -50,14 +40,11 @@ var DropdownToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 
   var classes = merge(className, withClassPrefix({
     'no-caret': noCaret
-  }));
-  var inSidenav = !!sidenav; // Caret icon is down by default, when Dropdown is used in Sidenav.
+  })); // Caret icon is down by default, when Dropdown is used in Sidenav.
 
-  var Caret = (0, _useToggleCaret.default)(inSidenav ? 'bottomStart' : placement);
+  var Caret = (0, _useToggleCaret.default)(placement);
 
-  var toggle = /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
-    appearance: withinNav ? 'subtle' : undefined
-  }, rest, {
+  var toggle = /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     ref: ref,
     className: classes
   }), icon && /*#__PURE__*/_react.default.cloneElement(icon, {

package/cjs/Dropdown/useRenderDropdownItem.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare function useRenderDropdownItem(Component: React.ElementType): (props: any, OverrideComponent?: React.ElementType<any> | undefined) => JSX.Element;
+export declare function useRenderDropdownItem(Component: React.ElementType): (props: any, OverrideComponent?: React.ElementType) => JSX.Element;

package/cjs/Form/Form.d.ts

@@ -44,21 +44,21 @@ export interface FormProps<T = Record<string, any>, errorMsgType = any, E = {
 export interface FormInstance<T = Record<string, any>, errorMsg = string, E = {
     [P in keyof T]?: errorMsg;
 }> {
-    root: React.FormHTMLAttributes<HTMLFormElement>;
+    root: HTMLFormElement | null;
     /** Verify form data */
-    check?: (callback?: (formError: E) => void) => boolean;
+    check: (callback?: (formError: E) => void) => boolean;
     /** Asynchronously check form data */
-    checkAsync?: () => Promise<any>;
+    checkAsync: () => Promise<any>;
     /** Check the data field */
-    checkForField?: (fieldName: keyof T, callback?: (checkResult: CheckResult<errorMsg>) => void) => boolean;
+    checkForField: (fieldName: keyof T, callback?: (checkResult: CheckResult<errorMsg>) => void) => boolean;
     /** Asynchronous verification as a data field */
-    checkForFieldAsync?: (fieldName: keyof T) => Promise<CheckResult>;
+    checkForFieldAsync: (fieldName: keyof T) => Promise<CheckResult>;
     /** Clear all error messages */
-    cleanErrors?: (callback?: () => void) => void;
+    cleanErrors: (callback?: () => void) => void;
     /** Clear the error message of the specified field */
-    cleanErrorForField?: (fieldName: keyof E, callback?: () => void) => void;
+    cleanErrorForField: (fieldName: keyof E, callback?: () => void) => void;
     /** All error messages are reset, and an initial value can be set */
-    resetErrors?: (formError: E, callback?: () => void) => void;
+    resetErrors: (formError: E, callback?: () => void) => void;
 }
 export interface FormComponent extends RsRefForwardingComponent<'form', FormProps & {
     ref?: React.Ref<FormInstance>;

package/cjs/Form/test/Form.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/Form/test/Form.test.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Form = _interopRequireDefault(require("../Form"));
+
+var _formRef$current;
+
+var formRef = /*#__PURE__*/_react.default.createRef();
+
+/*#__PURE__*/
+_react.default.createElement(_Form.default, {
+  ref: formRef
+});
+
+(_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.check();

package/cjs/Menu/Menu.d.ts

@@ -33,6 +33,7 @@ export interface MenuHandle {
 }
 /**
  * Headless ARIA `menu`
+ * @private
  */
 declare function Menu({ disabled, children, openMenuOn, defaultOpen, open: openProp, menuButtonText, renderMenuButton, renderMenuPopup, onToggleMenu }: MenuProps & React.HTMLAttributes<HTMLUListElement>): React.ReactElement<React.HTMLAttributes<HTMLDivElement>, string | React.JSXElementConstructor<any>>;
 declare namespace Menu {

package/cjs/Menu/Menu.js

@@ -34,6 +34,7 @@ var _dom = require("../utils/dom");
 var defaultOpenMenuOn = ['click'];
 /**
  * Headless ARIA `menu`
+ * @private
  */
 
 function Menu(_ref) {

package/cjs/Menu/MenuItem.d.ts

@@ -16,6 +16,7 @@ export interface MenuitemRenderProps {
 }
 /**
  * Headless ARIA `menuitem`
+ * @private
  */
 declare function MenuItem(props: MenuItemProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 declare namespace MenuItem {

package/cjs/Menu/MenuItem.js

@@ -19,6 +19,7 @@ var _MenuContext = _interopRequireWildcard(require("./MenuContext"));
 
 /**
  * Headless ARIA `menuitem`
+ * @private
  */
 function MenuItem(props) {
   var children = props.children,

package/cjs/Menu/Menubar.d.ts

@@ -7,4 +7,7 @@ export interface MenubarProps {
     /** Callback triggered when an item is being activated */
     onActivateItem?: (event: React.SyntheticEvent) => void;
 }
+/**
+ * @private
+ */
 export default function Menubar({ vertical, children, onActivateItem }: MenubarProps): JSX.Element;

package/cjs/Menu/Menubar.js

@@ -22,6 +22,10 @@ var _useMenu = _interopRequireDefault(require("./useMenu"));
 var _dom = require("../utils/dom");
 
 // Headless ARIA `menubar`
+
+/**
+ * @private
+ */
 function Menubar(_ref) {
   var _items$activeItemInde3;
 

package/cjs/Modal/test/Modal.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/Modal/test/Modal.test.js

@@ -0,0 +1,14 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Modal = _interopRequireDefault(require("../Modal"));
+
+/*#__PURE__*/
+_react.default.createElement(_Modal.default, {
+  container: function container() {
+    return document.body;
+  }
+});

package/cjs/Modal/utils.d.ts

@@ -3,4 +3,4 @@ export declare const useBodyStyles: (ref: React.RefObject<HTMLElement>, options:
     overflow: boolean;
     drawer: boolean;
     prefix: (...classes: any) => string;
-}) => [import("react").CSSProperties, (entering?: boolean | undefined) => void, () => void];
+}) => [import("react").CSSProperties, (entering?: boolean) => void, () => void];

package/cjs/Nav/Nav.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
 import NavItem from './NavItem';
-import Dropdown from '../Dropdown';
 import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import NavDropdown from './NavDropdown';
+import NavMenu from './NavMenu';
 export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {
     /** sets appearance */
     appearance?: 'default' | 'subtle' | 'tabs';
@@ -19,8 +20,12 @@ export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttribute
     onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
 interface NavComponent extends RsRefForwardingComponent<'div', NavProps> {
-    Dropdown: typeof Dropdown;
+    /**
+     * @deprecated Use <Nav.Menu> instead.
+     */
+    Dropdown: typeof NavDropdown;
     Item: typeof NavItem;
+    Menu: typeof NavMenu;
 }
 declare const Nav: NavComponent;
 export default Nav;

package/cjs/Nav/Nav.js

@@ -17,8 +17,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _NavItem = _interopRequireDefault(require("./NavItem"));
 
-var _Dropdown = _interopRequireDefault(require("../Dropdown"));
-
 var _utils = require("../utils");
 
 var _Navbar = require("../Navbar/Navbar");
@@ -31,6 +29,26 @@ var _useEnsuredRef = _interopRequireDefault(require("../utils/useEnsuredRef"));
 
 var _Menubar = _interopRequireDefault(require("../Menu/Menubar"));
 
+var _NavDropdown = _interopRequireDefault(require("./NavDropdown"));
+
+var _NavMenu = _interopRequireWildcard(require("./NavMenu"));
+
+var _deprecateComponent = _interopRequireDefault(require("../utils/deprecateComponent"));
+
+var _NavDropdownItem = _interopRequireDefault(require("./NavDropdownItem"));
+
+var _NavDropdownMenu = _interopRequireDefault(require("./NavDropdownMenu"));
+
+var _NavbarDropdownItem = _interopRequireDefault(require("../Navbar/NavbarDropdownItem"));
+
+var _SidenavDropdownItem = _interopRequireDefault(require("../Sidenav/SidenavDropdownItem"));
+
+var _NavbarItem = _interopRequireDefault(require("../Navbar/NavbarItem"));
+
+var _SidenavItem = _interopRequireDefault(require("../Sidenav/SidenavItem"));
+
+var _useInternalId = _interopRequireDefault(require("../utils/useInternalId"));
+
 var Nav = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -77,7 +95,6 @@ var Nav = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var activeKey = activeKeyProp !== null && activeKeyProp !== void 0 ? activeKeyProp : activeKeyFromSidenav;
   var contextValue = (0, _react.useMemo)(function () {
     return {
-      withinNav: true,
       activeKey: activeKey,
       onSelect: onSelectProp !== null && onSelectProp !== void 0 ? onSelectProp : onSelectFromSidenav
     };
@@ -118,8 +135,91 @@ var Nav = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   })));
 });
 
-Nav.Dropdown = _Dropdown.default;
-Nav.Item = _NavItem.default;
+var DeprecatedNavDropdown = (0, _deprecateComponent.default)(_NavDropdown.default, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
+DeprecatedNavDropdown.Menu = (0, _deprecateComponent.default)(_NavDropdownMenu.default, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
+DeprecatedNavDropdown.Item = (0, _deprecateComponent.default)(_NavDropdownItem.default, '<Nav.Dropdown.Item> is deprecated, use <Nav.Item> instead');
+Nav.Dropdown = DeprecatedNavDropdown;
+/**
+ * The <Nav.Item> API
+ * When used as direct child of <Nav>, render the NavItem
+ * When used within a <Nav.Menu>, render the NavDropdownItem
+ */
+
+Nav.Item = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var nav = (0, _react.useContext)(_NavContext.default);
+
+  if (!nav) {
+    throw new Error('<Nav.Item> must be rendered within a <Nav> component.');
+  }
+
+  var parentNavMenu = (0, _react.useContext)(_NavMenu.NavMenuContext);
+  var navbar = (0, _react.useContext)(_Navbar.NavbarContext);
+  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
+
+  var _ref2 = parentNavMenu !== null && parentNavMenu !== void 0 ? parentNavMenu : [],
+      dispatch = _ref2[1];
+
+  var _id = (0, _useInternalId.default)('Nav.Item');
+
+  (0, _react.useEffect)(function () {
+    if (dispatch) {
+      var _props$active;
+
+      dispatch({
+        type: _NavMenu.NavMenuActionType.RegisterItem,
+        payload: {
+          _id: _id,
+          eventKey: props.eventKey,
+          active: (_props$active = props.active) !== null && _props$active !== void 0 ? _props$active : false
+        }
+      });
+      return function () {
+        dispatch({
+          type: _NavMenu.NavMenuActionType.UnregisterItem,
+          payload: {
+            _id: _id
+          }
+        });
+      };
+    }
+  }, [dispatch, _id, props.eventKey, props.active]);
+
+  if (parentNavMenu) {
+    if (navbar) {
+      return /*#__PURE__*/_react.default.createElement(_NavbarDropdownItem.default, (0, _extends2.default)({
+        ref: ref
+      }, props));
+    }
+
+    if (sidenav) {
+      return /*#__PURE__*/_react.default.createElement(_SidenavDropdownItem.default, (0, _extends2.default)({
+        ref: ref
+      }, props));
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_NavDropdownItem.default, (0, _extends2.default)({
+      ref: ref
+    }, props));
+  }
+
+  if (navbar) {
+    return /*#__PURE__*/_react.default.createElement(_NavbarItem.default, (0, _extends2.default)({
+      ref: ref
+    }, props));
+  }
+
+  if (sidenav) {
+    return /*#__PURE__*/_react.default.createElement(_SidenavItem.default, (0, _extends2.default)({
+      ref: ref
+    }, props));
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_NavItem.default, (0, _extends2.default)({
+    ref: ref
+  }, props));
+});
+Nav.Item.displayName = 'Nav.Item';
+Nav.Menu = _NavMenu.default;
 Nav.displayName = 'Nav';
 Nav.propTypes = {
   classPrefix: _propTypes.default.string,

package/cjs/Nav/NavContext.d.ts

@@ -1,13 +1,7 @@
 import React from 'react';
 export interface NavContextProps {
-    /**
-     * Whether component is rendered within a <Nav>
-     *
-     * FIXME: Bad design. Should use NavContextProps | null to determin whether within a <Nav>
-     */
-    withinNav: boolean;
-    activeKey: string | null;
+    activeKey: string | undefined;
     onSelect?: (eventKey: string | undefined, event: React.SyntheticEvent) => void;
 }
-declare const NavContext: React.Context<NavContextProps>;
+declare const NavContext: React.Context<NavContextProps | null>;
 export default NavContext;

package/cjs/Nav/NavContext.js

@@ -7,13 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _noop = _interopRequireDefault(require("lodash/noop"));
-
-var NavContext = /*#__PURE__*/_react.default.createContext({
-  withinNav: false,
-  activeKey: null,
-  onSelect: _noop.default
-});
+var NavContext = /*#__PURE__*/_react.default.createContext(null);
 
 var _default = NavContext;
 exports.default = _default;

package/cjs/Nav/NavDropdown.d.ts

@@ -0,0 +1,71 @@
+import React from 'react';
+import { TypeAttributes, WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import Button from '../Button';
+import NavDropdownItem from './NavDropdownItem';
+import NavDropdownMenu from './NavDropdownMenu';
+import { NavDropdownToggleProps } from './NavDropdownToggle';
+export declare type NavDropdownTrigger = 'click' | 'hover' | 'contextMenu';
+export interface NavDropdownProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'title'> {
+    /** Define the title as a submenu */
+    title?: React.ReactNode;
+    /** Set the icon */
+    icon?: NavDropdownToggleProps['icon'];
+    /** Triggering events */
+    trigger?: NavDropdownTrigger | readonly NavDropdownTrigger[];
+    /** 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?: NavDropdownToggleProps['noCaret'];
+    /**
+     * Open the menu and control it
+     * @deprecated
+     */
+    open?: boolean;
+    /**
+     * @deprecated
+     */
+    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, eventKey?: T | undefined, event?: React.SyntheticEvent) => void;
+}
+export interface NavDropdownComponent extends RsRefForwardingComponent<'div', NavDropdownProps> {
+    <ToggleAs extends React.ElementType = typeof Button>(props: NavDropdownProps & {
+        ref?: React.Ref<any>;
+        toggleAs?: ToggleAs;
+    } & React.ComponentProps<ToggleAs>, context: any): JSX.Element | null;
+    /**
+     * @deprecated Use <Nav.Item> instead.
+     */
+    Item: typeof NavDropdownItem;
+    /**
+     * @deprecated Use <Nav.Menu> instead.
+     */
+    Menu: typeof NavDropdownMenu;
+}
+/**
+ * @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>
+ */
+declare const NavDropdown: NavDropdownComponent;
+export default NavDropdown;