@steroidsjs/core 2.2.59 → 2.2.62

package/hoc/file.d.ts

@@ -15,7 +15,7 @@ export interface IFileHocInput {
     uploaderConfig?: {
         useFormData?: boolean;
         fileFieldName?: string;
-    };
+    } | any;
 }
 export interface IFileHocOutput {
     uploader?: any;

package/hooks/useFetch.d.ts

@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { IComponents } from '../providers/ComponentsProvider';
 import { IApiMethod } from '../components/ApiComponent';
 declare global {
@@ -22,6 +23,7 @@ export interface IFetchResult {
     } | any;
     isLoading: boolean;
     fetch?: (newParams?: Record<string, unknown>) => void;
+    axiosError: AxiosError | null;
 }
 export declare const normalizeConfig: (config: any) => any;
 export declare const getConfigId: (config: any) => any;

package/hooks/useFetch.js

@@ -111,7 +111,8 @@ function useFetch(rawConfig) {
     var preloadedDataByConfigId = (preloadedData && configId) ? preloadedData[configId] : null;
     // State for data and loading flag
     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];
+    var _c = react_1.useState(null), axiosError = _c[0], setAxiosError = _c[1];
+    var _d = react_1.useState(!!config && !data), isLoading = _d[0], setIsLoading = _d[1];
     // Cancel tokens
     var cancelTokens = react_1.useRef([]);
     var addCancelToken = function (token) { return cancelTokens.current.push(token); };
@@ -120,7 +121,7 @@ function useFetch(rawConfig) {
     var fetch = react_1.useCallback(function (newConfig) {
         if (newConfig === void 0) { newConfig = null; }
         return __awaiter(_this, void 0, void 0, function () {
-            var _a;
+            var _a, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -128,15 +129,26 @@ function useFetch(rawConfig) {
                             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];
+                        if (!config) return [3 /*break*/, 5];
                         setIsLoading(true);
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
                         _a = setData;
                         return [4 /*yield*/, exports.fetchData(config, components, addCancelToken)];
-                    case 1:
+                    case 2:
                         _a.apply(void 0, [_b.sent()]);
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_1 = _b.sent();
+                        if (error_1.isAxiosError) {
+                            setAxiosError(error_1);
+                        }
+                        return [3 /*break*/, 4];
+                    case 4:
                         setIsLoading(false);
-                        _b.label = 2;
-                    case 2: return [2 /*return*/];
+                        _b.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -150,6 +162,6 @@ function useFetch(rawConfig) {
     react_use_1.useUpdateEffect(function () {
         fetch();
     }, [fetch]);
-    return { data: data, isLoading: isLoading, fetch: fetch };
+    return { data: data, isLoading: isLoading, fetch: fetch, axiosError: axiosError };
 }
 exports["default"] = useFetch;

package/hooks/useFile.js

@@ -39,7 +39,12 @@ function generateBackendUrl(props) {
     });
 }
 function useFile(props) {
-    var uploader = useInitial_1["default"](function () { return new fileup_core_1["default"](__assign(__assign({ dropArea: {}, backendUrl: generateBackendUrl(props), uploaderConfig: __assign({}, props.uploaderConfig) }, props.uploader), { form: __assign(__assign({}, (props.uploader && props.uploader.form)), { multiple: props.multiple }) })); });
+    var http = index_1.useComponents().http;
+    http.getAccessToken(); // TODO Run promise..
+    var uploader = useInitial_1["default"](function () {
+        var _a;
+        return new fileup_core_1["default"](__assign(__assign({ dropArea: {}, backendUrl: generateBackendUrl(props), uploaderConfig: __assign(__assign({}, props.uploaderConfig), { headers: __assign(__assign({}, (_a = props.uploaderConfig) === null || _a === void 0 ? void 0 : _a.headers), { Authorization: 'Bearer ' + http._accessToken }) }) }, props.uploader), { form: __assign(__assign({}, (props.uploader && props.uploader.form)), { multiple: props.multiple }) }));
+    });
     /**
      * Force component update when file status or progress changes
      * @private

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.2.59",
+  "version": "2.2.62",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {

package/ui/modal/Modal/Modal.d.ts

@@ -25,12 +25,16 @@ export interface IModalProps {
      */
     controls?: IControlItem[];
     /**
-     * Время, через которое произойдет закрытие Modal.
-     * В этот отрезок времени должны происходить все анимации закрытия компонента.
+     * Время, в течение которого будет происходить анимация закрытия Modal.
      * Переопределяет отрезок времени, заданный в ModalPortal
      * @example 300
      */
     closeTimeoutMs?: number;
+    /**
+     * Время, через которое автоматически произойдет закрытие Modal.
+     * @example 1000
+     */
+    closeAfterMs?: number;
     /**
      * Группа Modal
      * @example 'modal'

package/ui/modal/Modal/Modal.js

@@ -36,6 +36,11 @@ function Modal(props) {
     var components = hooks_1.useComponents();
     var ModalView = props.view || components.ui.getView('modal.ModalView');
     var ContentComponent = props.component;
+    React.useEffect(function () {
+        if (props.closeAfterMs) {
+            setTimeout(function () { return props.onClose(); }, props.closeAfterMs);
+        }
+    }, []);
     return (React.createElement(ModalView, __assign({}, props), (ContentComponent && (React.createElement(ContentComponent, __assign({}, props, props.componentProps)))) || (props.children)));
 }
 Modal.defaultProps = {