rsuite 5.12.0 → 5.13.0

package/esm/Cascader/DropdownMenu.js

@@ -100,11 +100,13 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return /*#__PURE__*/React.createElement(DropdownMenuItem, {
       classPrefix: "picker-cascader-menu-item",
       as: 'li',
+      role: "treeitem",
       key: layer + "-" + onlyKey,
       disabled: disabled,
       active: !isUndefined(activeItemValue) && shallowEqual(activeItemValue, value),
       focus: focus,
       value: value,
+      "aria-owns": node.children ? 'treeitem-' + value + '-children' : undefined,
       className: children ? prefix('has-children') : undefined,
       onSelect: function onSelect(_value, event) {
         return handleSelect(layer, node, event);
@@ -120,12 +122,13 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   var cascadeNodes = cascadeData.map(function (children, layer) {
     var onlyKey = layer + "_" + children.length;
+    var parentNode = cascadePaths[layer - 1];
     var menu = /*#__PURE__*/React.createElement("ul", {
-      role: "listbox"
+      role: layer === 0 ? 'none presentation' : 'group',
+      id: parentNode ? 'treeitem-' + parentNode[valueKey] + '-children' : undefined
     }, children.map(function (item, index) {
       return renderCascadeNode(item, index, layer, cascadePaths[layer] && shallowEqual(cascadePaths[layer][valueKey], item[valueKey]));
     }));
-    var parentNode = cascadePaths[layer - 1];
     return /*#__PURE__*/React.createElement("div", {
       key: onlyKey,
       className: prefix('column'),
@@ -137,7 +140,9 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }, renderMenu ? renderMenu(children, menu, parentNode, layer) : menu);
   });
-  return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(Component, _extends({
+    role: "tree"
+  }, rest, {
     ref: mergeRefs(rootRef, ref),
     className: classes
   }), /*#__PURE__*/React.createElement("div", {

package/esm/Disclosure/Disclosure.d.ts

@@ -15,7 +15,7 @@ export interface DisclosureProps {
     /** Callback when disclosure button is being activated to update the open state */
     onToggle?: (open: boolean, event: React.SyntheticEvent) => void;
     /** What mouse events should disclosure reacts to */
-    trigger?: DisclosureTrigger[];
+    trigger?: readonly DisclosureTrigger[];
 }
 export interface DisclosureComponent extends React.FC<DisclosureProps> {
     Button: typeof DisclosureButton;

package/esm/Disclosure/DisclosureContext.d.ts

@@ -17,7 +17,7 @@ export declare type DisclosureContextProps = [
     DisclosureState,
     Dispatch<DisclosureAction>,
     {
-        trigger: DisclosureTrigger[];
+        trigger: readonly DisclosureTrigger[];
         onToggle?: (open: boolean, event: React.SyntheticEvent) => void;
     }
 ];

package/esm/Dropdown/Dropdown.js

@@ -1,25 +1,21 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useCallback, useContext, useMemo, useReducer } from 'react';
+import React, { useContext, useMemo, useReducer } from 'react';
 import PropTypes from 'prop-types';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
 import DropdownMenu from './DropdownMenu';
 import { mergeRefs, PLACEMENT_8, placementPolyfill, useClassNames } from '../utils';
-import { SidenavContext } from '../Sidenav/Sidenav';
 import deprecatePropType from '../utils/deprecatePropType';
 import DropdownItem from './DropdownItem';
 import DropdownContext from './DropdownContext';
 import Menu from '../Menu/Menu';
 import DropdownToggle from './DropdownToggle';
-import MenuContext from '../Menu/MenuContext';
-import MenuItem from '../Menu/MenuItem';
 import kebabCase from 'lodash/kebabCase';
-import { NavbarContext } from '../Navbar';
-import Disclosure from '../Disclosure/Disclosure';
-import SidenavDropdown from '../Sidenav/SidenavDropdown';
 import NavContext from '../Nav/NavContext';
 import { initialState, reducer } from './DropdownState';
+import warnOnce from '../utils/warnOnce';
+import Nav from '../Nav';
 
 /**
  * The <Dropdown> API
@@ -28,7 +24,7 @@ import { initialState, reducer } from './DropdownState';
  */
 var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var activeKey = props.activeKey,
-      onSelectProp = props.onSelect,
+      onSelect = props.onSelect,
       rest = _objectWithoutPropertiesLoose(props, ["activeKey", "onSelect"]);
 
   var _rest$as = rest.as,
@@ -37,7 +33,6 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onClose = rest.onClose,
       onOpen = rest.onOpen,
       onToggle = rest.onToggle,
-      eventKey = rest.eventKey,
       _rest$trigger = rest.trigger,
       trigger = _rest$trigger === void 0 ? 'click' : _rest$trigger,
       _rest$placement = rest.placement,
@@ -53,30 +48,18 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
       children = rest.children,
       menuStyle = rest.menuStyle,
       style = rest.style,
-      toggleProps = _objectWithoutPropertiesLoose(rest, ["as", "title", "onClose", "onOpen", "onToggle", "eventKey", "trigger", "placement", "toggleAs", "toggleClassName", "open", "defaultOpen", "classPrefix", "className", "disabled", "children", "menuStyle", "style"]);
+      toggleProps = _objectWithoutPropertiesLoose(rest, ["as", "title", "onClose", "onOpen", "onToggle", "trigger", "placement", "toggleAs", "toggleClassName", "open", "defaultOpen", "classPrefix", "className", "disabled", "children", "menuStyle", "style"]);
 
-  var _useContext = useContext(NavContext),
-      onSelectFromNav = _useContext.onSelect;
-
-  var emitSelect = useCallback(function (eventKey, event) {
-    onSelectProp === null || onSelectProp === void 0 ? void 0 : onSelectProp(eventKey, event); // If <Dropdown> is inside <Nav>, also trigger `onSelect` on <Nav>
-
-    onSelectFromNav === null || onSelectFromNav === void 0 ? void 0 : onSelectFromNav(eventKey, event);
-  }, [onSelectProp, onSelectFromNav]);
+  var nav = useContext(NavContext);
 
   var _useClassNames = useClassNames(classPrefix),
       merge = _useClassNames.merge,
-      withClassPrefix = _useClassNames.withClassPrefix,
-      prefix = _useClassNames.prefix;
+      withClassPrefix = _useClassNames.withClassPrefix;
 
   var _useClassNames2 = useClassNames('dropdown-menu'),
       withMenuClassPrefix = _useClassNames2.withClassPrefix,
       mergeMenuClassName = _useClassNames2.merge;
 
-  var _useClassNames3 = useClassNames('nav-item'),
-      withNavItemClassPrefix = _useClassNames3.withClassPrefix,
-      mergeNavItemClassNames = _useClassNames3.merge;
-
   var menuButtonTriggers = useMemo(function () {
     if (!trigger) {
       return undefined;
@@ -96,9 +79,6 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return triggerMap[t];
     });
   }, [trigger]);
-  var parentMenu = useContext(MenuContext);
-  var sidenav = useContext(SidenavContext);
-  var navbar = useContext(NavbarContext);
 
   var _useReducer = useReducer(reducer, initialState),
       items = _useReducer[0].items,
@@ -112,54 +92,18 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var dropdownContextValue = useMemo(function () {
     return {
       activeKey: activeKey,
-      onSelect: emitSelect,
+      onSelect: onSelect,
       hasSelectedItem: hasSelectedItem,
       dispatch: dispatch
     };
-  }, [activeKey, emitSelect, hasSelectedItem, dispatch]); // Render a disclosure when inside expanded <Sidenav>
+  }, [activeKey, onSelect, hasSelectedItem, dispatch]); // Deprecate <Dropdown> within <Nav> usage
+  // in favor of <Nav.Menu> API
 
-  if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
-    return /*#__PURE__*/React.createElement(DropdownContext.Provider, {
-      value: dropdownContextValue
-    }, /*#__PURE__*/React.createElement(SidenavDropdown, _extends({
+  if (nav) {
+    warnOnce('Usage of <Dropdown> within <Nav> is deprecated. Replace with <Nav.Menu>');
+    return /*#__PURE__*/React.createElement(Nav.Menu, _extends({
       ref: ref
-    }, rest)));
-  } // Renders a disclosure when used inside <Navbar>
-
-
-  if (navbar) {
-    return /*#__PURE__*/React.createElement(DropdownContext.Provider, {
-      value: dropdownContextValue
-    }, /*#__PURE__*/React.createElement(Disclosure, {
-      hideOnClickOutside: true
-    }, function (_ref, containerRef) {
-      var _withClassPrefix;
-
-      var open = _ref.open;
-      var classes = merge(className, withClassPrefix((_withClassPrefix = {}, _withClassPrefix["placement-" + kebabCase(placementPolyfill(placement))] = !!placement, _withClassPrefix.disabled = disabled, _withClassPrefix.open = open, _withClassPrefix)));
-      return /*#__PURE__*/React.createElement(Component, {
-        ref: mergeRefs(ref, containerRef),
-        className: classes,
-        style: style
-      }, /*#__PURE__*/React.createElement(Disclosure.Button, null, function (buttonProps, buttonRef) {
-        return /*#__PURE__*/React.createElement(DropdownToggle, _extends({
-          ref: buttonRef,
-          as: toggleAs,
-          className: toggleClassName,
-          placement: placement,
-          disabled: disabled
-        }, omit(buttonProps, ['open']), toggleProps), title);
-      }), /*#__PURE__*/React.createElement(Disclosure.Content, null, function (_ref2, elementRef) {
-        var open = _ref2.open;
-        var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
-        return /*#__PURE__*/React.createElement("ul", {
-          ref: elementRef,
-          className: menuClassName,
-          style: menuStyle,
-          hidden: !open
-        }, children);
-      }));
-    }));
+    }, props));
   }
 
   var renderMenuButton = function renderMenuButton(menuButtonProps, menuButtonRef) {
@@ -172,25 +116,6 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, omit(menuButtonProps, ['open']), omit(toggleProps, ['data-testid'])), title);
   };
 
-  if (parentMenu) {
-    renderMenuButton = function renderMenuButton(menuButtonProps, buttonRef) {
-      return /*#__PURE__*/React.createElement(MenuItem, {
-        disabled: disabled
-      }, function (_ref3, menuitemRef) {
-        var active = _ref3.active,
-            menuitemProps = _objectWithoutPropertiesLoose(_ref3, ["active"]);
-
-        return /*#__PURE__*/React.createElement(DropdownToggle, _extends({
-          ref: mergeRefs(buttonRef, menuitemRef),
-          as: toggleAs,
-          className: mergeNavItemClassNames(toggleClassName, withNavItemClassPrefix({
-            focus: active
-          }))
-        }, menuButtonProps, omit(menuitemProps, ['onClick']), omit(toggleProps, 'data-testid')), title);
-      });
-    };
-  }
-
   return /*#__PURE__*/React.createElement(DropdownContext.Provider, {
     value: dropdownContextValue
   }, /*#__PURE__*/React.createElement(Menu, {
@@ -199,25 +124,20 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
     menuButtonText: title,
     renderMenuButton: renderMenuButton,
     openMenuOn: menuButtonTriggers,
-    renderMenuPopup: function renderMenuPopup(_ref4, popupRef) {
-      var open = _ref4.open,
-          popupProps = _objectWithoutPropertiesLoose(_ref4, ["open"]);
-
-      var menuClassName = mergeMenuClassName(className, withMenuClassPrefix({})); // When inside a collapsed <Sidenav>, render a header in menu
+    renderMenuPopup: function renderMenuPopup(_ref, popupRef) {
+      var open = _ref.open,
+          popupProps = _objectWithoutPropertiesLoose(_ref, ["open"]);
 
-      var showHeader = !!sidenav;
+      var menuClassName = mergeMenuClassName(className, withMenuClassPrefix({}));
       return /*#__PURE__*/React.createElement("ul", _extends({
         ref: popupRef,
         className: menuClassName,
         style: menuStyle,
         hidden: !open
-      }, popupProps), showHeader && /*#__PURE__*/React.createElement("div", {
-        className: prefix('header')
-      }, title), children);
+      }, popupProps), children);
     },
-    onToggleMenu: function onToggleMenu(open, event) {
+    onToggleMenu: function onToggleMenu(open) {
       onToggle === null || onToggle === void 0 ? void 0 : onToggle(open);
-      sidenav === null || sidenav === void 0 ? void 0 : sidenav.onOpenChange(eventKey, event);
 
       if (open) {
         onOpen === null || onOpen === void 0 ? void 0 : onOpen();
@@ -225,13 +145,13 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
         onClose === null || onClose === void 0 ? void 0 : onClose();
       }
     }
-  }, function (_ref5, menuContainerRef) {
-    var _withClassPrefix2;
+  }, function (_ref2, menuContainerRef) {
+    var _withClassPrefix;
 
-    var open = _ref5.open,
-        menuContainer = _objectWithoutPropertiesLoose(_ref5, ["open"]);
+    var open = _ref2.open,
+        menuContainer = _objectWithoutPropertiesLoose(_ref2, ["open"]);
 
-    var classes = merge(className, withClassPrefix((_withClassPrefix2 = {}, _withClassPrefix2["placement-" + kebabCase(placementPolyfill(placement))] = !!placement, _withClassPrefix2.disabled = disabled, _withClassPrefix2.open = open, _withClassPrefix2.submenu = !!parentMenu, _withClassPrefix2['selected-within'] = hasSelectedItem, _withClassPrefix2)));
+    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

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/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,