@ringcentral/juno 1.12.4-beta.5847-6a74475d → 1.12.4

package/components/Downshift/utils/useDownshiftTag.js

@@ -0,0 +1,229 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var react_1 = require("react");
+var isString_1 = tslib_1.__importDefault(require("lodash/isString"));
+var uniqueId_1 = tslib_1.__importDefault(require("lodash/uniqueId"));
+var utils_1 = require("@material-ui/core/utils");
+var foundation_1 = require("../../../foundation");
+var DownshiftUtils_1 = require("./DownshiftUtils");
+var DOWNSHIFT_ID_TOKEN = 'rc-chip-';
+/** @inner inner hook work with useDownshift */
+exports.useDownshiftTag = function (_a) {
+    var downshiftId = _a.id, _b = _a.value, selectedItemsProp = _b === void 0 ? [] : _b, onSelectChange = _a.onChange, variant = _a.variant, _c = _a.getOptionLabel, getOptionLabel = _c === void 0 ? DownshiftUtils_1.DEFAULT_GET_OPTION_LABEL : _c, onInputChangeProp = _a.onInputChange, wrapperRef = _a.wrapperRef, inputRef = _a.inputRef, freeSolo = _a.freeSolo, maxFreeSolo = _a.maxFreeSolo, keyToTags = _a.keyToTags, onMaxFreeSolo = _a.onMaxFreeSolo, multiple = _a.multiple, labelProp = _a.label, required = _a.required, disabled = _a.disabled, getStopCreateFreeSolo = _a.getStopCreateFreeSolo, onReset = _a.onReset;
+    var isAutocomplete = variant === 'autocomplete';
+    var isSelectedFromAutocompleteRef = react_1.useRef(false);
+    var _d = tslib_1.__read(utils_1.useControlled({
+        controlled: selectedItemsProp,
+        default: [],
+        name: DownshiftUtils_1.downshiftComponentName,
+    }), 2), tags = _d[0], _setTags = _d[1];
+    var _e = tslib_1.__read(react_1.useState(false), 2), focused = _e[0], setFocused = _e[1];
+    var _f = tslib_1.__read(foundation_1.useRefState(0), 2), focusedIndexRef = _f[0], setFocusedIndex = _f[1];
+    var freeSoloCount = react_1.useMemo(function () { return tags.filter(function (x) { return x.freeSolo; }).length; }, [tags]);
+    var setTags = function (_selectedItems) {
+        _setTags(_selectedItems);
+        onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(_selectedItems);
+        if (isAutocomplete && _selectedItems.length === 1) {
+            var result = getOptionLabel(_selectedItems[0]);
+            onInputChangeProp === null || onInputChangeProp === void 0 ? void 0 : onInputChangeProp(result);
+            isSelectedFromAutocompleteRef.current = true;
+        }
+    };
+    var _focusTag = function (tagToFocus) {
+        var _a;
+        var textFieldElm = wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current;
+        var inputElm = inputRef.current;
+        if (tagToFocus === -1) {
+            inputElm === null || inputElm === void 0 ? void 0 : inputElm.focus();
+        }
+        else {
+            (_a = textFieldElm === null || textFieldElm === void 0 ? void 0 : textFieldElm.querySelector("[data-tag-index=\"" + tagToFocus + "\"]")) === null || _a === void 0 ? void 0 : _a.focus();
+        }
+    };
+    var focusTag = foundation_1.useEventCallback(function (tagToFocus, focus) {
+        if (focus === void 0) { focus = true; }
+        if (focusedIndexRef.current === tagToFocus)
+            return;
+        setFocusedIndex(tagToFocus);
+        if (focus)
+            _focusTag(tagToFocus);
+    });
+    /** when return `true` mean add item success */
+    var checkAndAddFreeSolo = function (_a, e) {
+        var _b = _a === void 0 ? {} : _a, selectedItem = _b.selectedItem, value = _b.value;
+        var _c;
+        var isAddItem = false;
+        var currentValue = value !== null && value !== void 0 ? value : (_c = inputRef.current) === null || _c === void 0 ? void 0 : _c.value;
+        if (!(getStopCreateFreeSolo === null || getStopCreateFreeSolo === void 0 ? void 0 : getStopCreateFreeSolo()) &&
+            !selectedItem &&
+            freeSolo &&
+            currentValue &&
+            currentValue.length > 0) {
+            if (freeSoloCount < maxFreeSolo) {
+                var items = currentValue
+                    .trim()
+                    .split(DownshiftUtils_1.stringArrToRegExp(keyToTags))
+                    .filter(function (x) { return x.trim() !== ''; });
+                var toLength = freeSoloCount + items.length;
+                if (toLength > maxFreeSolo) {
+                    items.splice(-(toLength - maxFreeSolo));
+                    onMaxFreeSolo === null || onMaxFreeSolo === void 0 ? void 0 : onMaxFreeSolo(maxFreeSolo);
+                }
+                if (items.length > 0) {
+                    setTags(tslib_1.__spread(tags, items.map(function (label) {
+                        return ({
+                            id: uniqueId_1.default(DOWNSHIFT_ID_TOKEN),
+                            isSuggestion: false,
+                            freeSolo: true,
+                            label: label,
+                        });
+                    })));
+                    isAddItem = true;
+                }
+            }
+            else {
+                onMaxFreeSolo === null || onMaxFreeSolo === void 0 ? void 0 : onMaxFreeSolo(maxFreeSolo);
+            }
+            onReset === null || onReset === void 0 ? void 0 : onReset(e);
+        }
+        return isAddItem;
+    };
+    var removeTag = function (selectedItem) {
+        var selectedItemIndex = tags.indexOf(selectedItem);
+        if (selectedItemIndex > -1) {
+            setTags(tslib_1.__spread(tags.slice(0, selectedItemIndex), tags.slice(selectedItemIndex + 1)));
+        }
+    };
+    var addTag = function (selectedItem) {
+        // * change to uniqueId
+        if (selectedItem.freeSolo) {
+            if (freeSoloCount < maxFreeSolo) {
+                selectedItem.id = uniqueId_1.default(DOWNSHIFT_ID_TOKEN);
+            }
+            else {
+                onMaxFreeSolo === null || onMaxFreeSolo === void 0 ? void 0 : onMaxFreeSolo(maxFreeSolo);
+                return;
+            }
+        }
+        if (multiple) {
+            setTags(tslib_1.__spread(tags, [selectedItem]));
+        }
+        else {
+            setTags([selectedItem]);
+        }
+    };
+    var handleTagKey = foundation_1.useKeyboardMoveFocus({
+        options: tags,
+        focusedIndexRef: focusedIndexRef,
+        infinite: 'order',
+        onFocusedIndexChange: function (event, toIndex) {
+            focusTag(toIndex);
+            event === null || event === void 0 ? void 0 : event.preventDefault();
+        },
+    }).onKeyFocusedIndexHandle;
+    /**
+     * All Get props methods
+     */
+    var getTagListBoxProps = function (props) {
+        return tslib_1.__assign({ 'aria-label': isString_1.default(labelProp) ? labelProp : undefined, 'aria-required': required || false, 'aria-disabled': disabled || false }, props);
+    };
+    var getTagProps = function (_a) {
+        var index = _a.index, selectedItem = _a.selectedItem, restTagProps = tslib_1.__rest(_a, ["index", "selectedItem"]);
+        var tabIndex = 
+        // * when tag is not focus
+        !focused &&
+            // * and is first item
+            index === 0
+            ? 0
+            : -1;
+        return foundation_1.combineProps({
+            tabIndex: tabIndex,
+            // TODO: wait for input can complete that.
+            // role: 'option',
+            role: 'button',
+            key: downshiftId + "-selected-item-" + index,
+            'data-tag-index': index,
+            'data-item-last': index === tags.length - 1,
+            onClick: function (e) {
+                e.stopPropagation();
+            },
+            onBlur: function () { return setFocused(false); },
+            onFocus: function () {
+                focusTag(index);
+                setFocused(true);
+            },
+            onKeyDown: function (e) {
+                var focusedIndex = focusedIndexRef.current;
+                switch (e.key) {
+                    case 'Backspace':
+                        {
+                            var lengthBeforeDelete = tags.length;
+                            focusTag(
+                            // * when length is 1 mean that will be remove all
+                            lengthBeforeDelete === 1
+                                ? -1
+                                : focusedIndex === 0
+                                    ? 0
+                                    : focusedIndex - 1);
+                            removeTag(selectedItem);
+                        }
+                        break;
+                    case 'Delete':
+                        {
+                            var lengthBeforeDelete = tags.length;
+                            focusTag(
+                            // * when length is 1 mean that will be remove all
+                            lengthBeforeDelete === 1
+                                ? -1
+                                : focusedIndex === tags.length - 1
+                                    ? focusedIndex - 1
+                                    : focusedIndex);
+                            removeTag(selectedItem);
+                        }
+                        break;
+                    default:
+                        handleTagKey(e);
+                        break;
+                }
+            },
+            onDelete: function (e) {
+                // * left button clicked
+                if (e.button === 0) {
+                    removeTag(selectedItem);
+                    setFocused(false);
+                }
+            },
+        }, restTagProps);
+    };
+    return {
+        focused: focused,
+        setFocused: setFocused,
+        tags: tags,
+        isSelectedFromAutocompleteRef: isSelectedFromAutocompleteRef,
+        focusedIndex: focusedIndexRef.current,
+        checkAndAddFreeSolo: checkAndAddFreeSolo,
+        getTagListBoxProps: getTagListBoxProps,
+        getTagProps: getTagProps,
+        focusTag: focusTag,
+        addTag: addTag,
+        clearTags: function () {
+            setTags([]);
+        },
+        blur: function () {
+            if (focusedIndexRef.current !== -1) {
+                focusTag(-1, false);
+            }
+            setFocused(false);
+        },
+        // reset: () => {
+        //   setActiveIndex(-1);
+        // },
+        focusLast: function () {
+            var currTagsLength = tags.length;
+            if (currTagsLength > 0) {
+                focusTag(currTagsLength - 1);
+            }
+        },
+    };
+};

package/components/PortalHost/PortalManager/types.d.ts

@@ -63,7 +63,7 @@ export interface PortalController<P extends {} = {}, F = any, D extends {} = {}>
      */
     readonly data?: D;
 }
-export declare type UpdatePropsHandler<P extends {} = {}> = (preProps?: UncontrolledProps<P>) => UncontrolledProps<P>;
+export declare type UpdatePropsHandler<P extends {} = {}> = (preProps?: UncontrolledProps<P>) => Partial<UncontrolledProps<P>>;
 export declare type ControlledProps<P extends {} = {}, F = undefined> = P & {
     onClose: (feedback?: F) => void;
     open: boolean;

package/es6/components/Buttons/SplitButton/SplitButton.js

@@ -1,7 +1,7 @@
 import { __assign, __makeTemplateObject, __read, __rest } from "tslib";
 import React, { forwardRef, useMemo, useRef, useState, } from 'react';
 import clsx from 'clsx';
-import { checkDefaultPrevented, combineClasses, combineProps, logInDev, omit, styled, useEventCallback, useForkRef, useTheme, useThemeProps, } from '../../../foundation';
+import { checkDefaultPrevented, combineClasses, combineProps, logInDev, omit, styled, useEver, useEventCallback, useForkRef, useTheme, useThemeProps, } from '../../../foundation';
 import { RcMenu } from '../../Menu/Menu';
 import { RcButton } from '../Button';
 import { RcButtonGroup } from '../ButtonGroup';
@@ -25,6 +25,7 @@ var _RcSplitButton = forwardRef(function (inProps, ref) {
     var innerRef = useRef(null);
     var splitRef = useForkRef(innerRef, ref);
     var isMenuOpen = !!anchorEl;
+    var isMenuEverOpen = useEver(isMenuOpen);
     var _h = useMemo(function () {
         var result = combineClasses(RcSplitButtonClasses, classesProp);
         return {
@@ -156,7 +157,7 @@ var _RcSplitButton = forwardRef(function (inProps, ref) {
             React.createElement(RcButton, __assign({}, _ActionButtonProps)),
             React.createElement(RcButton, __assign({ "aria-haspopup": "listbox" }, _ControlButtonProps),
                 React.createElement(StyledArrowIcon, __assign({ open: isMenuOpen, size: variantIs(['round', 'plainIcon']) ? size : toButtonSize }, ArrowIconProps)))),
-        React.createElement(RcMenu, __assign({}, MenuProps, { anchorEl: anchorEl, open: isMenuOpen, onClose: handleClose }), children)));
+        isMenuEverOpen && (React.createElement(RcMenu, __assign({}, MenuProps, { anchorEl: anchorEl, open: isMenuOpen, onClose: handleClose }), children))));
 });
 var RcSplitButton = styled(_RcSplitButton)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  ", "\n"], ["\n  ", "\n"])), splitButtonStyle);
 RcSplitButton.displayName = 'RcSplitButton';

package/es6/components/Downshift/Downshift.js

@@ -62,7 +62,7 @@ var _RcDownshift = memo(forwardRef(function (inProps, ref) {
         onKeyDown: onKeyDownProp,
         disabledItemsHighlightable: disabledItemsHighlightable,
         onGroupExpanded: onGroupExpanded,
-    }), focusInput = _z.focusInput, optionItems = _z.optionItems, optionsGroupList = _z.optionsGroupList, selectedItems = _z.selectedItems, highlightedIndex = _z.highlightedIndex, getToggleButtonProps = _z.getToggleButtonProps, getTagProps = _z.getTagProps, getTagListBoxProps = _z.getTagListBoxProps, getMenuProps = _z.getMenuProps, getPopperProps = _z.getPopperProps, getInputProps = _z.getInputProps, getInputAriaProps = _z.getInputAriaProps, getLabelProps = _z.getLabelProps, getItemProps = _z.getItemProps, isOpen = _z.isOpen, inputValue = _z.inputValue, isTagsFocus = _z.isTagsFocus, activeIndex = _z.activeIndex, setActiveIndex = _z.setActiveIndex, setHighlightedIndex = _z.setHighlightedIndex, onInputChange = _z.onInputChange, keepHighlightedIndex = _z.keepHighlightedIndex, changeHighlightedIndexReason = _z.changeHighlightedIndexReason, closeMenu = _z.closeMenu, openMenu = _z.openMenu, reset = _z.reset, getClearButtonProps = _z.getClearButtonProps, noOptionItem = _z.noOptionItem, getNoOptionsProps = _z.getNoOptionsProps, isKeepHighlightedIndex = _z.isKeepHighlightedIndex, isFocused = _z.isFocused;
+    }), focusInput = _z.focusInput, optionItems = _z.optionItems, optionsGroupList = _z.optionsGroupList, selectedItems = _z.tags, highlightedIndex = _z.highlightedIndex, getToggleButtonProps = _z.getToggleButtonProps, getTagProps = _z.getTagProps, getTagListBoxProps = _z.getTagListBoxProps, getMenuProps = _z.getMenuProps, getPopperProps = _z.getPopperProps, getInputProps = _z.getInputProps, getInputAriaProps = _z.getInputAriaProps, getLabelProps = _z.getLabelProps, getItemProps = _z.getItemProps, isOpen = _z.isOpen, inputValue = _z.inputValue, activeIndex = _z.activeIndex, setActiveIndex = _z.setActiveIndex, setHighlightedIndex = _z.setHighlightedIndex, onInputChange = _z.onInputChange, keepHighlightedIndex = _z.keepHighlightedIndex, changeHighlightedIndexReason = _z.changeHighlightedIndexReason, closeMenu = _z.closeMenu, openMenu = _z.openMenu, reset = _z.reset, getClearButtonProps = _z.getClearButtonProps, noOptionItem = _z.noOptionItem, getNoOptionsProps = _z.getNoOptionsProps, isKeepHighlightedIndex = _z.isKeepHighlightedIndex, isDownshiftFocused = _z.focused;
     var open = Boolean((isOpen || noOptionItem) && textFieldRef.current);
     var _0 = getInputProps(), onBlur = _0.onBlur, InputProps = __rest(_0, ["onBlur"]);
     var helperText = isNew
@@ -124,7 +124,6 @@ var _RcDownshift = memo(forwardRef(function (inProps, ref) {
                     } })));
             });
     })();
-    var isDownshiftFocused = focused !== null && focused !== void 0 ? focused : (isTagsFocus || isFocused ? true : undefined);
     var endAdornment = (toggleButton || clearBtn) && (React.createElement(EndAdornment, null,
         clearBtn && (React.createElement(ClearIconButton, __assign({}, getClearButtonProps(clearButtonProps)))),
         toggleButton && (React.createElement(ArrowDownButton, __assign({ variant: "plain", "aria-hidden": true, color: isDownshiftFocused

package/es6/components/Downshift/SuggestionList/SuggestionList.js

@@ -21,7 +21,7 @@ var SuggestionList = forwardRef(function (inProps, ref) {
     var highlightedIndex = props.highlightedIndex, options = props.options, getItemProps = props.getItemProps, getMenuProps = props.getMenuProps, renderOption = props.renderOption, inputValue = props.inputValue, groupVariant = props.groupVariant, groupExpanded = props.groupExpanded, renderGroup = props.renderGroup, optionsGroupList = props.optionsGroupList, getOptionDisabled = props.getOptionDisabled, MenuItem = props.MenuItem, changeHighlightedIndexReason = props.changeHighlightedIndexReason, isKeepHighlightedIndex = props.isKeepHighlightedIndex, componentsProp = props.components, onUpdatePopper = props.onUpdatePopper, getOptionLabel = props.getOptionLabel, padding = props.padding, _a = props.maxContainerHeight, maxContainerHeight = _a === void 0 ? '100%' : _a, classNameProp = props.className, classesProp = props.classes, rest = __rest(props, ["highlightedIndex", "options", "getItemProps", "getMenuProps", "renderOption", "inputValue", "groupVariant", "groupExpanded", "renderGroup", "optionsGroupList", "getOptionDisabled", "MenuItem", "changeHighlightedIndexReason", "isKeepHighlightedIndex", "components", "onUpdatePopper", "getOptionLabel", "padding", "maxContainerHeight", "className", "classes"]);
     var vlRef = useRef(null);
     var forkVlRef = useForkRef(ref, vlRef);
-    var isTitleGroup = groupVariant === 'normal';
+    var isTitleMode = groupVariant === 'normal';
     var listRef = useRef(null);
     var itemData = options;
     var itemCount = options.length;
@@ -79,7 +79,7 @@ var SuggestionList = forwardRef(function (inProps, ref) {
             changeHighlightedIndexReason !== 'mouse') {
             scrollToHighlightedIndex(prevHighlightedIndex, highlightedIndex, 
             // when title group topHighlightIndex to be 1, first item is group title
-            isTitleGroup ? 1 : 0);
+            isTitleMode ? 1 : 0);
         }
     });
     var handleScrolling = function (scrolling) {
@@ -98,9 +98,8 @@ var SuggestionList = forwardRef(function (inProps, ref) {
         var _b, _c, _d, _e;
         var currGroup = option.group;
         var isGroupTitle = option === (currGroup === null || currGroup === void 0 ? void 0 : currGroup.options[0]);
-        var groupIndex = (optionsGroupList === null || optionsGroupList === void 0 ? void 0 : optionsGroupList.findIndex(function (x) { return x.group === (currGroup === null || currGroup === void 0 ? void 0 : currGroup.group); })) || 0;
         var isFixedGroupExpanded = typeof groupExpanded === 'boolean';
-        var expandIconProps = !isTitleGroup && !isFixedGroupExpanded && isGroupTitle
+        var expandIconProps = !isTitleMode && !isFixedGroupExpanded && isGroupTitle
             ? (_c = (_b = option.group) === null || _b === void 0 ? void 0 : _b.getExpandIconProps) === null || _c === void 0 ? void 0 : _c.call(_b, {
                 className: clsx(classes.toggle, (_a = {},
                     _a[classes.expanded] = (_d = option.group) === null || _d === void 0 ? void 0 : _d.expanded,
@@ -112,7 +111,9 @@ var SuggestionList = forwardRef(function (inProps, ref) {
             className: isGroupTitle ? classes.groupTitle : undefined,
         });
         var selected = highlightedIndex === index;
-        var resultProps = __assign(__assign(__assign({}, option), itemProps), { 'aria-setsize': itemCount - (isTitleGroup ? (optionsGroupList === null || optionsGroupList === void 0 ? void 0 : optionsGroupList.length) || 0 : 0), 'aria-posinset': index - (isTitleGroup ? groupIndex : 0), key: itemProps.id });
+        var resultProps = __assign(__assign(__assign({}, option), itemProps), { key: itemProps.id });
+        var indexInOwnGroup = resultProps.indexInOwnGroup;
+        delete resultProps.indexInOwnGroup;
         // * when item is not disabled, that should check outside is that disabled
         if (!resultProps.freeSolo && !resultProps.disabled && getOptionDisabled) {
             resultProps.disabled = getOptionDisabled(option);
@@ -121,6 +122,7 @@ var SuggestionList = forwardRef(function (inProps, ref) {
             inputValue: inputValue,
             selected: selected,
             index: index,
+            indexInOwnGroup: indexInOwnGroup,
         };
         if (renderGroup && isGroupTitle) {
             return renderGroup(resultProps, __assign(__assign({}, state), { expanded: (_e = option.group) === null || _e === void 0 ? void 0 : _e.expanded, expandIconProps: expandIconProps }));

package/es6/components/Downshift/SuggestionList/utils/useSuggestionList.js

@@ -1,9 +1,8 @@
-import { __read, __rest } from "tslib";
-import { useMemo, useRef } from 'react';
-import uniqueId from 'lodash/uniqueId';
+import { __assign, __read, __rest } from "tslib";
+import { useCallback, useEffect, useMemo, useRef, } from 'react';
 import { useControlled } from '@material-ui/core/utils';
-import { combineProps, useForceUpdate, useKeyboardMoveFocus, useResultRef, } from '../../../../foundation';
-import { DEFAULT_GET_OPTION_LABEL, isItemCanSelected, } from '../../utils';
+import { combineProps, useForceUpdate, useId, useKeyboardMoveFocus, } from '../../../../foundation';
+import { DEFAULT_GET_OPTION_LABEL, isItemCanSelected, } from '../../utils/DownshiftUtils';
 import { useDownshiftGroup } from '../../utils/useDownshiftGroup';
 var DEFAULT_HIGHLIGHTED_INDEX = -1;
 var componentName = 'useSuggestionList';
@@ -11,7 +10,8 @@ var componentName = 'useSuggestionList';
  * provide suggestion list with search function and expandable group with virtualized list
  */
 export var useSuggestionList = function (_a) {
-    var inputValueProp = _a.inputValue, _b = _a.getOptionLabel, getOptionLabel = _b === void 0 ? DEFAULT_GET_OPTION_LABEL : _b, filterOptions = _a.filterOptions, disabledItemsHighlightable = _a.disabledItemsHighlightable, options = _a.options, onInputChangeProp = _a.onInputChange, inputRef = _a.inputRef, onKeyDownProp = _a.onKeyDown, onSelect = _a.onSelect, onClear = _a.onClear, getOptionDisabled = _a.getOptionDisabled, groupBy = _a.groupBy, onGroupExpanded = _a.onGroupExpanded, groupVariant = _a.groupVariant, groupExpanded = _a.groupExpanded, groupDefaultExpanded = _a.groupDefaultExpanded, getExpandIconProps = _a.getExpandIconProps;
+    var id = _a.id, inputValueProp = _a.inputValue, _b = _a.getOptionLabel, getOptionLabel = _b === void 0 ? DEFAULT_GET_OPTION_LABEL : _b, filterOptions = _a.filterOptions, disabledItemsHighlightable = _a.disabledItemsHighlightable, options = _a.options, onInputChangeProp = _a.onInputChange, inputRef = _a.inputRef, onKeyDownProp = _a.onKeyDown, onSelect = _a.onSelect, onClear = _a.onClear, getOptionDisabled = _a.getOptionDisabled, groupBy = _a.groupBy, onGroupExpanded = _a.onGroupExpanded, groupVariant = _a.groupVariant, groupExpanded = _a.groupExpanded, groupDefaultExpanded = _a.groupDefaultExpanded, getExpandIconProps = _a.getExpandIconProps, processFilteredResult = _a.processFilteredResult;
+    var isTitleMode = groupVariant === 'normal';
     var _c = __read(useControlled({
         controlled: inputValueProp,
         default: '',
@@ -22,44 +22,44 @@ export var useSuggestionList = function (_a) {
         setInputValue(newValue);
     };
     var focusInput = function () { var _a; return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); };
-    var suggestionListId = useResultRef(function () {
-        return uniqueId("suggestion-list-");
-    }).current;
-    // * use -2 for us know that is init state, for recalculate defaultHighlightedIndex
+    var currUniqueId = useId(id || 'suggestion-list', !id);
     var highlightedIndexRef = useRef(DEFAULT_HIGHLIGHTED_INDEX);
-    var changeHighlightedIndexReason = useRef();
+    var changeHighlightedIndexReasonRef = useRef();
     var forceUpdate = useForceUpdate();
+    var getFilteredItems = useCallback(function (items) {
+        if (filterOptions) {
+            return filterOptions(items, {
+                inputValue: inputValue,
+                getOptionLabel: getOptionLabel,
+                selectedItems: [],
+            });
+        }
+        return items;
+    }, [filterOptions, getOptionLabel, inputValue]);
     var filteredResult = useMemo(function () {
-        var getFilteredItems = function (items) {
-            if (filterOptions) {
-                return filterOptions(items, {
-                    inputValue: inputValue,
-                    getOptionLabel: getOptionLabel,
-                    selectedItems: [],
-                });
-            }
-            return items;
-        };
         // * only when isOpen calculate the filtered result
         var results = getFilteredItems(options);
+        results = processFilteredResult
+            ? processFilteredResult(results, inputValue)
+            : results;
         return results;
-    }, [filterOptions, getOptionLabel, inputValue, options]);
+    }, [getFilteredItems, inputValue, options, processFilteredResult]);
     var _d = useDownshiftGroup({
-        groupBy: groupBy,
+        id: currUniqueId,
         options: options,
         filteredResult: filteredResult,
-        getExpandIconProps: getExpandIconProps,
         groupExpanded: groupExpanded,
         groupDefaultExpanded: groupDefaultExpanded,
-        onGroupExpanded: onGroupExpanded,
         groupVariant: groupVariant,
+        groupBy: groupBy,
+        getExpandIconProps: getExpandIconProps,
+        onGroupExpanded: onGroupExpanded,
         getOptionDisabled: getOptionDisabled,
-        id: suggestionListId,
     }), groupedResult = _d.groupedResult, handleGroupExpandedChange = _d.handleGroupExpandedChange, optionsGroupList = _d.optionsGroupList;
     var optionItems = groupBy ? groupedResult : filteredResult;
     var setHighlightedIndex = function (index, _a) {
         var _b = _a.reRender, reRender = _b === void 0 ? false : _b, reason = _a.reason;
-        changeHighlightedIndexReason.current = reason;
+        changeHighlightedIndexReasonRef.current = reason;
         if (highlightedIndexRef.current !== index) {
             highlightedIndexRef.current = index;
             if (reRender)
@@ -77,25 +77,25 @@ export var useSuggestionList = function (_a) {
         return ((!!item && item.freeSolo) ||
             (isItemCanSelected(item) && !(getOptionDisabled === null || getOptionDisabled === void 0 ? void 0 : getOptionDisabled(item))));
     };
-    var selectItemFn = function (e, selectedItem) {
+    var selectItem = function (e, selectedItem) {
         if (getIsItemCanSelected(selectedItem)) {
             onSelect === null || onSelect === void 0 ? void 0 : onSelect(e, selectedItem);
             return true;
         }
         return false;
     };
-    var resetState = function () {
+    var clearInput = function () {
         if (inputRef.current && inputRef.current.value.length > 0) {
             updateInputValue('');
         }
     };
     var reset = function (isFocus) {
-        resetState();
+        clearInput();
         onInputChangeProp === null || onInputChangeProp === void 0 ? void 0 : onInputChangeProp('');
         if (isFocus)
             focusInput();
     };
-    var onKeyFocusedIndexHandle = useKeyboardMoveFocus({
+    var _e = useKeyboardMoveFocus({
         options: optionItems,
         focusedIndexRef: highlightedIndexRef,
         infinite: true,
@@ -108,29 +108,44 @@ export var useSuggestionList = function (_a) {
             : function (child) {
                 return !getIsItemCanSelected(child);
             },
-    }).onKeyFocusedIndexHandle;
+    }), onKeyFocusedIndexHandle = _e.onKeyFocusedIndexHandle, getNextFocusableOption = _e.getNextFocusableOption;
     var getItemProps = function (_a) {
-        var item = _a.item, index = _a.index, itemRest = __rest(_a, ["item", "index"]);
-        return combineProps({
-            id: suggestionListId + "-option-" + index,
-            role: 'option',
-            onClick: function (e) {
-                selectItemFn(e, item);
-            },
-            onMouseDown: function (e) {
+        var item = _a.item, _b = _a.index, index = _b === void 0 ? 0 : _b, itemRest = __rest(_a, ["item", "index"]);
+        var currGroup = item.group;
+        var isGroupTitle = item === (currGroup === null || currGroup === void 0 ? void 0 : currGroup.options[0]);
+        var itemCount = optionItems.length;
+        var groupOrder = (currGroup === null || currGroup === void 0 ? void 0 : currGroup.order) || 0;
+        return combineProps(__assign({ id: currUniqueId + "-option-" + index, onClick: function (e) {
+                selectItem(e, item);
+            }, onMouseDown: function (e) {
                 e.preventDefault();
                 e.stopPropagation();
-            },
-            onMouseOver: function () {
-                if (highlightedIndexRef.current !== index) {
+            }, onMouseOver: function () {
+                if (highlightedIndexRef.current !== index &&
+                    getIsItemCanSelected(item)) {
                     setHighlightedIndex(index, { reason: 'mouse', reRender: true });
                 }
-            },
-        }, itemRest);
+            } }, (isTitleMode && isGroupTitle
+            ? {}
+            : {
+                role: 'option',
+                'aria-setsize': itemCount - (isTitleMode ? (optionsGroupList === null || optionsGroupList === void 0 ? void 0 : optionsGroupList.length) || 0 : 0),
+                'aria-posinset': index - (isTitleMode ? groupOrder + 1 : 0),
+            })), itemRest);
+    };
+    var handleF10KeyDown = function (e) {
+        var highlightedIndex = highlightedIndexRef.current;
+        if (e.shiftKey) {
+            var currOption = optionItems[highlightedIndex];
+            var currentGroup = currOption.group;
+            if (currentGroup && currentGroup.options.length > 1) {
+                handleGroupExpandedChange(currentGroup.group);
+            }
+        }
     };
     var getInputProps = function (props) {
         return combineProps({
-            id: suggestionListId + "-input",
+            id: currUniqueId + "-input",
             autoComplete: 'off',
             onChange: function (e) {
                 var changeValue = e.target.value;
@@ -139,18 +154,12 @@ export var useSuggestionList = function (_a) {
             onKeyDown: function (e) {
                 var _a;
                 onKeyDownProp === null || onKeyDownProp === void 0 ? void 0 : onKeyDownProp(e, highlightedIndexRef.current);
-                var highlightedIndex = highlightedIndexRef.current;
                 switch (e.key) {
                     case 'F10':
-                        if (e.shiftKey) {
-                            var currOption = optionItems[highlightedIndex];
-                            var currentGroup = currOption.group;
-                            if (currentGroup && currentGroup.options.length > 1) {
-                                handleGroupExpandedChange(currentGroup.group);
-                            }
-                        }
+                        handleF10KeyDown(e);
                         break;
-                    case 'Enter':
+                    case 'Enter': {
+                        var highlightedIndex = highlightedIndexRef.current;
                         if (e.which === 229)
                             return;
                         if (highlightedIndex !== DEFAULT_HIGHLIGHTED_INDEX) {
@@ -161,13 +170,14 @@ export var useSuggestionList = function (_a) {
                                 onClick === null || onClick === void 0 ? void 0 : onClick(e);
                             }
                             else {
-                                selectItemFn(e, currOption);
+                                selectItem(e, currOption);
                             }
                             e.stopPropagation();
                         }
                         // always preventDefault for not inset all enter into textarea
                         e.preventDefault();
                         break;
+                    }
                     default:
                         onKeyFocusedIndexHandle(e);
                         break;
@@ -181,57 +191,65 @@ export var useSuggestionList = function (_a) {
             onContainerClick: focusInput,
             role: 'combobox',
             'aria-autocomplete': 'list',
-            // TODO
             'aria-expanded': true,
             'aria-haspopup': true,
-            'aria-owns': suggestionListId + "-menu",
+            'aria-owns': currUniqueId + "-menu",
             'aria-activedescendant': highlightedIndexRef.current > -1
-                ? suggestionListId + "-option-" + highlightedIndexRef.current
+                ? currUniqueId + "-option-" + highlightedIndexRef.current
                 : undefined,
         }, props);
     };
     var getLabelProps = function (props) {
         return combineProps({
-            htmlFor: suggestionListId + "-input",
-            id: suggestionListId + "-label",
+            htmlFor: currUniqueId + "-input",
+            id: currUniqueId + "-label",
         }, props);
     };
     var getMenuProps = function (restMenuProps) {
         return combineProps({
-            'aria-labelledby': suggestionListId + "-label",
-            id: suggestionListId + "-menu",
+            'aria-labelledby': currUniqueId + "-label",
+            id: currUniqueId + "-menu",
             role: 'listbox',
         }, restMenuProps);
     };
     var getClearButtonProps = function (props) {
         return combineProps({
-            id: suggestionListId + "-clear-button",
+            id: currUniqueId + "-clear-button",
             onClick: function (e) {
                 onClear === null || onClear === void 0 ? void 0 : onClear(e);
                 reset(true);
             },
         }, props);
     };
-    var resultObj = {
+    useEffect(function () {
+        changeHighlightedIndexReasonRef.current = undefined;
+    });
+    return {
+        reset: reset,
+        clearInput: clearInput,
+        forceUpdate: forceUpdate,
         focusInput: focusInput,
+        updateInputValue: updateInputValue,
+        selectItem: selectItem,
+        onKeyFocusedIndexHandle: onKeyFocusedIndexHandle,
         getClearButtonProps: getClearButtonProps,
         getLabelProps: getLabelProps,
         getMenuProps: getMenuProps,
         getInputProps: getInputProps,
         getInputAriaProps: getInputAriaProps,
         getItemProps: getItemProps,
+        highlightedIndexRef: highlightedIndexRef,
         highlightedIndex: highlightedIndexRef.current,
         optionItems: optionItems,
         inputValue: inputValue,
         onInputChange: handleInputChange,
         setHighlightedIndex: setHighlightedIndex,
-        changeHighlightedIndexReason: changeHighlightedIndexReason.current,
-        reset: reset,
-        forceUpdate: forceUpdate,
+        changeHighlightedIndexReasonRef: changeHighlightedIndexReasonRef,
+        changeHighlightedIndexReason: changeHighlightedIndexReasonRef.current,
         optionsGroupList: optionsGroupList,
-        /** current suggestion list id */
-        id: suggestionListId,
+        /** current unique id */
+        id: currUniqueId,
+        getNextFocusableOption: getNextFocusableOption,
+        handleF10KeyDown: handleF10KeyDown,
     };
-    changeHighlightedIndexReason.current = undefined;
-    return resultObj;
 };

package/es6/components/Downshift/utils/DownshiftUtils.js

@@ -38,3 +38,8 @@ export var RcAutocompleteDefaultFilterOptions = function (options, _a) {
     }
     return options.filter(function (item) { return getOptionLabel === null || getOptionLabel === void 0 ? void 0 : getOptionLabel(item).toLowerCase().startsWith((inputValue === null || inputValue === void 0 ? void 0 : inputValue.toLowerCase()) || ''); });
 };
+export var downshiftComponentName = 'RcDownshift';
+export function stringArrToRegExp(keyToTags) {
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    return new RegExp((keyToTags === null || keyToTags === void 0 ? void 0 : keyToTags.join('|')) || '', 'g');
+}

package/es6/components/Downshift/utils/index.js

@@ -1,3 +1,5 @@
 export * from './DownshiftUtils';
 export * from './useDownshift';
 export * from './useDownshiftError';
+export * from './useDownshiftGroup';
+export * from './useDownshiftTag';