rsuite 5.56.0 → 5.57.0

package/esm/Cascader/Cascader.js

@@ -1,22 +1,22 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useState, useCallback, useMemo } from 'react';
-import { useSet } from 'react-use-set';
+import React, { useCallback, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
 import isNil from 'lodash/isNil';
 import isFunction from 'lodash/isFunction';
-import shallowEqual from '../utils/shallowEqual';
-import TreeView from './TreeView';
-import { getParentMap, getPathTowardsItem, findNodeOfTree, flattenTree } from '../utils/treeUtils';
-import { usePaths } from './utils';
-import { getSafeRegExpString, createChainedFunction, mergeRefs, useControlled, useCustom, useClassNames, useIsMounted, useEventCallback } from '../utils';
+import TreeView from '../CascadeTree/TreeView';
+import SearchView from '../CascadeTree/SearchView';
+import { usePaths, useSelect, useSearch } from '../CascadeTree/hooks';
+import { getParentMap, findNodeOfTree, flattenTree } from '../utils/treeUtils';
+import { deprecatePropTypeNew } from '../internals/propTypes';
+import { createChainedFunction, mergeRefs, shallowEqual, useControlled, useCustom, useClassNames, useEventCallback } from '../utils';
 import { PickerToggle, PickerPopup, PickerToggleTrigger, usePickerClassName, usePickerRef, useToggleKeyDownEvent, useFocusItemValue, pickTriggerPropKeys, omitTriggerPropKeys, listPickerPropTypes } from '../internals/Picker';
-import SearchBox from '../internals/SearchBox';
 import { useMap } from '../utils/useMap';
 import { oneOf } from '../internals/propTypes';
+import useActive from './useActive';
 var emptyArray = [];
 
 /**
@@ -49,23 +49,22 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     toggleAs = props.toggleAs,
     style = props.style,
     valueProp = props.value,
-    inline = props.inline,
-    menuClassName = props.menuClassName,
-    menuStyle = props.menuStyle,
-    menuWidth = props.menuWidth,
-    menuHeight = props.menuHeight,
+    popupClassName = props.popupClassName,
+    popupStyle = props.popupStyle,
+    columnHeight = props.columnHeight,
+    columnWidth = props.columnWidth,
     _props$searchable = props.searchable,
     searchable = _props$searchable === void 0 ? true : _props$searchable,
     parentSelectable = props.parentSelectable,
     _props$placement = props.placement,
     placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
     id = props.id,
-    renderMenuItem = props.renderMenuItem,
+    renderColumn = props.renderColumn,
+    renderTreeNode = props.renderTreeNode,
     renderSearchItem = props.renderSearchItem,
     renderValue = props.renderValue,
-    renderMenu = props.renderMenu,
     renderExtraFooter = props.renderExtraFooter,
-    onEnter = props.onEnter,
+    onEntered = props.onEntered,
     onExited = props.onExited,
     onClean = props.onClean,
     onChange = props.onChange,
@@ -74,10 +73,13 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClose = props.onClose,
     onOpen = props.onOpen,
     getChildren = props.getChildren,
-    rest = _objectWithoutPropertiesLoose(props, ["as", "data", "classPrefix", "childrenKey", "valueKey", "labelKey", "defaultValue", "placeholder", "disabled", "disabledItemValues", "appearance", "cleanable", "locale", "toggleAs", "style", "value", "inline", "menuClassName", "menuStyle", "menuWidth", "menuHeight", "searchable", "parentSelectable", "placement", "id", "renderMenuItem", "renderSearchItem", "renderValue", "renderMenu", "renderExtraFooter", "onEnter", "onExited", "onClean", "onChange", "onSelect", "onSearch", "onClose", "onOpen", "getChildren"]); // Use component active state to support keyboard events.
-  var _useState = useState(false),
-    active = _useState[0],
-    setActive = _useState[1];
+    DEPRECATED_menuClassName = props.menuClassName,
+    DEPRECATED_menuStyle = props.menuStyle,
+    DEPRECATED_menuWidth = props.menuWidth,
+    DEPRECATED_menuHeight = props.menuHeight,
+    DEPRECATED_renderMenuItem = props.renderMenuItem,
+    DEPRECATED_renderMenu = props.renderMenu,
+    rest = _objectWithoutPropertiesLoose(props, ["as", "data", "classPrefix", "childrenKey", "valueKey", "labelKey", "defaultValue", "placeholder", "disabled", "disabledItemValues", "appearance", "cleanable", "locale", "toggleAs", "style", "value", "popupClassName", "popupStyle", "columnHeight", "columnWidth", "searchable", "parentSelectable", "placement", "id", "renderColumn", "renderTreeNode", "renderSearchItem", "renderValue", "renderExtraFooter", "onEntered", "onExited", "onClean", "onChange", "onSelect", "onSearch", "onClose", "onOpen", "getChildren", "menuClassName", "menuStyle", "menuWidth", "menuHeight", "renderMenuItem", "renderMenu"]);
   var _usePickerRef = usePickerRef(ref),
     trigger = _usePickerRef.trigger,
     root = _usePickerRef.root,
@@ -86,42 +88,81 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     searchInput = _usePickerRef.searchInput;
   var _ref = useControlled(valueProp, defaultValue),
     value = _ref[0],
-    setValue = _ref[1];
-  var isMounted = useIsMounted();
-  var loadingItemsSet = useSet();
-  var asyncChildrenMap = useMap();
+    setValue = _ref[1]; // Store the children of each node
+  var childrenMap = useMap();
+
+  // Store the parent of each node
   var parentMap = useMemo(function () {
     return getParentMap(data, function (item) {
-      var _asyncChildrenMap$get;
-      return (_asyncChildrenMap$get = asyncChildrenMap.get(item)) !== null && _asyncChildrenMap$get !== void 0 ? _asyncChildrenMap$get : item[childrenKey];
+      var _childrenMap$get;
+      return (_childrenMap$get = childrenMap.get(item)) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : item[childrenKey];
     });
-  }, [asyncChildrenMap, childrenKey, data]);
+  }, [childrenMap, childrenKey, data]);
+
+  // Flatten the tree data
   var flattenedData = useMemo(function () {
     return flattenTree(data, function (item) {
-      var _asyncChildrenMap$get2;
-      return (_asyncChildrenMap$get2 = asyncChildrenMap.get(item)) !== null && _asyncChildrenMap$get2 !== void 0 ? _asyncChildrenMap$get2 : item[childrenKey];
+      var _childrenMap$get2;
+      return (_childrenMap$get2 = childrenMap.get(item)) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : item[childrenKey];
     });
-  }, [asyncChildrenMap, childrenKey, data]);
+  }, [childrenMap, childrenKey, data]);
 
-  // The item that focus is on
-  var _useState2 = useState(),
-    activeItem = _useState2[0],
-    setActiveItem = _useState2[1];
+  // The selected item
+  var selectedItem = flattenedData.find(function (item) {
+    return item[valueKey] === value;
+  });
+
+  // Callback function after selecting the node
+  var onSelectCallback = function onSelectCallback(node, event) {
+    var _trigger$current;
+    var isLeafNode = node.isLeafNode,
+      cascadePaths = node.cascadePaths,
+      itemData = node.itemData;
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(itemData, cascadePaths, event);
+    var nextValue = itemData[valueKey];
+    if (isLeafNode) {
+      // Determines whether the option is a leaf node, and if so, closes the picker.
+      handleClose();
+      setValue(nextValue);
+      return;
+    }
+
+    //  When the parent is optional, the value and the displayed path are updated.
+    if (parentSelectable && !shallowEqual(value, nextValue)) {
+      setValue(nextValue);
+      onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
+    }
+
+    // Update menu position
+    (_trigger$current = trigger.current) === null || _trigger$current === void 0 ? void 0 : _trigger$current.updatePosition();
+  };
+  var _useSelect = useSelect({
+      value: value,
+      valueKey: valueKey,
+      childrenKey: childrenKey,
+      childrenMap: childrenMap,
+      selectedItem: selectedItem,
+      getChildren: getChildren,
+      onChange: onChange,
+      onSelect: onSelectCallback
+    }),
+    activeItem = _useSelect.activeItem,
+    setActiveItem = _useSelect.setActiveItem,
+    loadingItemsSet = _useSelect.loadingItemsSet,
+    handleSelect = _useSelect.handleSelect;
   var _usePaths = usePaths({
       data: data,
       activeItem: activeItem,
-      selectedItem: flattenedData.find(function (item) {
-        return item[valueKey] === value;
-      }),
+      selectedItem: selectedItem,
       getParent: function getParent(item) {
         return parentMap.get(item);
       },
       getChildren: function getChildren(item) {
-        var _asyncChildrenMap$get3;
-        return (_asyncChildrenMap$get3 = asyncChildrenMap.get(item)) !== null && _asyncChildrenMap$get3 !== void 0 ? _asyncChildrenMap$get3 : item[childrenKey];
+        var _childrenMap$get3;
+        return (_childrenMap$get3 = childrenMap.get(item)) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : item[childrenKey];
       }
     }),
-    columnsToDisplay = _usePaths.columnsToDisplay,
+    columns = _usePaths.columns,
     pathTowardsActiveItem = _usePaths.pathTowardsActiveItem,
     pathTowardsSelectedItem = _usePaths.pathTowardsSelectedItem;
   var _useCustom = useCustom('Picker', overrideLocale),
@@ -135,37 +176,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useClassNames = useClassNames(classPrefix),
     prefix = _useClassNames.prefix,
     merge = _useClassNames.merge;
-  var _useState3 = useState(''),
-    searchKeyword = _useState3[0],
-    setSearchKeyword = _useState3[1];
-  var someKeyword = function someKeyword(item, keyword) {
-    if (item[labelKey].match(new RegExp(getSafeRegExpString(keyword || searchKeyword), 'i'))) {
-      return true;
-    }
-    var parent = parentMap.get(item);
-    if (parent && someKeyword(parent)) {
-      return true;
-    }
-    return false;
-  };
-  var getSearchResult = function getSearchResult(keyword) {
-    var items = [];
-    var result = flattenedData.filter(function (item) {
-      if (!parentSelectable && item[childrenKey]) {
-        return false;
-      }
-      return someKeyword(item, keyword);
-    });
-    for (var i = 0; i < result.length; i++) {
-      items.push(result[i]);
-
-      // A maximum of 100 search results are returned.
-      if (i === 99) {
-        return items;
-      }
-    }
-    return items;
-  };
+  var onFocusItemCallback = useCallback(function (value) {
+    setActiveItem(flattenedData.find(function (item) {
+      return item[valueKey] === value;
+    }));
+  }, [flattenedData, setActiveItem, valueKey]);
 
   // Used to hover the focuse item  when trigger `onKeydown`
   var _useFocusItemValue = useFocusItemValue(value, {
@@ -179,20 +194,14 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       getParent: function getParent(item) {
         return parentMap.get(item);
       },
-      callback: useCallback(function (value) {
-        setActiveItem(flattenedData.find(function (item) {
-          return item[valueKey] === value;
-        }));
-      }, [flattenedData, setActiveItem, valueKey])
+      callback: onFocusItemCallback
     }),
     focusItemValue = _useFocusItemValue.focusItemValue,
     setFocusItemValue = _useFocusItemValue.setFocusItemValue,
     setLayer = _useFocusItemValue.setLayer,
     setKeys = _useFocusItemValue.setKeys,
     onFocusItem = _useFocusItemValue.onKeyDown;
-  var handleSearch = useEventCallback(function (value, event) {
-    var items = getSearchResult(value);
-    setSearchKeyword(value);
+  var onSearchCallback = function onSearchCallback(value, items, event) {
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(value, event);
     if (!value || items.length === 0) {
       setFocusItemValue(undefined);
@@ -203,25 +212,33 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setLayer(0);
       setKeys([]);
     }
-  });
-  var handleEntered = useEventCallback(function () {
-    if (!target.current) {
-      return;
-    }
-    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
-    setActive(true);
-  });
-  var handleExited = useEventCallback(function () {
-    if (!target.current) {
-      return;
-    }
-    onClose === null || onClose === void 0 ? void 0 : onClose();
-    setActive(false);
-    setSearchKeyword('');
-  });
+  };
+  var _useSearch = useSearch({
+      labelKey: labelKey,
+      childrenKey: childrenKey,
+      parentMap: parentMap,
+      flattenedData: flattenedData,
+      parentSelectable: parentSelectable,
+      onSearch: onSearchCallback
+    }),
+    items = _useSearch.items,
+    searchKeyword = _useSearch.searchKeyword,
+    setSearchKeyword = _useSearch.setSearchKeyword,
+    handleSearch = _useSearch.handleSearch;
+  var _useActive = useActive({
+      onOpen: onOpen,
+      onClose: onClose,
+      onEntered: onEntered,
+      onExited: onExited,
+      target: target,
+      setSearchKeyword: setSearchKeyword
+    }),
+    active = _useActive.active,
+    handleEntered = _useActive.handleEntered,
+    handleExited = _useActive.handleExited;
   var handleClose = useEventCallback(function () {
-    var _trigger$current, _target$current, _target$current$focus;
-    (_trigger$current = trigger.current) === null || _trigger$current === void 0 ? void 0 : _trigger$current.close();
+    var _trigger$current2, _target$current, _target$current$focus;
+    (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : _trigger$current2.close();
 
     // The focus is on the trigger button after closing
     (_target$current = target.current) === null || _target$current === void 0 ? void 0 : (_target$current$focus = _target$current.focus) === null || _target$current$focus === void 0 ? void 0 : _target$current$focus.call(_target$current);
@@ -261,162 +278,79 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onMenuKeyDown: onFocusItem,
     onMenuPressEnter: handleMenuPressEnter
   }, rest));
-  var handleSelect = useEventCallback(function (node, cascadePaths, isLeafNode, event) {
-    var _node$childrenKey, _trigger$current2;
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, cascadePaths, event);
-    setActiveItem(node);
-    var nextValue = node[valueKey];
-
-    // Lazy load node's children
-    if (typeof getChildren === 'function' && ((_node$childrenKey = node[childrenKey]) === null || _node$childrenKey === void 0 ? void 0 : _node$childrenKey.length) === 0 && !asyncChildrenMap.has(node)) {
-      loadingItemsSet.add(node);
-      var children = getChildren(node);
-      if (children instanceof Promise) {
-        children.then(function (data) {
-          if (isMounted()) {
-            loadingItemsSet.delete(node);
-            asyncChildrenMap.set(node, data);
-          }
-        });
-      } else {
-        loadingItemsSet.delete(node);
-        asyncChildrenMap.set(node, children);
-      }
-    }
-    if (isLeafNode) {
-      // Determines whether the option is a leaf node, and if so, closes the picker.
-      handleClose();
-      setValue(nextValue);
-      if (!shallowEqual(value, nextValue)) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
-      }
-      return;
-    }
-
-    /** When the parent is optional, the value and the displayed path are updated. */
-    if (parentSelectable && !shallowEqual(value, nextValue)) {
-      setValue(nextValue);
-      onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
-    }
-
-    // Update menu position
-    (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : _trigger$current2.updatePosition();
-  });
 
   /**
    * The search structure option is processed after being selected.
    */
-  var handleSearchRowSelect = useEventCallback(function (node, nodes, event) {
-    var nextValue = node[valueKey];
+  var handleSearchRowSelect = useEventCallback(function (itemData, nodes, event) {
+    var nextValue = itemData[valueKey];
     handleClose();
     setSearchKeyword('');
     setValue(nextValue);
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, nodes, event);
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(itemData, nodes, event);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
   });
-  var renderSearchRow = function renderSearchRow(item, key) {
-    var regx = new RegExp(getSafeRegExpString(searchKeyword), 'ig');
-    var nodes = getPathTowardsItem(item, function (item) {
-      return parentMap.get(item);
-    });
-    var formattedNodes = nodes.map(function (node) {
-      var _extends2;
-      var labelElements = [];
-      var a = node[labelKey].split(regx);
-      var b = node[labelKey].match(regx);
-      for (var i = 0; i < a.length; i++) {
-        labelElements.push(a[i]);
-        if (b && b[i]) {
-          labelElements.push( /*#__PURE__*/React.createElement("span", {
-            key: i,
-            className: prefix('cascader-search-match')
-          }, b[i]));
-        }
-      }
-      return _extends({}, node, (_extends2 = {}, _extends2[labelKey] = labelElements, _extends2));
-    });
-    var disabled = disabledItemValues.some(function (value) {
-      return formattedNodes.some(function (node) {
-        return node[valueKey] === value;
-      });
-    });
-    var itemClasses = prefix('cascader-row', {
-      'cascader-row-disabled': disabled,
-      'cascader-row-focus': item[valueKey] === focusItemValue
-    });
-    var label = formattedNodes.map(function (node, index) {
-      return /*#__PURE__*/React.createElement("span", {
-        key: "col-" + index,
-        className: prefix('cascader-col')
-      }, node[labelKey]);
-    });
-    return /*#__PURE__*/React.createElement("div", {
-      role: "treeitem",
-      key: key,
-      "aria-disabled": disabled,
-      "data-key": item[valueKey],
-      className: itemClasses,
-      tabIndex: -1,
-      onClick: function onClick(event) {
-        if (!disabled) {
-          handleSearchRowSelect(item, nodes, event);
-        }
-      }
-    }, renderSearchItem ? renderSearchItem(label, nodes) : label);
+  var renderCascadeColumn = function renderCascadeColumn(childNodes, column) {
+    var items = column.items,
+      parentItem = column.parentItem,
+      layer = column.layer;
+    if (typeof renderColumn === 'function') {
+      return renderColumn(childNodes, column);
+    } else if (typeof DEPRECATED_renderMenu === 'function') {
+      return DEPRECATED_renderMenu(items, childNodes, parentItem, layer);
+    }
+    return childNodes;
   };
-  var renderSearchResultPanel = function renderSearchResultPanel() {
-    if (searchKeyword === '') {
-      return null;
+  var renderCascadeTreeNode = function renderCascadeTreeNode(node, itemData) {
+    var render = typeof renderTreeNode === 'function' ? renderTreeNode : DEPRECATED_renderMenuItem;
+    if (typeof render === 'function') {
+      return render(node, itemData);
     }
-    var items = getSearchResult();
-    return /*#__PURE__*/React.createElement("div", {
-      className: prefix('cascader-search-panel'),
-      "data-layer": 0,
-      role: "tree"
-    }, items.length ? items.map(renderSearchRow) : /*#__PURE__*/React.createElement("div", {
-      className: prefix('none')
-    }, locale.noResultsText));
+    return node;
   };
   var renderTreeView = function renderTreeView(positionProps, speakerRef) {
     var _ref2 = positionProps || {},
       left = _ref2.left,
       top = _ref2.top,
       className = _ref2.className;
-    var styles = _extends({}, menuStyle, {
+    var styles = _extends({}, DEPRECATED_menuStyle, popupStyle, {
       left: left,
       top: top
     });
-    var classes = merge(className, menuClassName, prefix('cascader-menu', {
-      inline: inline
-    }));
+    var classes = merge(className, DEPRECATED_menuClassName, popupClassName, prefix('popup-cascader'));
     return /*#__PURE__*/React.createElement(PickerPopup, {
       ref: mergeRefs(overlay, speakerRef),
       className: classes,
       style: styles,
       target: trigger,
       onKeyDown: onPickerKeyDown
-    }, searchable && /*#__PURE__*/React.createElement(SearchBox, {
-      placeholder: locale === null || locale === void 0 ? void 0 : locale.searchPlaceholder,
-      onChange: handleSearch,
-      value: searchKeyword,
-      inputRef: searchInput
-    }), renderSearchResultPanel(), searchKeyword === '' && /*#__PURE__*/React.createElement(TreeView, {
-      menuWidth: menuWidth,
-      menuHeight: menuHeight,
+    }, searchable && /*#__PURE__*/React.createElement(SearchView, {
+      data: items,
+      searchKeyword: searchKeyword,
+      valueKey: valueKey,
+      labelKey: labelKey,
+      parentMap: parentMap,
+      disabledItemValues: disabledItemValues,
+      focusItemValue: focusItemValue,
+      inputRef: searchInput,
+      renderSearchItem: renderSearchItem,
+      onSelect: handleSearchRowSelect,
+      onSearch: handleSearch
+    }), searchKeyword === '' && /*#__PURE__*/React.createElement(TreeView, {
+      columnWidth: columnWidth !== null && columnWidth !== void 0 ? columnWidth : DEPRECATED_menuWidth,
+      columnHeight: columnHeight !== null && columnHeight !== void 0 ? columnHeight : DEPRECATED_menuHeight,
       disabledItemValues: disabledItemValues,
       loadingItemsSet: loadingItemsSet,
       valueKey: valueKey,
       labelKey: labelKey,
       childrenKey: childrenKey,
-      classPrefix: 'picker-cascader-menu',
-      cascadeData: columnsToDisplay,
+      classPrefix: 'cascade-tree',
+      data: columns,
       cascadePaths: pathTowardsActiveItem,
-      activeItemValue: value
-      // FIXME make onSelect generic
-      ,
+      activeItemValue: value,
       onSelect: handleSelect,
-      renderMenu: renderMenu,
-      renderMenuItem: renderMenuItem
+      renderColumn: renderCascadeColumn,
+      renderTreeNode: renderCascadeTreeNode
     }), renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
   };
   var selectedElement = placeholder;
@@ -450,19 +384,15 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       cleanable: cleanable
     })),
     classes = _usePickerClassName[0],
-    usedClassNamePropKeys = _usePickerClassName[1]; // TODO: bad api design
-  //       consider an isolated Menu component
-  if (inline) {
-    return renderTreeView();
-  }
+    usedClassNamePropKeys = _usePickerClassName[1];
   return /*#__PURE__*/React.createElement(PickerToggleTrigger, {
     id: id,
     popupType: "tree",
     pickerProps: pick(props, pickTriggerPropKeys),
     ref: trigger,
     placement: placement,
-    onEntered: createChainedFunction(handleEntered, onEnter),
-    onExited: createChainedFunction(handleExited, onExited),
+    onEntered: handleEntered,
+    onExited: handleExited,
     speaker: renderTreeView
   }, /*#__PURE__*/React.createElement(Component, {
     className: classes,
@@ -488,16 +418,20 @@ Cascader.propTypes = _extends({}, listPickerPropTypes, {
   disabledItemValues: PropTypes.array,
   locale: PropTypes.any,
   appearance: oneOf(['default', 'subtle']),
-  renderMenu: PropTypes.func,
   onSelect: PropTypes.func,
   onSearch: PropTypes.func,
   cleanable: PropTypes.bool,
-  renderMenuItem: PropTypes.func,
+  renderColumn: PropTypes.func,
+  renderTreeNode: PropTypes.func,
   renderSearchItem: PropTypes.func,
-  menuWidth: PropTypes.number,
-  menuHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  columnWidth: PropTypes.number,
+  columnHeight: PropTypes.number,
   searchable: PropTypes.bool,
-  inline: PropTypes.bool,
-  parentSelectable: PropTypes.bool
+  parentSelectable: PropTypes.bool,
+  inline: deprecatePropTypeNew(PropTypes.bool, 'Use `<CascadeTree>` instead.'),
+  renderMenu: deprecatePropTypeNew(PropTypes.func, 'Use "renderColumn" property instead.'),
+  renderMenuItem: deprecatePropTypeNew(PropTypes.func, 'Use "renderTreeNode" property instead.'),
+  menuWidth: deprecatePropTypeNew(PropTypes.number, 'Use "columnWidth" property instead.'),
+  menuHeight: deprecatePropTypeNew(PropTypes.number, 'Use "columnHeight" property instead.')
 });
 export default Cascader;

package/esm/Cascader/useActive.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="react" />
+interface UseActiveProps {
+    target: React.RefObject<HTMLElement>;
+    onOpen?: () => void;
+    onClose?: () => void;
+    onEntered?: (node: HTMLElement) => void;
+    onExited?: (node: HTMLElement) => void;
+    setSearchKeyword: (keyword: string) => void;
+}
+declare const useActive: (props: UseActiveProps) => {
+    active: boolean;
+    handleEntered: (...args: any[]) => any;
+    handleExited: (...args: any[]) => any;
+};
+export default useActive;

package/esm/Cascader/useActive.js

@@ -0,0 +1,37 @@
+'use client';
+import { useState } from 'react';
+import useEventCallback from '../utils/useEventCallback';
+var useActive = function useActive(props) {
+  var onOpen = props.onOpen,
+    onClose = props.onClose,
+    onEntered = props.onEntered,
+    onExited = props.onExited,
+    target = props.target,
+    setSearchKeyword = props.setSearchKeyword; // Use component active state to support keyboard events.
+  var _useState = useState(false),
+    active = _useState[0],
+    setActive = _useState[1];
+  var handleEntered = useEventCallback(function (node) {
+    onEntered === null || onEntered === void 0 ? void 0 : onEntered(node);
+    if (!target.current) {
+      return;
+    }
+    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+    setActive(true);
+  });
+  var handleExited = useEventCallback(function (node) {
+    onExited === null || onExited === void 0 ? void 0 : onExited(node);
+    if (!target.current) {
+      return;
+    }
+    onClose === null || onClose === void 0 ? void 0 : onClose();
+    setActive(false);
+    setSearchKeyword('');
+  });
+  return {
+    active: active,
+    handleEntered: handleEntered,
+    handleExited: handleExited
+  };
+};
+export default useActive;

package/esm/InlineEdit/InlineEdit.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
 import { type ChildrenProps } from './renderChildren';
-export interface InlineEditProps extends WithAsProps {
+export interface InlineEditProps extends Omit<WithAsProps, 'children'> {
     /**
      * If true, the InlineEdit will be disabled.
      */

package/esm/Loader/Loader.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useClassNames } from '../utils';
+import { useClassNames, useUniqueId } from '../utils';
 import { oneOf } from '../internals/propTypes';
 /**
  * The `Loader` component is used to indicate the loading state of a page or a section.
@@ -24,20 +24,20 @@ var Loader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     content = props.content,
     size = props.size,
     rest = _objectWithoutPropertiesLoose(props, ["as", "classPrefix", "className", "inverse", "backdrop", "speed", "center", "vertical", "content", "size"]);
-  var hasContent = !!content;
   var _useClassNames = useClassNames(classPrefix),
     merge = _useClassNames.merge,
     withClassPrefix = _useClassNames.withClassPrefix,
     prefix = _useClassNames.prefix;
+  var labelId = useUniqueId('loader-label-');
   var classes = merge(className, prefix('wrapper', "speed-" + speed, size, {
     'backdrop-wrapper': backdrop,
-    'has-content': hasContent,
     vertical: vertical,
     inverse: inverse,
     center: center
   }));
   return /*#__PURE__*/React.createElement(Component, _extends({
-    role: "progressbar"
+    role: "status",
+    "aria-labelledby": content ? labelId : undefined
   }, rest, {
     ref: ref,
     className: classes
@@ -47,7 +47,8 @@ var Loader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: withClassPrefix()
   }, /*#__PURE__*/React.createElement("span", {
     className: prefix('spin')
-  }), hasContent && /*#__PURE__*/React.createElement("span", {
+  }), content && /*#__PURE__*/React.createElement("span", {
+    id: labelId,
     className: prefix('content')
   }, content)));
 });