@formio/js 5.0.0-rc.97 → 5.0.0-rc.99

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,7 +20,7 @@
 
 /*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
 
-/*! formiojs v5.0.0-rc.97 | https://unpkg.com/formiojs@5.0.0-rc.97/LICENSE.txt */
+/*! formiojs v5.0.0-rc.99 | https://unpkg.com/formiojs@5.0.0-rc.99/LICENSE.txt */
 
 /**
  * @license

package/lib/cjs/components/_classes/component/Component.js

@@ -3224,12 +3224,6 @@ class Component extends Element_1.default {
         return (this.component.protected || !this.component.persistent || (this.component.persistent === 'client-only'));
     }
     shouldSkipValidation(data, row, flags = {}) {
-        const { validateWhenHidden = false } = this.component || {};
-        const forceValidOnHidden = (!this.visible || !this.checkCondition(row, data)) && !validateWhenHidden;
-        if (forceValidOnHidden) {
-            // If this component is forced valid when it is hidden, then we also need to reset the errors for this component.
-            this._errors = [];
-        }
         const rules = [
             // Do not validate if the flags say not too.
             () => flags.noValidate,
@@ -3240,7 +3234,14 @@ class Component extends Element_1.default {
             // Check to see if we are editing and if so, check component persistence.
             () => this.isValueHidden(),
             // Force valid if component is hidden.
-            () => forceValidOnHidden
+            () => {
+                if (!this.component.validateWhenHidden && (!this.visible || !this.checkCondition(row, data))) {
+                    // If this component is forced valid when it is hidden, then we also need to reset the errors for this component.
+                    this._errors = [];
+                    return true;
+                }
+                return false;
+            }
         ];
         return rules.some(pred => pred());
     }

package/lib/cjs/components/radio/Radio.js

@@ -332,9 +332,8 @@ class RadioComponent extends ListComponent_1.default {
                 label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
             listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (lodash_1.default.isUndefined(valueAtProperty) ||
-                (!this.isRadio && lodash_1.default.isObject(valueAtProperty)) ||
-                (!this.isRadio && lodash_1.default.isBoolean(valueAtProperty)))) {
+            const value = this.loadedOptions[i].value;
+            if (!this.isRadio && (lodash_1.default.isObject(value) || lodash_1.default.isBoolean(value) || lodash_1.default.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
         });

package/lib/cjs/utils/i18n.js

@@ -79,7 +79,12 @@ class I18n {
         this.languages[language] = strings;
     }
     t(text, ...args) {
+        var _a;
         if (this.currentLanguage[text]) {
+            const customTranslationFieldName = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.field;
+            if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
+                args[0].field = this.currentLanguage[customTranslationFieldName];
+            }
             return utils_1.Evaluator.interpolateString(this.currentLanguage[text], ...args);
         }
         return utils_1.Evaluator.interpolateString(text, ...args);

package/lib/mjs/components/_classes/component/Component.js

@@ -3189,12 +3189,6 @@ export default class Component extends Element {
         return (this.component.protected || !this.component.persistent || (this.component.persistent === 'client-only'));
     }
     shouldSkipValidation(data, row, flags = {}) {
-        const { validateWhenHidden = false } = this.component || {};
-        const forceValidOnHidden = (!this.visible || !this.checkCondition(row, data)) && !validateWhenHidden;
-        if (forceValidOnHidden) {
-            // If this component is forced valid when it is hidden, then we also need to reset the errors for this component.
-            this._errors = [];
-        }
         const rules = [
             // Do not validate if the flags say not too.
             () => flags.noValidate,
@@ -3205,7 +3199,14 @@ export default class Component extends Element {
             // Check to see if we are editing and if so, check component persistence.
             () => this.isValueHidden(),
             // Force valid if component is hidden.
-            () => forceValidOnHidden
+            () => {
+                if (!this.component.validateWhenHidden && (!this.visible || !this.checkCondition(row, data))) {
+                    // If this component is forced valid when it is hidden, then we also need to reset the errors for this component.
+                    this._errors = [];
+                    return true;
+                }
+                return false;
+            }
         ];
         return rules.some(pred => pred());
     }

package/lib/mjs/components/radio/Radio.js

@@ -332,9 +332,8 @@ export default class RadioComponent extends ListComponent {
                 label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
             listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (_.isUndefined(valueAtProperty) ||
-                (!this.isRadio && _.isObject(valueAtProperty)) ||
-                (!this.isRadio && _.isBoolean(valueAtProperty)))) {
+            const value = this.loadedOptions[i].value;
+            if (!this.isRadio && (_.isObject(value) || _.isBoolean(value) || _.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
         });

package/lib/mjs/utils/i18n.js

@@ -74,6 +74,10 @@ export class I18n {
     }
     t(text, ...args) {
         if (this.currentLanguage[text]) {
+            const customTranslationFieldName = args[0]?.field;
+            if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
+                args[0].field = this.currentLanguage[customTranslationFieldName];
+            }
             return Evaluator.interpolateString(this.currentLanguage[text], ...args);
         }
         return Evaluator.interpolateString(text, ...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.97",
+  "version": "5.0.0-rc.99",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-rc.41",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.3.0-rc.21",
+    "@formio/core": "2.3.0-rc.22",
     "@formio/text-mask-addons": "^3.8.0-formio.3",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",