@ringcentral/juno 1.12.4-beta.5873-31100a7c → 1.12.4-beta.5882-b67a215e

package/components/Downshift/Downshift.d.ts

@@ -157,7 +157,7 @@ declare type RcDownshiftProps<T extends RcDownshiftSelectedItem = RcDownshiftSel
      * render when not have any options,
      * if set that the freeSolo auto add items will not be cover
      */
-    renderNoOptions?: (getNoOptionsProps: (additionProps?: HTMLAttributes<HTMLElement>) => HTMLAttributes<HTMLElement>, additionItem?: RcDownshiftSelectedItem) => React.ReactNode;
+    renderNoOptions?: (getNoOptionsProps: (additionProps?: HTMLAttributes<HTMLElement>) => HTMLAttributes<HTMLElement>, additionItem: RcDownshiftSelectedItem | null) => React.ReactNode;
     /**
      * one of that character, also can be confirm a tag
      * @default

package/components/Downshift/Downshift.js

@@ -66,7 +66,7 @@ var _RcDownshift = react_1.memo(react_1.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 = tslib_1.__rest(_0, ["onBlur"]);
     var helperText = isNew
@@ -128,7 +128,6 @@ var _RcDownshift = react_1.memo(react_1.forwardRef(function (inProps, ref) {
                     } })));
             });
     })();
-    var isDownshiftFocused = focused !== null && focused !== void 0 ? focused : (isTagsFocus || isFocused ? true : undefined);
     var endAdornment = (toggleButton || clearBtn) && (react_1.default.createElement(styles_1.EndAdornment, null,
         clearBtn && (react_1.default.createElement(ClearIconButton_1.ClearIconButton, tslib_1.__assign({}, getClearButtonProps(clearButtonProps)))),
         toggleButton && (react_1.default.createElement(styles_1.ArrowDownButton, tslib_1.__assign({ variant: "plain", "aria-hidden": true, color: isDownshiftFocused

package/components/Downshift/SuggestionList/SuggestionList.js

@@ -23,7 +23,7 @@ var SuggestionList = react_1.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 = tslib_1.__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 = react_1.useRef(null);
     var forkVlRef = foundation_1.useForkRef(ref, vlRef);
-    var isTitleGroup = groupVariant === 'normal';
+    var isTitleMode = groupVariant === 'normal';
     var listRef = react_1.useRef(null);
     var itemData = options;
     var itemCount = options.length;
@@ -81,7 +81,7 @@ var SuggestionList = react_1.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) {
@@ -100,9 +100,8 @@ var SuggestionList = react_1.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_1.default(classes.toggle, (_a = {},
                     _a[classes.expanded] = (_d = option.group) === null || _d === void 0 ? void 0 : _d.expanded,
@@ -114,7 +113,7 @@ var SuggestionList = react_1.forwardRef(function (inProps, ref) {
             className: isGroupTitle ? classes.groupTitle : undefined,
         });
         var selected = highlightedIndex === index;
-        var resultProps = tslib_1.__assign(tslib_1.__assign(tslib_1.__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 = tslib_1.__assign(tslib_1.__assign(tslib_1.__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

package/components/Downshift/SuggestionList/utils/useSuggestionList.d.ts

@@ -1,19 +1,30 @@
 /// <reference types="styled-jsx" />
-import { HTMLAttributes } from 'react';
+import { ChangeEvent, HTMLAttributes } from 'react';
 import { RcIconButtonProps } from '../../../Buttons/IconButton';
 import { RcDownshiftProps } from '../../Downshift';
-import { RcDownshiftGetItemPropsOptions, RcDownshiftHighlightChangeReason, RcDownshiftSelectedItem } from '../../utils';
+import { RcDownshiftSelectedItem } from '../../utils/SelectItem';
+import { RcDownshiftGetItemPropsOptions, RcDownshiftHighlightChangeReason } from '../../utils/useDownshift.interface';
 declare type UseDownshiftParams<T = RcDownshiftSelectedItem> = {
+    /** current suggestion list unique id */
+    id?: string;
     /** that input ref you binding event */
     inputRef: React.RefObject<HTMLInputElement>;
+    /** process filtered options result, let you can handle result after filter */
+    processFilteredResult?: (options: T[], inputValue: string) => T[];
     /** emit when item be select */
     onSelect?: (event: React.ChangeEvent<{}>, selectedItems: T) => void;
 } & Pick<RcDownshiftProps<T>, 'options' | 'value' | 'getOptionLabel' | 'filterOptions' | 'inputValue' | 'onInputChange' | 'onKeyDown' | 'onClear' | 'getOptionDisabled' | 'disabledItemsHighlightable' | 'variant' | 'groupBy' | 'getExpandIconProps' | 'groupExpanded' | 'groupDefaultExpanded' | 'onGroupExpanded' | 'groupVariant'>;
 /**
  * provide suggestion list with search function and expandable group with virtualized list
  */
-export declare const useSuggestionList: <T extends RcDownshiftSelectedItem = RcDownshiftSelectedItem>({ inputValue: inputValueProp, getOptionLabel, filterOptions, disabledItemsHighlightable, options, onInputChange: onInputChangeProp, inputRef, onKeyDown: onKeyDownProp, onSelect, onClear, getOptionDisabled, groupBy, onGroupExpanded, groupVariant, groupExpanded, groupDefaultExpanded, getExpandIconProps, }: UseDownshiftParams<T>) => {
+export declare const useSuggestionList: <T extends RcDownshiftSelectedItem = RcDownshiftSelectedItem>({ id, inputValue: inputValueProp, getOptionLabel, filterOptions, disabledItemsHighlightable, options, onInputChange: onInputChangeProp, inputRef, onKeyDown: onKeyDownProp, onSelect, onClear, getOptionDisabled, groupBy, onGroupExpanded, groupVariant, groupExpanded, groupDefaultExpanded, getExpandIconProps, processFilteredResult, }: UseDownshiftParams<T>) => {
+    reset: (isFocus?: boolean | undefined) => void;
+    clearInput: () => void;
+    forceUpdate: () => void;
     focusInput: () => void | undefined;
+    updateInputValue: (newValue: string) => void;
+    selectItem: (e: ChangeEvent<{}>, selectedItem: T | null) => boolean;
+    onKeyFocusedIndexHandle: (event: import("react").KeyboardEvent<any>) => void;
     getClearButtonProps: (props?: RcIconButtonProps | undefined) => RcIconButtonProps;
     getLabelProps: (props?: Partial<import("@material-ui/core").InputLabelProps> | undefined) => Partial<import("@material-ui/core").InputLabelProps>;
     getMenuProps: (restMenuProps?: HTMLAttributes<HTMLElement> | undefined) => HTMLAttributes<HTMLElement>;
@@ -280,6 +291,7 @@ export declare const useSuggestionList: <T extends RcDownshiftSelectedItem = RcD
         onTransitionEnd?: ((event: import("react").TransitionEvent<HTMLElement>) => void) | undefined;
         onTransitionEndCapture?: ((event: import("react").TransitionEvent<HTMLElement>) => void) | undefined;
     };
+    highlightedIndexRef: import("react").MutableRefObject<number>;
     highlightedIndex: number;
     optionItems: T[];
     inputValue: string;
@@ -288,11 +300,12 @@ export declare const useSuggestionList: <T extends RcDownshiftSelectedItem = RcD
         reRender?: boolean | undefined;
         reason?: RcDownshiftHighlightChangeReason;
     }) => void;
+    changeHighlightedIndexReasonRef: import("react").MutableRefObject<RcDownshiftHighlightChangeReason>;
     changeHighlightedIndexReason: RcDownshiftHighlightChangeReason;
-    reset: (isFocus?: boolean | undefined) => void;
-    forceUpdate: () => void;
-    optionsGroupList: import("../../utils").RcDownshiftGroupedOption<T>[];
-    /** current suggestion list id */
+    optionsGroupList: import("../../utils/SelectItem").RcDownshiftGroupedOption<T>[];
+    /** current unique id */
     id: string;
+    getNextFocusableOption: (index?: number, isInfinite?: any) => number;
+    handleF10KeyDown: (e: import("react").KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
 };
 export {};

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

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var react_1 = require("react");
-var uniqueId_1 = tslib_1.__importDefault(require("lodash/uniqueId"));
 var utils_1 = require("@material-ui/core/utils");
 var foundation_1 = require("../../../../foundation");
-var utils_2 = require("../../utils");
+var DownshiftUtils_1 = require("../../utils/DownshiftUtils");
 var useDownshiftGroup_1 = require("../../utils/useDownshiftGroup");
 var DEFAULT_HIGHLIGHTED_INDEX = -1;
 var componentName = 'useSuggestionList';
@@ -13,7 +12,8 @@ var componentName = 'useSuggestionList';
  * provide suggestion list with search function and expandable group with virtualized list
  */
 exports.useSuggestionList = function (_a) {
-    var inputValueProp = _a.inputValue, _b = _a.getOptionLabel, getOptionLabel = _b === void 0 ? utils_2.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 ? DownshiftUtils_1.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 = tslib_1.__read(utils_1.useControlled({
         controlled: inputValueProp,
         default: '',
@@ -24,44 +24,44 @@ exports.useSuggestionList = function (_a) {
         setInputValue(newValue);
     };
     var focusInput = function () { var _a; return (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); };
-    var suggestionListId = foundation_1.useResultRef(function () {
-        return uniqueId_1.default("suggestion-list-");
-    }).current;
-    // * use -2 for us know that is init state, for recalculate defaultHighlightedIndex
+    var currUniqueId = foundation_1.useId(id || 'suggestion-list', !id);
     var highlightedIndexRef = react_1.useRef(DEFAULT_HIGHLIGHTED_INDEX);
-    var changeHighlightedIndexReason = react_1.useRef();
+    var changeHighlightedIndexReasonRef = react_1.useRef();
     var forceUpdate = foundation_1.useForceUpdate();
+    var getFilteredItems = react_1.useCallback(function (items) {
+        if (filterOptions) {
+            return filterOptions(items, {
+                inputValue: inputValue,
+                getOptionLabel: getOptionLabel,
+                selectedItems: [],
+            });
+        }
+        return items;
+    }, [filterOptions, getOptionLabel, inputValue]);
     var filteredResult = react_1.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_1.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,27 +77,27 @@ exports.useSuggestionList = function (_a) {
     };
     var getIsItemCanSelected = function (item) {
         return ((!!item && item.freeSolo) ||
-            (utils_2.isItemCanSelected(item) && !(getOptionDisabled === null || getOptionDisabled === void 0 ? void 0 : getOptionDisabled(item))));
+            (DownshiftUtils_1.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 = foundation_1.useKeyboardMoveFocus({
+    var _e = foundation_1.useKeyboardMoveFocus({
         options: optionItems,
         focusedIndexRef: highlightedIndexRef,
         infinite: true,
@@ -110,29 +110,44 @@ exports.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 = tslib_1.__rest(_a, ["item", "index"]);
-        return foundation_1.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 = tslib_1.__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 foundation_1.combineProps(tslib_1.__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 foundation_1.combineProps({
-            id: suggestionListId + "-input",
+            id: currUniqueId + "-input",
             autoComplete: 'off',
             onChange: function (e) {
                 var changeValue = e.target.value;
@@ -141,18 +156,12 @@ exports.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) {
@@ -163,13 +172,14 @@ exports.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;
@@ -183,57 +193,65 @@ exports.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 foundation_1.combineProps({
-            htmlFor: suggestionListId + "-input",
-            id: suggestionListId + "-label",
+            htmlFor: currUniqueId + "-input",
+            id: currUniqueId + "-label",
         }, props);
     };
     var getMenuProps = function (restMenuProps) {
         return foundation_1.combineProps({
-            'aria-labelledby': suggestionListId + "-label",
-            id: suggestionListId + "-menu",
+            'aria-labelledby': currUniqueId + "-label",
+            id: currUniqueId + "-menu",
             role: 'listbox',
         }, restMenuProps);
     };
     var getClearButtonProps = function (props) {
         return foundation_1.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 = {
+    react_1.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/components/Downshift/utils/DownshiftUtils.d.ts

@@ -19,3 +19,5 @@ export declare const RcDownshiftDefaultFilterOptions: RcDownshiftProps['filterOp
  * - only filter options by input value when have input value changed
  */
 export declare const RcAutocompleteDefaultFilterOptions: RcDownshiftProps['filterOptions'];
+export declare const downshiftComponentName = "RcDownshift";
+export declare function stringArrToRegExp(keyToTags?: string[]): RegExp;

package/components/Downshift/utils/DownshiftUtils.js

@@ -40,3 +40,9 @@ exports.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()) || ''); });
 };
+exports.downshiftComponentName = 'RcDownshift';
+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');
+}
+exports.stringArrToRegExp = stringArrToRegExp;

package/components/Downshift/utils/SelectItem.d.ts

@@ -50,8 +50,10 @@ export declare type RcDownshiftSelectedItemAdditionProps = {
 export interface RcDownshiftGroupedOption<T = RcDownshiftSelectedItem> {
     /** group key */
     key: number;
-    /** group index */
+    /** group index in all options */
     index: number;
+    /** group order in all group */
+    order: number;
     /** group title */
     group: string;
     /** expanded state */

package/components/Downshift/utils/index.d.ts

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

package/components/Downshift/utils/index.js

@@ -4,3 +4,5 @@ var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./DownshiftUtils"), exports);
 tslib_1.__exportStar(require("./useDownshift"), exports);
 tslib_1.__exportStar(require("./useDownshiftError"), exports);
+tslib_1.__exportStar(require("./useDownshiftGroup"), exports);
+tslib_1.__exportStar(require("./useDownshiftTag"), exports);