rsuite 5.12.0 → 5.14.0

package/esm/@types/common.d.ts

@@ -149,4 +149,10 @@ export interface Offset {
     height: number;
 }
 export declare type OnChangeCallback<T, E = React.SyntheticEvent> = (value: T, event: E) => void;
+export declare type CursorPosition = {
+    top: number;
+    left: number;
+    clientTop: number;
+    clientLeft: number;
+};
 export {};

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/Cascader/utils.d.ts

@@ -6,7 +6,7 @@ export declare function getColumnsAndPaths<T extends ItemDataType>(data: T[], va
     paths: T[];
 };
 export declare function usePaths(props: CascaderProps): {
-    enforceUpdate: (nextValue: any, isAttachChildren?: boolean | undefined) => void;
+    enforceUpdate: (nextValue: any, isAttachChildren?: boolean) => void;
     columnData: ItemDataType<string | number>[][];
     valueToPaths: ItemDataType<string | number>[];
     selectedPaths: ItemDataType<string | number>[];

package/esm/Col/Col.d.ts

@@ -1,21 +1,29 @@
 import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
 export interface ColProps extends WithAsProps {
-    /** The number of columns you wish to span for Extra small devices Phones (< 480px) */
+    /** The number of columns you wish to span for Extra small devices Phones (< 576px) */
     xs?: number;
-    /** The number of columns you wish to span for Small devices Tablets (≥ 480px) */
+    /** The number of columns you wish to span for Small devices Tablets (≥ 576px) */
     sm?: number;
-    /** The number of columns you wish to span for Medium devices Desktops (≥ 992px) */
+    /** The number of columns you wish to span for Medium devices Desktops (≥ 768px) */
     md?: number;
-    /** The number of columns you wish to span for Large devices Desktops (≥ 1200px) */
+    /** The number of columns you wish to span for Large devices Desktops (≥ 992px) */
     lg?: number;
+    /** The number of columns you wish to span for Extra Large devices Desktops (≥ 1200px) */
+    xl?: number;
+    /** The number of columns you wish to span for Ultra Large devices Desktops (≥ 1400px) */
+    xxl?: number;
     /** Move columns to the right for Extra small devices Phones */
     xsOffset?: number;
     /** Move columns to the right for Small devices Tablets */
     smOffset?: number;
     /** Move columns to the right for Medium devices Desktops */
     mdOffset?: number;
-    /** Move columns to the right for Medium devices Desktops */
+    /** Move columns to the right for Large devices Desktops */
     lgOffset?: number;
+    /** Move columns to the right for Extra large devices Desktops */
+    xlOffset?: number;
+    /** Move columns to the right for Ultra large devices Desktops */
+    xxlOffset?: number;
     /** Change the order of grid columns to the right for Extra small devices Phones */
     xsPush?: number;
     /** Change the order of grid columns to the right for Small devices Tablets */
@@ -24,6 +32,10 @@ export interface ColProps extends WithAsProps {
     mdPush?: number;
     /** Change the order of grid columns to the right for Large devices Desktops */
     lgPush?: number;
+    /** Change the order of grid columns to the right for Extra large devices Desktops */
+    xlPush?: number;
+    /** Change the order of grid columns to the right for Ultra large devices Desktops */
+    xxlPush?: number;
     /** Change the order of grid columns to the left for Extra small devices Phones */
     xsPull?: number;
     /** Change the order of grid columns to the left for Small devices Tablets */
@@ -32,6 +44,10 @@ export interface ColProps extends WithAsProps {
     mdPull?: number;
     /** Change the order of grid columns to the left for Large devices Desktops */
     lgPull?: number;
+    /** Change the order of grid columns to the left for Extra large devices Desktops */
+    xlPull?: number;
+    /** Change the order of grid columns to the left for Ultra large devices Desktops */
+    xxlPull?: number;
     /** Hide column on Extra small devices Phones */
     xsHidden?: boolean;
     /** Hide column on Small devices Tablets */
@@ -40,6 +56,10 @@ export interface ColProps extends WithAsProps {
     mdHidden?: boolean;
     /** Hide column on Large devices Desktops */
     lgHidden?: boolean;
+    /** Hide column on Extra large devices Desktops */
+    xlHidden?: boolean;
+    /** Hide column on Ultra large devices Desktops */
+    xxlHidden?: boolean;
 }
 declare const Col: RsRefForwardingComponent<'div', ColProps>;
 export default Col;

package/esm/Col/Col.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import React from 'react';
 import PropTypes from 'prop-types';
 import omit from 'lodash/omit';
-import { useClassNames, SIZE } from '../utils';
+import { useClassNames, COLUMN_SIZE } from '../utils';
 var Col = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -26,7 +26,7 @@ var Col = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return rest[key];
   };
 
-  SIZE.forEach(function (size) {
+  COLUMN_SIZE.forEach(function (size) {
     var col = getPropValue(size);
     var hidden = getPropValue(size + "Hidden");
     var offset = getPropValue(size + "Offset");
@@ -55,10 +55,14 @@ Col.propTypes = {
   sm: PropTypes.number,
   md: PropTypes.number,
   lg: PropTypes.number,
+  xl: PropTypes.number,
+  xxl: PropTypes.number,
   xsOffset: PropTypes.number,
   smOffset: PropTypes.number,
   mdOffset: PropTypes.number,
   lgOffset: PropTypes.number,
+  xlOffset: PropTypes.number,
+  xxlOffset: PropTypes.number,
   xsPush: PropTypes.number,
   smPush: PropTypes.number,
   mdPush: PropTypes.number,
@@ -67,10 +71,14 @@ Col.propTypes = {
   smPull: PropTypes.number,
   mdPull: PropTypes.number,
   lgPull: PropTypes.number,
+  xlPull: PropTypes.number,
+  xxlPull: PropTypes.number,
   xsHidden: PropTypes.bool,
   smHidden: PropTypes.bool,
   mdHidden: PropTypes.bool,
   lgHidden: PropTypes.bool,
+  xlHidden: PropTypes.bool,
+  xxlHidden: PropTypes.bool,
   as: PropTypes.elementType
 };
 export default Col;

package/esm/CustomProvider/CustomProvider.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Locale } from '../locales';
+import { ToastContainerInstance } from '../toaster/ToastContainer';
 export interface CustomValue<T = Locale> {
     /** Language configuration */
     locale: T;
@@ -33,6 +34,10 @@ export interface CustomValue<T = Locale> {
      *
      * */
     parseDate: (dateString: string, formatString: string) => Date;
+    /**
+     * A Map of toast containers
+     */
+    toasters?: React.MutableRefObject<Map<string, ToastContainerInstance>>;
 }
 export interface CustomProviderProps<T = Locale> extends Partial<CustomValue<T>> {
     /** Supported themes */
@@ -41,6 +46,8 @@ export interface CustomProviderProps<T = Locale> extends Partial<CustomValue<T>>
     classPrefix?: string;
     /** Primary content */
     children?: React.ReactNode;
+    /** Sets a container for toast rendering */
+    toastContainer?: HTMLElement | (() => HTMLElement | null) | null;
 }
 declare const CustomContext: React.Context<CustomProviderProps<{
     common?: {
@@ -75,7 +82,7 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         yesterday: string;
         hours: string;
         minutes: string;
-        seconds: string; /** Support right-to-left */
+        seconds: string;
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
@@ -93,7 +100,7 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         yesterday: string;
         hours: string;
         minutes: string;
-        seconds: string; /** Support right-to-left */
+        seconds: string;
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
@@ -112,7 +119,7 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         yesterday: string;
         hours: string;
         minutes: string;
-        seconds: string; /** Support right-to-left */
+        seconds: string;
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
@@ -125,6 +132,9 @@ declare const CustomContext: React.Context<CustomProviderProps<{
     } | undefined;
     InputPicker?: {
         newItem: string;
+        /**
+         * A Map of toast containers
+         */
         createOption: string;
     } | undefined;
     Uploader?: {
@@ -179,7 +189,7 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         yesterday: string;
         hours: string;
         minutes: string;
-        seconds: string; /** Support right-to-left */
+        seconds: string;
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
@@ -197,7 +207,7 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         yesterday: string;
         hours: string;
         minutes: string;
-        seconds: string; /** Support right-to-left */
+        seconds: string;
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
@@ -216,7 +226,7 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         yesterday: string;
         hours: string;
         minutes: string;
-        seconds: string; /** Support right-to-left */
+        seconds: string;
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
@@ -229,6 +239,9 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
     } | undefined;
     InputPicker?: {
         newItem: string;
+        /**
+         * A Map of toast containers
+         */
         createOption: string;
     } | undefined;
     Uploader?: {
@@ -250,6 +263,6 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         off: string;
     } | undefined;
 }>>;
-declare const CustomProvider: (props: CustomProviderProps) => JSX.Element;
+declare const CustomProvider: (props: Omit<CustomProviderProps, 'toasters'>) => JSX.Element;
 export { CustomContext, Consumer as CustomConsumer };
 export default CustomProvider;

package/esm/CustomProvider/CustomProvider.js

@@ -3,6 +3,8 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import React, { useEffect } from 'react';
 import { getClassNamePrefix, prefix } from '../utils/prefix';
 import { addClass, removeClass, canUseDOM } from '../DOMHelper';
+import ToastContainer, { toastPlacements } from '../toaster/ToastContainer';
+import { usePortal } from '../utils';
 var CustomContext = /*#__PURE__*/React.createContext({});
 var Consumer = CustomContext.Consumer,
     Provider = CustomContext.Provider;
@@ -13,12 +15,21 @@ var CustomProvider = function CustomProvider(props) {
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? getClassNamePrefix() : _props$classPrefix,
       theme = props.theme,
-      rest = _objectWithoutPropertiesLoose(props, ["children", "classPrefix", "theme"]);
+      container = props.toastContainer,
+      rest = _objectWithoutPropertiesLoose(props, ["children", "classPrefix", "theme", "toastContainer"]);
+
+  var toasters = React.useRef(new Map());
+
+  var _usePortal = usePortal({
+    container: container
+  }),
+      Portal = _usePortal.Portal;
 
   var value = React.useMemo(function () {
     return _extends({
       classPrefix: classPrefix,
-      theme: theme
+      theme: theme,
+      toasters: toasters
     }, rest);
   }, [classPrefix, theme, rest]);
   useEffect(function () {
@@ -34,7 +45,15 @@ var CustomProvider = function CustomProvider(props) {
   }, [classPrefix, theme]);
   return /*#__PURE__*/React.createElement(Provider, {
     value: value
-  }, children);
+  }, children, /*#__PURE__*/React.createElement(Portal, null, toastPlacements.map(function (placement) {
+    return /*#__PURE__*/React.createElement(ToastContainer, {
+      key: placement,
+      placement: placement,
+      ref: function ref(_ref) {
+        toasters.current.set(placement, _ref);
+      }
+    });
+  })));
 };
 
 export { CustomContext, Consumer as CustomConsumer };

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