@formio/js 5.0.0-dev.5911.81fbc1f → 5.0.0-dev.5913.cb0bb4a

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

@@ -20,6 +20,8 @@
 
 /*! @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 */
 
+/*! @license DOMPurify 3.2.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.0/LICENSE */
+
 /*! formiojs v5.0.0-rc.59 | https://unpkg.com/formiojs@5.0.0-rc.59/LICENSE.txt */
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

package/lib/cjs/WebformBuilder.js

@@ -808,18 +808,31 @@ class WebformBuilder extends Component_1.default {
         // Show an error if siblings are disabled for a component and such a component already exists.
         const compKey = (group === 'resource') ? `component-${key}` : key;
         const draggableComponent = ((_a = this.groups[group]) === null || _a === void 0 ? void 0 : _a.components[compKey]) || {};
-        if (draggableComponent.disableSiblings || draggableComponent.uniqueComponent) {
+        if (draggableComponent.disableSiblings) {
             let isCompAlreadyExists = false;
             (0, formUtils_1.eachComponent)(this.webform.components, (component) => {
-                if ((draggableComponent.disableSiblings && component.type === draggableComponent.schema.type) ||
-                    (draggableComponent.uniqueComponent && component.component.key === draggableComponent.schema.key)) {
+                if (component.type === draggableComponent.schema.type) {
                     isCompAlreadyExists = true;
                     return;
                 }
             }, true);
             if (isCompAlreadyExists) {
                 this.webform.redraw();
-                this.webform.setAlert('danger', `You cannot add more than one ${lodash_1.default.get(draggableComponent, draggableComponent.uniqueComponent ? 'title' : 'key')} component to one page.`);
+                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.key} component to one page.`);
+                return;
+            }
+        }
+        if (draggableComponent.uniqueComponent) {
+            let isCompAlreadyExists = false;
+            (0, formUtils_1.eachComponent)(this.webform.components, (component) => {
+                if (component.key === draggableComponent.schema.key) {
+                    isCompAlreadyExists = true;
+                    return;
+                }
+            }, true);
+            if (isCompAlreadyExists) {
+                this.webform.redraw();
+                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.title} component to one page.`);
                 return;
             }
         }

package/lib/cjs/Wizard.js

@@ -189,7 +189,7 @@ class Wizard extends Webform_1.default {
         const ctx = this.renderContext;
         if (this.component.key) {
             ctx.panels.map(panel => {
-                if (panel.key === this.component.key) {
+                if (panel.key === this.component.key && panel.title === this.component.title) {
                     this.currentPanel = panel;
                     ctx.wizardPageTooltip = this.getFormattedTooltip(panel.tooltip);
                 }
@@ -876,6 +876,9 @@ class Wizard extends Webform_1.default {
             currentPanels = this.pages.map(page => page.component.key);
             this.establishPages();
             panels = this.pages.map(page => page.component.key);
+            if (panels.length !== currentPanels.length) {
+                this.setPage(this.pages.findIndex(page => page.component.title === this.currentPanel.components[0].label));
+            }
         }
         else {
             currentPanels = this.currentPanels || this.pages.map(page => page.component.key);
@@ -932,7 +935,6 @@ class Wizard extends Webform_1.default {
                 }
             });
         }
-        ;
         return super.showErrors(errors, triggerEvent);
     }
     focusOnComponent(key) {

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

@@ -3252,12 +3252,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,
@@ -3268,7 +3262,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/selectboxes/SelectBoxes.js

@@ -267,7 +267,6 @@ class SelectBoxesComponent extends Radio_1.default {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!(0, utils_1.boolValue)(setting) || !value) {

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/WebformBuilder.js

@@ -793,18 +793,31 @@ export default class WebformBuilder extends Component {
         // Show an error if siblings are disabled for a component and such a component already exists.
         const compKey = (group === 'resource') ? `component-${key}` : key;
         const draggableComponent = this.groups[group]?.components[compKey] || {};
-        if (draggableComponent.disableSiblings || draggableComponent.uniqueComponent) {
+        if (draggableComponent.disableSiblings) {
             let isCompAlreadyExists = false;
             eachComponent(this.webform.components, (component) => {
-                if ((draggableComponent.disableSiblings && component.type === draggableComponent.schema.type) ||
-                    (draggableComponent.uniqueComponent && component.component.key === draggableComponent.schema.key)) {
+                if (component.type === draggableComponent.schema.type) {
                     isCompAlreadyExists = true;
                     return;
                 }
             }, true);
             if (isCompAlreadyExists) {
                 this.webform.redraw();
-                this.webform.setAlert('danger', `You cannot add more than one ${_.get(draggableComponent, draggableComponent.uniqueComponent ? 'title' : 'key')} component to one page.`);
+                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.key} component to one page.`);
+                return;
+            }
+        }
+        if (draggableComponent.uniqueComponent) {
+            let isCompAlreadyExists = false;
+            eachComponent(this.webform.components, (component) => {
+                if (component.key === draggableComponent.schema.key) {
+                    isCompAlreadyExists = true;
+                    return;
+                }
+            }, true);
+            if (isCompAlreadyExists) {
+                this.webform.redraw();
+                this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.title} component to one page.`);
                 return;
             }
         }

package/lib/mjs/Wizard.js

@@ -179,7 +179,7 @@ export default class Wizard extends Webform {
         const ctx = this.renderContext;
         if (this.component.key) {
             ctx.panels.map(panel => {
-                if (panel.key === this.component.key) {
+                if (panel.key === this.component.key && panel.title === this.component.title) {
                     this.currentPanel = panel;
                     ctx.wizardPageTooltip = this.getFormattedTooltip(panel.tooltip);
                 }
@@ -864,6 +864,9 @@ export default class Wizard extends Webform {
             currentPanels = this.pages.map(page => page.component.key);
             this.establishPages();
             panels = this.pages.map(page => page.component.key);
+            if (panels.length !== currentPanels.length) {
+                this.setPage(this.pages.findIndex(page => page.component.title === this.currentPanel.components[0].label));
+            }
         }
         else {
             currentPanels = this.currentPanels || this.pages.map(page => page.component.key);
@@ -919,7 +922,6 @@ export default class Wizard extends Webform {
                 }
             });
         }
-        ;
         return super.showErrors(errors, triggerEvent);
     }
     focusOnComponent(key) {

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

@@ -3214,12 +3214,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,
@@ -3230,7 +3224,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/selectboxes/SelectBoxes.js

@@ -268,7 +268,6 @@ export default class SelectBoxesComponent extends RadioComponent {
         else {
             return super.setCustomValidity(messages, dirty, external);
         }
-        ;
     }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {

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-dev.5911.81fbc1f",
+  "version": "5.0.0-dev.5913.cb0bb4a",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -82,7 +82,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-dev.98.17ba6ea",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "v2.1.0-dev.174.9a3c6ec",
+    "@formio/core": "2.1.0-dev.191.8c609ab",
     "@formio/text-mask-addons": "^3.8.0-formio.3",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",