rsuite 5.50.0 → 5.51.0

package/esm/Picker/utils.d.ts

@@ -1,33 +1,11 @@
 import React from 'react';
-import { OverlayTriggerHandle } from './PickerToggleTrigger';
-import { TypeAttributes } from '../@types/common';
-import type { ListHandle } from '../Windowing';
 export interface NodeKeys {
     valueKey: string;
     childrenKey: string;
 }
 export declare function createConcatChildrenFunction<T = any>(node: any, nodeValue?: any, nodeKeys?: NodeKeys): (data: T[], children: T[]) => T[];
 export declare function shouldDisplay(label: React.ReactNode, searchKeyword: string): boolean;
-export interface PickerClassNameProps {
-    name?: string;
-    classPrefix: string;
-    className?: string;
-    placement?: TypeAttributes.Placement;
-    appearance?: 'default' | 'subtle';
-    cleanable?: boolean;
-    block?: boolean;
-    disabled?: boolean;
-    countable?: boolean;
-    readOnly?: boolean;
-    plaintext?: boolean;
-    hasValue?: boolean;
-    classes?: any;
-}
-/**
- * The className of the assembled Toggle is on the Picker.
- */
-export declare function usePickerClassName(props: PickerClassNameProps): [string, string[]];
-export interface EventsProps {
+export interface KeyboardEvents {
     down?: React.KeyboardEventHandler;
     up?: React.KeyboardEventHandler;
     enter?: React.KeyboardEventHandler;
@@ -41,76 +19,4 @@ export interface EventsProps {
  * @param event Keyboard event object
  * @param events Event callback functions
  */
-export declare function onMenuKeyDown(event: React.KeyboardEvent, events: EventsProps): void;
-export interface FocusItemValueProps<T = unknown> {
-    target: HTMLElement | null | (() => HTMLElement | null);
-    data?: T[];
-    valueKey?: string;
-    focusableQueryKey?: string;
-    defaultLayer?: number;
-    rtl?: boolean;
-    callback?: (value: any, event: React.KeyboardEvent) => void;
-    getParent?: (node: T) => T | undefined;
-}
-/**
- * A hook that manages the focus state of the option.
- * @param defaultFocusItemValue
- * @param props
- */
-export declare const useFocusItemValue: <T, D>(defaultFocusItemValue: T | null | undefined, props: FocusItemValueProps<D>) => {
-    focusItemValue: T | null | undefined;
-    setFocusItemValue: React.Dispatch<React.SetStateAction<T | null | undefined>>;
-    layer: number;
-    setLayer: React.Dispatch<React.SetStateAction<number>>;
-    keys: any[];
-    setKeys: React.Dispatch<React.SetStateAction<any[]>>;
-    onKeyDown: (event: any) => void;
-};
-export interface ToggleKeyDownEventProps {
-    toggle?: boolean;
-    trigger: React.RefObject<any>;
-    target: React.RefObject<any>;
-    overlay?: React.RefObject<any>;
-    searchInput?: React.RefObject<any>;
-    active?: boolean;
-    readOnly?: boolean;
-    disabled?: boolean;
-    onExit?: (event: any) => void;
-    onKeyDown?: (event: any) => void;
-    onOpen?: () => void;
-    onClose?: () => void;
-    onMenuKeyDown?: (event: any) => void;
-    onMenuPressEnter?: (event: any) => void;
-    onMenuPressBackspace?: (event: any) => void;
-    [key: string]: any;
-}
-/**
- * A hook to control the toggle keyboard operation
- * @param props
- */
-export declare const useToggleKeyDownEvent: (props: ToggleKeyDownEventProps) => (...args: any[]) => any;
-interface SearchOptions<T> {
-    labelKey: string;
-    searchBy?: (keyword: string, label: any, item: T) => boolean;
-    callback?: (keyword: string, data: T[], event: React.SyntheticEvent) => void;
-}
-declare type UseSearchResult<T> = {
-    searchKeyword: string;
-    filteredData: T[];
-    checkShouldDisplay: (item: T, keyword?: string) => boolean;
-    handleSearch: (searchKeyword: string, event: React.SyntheticEvent) => void;
-    resetSearch: () => void;
-};
-/**
- * A hook that handles search filter options
- */
-export declare function useSearch<T>(data: readonly T[], props: SearchOptions<T>): UseSearchResult<T>;
-export interface PickerDependentParameters {
-    triggerRef?: React.RefObject<OverlayTriggerHandle>;
-    rootRef?: React.RefObject<HTMLElement>;
-    overlayRef?: React.RefObject<HTMLElement>;
-    targetRef?: React.RefObject<HTMLElement>;
-    listRef?: React.RefObject<ListHandle>;
-    inline?: boolean;
-}
-export {};
+export declare function onMenuKeyDown(event: React.KeyboardEvent, events: KeyboardEvents): void;

package/esm/Picker/utils.js

@@ -1,15 +1,8 @@
 'use client';
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useState, useCallback, useMemo } from 'react';
-import kebabCase from 'lodash/kebabCase';
+import React from 'react';
 import trim from 'lodash/trim';
-import isFunction from 'lodash/isFunction';
-import isUndefined from 'lodash/isUndefined';
-import omit from 'lodash/omit';
-import find from 'lodash/find';
 import { findNodeOfTree } from '../utils/treeUtils';
-import { KEY_VALUES, useClassNames, shallowEqual, reactToString, placementPolyfill, useEventCallback } from '../utils';
-import { getHeight } from 'dom-lib';
+import { KEY_VALUES, reactToString } from '../utils';
 var defaultNodeKeys = {
   valueKey: 'value',
   childrenKey: 'children'
@@ -44,33 +37,6 @@ export function shouldDisplay(label, searchKeyword) {
   }
   return false;
 }
-/**
- * The className of the assembled Toggle is on the Picker.
- */
-export function usePickerClassName(props) {
-  var _withClassPrefix;
-  var name = props.name,
-    classPrefix = props.classPrefix,
-    className = props.className,
-    placement = props.placement,
-    appearance = props.appearance,
-    cleanable = props.cleanable,
-    block = props.block,
-    disabled = props.disabled,
-    countable = props.countable,
-    readOnly = props.readOnly,
-    plaintext = props.plaintext,
-    hasValue = props.hasValue,
-    rest = _objectWithoutPropertiesLoose(props, ["name", "classPrefix", "className", "placement", "appearance", "cleanable", "block", "disabled", "countable", "readOnly", "plaintext", "hasValue"]);
-  var _useClassNames = useClassNames(classPrefix),
-    withClassPrefix = _useClassNames.withClassPrefix,
-    merge = _useClassNames.merge;
-  var classes = merge(className, withClassPrefix(name, appearance, 'toggle-wrapper', (_withClassPrefix = {}, _withClassPrefix["placement-" + kebabCase(placementPolyfill(placement))] = placement, _withClassPrefix['read-only'] = readOnly, _withClassPrefix['has-value'] = hasValue, _withClassPrefix.cleanable = cleanable, _withClassPrefix.block = block, _withClassPrefix.disabled = disabled, _withClassPrefix.countable = countable, _withClassPrefix.plaintext = plaintext, _withClassPrefix)));
-
-  // Those props that're used for composing the className
-  var usedClassNamePropKeys = Object.keys(omit(props, [].concat(Object.keys(rest || {}), ['disabled', 'readOnly', 'plaintext', 'name'])));
-  return [classes, usedClassNamePropKeys];
-}
 /**
  * Handling keyboard events...
  * @param event Keyboard event object
@@ -119,369 +85,4 @@ export function onMenuKeyDown(event, events) {
       break;
     default:
   }
-}
-/**
- * Checks if the element has a vertical scrollbar.
- */
-function hasVerticalScroll(element) {
-  var scrollHeight = element.scrollHeight,
-    clientHeight = element.clientHeight;
-  return scrollHeight > clientHeight;
-}
-
-/**
- * Checks if the element is within the visible area of the container
- */
-function isVisible(element, container, direction) {
-  if (!hasVerticalScroll(container)) {
-    return true;
-  }
-  var _element$getBoundingC = element.getBoundingClientRect(),
-    top = _element$getBoundingC.top,
-    bottom = _element$getBoundingC.bottom,
-    height = _element$getBoundingC.height;
-  var _container$getBoundin = container.getBoundingClientRect(),
-    containerTop = _container$getBoundin.top,
-    containerBottom = _container$getBoundin.bottom;
-  if (direction === 'top') {
-    return top + height > containerTop;
-  }
-  return bottom - height < containerBottom;
-}
-function scrollTo(container, direction, step) {
-  var scrollTop = container.scrollTop;
-  container.scrollTop = direction === 'top' ? scrollTop - step : scrollTop + step;
-}
-
-/**
- * A hook that manages the focus state of the option.
- * @param defaultFocusItemValue
- * @param props
- */
-export var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue, props) {
-  var _props$valueKey = props.valueKey,
-    valueKey = _props$valueKey === void 0 ? 'value' : _props$valueKey,
-    _props$focusableQuery = props.focusableQueryKey,
-    focusableQueryKey = _props$focusableQuery === void 0 ? '[data-key][aria-disabled="false"]' : _props$focusableQuery,
-    _props$defaultLayer = props.defaultLayer,
-    defaultLayer = _props$defaultLayer === void 0 ? 0 : _props$defaultLayer,
-    data = props.data,
-    target = props.target,
-    rtl = props.rtl,
-    callback = props.callback,
-    _props$getParent = props.getParent,
-    getParent = _props$getParent === void 0 ? function (item) {
-      return item === null || item === void 0 ? void 0 : item.parent;
-    } : _props$getParent;
-  var _useState = useState(defaultFocusItemValue),
-    focusItemValue = _useState[0],
-    setFocusItemValue = _useState[1];
-  var _useState2 = useState(defaultLayer),
-    layer = _useState2[0],
-    setLayer = _useState2[1];
-  var _useState3 = useState([]),
-    keys = _useState3[0],
-    setKeys = _useState3[1];
-  var focusCallback = useCallback(function (value, event) {
-    var menu = isFunction(target) ? target() : target;
-    var focusElement = menu === null || menu === void 0 ? void 0 : menu.querySelector("[data-key=\"" + value + "\"]");
-    focusElement === null || focusElement === void 0 ? void 0 : focusElement.focus();
-    callback === null || callback === void 0 ? void 0 : callback(value, event);
-  }, [callback, target]);
-  var getScrollContainer = useCallback(function () {
-    var menu = isFunction(target) ? target() : target;
-
-    // For Cascader and MutiCascader
-    var subMenu = menu === null || menu === void 0 ? void 0 : menu.querySelector("[data-layer=\"" + layer + "\"]");
-    if (subMenu) {
-      return subMenu;
-    }
-
-    // For SelectPicker、CheckPicker、Autocomplete、InputPicker、TagPicker
-    return menu === null || menu === void 0 ? void 0 : menu.querySelector('[role="listbox"]');
-  }, [layer, target]);
-
-  /**
-   * Get the elements visible in all options.
-   */
-  var getFocusableMenuItems = useCallback(function () {
-    if (!target) {
-      return [];
-    }
-    var currentKeys = keys;
-    if (layer < 1) {
-      var popup = isFunction(target) ? target() : target;
-      var rootMenu = popup === null || popup === void 0 ? void 0 : popup.querySelector('[data-layer="0"]');
-      if (rootMenu) {
-        var _rootMenu$querySelect;
-        currentKeys = Array.from((_rootMenu$querySelect = rootMenu.querySelectorAll(focusableQueryKey)) !== null && _rootMenu$querySelect !== void 0 ? _rootMenu$querySelect : []).map(function (item) {
-          var _item$dataset;
-          return (_item$dataset = item.dataset) === null || _item$dataset === void 0 ? void 0 : _item$dataset.key;
-        });
-      } else {
-        var _popup$querySelectorA;
-        currentKeys = Array.from((_popup$querySelectorA = popup === null || popup === void 0 ? void 0 : popup.querySelectorAll(focusableQueryKey)) !== null && _popup$querySelectorA !== void 0 ? _popup$querySelectorA : []).map(function (item) {
-          var _item$dataset2;
-          return (_item$dataset2 = item.dataset) === null || _item$dataset2 === void 0 ? void 0 : _item$dataset2.key;
-        });
-      }
-    }
-
-    // 1. It is necessary to traverse the `keys` instead of `data` here to preserve the order of the array.
-    // 2. The values ​​in `keys` are all string, so the corresponding value of `data` should also be converted to string
-    return currentKeys.map(function (key) {
-      return find(data, function (i) {
-        return "" + i[valueKey] === key;
-      });
-    });
-  }, [data, focusableQueryKey, keys, target, valueKey, layer]);
-
-  /**
-   * Get the index of the focus item.
-   */
-  var findFocusItemIndex = useCallback(function (callback) {
-    var items = getFocusableMenuItems();
-    for (var i = 0; i < items.length; i += 1) {
-      var _items$i;
-      if (shallowEqual(focusItemValue, (_items$i = items[i]) === null || _items$i === void 0 ? void 0 : _items$i[valueKey])) {
-        callback(items, i);
-        return;
-      }
-    }
-    callback(items, -1);
-  }, [focusItemValue, getFocusableMenuItems, valueKey]);
-  var scrollListItem = useCallback(function (direction, itemValue, willOverflow) {
-    var container = getScrollContainer();
-    var item = container === null || container === void 0 ? void 0 : container.querySelector("[data-key=\"" + itemValue + "\"]");
-    if (willOverflow && container) {
-      var scrollHeight = container.scrollHeight,
-        clientHeight = container.clientHeight;
-      container.scrollTop = direction === 'top' ? scrollHeight - clientHeight : 0;
-      return;
-    }
-    if (item && container) {
-      if (!isVisible(item, container, direction)) {
-        var height = getHeight(item);
-        scrollTo(container, direction, height);
-      }
-    }
-  }, [getScrollContainer]);
-  var focusNextMenuItem = useCallback(function (event) {
-    findFocusItemIndex(function (items, index) {
-      var willOverflow = index + 2 > items.length;
-      var nextIndex = willOverflow ? 0 : index + 1;
-      var focusItem = items[nextIndex];
-      if (!isUndefined(focusItem)) {
-        setFocusItemValue(focusItem[valueKey]);
-        focusCallback(focusItem[valueKey], event);
-        scrollListItem('bottom', focusItem[valueKey], willOverflow);
-      }
-    });
-  }, [focusCallback, findFocusItemIndex, scrollListItem, valueKey]);
-  var focusPrevMenuItem = useCallback(function (event) {
-    findFocusItemIndex(function (items, index) {
-      var willOverflow = index === 0;
-      var nextIndex = willOverflow ? items.length - 1 : index - 1;
-      var focusItem = items[nextIndex];
-      if (!isUndefined(focusItem)) {
-        setFocusItemValue(focusItem[valueKey]);
-        focusCallback(focusItem[valueKey], event);
-        scrollListItem('top', focusItem[valueKey], willOverflow);
-      }
-    });
-  }, [focusCallback, findFocusItemIndex, scrollListItem, valueKey]);
-  var getSubMenuKeys = useCallback(function (nextLayer) {
-    var menu = isFunction(target) ? target() : target;
-    var subMenu = menu === null || menu === void 0 ? void 0 : menu.querySelector("[data-layer=\"" + nextLayer + "\"]");
-    if (subMenu) {
-      var _Array$from;
-      return (_Array$from = Array.from(subMenu.querySelectorAll(focusableQueryKey))) === null || _Array$from === void 0 ? void 0 : _Array$from.map(function (item) {
-        var _item$dataset3;
-        return (_item$dataset3 = item.dataset) === null || _item$dataset3 === void 0 ? void 0 : _item$dataset3.key;
-      });
-    }
-    return null;
-  }, [focusableQueryKey, target]);
-  var focusNextLevelMenu = useCallback(function (event) {
-    var nextLayer = layer + 1;
-    var nextKeys = getSubMenuKeys(nextLayer);
-    if (nextKeys) {
-      setKeys(nextKeys);
-      setLayer(nextLayer);
-      setFocusItemValue(nextKeys[0]);
-      focusCallback(nextKeys[0], event);
-    }
-  }, [focusCallback, getSubMenuKeys, layer]);
-  var focusPrevLevelMenu = useCallback(function (event) {
-    var nextLayer = layer - 1;
-    var nextKeys = getSubMenuKeys(nextLayer);
-    if (nextKeys) {
-      var _getParent;
-      setKeys(nextKeys);
-      setLayer(nextLayer);
-      var focusItem = findNodeOfTree(data, function (item) {
-        return item[valueKey] === focusItemValue;
-      });
-      var parentItemValue = (_getParent = getParent(focusItem)) === null || _getParent === void 0 ? void 0 : _getParent[valueKey];
-      if (parentItemValue) {
-        setFocusItemValue(parentItemValue);
-        focusCallback(parentItemValue, event);
-      }
-    }
-  }, [focusCallback, data, focusItemValue, getParent, getSubMenuKeys, layer, valueKey]);
-  var handleKeyDown = useCallback(function (event) {
-    var _onMenuKeyDown;
-    onMenuKeyDown(event, (_onMenuKeyDown = {
-      down: focusNextMenuItem,
-      up: focusPrevMenuItem
-    }, _onMenuKeyDown[rtl ? 'left' : 'right'] = focusNextLevelMenu, _onMenuKeyDown[rtl ? 'right' : 'left'] = focusPrevLevelMenu, _onMenuKeyDown));
-  }, [focusNextLevelMenu, focusNextMenuItem, focusPrevLevelMenu, focusPrevMenuItem, rtl]);
-  return {
-    focusItemValue: focusItemValue,
-    setFocusItemValue: setFocusItemValue,
-    layer: layer,
-    setLayer: setLayer,
-    keys: keys,
-    setKeys: setKeys,
-    onKeyDown: handleKeyDown
-  };
-};
-/**
- * A hook to control the toggle keyboard operation
- * @param props
- */
-export var useToggleKeyDownEvent = function useToggleKeyDownEvent(props) {
-  var _props$toggle = props.toggle,
-    toggle = _props$toggle === void 0 ? true : _props$toggle,
-    trigger = props.trigger,
-    target = props.target,
-    overlay = props.overlay,
-    searchInput = props.searchInput,
-    active = props.active,
-    readOnly = props.readOnly,
-    disabled = props.disabled,
-    loading = props.loading,
-    onExit = props.onExit,
-    onOpen = props.onOpen,
-    onClose = props.onClose,
-    onKeyDown = props.onKeyDown,
-    onMenuKeyDown = props.onMenuKeyDown,
-    onMenuPressEnter = props.onMenuPressEnter,
-    onMenuPressBackspace = props.onMenuPressBackspace;
-  var handleClose = useEventCallback(function () {
-    var _trigger$current, _trigger$current$clos, _trigger$current2, _trigger$current2$foc;
-    (_trigger$current = trigger.current) === null || _trigger$current === void 0 ? void 0 : (_trigger$current$clos = _trigger$current.close) === null || _trigger$current$clos === void 0 ? void 0 : _trigger$current$clos.call(_trigger$current);
-
-    // The focus is on the trigger button after closing
-    (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : (_trigger$current2$foc = _trigger$current2.focus) === null || _trigger$current2$foc === void 0 ? void 0 : _trigger$current2$foc.call(_trigger$current2);
-    onClose === null || onClose === void 0 ? void 0 : onClose();
-  });
-  var handleOpen = useEventCallback(function () {
-    var _trigger$current3, _trigger$current3$ope;
-    (_trigger$current3 = trigger.current) === null || _trigger$current3 === void 0 ? void 0 : (_trigger$current3$ope = _trigger$current3.open) === null || _trigger$current3$ope === void 0 ? void 0 : _trigger$current3$ope.call(_trigger$current3);
-    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
-  });
-  var handleToggleDropdown = useEventCallback(function () {
-    if (active) {
-      handleClose();
-      return;
-    }
-    handleOpen();
-  });
-  var onToggle = useEventCallback(function (event) {
-    // Keyboard events should not be processed when readOnly and disabled are set.
-    if (readOnly || disabled || loading) {
-      return;
-    }
-    if (event.target === (target === null || target === void 0 ? void 0 : target.current)) {
-      // enter
-      if (toggle && event.key === KEY_VALUES.ENTER) {
-        handleToggleDropdown();
-      }
-
-      // delete
-      if (event.key === KEY_VALUES.BACKSPACE) {
-        onExit === null || onExit === void 0 ? void 0 : onExit(event);
-      }
-    }
-    if (overlay !== null && overlay !== void 0 && overlay.current) {
-      // The keyboard operation callback on the menu.
-      onMenuKeyDown === null || onMenuKeyDown === void 0 ? void 0 : onMenuKeyDown(event);
-      if (event.key === KEY_VALUES.ENTER) {
-        onMenuPressEnter === null || onMenuPressEnter === void 0 ? void 0 : onMenuPressEnter(event);
-      }
-
-      /**
-       * There is no callback when typing the Backspace key in the search box.
-       * The default is to remove search keywords
-       */
-      if (event.key === KEY_VALUES.BACKSPACE && event.target !== (searchInput === null || searchInput === void 0 ? void 0 : searchInput.current)) {
-        onMenuPressBackspace === null || onMenuPressBackspace === void 0 ? void 0 : onMenuPressBackspace(event);
-      }
-
-      // The search box gets focus when typing characters and numbers.
-      if (event.key.length === 1 && /\w/.test(event.key)) {
-        var _event$target;
-        // Exclude Input
-        // eg: <SelectPicker renderExtraFooter={() => <Input />} />
-        if (((_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.tagName) !== 'INPUT') {
-          var _searchInput$current;
-          searchInput === null || searchInput === void 0 ? void 0 : (_searchInput$current = searchInput.current) === null || _searchInput$current === void 0 ? void 0 : _searchInput$current.focus();
-        }
-      }
-    }
-    if (event.key === KEY_VALUES.ESC || event.key === KEY_VALUES.TAB) {
-      handleClose();
-    }
-
-    // Native event callback
-    onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
-  });
-  return onToggle;
-};
-/**
- * A hook that handles search filter options
- */
-export function useSearch(data, props) {
-  var labelKey = props.labelKey,
-    searchBy = props.searchBy,
-    callback = props.callback; // Use search keywords to filter options.
-  var _useState4 = useState(''),
-    searchKeyword = _useState4[0],
-    setSearchKeyword = _useState4[1];
-  var resetSearch = useCallback(function () {
-    setSearchKeyword('');
-  }, []);
-
-  /**
-   * Index of keyword  in `label`
-   * @param {node} label
-   */
-  var checkShouldDisplay = useCallback(function (item, keyword) {
-    var checkValue = typeof item === 'object' ? item === null || item === void 0 ? void 0 : item[labelKey] : String(item);
-    var _keyword = isUndefined(keyword) ? searchKeyword : keyword;
-    if (typeof searchBy === 'function') {
-      return searchBy(_keyword, checkValue, item);
-    }
-    return shouldDisplay(checkValue, _keyword);
-  }, [labelKey, searchBy, searchKeyword]);
-  var filteredData = useMemo(function () {
-    return data.filter(function (item) {
-      return checkShouldDisplay(item, searchKeyword);
-    });
-  }, [checkShouldDisplay, data, searchKeyword]);
-  var handleSearch = function handleSearch(searchKeyword, event) {
-    var filteredData = data.filter(function (item) {
-      return checkShouldDisplay(item, searchKeyword);
-    });
-    setSearchKeyword(searchKeyword);
-    callback === null || callback === void 0 ? void 0 : callback(searchKeyword, filteredData, event);
-  };
-  return {
-    searchKeyword: searchKeyword,
-    filteredData: filteredData,
-    checkShouldDisplay: checkShouldDisplay,
-    handleSearch: handleSearch,
-    resetSearch: resetSearch
-  };
 }

package/esm/SelectPicker/SelectPicker.js

@@ -12,7 +12,7 @@ import isFunction from 'lodash/isFunction';
 import omit from 'lodash/omit';
 import { createChainedFunction, useCustom, useClassNames, useControlled, useEventCallback, mergeRefs, shallowEqual } from '../utils';
 import { getDataGroupBy } from '../utils/getDataGroupBy';
-import { DropdownMenu, DropdownMenuItem, PickerToggle, PickerToggleTrigger, PickerOverlay, SearchBar, useFocusItemValue, usePickerClassName, useSearch, useToggleKeyDownEvent, usePickerRef, pickTriggerPropKeys, omitTriggerPropKeys, listPickerPropTypes } from '../Picker';
+import { Listbox, ListItem, PickerToggle, PickerToggleTrigger, PickerPopup, SearchBar, useFocusItemValue, usePickerClassName, useSearch, useToggleKeyDownEvent, usePickerRef, pickTriggerPropKeys, omitTriggerPropKeys, listPickerPropTypes } from '../Picker';
 var emptyArray = [];
 /**
  * The `SelectPicker` component is used to select an item from a list of data.
@@ -203,7 +203,7 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       hasValue = false;
     }
   }
-  var renderDropdownMenu = function renderDropdownMenu(positionProps, speakerRef) {
+  var renderPopup = function renderPopup(positionProps, speakerRef) {
     var left = positionProps.left,
       top = positionProps.top,
       className = positionProps.className;
@@ -220,8 +220,7 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     } else if (typeof sort === 'function') {
       items = items.sort(sort(false));
     }
-    var menu = items.length ? /*#__PURE__*/React.createElement(DropdownMenu, {
-      id: id ? id + "-listbox" : undefined,
+    var menu = items.length ? /*#__PURE__*/React.createElement(Listbox, {
       listProps: listProps,
       listRef: list,
       disabledItemValues: disabledItemValues,
@@ -231,8 +230,8 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       renderMenuItem: renderMenuItem,
       maxHeight: menuMaxHeight,
       classPrefix: 'picker-select-menu',
-      dropdownMenuItemClassPrefix: 'picker-select-menu-item',
-      dropdownMenuItemAs: DropdownMenuItem,
+      listItemClassPrefix: 'picker-select-menu-item',
+      listItemAs: ListItem,
       activeItemValues: [value],
       focusItemValue: focusItemValue,
       data: items
@@ -247,7 +246,7 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }) : /*#__PURE__*/React.createElement("div", {
       className: prefix(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["none"])))
     }, locale === null || locale === void 0 ? void 0 : locale.noResultsText);
-    return /*#__PURE__*/React.createElement(PickerOverlay, {
+    return /*#__PURE__*/React.createElement(PickerPopup, {
       ref: mergeRefs(overlay, speakerRef),
       autoWidth: menuAutoWidth,
       className: classes,
@@ -271,18 +270,18 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     classes = _usePickerClassName[0],
     usedClassNamePropKeys = _usePickerClassName[1];
   return /*#__PURE__*/React.createElement(PickerToggleTrigger, {
+    id: id,
     pickerProps: pick(props, pickTriggerPropKeys),
     ref: trigger,
     placement: placement,
     onEntered: createChainedFunction(handleEntered, onEntered),
     onExited: createChainedFunction(handleExited, onExited),
-    speaker: renderDropdownMenu
+    speaker: renderPopup
   }, /*#__PURE__*/React.createElement(Component, {
     className: classes,
     style: style,
     ref: root
   }, /*#__PURE__*/React.createElement(PickerToggle, _extends({}, omit(rest, [].concat(omitTriggerPropKeys, usedClassNamePropKeys)), {
-    id: id,
     ref: target,
     appearance: appearance,
     onClean: createChainedFunction(handleClean, onClean),
@@ -292,6 +291,7 @@ var SelectPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     cleanable: cleanable && !disabled,
     hasValue: hasValue,
     inputValue: value !== null && value !== void 0 ? value : '',
+    focusItemValue: focusItemValue,
     active: active,
     placement: placement
   }), selectedElement || (locale === null || locale === void 0 ? void 0 : locale.placeholder))));

package/esm/TagInput/index.js

@@ -38,6 +38,10 @@ var TagInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(InputPickerContext.Provider, {
     value: contextValue
   }, /*#__PURE__*/React.createElement(InputPicker, _extends({}, rest, {
+    "aria-haspopup": false,
+    "aria-expanded": undefined,
+    "aria-controls": undefined,
+    "aria-keyshortcuts": trigger,
     value: value,
     defaultValue: defaultValue,
     data: data,

package/esm/TreePicker/TreeNode.d.ts

@@ -23,8 +23,8 @@ export interface TreeNodeProps extends WithAsProps {
     style?: React.CSSProperties;
     onExpand?: (nodeData: any) => void;
     onSelect?: (nodeData: any, event: React.SyntheticEvent) => void;
-    onRenderTreeIcon?: (nodeData: any) => React.ReactNode;
-    onRenderTreeNode?: (nodeData: any) => React.ReactNode;
+    renderTreeIcon?: (nodeData: any) => React.ReactNode;
+    renderTreeNode?: (nodeData: any) => React.ReactNode;
     onDragStart?: (data: any, event: React.DragEvent<any>) => void;
     onDragEnter?: (data: any, event: React.DragEvent<any>) => void;
     onDragOver?: (data: any, event: React.DragEvent<any>) => void;