@steroidsjs/core 2.2.28 → 2.2.31

package/hooks/useFile.js

@@ -173,13 +173,13 @@ function useFile(props) {
     //todo refactoring
     react_1.useEffect(function () {
         if (prevInputValue && !isEqual_1["default"](prevInputValue !== props.input.value)) {
-            var toRemove_1 = difference_1["default"]([].concat(props.input.value || []), [].concat(prevInputValue || []));
+            var toRemove_1 = difference_1["default"]([].concat(prevInputValue || []), [].concat(props.input.value || []));
             if (toRemove_1.length > 0) {
                 uploader.queue.remove(uploader.queue.getFiles().filter(function (file) { return (toRemove_1.indexOf(get_1["default"](file.getResultHttpMessage(), 'id')) !== -1); }));
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [prevInputValue]);
+    }, [prevInputValue, props.input.value]);
     /**
      * Show browse dialog in user browser
      * @param {object} event

package/package.json

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

package/ui/form/Form/Form.js

@@ -158,7 +158,7 @@ function Form(props) {
     var onSubmit = react_1.useCallback(function (e) {
         if (e === void 0) { e = null; }
         return __awaiter(_this, void 0, void 0, function () {
-            var cleanedValues, captchaAttribute, googleCaptcha, captchaToken, options, response, _a, data;
+            var cleanedValues, submitResult, captchaAttribute, googleCaptcha, captchaToken, options, response, _a, data;
             var _b;
             var _this = this;
             return __generator(this, function (_c) {
@@ -181,14 +181,19 @@ function Form(props) {
                         cleanedValues = form_1.cleanEmptyObject(values);
                         // Event onBeforeSubmit
                         if (props.onBeforeSubmit && props.onBeforeSubmit.call(null, cleanedValues) === false) {
+                            dispatch(form_2.formSetSubmitting(props.formId, false));
                             return [2 /*return*/, null];
                         }
                         if (props.validators) {
                             validate_1["default"](cleanedValues, props.validators);
                         }
-                        if (props.onSubmit) {
-                            return [2 /*return*/, props.onSubmit.call(null, cleanedValues)];
-                        }
+                        if (!props.onSubmit) return [3 /*break*/, 2];
+                        return [4 /*yield*/, props.onSubmit.call(null, cleanedValues)];
+                    case 1:
+                        submitResult = _c.sent();
+                        dispatch(form_2.formSetSubmitting(props.formId, false));
+                        return [2 /*return*/, submitResult];
+                    case 2:
                         captchaAttribute = null;
                         Object.entries(components.ui.getRegisteredFields(props.formId) || {}).forEach(function (_a) {
                             var attribute = _a[0], fieldType = _a[1];
@@ -196,20 +201,20 @@ function Form(props) {
                                 captchaAttribute = attribute;
                             }
                         });
-                        if (!(captchaAttribute && components.resource.googleCaptchaSiteKey)) return [3 /*break*/, 3];
+                        if (!(captchaAttribute && components.resource.googleCaptchaSiteKey)) return [3 /*break*/, 5];
                         return [4 /*yield*/, components.resource.loadGoogleCaptcha()];
-                    case 1:
+                    case 3:
                         googleCaptcha = _c.sent();
                         return [4 /*yield*/, getCaptchaToken({
                                 googleCaptcha: googleCaptcha,
                                 siteKey: components.resource.googleCaptchaSiteKey,
                                 actionName: props.captchaActionName
                             })];
-                    case 2:
+                    case 4:
                         captchaToken = _c.sent();
                         cleanedValues = __assign(__assign({}, cleanedValues), (_b = {}, _b[captchaAttribute] = captchaToken, _b));
-                        _c.label = 3;
-                    case 3:
+                        _c.label = 5;
+                    case 5:
                         options = {
                             onTwoFactor: props.onTwoFactor
                                 ? function (providerName) { return __awaiter(_this, void 0, void 0, function () {
@@ -234,16 +239,16 @@ function Form(props) {
                                 }); }
                                 : undefined
                         };
-                        if (!(typeof props.action === 'function')) return [3 /*break*/, 5];
+                        if (!(typeof props.action === 'function')) return [3 /*break*/, 7];
                         return [4 /*yield*/, props.action.call(null, components.api, cleanedValues, options)];
-                    case 4:
-                        _a = _c.sent();
-                        return [3 /*break*/, 7];
-                    case 5: return [4 /*yield*/, components.http.send(props.actionMethod, props.action || window.location.pathname, cleanedValues, options)];
                     case 6:
                         _a = _c.sent();
-                        _c.label = 7;
-                    case 7:
+                        return [3 /*break*/, 9];
+                    case 7: return [4 /*yield*/, components.http.send(props.actionMethod, props.action || window.location.pathname, cleanedValues, options)];
+                    case 8:
+                        _a = _c.sent();
+                        _c.label = 9;
+                    case 9:
                         response = _a;
                         dispatch(form_2.formSetSubmitting(props.formId, false));
                         // Skip on 2fa

package/ui/layout/Meta/Meta.js

@@ -27,9 +27,7 @@ function Meta(props) {
         _c.map(function (attrs, index) { return (react_1["default"].createElement("style", __assign({ key: index }, attrs, { dangerouslySetInnerHTML: {
                 __html: attrs.innerHtml
             } }))); }), (_d = props.scripts) === null || _d === void 0 ? void 0 :
-        _d.map(function (attrs, index) { return (react_1["default"].createElement("script", __assign({ key: index }, attrs, { dangerouslySetInnerHTML: {
-                __html: attrs.innerHtml
-            } }))); }), (_e = props.noScripts) === null || _e === void 0 ? void 0 :
+        _d.map(function (attrs, index) { return (react_1["default"].createElement("script", __assign({ key: index }, attrs), attrs.innerHtml || '')); }), (_e = props.noScripts) === null || _e === void 0 ? void 0 :
         _e.map(function (attrs, index) { return (react_1["default"].createElement("noscript", { key: index, dangerouslySetInnerHTML: {
                 __html: attrs.innerHtml
             } })); }),