rsuite 5.50.0 → 5.51.0

package/cjs/InputPicker/InputPicker.js

@@ -27,9 +27,20 @@ var _getDataGroupBy = require("../utils/getDataGroupBy");
 var _Picker = require("../Picker");
 var _Tag = _interopRequireDefault(require("../Tag"));
 var _InputAutosize = _interopRequireDefault(require("./InputAutosize"));
-var _InputSearch = _interopRequireDefault(require("./InputSearch"));
+var _TextBox = _interopRequireDefault(require("./TextBox"));
 var _InputPickerContext = _interopRequireDefault(require("./InputPickerContext"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var convertSize = function convertSize(size) {
+  switch (size) {
+    case 'lg':
+      return 'lg';
+    case 'sm':
+    case 'xs':
+      return 'sm';
+    default:
+      return 'md';
+  }
+};
 /**
  * Single item selector with text box input.
  *
@@ -212,7 +223,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     (_triggerRef$current3 = triggerRef.current) === null || _triggerRef$current3 === void 0 ? void 0 : (_triggerRef$current3$ = _triggerRef$current3.updatePosition) === null || _triggerRef$current3$ === void 0 ? void 0 : _triggerRef$current3$.call(_triggerRef$current3);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchKeyword, value]);
-  var getDateItem = function getDateItem(value) {
+  var getDataItem = function getDataItem(value) {
     // Find active `MenuItem` by `value`
     var allData = getAllDataAndCache();
     var activeItem = allData.find(function (item) {
@@ -470,7 +481,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     blurInput();
     setOpen(false);
   });
-  var renderDropdownMenuItem = function renderDropdownMenuItem(label, item) {
+  var renderListItem = function renderListItem(label, item) {
     // 'Create option "{0}"' =>  Create option "xxxxx"
     var newLabel = item.create ? /*#__PURE__*/_react.default.createElement("span", null, (0, _utils.tplTransform)(locale.createOption, label)) : label;
     return renderMenuItem ? renderMenuItem(newLabel, item) : newLabel;
@@ -482,7 +493,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         itemNode: null
       };
     }
-    var dataItem = getDateItem(value);
+    var dataItem = getDataItem(value);
     var itemNode = dataItem.itemNode;
     if (!(0, _isNil.default)(value) && (0, _isFunction.default)(renderValue)) {
       itemNode = renderValue(value, dataItem.activeItem, itemNode);
@@ -503,17 +514,19 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var tags = value || [];
     var items = [];
     var tagElements = tags.map(function (tag) {
-      var _getDateItem = getDateItem(tag),
-        isValid = _getDateItem.isValid,
-        itemNode = _getDateItem.itemNode,
-        activeItem = _getDateItem.activeItem;
+      var _getDataItem = getDataItem(tag),
+        isValid = _getDataItem.isValid,
+        itemNode = _getDataItem.itemNode,
+        activeItem = _getDataItem.activeItem;
       items.push(activeItem);
       if (!isValid) {
         return null;
       }
-      return /*#__PURE__*/_react.default.createElement(_Tag.default, (0, _extends2.default)({}, tagRest, {
+      return /*#__PURE__*/_react.default.createElement(_Tag.default, (0, _extends2.default)({
+        role: "option"
+      }, tagRest, {
         key: tag,
-        size: rest.size === 'lg' ? 'lg' : rest.size === 'xs' ? 'sm' : 'md',
+        size: convertSize(rest.size),
         closable: !disabled && closable && !readOnly && !plaintext,
         title: typeof itemNode === 'string' ? itemNode : undefined,
         onClose: (0, _utils.createChainedFunction)(handleRemoveItemByTag.bind(null, tag), onClose)
@@ -526,7 +539,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
     return tagElements;
   };
-  var renderDropdownMenu = function renderDropdownMenu(positionProps, speakerRef) {
+  var renderPopup = function renderPopup(positionProps, speakerRef) {
     var left = positionProps.left,
       top = positionProps.top,
       className = positionProps.className;
@@ -550,21 +563,20 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       items = items.sort(sort(false));
     }
     if (disabledOptions) {
-      return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
+      return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
         ref: (0, _utils.mergeRefs)(overlay, speakerRef)
       });
     }
-    var menu = items.length ? /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenu, {
-      id: id ? id + "-listbox" : undefined,
+    var menu = items.length ? /*#__PURE__*/_react.default.createElement(_Picker.Listbox, {
       listProps: listProps,
       listRef: list,
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
       labelKey: labelKey,
       classPrefix: menuClassPrefix,
-      dropdownMenuItemClassPrefix: multi ? undefined : menuClassPrefix + "-item",
-      dropdownMenuItemAs: multi ? _Picker.DropdownMenuCheckItem : _Picker.DropdownMenuItem,
-      dropdownMenuItemProps: {
+      listItemClassPrefix: multi ? undefined : menuClassPrefix + "-item",
+      listItemAs: multi ? _Picker.ListCheckItem : _Picker.ListItem,
+      listItemProps: {
         renderMenuItemCheckbox: renderMenuItemCheckbox
       },
       activeItemValues: multi ? value : [value],
@@ -579,12 +591,12 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onSelect: multi ? handleCheckTag : handleSelectItem // fixme don't use any
       ,
       renderMenuGroup: renderMenuGroup,
-      renderMenuItem: renderDropdownMenuItem,
+      renderMenuItem: renderListItem,
       virtualized: virtualized
     }) : /*#__PURE__*/_react.default.createElement("div", {
       className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["none"])))
     }, locale === null || locale === void 0 ? void 0 : locale.noResultsText);
-    return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
+    return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
       ref: (0, _utils.mergeRefs)(overlay, speakerRef),
       autoWidth: menuAutoWidth,
       className: classes,
@@ -617,7 +629,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     usedClassNamePropKeys = _usePickerClassName[1];
   var classes = merge(pickerClasses, (_merge = {}, _merge[prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["tag"])))] = multi, _merge[prefix(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["focused"])))] = open, _merge[prefix(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["disabled-options"])))] = disabledOptions, _merge));
   var searching = !!searchKeyword && open;
-  var displaySearchInput = searchable && !disabled && !rest.loading;
+  var editable = searchable && !disabled && !rest.loading;
   var inputProps = multi ? {
     inputStyle: {
       maxWidth: maxWidth - 63
@@ -643,6 +655,8 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }
   var placeholderNode = placeholder || (disabledOptions ? null : locale === null || locale === void 0 ? void 0 : locale.placeholder);
   return /*#__PURE__*/_react.default.createElement(_Picker.PickerToggleTrigger, {
+    id: id,
+    multiple: multi,
     pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),
     ref: triggerRef,
     trigger: "active",
@@ -650,7 +664,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onEntered: (0, _utils.createChainedFunction)(onEntered, onOpen),
     onExit: (0, _utils.createChainedFunction)(handleExit, onExit),
     onExited: (0, _utils.createChainedFunction)(handleExited, onExited),
-    speaker: renderDropdownMenu,
+    speaker: renderPopup,
     placement: placement
   }, /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,
@@ -659,7 +673,6 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onKeyDown: onPickerKeyDown,
     ref: root
   }, /*#__PURE__*/_react.default.createElement(_Picker.PickerToggle, (0, _extends2.default)({}, (0, _omit.default)(rest, [].concat(_Picker.omitTriggerPropKeys, usedClassNamePropKeys)), {
-    id: id,
     appearance: appearance,
     readOnly: readOnly,
     plaintext: plaintext,
@@ -673,18 +686,22 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     disabled: disabled,
     placement: placement,
     inputValue: value,
+    focusItemValue: focusItemValue,
     caret: !disabledOptions
-  }), searching || multi && hasValue ? null : itemNode || placeholderNode), !(!multi && disabled) && /*#__PURE__*/_react.default.createElement("div", {
-    className: prefix(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["tag-wrapper"])))
-  }, tagElements, displaySearchInput && /*#__PURE__*/_react.default.createElement(_InputSearch.default, (0, _extends2.default)({}, inputProps, {
-    tabIndex: -1,
+  }), searching || multi && hasValue ? null : itemNode || placeholderNode), /*#__PURE__*/_react.default.createElement(_TextBox.default, {
+    showTagList: hasValue && multi,
+    tags: tagElements,
+    editable: editable,
     readOnly: readOnly,
+    disabled: disabled,
+    multiple: multi,
     onBlur: onBlur,
     onFocus: (0, _utils.createChainedFunction)(handleFocus, onFocus),
     inputRef: inputRef,
     onChange: handleSearch,
-    value: open ? searchKeyword : ''
-  })))));
+    inputValue: open ? searchKeyword : '',
+    inputProps: inputProps
+  })));
 });
 InputPicker.displayName = 'InputPicker';
 InputPicker.propTypes = (0, _extends2.default)({}, _Picker.listPickerPropTypes, {

package/cjs/InputPicker/InputSearch.js

@@ -2,14 +2,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteralLoose"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireDefault(require("react"));
 var _utils = require("../utils");
 var _templateObject;
 var InputSearch = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -25,10 +23,10 @@ var InputSearch = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     readOnly = props.readOnly,
     onChange = props.onChange,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "children", "className", "value", "inputRef", "style", "readOnly", "onChange"]);
-  var handleChange = (0, _react.useCallback)(function (event) {
+  var handleChange = (0, _utils.useEventCallback)(function (event) {
     var _event$target;
     onChange === null || onChange === void 0 ? void 0 : onChange(event === null || event === void 0 ? void 0 : (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.value, event);
-  }, [onChange]);
+  });
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
     withClassPrefix = _useClassNames.withClassPrefix,
     merge = _useClassNames.merge,
@@ -47,15 +45,5 @@ var InputSearch = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   })), children);
 });
 InputSearch.displayName = 'InputSearch';
-InputSearch.propTypes = {
-  classPrefix: _propTypes.default.string,
-  value: _propTypes.default.string,
-  className: _propTypes.default.string,
-  children: _propTypes.default.node,
-  style: _propTypes.default.object,
-  inputRef: _utils.TypeChecker.refType,
-  as: _propTypes.default.elementType,
-  onChange: _propTypes.default.func
-};
 var _default = InputSearch;
 exports.default = _default;

package/cjs/InputPicker/TagList.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const TagList: React.ForwardRefExoticComponent<React.HTMLAttributes<HTMLDivElement> & React.RefAttributes<HTMLDivElement>>;
+export default TagList;

package/cjs/InputPicker/TagList.js

@@ -0,0 +1,29 @@
+'use client';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteralLoose"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _react = _interopRequireDefault(require("react"));
+var _utils = require("../utils");
+var _useCombobox2 = _interopRequireDefault(require("../Picker/hooks/useCombobox"));
+var _templateObject;
+var TagList = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var children = props.children,
+    rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["children"]);
+  var _useClassNames = (0, _utils.useClassNames)('picker'),
+    prefix = _useClassNames.prefix;
+  var _useCombobox = (0, _useCombobox2.default)(),
+    id = _useCombobox.id;
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
+    ref: ref,
+    role: "listbox",
+    id: id + "-describe",
+    className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["tag-list"])))
+  }, rest), children);
+});
+var _default = TagList;
+exports.default = _default;

package/cjs/InputPicker/TextBox.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { InputSearchProps } from './InputSearch';
+interface TextBoxProps {
+    tags?: React.ReactNode;
+    inputProps?: InputSearchProps;
+    readOnly?: boolean;
+    disabled?: boolean;
+    onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
+    onFocus?: (event: React.FocusEvent<HTMLInputElement>) => void;
+    onChange?: (value: string, event: React.ChangeEvent<HTMLInputElement>) => void;
+    inputValue?: string;
+    inputRef?: React.Ref<HTMLInputElement>;
+    editable?: boolean;
+    multiple?: boolean;
+    showTagList?: boolean;
+}
+declare const TextBox: React.ForwardRefExoticComponent<TextBoxProps & React.RefAttributes<HTMLDivElement>>;
+export default TextBox;

package/cjs/InputPicker/TextBox.js

@@ -0,0 +1,48 @@
+'use client';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteralLoose"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _react = _interopRequireDefault(require("react"));
+var _TagList = _interopRequireDefault(require("./TagList"));
+var _utils = require("../utils");
+var _InputSearch = _interopRequireDefault(require("./InputSearch"));
+var _templateObject;
+var TextBox = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var tags = props.tags,
+    inputProps = props.inputProps,
+    readOnly = props.readOnly,
+    disabled = props.disabled,
+    multiple = props.multiple,
+    onBlur = props.onBlur,
+    onFocus = props.onFocus,
+    onChange = props.onChange,
+    inputValue = props.inputValue,
+    inputRef = props.inputRef,
+    editable = props.editable,
+    showTagList = props.showTagList,
+    rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["tags", "inputProps", "readOnly", "disabled", "multiple", "onBlur", "onFocus", "onChange", "inputValue", "inputRef", "editable", "showTagList"]);
+  var _useClassNames = (0, _utils.useClassNames)('picker'),
+    prefix = _useClassNames.prefix;
+  if (!multiple && disabled) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
+    className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["textbox"]))),
+    ref: ref
+  }, rest), showTagList ? /*#__PURE__*/_react.default.createElement(_TagList.default, null, tags) : null, editable && /*#__PURE__*/_react.default.createElement(_InputSearch.default, (0, _extends2.default)({}, inputProps, {
+    tabIndex: -1,
+    readOnly: readOnly,
+    onBlur: onBlur,
+    onFocus: onFocus,
+    inputRef: inputRef,
+    onChange: onChange,
+    value: inputValue
+  })));
+});
+var _default = TextBox;
+exports.default = _default;

package/cjs/MultiCascader/MultiCascader.js

@@ -13,7 +13,7 @@ var _pick = _interopRequireDefault(require("lodash/pick"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
-var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+var _TreeView = _interopRequireDefault(require("./TreeView"));
 var _Checkbox = _interopRequireDefault(require("../Checkbox"));
 var _utils = require("./utils");
 var _treeUtils = require("../utils/treeUtils");
@@ -334,9 +334,10 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       'cascader-row-focus': item[valueKey] === focusItemValue
     });
     return /*#__PURE__*/_react.default.createElement("div", {
+      role: "treeitem",
+      "aria-disabled": disabled,
       key: key,
       className: itemClasses,
-      "aria-disabled": disabled,
       "data-key": item[valueKey]
     }, /*#__PURE__*/_react.default.createElement(_Checkbox.default, {
       disabled: disabled,
@@ -365,12 +366,13 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     var items = getSearchResult();
     return /*#__PURE__*/_react.default.createElement("div", {
       className: prefix('cascader-search-panel'),
-      "data-layer": 0
+      "data-layer": 0,
+      role: "tree"
     }, items.length ? items.map(renderSearchRow) : /*#__PURE__*/_react.default.createElement("div", {
       className: prefix('none')
     }, locale.noResultsText));
   };
-  var renderDropdownMenu = function renderDropdownMenu(positionProps, speakerRef) {
+  var renderTreeView = function renderTreeView(positionProps, speakerRef) {
     var _ref = positionProps || {},
       left = _ref.left,
       top = _ref.top,
@@ -382,7 +384,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     var classes = merge(className, menuClassName, prefix('cascader-menu', 'multi-cascader-menu', {
       inline: inline
     }));
-    return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
+    return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
       ref: (0, _utils3.mergeRefs)(overlay, speakerRef),
       className: classes,
       style: styles,
@@ -393,8 +395,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       onChange: handleSearch,
       value: searchKeyword,
       inputRef: searchInput
-    }), renderSearchResultPanel(), searchKeyword === '' && /*#__PURE__*/_react.default.createElement(_DropdownMenu.default, {
-      id: id ? id + "-listbox" : undefined,
+    }), renderSearchResultPanel(), searchKeyword === '' && /*#__PURE__*/_react.default.createElement(_TreeView.default, {
       cascade: cascade,
       menuWidth: menuWidth,
       menuHeight: menuHeight,
@@ -444,22 +445,24 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     classes = _usePickerClassName[0],
     usedClassNamePropKeys = _usePickerClassName[1];
   if (inline) {
-    return renderDropdownMenu();
+    return renderTreeView();
   }
   return /*#__PURE__*/_react.default.createElement(_Picker.PickerToggleTrigger, {
+    id: id,
+    popupType: "tree",
+    multiple: true,
     pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),
     ref: trigger,
     placement: placement,
     onEnter: (0, _utils3.createChainedFunction)(handleEntered, onEnter),
     onExited: (0, _utils3.createChainedFunction)(handleExited, onExited),
     onExit: (0, _utils3.createChainedFunction)(onClose, onExit),
-    speaker: renderDropdownMenu
+    speaker: renderTreeView
   }, /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,
     style: style,
     ref: root
   }, /*#__PURE__*/_react.default.createElement(_Picker.PickerToggle, (0, _extends3.default)({}, (0, _omit.default)(rest, [].concat(_Picker.omitTriggerPropKeys, usedClassNamePropKeys)), {
-    id: id,
     as: toggleAs,
     appearance: appearance,
     disabled: disabled,

package/cjs/MultiCascader/{DropdownMenu.d.ts → TreeView.d.ts}

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ItemDataType, WithAsProps, RsRefForwardingComponent } from '../@types/common';
 import { ValueType } from './MultiCascader';
-export interface DropdownMenuProps extends WithAsProps {
+export interface TreeViewProps extends WithAsProps {
     disabledItemValues: ValueType;
     value: ValueType;
     childrenKey: string;
@@ -21,5 +21,5 @@ export interface DropdownMenuProps extends WithAsProps {
 /**
  * TODO: reuse Menu from Cascader for consistent behavior
  */
-declare const DropdownMenu: RsRefForwardingComponent<'div', DropdownMenuProps>;
-export default DropdownMenu;
+declare const TreeView: RsRefForwardingComponent<'div', TreeViewProps>;
+export default TreeView;

package/cjs/MultiCascader/{DropdownMenu.js → TreeView.js}

@@ -1,14 +1,12 @@
 'use client';
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireDefault(require("react"));
 var _Spinner = _interopRequireDefault(require("@rsuite/icons/legacy/Spinner"));
 var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"));
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
@@ -20,7 +18,7 @@ var emptyArray = [];
 /**
  * TODO: reuse Menu from Cascader for consistent behavior
  */
-var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+var TreeView = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
     Component = _props$as === void 0 ? 'div' : _props$as,
     _props$classPrefix = props.classPrefix,
@@ -46,18 +44,24 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     valueKey = _props$valueKey === void 0 ? 'value' : _props$valueKey,
     _props$labelKey = props.labelKey,
     labelKey = _props$labelKey === void 0 ? 'label' : _props$labelKey,
+    style = props.style,
     renderMenuItem = props.renderMenuItem,
     renderMenu = props.renderMenu,
     _onCheck = props.onCheck,
     onSelect = props.onSelect,
-    rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "cascade", "cascadeData", "cascadePaths", "childrenKey", "disabledItemValues", "menuWidth", "menuHeight", "uncheckableItemValues", "value", "valueKey", "labelKey", "renderMenuItem", "renderMenu", "onCheck", "onSelect"]);
+    rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "cascade", "cascadeData", "cascadePaths", "childrenKey", "disabledItemValues", "menuWidth", "menuHeight", "uncheckableItemValues", "value", "valueKey", "labelKey", "style", "renderMenuItem", "renderMenu", "onCheck", "onSelect"]);
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
     merge = _useClassNames.merge,
     prefix = _useClassNames.prefix;
   var classes = merge(className, prefix('items'));
-  var _useCustom = (0, _utils.useCustom)('DropdownMenu'),
+  var _useCustom = (0, _utils.useCustom)(),
     rtl = _useCustom.rtl;
-  var getCascadePaths = (0, _react.useCallback)(function (layer, node) {
+  var _useCombobox = (0, _Picker.useCombobox)(),
+    id = _useCombobox.id,
+    labelId = _useCombobox.labelId,
+    popupType = _useCombobox.popupType,
+    multiple = _useCombobox.multiple;
+  var getCascadePaths = function getCascadePaths(layer, node) {
     var paths = [];
     for (var i = 0; i < cascadeData.length && i < layer; i += 1) {
       if (i < layer - 1 && cascadePaths) {
@@ -66,15 +70,21 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }
     paths.push(node);
     return paths;
-  }, [cascadeData, cascadePaths]);
-  var handleSelect = (0, _react.useCallback)(function (layer, node, event) {
+  };
+  var handleSelect = (0, _utils.useEventCallback)(function (layer, node, event) {
     var cascadePaths = getCascadePaths(layer + 1, node);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, cascadePaths, event);
-  }, [getCascadePaths, onSelect]);
-  var renderCascadeNode = function renderCascadeNode(node, index, layer, focus, uncheckable) {
+  });
+  var renderCascadeNode = function renderCascadeNode(nodeProps) {
+    var node = nodeProps.node,
+      index = nodeProps.index,
+      layer = nodeProps.layer,
+      focus = nodeProps.focus,
+      uncheckable = nodeProps.uncheckable,
+      size = nodeProps.size;
     var children = node[childrenKey];
     var nodeValue = node[valueKey];
-    var nodeLabel = node[labelKey];
+    var label = node[labelKey];
     var disabled = disabledItemValues.some(function (disabledValue) {
       return (0, _utils.shallowEqual)(disabledValue, nodeValue);
     });
@@ -90,8 +100,13 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         valueKey: valueKey
       });
     }
-    return /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenuCheckItem, {
+    return /*#__PURE__*/_react.default.createElement(_Picker.ListCheckItem, {
       as: "li",
+      role: "treeitem",
+      "aria-level": layer + 1,
+      "aria-setsize": size,
+      "aria-posinset": index + 1,
+      "aria-label": typeof label === 'string' ? label : undefined,
       key: layer + "-" + onlyKey,
       disabled: disabled,
       active: active,
@@ -111,73 +126,61 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         return _onCheck === null || _onCheck === void 0 ? void 0 : _onCheck(node, event, checked);
       },
       checkable: !uncheckable
-    }, renderMenuItem ? renderMenuItem(nodeLabel, node) : nodeLabel, children ? /*#__PURE__*/_react.default.createElement(Icon, {
+    }, renderMenuItem ? renderMenuItem(label, node) : label, children ? /*#__PURE__*/_react.default.createElement(Icon, {
       className: prefix('caret'),
       spin: node.loading
     }) : null);
   };
-  var renderCascade = function renderCascade() {
-    var styles = {
-      width: cascadeData.length * menuWidth
-    };
-    var columnStyles = {
-      height: menuHeight,
-      width: menuWidth
-    };
-    var cascadeNodes = cascadeData.map(function (children, layer) {
-      var uncheckableCount = 0;
-      var onlyKey = layer + "_" + children.length;
-      var menu = /*#__PURE__*/_react.default.createElement("ul", {
-        role: "listbox"
-      }, children.map(function (item, index) {
-        var uncheckable = uncheckableItemValues.some(function (uncheckableValue) {
-          return (0, _utils.shallowEqual)(uncheckableValue, item[valueKey]);
-        });
-        if (uncheckable) {
-          uncheckableCount++;
-        }
-        return renderCascadeNode(item, index, layer, cascadePaths[layer] && (0, _utils.shallowEqual)(cascadePaths[layer][valueKey], item[valueKey]), uncheckable);
-      }));
-      var parentNode = cascadePaths[layer - 1];
-      var columnClasses = prefix('column', {
-        'column-uncheckable': uncheckableCount === children.length
+  var columnStyles = {
+    height: menuHeight,
+    width: menuWidth
+  };
+  var cascadeNodes = cascadeData.map(function (children, layer) {
+    var uncheckableCount = 0;
+    var onlyKey = layer + "_" + children.length;
+    var menu = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children.map(function (item, index) {
+      var uncheckable = uncheckableItemValues.some(function (uncheckableValue) {
+        return (0, _utils.shallowEqual)(uncheckableValue, item[valueKey]);
       });
-      return /*#__PURE__*/_react.default.createElement("div", {
-        key: onlyKey,
-        className: columnClasses,
-        "data-layer": layer,
-        style: columnStyles
-      }, renderMenu ? renderMenu(children, menu, parentNode, layer) : menu);
+      if (uncheckable) {
+        uncheckableCount++;
+      }
+      var focus = cascadePaths[layer] && (0, _utils.shallowEqual)(cascadePaths[layer][valueKey], item[valueKey]);
+      return renderCascadeNode({
+        node: item,
+        index: index,
+        layer: layer,
+        focus: focus,
+        uncheckable: uncheckable,
+        size: children.length
+      });
+    }));
+    var parentNode = cascadePaths[layer - 1];
+    var columnClasses = prefix('column', {
+      'column-uncheckable': uncheckableCount === children.length
     });
-    return /*#__PURE__*/_react.default.createElement("div", {
-      style: styles
-    }, cascadeNodes);
-  };
-  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+    return /*#__PURE__*/_react.default.createElement("ul", {
+      role: "group",
+      key: onlyKey,
+      className: columnClasses,
+      "data-layer": layer,
+      style: columnStyles
+    }, renderMenu ? renderMenu(children, menu, parentNode, layer) : menu);
+  });
+  var styles = (0, _extends2.default)({}, style, {
+    width: cascadeData.length * menuWidth
+  });
+  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    role: "tree",
+    id: id + "-" + popupType,
+    "aria-labelledby": labelId,
+    "aria-multiselectable": multiple
+  }, rest, {
     ref: ref,
-    className: classes
-  }), renderCascade());
+    className: classes,
+    style: styles
+  }), cascadeNodes);
 });
-DropdownMenu.displayName = 'DropdownMenu';
-DropdownMenu.propTypes = {
-  classPrefix: _propTypes.default.string,
-  data: _propTypes.default.array,
-  disabledItemValues: _propTypes.default.array,
-  value: _propTypes.default.array,
-  childrenKey: _propTypes.default.string,
-  valueKey: _propTypes.default.string,
-  labelKey: _propTypes.default.string,
-  menuWidth: _propTypes.default.number,
-  menuHeight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-  className: _propTypes.default.string,
-  cascade: _propTypes.default.bool,
-  cascadeData: _propTypes.default.array,
-  cascadePaths: _propTypes.default.array,
-  uncheckableItemValues: _propTypes.default.array,
-  renderMenuItem: _propTypes.default.func,
-  renderMenu: _propTypes.default.func,
-  onSelect: _propTypes.default.func,
-  onCheck: _propTypes.default.func
-};
-var _default = DropdownMenu;
+TreeView.displayName = 'TreeView';
+var _default = TreeView;
 exports.default = _default;