rsuite 5.10.0 → 5.13.0

package/esm/Form/Form.js

@@ -12,6 +12,7 @@ import FormErrorMessage from '../FormErrorMessage';
 import FormGroup from '../FormGroup';
 import FormHelpText from '../FormHelpText';
 import { useFormClassNames } from './useFormClassNames';
+import useSchemaModel from './useSchemaModel';
 var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$checkTrigger = props.checkTrigger,
       checkTrigger = _props$checkTrigger === void 0 ? 'change' : _props$checkTrigger,
@@ -27,7 +28,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _props$layout = props.layout,
       layout = _props$layout === void 0 ? 'vertical' : _props$layout,
       _props$model = props.model,
-      model = _props$model === void 0 ? SchemaModel({}) : _props$model,
+      formModel = _props$model === void 0 ? SchemaModel({}) : _props$model,
       readOnly = props.readOnly,
       plaintext = props.plaintext,
       className = props.className,
@@ -39,6 +40,11 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onChange = props.onChange,
       rest = _objectWithoutPropertiesLoose(props, ["checkTrigger", "classPrefix", "errorFromContext", "formDefaultValue", "formValue", "formError", "fluid", "layout", "model", "readOnly", "plaintext", "className", "children", "disabled", "onSubmit", "onCheck", "onError", "onChange"]);
 
+  var _useSchemaModel = useSchemaModel(formModel),
+      getCombinedModel = _useSchemaModel.getCombinedModel,
+      pushFieldRule = _useSchemaModel.pushFieldRule,
+      removeFieldRule = _useSchemaModel.removeFieldRule;
+
   var classes = useFormClassNames({
     classPrefix: classPrefix,
     className: className,
@@ -73,6 +79,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var formValue = getFormValue() || {};
     var formError = {};
     var errorCount = 0;
+    var model = getCombinedModel();
     Object.keys(model.spec).forEach(function (key) {
       var checkResult = model.checkForField(key, formValue);
 
@@ -91,7 +98,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
 
     return true;
-  }, [onCheck, onError, model, getFormValue]);
+  }, [getFormValue, getCombinedModel, onCheck, onError]);
   /**
    * Check the data field
    * @param fieldName
@@ -102,6 +109,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var _extends2;
 
     var formValue = getFormValue() || {};
+    var model = getCombinedModel();
     var checkResult = model.checkForField(fieldName, formValue);
 
     var formError = _extends({}, getFormError(), (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
@@ -115,7 +123,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
 
     return !checkResult.hasError;
-  }, [model, getFormValue, getFormError, onCheck, onError]);
+  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
   /**
    * Check form data asynchronously and return a Promise
    */
@@ -124,6 +132,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var formValue = getFormValue() || {};
     var promises = [];
     var keys = [];
+    var model = getCombinedModel();
     Object.keys(model.spec).forEach(function (key) {
       keys.push(key);
       promises.push(model.checkForFieldAsync(key, formValue));
@@ -151,7 +160,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
         formError: formError
       };
     });
-  }, [model, getFormValue, onCheck, onError]);
+  }, [getFormValue, getCombinedModel, onCheck, onError]);
   /**
    * Asynchronously check form fields and return Promise
    * @param fieldName
@@ -159,6 +168,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var checkForFieldAsync = useCallback(function (fieldName) {
     var formValue = getFormValue() || {};
+    var model = getCombinedModel();
     return model.checkForFieldAsync(fieldName, formValue).then(function (checkResult) {
       var _extends3;
 
@@ -173,7 +183,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
       return checkResult;
     });
-  }, [model, getFormValue, getFormError, onCheck, onError]);
+  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
   var cleanErrors = useCallback(function () {
     setFormError({});
   }, []);
@@ -244,7 +254,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var rootRef = useRef(null);
   var formContextValue = useMemo(function () {
     return {
-      model: model,
+      getCombinedModel: getCombinedModel,
       checkTrigger: checkTrigger,
       formDefaultValue: formDefaultValue,
       errorFromContext: errorFromContext,
@@ -254,11 +264,13 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
       formError: getFormError(),
       removeFieldValue: removeFieldValue,
       removeFieldError: removeFieldError,
+      pushFieldRule: pushFieldRule,
+      removeFieldRule: removeFieldRule,
       onFieldChange: handleFieldChange,
       onFieldError: handleFieldError,
       onFieldSuccess: handleFieldSuccess
     };
-  }, [model, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, removeFieldValue, removeFieldError, handleFieldChange, handleFieldError, handleFieldSuccess]);
+  }, [getCombinedModel, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
   return /*#__PURE__*/React.createElement("form", _extends({}, rest, {
     ref: rootRef,
     onSubmit: handleSubmit,

package/esm/Form/FormContext.d.ts

@@ -1,26 +1,31 @@
 import React from 'react';
-import { Schema } from 'schema-typed';
 import { TypeAttributes } from '../@types/common';
-export interface FormContextValue<T = Record<string, any>, errorMsgType = any, E = {
+import type { Schema } from 'schema-typed';
+import type { FieldRuleType } from './useSchemaModel';
+interface TrulyFormContextValue<T = Record<string, any>, errorMsgType = any, E = {
     [P in keyof T]?: errorMsgType;
 }> {
-    model?: Schema;
+    getCombinedModel: () => Schema;
+    formError: E;
+    removeFieldValue: (name: string) => void;
+    removeFieldError: (name: string) => void;
+    pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
+    removeFieldRule: (name: string) => void;
+    onFieldChange: (name: string, value: any, event: React.SyntheticEvent) => void;
+    onFieldError: (name: string, errorMessage: string) => void;
+    onFieldSuccess: (name: string) => void;
+}
+declare type ExternalPropsContextValue<T> = {
     checkTrigger?: TypeAttributes.CheckTrigger;
     formDefaultValue?: T;
     errorFromContext?: boolean;
     readOnly?: boolean;
     plaintext?: boolean;
     disabled?: boolean;
-    formError?: E;
-    removeFieldValue?: (name: string) => void;
-    removeFieldError?: (name: string) => void;
-    onFieldChange?: (name: string, value: any, event: React.SyntheticEvent) => void;
-    onFieldError?: (name: string, errorMessage: string) => void;
-    onFieldSuccess?: (name: string) => void;
-}
-export declare const FormContext: React.Context<FormContextValue<Record<string, any>, any, {
-    [x: string]: any;
-}>>;
+};
+declare type InitialContextType = Partial<Record<keyof TrulyFormContextValue, undefined>>;
+export declare type FormContextValue<T = Record<string, any>, errorMsgType = any> = (TrulyFormContextValue<T, errorMsgType> | InitialContextType) & ExternalPropsContextValue<T>;
+export declare const FormContext: React.Context<FormContextValue<Record<string, any>, any>>;
 export declare const FormValueContext: React.Context<Record<string, any> | undefined>;
 export declare const FormPlaintextContext: React.Context<boolean>;
 export default FormContext;

package/esm/Form/useSchemaModel.d.ts

@@ -0,0 +1,9 @@
+import type { MutableRefObject } from 'react';
+import type { CheckType, Schema } from 'schema-typed';
+export declare type FieldRuleType = MutableRefObject<CheckType<unknown, any> | undefined>;
+declare function useSchemaModel(formModel: Schema): {
+    getCombinedModel: () => Schema<any, string>;
+    pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
+    removeFieldRule: (name: string) => void;
+};
+export default useSchemaModel;

package/esm/Form/useSchemaModel.js

@@ -0,0 +1,39 @@
+import { SchemaModel } from 'schema-typed';
+import { useRef, useCallback } from 'react';
+
+function useSchemaModel(formModel) {
+  var subRulesRef = useRef([]);
+  var pushFieldRule = useCallback(function (name, fieldRule) {
+    subRulesRef.current.push({
+      name: name,
+      fieldRule: fieldRule
+    });
+  }, []);
+  var removeFieldRule = useCallback(function (name) {
+    var index = subRulesRef.current.findIndex(function (v) {
+      return v.name === name;
+    });
+    subRulesRef.current.splice(index, 1);
+  }, []);
+  var getCombinedModel = useCallback(function () {
+    var realSubRules = subRulesRef.current.filter(function (v) {
+      return Boolean(v.fieldRule.current);
+    });
+    return SchemaModel.combine(formModel, SchemaModel(realSubRules.map(function (_ref) {
+      var _ref2;
+
+      var name = _ref.name,
+          fieldRule = _ref.fieldRule;
+      return _ref2 = {}, _ref2[name] = fieldRule.current, _ref2;
+    }).reduce(function (a, b) {
+      return Object.assign(a, b);
+    }, {})));
+  }, [formModel]);
+  return {
+    getCombinedModel: getCombinedModel,
+    pushFieldRule: pushFieldRule,
+    removeFieldRule: removeFieldRule
+  };
+}
+
+export default useSchemaModel;

package/esm/FormControl/FormControl.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import Input from '../Input';
 import { TypeAttributes, FormControlBaseProps, WithAsProps } from '../@types/common';
+import type { CheckType } from 'schema-typed';
 /**
  * Props that FormControl passes to its accepter
  */
@@ -30,6 +31,8 @@ export interface FormControlProps<P = any, ValueType = any> extends WithAsProps,
     checkAsync?: boolean;
     /** Remove field value and error message when component is unmounted  */
     shouldResetWithUnmount?: boolean;
+    /** Validation rule */
+    rule?: CheckType<unknown, any>;
 }
 interface FormControlComponent extends React.FC<FormControlProps> {
     <Accepter extends React.ElementType = typeof Input>(props: FormControlProps & {

package/esm/FormControl/FormControl.js

@@ -13,10 +13,7 @@ import { useClassNames } from '../utils';
 import FormContext, { FormValueContext } from '../Form/FormContext';
 import { FormGroupContext } from '../FormGroup/FormGroup';
 import { useWillUnmount } from '../utils';
-/**
- * Props that FormControl passes to its accepter
- */
-
+import useRegisterModel from './useRegisterModel';
 var FormControl = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useContext = useContext(FormContext),
       readOnlyContext = _useContext.readOnly,
@@ -28,10 +25,12 @@ var FormControl = /*#__PURE__*/React.forwardRef(function (props, ref) {
       formError = _useContext.formError,
       removeFieldValue = _useContext.removeFieldValue,
       removeFieldError = _useContext.removeFieldError,
+      pushFieldRule = _useContext.pushFieldRule,
+      removeFieldRule = _useContext.removeFieldRule,
       onFieldChange = _useContext.onFieldChange,
       onFieldError = _useContext.onFieldError,
       onFieldSuccess = _useContext.onFieldSuccess,
-      model = _useContext.model,
+      getCombinedModel = _useContext.getCombinedModel,
       contextCheckTrigger = _useContext.checkTrigger;
 
   var _props$as = props.as,
@@ -59,7 +58,8 @@ var FormControl = /*#__PURE__*/React.forwardRef(function (props, ref) {
       defaultValue = props.defaultValue,
       _props$shouldResetWit = props.shouldResetWithUnmount,
       shouldResetWithUnmount = _props$shouldResetWit === void 0 ? false : _props$shouldResetWit,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount"]);
+      rule = props.rule,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount", "rule"]);
 
   var _useContext2 = useContext(FormGroupContext),
       controlId = _useContext2.controlId;
@@ -68,6 +68,7 @@ var FormControl = /*#__PURE__*/React.forwardRef(function (props, ref) {
     throw new Error("\n      <FormControl> must be inside a component decorated with <Form>.\n      And need to update React to 16.6.0 +.\n    ");
   }
 
+  useRegisterModel(name, pushFieldRule, removeFieldRule, rule);
   useWillUnmount(function () {
     if (shouldResetWithUnmount) {
       removeFieldValue === null || removeFieldValue === void 0 ? void 0 : removeFieldValue(name);
@@ -114,6 +115,8 @@ var FormControl = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
     var nextFormValue = _extends({}, formValue, (_extends2 = {}, _extends2[name] = value, _extends2));
 
+    var model = getCombinedModel();
+
     if (checkAsync) {
       return model === null || model === void 0 ? void 0 : model.checkForFieldAsync(name, nextFormValue).then(function (checkResult) {
         return callbackEvents(checkResult);

package/esm/FormControl/useRegisterModel.d.ts

@@ -0,0 +1,4 @@
+import type { FieldRuleType } from '../Form/useSchemaModel';
+import type { CheckType } from 'schema-typed';
+declare function useRegisterModel(name: string, pushFieldRule: (n: string, r: FieldRuleType) => void, removeFieldRule: (n: string) => void, rule?: CheckType<unknown, any>): void;
+export default useRegisterModel;

package/esm/FormControl/useRegisterModel.js

@@ -0,0 +1,14 @@
+import { useRef, useEffect } from 'react';
+
+function useRegisterModel(name, pushFieldRule, removeFieldRule, rule) {
+  var refRule = useRef(rule);
+  refRule.current = rule;
+  useEffect(function () {
+    pushFieldRule(name, refRule);
+    return function () {
+      removeFieldRule(name);
+    };
+  }, [name, pushFieldRule, removeFieldRule]);
+}
+
+export default useRegisterModel;

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

@@ -5,7 +5,14 @@ import MenuContext, { MenuActionTypes, MoveFocusTo } from './MenuContext';
 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;
+
   var _ref$vertical = _ref.vertical,
       vertical = _ref$vertical === void 0 ? false : _ref$vertical,
       children = _ref.children,
@@ -20,7 +27,8 @@ export default function Menubar(_ref) {
   var menubarElementRef = useRef(null);
   var onFocus = useCallback(function (event) {
     // Focus moves inside Menubar
-    if (isFocusEntering(event)) {
+    if (isFocusEntering(event) && // Skip if focus is moving to a focusable element within this menu
+    !(event.target !== event.currentTarget && isFocusableElement(event.target))) {
       if (activeItemIndex === null) {
         dispatch({
           type: MenuActionTypes.MoveFocus,
@@ -43,7 +51,9 @@ export default function Menubar(_ref) {
       rtl = _useCustom.rtl;
 
   var onKeyDown = useCallback(function (event) {
-    var activeItemElement = isNil(activeItemIndex) ? null : items[activeItemIndex].element;
+    var _items$activeItemInde, _items$activeItemInde2;
+
+    var activeItemElement = isNil(activeItemIndex) ? null : (_items$activeItemInde = (_items$activeItemInde2 = items[activeItemIndex]) === null || _items$activeItemInde2 === void 0 ? void 0 : _items$activeItemInde2.element) !== null && _items$activeItemInde !== void 0 ? _items$activeItemInde : null;
 
     switch (true) {
       case !vertical && !rtl && event.key === KEY_VALUES.RIGHT:
@@ -123,7 +133,7 @@ export default function Menubar(_ref) {
     onBlur: onBlur,
     onKeyDown: onKeyDown,
     onClick: onClick,
-    'aria-activedescendant': isNil(activeItemIndex) ? undefined : items[activeItemIndex].element.id,
+    'aria-activedescendant': isNil(activeItemIndex) ? undefined : (_items$activeItemInde3 = items[activeItemIndex]) === null || _items$activeItemInde3 === void 0 ? void 0 : _items$activeItemInde3.element.id,
     'aria-orientation': vertical ? 'vertical' : undefined // implicitly set 'horizontal'
 
   }, menubarElementRef));

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;

package/esm/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;