@ringcentral/juno 1.12.4-beta.5864-e73e0ffc → 1.12.5-beta.5892-381bb03b

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';