rsuite 6.0.0-canary-2025011413 → 6.0.0-canary-20250315

package/cjs/Message/Message.js

@@ -40,12 +40,12 @@ const Message = (0, _utils.forwardRef)((props, ref) => {
   } = propsWithDefaults;
   const [display, setDisplay] = (0, _react.useState)('show');
   const {
-    withClassPrefix,
+    withPrefix,
     merge,
     prefix
-  } = (0, _hooks.useClassNames)(classPrefix);
+  } = (0, _hooks.useStyles)(classPrefix);
   const isMounted = (0, _hooks.useIsMounted)();
-  const targetRef = _react.default.useRef(null);
+  const targetRef = (0, _react.useRef)(null);
 
   // Timed close message
   const {
@@ -68,7 +68,7 @@ const Message = (0, _utils.forwardRef)((props, ref) => {
   if (display === 'hide') {
     return null;
   }
-  const classes = merge(className, withClassPrefix(type, display, {
+  const classes = merge(className, withPrefix(type, display, {
     full,
     bordered,
     centered,
@@ -82,9 +82,7 @@ const Message = (0, _utils.forwardRef)((props, ref) => {
     className: classes
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: prefix`container`
-  }, closable && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
-    onClick: handleClose
-  }), showIcon && /*#__PURE__*/_react.default.createElement("div", {
+  }, showIcon && /*#__PURE__*/_react.default.createElement("div", {
     className: prefix`icon`
   }, _statusIcons.MESSAGE_STATUS_ICONS[type]), /*#__PURE__*/_react.default.createElement("div", {
     className: prefix`content`
@@ -92,7 +90,9 @@ const Message = (0, _utils.forwardRef)((props, ref) => {
     className: prefix`header`
   }, header), children && /*#__PURE__*/_react.default.createElement("div", {
     className: prefix`body`
-  }, children))));
+  }, children)), closable && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
+    onClick: handleClose
+  })));
 });
 Message.displayName = 'Message';
 var _default = exports.default = Message;

package/cjs/Modal/Modal.d.ts

@@ -8,6 +8,8 @@ export interface ModalProps extends BaseModalProps, Pick<React.HTMLAttributes<HT
     animationTimeout?: number;
     /** Set an animation effect for Modal, the default is Bounce.  */
     animation?: React.ElementType;
+    /** Set the centered position of the modal */
+    centered?: boolean;
     /** CSS class applied to Dialog DOM nodes */
     dialogClassName?: string;
     /** CSS style applied to dialog DOM nodes */

package/cjs/Modal/Modal.js

@@ -50,6 +50,7 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
     backdrop = true,
     className,
     classPrefix = 'modal',
+    centered,
     dialogClassName,
     dialogStyle,
     dialogAs: Dialog = _ModalDialog.default,
@@ -74,14 +75,14 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
   const {
     merge,
     prefix
-  } = (0, _hooks.useClassNames)(classPrefix);
+  } = (0, _hooks.useStyles)(classPrefix);
   const [shake, setShake] = (0, _react.useState)(false);
   const classes = merge(className, prefix({
     full,
     [size]: modalSizes.includes(size)
   }));
   const dialogRef = (0, _react.useRef)(null);
-  const transitionEndListener = (0, _react.useRef)();
+  const transitionEndListener = (0, _react.useRef)(null);
 
   // The style of the Modal body will be updated with the size of the window or container.
   const [bodyStyles, onChangeBodyStyles, onDestroyEvents] = (0, _utils2.useBodyStyles)(dialogRef, {
@@ -112,7 +113,7 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
     onEntering === null || onEntering === void 0 || onEntering(node);
     onChangeBodyStyles(true);
   }, [onChangeBodyStyles, onEntering]);
-  const backdropClick = _react.default.useRef();
+  const backdropClick = (0, _react.useRef)(null);
   const handleMouseDown = (0, _react.useCallback)(event => {
     backdropClick.current = event.target === event.currentTarget;
   }, []);
@@ -169,6 +170,7 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
     }
   }, [backdrop, enforceFocusProp, isDrawer]);
   const wrapperClassName = merge(prefix`wrapper`, {
+    [prefix`centered`]: centered,
     [prefix`no-backdrop`]: backdrop === false
   });
   return /*#__PURE__*/_react.default.createElement(_ModalContext.ModalContext.Provider, {
@@ -205,7 +207,7 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
       role: role,
       id: dialogId,
       "aria-labelledby": ariaLabelledby !== null && ariaLabelledby !== void 0 ? ariaLabelledby : `${dialogId}-title`,
-      "aria-describedby": ariaDescribedby,
+      "aria-describedby": ariaDescribedby !== null && ariaDescribedby !== void 0 ? ariaDescribedby : `${dialogId}-description`,
       style: {
         [sizeKey]: modalSizes.includes(size) ? undefined : size
       }

package/cjs/Modal/ModalBody.js

@@ -23,15 +23,16 @@ const ModalBody = (0, _utils.forwardRef)((props, ref) => {
     ...rest
   } = props;
   const {
-    withClassPrefix,
+    withPrefix,
     merge,
     prefix
-  } = (0, _hooks.useClassNames)(classPrefix);
-  const classes = merge(className, withClassPrefix());
+  } = (0, _hooks.useStyles)(classPrefix);
+  const classes = merge(className, withPrefix());
   const context = (0, _react.useContext)(_ModalContext.ModalContext);
   const {
     getBodyStyles,
     closeButton,
+    dialogId,
     onModalClose
   } = context || {};
   const bodyStyles = getBodyStyles === null || getBodyStyles === void 0 ? void 0 : getBodyStyles();
@@ -46,11 +47,9 @@ const ModalBody = (0, _utils.forwardRef)((props, ref) => {
     }) : closeButton;
   }
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+    id: dialogId ? `${dialogId}-description` : undefined,
     ref: ref,
-    style: {
-      ...bodyStyles,
-      ...style
-    },
+    style: (0, _utils.mergeStyles)(bodyStyles, style),
     className: classes
   }), buttonElement, children);
 });

package/cjs/Modal/ModalDialog.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import type { WithAsProps, SizeType } from '../internals/types';
+import type { WithAsProps, Size } from '../internals/types';
 export interface ModalDialogProps extends WithAsProps {
     /** A modal can have different sizes */
-    size?: SizeType;
+    size?: Size;
     dialogClassName?: string;
     dialogStyle?: React.CSSProperties;
 }

package/cjs/Modal/ModalDialog.js

@@ -22,28 +22,25 @@ const ModalDialog = (0, _utils.forwardRef)((props, ref) => {
   } = props;
   const {
     merge,
-    withClassPrefix,
+    withPrefix,
     prefix
-  } = (0, _hooks.useClassNames)(classPrefix);
-  const classes = merge(className, withClassPrefix(size));
+  } = (0, _hooks.useStyles)(classPrefix);
+  const classes = merge(className, withPrefix(size));
   const dialogClasses = merge(dialogClassName, prefix('dialog'));
   const modalStyle = (0, _utils.mergeStyles)({
     display: 'block'
   }, style);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     role: "dialog",
-    "aria-modal": true
-  }, rest, {
+    "aria-modal": true,
     ref: ref,
     className: classes,
     style: modalStyle
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }, rest), /*#__PURE__*/_react.default.createElement("div", {
     role: "document",
     className: dialogClasses,
     style: dialogStyle
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: prefix`content`
-  }, children)));
+  }, children));
 });
 ModalDialog.displayName = 'ModalDialog';
 var _default = exports.default = ModalDialog;

package/cjs/Modal/ModalHeader.js

@@ -25,10 +25,10 @@ const ModalHeader = (0, _utils.forwardRef)((props, ref) => {
   } = props;
   const {
     merge,
-    withClassPrefix,
+    withPrefix,
     prefix
-  } = (0, _hooks.useClassNames)(classPrefix);
-  const classes = merge(className, withClassPrefix());
+  } = (0, _hooks.useStyles)(classPrefix);
+  const classes = merge(className, withPrefix());
   const context = (0, _react.useContext)(_ModalContext.ModalContext);
   const {
     isDrawer,

package/cjs/Modal/ModalTitle.js

@@ -20,10 +20,10 @@ const ModalTitle = (0, _utils.forwardRef)((props, ref) => {
     ...rest
   } = props;
   const {
-    withClassPrefix,
+    withPrefix,
     merge
-  } = (0, _hooks.useClassNames)(classPrefix);
-  const classes = merge(className, withClassPrefix());
+  } = (0, _hooks.useStyles)(classPrefix);
+  const classes = merge(className, withPrefix());
   const context = (0, _react.useContext)(_ModalContext.ModalContext);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     id: context ? `${context.dialogId}-title` : undefined

package/cjs/Modal/utils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { SizeType } from '../internals/types';
-export type ModalSize = SizeType | 'full' | number | string;
-export declare const useBodyStyles: (ref: React.RefObject<HTMLElement>, options: {
+import type { Size } from '../internals/types';
+export type ModalSize = Size | 'full' | number | string;
+export declare const useBodyStyles: (ref: React.RefObject<HTMLElement | null>, options: {
     overflow: boolean;
     size?: ModalSize | undefined;
     prefix: (...classes: any) => string;

package/cjs/Modal/utils.js

@@ -15,9 +15,9 @@ const useBodyStyles = (ref, options) => {
     prefix,
     size
   } = options;
-  const windowResizeListener = (0, _react.useRef)();
+  const windowResizeListener = (0, _react.useRef)(null);
   const contentElement = (0, _react.useRef)(null);
-  const contentElementResizeObserver = (0, _react.useRef)();
+  const contentElementResizeObserver = (0, _react.useRef)(null);
   const updateBodyStyles = (0, _react.useCallback)((_event, entering) => {
     const dialog = ref.current;
     const scrollHeight = dialog ? dialog.scrollHeight : 0;

package/cjs/MultiCascadeTree/MultiCascadeTree.js

@@ -92,10 +92,10 @@ const MultiCascadeTree = (0, _utils.forwardRef)((props, ref) => {
     onSearch
   });
   const {
-    withClassPrefix,
+    withPrefix,
     merge
-  } = (0, _hooks2.useClassNames)(classPrefix);
-  const classes = merge(className, withClassPrefix('multi'));
+  } = (0, _hooks2.useStyles)(classPrefix);
+  const classes = merge(className, withPrefix('multi'));
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     ref: ref,
     className: classes

package/cjs/MultiCascadeTree/SearchView.d.ts

@@ -1,18 +1,18 @@
 import React from 'react';
-import type { ItemDataType, WithAsProps } from '../internals/types';
+import type { Option, WithAsProps } from '../internals/types';
 interface SearchViewProps<T> extends WithAsProps {
     searchKeyword: string;
     labelKey: string;
     valueKey: string;
     childrenKey: string;
     value: T[];
-    data: ItemDataType<T>[];
+    data: Option<T>[];
     disabledItemValues: any[];
     cascade?: boolean;
     locale?: Record<string, string>;
     onSearch: (value: string, event: React.ChangeEvent<HTMLInputElement>) => void;
-    onCheck: (item: ItemDataType<T>, event: React.SyntheticEvent, checked: boolean) => void;
-    inputRef?: React.RefObject<HTMLInputElement>;
+    onCheck: (item: Option<T>, event: React.SyntheticEvent, checked: boolean) => void;
+    inputRef?: React.RefObject<HTMLInputElement | null>;
 }
 declare function SearchView<T>(props: SearchViewProps<T>): React.JSX.Element;
 export default SearchView;

package/cjs/MultiCascadeTree/SearchView.js

@@ -34,10 +34,10 @@ function SearchView(props) {
   const {
     merge,
     prefix,
-    withClassPrefix,
+    withPrefix,
     rootPrefix
-  } = (0, _hooks.useClassNames)(classPrefix);
-  const classes = merge(className, withClassPrefix());
+  } = (0, _hooks.useStyles)(classPrefix);
+  const classes = merge(className, withPrefix());
   const {
     getLocale
   } = (0, _CustomProvider.useCustom)();

package/cjs/MultiCascadeTree/TreeView.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ItemDataType, WithAsProps } from '../internals/types';
+import type { Option, WithAsProps } from '../internals/types';
 import type { CascadeColumn } from '../CascadeTree/types';
 export interface TreeViewProps<T = any> extends WithAsProps {
     disabledItemValues?: T[];
@@ -10,13 +10,13 @@ export interface TreeViewProps<T = any> extends WithAsProps {
     columnWidth?: number;
     columnHeight?: number | string;
     cascade?: boolean;
-    cascadeData: (readonly ItemDataType<T>[])[];
-    cascadePaths?: ItemDataType<T>[];
+    cascadeData: (readonly Option<T>[])[];
+    cascadePaths?: Option<T>[];
     uncheckableItemValues: T[];
-    renderTreeNode?: (node: React.ReactNode, item: ItemDataType<T>) => React.ReactNode;
+    renderTreeNode?: (node: React.ReactNode, item: Option<T>) => React.ReactNode;
     renderColumn?: (childNodes: React.ReactNode, column: CascadeColumn<T>) => React.ReactNode;
-    onCheck?: (node: ItemDataType<T>, event: React.SyntheticEvent, checked: boolean) => void;
-    onSelect?: (node: ItemDataType<T>, cascadePaths: ItemDataType<T>[], event: React.SyntheticEvent) => void;
+    onCheck?: (node: Option<T>, event: React.SyntheticEvent, checked: boolean) => void;
+    onSelect?: (node: Option<T>, cascadePaths: Option<T>[], event: React.SyntheticEvent) => void;
 }
 declare const TreeView: import("../internals/types").InternalRefForwardingComponent<"div", TreeViewProps<any>, never> & Record<string, never>;
 export default TreeView;

package/cjs/MultiCascadeTree/TreeView.js

@@ -41,7 +41,7 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
   const {
     merge,
     prefix
-  } = (0, _hooks.useClassNames)(classPrefix);
+  } = (0, _hooks.useStyles)(classPrefix);
   const classes = merge(className, prefix('items'));
   const {
     rtl
@@ -155,10 +155,9 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
       layer
     }) : childNodes);
   });
-  const styles = {
-    ...style,
+  const styles = (0, _utils.mergeStyles)(style, {
     width: cascadeData.length * columnWidth
-  };
+  });
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     role: "tree",
     id: id ? `${id}-${popupType}` : undefined,

package/cjs/MultiCascadeTree/hooks/useSearch.d.ts

@@ -1,17 +1,17 @@
 /// <reference types="react" />
-import { ItemDataType } from '../../internals/types';
+import type { Option } from '../../internals/types';
 interface SearchPanelProps<T> {
     labelKey: string;
     valueKey: string;
     childrenKey: string;
-    flattenedData: ItemDataType<T>[];
+    flattenedData: Option<T>[];
     uncheckableItemValues?: any[];
     onSearch?: (value: string, event: React.SyntheticEvent) => void;
 }
 declare function useSearch<T>(props: SearchPanelProps<T>): {
     searchKeyword: string;
     setSearchKeyword: import("react").Dispatch<import("react").SetStateAction<string>>;
-    items: ItemDataType<T>[];
+    items: Option<T>[];
     handleSearch: (...args: any[]) => any;
 };
 export default useSearch;

package/cjs/MultiCascadeTree/hooks/useSelect.d.ts

@@ -1,19 +1,19 @@
 import React from 'react';
-import { type ItemDataType } from '../../internals/types';
+import type { Option } from '../../internals/types';
 export interface UseSelectProps<T> {
-    data: ItemDataType<T>[];
+    data: Option<T>[];
     childrenKey: string;
     labelKey: string;
     valueKey: string;
-    onSelect?: (node: ItemDataType<T>, cascadePaths: ItemDataType<T>[], event: React.SyntheticEvent) => void;
-    getChildren?: (node: ItemDataType<T>) => ItemDataType<T>[] | Promise<ItemDataType<T>[]>;
+    onSelect?: (node: Option<T>, cascadePaths: Option<T>[], event: React.SyntheticEvent) => void;
+    getChildren?: (node: Option<T>) => Option<T>[] | Promise<Option<T>[]>;
 }
 declare const useSelect: <T>(props: UseSelectProps<T>) => {
-    columnData: (readonly ItemDataType<T>[])[];
-    setColumnData: React.Dispatch<React.SetStateAction<(readonly ItemDataType<T>[])[]>>;
-    flattenData: ItemDataType<T>[];
-    selectedPaths: ItemDataType<T>[] | undefined;
-    setSelectedPaths: React.Dispatch<React.SetStateAction<ItemDataType<T>[] | undefined>>;
+    columnData: (readonly Option<T>[])[];
+    setColumnData: React.Dispatch<React.SetStateAction<(readonly Option<T>[])[]>>;
+    flattenData: Option<T>[];
+    selectedPaths: Option<T>[] | undefined;
+    setSelectedPaths: React.Dispatch<React.SetStateAction<Option<T>[] | undefined>>;
     handleSelect: (...args: any[]) => any;
 };
 export default useSelect;

package/cjs/MultiCascadeTree/hooks/useSelect.js

@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _react = require("react");
-var _hooks = require("../../internals/hooks");
 var _useFlattenData = _interopRequireDefault(require("./useFlattenData"));
 var _useColumnData = _interopRequireDefault(require("./useColumnData"));
+var _hooks = require("../../internals/hooks");
 const useSelect = props => {
   const {
     data,

package/cjs/MultiCascadeTree/index.d.ts

@@ -1,5 +1,5 @@
 import MultiCascadeTree from './MultiCascadeTree';
-export type { ItemDataType } from '../internals/types';
+export type { Option } from '../internals/types';
 export type { MultiCascadeTreeProps } from './types';
 export { MultiCascadeTree };
 export default MultiCascadeTree;

package/cjs/MultiCascadeTree/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { CascadeTreeProps } from '../CascadeTree/types';
-import type { ItemDataType, ToArray, WithAsProps } from '../internals/types';
+import type { Option, ToArray, WithAsProps } from '../internals/types';
 export interface ItemKeys {
     valueKey: string;
     labelKey: string;
@@ -26,5 +26,5 @@ export interface MultiCascadeTreeProps<T = any, V = T[], L = any> extends WithAs
     /**
      * Called after the checkbox state changes.
      */
-    onCheck?: (value: T[], node: ItemDataType<T>, checked: boolean, event: React.SyntheticEvent) => void;
+    onCheck?: (value: T[], node: Option<T>, checked: boolean, event: React.SyntheticEvent) => void;
 }

package/cjs/MultiCascadeTree/utils.d.ts

@@ -1,5 +1,5 @@
-import { ItemDataType } from '../internals/types';
-export interface ItemType<T = any> extends ItemDataType<T> {
+import { Option } from '../internals/types';
+export interface ItemType<T = any> extends Option<T> {
     parent?: ItemType<T>;
 }
 interface ItemKeys {

package/cjs/MultiCascader/MultiCascader.d.ts

@@ -1,62 +1,25 @@
 import React from 'react';
 import { PickerToggleProps } from '../internals/Picker';
-import type { FormControlPickerProps, ItemDataType, DataItemValue } from '../internals/types';
+import type { FormControlPickerProps, Option, DeprecatedMenuProps } from '../internals/types';
 import type { PickerLocale } from '../locales';
 import type { MultiCascadeTreeProps } from '../MultiCascadeTree';
-export interface MultiCascaderProps<T extends DataItemValue = any> extends FormControlPickerProps<T[], PickerLocale, ItemDataType<T>, T>, MultiCascadeTreeProps<T, T[], PickerLocale>, Pick<PickerToggleProps, 'loading'> {
-    /**
-     * A picker that can be counted
-     */
-    countable?: boolean;
-    /**
-     * Sets the width of the menu.
-     *
-     * @deprecated Use columnWidth instead
-     */
-    menuWidth?: number;
-    /**
-     * Sets the height of the menu
-     * @deprecated Use columnHeight instead
-     */
-    menuHeight?: number;
-    /**
-     * Custom menu class name
-     * @deprecated Use popupClassName instead
-     */
-    menuClassName?: string;
-    /**
-     * Custom menu style
-     * @deprecated Use popupStyle instead
-     */
-    menuStyle?: React.CSSProperties;
-    /**
-     * Custom popup style
-     */
-    popupStyle?: React.CSSProperties;
-    /**
-     * Custom popup style
-     */
-    popupClassName?: string;
+interface DeprecatedProps extends DeprecatedMenuProps {
     /**
      * The panel is displayed directly when the component is initialized
      * @deprecated Use MultiCascadeTree instead
      * @see MultiCascadeTree https://rsuitejs.com/components/multi-cascade-tree
      */
     inline?: boolean;
+}
+export interface MultiCascaderProps<T = any> extends FormControlPickerProps<T[], PickerLocale, Option<T>, T>, MultiCascadeTreeProps<T, T[], PickerLocale>, DeprecatedProps, Pick<PickerToggleProps, 'label' | 'caretAs' | 'loading'> {
     /**
-     * Custom render menu
-     * @deprecated Use renderColumn instead
-     */
-    renderMenu?: (items: readonly ItemDataType<T>[], menu: React.ReactNode, parentNode?: any, layer?: number) => React.ReactNode;
-    /**
-     * Custom render menu item
-     * @deprecated Use renderTreeNode instead
+     * A picker that can be counted
      */
-    renderMenuItem?: (node: React.ReactNode, item: ItemDataType<T>) => React.ReactNode;
+    countable?: boolean;
     /**
      * Custom render selected items
      */
-    renderValue?: (value: T[], selectedItems: ItemDataType<T>[], selectedElement: React.ReactNode) => React.ReactNode;
+    renderValue?: (value: T[], selectedItems: Option<T>[], selectedElement: React.ReactNode) => React.ReactNode;
     /**
      * Called when clean
      */
@@ -66,5 +29,5 @@ export interface MultiCascaderProps<T extends DataItemValue = any> extends FormC
  * The `MultiCascader` component is used to select multiple values from cascading options.
  * @see https://rsuitejs.com/components/multi-cascader/
  */
-declare const MultiCascader: import("../internals/types").InternalRefForwardingComponent<"div", MultiCascaderProps<DataItemValue>, never> & Record<string, never>;
+declare const MultiCascader: import("../internals/types").InternalRefForwardingComponent<"div", MultiCascaderProps<any>, never> & Record<string, never>;
 export default MultiCascader;

package/cjs/MultiCascader/MultiCascader.js

@@ -73,12 +73,6 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
     onSelect,
     onChange,
     onCheck,
-    menuClassName: DEPRECATED_menuClassName,
-    menuStyle: DEPRECATED_menuStyle,
-    menuWidth: DEPRECATED_menuWidth,
-    menuHeight: DEPRECATED_menuHeight,
-    renderMenu: DEPRECATED_renderMenu,
-    renderMenuItem: DEPRECATED_renderMenuItem,
     ...rest
   } = propsWithDefaults;
   const {
@@ -91,7 +85,7 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
   const {
     prefix,
     merge
-  } = (0, _hooks.useClassNames)(classPrefix);
+  } = (0, _hooks.useStyles)(classPrefix);
   const onSelectCallback = (0, _react.useCallback)((node, cascadePaths, event) => {
     var _trigger$current, _trigger$current$upda;
     onSelect === null || onSelect === void 0 || onSelect(node, cascadePaths, event);
@@ -220,42 +214,26 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
     ...rest
   });
   const renderCascadeColumn = (childNodes, column) => {
-    const {
-      items,
-      parentItem,
-      layer
-    } = column;
     if (typeof renderColumn === 'function') {
       return renderColumn(childNodes, column);
-    } else if (typeof DEPRECATED_renderMenu === 'function') {
-      return DEPRECATED_renderMenu(items, childNodes, parentItem, layer);
     }
     return childNodes;
   };
   const renderCascadeTreeNode = (node, itemData) => {
-    const render = typeof renderTreeNode === 'function' ? renderTreeNode : DEPRECATED_renderMenuItem;
-    if (typeof render === 'function') {
-      return render(node, itemData);
+    if (typeof renderTreeNode === 'function') {
+      return renderTreeNode(node, itemData);
     }
     return node;
   };
   const renderTreeView = (positionProps, speakerRef) => {
     const {
-      left,
-      top,
       className
     } = positionProps || {};
-    const styles = {
-      ...DEPRECATED_menuStyle,
-      ...popupStyle,
-      left,
-      top
-    };
-    const classes = merge(className, DEPRECATED_menuClassName, popupClassName, prefix('popup-multi-cascader'));
+    const classes = merge(className, popupClassName, prefix('popup-multi-cascader'));
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
       ref: (0, _utils3.mergeRefs)(overlay, speakerRef),
       className: classes,
-      style: styles,
+      style: popupStyle,
       target: trigger,
       onKeyDown: onPickerKeyDown
     }, searchable && /*#__PURE__*/_react.default.createElement(_SearchView.default, {
@@ -273,8 +251,8 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
       onSearch: handleSearch
     }), !searchKeyword && /*#__PURE__*/_react.default.createElement(_TreeView.default, {
       cascade: cascade,
-      columnWidth: columnWidth !== null && columnWidth !== void 0 ? columnWidth : DEPRECATED_menuWidth,
-      columnHeight: columnHeight !== null && columnHeight !== void 0 ? columnHeight : DEPRECATED_menuHeight,
+      columnWidth: columnWidth,
+      columnHeight: columnHeight,
       classPrefix: "cascade-tree",
       uncheckableItemValues: uncheckableItemValues,
       disabledItemValues: disabledItemValues,

package/cjs/Nav/AdaptiveNavItem.js

@@ -57,13 +57,13 @@ const AdaptiveNavItem = (0, _utils.forwardRef)((props, ref) => {
     }
   }, [dispatch, _id, props.eventKey, props.active]);
   if (parentNavMenu) {
-    if (navbar) {
-      return /*#__PURE__*/_react.default.createElement(_NavbarDropdownItem.default, (0, _extends2.default)({
+    if (sidenav) {
+      return /*#__PURE__*/_react.default.createElement(_SidenavDropdownItem.default, (0, _extends2.default)({
         ref: ref
       }, props));
     }
-    if (sidenav) {
-      return /*#__PURE__*/_react.default.createElement(_SidenavDropdownItem.default, (0, _extends2.default)({
+    if (navbar) {
+      return /*#__PURE__*/_react.default.createElement(_NavbarDropdownItem.default, (0, _extends2.default)({
         ref: ref
       }, props));
     }
@@ -71,13 +71,13 @@ const AdaptiveNavItem = (0, _utils.forwardRef)((props, ref) => {
       ref: ref
     }, props));
   }
-  if (navbar) {
-    return /*#__PURE__*/_react.default.createElement(_NavbarItem.default, (0, _extends2.default)({
+  if (sidenav) {
+    return /*#__PURE__*/_react.default.createElement(_SidenavItem.default, (0, _extends2.default)({
       ref: ref
     }, props));
   }
-  if (sidenav) {
-    return /*#__PURE__*/_react.default.createElement(_SidenavItem.default, (0, _extends2.default)({
+  if (navbar) {
+    return /*#__PURE__*/_react.default.createElement(_NavbarItem.default, (0, _extends2.default)({
       ref: ref
     }, props));
   }