@steroidsjs/core 3.0.0-beta.1 → 3.0.0-beta.100

package/hooks/useDataProvider.d.ts

@@ -1,6 +1,5 @@
-import { IApiMethod } from '../components/ApiComponent';
 import Enum from '../base/Enum';
-export interface AutoCompleteConfig {
+export interface IAutoCompleteConfig {
     /**
      * Подключить autocomplete?
      * @example true
@@ -17,13 +16,39 @@ export interface AutoCompleteConfig {
      */
     delay?: number;
 }
-export declare type DataProviderItems = string | ({
+export type DataProviderItems = string | ({
     new (): Enum;
 }) | (string | number | {
     id: string | number | boolean;
     label: string | any;
     [key: string]: any;
 })[];
+export interface IDataProvider {
+    /**
+     * Уникальный (глобально) идентификатор, под которых будут храниться
+     * подгруженные данные в redux (при включенном флаге useRedux). Если
+     * не задан - данные будут храниться в локальном стейте
+     */
+    reduxId?: string;
+    /**
+     * URL для подгрузки новой коллекции данных
+     * @example '/api/v1/search'
+     */
+    action?: string;
+    /**
+     * Параметры запроса
+     * @example {pageSize: 3}
+     */
+    params?: Record<string, unknown>;
+    /**
+     * Обработчик, который вызывается для подгрузки данных.
+     * Если обработчик не передан, то по умолчанию отправится post-запрос.
+     * @param {string} action
+     * @param {Object} params
+     * @return {Promise<Array> | Array}
+     */
+    onSearch?: (action: string, params: Record<string, unknown>) => Array<unknown> | Promise<Array<unknown>>;
+}
 export interface IDataProviderConfig {
     /**
      * Коллекция элементов
@@ -34,32 +59,7 @@ export interface IDataProviderConfig {
      * Конфигурация для подгрузки данных извне.
      * Если dataProvider не передан, то поиск данных по запросу происходит локально.
      */
-    dataProvider?: {
-        /**
-         * Уникальный (глобально) идентификатор, под которых будут храниться
-         * подгруженные данные в redux (при включенном флаге useRedux). Если
-         * не задан - данные будут храниться в локальном стейте
-         */
-        reduxId?: string;
-        /**
-         * URL для подгрузки новой коллекции данных
-         * @example '/api/v1/search'
-         */
-        action?: string | IApiMethod;
-        /**
-         * Параметры запроса
-         * @example {pageSize: 3}
-         */
-        params?: Record<string, unknown>;
-        /**
-         * Обработчик, который вызывается для подгрузки данных.
-         * Если обработчик не передан, то по умолчанию отправится post-запрос.
-         * @param {string} action
-         * @param {Object} params
-         * @return {Promise<Array> | Array}
-         */
-        onSearch?: (action: string, params: Record<string, unknown>) => Array<unknown> | Promise<Array<unknown>>;
-    };
+    dataProvider?: IDataProvider;
     /**
      * Текст запроса
      * @example 'some text'
@@ -69,7 +69,7 @@ export interface IDataProviderConfig {
      * Настройки поиска
      * @example {enable: true, minLength: 2, delay: 100}
      */
-    autoComplete?: boolean | AutoCompleteConfig;
+    autoComplete?: boolean | IAutoCompleteConfig;
     /**
      * Загрузка данных после любого изменения запроса.
      * Если включен autoFetch, то настройки autoComplete не применятся.

package/hooks/useDataProvider.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -46,10 +46,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -83,57 +87,56 @@ var defaultProps = {
 function useDataProvider(config) {
     var _this = this;
     var _a;
-    var components = index_1.useComponents();
-    var dispatch = index_1.useDispatch();
+    var components = (0, index_1.useComponents)();
+    var dispatch = (0, index_1.useDispatch)();
     var reduxDataProviderId = (_a = config.dataProvider) === null || _a === void 0 ? void 0 : _a.reduxId;
     // Check enum
-    var enumItems = react_redux_1.useSelector(function (state) { return isString_1["default"](config.items) ? fields_2.getEnumLabels(state, config.items) : null; });
+    var enumItems = (0, react_redux_1.useSelector)(function (state) { return (0, isString_1["default"])(config.items) ? (0, fields_2.getEnumLabels)(state, config.items) : null; });
     // Initial items
-    var initialItems = data_1.normalizeItems(enumItems || config.items);
+    var initialItems = (0, data_1.normalizeItems)(enumItems || config.items);
     // Items state
-    var _b = react_1.useState(initialItems), items = _b[0], setItems = _b[1];
-    var _c = react_1.useState(false), isLoading = _c[0], setIsLoading = _c[1];
+    var _b = (0, react_1.useState)(initialItems), items = _b[0], setItems = _b[1];
+    var _c = (0, react_1.useState)(false), isLoading = _c[0], setIsLoading = _c[1];
     // Source items state (redux or local)
-    var _d = react_1.useState(initialItems), sourceInternalItems = _d[0], setSourceInternalItems = _d[1];
-    var sourceReduxItems = react_redux_1.useSelector(function (state) { return fields_2.getDataProviderItems(state, reduxDataProviderId); });
+    var _d = (0, react_1.useState)(initialItems), sourceInternalItems = _d[0], setSourceInternalItems = _d[1];
+    var sourceReduxItems = (0, react_redux_1.useSelector)(function (state) { return (0, fields_2.getDataProviderItems)(state, reduxDataProviderId); });
     var sourceItems = reduxDataProviderId ? sourceReduxItems : sourceInternalItems;
-    var setSourceItems = react_1.useCallback(function (value) {
+    var setSourceItems = (0, react_1.useCallback)(function (value) {
         if (reduxDataProviderId) {
-            dispatch(fields_1.fieldsDataProviderSetItems(reduxDataProviderId, value));
+            dispatch((0, fields_1.fieldsDataProviderSetItems)(reduxDataProviderId, value));
         }
         else {
             setSourceInternalItems(value);
         }
     }, [reduxDataProviderId, dispatch]);
     // Check change items from props
-    var prevInitialItems = react_use_1.usePrevious(initialItems);
-    react_1.useEffect(function () {
-        if (prevInitialItems && !isEqual_1["default"](prevInitialItems, initialItems)) {
+    var prevInitialItems = (0, react_use_1.usePrevious)(initialItems);
+    (0, react_1.useEffect)(function () {
+        if (prevInitialItems && !(0, isEqual_1["default"])(prevInitialItems, initialItems)) {
             setSourceInternalItems(initialItems);
         }
     }, [prevInitialItems, initialItems]);
     // Normalize autoComplete
-    var autoComplete = react_1.useMemo(function () { return (__assign(__assign({}, defaultProps.autoComplete), (typeof config.autoComplete === 'boolean') ? { enable: config.autoComplete } : config.autoComplete)); }, [config.autoComplete]);
-    var dataProvider = react_1.useMemo(function () { return (__assign({ action: '', actionMethod: 'get', params: null, onSearch: null }, config.dataProvider)); }, [config.dataProvider]);
+    var autoComplete = (0, react_1.useMemo)(function () { return (__assign(__assign({}, defaultProps.autoComplete), (typeof config.autoComplete === 'boolean') ? { enable: config.autoComplete } : config.autoComplete)); }, [config.autoComplete]);
+    var dataProvider = (0, react_1.useMemo)(function () { return (__assign({ action: '', actionMethod: 'get', params: null, onSearch: null }, config.dataProvider)); }, [config.dataProvider]);
     // Fetch data
-    var delayTimerRef = react_1.useRef(null);
-    var isAutoFetchedRef = react_1.useRef(false);
-    var prevQuery = react_use_1.usePrevious(config.query);
-    var prevParams = react_use_1.usePrevious(dataProvider.params);
-    var prevValues = react_use_1.usePrevious(config.initialSelectedIds);
-    react_1.useEffect(function () {
+    var delayTimerRef = (0, react_1.useRef)(null);
+    var isAutoFetchedRef = (0, react_1.useRef)(false);
+    var prevQuery = (0, react_use_1.usePrevious)(config.query);
+    var prevParams = (0, react_use_1.usePrevious)(dataProvider.params);
+    var prevValues = (0, react_use_1.usePrevious)(config.initialSelectedIds);
+    (0, react_1.useEffect)(function () {
         var fetchRemote = function (isAuto) { return __awaiter(_this, void 0, void 0, function () {
             var searchHandler, result, newItems;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        searchHandler = dataProvider.onSearch || (typeof dataProvider.action === 'function'
-                            ? function (method, params) { return method(components.api, params).then(function (response) { return response.data; }); }
-                            : function (method, params) { return components.http.send(dataProvider.actionMethod, method, params)
-                                .then(function (response) { return response.data; }); });
+                        searchHandler = dataProvider.onSearch || (function (method, params) { return components.http
+                            .send(dataProvider.actionMethod, method, params)
+                            .then(function (response) { return response.data; }); });
                         result = searchHandler(dataProvider.action, __assign(__assign(__assign({ query: config.query }, (isAuto ? { ids: config.initialSelectedIds } : null)), (((_a = config.initialSelectedIds) === null || _a === void 0 ? void 0 : _a.length) > 0 ? { withIds: config.initialSelectedIds } : null)), config.dataProvider.params));
-                        if (!(result && isFunction_1["default"](result.then))) return [3 /*break*/, 2];
+                        if (!(result && (0, isFunction_1["default"])(result.then))) return [3 /*break*/, 2];
                         setIsLoading(true);
                         return [4 /*yield*/, result];
                     case 1:
@@ -142,12 +145,12 @@ function useDataProvider(config) {
                         _b.label = 2;
                     case 2:
                         // Update items
-                        newItems = data_1.normalizeItems(newItems);
+                        newItems = (0, data_1.normalizeItems)(newItems);
                         if (!config.query) {
                             setSourceItems(newItems);
                         }
                         else {
-                            setSourceItems(uniqBy_1["default"](__spreadArray(__spreadArray([], sourceItems), newItems), 'id'));
+                            setSourceItems((0, uniqBy_1["default"])(__spreadArray(__spreadArray([], sourceItems, true), newItems, true), 'id'));
                         }
                         setItems(newItems);
                         return [2 /*return*/];
@@ -156,13 +159,13 @@ function useDataProvider(config) {
         }); };
         if (!config.dataProvider) {
             // Client-side search on static items
-            setItems(config.query ? text_1.smartSearch(config.query, sourceItems) : sourceItems);
+            setItems(config.query ? (0, text_1.smartSearch)(config.query, sourceItems) : sourceItems);
         }
         else if (config.autoFetch && isAutoFetchedRef.current === false) {
             isAutoFetchedRef.current = true;
             fetchRemote(true);
         }
-        else if (!isEqual_1["default"](prevValues, config.initialSelectedIds)) {
+        else if (!(0, isEqual_1["default"])(prevValues, config.initialSelectedIds)) {
             fetchRemote(false);
         }
         else if (autoComplete.enable || (config.autoFetch && isAutoFetchedRef.current === true)) {
@@ -170,12 +173,12 @@ function useDataProvider(config) {
                 clearTimeout(delayTimerRef.current);
             }
             // Changed query logic
-            if (prevQuery !== config.query || !isEqual_1["default"](prevParams, dataProvider.params)) {
+            if (prevQuery !== config.query || !(0, isEqual_1["default"])(prevParams, dataProvider.params)) {
                 // Search with delay
                 delayTimerRef.current = setTimeout(fetchRemote, autoComplete.delay);
             }
         }
-    }, [autoComplete, components.api, components.http, config.autoFetch,
+    }, [autoComplete, components.http, config.autoFetch,
         config.dataProvider, config.initialSelectedIds, config.query, dataProvider,
         dataProvider.action, dataProvider.onSearch, prevParams, prevQuery, prevValues, setSourceItems, sourceItems]);
     return {

package/hooks/useDataSelect.d.ts

@@ -1,5 +1,11 @@
-interface IDataSelectItem {
+export interface IDataSelectItem {
+    /**
+    * Идентификатор элемента
+    */
     id: number | string | boolean;
+    /**
+    * Отображаемое название для IDataSelectItem
+    */
     label?: string;
     [key: string]: unknown;
 }
@@ -54,7 +60,8 @@ export interface IDataSelectResult {
     selectedIds: PrimaryKey[];
     setSelectedIds: (ids: PrimaryKey | PrimaryKey[], skipToggle?: boolean) => void;
     selectedItems: IDataSelectItem[];
+    setSelectedAll: VoidFunction;
+    isSelectedAll: boolean;
 }
-export declare const getLinearItems: (items: any, groupAttribute: any) => any[];
+export declare const getFlattenedItems: (items: any, groupAttribute: any) => any[];
 export default function useDataSelect(config: IDataSelectConfig): IDataSelectResult;
-export {};

package/hooks/useDataSelect.js

@@ -1,14 +1,18 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.getLinearItems = void 0;
+exports.getFlattenedItems = void 0;
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
 var isArray_1 = __importDefault(require("lodash-es/isArray"));
 var isNil_1 = __importDefault(require("lodash-es/isNil"));
@@ -17,11 +21,11 @@ var react_use_1 = require("react-use");
 var defaultProps = {
     primaryKey: 'id'
 };
-var getLinearItems = function (items, groupAttribute) {
+var getFlattenedItems = function (items, groupAttribute) {
     var result = [];
     items.forEach(function (item) {
         if (groupAttribute && Array.isArray(item[groupAttribute])) {
-            result = result.concat(exports.getLinearItems(item[groupAttribute], groupAttribute));
+            result = result.concat((0, exports.getFlattenedItems)(item[groupAttribute], groupAttribute));
         }
         else {
             result.push(item);
@@ -29,7 +33,7 @@ var getLinearItems = function (items, groupAttribute) {
     });
     return result;
 };
-exports.getLinearItems = getLinearItems;
+exports.getFlattenedItems = getFlattenedItems;
 var isIdExists = function (id) {
     if (typeof id === 'boolean') {
         return true;
@@ -39,39 +43,44 @@ var isIdExists = function (id) {
 function useDataSelect(config) {
     // Get primary key
     var primaryKey = config.primaryKey || defaultProps.primaryKey;
-    var linearItems = react_1.useMemo(function () { return exports.getLinearItems(config.items, config.groupAttribute); }, [config.groupAttribute, config.items]);
+    var flattenedItems = (0, react_1.useMemo)(function () { return (0, exports.getFlattenedItems)(config.items, config.groupAttribute); }, [config.groupAttribute, config.items]);
     // Initial select
-    var initialSelectedIds = react_1.useMemo(function () {
+    var initialSelectedIds = (0, react_1.useMemo)(function () {
         var _a;
         if (((_a = config.selectedIds) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             return [].concat(config.selectedIds || []);
         }
-        if (!isNil_1["default"](config.inputValue)) {
-            return [].concat(isArray_1["default"](config.inputValue) ? config.inputValue : [config.inputValue]);
+        if (!(0, isNil_1["default"])(config.inputValue)) {
+            return [].concat((0, isArray_1["default"])(config.inputValue) ? config.inputValue : [config.inputValue]);
         }
-        return config.selectFirst && linearItems.length > 0
-            ? [linearItems[0][primaryKey]]
+        return config.selectFirst && flattenedItems.length > 0
+            ? [flattenedItems[0][primaryKey]]
             : [];
-    }, [config.selectedIds, config.inputValue, config.selectFirst, linearItems, primaryKey]);
-    var initialSelectedItems = react_1.useMemo(function () { return linearItems.length > 0
+    }, [config.selectedIds, config.inputValue, config.selectFirst, flattenedItems, primaryKey]);
+    var initialSelectedItems = (0, react_1.useMemo)(function () { return flattenedItems.length > 0
         && initialSelectedIds.length > 0
         ? initialSelectedIds
-            .map(function (selectedId) { return linearItems.find(function (item) { return item.id === selectedId; }); })
+            .map(function (selectedId) { return flattenedItems.find(function (item) { return item.id === selectedId; }); })
             .filter(isIdExists)
-        : []; }, [initialSelectedIds, linearItems]);
+        : []; }, [initialSelectedIds, flattenedItems]);
     // State
-    var _a = react_1.useState(false), isOpened = _a[0], setIsOpened = _a[1];
-    var _b = react_1.useState(false), isFocused = _b[0], setIsFocused = _b[1];
-    var _c = react_1.useState(null), hoveredId = _c[0], setHoveredId = _c[1];
-    var _d = react_1.useState(initialSelectedIds), selectedIds = _d[0], setSelectedIdsInternal = _d[1];
-    var _e = react_1.useState(initialSelectedItems), selectedItems = _e[0], setSelectedItemsInternal = _e[1];
+    var _a = (0, react_1.useState)(false), isOpened = _a[0], setIsOpened = _a[1];
+    var _b = (0, react_1.useState)(false), isFocused = _b[0], setIsFocused = _b[1];
+    var _c = (0, react_1.useState)(null), hoveredId = _c[0], setHoveredId = _c[1];
+    var _d = (0, react_1.useState)(initialSelectedIds), selectedIds = _d[0], setSelectedIdsInternal = _d[1];
+    var _e = (0, react_1.useState)(initialSelectedItems), selectedItems = _e[0], setSelectedItemsInternal = _e[1];
+    var _f = (0, react_1.useState)(config.items.length === selectedIds.length), isSelectedAll = _f[0], setIsSelectedAll = _f[1];
     // Handler for select/toggle item by id
-    var setSelectedIds = react_1.useCallback(function (ids, skipToggle) {
+    var setSelectedIds = (0, react_1.useCallback)(function (ids, skipToggle) {
         if (skipToggle === void 0) { skipToggle = false; }
-        if (isArray_1["default"](ids)) {
+        if ((0, isArray_1["default"])(ids)) {
             if (!config.multiple && ids.length > 1) {
                 ids = [ids[0]];
             }
+            if (selectedItems.length === ids.length) {
+                setSelectedIds([]);
+                return;
+            }
             setSelectedIdsInternal(ids.sort());
         }
         else {
@@ -86,24 +95,31 @@ function useDataSelect(config) {
                     }
                 }
                 else {
-                    setSelectedIdsInternal(__spreadArray(__spreadArray([], selectedIds), [id_1]).sort());
+                    setSelectedIdsInternal(__spreadArray(__spreadArray([], selectedIds, true), [id_1], false).sort());
                 }
             }
             else {
                 if (selectedIds.length !== 1 || selectedIds[0] !== id_1) {
                     setSelectedIdsInternal([id_1]);
                 }
+                else if (selectedIds.length === 1 && selectedIds[0] === id_1) {
+                    setSelectedIdsInternal([]);
+                }
                 setIsOpened(false);
             }
         }
-    }, [config.multiple, selectedIds]);
+    }, [config.multiple, selectedIds, selectedItems.length]);
+    var setSelectedAll = (0, react_1.useCallback)(function () {
+        var itemsIds = flattenedItems.map(function (item) { return item.id; });
+        setSelectedIds(itemsIds);
+    }, [flattenedItems, setSelectedIds]);
     // Update selected items on change selectedIds or items or source items
-    var prevSelectedIdsLength = react_use_1.usePrevious(selectedIds.length);
-    react_use_1.useUpdateEffect(function () {
+    var prevSelectedIdsLength = (0, react_use_1.usePrevious)(selectedIds.length);
+    (0, react_use_1.useUpdateEffect)(function () {
         var newSelectedItems = [];
         var hasChanges = false;
         selectedIds.forEach(function (selectedId) {
-            var finedItem = linearItems.find(function (item) { return item[primaryKey] === selectedId; });
+            var finedItem = flattenedItems.find(function (item) { return item[primaryKey] === selectedId; });
             if (!finedItem && config.sourceItems) {
                 finedItem = config.sourceItems.find(function (item) { return item[primaryKey] === selectedId; });
             }
@@ -119,17 +135,17 @@ function useDataSelect(config) {
         if (hasChanges || prevSelectedIdsLength !== selectedIds.length) {
             setSelectedItemsInternal(newSelectedItems);
         }
-    }, [linearItems, config.sourceItems, primaryKey, selectedIds, selectedItems, prevSelectedIdsLength]);
+    }, [flattenedItems, config.sourceItems, primaryKey, selectedIds, selectedItems, prevSelectedIdsLength]);
     // Select first after fetch data
-    var prevItemsLength = react_use_1.usePrevious(linearItems.length);
-    react_use_1.useUpdateEffect(function () {
-        if (config.selectFirst && prevItemsLength === 0 && linearItems.length > 0) {
-            setSelectedIdsInternal([linearItems[0][primaryKey]]);
+    var prevItemsLength = (0, react_use_1.usePrevious)(flattenedItems.length);
+    (0, react_use_1.useUpdateEffect)(function () {
+        if (config.selectFirst && prevItemsLength === 0 && flattenedItems.length > 0) {
+            setSelectedIdsInternal([flattenedItems[0][primaryKey]]);
         }
-    }, [linearItems, config.selectFirst, prevItemsLength, primaryKey]);
+    }, [flattenedItems, config.selectFirst, prevItemsLength, primaryKey]);
     // Update selected items on change value
-    var prevConfigSelectedIds = react_use_1.usePrevious(config.selectedIds || []);
-    react_use_1.useUpdateEffect(function () {
+    var prevConfigSelectedIds = (0, react_use_1.usePrevious)(config.selectedIds || []);
+    (0, react_use_1.useUpdateEffect)(function () {
         var newSelectedIds = config.selectedIds || [];
         selectedItems.forEach(function (selectedItem) {
             if (!newSelectedIds.includes(selectedItem.id) && config.selectedIds
@@ -138,10 +154,13 @@ function useDataSelect(config) {
             }
         });
         newSelectedIds.sort();
-        if (!isEqual_1["default"](prevConfigSelectedIds, newSelectedIds) && !isEqual_1["default"](selectedIds, newSelectedIds)) {
+        if (!(0, isEqual_1["default"])(prevConfigSelectedIds, newSelectedIds) && !(0, isEqual_1["default"])(selectedIds, newSelectedIds)) {
             setSelectedIdsInternal(newSelectedIds);
         }
     }, [config.selectedIds, prevConfigSelectedIds, selectedIds, selectedItems]);
+    (0, react_use_1.useUpdateEffect)(function () {
+        setIsSelectedAll(config.items.length === selectedIds.length);
+    }, [config.items.length, selectedIds]);
     // Global key down handler for navigate on items
     // Support keys:
     // - tab
@@ -149,7 +168,7 @@ function useDataSelect(config) {
     // - enter
     // - up/down arrows
     // - space
-    var onKeyDown = react_1.useCallback(function (e) {
+    var onKeyDown = (0, react_1.useCallback)(function (e) {
         // Skip no active
         if (!isFocused && !isOpened) {
             return;
@@ -171,9 +190,9 @@ function useDataSelect(config) {
                 // Select first selected
                 setSelectedIds(selectedIds[0], true);
             }
-            else if (linearItems.length > 0) {
+            else if (flattenedItems.length > 0) {
                 // Select first result
-                setSelectedIds(linearItems[0], true);
+                setSelectedIds(flattenedItems[0], true);
             }
             setIsOpened(false);
         }
@@ -198,7 +217,7 @@ function useDataSelect(config) {
             else {
                 // Navigate on items by keys
                 var direction = isDown ? 1 : -1;
-                var keys = linearItems.map(function (item) { return item.id; });
+                var keys = flattenedItems.map(function (item) { return item.id; });
                 // Get current index
                 var index = hoveredId ? keys.indexOf(hoveredId) : -1;
                 if (index === -1 && selectedIds.length === 1) {
@@ -212,8 +231,8 @@ function useDataSelect(config) {
                 setHoveredId(keys[newIndex]);
             }
         }
-    }, [isFocused, isOpened, hoveredId, selectedIds, linearItems, setSelectedIds]);
-    react_use_1.useEvent('keydown', onKeyDown);
+    }, [isFocused, isOpened, hoveredId, selectedIds, flattenedItems, setSelectedIds]);
+    (0, react_use_1.useEvent)('keydown', onKeyDown);
     return {
         isOpened: isOpened,
         setIsOpened: setIsOpened,
@@ -223,7 +242,9 @@ function useDataSelect(config) {
         setHoveredId: setHoveredId,
         selectedIds: selectedIds,
         setSelectedIds: setSelectedIds,
-        selectedItems: selectedItems
+        selectedItems: selectedItems,
+        setSelectedAll: setSelectedAll,
+        isSelectedAll: isSelectedAll
     };
 }
 exports["default"] = useDataSelect;

package/hooks/useDispatch.d.ts

@@ -1 +1,2 @@
-export default function useDispatch(): any;
+import { Dispatch } from 'react';
+export default function useDispatch(): Dispatch<any>;

package/hooks/useDispatch.js

@@ -2,6 +2,7 @@
 exports.__esModule = true;
 var react_redux_1 = require("react-redux");
 function useDispatch() {
-    return react_redux_1.useDispatch();
+    //@ts-ignore
+    return (0, react_redux_1.useDispatch)();
 }
 exports["default"] = useDispatch;

package/hooks/useFetch.d.ts

@@ -1,6 +1,5 @@
 import { AxiosError } from 'axios';
 import { IComponents } from '../providers/ComponentsProvider';
-import { IApiMethod } from '../components/ApiComponent';
 declare global {
     interface Window {
         APP_PRELOADED_DATA: any;
@@ -8,21 +7,21 @@ declare global {
 }
 export interface IFetchConfig {
     id?: string | number;
-    url?: string | IApiMethod;
+    url?: string;
     method?: 'get' | 'post' | string;
     params?: Record<string, unknown>;
     onFetch?: (config: IFetchConfig, components: IComponents, addCancelToken: (token: any) => any) => any;
 }
-export interface IFetchResult {
+export interface IFetchResult<T> {
     data?: {
         providerData?: {
             type: string;
             value: string;
         };
         [key: string]: unknown;
-    } | any;
+    } | T;
     isLoading: boolean;
-    fetch?: (newParams?: Record<string, unknown>) => void;
+    fetch: (newParams?: Record<string, unknown>) => void;
     axiosError: AxiosError | null;
 }
 export declare const normalizeConfig: (config: any) => any;
@@ -38,4 +37,4 @@ export declare const fetchData: (config: any, components: any, addCancelToken: a
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
  * ключ `key`.
  */
-export default function useFetch(rawConfig?: IFetchConfig): IFetchResult;
+export default function useFetch<T = any>(rawConfig?: IFetchConfig): IFetchResult<T>;