@steroidsjs/core 2.1.0-beta.6 → 2.1.1

package/hooks/useApplication.js

@@ -44,86 +44,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.ComponentsContext = exports.SCREEN_DESKTOP = exports.SCREEN_TABLET = exports.SCREEN_PHONE = exports.ScreenContext = void 0;
+exports.defaultComponents = void 0;
 var React = __importStar(require("react"));
 var react_redux_1 = require("react-redux");
 var merge_1 = __importDefault(require("lodash-es/merge"));
 var react_1 = require("react");
-var react_use_1 = require("react-use");
 var ClientStorageComponent_1 = __importDefault(require("../components/ClientStorageComponent"));
 var HtmlComponent_1 = __importDefault(require("../components/HtmlComponent"));
 var StoreComponent_1 = __importDefault(require("../components/StoreComponent"));
 var UiComponent_1 = __importDefault(require("../components/UiComponent"));
 var MetaComponent_1 = __importDefault(require("../components/MetaComponent"));
+var ComponentsProvider_1 = __importDefault(require("../providers/ComponentsProvider"));
 var Router_1 = __importDefault(require("../ui/nav/Router/Router"));
 var MetricsComponent_1 = __importDefault(require("../components/MetricsComponent"));
-exports.ScreenContext = React.createContext({});
-exports.SCREEN_PHONE = 'phone';
-exports.SCREEN_TABLET = 'tablet';
-exports.SCREEN_DESKTOP = 'desktop';
-function ScreenProvider(props) {
-    var _a;
-    var _b = react_1.useState(typeof window !== 'undefined' ? window.innerWidth : 1280), width = _b[0], setWidth = _b[1];
-    var _c = react_1.useState(props.media || (_a = {},
-        _a[exports.SCREEN_PHONE] = 320,
-        _a[exports.SCREEN_TABLET] = 768,
-        _a[exports.SCREEN_DESKTOP] = 1024,
-        _a)), media = _c[0], setMedia = _c[1];
-    var timer = null;
-    var onResize = function () {
-        if (timer) {
-            clearTimeout(timer);
-        }
-        if (props.skipTimeout) {
-            setWidth(window.innerWidth);
-        }
-        else {
-            timer = setTimeout(function () { return setWidth(window.innerWidth); }, 100);
-        }
-    };
-    react_use_1.useMount(function () {
-        if (typeof window !== 'undefined') {
-            window.addEventListener('resize', onResize, false);
-        }
-    });
-    react_use_1.useUnmount(function () {
-        if (typeof window !== 'undefined') {
-            window.removeEventListener('resize', onResize);
-        }
-    });
-    var getDeviceType = react_1.useCallback(function () {
-        if (width < media[exports.SCREEN_TABLET]) {
-            return exports.SCREEN_PHONE;
-        }
-        if (width < media[exports.SCREEN_DESKTOP]) {
-            return exports.SCREEN_TABLET;
-        }
-        return exports.SCREEN_DESKTOP;
-    }, [width, media]);
-    var isPhone = react_1.useCallback(function () { return getDeviceType() === exports.SCREEN_PHONE; }, [getDeviceType]);
-    var isTablet = react_1.useCallback(function () { return getDeviceType() === exports.SCREEN_TABLET; }, [getDeviceType]);
-    var isDesktop = react_1.useCallback(function () { return getDeviceType() === exports.SCREEN_DESKTOP; }, [getDeviceType]);
-    var value = react_1.useMemo(function () { return ({
-        width: width,
-        media: media,
-        setMedia: setMedia,
-        isPhone: isPhone,
-        isTablet: isTablet,
-        isDesktop: isDesktop,
-        getDeviceType: getDeviceType
-    }); }, [
-        width,
-        media,
-        setMedia,
-        isPhone,
-        isTablet,
-        isDesktop,
-        getDeviceType,
-    ]);
-    return (React.createElement(exports.ScreenContext.Provider, { value: value }, props.children));
-}
-exports.ComponentsContext = React.createContext({});
-var defaultComponents = {
+var ScreenProvider_1 = __importDefault(require("../providers/ScreenProvider"));
+var useComponents_1 = __importDefault(require("./useComponents"));
+exports.defaultComponents = {
     clientStorage: {
         className: ClientStorageComponent_1["default"]
     },
@@ -151,31 +87,30 @@ var defaultComponents = {
 };
 function useApplication(config) {
     if (config === void 0) { config = {}; }
-    var components;
-    // Store global (in global mode)
-    var useGlobal = config.useGlobal !== false && typeof window !== 'undefined';
-    if (useGlobal) {
+    var useGlobal = config.useGlobal !== false;
+    var components = useComponents_1["default"]();
+    if (useGlobal && !process.env.IS_SSR) {
         components = window.SteroidsComponents || null;
     }
     // Create components
     if (!components) {
         components = {};
-        var componentsConfig_1 = merge_1["default"]({}, defaultComponents, config.components);
+        var componentsConfig_1 = merge_1["default"]({}, exports.defaultComponents, config.components);
         Object.keys(componentsConfig_1).forEach(function (name) {
             if (typeof componentsConfig_1[name] === 'function') {
                 componentsConfig_1[name] = { className: componentsConfig_1[name] };
             }
             var _a = componentsConfig_1[name], className = _a.className, componentConfig = __rest(_a, ["className"]);
             // Append reducers to store
-            if (name === 'store' && config.reducers) {
-                componentConfig.reducers = config.reducers;
+            if (name === 'store') {
+                if (config.reducers) {
+                    componentConfig.reducers = config.reducers;
+                }
             }
             // eslint-disable-next-line new-cap
             components[name] = new className(components, componentConfig);
         });
-        if (useGlobal) {
-            window.SteroidsComponents = components;
-        }
+        window.SteroidsComponents = components;
         // Init callback
         if (config.onInit) {
             config.onInit(components);
@@ -190,10 +125,10 @@ function useApplication(config) {
             content = (React.createElement(Router_1["default"], { routes: config.routes(), wrapperView: config.layoutView(), wrapperProps: config.layoutProps }));
         }
         if (config.screen) {
-            content = (React.createElement(ScreenProvider, __assign({}, config.screen), content));
+            content = (React.createElement(ScreenProvider_1["default"], __assign({}, config.screen), content));
         }
-        if (!useGlobal) {
-            content = (React.createElement(exports.ComponentsContext.Provider, { value: components }, content));
+        if (!(useGlobal || process.env.IS_SSR)) {
+            content = (React.createElement(ComponentsProvider_1["default"], { components: components }, content));
         }
         return (React.createElement(react_redux_1.Provider, { store: components.store.store }, content));
     }, [components, config, useGlobal]);

package/hooks/useComponents.d.ts

@@ -1,15 +1,2 @@
-export interface IComponents {
-    api?: any;
-    clientStorage?: any;
-    html?: any;
-    http?: any;
-    locale?: any;
-    store?: any;
-    ui?: any;
-    resource?: any;
-    ws?: any;
-    pushNotification?: any;
-    meta?: any;
-    [key: string]: any;
-}
+import { IComponents } from '../providers/ComponentsProvider';
 export default function useComponents(): IComponents;

package/hooks/useComponents.js

@@ -1,12 +1,11 @@
 "use strict";
-//import {useContext} from 'react';
 exports.__esModule = true;
+var react_1 = require("react");
+var ComponentsProvider_1 = require("../providers/ComponentsProvider");
 function useComponents() {
-    if (typeof window !== 'undefined' && window.SteroidsComponents) {
+    if (!process.env.IS_SSR) {
         return window.SteroidsComponents;
     }
-    // TODO Get components from context
-    //return useContext(ComponentsContext);
-    return null;
+    return react_1.useContext(ComponentsProvider_1.ComponentsContext); // eslint-disable-line react-hooks/rules-of-hooks
 }
 exports["default"] = useComponents;

package/hooks/useDataProvider.d.ts

@@ -22,6 +22,7 @@ export declare type DataProviderItems = string | ({
 }) | (string | number | {
     id: string | number | boolean;
     label: string | any;
+    [key: string]: any;
 })[];
 export interface IDataProviderConfig {
     /**
@@ -69,6 +70,13 @@ export interface IDataProviderConfig {
      * @example true
      */
     autoFetch?: boolean;
+    /**
+     * Идентификаторы выбранных значений, которые необходимо подгрузить при `autoFetch` режиме.
+     * На бекенд будут переданы идентификаторы в параметре `ids`, которые необходимо вернуть.
+     * Используется только при `autoFetch = true`
+     * @example [1, 22]
+     */
+    initialSelectedIds?: number[];
 }
 export interface IDataProviderResult {
     items?: {

package/hooks/useDataProvider.js

@@ -54,6 +54,7 @@ var react_redux_1 = require("react-redux");
 var isString_1 = __importDefault(require("lodash-es/isString"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var react_1 = require("react");
+var react_use_1 = require("react-use");
 var data_1 = require("../utils/data");
 var index_1 = require("./index");
 var fields_1 = require("../reducers/fields");
@@ -88,8 +89,9 @@ function useDataProvider(config) {
     // Fetch data
     var delayTimerRef = react_1.useRef(null);
     var isAutoFetchedRef = react_1.useRef(false);
+    var prevQuery = react_use_1.usePrevious(config.query);
     react_1.useEffect(function () {
-        var fetchRemote = function () { return __awaiter(_this, void 0, void 0, function () {
+        var fetchRemote = function (isAuto) { return __awaiter(_this, void 0, void 0, function () {
             var searchHandler, result, newItems;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -98,7 +100,7 @@ function useDataProvider(config) {
                             ? 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; }); });
-                        result = searchHandler(dataProvider.action, __assign({ query: config.query }, config.dataProvider.params));
+                        result = searchHandler(dataProvider.action, __assign(__assign({ query: config.query }, (isAuto ? { ids: config.initialSelectedIds } : null)), config.dataProvider.params));
                         if (!(result && isFunction_1["default"](result.then))) return [3 /*break*/, 2];
                         setIsLoading(true);
                         return [4 /*yield*/, result];
@@ -123,20 +125,19 @@ function useDataProvider(config) {
         }
         else if (config.autoFetch && isAutoFetchedRef.current === false) {
             isAutoFetchedRef.current = true;
-            fetchRemote();
+            fetchRemote(true);
         }
         else if (autoComplete.enable) {
             if (delayTimerRef.current) {
                 clearTimeout(delayTimerRef.current);
             }
-            // Min length query logic
-            if (config.query && config.query.length >= autoComplete.minLength) {
+            // Changed query logic
+            if (prevQuery !== config.query) {
                 // Search with delay
                 delayTimerRef.current = setTimeout(fetchRemote, autoComplete.delay);
             }
         }
-    }, [autoComplete, components.api, components.http, config.autoFetch, config.dataProvider, config.query,
-        dataProvider, dataProvider.action, dataProvider.onSearch, sourceItems]);
+    }, [autoComplete, components.api, components.http, config.autoFetch, config.dataProvider, config.initialSelectedIds, config.query, dataProvider, dataProvider.action, dataProvider.onSearch, prevQuery, sourceItems]);
     return {
         sourceItems: sourceItems,
         items: items,

package/hooks/useDataSelect.d.ts

@@ -1,3 +1,8 @@
+interface IDataSelectItem {
+    id: number | string | boolean;
+    label?: string;
+    [key: string]: unknown;
+}
 export interface IDataSelectConfig {
     /**
      * Возможность множественного выбора
@@ -5,14 +10,10 @@ export interface IDataSelectConfig {
      */
     multiple?: boolean;
     /**
-     * Список с элементами
+     * Список с видимыми элементами
      * @example [{id: 1, label: 'Krasnoyarsk'}, {id: 2, label: 'Moscow'}]
      */
-    items: {
-        id: number | string | boolean;
-        label?: string;
-        [key: string]: unknown;
-    }[];
+    items?: IDataSelectItem[];
     /**
      * Сделать активным первый элемент в списке
      * @example true
@@ -22,7 +23,7 @@ export interface IDataSelectConfig {
      * Список с идентификаторами выбранных элементов
      * @example [1, 4]
      */
-    selectedIds: any;
+    selectedIds?: any;
     /**
      * Первичный ключ для item
      * @example id
@@ -31,7 +32,11 @@ export interface IDataSelectConfig {
     /**
      * Значение поля в форме
      */
-    inputValue: any;
+    inputValue?: any;
+    /**
+     *  Список со всеми элементами
+     */
+    sourceItems?: IDataSelectItem[];
 }
 export interface IDataSelectResult {
     isOpened: boolean;
@@ -42,5 +47,7 @@ export interface IDataSelectResult {
     setHoveredId: (id: PrimaryKey) => void;
     selectedIds: PrimaryKey[];
     setSelectedIds: (ids: PrimaryKey | PrimaryKey[], skipToggle?: boolean) => void;
+    selectedItems: IDataSelectItem[];
 }
 export default function useDataSelect(config: IDataSelectConfig): IDataSelectResult;
+export {};

package/hooks/useDataSelect.js

@@ -21,7 +21,8 @@ function useDataSelect(config) {
     var primaryKey = config.primaryKey || defaultProps.primaryKey;
     // Initial select
     var initialSelectedIds = react_1.useMemo(function () {
-        if (config.selectedIds.length > 0) {
+        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)) {
@@ -31,12 +32,18 @@ function useDataSelect(config) {
             ? [config.items[0][primaryKey]]
             : [];
     }, [config.items, config.selectFirst, config.selectedIds, primaryKey, config.inputValue]);
-    // console.log(initialSelectedIds);
+    var initialSelectedItems = react_1.useMemo(function () { return config.items.length > 0
+        && initialSelectedIds.length > 0
+        ? initialSelectedIds
+            .map(function (selectedId) { return config.items.find(function (item) { return item.id === selectedId; }); })
+            .filter(Boolean)
+        : []; }, [initialSelectedIds, config.items]);
     // 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];
     // Handler for select/toggle item by id
     var setSelectedIds = react_1.useCallback(function (ids, skipToggle) {
         if (skipToggle === void 0) { skipToggle = false; }
@@ -44,7 +51,7 @@ function useDataSelect(config) {
             if (!config.multiple && ids.length > 1) {
                 ids = [ids[0]];
             }
-            setSelectedIdsInternal(ids);
+            setSelectedIdsInternal(ids.sort());
         }
         else {
             var id_1 = ids;
@@ -54,11 +61,11 @@ function useDataSelect(config) {
             else if (config.multiple) {
                 if (selectedIds.indexOf(id_1) !== -1) {
                     if (!skipToggle) {
-                        setSelectedIdsInternal(selectedIds.filter(function (itemValue) { return itemValue !== id_1; }));
+                        setSelectedIdsInternal(selectedIds.filter(function (itemValue) { return itemValue !== id_1; }).sort());
                     }
                 }
                 else {
-                    setSelectedIdsInternal(__spreadArray(__spreadArray([], selectedIds), [id_1]));
+                    setSelectedIdsInternal(__spreadArray(__spreadArray([], selectedIds), [id_1]).sort());
                 }
             }
             else {
@@ -69,6 +76,29 @@ function useDataSelect(config) {
             }
         }
     }, [config.multiple, selectedIds]);
+    // 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 newSelectedItems = [];
+        var hasChanges = false;
+        selectedIds.forEach(function (selectedId) {
+            var finedItem = config.items.find(function (item) { return item[primaryKey] === selectedId; });
+            if (!finedItem && config.sourceItems) {
+                finedItem = config.sourceItems.find(function (item) { return item[primaryKey] === selectedId; });
+            }
+            var selectedItem = selectedItems.find(function (item) { return item[primaryKey] === selectedId; });
+            if (finedItem || selectedItem) {
+                newSelectedItems.push(finedItem || selectedItem);
+            }
+            if (finedItem
+                && (!selectedItem || selectedItem !== finedItem)) {
+                hasChanges = true;
+            }
+        });
+        if (hasChanges || prevSelectedIdsLength !== selectedIds.length) {
+            setSelectedItemsInternal(newSelectedItems);
+        }
+    }, [config.items, config.sourceItems, primaryKey, selectedIds, selectedItems, prevSelectedIdsLength]);
     // Select first after fetch data
     var prevItemsLength = react_use_1.usePrevious(config.items.length);
     react_use_1.useUpdateEffect(function () {
@@ -79,20 +109,27 @@ function useDataSelect(config) {
     // Update selected items on change value
     var prevConfigSelectedIds = react_use_1.usePrevious(config.selectedIds || []);
     react_use_1.useUpdateEffect(function () {
-        // console.log(config.selectedIds, prevConfigSelectedIds);
-        var newSelectedIds = config.selectedIds && config.selectedIds.length > 0
-            ? config.items.map(function (item) { return item[primaryKey]; }).filter(function (id) { return config.selectedIds.includes(id); })
-            : [];
-        if (!isEqual_1["default"](prevConfigSelectedIds, newSelectedIds) && newSelectedIds.length !== 0) {
+        var newSelectedIds = config.selectedIds;
+        selectedItems.forEach(function (selectedItem) {
+            if (!newSelectedIds.includes(selectedItem.id) && config.selectedIds
+                && config.selectedIds.includes(selectedItem.id)) {
+                newSelectedIds.push(selectedItem.id);
+            }
+        });
+        newSelectedIds.sort();
+        if (!isEqual_1["default"](prevConfigSelectedIds, newSelectedIds)
+            && !isEqual_1["default"](selectedIds, newSelectedIds) && newSelectedIds.length !== 0) {
             setSelectedIdsInternal(newSelectedIds);
         }
-    }, [config.items, config.selectedIds, primaryKey, prevConfigSelectedIds]);
+    }, [config.items, config.selectedIds, primaryKey, prevConfigSelectedIds,
+        selectedItems, config.sourceItems, selectedIds]);
     // Global key down handler for navigate on items
     // Support keys:
     // - tab
     // - esc
     // - enter
     // - up/down arrows
+    // - space
     var onKeyDown = react_1.useCallback(function (e) {
         // Skip no active
         if (!isFocused && !isOpened) {
@@ -102,9 +139,8 @@ function useDataSelect(config) {
         if ([9, 27].includes(e.which)) {
             e.preventDefault();
             setIsOpened(false);
-            return;
         }
-        // Keys: enter
+        // Keys: enter (select and close)
         if (e.which === 13 && isOpened) {
             e.preventDefault();
             if (hoveredId) {
@@ -119,6 +155,15 @@ function useDataSelect(config) {
                 // Select first result
                 setSelectedIds(config.items[0], true);
             }
+            setIsOpened(false);
+        }
+        // Keys: space (toggle select)
+        if (e.which === 32 && isOpened) {
+            e.preventDefault();
+            if (hoveredId) {
+                // Select hovered
+                setSelectedIds(hoveredId);
+            }
         }
         // Keys: arrow up, arrow down
         if ([38, 40].includes(e.which)) {
@@ -157,7 +202,8 @@ function useDataSelect(config) {
         hoveredId: hoveredId,
         setHoveredId: setHoveredId,
         selectedIds: selectedIds,
-        setSelectedIds: setSelectedIds
+        setSelectedIds: setSelectedIds,
+        selectedItems: selectedItems
     };
 }
 exports["default"] = useDataSelect;

package/hooks/useDispatch.d.ts

@@ -1 +1 @@
-export default function useDispatch(): import("redux").Dispatch<any>;
+export default function useDispatch(): any;

package/hooks/useFetch.d.ts

@@ -1,5 +1,10 @@
-import { IComponents } from './useComponents';
+import { IComponents } from '../providers/ComponentsProvider';
 import { IApiMethod } from '../components/ApiComponent';
+declare global {
+    interface Window {
+        APP_PRELOADED_DATA: any;
+    }
+}
 export interface IFetchConfig {
     id?: string | number;
     url?: string | IApiMethod;
@@ -18,6 +23,10 @@ export interface IFetchResult {
     isLoading: boolean;
     fetch?: (newParams?: Record<string, unknown>) => void;
 }
+export declare const normalizeConfig: (config: any) => any;
+export declare const getConfigId: (config: any) => any;
+export declare const defaultFetchHandler: (config: any, components: any, addCancelToken: any) => any;
+export declare const fetchData: (config: any, components: any, addCancelToken: any) => any;
 /**
  * Fetch
  * Используется для подгрузки данных с бекенда перед рендером компонента, на котором он применяется.
@@ -25,7 +34,6 @@ export interface IFetchResult {
  * которые описывают откуда нужно подтянуть данные.
  *
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
- * ключ `key`. Все данные сохраняются в Redux Store, что позволяет избежать дополнительных запросов при использовании
- * SSR.
+ * ключ `key`.
  */
 export default function useFetch(rawConfig?: IFetchConfig): IFetchResult;

package/hooks/useFetch.js

@@ -50,12 +50,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+exports.fetchData = exports.defaultFetchHandler = exports.getConfigId = exports.normalizeConfig = void 0;
 var react_1 = require("react");
 var react_use_1 = require("react-use");
+var trim_1 = __importDefault(require("lodash-es/trim"));
 var axios_1 = __importDefault(require("axios"));
 var index_1 = require("./index");
 var normalizeConfig = function (config) { return (config
     ? __assign({ id: null, url: '', method: 'get', params: {}, options: null, onFetch: null }, config) : null); };
+exports.normalizeConfig = normalizeConfig;
+var getConfigId = function (config) {
+    if (config === null) {
+        return null;
+    }
+    var result = trim_1["default"](config.id || config.url, '/');
+    if (!result) {
+        // eslint-disable-next-line no-console
+        console.warn('Please set id for fetch config, it`s necessary for SSR to work properly');
+    }
+    return result;
+};
+exports.getConfigId = getConfigId;
 var defaultFetchHandler = function (config, components, addCancelToken) {
     var cancelToken = new axios_1["default"].CancelToken(function (cancel) {
         addCancelToken(cancel);
@@ -67,6 +82,9 @@ var defaultFetchHandler = function (config, components, addCancelToken) {
         .send(config.method, config.url, config.params, __assign(__assign({}, config.options), { cancelToken: cancelToken }))
         .then(function (result) { return result.data; });
 };
+exports.defaultFetchHandler = defaultFetchHandler;
+var fetchData = function (config, components, addCancelToken) { return ((config.onFetch || exports.defaultFetchHandler).call(null, config, components, addCancelToken)); };
+exports.fetchData = fetchData;
 /**
  * Fetch
  * Используется для подгрузки данных с бекенда перед рендером компонента, на котором он применяется.
@@ -74,26 +92,26 @@ var defaultFetchHandler = function (config, components, addCancelToken) {
  * которые описывают откуда нужно подтянуть данные.
  *
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
- * ключ `key`. Все данные сохраняются в Redux Store, что позволяет избежать дополнительных запросов при использовании
- * SSR.
+ * ключ `key`.
  */
 function useFetch(rawConfig) {
     var _this = this;
     if (rawConfig === void 0) { rawConfig = null; }
     var components = index_1.useComponents();
     // Store config in state
-    var _a = react_1.useState(normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
+    var _a = react_1.useState(exports.normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
     // Update config in state on raw config updated
     react_use_1.useUpdateEffect(function () {
         setConfig(rawConfig);
     }, [rawConfig]);
-    // Resolve config id
-    // TODO Get initial state from HttpComponent (for SSR) by configId
-    //const idRef = useRef(_uniqueId('fetch'));
-    //const configId = config ? _trim(config.id || config.url || idRef.current, '/') : null;
+    // Get preloaded data
+    var configId = exports.getConfigId(config);
+    var ssrValueContext = index_1.useSsr();
+    var preloadedData = process.env.IS_SSR ? ssrValueContext.preloadedData : window.APP_PRELOADED_DATA;
+    var preloadedDataByConfigId = (preloadedData && configId) ? preloadedData[configId] : null;
     // State for data and loading flag
-    var _b = react_1.useState(null), data = _b[0], setData = _b[1];
-    var _c = react_1.useState(!!config), isLoading = _c[0], setIsLoading = _c[1];
+    var _b = react_1.useState(preloadedDataByConfigId || null), data = _b[0], setData = _b[1];
+    var _c = react_1.useState(!!config && !data), isLoading = _c[0], setIsLoading = _c[1];
     // Cancel tokens
     var cancelTokens = react_1.useRef([]);
     var addCancelToken = function (token) { return cancelTokens.current.push(token); };
@@ -109,10 +127,11 @@ function useFetch(rawConfig) {
                         if (newConfig) {
                             setConfig(__assign(__assign(__assign({}, config), newConfig), { params: __assign(__assign({}, config === null || config === void 0 ? void 0 : config.params), newConfig === null || newConfig === void 0 ? void 0 : newConfig.params) }));
                         }
+                        setData(null);
                         if (!config) return [3 /*break*/, 2];
                         setIsLoading(true);
                         _a = setData;
-                        return [4 /*yield*/, (config.onFetch || defaultFetchHandler).call(null, config, components, addCancelToken)];
+                        return [4 /*yield*/, exports.fetchData(config, components, addCancelToken)];
                     case 1:
                         _a.apply(void 0, [_b.sent()]);
                         setIsLoading(false);
@@ -122,28 +141,15 @@ function useFetch(rawConfig) {
             });
         });
     }, [components, config]);
+    react_use_1.useEffectOnce(function () {
+        if (!data) {
+            fetch();
+        }
+    });
     // Fetch data on config update
-    react_1.useLayoutEffect(function () {
-        var fetchData = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        setData(null);
-                        if (!config) return [3 /*break*/, 2];
-                        setIsLoading(true);
-                        _a = setData;
-                        return [4 /*yield*/, (config.onFetch || defaultFetchHandler).call(null, config, components, addCancelToken)];
-                    case 1:
-                        _a.apply(void 0, [_b.sent()]);
-                        setIsLoading(false);
-                        _b.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        }); };
-        fetchData();
-    }, [components, config]);
+    react_use_1.useUpdateEffect(function () {
+        fetch();
+    }, [fetch]);
     return { data: data, isLoading: isLoading, fetch: fetch };
 }
 exports["default"] = useFetch;

package/hooks/useFile.js

@@ -178,18 +178,29 @@ function useFile(props) {
     /**
      * Remove selected file from uploader
      * @param {File} fileToRemove
-     * @private
      */
     var onRemove = function (fileToRemove) {
         uploader.queue.remove([fileToRemove]);
         forceUpdate();
     };
     var files = [].concat(uploader.queue.getFiles());
+    /**
+     * Add file to uploader
+     * @param {File} newFile
+     */
+    var onAdd = function (newFile) {
+        if (!props.multiple) {
+            uploader.queue.remove(files);
+        }
+        uploader.queue.add([newFile]);
+        forceUpdate();
+    };
     return {
         uploader: uploader,
         files: files,
         onBrowse: onBrowse,
-        onRemove: onRemove
+        onRemove: onRemove,
+        onAdd: onAdd
     };
 }
 exports["default"] = useFile;