@sprinklrjs/spaceweb 11.0.0 → 12.33.2-rc.1

package/asyncSelect/hooks/useAsyncSelect.js

@@ -0,0 +1,196 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useAsyncSelect = void 0;
+var tslib_1 = require("tslib");
+var react_1 = require("react");
+var keyBy_1 = (0, tslib_1.__importDefault)(require("lodash/keyBy"));
+var reduce_1 = (0, tslib_1.__importDefault)(require("lodash/reduce"));
+var isObject_1 = (0, tslib_1.__importDefault)(require("lodash/isObject"));
+//hooks
+var locale_1 = require("../../locale");
+var useLatest_1 = require("../../hooks/useLatest");
+var useCombinedRef_1 = (0, tslib_1.__importDefault)(require("../../hooks/useCombinedRef"));
+var useInputChangeHandler_1 = require("./useInputChangeHandler");
+var useAsyncOptionHandlers_1 = require("./useAsyncOptionHandlers");
+var useResolveSelectedOptions_1 = require("./useResolveSelectedOptions");
+//helpers
+var helpers_1 = require("../helpers");
+var utils_1 = require("../../baseui/select/utils");
+var helpers_2 = require("../../helpers");
+//utils
+var overrides_1 = require("../../overrides");
+var default_props_1 = (0, tslib_1.__importDefault)(require("../../select/default-props"));
+var constants_1 = require("../../select/constants");
+var EMPTY_OBJ = {};
+var useAsyncSelect = function (params) {
+    var loadOptions = params.loadOptions, searchingText = params.searchingText, paginationBuffer = params.paginationBuffer, debounceInterval = params.debounceInterval, resolveSelectedOptions = params.resolveSelectedOptions, _a = params.minimumInput, minimumInput = _a === void 0 ? 0 : _a, _b = params.loadOnMount, loadOnMount = _b === void 0 ? false : _b, _c = params.loadOnFocus, loadOnFocus = _c === void 0 ? false : _c, _d = params.initialOptions, initialOptions = _d === void 0 ? EMPTY_OBJ : _d, _e = params.listenAllInputChanges, listenAllInputChanges = _e === void 0 ? true : _e, groupConfig = params.groupConfig, resolveValuesOnUpdate = params.resolveValuesOnUpdate, hideUnresolvedValues = params.hideUnresolvedValues, _f = params.moveSelectedOptionsToTop, moveSelectedOptionsToTop = _f === void 0 ? false : _f, 
+    //selectProps
+    onInputChange = params.onInputChange, noResultsMsg = params.noResultsMsg, overrides = params.overrides, groupedValue = params.value, controlRef = params.controlRef, propsInputRef = params.inputRef, propsCreateOption = params.createOption, _g = params.valueKey, valueKey = _g === void 0 ? default_props_1.default.valueKey : _g, _h = params.labelKey, labelKey = _h === void 0 ? default_props_1.default.labelKey : _h, propsOnChange = params.onChange, onOpen = params.onOpen, filterOptions = params.filterOptions, restSelectProps = (0, tslib_1.__rest)(params, ["loadOptions", "searchingText", "paginationBuffer", "debounceInterval", "resolveSelectedOptions", "minimumInput", "loadOnMount", "loadOnFocus", "initialOptions", "listenAllInputChanges", "groupConfig", "resolveValuesOnUpdate", "hideUnresolvedValues", "moveSelectedOptionsToTop", "onInputChange", "noResultsMsg", "overrides", "value", "controlRef", "inputRef", "createOption", "valueKey", "labelKey", "onChange", "onOpen", "filterOptions"]);
+    var locale = (0, locale_1.useLocale)();
+    var loadOnMountRef = (0, useLatest_1.useLatest)(loadOnMount);
+    var _j = (0, tslib_1.__read)((0, react_1.useState)(function () {
+        return (0, helpers_1.mergeOptions)(initialOptions, (0, helpers_1.initGroupOptions)(groupConfig));
+    }), 2), options = _j[0], setOptions = _j[1];
+    var sortedOptionsRef = (0, react_1.useRef)({});
+    var _k = (0, tslib_1.__read)((0, react_1.useState)(function () {
+        return (0, keyBy_1.default)((0, utils_1.normalizeOptions)(initialOptions), valueKey);
+    }), 2), allOptionsMap = _k[0], setAllOptionsMap = _k[1];
+    var _l = (0, tslib_1.__read)((0, react_1.useState)(null), 2), inputElement = _l[0], setInputElement = _l[1];
+    var inputRef = (0, useLatest_1.useLatest)(inputElement);
+    var combinedRef = (0, useCombinedRef_1.default)(setInputElement, propsInputRef);
+    var rootRef = (0, react_1.useRef)(null);
+    var popoverRef = (0, react_1.useRef)(null);
+    var _m = (0, useResolveSelectedOptions_1.useResolveSelectedOptions)({
+        groupedValue: groupedValue,
+        valueKey: valueKey,
+        inputRef: inputRef,
+        allOptionsMap: allOptionsMap,
+        sortedOptionsRef: sortedOptionsRef,
+        setOptions: setOptions,
+        setAllOptionsMap: setAllOptionsMap,
+        resolveValuesOnUpdate: resolveValuesOnUpdate,
+        resolveSelectedOptions: resolveSelectedOptions,
+    }), unresolvedGroupedValueKeys = _m.unresolvedGroupedValueKeys, isResolvingValues = _m.isResolvingValues;
+    var _o = (0, tslib_1.__read)((0, react_1.useState)(loadOnMount), 2), _isLoading = _o[0], setIsLoading = _o[1];
+    var isLoading = isResolvingValues || _isLoading;
+    var unresolvedValueKeysRef = (0, react_1.useRef)([]);
+    var selectedOptions = (0, react_1.useMemo)(function () {
+        if (!groupedValue) {
+            return undefined;
+        }
+        unresolvedValueKeysRef.current = [];
+        var groupedValueObject = (0, reduce_1.default)(groupedValue, function (acc, values, groupId) {
+            acc[groupId] = (values || []).flatMap(function (valueObjOrId) {
+                var _a, _b;
+                var valueId = (0, isObject_1.default)(valueObjOrId) ? valueObjOrId[valueKey] : valueObjOrId;
+                var isResolving = isResolvingValues && unresolvedGroupedValueKeys[groupId].includes(valueId);
+                var valueObject = (0, isObject_1.default)(valueObjOrId)
+                    ? valueObjOrId
+                    : (_a = {},
+                        _a[valueKey] = valueId,
+                        _a[labelKey] = valueId,
+                        _a);
+                var isUnresolved = !allOptionsMap[valueId];
+                var resolvedObject = isUnresolved ? valueObject : (0, tslib_1.__assign)((0, tslib_1.__assign)({}, valueObject), allOptionsMap[valueId]);
+                if (isResolving) {
+                    return [(0, tslib_1.__assign)((0, tslib_1.__assign)({}, resolvedObject), (_b = {}, _b[constants_1.LOADING_KEY] = true, _b))];
+                }
+                if (isUnresolved && hideUnresolvedValues) {
+                    unresolvedValueKeysRef.current.push({ id: valueId, groupId: groupId });
+                    return [];
+                }
+                return [resolvedObject];
+            });
+            return acc;
+        }, {});
+        return (0, utils_1.normalizeOptions)(groupedValueObject);
+    }, 
+    // All options map needs to be present in the dependency list so that the values get recomputed when
+    // the resolved options have been fetched
+    [
+        groupedValue,
+        valueKey,
+        isResolvingValues,
+        unresolvedGroupedValueKeys,
+        labelKey,
+        allOptionsMap,
+        hideUnresolvedValues,
+    ]);
+    var _p = (0, useAsyncOptionHandlers_1.useAsyncOptionHandlers)({
+        valueKey: valueKey,
+        isLoading: isLoading,
+        minimumInput: minimumInput,
+        paginationBuffer: paginationBuffer,
+        inputRef: inputRef,
+        setAllOptionsMap: setAllOptionsMap,
+        setIsLoading: setIsLoading,
+        sortedOptionsRef: sortedOptionsRef,
+        setOptions: setOptions,
+        loadOptions: loadOptions,
+        createOption: propsCreateOption,
+        groupConfig: groupConfig,
+        selectedOptions: selectedOptions,
+        moveSelectedOptionsToTop: moveSelectedOptionsToTop,
+    }), fetchOptions = _p.fetchOptions, onPaginate = _p.onPaginate, inputChangeHandlerToDebounce = _p.onInputChange, createOption = _p.createOption, resultCountMap = _p.resultCountMap;
+    var _onInputChange = (0, useInputChangeHandler_1.useInputChangeHandler)({
+        inputElement: inputElement,
+        listenAllInputChanges: listenAllInputChanges,
+        onInputChange: onInputChange,
+        inputChangeHandlerToDebounce: inputChangeHandlerToDebounce,
+        debounceInterval: debounceInterval,
+    });
+    /************************************************ HANDLING FOCUS ****************************************************/
+    var handleFocus = (0, react_1.useCallback)(function (event) {
+        var _a, _b;
+        /**
+         * https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent/relatedTarget
+         * event.relatedTarget points to last focused element
+         */
+        var lastFocusedNode = event.relatedTarget;
+        if (loadOnFocus &&
+            !((_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.contains(lastFocusedNode)) &&
+            !((_b = popoverRef.current) === null || _b === void 0 ? void 0 : _b.contains(lastFocusedNode))) {
+            inputChangeHandlerToDebounce();
+        }
+    }, [loadOnFocus, inputChangeHandlerToDebounce]);
+    /******************************************* HANDLING FETCH ON MOUNT ************************************************/
+    (0, react_1.useEffect)(function () {
+        if (loadOnMountRef.current) {
+            fetchOptions(groupConfig.map(function (_a) {
+                var id = _a.id;
+                return ({ group: id, pageNumber: 0 });
+            }));
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- only want to load the options on first mount
+    }, []);
+    /********************************************************************************************************************/
+    var inputText = (0, helpers_1.getInputValue)(inputRef), adaptedNoResultsMsg = (0, helpers_1.getNoResultsMsg)({
+        isLoading: isLoading,
+        noResultsMsg: noResultsMsg,
+        inputText: inputText,
+        minimumInput: minimumInput,
+        searchingText: searchingText !== null && searchingText !== void 0 ? searchingText : locale.asyncSelect.searchingText,
+        emptyInputMsg: locale.asyncSelect.emptyInputMsg,
+        searchable: restSelectProps.searchable,
+    });
+    var mergedOverrides = (0, react_1.useMemo)(function () {
+        return (0, overrides_1.mergeOverrides)((0, tslib_1.__assign)({ Root: { props: { ref: rootRef, onFocus: handleFocus } }, Popover: { props: { overrides: { Inner: { props: { ref: popoverRef } } } } }, StatefulMenu: { props: { $onPaginate: onPaginate } }, NoResults: { props: (0, helpers_2.add$props)({ isLoading: isLoading, inputText: inputText, adaptedNoResultsMsg: adaptedNoResultsMsg }) } }, (params.type === 'overlay'
+            ? {
+                // In overlaySelect, overflow property is on OverlayContentContainer
+                OverlayContentContainer: { props: { onScroll: onPaginate } },
+                Menu: { props: { $onPaginate: onPaginate } },
+            }
+            : {
+                //Overriding DropdownContainer and not StatefulMenu so that async select remains functional even when
+                //user overrides StatefulMenu in favour of rendering virtualized menu
+                Menu: { props: { onScroll: onPaginate } },
+            })), overrides);
+    }, [handleFocus, onPaginate, isLoading, inputText, adaptedNoResultsMsg, params.type, overrides]);
+    var onChange = (0, react_1.useCallback)(function (onChangeParams) {
+        propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange((0, tslib_1.__assign)((0, tslib_1.__assign)({}, onChangeParams), { valueKeys: (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(unresolvedValueKeysRef.current.map(function (_a) {
+                var id = _a.id;
+                return id;
+            })), false), (0, tslib_1.__read)(onChangeParams.value.map(function (opt) { return opt[valueKey]; })), false), value: unresolvedValueKeysRef.current.length
+                ? (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(unresolvedValueKeysRef.current.map(function (_a) {
+                    var _b;
+                    var id = _a.id, groupId = _a.groupId;
+                    return (_b = {},
+                        _b[valueKey] = id,
+                        _b[labelKey] = id,
+                        _b.__optgroup = groupId,
+                        _b);
+                })), false), (0, tslib_1.__read)(onChangeParams.value), false) : onChangeParams.value }));
+    }, [propsOnChange, valueKey, labelKey]);
+    return (0, tslib_1.__assign)((0, tslib_1.__assign)({ children: undefined }, restSelectProps), { options: options, isLoading: isLoading, value: selectedOptions, controlRef: controlRef, inputRef: combinedRef, overrides: mergedOverrides, noResultsMsg: adaptedNoResultsMsg, createOption: createOption, onInputChange: _onInputChange, valueKey: valueKey, labelKey: labelKey, type: restSelectProps.type, resultCountMap: resultCountMap, onChange: onChange, onOpen: (0, react_1.useCallback)(function () {
+            moveSelectedOptionsToTop &&
+                setOptions((0, helpers_1.mergeOptions)((selectedOptions || []), sortedOptionsRef.current || []));
+            onOpen && onOpen();
+        }, [moveSelectedOptionsToTop, onOpen, selectedOptions]), filterOptions: (0, react_1.useCallback)(function () {
+            var param = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                param[_i] = arguments[_i];
+            }
+            return (filterOptions ? filterOptions.apply(void 0, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(param), false)) : param[0]);
+        }, [filterOptions]) });
+};
+exports.useAsyncSelect = useAsyncSelect;

package/asyncSelect/hooks/useResolveSelectedOptions.d.ts

@@ -2,17 +2,21 @@
  *  Created by Aneree on 15/01/21.
  */
 import { MutableRefObject } from 'react';
-import { Option, Value } from '../../select';
-import { SetStateFunc, AllOptionsMap } from '../types';
+import { Option } from '../../select';
+import { AllOptionsMap, GroupedOptions, GroupedValue, Id, SetStateFunc } from '../types';
 interface UseResolveSelectedOptionsArgs {
-    value?: Value;
+    groupedValue?: GroupedValue;
     valueKey: string;
     allOptionsMap: AllOptionsMap;
-    resolveSelectedOptions?: (unresolvedValueKeys: Array<string | number>) => Promise<Array<Option>>;
+    resolveValuesOnUpdate?: boolean;
+    resolveSelectedOptions?: (groupVsUnresolvedValueKeys: Record<string, Array<Id>>) => Promise<Record<string, Array<Option>>>;
     inputRef: MutableRefObject<HTMLInputElement | null>;
-    setIsLoading: SetStateFunc<boolean>;
-    setOptions: SetStateFunc<Array<Option>>;
+    setOptions: SetStateFunc<GroupedOptions>;
     setAllOptionsMap: SetStateFunc<AllOptionsMap>;
+    sortedOptionsRef: MutableRefObject<GroupedOptions>;
 }
-declare const useResolveSelectedOptions: ({ value, valueKey, allOptionsMap, resolveSelectedOptions, inputRef, setIsLoading, setOptions, setAllOptionsMap, }: UseResolveSelectedOptionsArgs) => void;
+declare const useResolveSelectedOptions: ({ groupedValue, valueKey, allOptionsMap, resolveValuesOnUpdate, resolveSelectedOptions, inputRef, setOptions, sortedOptionsRef, setAllOptionsMap, }: UseResolveSelectedOptionsArgs) => {
+    isResolvingValues: boolean;
+    unresolvedGroupedValueKeys: Record<string, Id[]>;
+};
 export { useResolveSelectedOptions };

package/asyncSelect/hooks/useResolveSelectedOptions.js

@@ -6,59 +6,72 @@ var tslib_1 = require("tslib");
  *  Created by Aneree on 15/01/21.
  */
 var react_1 = require("react");
-var uniqBy_1 = (0, tslib_1.__importDefault)(require("lodash/uniqBy"));
+var forEach_1 = (0, tslib_1.__importDefault)(require("lodash/forEach"));
+var isEmpty_1 = (0, tslib_1.__importDefault)(require("lodash/isEmpty"));
+var isObject_1 = (0, tslib_1.__importDefault)(require("lodash/isObject"));
 //hooks
-var useLatest_1 = require("../../hooks/useLatest");
+var useFirstMountState_1 = require("../../hooks/useFirstMountState");
 //helpers
 var helpers_1 = require("../helpers");
 var useResolveSelectedOptions = function (_a) {
-    var value = _a.value, valueKey = _a.valueKey, allOptionsMap = _a.allOptionsMap, resolveSelectedOptions = _a.resolveSelectedOptions, inputRef = _a.inputRef, setIsLoading = _a.setIsLoading, setOptions = _a.setOptions, setAllOptionsMap = _a.setAllOptionsMap;
-    var valueRef = (0, useLatest_1.useLatest)(value);
-    var valueKeyRef = (0, useLatest_1.useLatest)(valueKey);
-    var resolveSelectedOptionsRef = (0, useLatest_1.useLatest)(resolveSelectedOptions);
-    var allOptionsMapRef = (0, react_1.useRef)(allOptionsMap);
-    var fetchUnresolvedValueKeys = (0, react_1.useCallback)(function (unresolvedValueKeys) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-        var options_1, e_1;
-        return (0, tslib_1.__generator)(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    setIsLoading(true);
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, resolveSelectedOptionsRef.current(unresolvedValueKeys)];
-                case 2:
-                    options_1 = _a.sent();
-                    setAllOptionsMap(function (prevOptions) { return (0, helpers_1.addOptionsInMap)(prevOptions, options_1, valueKeyRef.current); });
-                    //Inject the resolved selected options into the options state
-                    // 1. Only if currently shown options are not filtered i.e. user input text is empty (All options need to be shown)
-                    if (!(0, helpers_1.getInputValue)(inputRef)) {
-                        setOptions(function (prevOptions) {
-                            // 2. Only if they are not already present in the state
-                            var combinedOptions = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(prevOptions), false), (0, tslib_1.__read)(options_1), false), uniqueOptions = (0, uniqBy_1.default)(combinedOptions, valueKeyRef.current);
-                            return prevOptions.length === uniqueOptions.length ? prevOptions : uniqueOptions;
-                        });
-                    }
-                    setIsLoading(false);
-                    return [3 /*break*/, 4];
-                case 3:
-                    e_1 = _a.sent();
-                    setIsLoading(false);
-                    throw e_1;
-                case 4: return [2 /*return*/];
-            }
+    var groupedValue = _a.groupedValue, valueKey = _a.valueKey, allOptionsMap = _a.allOptionsMap, resolveValuesOnUpdate = _a.resolveValuesOnUpdate, resolveSelectedOptions = _a.resolveSelectedOptions, inputRef = _a.inputRef, setOptions = _a.setOptions, sortedOptionsRef = _a.sortedOptionsRef, setAllOptionsMap = _a.setAllOptionsMap;
+    var isFirstMount = (0, useFirstMountState_1.useFirstMountState)();
+    var unresolvedValuesResults = (0, react_1.useRef)({
+        unresolvedGroupedValueKeys: {},
+        hasUnresolvedValues: false,
+    });
+    (0, react_1.useMemo)(function () {
+        var shouldCalculateUnresolvedValues = (resolveValuesOnUpdate || isFirstMount) && resolveSelectedOptions && !(0, isEmpty_1.default)(groupedValue);
+        if (!shouldCalculateUnresolvedValues) {
+            return;
+        }
+        var unresolvedGroupedValueKeys = {}, hasUnresolvedValues = false;
+        (0, forEach_1.default)(groupedValue, function (values, groupId) {
+            unresolvedGroupedValueKeys[groupId] = (values !== null && values !== void 0 ? values : [])
+                .map(function (valueObjOrId) { return ((0, isObject_1.default)(valueObjOrId) ? valueObjOrId[valueKey] : valueObjOrId); })
+                .filter(function (valueId) { return !allOptionsMap[valueId]; });
+            hasUnresolvedValues = hasUnresolvedValues || unresolvedGroupedValueKeys[groupId].length > 0;
         });
-    }); }, []);
+        unresolvedValuesResults.current = { unresolvedGroupedValueKeys: unresolvedGroupedValueKeys, hasUnresolvedValues: hasUnresolvedValues };
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- calculate this on mount or when value changes
+    }, [groupedValue]);
+    var _b = unresolvedValuesResults.current, hasUnresolvedValues = _b.hasUnresolvedValues, unresolvedGroupedValueKeys = _b.unresolvedGroupedValueKeys;
+    var _c = (0, tslib_1.__read)((0, react_1.useState)(hasUnresolvedValues), 2), isResolvingValues = _c[0], setIsResolving = _c[1];
     (0, react_1.useEffect)(function () {
-        var _a, _b;
-        //Check on mount if there are any unresolved values
-        if (((_a = valueRef.current) === null || _a === void 0 ? void 0 : _a.length) && resolveSelectedOptionsRef.current) {
-            var _valueKey_1 = valueKeyRef.current;
-            var unresolvedValueKeys = (_b = valueRef.current) === null || _b === void 0 ? void 0 : _b.filter(function (valueOption) { return !allOptionsMapRef.current[valueOption[_valueKey_1]]; }).map(function (valueOption) { return valueOption[_valueKey_1]; });
-            if (unresolvedValueKeys.length) {
-                fetchUnresolvedValueKeys(unresolvedValueKeys);
-            }
+        if (!hasUnresolvedValues || !resolveSelectedOptions) {
+            setIsResolving(false);
+            return;
         }
-    }, []);
+        var fetchUnresolvedValueKeys = function (_unresolvedGroupedValueKeys) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+            var options_1;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        setIsResolving(true);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        return [4 /*yield*/, resolveSelectedOptions(_unresolvedGroupedValueKeys)];
+                    case 2:
+                        options_1 = _a.sent();
+                        setAllOptionsMap(function (prevOptions) { return (0, helpers_1.addOptionsInMap)(prevOptions, options_1, valueKey); });
+                        //Inject the resolved selected options into the options state
+                        // 1. Only if currently shown options are not filtered i.e. user input text is empty (All options need to be shown)
+                        if (!(0, helpers_1.getInputValue)(inputRef)) {
+                            sortedOptionsRef.current = (0, helpers_1.mergeOptions)(sortedOptionsRef.current, options_1);
+                            setOptions((0, helpers_1.mergeOptions)(sortedOptionsRef.current, options_1));
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        setIsResolving(false);
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); };
+        fetchUnresolvedValueKeys(unresolvedGroupedValueKeys);
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- this effect should run only when unresolvedValues is changed
+    }, [unresolvedGroupedValueKeys]);
+    return { isResolvingValues: isResolvingValues, unresolvedGroupedValueKeys: unresolvedGroupedValueKeys };
 };
 exports.useResolveSelectedOptions = useResolveSelectedOptions;

package/asyncSelect/index.d.ts

@@ -1,3 +1,6 @@
-export type { Value, Option, AsyncSelectProps } from './types';
+export type { Value, AsyncSelectValue, GroupedValue, Option, GroupedOptions, AsyncSelectProps, GroupedAsyncSelectProps, } from './types';
 export * from './locale';
 export * from './asyncSelect';
+export { GroupedAsyncSelect } from './groupedAsyncSelect';
+export { arrayToGroupedOptions, normalizeOptions } from './helpers';
+export { STATE_CHANGE_TYPE } from '../select';

package/asyncSelect/index.js

@@ -1,5 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.STATE_CHANGE_TYPE = exports.normalizeOptions = exports.arrayToGroupedOptions = exports.GroupedAsyncSelect = void 0;
 var tslib_1 = require("tslib");
 (0, tslib_1.__exportStar)(require("./locale"), exports);
 (0, tslib_1.__exportStar)(require("./asyncSelect"), exports);
+var groupedAsyncSelect_1 = require("./groupedAsyncSelect");
+Object.defineProperty(exports, "GroupedAsyncSelect", { enumerable: true, get: function () { return groupedAsyncSelect_1.GroupedAsyncSelect; } });
+var helpers_1 = require("./helpers");
+Object.defineProperty(exports, "arrayToGroupedOptions", { enumerable: true, get: function () { return helpers_1.arrayToGroupedOptions; } });
+Object.defineProperty(exports, "normalizeOptions", { enumerable: true, get: function () { return helpers_1.normalizeOptions; } });
+var select_1 = require("../select");
+Object.defineProperty(exports, "STATE_CHANGE_TYPE", { enumerable: true, get: function () { return select_1.STATE_CHANGE_TYPE; } });

package/asyncSelect/types.d.ts

@@ -2,27 +2,74 @@
  *  Created by Aneree on 03/11/20.
  */
 import { Dispatch, ReactNode, SetStateAction } from 'react';
-import { SelectProps, Option, Value } from '../select/types';
+import { SelectProps, Option, Value, OnChangeParams } from '../select/types';
 export declare type SetStateFunc<S> = Dispatch<SetStateAction<S>>;
-export declare type AllOptionsMap = Record<string | number, Option>;
-/**
- * NOTE:
- *   AsyncSelect does not support select all option
- *   removed the support of these props in AsyncSelect
- */
-export declare type AsyncSelectProps = Omit<SelectProps, 'isLoading' | 'options' | 'hideSelectAll'> & {
-    loadOptions: (input: string, page: number) => Promise<{
+export declare type Id = string | number;
+export declare type AllOptionsMap = Record<Id, Option>;
+export declare type GroupedOptions = Record<string, Array<Option>>;
+export declare type LoadOptions = (input: string, groupFilters: {
+    group: string;
+    pageNumber: number;
+}[]) => Promise<{
+    groups: Array<{
+        group: string;
         options: Array<Option>;
         complete: boolean;
+        count?: number;
     }>;
+}>;
+export declare type AsyncSelectValue = Array<Id | Option> | Value;
+declare type BaseAsyncSelectProps = Omit<SelectProps, 'isLoading' | 'options' | 'value' | 'onChange' | 'scrollContainer'> & {
     paginationBuffer?: number;
     searchingText?: ReactNode;
     minimumInput?: number;
     debounceInterval?: number;
-    initialOptions?: Array<Option>;
-    resolveSelectedOptions?: (unresolvedValueKeys: Array<string | number>) => Promise<Array<Option>>;
     loadOnFocus?: boolean;
     loadOnMount?: boolean;
     listenAllInputChanges?: boolean;
+    value?: AsyncSelectValue;
+    onChange?: (params: OnChangeParams & {
+        valueKeys: Id[];
+    }) => unknown;
+    resolveValuesOnUpdate?: boolean;
+    hideUnresolvedValues?: boolean;
+    moveSelectedOptionsToTop?: boolean;
+};
+export declare type AsyncSelectProps = BaseAsyncSelectProps & {
+    loadOptions: (input: string, page: number) => Promise<{
+        options: Array<Option>;
+        complete: boolean;
+    }>;
+    initialOptions?: Array<Option>;
+    resolveSelectedOptions?: (unresolvedValueKeys: Array<Id>) => Promise<Array<Option>>;
+};
+export declare type GroupConfig = Array<{
+    id: string;
+    label: string;
+}>;
+export declare type GroupedValue = Record<string, AsyncSelectValue>;
+export declare type GroupedAsyncSelectProps = Omit<BaseAsyncSelectProps, 'creatable' | 'onChange' | 'value'> & {
+    loadOptions: (input: string, groupFilters: Array<{
+        group: string;
+        pageNumber: number;
+    }>) => Promise<{
+        groups: {
+            group: string;
+            options: Array<Option>;
+            complete: boolean;
+            count?: number;
+        }[];
+    }>;
+    initialOptions?: Record<string, Array<Option>>;
+    groupConfig: GroupConfig;
+    initialExpandedCount?: number;
+    resolveSelectedOptions?: (groupVsUnresolvedValueKeys: Record<string, Array<Id>>) => Promise<GroupedOptions>;
+    value?: GroupedValue;
+    onChange?: (params: Omit<OnChangeParams, 'value'> & {
+        value: GroupedOptions;
+        valueKeys: Record<string, Id[]>;
+    }) => unknown;
+    showSelectAll?: boolean;
+    selectAllSelected?: boolean;
 };
 export type { Value, Option };

package/avatar/avatar.js

@@ -23,46 +23,60 @@ function getInitials(name) {
     var initials = words.map(function (word) { return word[0]; });
     return initials.slice(0, 2).join('').toUpperCase();
 }
+//If Image is already available in disk cache, then we should directly set isImageLoaded state to true, to avoid flicker between initials and avatar.
+var getIsImageLoaded = function (src) {
+    if (!src) {
+        return false;
+    }
+    var imageEl = new Image();
+    imageEl.src = src;
+    return imageEl.complete;
+};
 var Icon = function (_a) {
     var overrides = _a.overrides, className = _a.className, props = (0, tslib_1.__rest)(_a, ["overrides", "className"]);
     var _b = (0, tslib_1.__read)((0, overrides_1.useOverrides)(overrides === null || overrides === void 0 ? void 0 : overrides.UserIcon, user_1.default), 2), UserIcon = _b[0], iconProps = _b[1];
     return ((0, jsx_runtime_1.jsx)(box_1.Box, (0, tslib_1.__assign)({ className: ['h-full w-full flex items-center justify-center', className] }, props, { children: (0, jsx_runtime_1.jsx)(UserIcon, (0, tslib_1.__assign)({ "data-testid": "user-icon", className: "w-1/2 h-1/2" }, iconProps), void 0) }), void 0));
 };
 var Avatar = function (props) {
-    var _a = (0, tslib_1.__read)((0, react_1.useState)(null), 2), imageRef = _a[0], setImageRef = _a[1];
-    var _b = (0, tslib_1.__read)((0, react_1.useState)(false), 2), imageLoaded = _b[0], setImageLoaded = _b[1];
-    var _c = props.shape, shape = _c === void 0 ? 'circle' : _c, _d = props.size, size = _d === void 0 ? 'md' : _d, className = props.className, color = props.color, allowPhoneInitials = props.allowPhoneInitials, name = props.name, overrides = props.overrides, initials = props.initials, src = props.src;
+    var _a = (0, tslib_1.__read)((0, react_1.useState)(null), 2), imageEl = _a[0], setImageEl = _a[1];
+    var _b = props.shape, shape = _b === void 0 ? 'circle' : _b, _c = props.size, size = _c === void 0 ? 'md' : _c, className = props.className, color = props.color, allowPhoneInitials = props.allowPhoneInitials, name = props.name, overrides = props.overrides, initials = props.initials, src = props.src;
+    var _d = (0, tslib_1.__read)((0, react_1.useState)(), 2), imageLoaded = _d[0], setImageLoaded = _d[1];
     var displayName = (0, cleanupDisplayName_1.cleanupDisplayName)(name);
     var randomBgColor = (0, useAvatarColor_1.useAvatarColor)(displayName);
     var isPhoneNumber = PHONENUMBER_REGEX.test(displayName);
     var px2rem = (0, style_1.useStyle)().px2rem;
     var avatarSize = typeof size === 'string' ? styled_component_1.avatarSizeConfig[size].size : px2rem(size);
-    var sharedProps = (0, tslib_1.__assign)({ $avatarSize: size, $color: color || randomBgColor, $didImageFailToLoad: !imageLoaded }, (0, helpers_1.add$props)({ shape: shape, imageLoaded: imageLoaded }));
+    var _initials = initials || getInitials(displayName);
+    var sharedProps = (0, tslib_1.__assign)((0, tslib_1.__assign)({ $avatarSize: size, $color: color || randomBgColor, $didImageFailToLoad: !imageLoaded }, (0, helpers_1.add$props)({ shape: shape, imageLoaded: imageLoaded })), { $isSingleLetterInitial: _initials.length === 1 });
     (0, useIsomorphicLayoutEffect_1.useIsomorphicLayoutEffect)(function () {
-        if (!imageRef || !src) {
+        if (!imageEl) {
+            setImageLoaded(getIsImageLoaded(src));
+            return undefined;
+        }
+        if (!src) {
             setImageLoaded(false);
             return undefined;
         }
-        if (imageRef) {
-            imageRef.onload = function () { return setImageLoaded(true); };
-            imageRef.onerror = function () { return setImageLoaded(false); };
+        if (imageEl) {
+            imageEl.onload = function () { return setImageLoaded(true); };
+            imageEl.onerror = function () { return setImageLoaded(false); };
             /**
              * Important to set src once onload listener is attached.
              * In some cases, image loads before these listeners are attached.
              */
-            imageRef.src = src;
+            imageEl.src = src;
         }
         return function () {
-            if (imageRef) {
-                imageRef.onload = null;
-                imageRef.onerror = null;
+            if (imageEl) {
+                imageEl.onload = null;
+                imageEl.onerror = null;
             }
         };
-    }, [src, imageRef]);
+    }, [src, imageEl]);
     var _e = (0, tslib_1.__read)((0, overrides_1.useOverrides)(overrides === null || overrides === void 0 ? void 0 : overrides.Root, styled_component_1.StyledRoot), 2), Root = _e[0], rootProps = _e[1];
     var _f = (0, tslib_1.__read)((0, overrides_1.useOverrides)(overrides === null || overrides === void 0 ? void 0 : overrides.Avatar, styled_component_1.StyledAvatar), 2), AvatarImage = _f[0], avatarImageProps = _f[1];
     var _g = (0, tslib_1.__read)((0, overrides_1.useOverrides)(overrides === null || overrides === void 0 ? void 0 : overrides.Initials, styled_component_1.StyledInitials), 2), Initials = _g[0], initialsProps = _g[1];
     return ((0, jsx_runtime_1.jsxs)(Root, (0, tslib_1.__assign)({ "aria-label": imageLoaded ? null : name, className: className, "data-spaceweb": "avatar", "$size": avatarSize }, sharedProps, rootProps, { children: [!imageLoaded &&
-                (isPhoneNumber && !allowPhoneInitials ? ((0, jsx_runtime_1.jsx)(Icon, (0, tslib_1.__assign)({ overrides: overrides }, sharedProps, initialsProps), void 0)) : ((0, jsx_runtime_1.jsx)(Initials, (0, tslib_1.__assign)({}, sharedProps, initialsProps, { children: initials || getInitials(displayName) }), void 0))), (0, jsx_runtime_1.jsx)(AvatarImage, (0, tslib_1.__assign)({ ref: setImageRef, src: src, alt: name, "$size": avatarSize }, sharedProps, avatarImageProps), void 0)] }), void 0));
+                (isPhoneNumber && !allowPhoneInitials ? ((0, jsx_runtime_1.jsx)(Icon, (0, tslib_1.__assign)({ overrides: overrides }, sharedProps, initialsProps), void 0)) : ((0, jsx_runtime_1.jsx)(Initials, (0, tslib_1.__assign)({}, sharedProps, initialsProps, { children: _initials }), void 0))), (0, jsx_runtime_1.jsx)(AvatarImage, (0, tslib_1.__assign)({ ref: setImageEl, src: src, alt: name, "$size": avatarSize }, sharedProps, avatarImageProps), void 0)] }), void 0));
 };
 exports.Avatar = Avatar;

package/avatar/styled-component.js

@@ -5,43 +5,40 @@ var tslib_1 = require("tslib");
 var styled_1 = (0, tslib_1.__importDefault)(require("../style/styled"));
 var longHandHelpers_1 = require("../helpers/longHandHelpers");
 exports.avatarSizeConfig = {
-    sm: { size: '24px', rectangleBorderRadius: '6px', fontSize: '8px' },
-    md: { size: '34px', rectangleBorderRadius: '8px', fontSize: '10px' },
-    lg: { size: '40px', rectangleBorderRadius: '8px', fontSize: '12px' },
-    xl: { size: '48px', rectangleBorderRadius: '8px', fontSize: '16px' },
-    xxl: { size: '84px', rectangleBorderRadius: '12px', fontSize: '16px' },
-    xxxl: { size: '96px', rectangleBorderRadius: '12px', fontSize: '16px' },
+    sm: { size: '24px', rectangleBorderRadius: '6px', fontSize: '12px' },
+    md: { size: '34px', rectangleBorderRadius: '8px', fontSize: '17px' },
+    lg: { size: '40px', rectangleBorderRadius: '8px', fontSize: '20px' },
+    xl: { size: '48px', rectangleBorderRadius: '8px', fontSize: '24px' },
+    xxl: { size: '84px', rectangleBorderRadius: '12px', fontSize: '42px' },
+    xxxl: { size: '96px', rectangleBorderRadius: '12px', fontSize: '48px' },
 };
-var getSizeConfig = function (size) { var _a; return (_a = exports.avatarSizeConfig[size]) !== null && _a !== void 0 ? _a : exports.avatarSizeConfig.md; };
-var getFontSize = function (size) {
-    if (size < 24)
-        return '8px';
-    else if (size < 36)
-        return '12px';
-    else if (size < 48)
-        return '16px';
-    else if (size < 60)
-        return '20px';
-    else if (size < 72)
-        return '24px';
-    else if (size < 84)
-        return '28px';
-    else
-        return '36px';
+var getRectangleBorderRadius = function (size) {
+    var _a, _b;
+    if (typeof size === 'number') {
+        return "".concat(Math.ceil(Number(size) / 4), "px");
+    }
+    return (_b = (_a = exports.avatarSizeConfig[size]) === null || _a === void 0 ? void 0 : _a.rectangleBorderRadius) !== null && _b !== void 0 ? _b : exports.avatarSizeConfig.md.rectangleBorderRadius;
+};
+var getFontSize = function (size, isSingleLetterInitial) {
+    var _size = typeof size === 'number' ? size : parseFloat(exports.avatarSizeConfig[size].size);
+    if (isSingleLetterInitial) {
+        return _size > 17 ? "".concat(Math.max(13, _size * 0.6), "px") : "".concat(_size * 0.75, "px");
+    }
+    else {
+        return "".concat(_size / 2, "px");
+    }
 };
 exports.StyledAvatarGroup = (0, styled_1.default)('div', 'flex');
 exports.StyledRoot = (0, styled_1.default)('div', 'box-border inline-block', function (_, _a) {
     var $shape = _a.$shape, $color = _a.$color, $didImageFailToLoad = _a.$didImageFailToLoad, $avatarSize = _a.$avatarSize, $size = _a.$size;
-    var avatarSizeTheme = getSizeConfig($avatarSize);
-    var borderRadius = $shape === 'circle' ? '50%' : avatarSizeTheme.rectangleBorderRadius;
+    var borderRadius = $shape === 'circle' ? '50%' : getRectangleBorderRadius($avatarSize);
     return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, (0, longHandHelpers_1.borderRadius)(borderRadius)), { background: $didImageFailToLoad ? $color : undefined, height: $didImageFailToLoad ? $size : undefined, width: $didImageFailToLoad ? $size : undefined });
 });
-exports.StyledInitials = (0, styled_1.default)('div', 'items-center justify-center h-full flex font-semibold spr-text-01', function (_, _a) {
-    var $avatarSize = _a.$avatarSize;
-    var fontSize = typeof $avatarSize === 'number' ? getFontSize($avatarSize) : getSizeConfig($avatarSize).fontSize;
-    return {
-        fontSize: fontSize,
-    };
+exports.StyledInitials = (0, styled_1.default)('div', 'items-center justify-center h-full flex font-medium spr-text-01', function (_, _a) {
+    var $avatarSize = _a.$avatarSize, $isSingleLetterInitial = _a.$isSingleLetterInitial;
+    return ({
+        fontSize: getFontSize($avatarSize, $isSingleLetterInitial),
+    });
 });
 // borderRadius should be inherited
 exports.StyledAvatar = (0, styled_1.default)('img', 'box-border object-cover', function (_, _a) {

package/avatar/types.d.ts

@@ -29,6 +29,7 @@ export declare type AvatarSharedProps = {
     $shape: Shape;
     $color?: string;
     $avatarSize: string;
+    $isSingleLetterInitial: boolean;
 };
 declare type AvatarOverrides = {
     Root?: Override<AvatarSharedProps & Record<string, any>>;