rsuite 5.12.0 → 5.14.0

package/esm/Dropdown/DropdownItem.js

@@ -2,19 +2,17 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { SidenavContext } from '../Sidenav/Sidenav';
 import deprecatePropType from '../utils/deprecatePropType';
 import MenuItem from '../Menu/MenuItem';
 import DropdownContext from './DropdownContext';
 import isNil from 'lodash/isNil';
-import { createChainedFunction, mergeRefs, shallowEqual, useClassNames } from '../utils';
-import { NavbarContext } from '../Navbar/Navbar';
-import SidenavDropdownItem from '../Sidenav/SidenavDropdownItem';
-import DisclosureContext, { DisclosureActionTypes } from '../Disclosure/DisclosureContext';
+import { mergeRefs, shallowEqual, useClassNames } from '../utils';
 import NavContext from '../Nav/NavContext';
 import useInternalId from '../utils/useInternalId';
 import { DropdownActionType } from './DropdownState';
 import { useRenderDropdownItem } from './useRenderDropdownItem';
+import warnOnce from '../utils/warnOnce';
+import Nav from '../Nav';
 
 /**
  * The <Dropdown.Item> API
@@ -52,21 +50,7 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(eventKey, event);
     dropdown === null || dropdown === void 0 ? void 0 : (_dropdown$onSelect = dropdown.onSelect) === null || _dropdown$onSelect === void 0 ? void 0 : _dropdown$onSelect.call(dropdown, eventKey, event);
   }, [onSelect, eventKey, dropdown]);
-  var sidenav = useContext(SidenavContext);
-  var navbar = useContext(NavbarContext);
-  var disclosure = useContext(DisclosureContext);
-
-  var _ref = disclosure !== null && disclosure !== void 0 ? disclosure : [],
-      dispatchDisclosure = _ref[1];
-
-  var handleClickNavbarDropdownItem = useCallback(function (event) {
-    dispatchDisclosure === null || dispatchDisclosure === void 0 ? void 0 : dispatchDisclosure({
-      type: DisclosureActionTypes.Hide,
-      cascade: true
-    });
-    handleSelectItem === null || handleSelectItem === void 0 ? void 0 : handleSelectItem(event);
-  }, [dispatchDisclosure, handleSelectItem]);
-  var selected = activeProp || !isNil(eventKey) && (shallowEqual(dropdown === null || dropdown === void 0 ? void 0 : dropdown.activeKey, eventKey) || shallowEqual(nav === null || nav === void 0 ? void 0 : nav.activeKey, eventKey));
+  var selected = activeProp || !isNil(eventKey) && shallowEqual(dropdown === null || dropdown === void 0 ? void 0 : dropdown.activeKey, eventKey);
   var dispatch = dropdown === null || dropdown === void 0 ? void 0 : dropdown.dispatch;
   useEffect(function () {
     if (dispatch) {
@@ -89,10 +73,12 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       };
     }
   }, [internalId, selected, dispatch]);
-  var renderDropdownItem = useRenderDropdownItem(Component);
+  var renderDropdownItem = useRenderDropdownItem(Component); // If using <Dropdown.Item> within <Nav>
+  // Suggest <Nav.Item>
 
-  if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
-    return /*#__PURE__*/React.createElement(SidenavDropdownItem, _extends({
+  if (nav) {
+    warnOnce('Usage of <Dropdown.Item> within <Nav> is deprecated. Replace with <Nav.Item> within <Nav.Menu>.');
+    return /*#__PURE__*/React.createElement(Nav.Item, _extends({
       ref: ref
     }, props));
   }
@@ -113,42 +99,14 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, restProps));
   }
 
-  if (navbar) {
-    var classes = merge(className, withClassPrefix({
-      'with-icon': icon,
-      disabled: disabled,
-      divider: divider,
-      panel: panel,
-      active: selected
-    }));
-    var dataAttributes = {
-      'data-event-key': eventKey
-    };
-
-    if (!isNil(eventKey) && typeof eventKey !== 'string') {
-      dataAttributes['data-event-key-type'] = typeof eventKey;
-    }
-
-    return renderDropdownItem(_extends({
-      ref: ref,
-      className: classes,
-      'aria-current': selected || undefined
-    }, dataAttributes, restProps, {
-      onClick: createChainedFunction(handleClickNavbarDropdownItem, restProps.onClick),
-      children: /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.cloneElement(icon, {
-        className: prefix('menu-icon')
-      }), children)
-    }));
-  }
-
   return /*#__PURE__*/React.createElement(MenuItem, {
     selected: selected,
     disabled: disabled,
     onActivate: handleSelectItem
-  }, function (_ref2, menuitemRef) {
-    var selected = _ref2.selected,
-        active = _ref2.active,
-        menuitem = _objectWithoutPropertiesLoose(_ref2, ["selected", "active"]);
+  }, function (_ref, menuitemRef) {
+    var selected = _ref.selected,
+        active = _ref.active,
+        menuitem = _objectWithoutPropertiesLoose(_ref, ["selected", "active"]);
 
     var classes = merge(className, withClassPrefix({
       'with-icon': icon,

package/esm/Dropdown/DropdownMenu.js

@@ -2,7 +2,7 @@ import _taggedTemplateLiteralLoose from "@babel/runtime/helpers/esm/taggedTempla
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2;
 
 import React, { useCallback, useContext, useMemo } from 'react';
 import omit from 'lodash/omit';
@@ -10,15 +10,14 @@ import Menu from '../Menu/Menu';
 import MenuItem from '../Menu/MenuItem';
 import { mergeRefs, useClassNames } from '../utils';
 import PropTypes from 'prop-types';
-import { SidenavContext } from '../Sidenav/Sidenav';
 import AngleLeft from '@rsuite/icons/legacy/AngleLeft';
 import AngleRight from '@rsuite/icons/legacy/AngleRight';
 import useCustom from '../utils/useCustom';
 import DropdownContext from './DropdownContext';
-import { NavbarContext } from '../Navbar';
 import Menubar from '../Menu/Menubar';
-import SidenavDropdownMenu from '../Sidenav/SidenavDropdownMenu';
-import Disclosure from '../Disclosure';
+import Nav from '../Nav';
+import NavContext from '../Nav/NavContext';
+import warnOnce from '../utils/warnOnce';
 
 /**
  * The <Dropdown.Menu> API
@@ -49,9 +48,8 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       children = props.children,
       rest = _objectWithoutPropertiesLoose(props, ["onToggle", "eventKey", "title", "activeKey", "onSelect", "classPrefix", "children"]);
 
+  var nav = useContext(NavContext);
   var dropdown = useContext(DropdownContext);
-  var sidenav = useContext(SidenavContext);
-  var withinNavbar = Boolean(useContext(NavbarContext));
 
   var _useCustom = useCustom('DropdownMenu'),
       rtl = _useCustom.rtl;
@@ -79,9 +77,18 @@ var DropdownMenu = /*#__PURE__*/React.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) {
+    warnOnce('Usage of <Dropdown.Menu> within <Nav> is deprecated. Replace with <Nav.Menu>');
+    return /*#__PURE__*/React.createElement(Nav.Menu, _extends({
+      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.createElement(DropdownContext.Provider, {
@@ -94,10 +101,6 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
         className: classes
       }, menubar, rest), children);
     }));
-  }
-
-  if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
-    return /*#__PURE__*/React.createElement(SidenavDropdownMenu, omit(props, 'classPrefix'));
   } // Parent menu exists. This is a submenu.
   // Should render a `menuitem` that controls this submenu.
 
@@ -108,69 +111,21 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       disabled = _omit.disabled,
       menuProps = _objectWithoutPropertiesLoose(_omit, ["icon", "className", "disabled"]);
 
-  var Icon = rtl ? AngleLeft : AngleRight; // Renders a disclosure when used within <Navbar>
-
-  if (withinNavbar) {
-    return /*#__PURE__*/React.createElement(Disclosure, {
-      hideOnClickOutside: true,
-      trigger: ['click', 'mouseover']
-    }, function (_ref, containerRef) {
-      var open = _ref.open,
-          props = _objectWithoutPropertiesLoose(_ref, ["open"]);
-
-      var classes = mergeItemClassNames(className, withItemClassPrefix({
-        disabled: disabled,
-        open: open,
-        submenu: true
-      }));
-      return /*#__PURE__*/React.createElement("li", _extends({
-        ref: mergeRefs(ref, containerRef),
-        className: classes
-      }, props), /*#__PURE__*/React.createElement(Disclosure.Button, null, function (_ref2, buttonRef) {
-        var open = _ref2.open,
-            buttonProps = _objectWithoutPropertiesLoose(_ref2, ["open"]);
-
-        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["toggle"]))), withItemClassPrefix({
-          'with-icon': icon,
-          open: open,
-          disabled: disabled
-        }));
-        return /*#__PURE__*/React.createElement("div", _extends({
-          ref: mergeRefs(buttonRef, buttonRef),
-          className: classes,
-          "data-event-key": eventKey,
-          "data-event-key-type": typeof eventKey
-        }, buttonProps), icon && /*#__PURE__*/React.cloneElement(icon, {
-          className: prefix('menu-icon')
-        }), title, /*#__PURE__*/React.createElement(Icon, {
-          className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["toggle-icon"])))
-        }));
-      }), /*#__PURE__*/React.createElement(Disclosure.Content, null, function (_ref3, elementRef) {
-        var open = _ref3.open;
-        var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
-        return /*#__PURE__*/React.createElement("ul", _extends({
-          ref: elementRef,
-          className: menuClassName,
-          hidden: !open
-        }, menuProps), children);
-      }));
-    });
-  }
-
+  var Icon = rtl ? AngleLeft : AngleRight;
   return /*#__PURE__*/React.createElement(Menu, {
     openMenuOn: ['mouseover', 'click'],
-    renderMenuButton: function renderMenuButton(_ref4, buttonRef) {
-      var open = _ref4.open,
-          menuButtonProps = _objectWithoutPropertiesLoose(_ref4, ["open"]);
+    renderMenuButton: function renderMenuButton(_ref, buttonRef) {
+      var open = _ref.open,
+          menuButtonProps = _objectWithoutPropertiesLoose(_ref, ["open"]);
 
       return /*#__PURE__*/React.createElement(MenuItem, {
         disabled: disabled
-      }, function (_ref5, menuitemRef) {
-        var selected = _ref5.selected,
-            active = _ref5.active,
-            menuitem = _objectWithoutPropertiesLoose(_ref5, ["selected", "active"]);
+      }, function (_ref2, menuitemRef) {
+        var selected = _ref2.selected,
+            active = _ref2.active,
+            menuitem = _objectWithoutPropertiesLoose(_ref2, ["selected", "active"]);
 
-        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["toggle"]))), withItemClassPrefix({
+        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["toggle"]))), withItemClassPrefix({
           'with-icon': icon,
           open: open,
           active: selected,
@@ -185,13 +140,13 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }, menuitem, omit(menuButtonProps, ['role'])), icon && /*#__PURE__*/React.cloneElement(icon, {
           className: prefix('menu-icon')
         }), title, /*#__PURE__*/React.createElement(Icon, {
-          className: prefix(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["toggle-icon"])))
+          className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["toggle-icon"])))
         }));
       });
     },
-    renderMenuPopup: function renderMenuPopup(_ref6, popupRef) {
-      var open = _ref6.open,
-          popupProps = _objectWithoutPropertiesLoose(_ref6, ["open"]);
+    renderMenuPopup: function renderMenuPopup(_ref3, popupRef) {
+      var open = _ref3.open,
+          popupProps = _objectWithoutPropertiesLoose(_ref3, ["open"]);
 
       var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
       return /*#__PURE__*/React.createElement("ul", _extends({
@@ -201,9 +156,9 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }, popupProps, menuProps), children);
     },
     onToggleMenu: handleToggleSubmenu
-  }, function (_ref7, menuContainerRef) {
-    var open = _ref7.open,
-        menuContainer = _objectWithoutPropertiesLoose(_ref7, ["open"]);
+  }, function (_ref4, menuContainerRef) {
+    var open = _ref4.open,
+        menuContainer = _objectWithoutPropertiesLoose(_ref4, ["open"]);
 
     var classes = mergeItemClassNames(className, withItemClassPrefix({
       disabled: disabled,

package/esm/Dropdown/DropdownToggle.js

@@ -1,12 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useContext } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import Button from '../Button';
 import { useClassNames } from '../utils';
 import useToggleCaret from '../utils/useToggleCaret';
-import { SidenavContext } from '../Sidenav/Sidenav';
-import NavContext from '../Nav/NavContext';
 var DropdownToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? Button : _props$as,
@@ -21,11 +19,6 @@ var DropdownToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
       rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "renderToggle", "children", "icon", "noCaret", "placement"]);
 
-  var sidenav = useContext(SidenavContext);
-
-  var _useContext = useContext(NavContext),
-      withinNav = _useContext.withinNav;
-
   var _useClassNames = useClassNames(classPrefix),
       prefix = _useClassNames.prefix,
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -33,13 +26,10 @@ var DropdownToggle = /*#__PURE__*/React.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 = useToggleCaret(inSidenav ? 'bottomStart' : placement);
-  var toggle = /*#__PURE__*/React.createElement(Component, _extends({
-    appearance: withinNav ? 'subtle' : undefined
-  }, rest, {
+  var Caret = useToggleCaret(placement);
+  var toggle = /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     ref: ref,
     className: classes
   }), icon && /*#__PURE__*/React.cloneElement(icon, {

package/esm/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/esm/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/esm/Form/test/Form.test.d.ts

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

package/esm/Form/test/Form.test.js

@@ -0,0 +1,11 @@
+var _formRef$current;
+
+import React from 'react';
+import Form from '../Form';
+var formRef = /*#__PURE__*/React.createRef();
+
+/*#__PURE__*/
+React.createElement(Form, {
+  ref: formRef
+});
+(_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.check();

package/esm/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/esm/Menu/Menu.js

@@ -13,6 +13,7 @@ import { isFocusableElement } from '../utils/dom';
 var defaultOpenMenuOn = ['click'];
 /**
  * Headless ARIA `menu`
+ * @private
  */
 
 function Menu(_ref) {

package/esm/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/esm/Menu/MenuItem.js

@@ -6,6 +6,7 @@ import MenuContext, { MenuActionTypes, MoveFocusTo } from './MenuContext';
 
 /**
  * Headless ARIA `menuitem`
+ * @private
  */
 function MenuItem(props) {
   var children = props.children,

package/esm/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/esm/Menu/Menubar.js

@@ -6,6 +6,10 @@ import { KEY_VALUES, useCustom } from '../utils';
 import { isFocusEntering, isFocusLeaving } from '../utils/events';
 import useMenu from './useMenu';
 import { isFocusableElement } from '../utils/dom';
+
+/**
+ * @private
+ */
 export default function Menubar(_ref) {
   var _items$activeItemInde3;
 

package/esm/Modal/test/Modal.test.d.ts

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

package/esm/Modal/test/Modal.test.js

@@ -0,0 +1,9 @@
+import React from 'react';
+import Modal from '../Modal';
+
+/*#__PURE__*/
+React.createElement(Modal, {
+  container: function container() {
+    return document.body;
+  }
+});

package/esm/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/esm/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/esm/Nav/Nav.js

@@ -1,15 +1,24 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useContext, useMemo } from 'react';
+import React, { useContext, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import NavItem from './NavItem';
-import Dropdown from '../Dropdown';
 import { useClassNames } from '../utils';
 import { NavbarContext } from '../Navbar/Navbar';
 import { SidenavContext } from '../Sidenav/Sidenav';
 import NavContext from './NavContext';
 import useEnsuredRef from '../utils/useEnsuredRef';
 import Menubar from '../Menu/Menubar';
+import NavDropdown from './NavDropdown';
+import NavMenu, { NavMenuActionType, NavMenuContext } from './NavMenu';
+import deprecateComponent from '../utils/deprecateComponent';
+import NavDropdownItem from './NavDropdownItem';
+import NavDropdownMenu from './NavDropdownMenu';
+import NavbarDropdownItem from '../Navbar/NavbarDropdownItem';
+import SidenavDropdownItem from '../Sidenav/SidenavDropdownItem';
+import NavbarItem from '../Navbar/NavbarItem';
+import SidenavItem from '../Sidenav/SidenavItem';
+import useInternalId from '../utils/useInternalId';
 var Nav = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -57,7 +66,6 @@ var Nav = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var activeKey = activeKeyProp !== null && activeKeyProp !== void 0 ? activeKeyProp : activeKeyFromSidenav;
   var contextValue = useMemo(function () {
     return {
-      withinNav: true,
       activeKey: activeKey,
       onSelect: onSelectProp !== null && onSelectProp !== void 0 ? onSelectProp : onSelectFromSidenav
     };
@@ -97,8 +105,91 @@ var Nav = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: prefix('bar')
   })));
 });
-Nav.Dropdown = Dropdown;
-Nav.Item = NavItem;
+var DeprecatedNavDropdown = deprecateComponent(NavDropdown, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
+DeprecatedNavDropdown.Menu = deprecateComponent(NavDropdownMenu, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
+DeprecatedNavDropdown.Item = deprecateComponent(NavDropdownItem, '<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.forwardRef(function (props, ref) {
+  var nav = useContext(NavContext);
+
+  if (!nav) {
+    throw new Error('<Nav.Item> must be rendered within a <Nav> component.');
+  }
+
+  var parentNavMenu = useContext(NavMenuContext);
+  var navbar = useContext(NavbarContext);
+  var sidenav = useContext(SidenavContext);
+
+  var _ref2 = parentNavMenu !== null && parentNavMenu !== void 0 ? parentNavMenu : [],
+      dispatch = _ref2[1];
+
+  var _id = useInternalId('Nav.Item');
+
+  useEffect(function () {
+    if (dispatch) {
+      var _props$active;
+
+      dispatch({
+        type: 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: NavMenuActionType.UnregisterItem,
+          payload: {
+            _id: _id
+          }
+        });
+      };
+    }
+  }, [dispatch, _id, props.eventKey, props.active]);
+
+  if (parentNavMenu) {
+    if (navbar) {
+      return /*#__PURE__*/React.createElement(NavbarDropdownItem, _extends({
+        ref: ref
+      }, props));
+    }
+
+    if (sidenav) {
+      return /*#__PURE__*/React.createElement(SidenavDropdownItem, _extends({
+        ref: ref
+      }, props));
+    }
+
+    return /*#__PURE__*/React.createElement(NavDropdownItem, _extends({
+      ref: ref
+    }, props));
+  }
+
+  if (navbar) {
+    return /*#__PURE__*/React.createElement(NavbarItem, _extends({
+      ref: ref
+    }, props));
+  }
+
+  if (sidenav) {
+    return /*#__PURE__*/React.createElement(SidenavItem, _extends({
+      ref: ref
+    }, props));
+  }
+
+  return /*#__PURE__*/React.createElement(NavItem, _extends({
+    ref: ref
+  }, props));
+});
+Nav.Item.displayName = 'Nav.Item';
+Nav.Menu = NavMenu;
 Nav.displayName = 'Nav';
 Nav.propTypes = {
   classPrefix: PropTypes.string,

package/esm/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/esm/Nav/NavContext.js

@@ -1,8 +1,3 @@
 import React from 'react';
-import noop from 'lodash/noop';
-var NavContext = /*#__PURE__*/React.createContext({
-  withinNav: false,
-  activeKey: null,
-  onSelect: noop
-});
+var NavContext = /*#__PURE__*/React.createContext(null);
 export default NavContext;