@formio/js 5.0.0-rc.42 → 5.0.0-rc.43

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

@@ -10,11 +10,9 @@
  * MIT licensed
  */
 
-/*! @license DOMPurify 3.0.11 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.0.11/LICENSE */
+/*! @license DOMPurify 3.1.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.1.0/LICENSE */
 
-/*! @license DOMPurify 3.0.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.0.6/LICENSE */
-
-/*! formiojs v5.0.0-rc.42 | https://unpkg.com/formiojs@5.0.0-rc.42/LICENSE.txt */
+/*! formiojs v5.0.0-rc.43 | https://unpkg.com/formiojs@5.0.0-rc.43/LICENSE.txt */
 
 /**
  * @license

package/lib/cjs/Webform.js

@@ -693,12 +693,13 @@ class Webform extends NestedDataComponent_1.default {
      * @param {userId} - The user id where we need to restore the draft from.
      */
     restoreDraft(userId) {
-        if (!this.formio) {
+        const formio = this.formio || this.options.formio;
+        if (!formio) {
             this.handleDraftError('restoreDraftInstanceError', null, true);
             return;
         }
         this.savingDraft = true;
-        this.formio.loadSubmissions({
+        formio.loadSubmissions({
             params: {
                 state: 'draft',
                 owner: userId
@@ -997,10 +998,7 @@ class Webform extends NestedDataComponent_1.default {
      * @returns {*}
      */
     /* eslint-disable no-unused-vars */
-    showErrors(errors, triggerEvent, onChange) {
-        if (!errors) {
-            return;
-        }
+    showErrors(errors, triggerEvent) {
         this.loading = false;
         if (!Array.isArray(errors)) {
             errors = [errors];
@@ -1153,7 +1151,7 @@ class Webform extends NestedDataComponent_1.default {
         if (this.submitted) {
             // show server errors while they are not cleaned/fixed
             const nonComponentServerErrors = lodash_1.default.filter(this.serverErrors || [], err => !err.component && !err.path);
-            this.showErrors(nonComponentServerErrors.length ? nonComponentServerErrors : null);
+            this.showErrors(nonComponentServerErrors.length ? nonComponentServerErrors : errors);
         }
         // See if we need to save the draft of the form.
         if (modified && this.options.saveDraft) {

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

@@ -2698,6 +2698,7 @@ class Component extends Element_1.default {
             component: this.component,
             data,
             row,
+            value: this.validationValue,
             path: this.path || this.component.key,
             instance: this,
             scope: { errors: [] },
@@ -2965,6 +2966,11 @@ class Component extends Element_1.default {
     }
     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,
@@ -2975,9 +2981,7 @@ 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.
-            () => !this.visible && !validateWhenHidden,
-            // Force valid if component is conditionally hidden.
-            () => !this.checkCondition(row, data) && !validateWhenHidden
+            () => forceValidOnHidden
         ];
         return rules.some(pred => pred());
     }

package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.js

@@ -189,7 +189,7 @@ class NestedArrayComponent extends NestedDataComponent_1.default {
         return super.getValueAsString(value, options);
     }
     getComponents(rowIndex) {
-        if (rowIndex !== undefined) {
+        if (rowIndex !== undefined && rowIndex !== null) {
             if (!this.iteratableRows[rowIndex]) {
                 return [];
             }

package/lib/cjs/components/_classes/nesteddata/NestedDataComponent.js

@@ -66,7 +66,7 @@ class NestedDataComponent extends NestedComponent_1.default {
         <tbody>
     `);
         const htmlTagRegExp = new RegExp('<(.*?)>');
-        this.components.forEach((component) => {
+        this.everyComponent((component) => {
             if (component.isInputComponent && component.visible && !component.skipInEmail) {
                 const componentValue = component.getView(component.dataValue, options);
                 result += (`

package/lib/cjs/components/editgrid/EditGrid.js

@@ -1040,6 +1040,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
                 }
                 else {
                     this.alert.clear();
+                    this.alert = null;
                 }
             }
         }

package/lib/cjs/components/form/Form.js

@@ -143,6 +143,7 @@ class FormComponent extends Component_1.default {
             return this.subForm.getComponent(path, fn, originalPathStr);
         }
     }
+    /* eslint-disable max-statements */
     getSubOptions(options = {}) {
         options.events = this.createEmitter();
         // Make sure to not show the submit button in wizards in the nested forms.
@@ -200,12 +201,14 @@ class FormComponent extends Component_1.default {
         }
         if (this.options.saveDraft) {
             options.saveDraft = this.options.saveDraft;
+            options.formio = new Formio_1.Formio(this.formSrc);
         }
         if (this.options.saveDraftThrottle) {
             options.saveDraftThrottle = this.options.saveDraftThrottle;
         }
         return options;
     }
+    /* eslint-enable max-statements */
     render() {
         if (this.builderMode) {
             return super.render(this.component.label || 'Nested form');
@@ -403,10 +406,6 @@ class FormComponent extends Component_1.default {
                 this.subForm.nosubmit = true;
                 this.subForm.root = this.root;
                 this.subForm.localRoot = this.isNestedWizard ? this.localRoot : this.subForm;
-                if (this.parent) {
-                    this.subForm.draftEnabled = this.parent.draftEnabled;
-                    this.subForm.savingDraft = this.parent.savingDraft;
-                }
                 this.restoreValue();
                 this.valueChanged = this.hasSetValue;
                 this.onChange();
@@ -571,11 +570,15 @@ class FormComponent extends Component_1.default {
      * Submit the form before the whole form is triggered.
      */
     beforeSubmit() {
-        var _a;
+        var _a, _b, _c;
         const submission = this.dataValue;
+        // Cancel triggered saveDraft
+        if (((_a = this.subForm) === null || _a === void 0 ? void 0 : _a.draftEnabled) && ((_b = this.subForm.triggerSaveDraft) === null || _b === void 0 ? void 0 : _b.cancel)) {
+            this.subForm.triggerSaveDraft.cancel();
+        }
         const isAlreadySubmitted = submission && submission._id && submission.form;
         // This submission has already been submitted, so just return the reference data.
-        if (isAlreadySubmitted && !((_a = this.subForm) === null || _a === void 0 ? void 0 : _a.wizard)) {
+        if (isAlreadySubmitted && !((_c = this.subForm) === null || _c === void 0 ? void 0 : _c.wizard)) {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }

package/lib/cjs/widgets/CalendarWidget.js

@@ -338,7 +338,8 @@ class CalendarWidget extends InputWidget_1.default {
             this.input.setAttribute('aria-invalid', 'false');
         }
     }
-    validationValue(value) {
+    get validationValue() {
+        const value = this.dataValue;
         if (typeof value === 'string') {
             return new Date(value);
         }
@@ -357,7 +358,7 @@ class CalendarWidget extends InputWidget_1.default {
     initFlatpickr(Flatpickr) {
         // Create a new flatpickr.
         this.calendar = new Flatpickr(this._input, Object.assign(Object.assign({}, this.settings), { disableMobile: true }));
-        this.calendar.altInput.addEventListener('input', (event) => {
+        this.addEventListener(this.calendar.altInput, 'input', (event) => {
             if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
                 this.settings.manualInputValue = event.target.value;
                 this.settings.isManuallyOverriddenValue = true;

package/lib/cjs/widgets/InputWidget.js

@@ -43,8 +43,8 @@ class InputWidget extends Element_1.default {
     getValueAsString(value) {
         return value;
     }
-    validationValue(value) {
-        return value;
+    get validationValue() {
+        return this.dataValue;
     }
     addPrefix() {
         return null;

package/lib/mjs/Webform.js

@@ -693,12 +693,13 @@ export default class Webform extends NestedDataComponent {
      * @param {userId} - The user id where we need to restore the draft from.
      */
     restoreDraft(userId) {
-        if (!this.formio) {
+        const formio = this.formio || this.options.formio;
+        if (!formio) {
             this.handleDraftError('restoreDraftInstanceError', null, true);
             return;
         }
         this.savingDraft = true;
-        this.formio.loadSubmissions({
+        formio.loadSubmissions({
             params: {
                 state: 'draft',
                 owner: userId
@@ -997,10 +998,7 @@ export default class Webform extends NestedDataComponent {
      * @returns {*}
      */
     /* eslint-disable no-unused-vars */
-    showErrors(errors, triggerEvent, onChange) {
-        if (!errors) {
-            return;
-        }
+    showErrors(errors, triggerEvent) {
         this.loading = false;
         if (!Array.isArray(errors)) {
             errors = [errors];
@@ -1151,7 +1149,7 @@ export default class Webform extends NestedDataComponent {
         if (this.submitted) {
             // show server errors while they are not cleaned/fixed
             const nonComponentServerErrors = _.filter(this.serverErrors || [], err => !err.component && !err.path);
-            this.showErrors(nonComponentServerErrors.length ? nonComponentServerErrors : null);
+            this.showErrors(nonComponentServerErrors.length ? nonComponentServerErrors : errors);
         }
         // See if we need to save the draft of the form.
         if (modified && this.options.saveDraft) {

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

@@ -2665,6 +2665,7 @@ export default class Component extends Element {
             component: this.component,
             data,
             row,
+            value: this.validationValue,
             path: this.path || this.component.key,
             instance: this,
             scope: { errors: [] },
@@ -2930,6 +2931,11 @@ export default class Component extends Element {
     }
     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,
@@ -2940,9 +2946,7 @@ 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.
-            () => !this.visible && !validateWhenHidden,
-            // Force valid if component is conditionally hidden.
-            () => !this.checkCondition(row, data) && !validateWhenHidden
+            () => forceValidOnHidden
         ];
         return rules.some(pred => pred());
     }

package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.js

@@ -184,7 +184,7 @@ export default class NestedArrayComponent extends NestedDataComponent {
         return super.getValueAsString(value, options);
     }
     getComponents(rowIndex) {
-        if (rowIndex !== undefined) {
+        if (rowIndex !== undefined && rowIndex !== null) {
             if (!this.iteratableRows[rowIndex]) {
                 return [];
             }

package/lib/mjs/components/_classes/nesteddata/NestedDataComponent.js

@@ -65,7 +65,7 @@ export default class NestedDataComponent extends NestedComponent {
         <tbody>
     `);
         const htmlTagRegExp = new RegExp('<(.*?)>');
-        this.components.forEach((component) => {
+        this.everyComponent((component) => {
             if (component.isInputComponent && component.visible && !component.skipInEmail) {
                 const componentValue = component.getView(component.dataValue, options);
                 result += (`

package/lib/mjs/components/editgrid/EditGrid.js

@@ -1029,6 +1029,7 @@ export default class EditGridComponent extends NestedArrayComponent {
                 }
                 else {
                     this.alert.clear();
+                    this.alert = null;
                 }
             }
         }

package/lib/mjs/components/form/Form.js

@@ -137,6 +137,7 @@ export default class FormComponent extends Component {
             return this.subForm.getComponent(path, fn, originalPathStr);
         }
     }
+    /* eslint-disable max-statements */
     getSubOptions(options = {}) {
         options.events = this.createEmitter();
         // Make sure to not show the submit button in wizards in the nested forms.
@@ -194,12 +195,14 @@ export default class FormComponent extends Component {
         }
         if (this.options.saveDraft) {
             options.saveDraft = this.options.saveDraft;
+            options.formio = new Formio(this.formSrc);
         }
         if (this.options.saveDraftThrottle) {
             options.saveDraftThrottle = this.options.saveDraftThrottle;
         }
         return options;
     }
+    /* eslint-enable max-statements */
     render() {
         if (this.builderMode) {
             return super.render(this.component.label || 'Nested form');
@@ -399,10 +402,6 @@ export default class FormComponent extends Component {
                 this.subForm.nosubmit = true;
                 this.subForm.root = this.root;
                 this.subForm.localRoot = this.isNestedWizard ? this.localRoot : this.subForm;
-                if (this.parent) {
-                    this.subForm.draftEnabled = this.parent.draftEnabled;
-                    this.subForm.savingDraft = this.parent.savingDraft;
-                }
                 this.restoreValue();
                 this.valueChanged = this.hasSetValue;
                 this.onChange();
@@ -566,6 +565,10 @@ export default class FormComponent extends Component {
      */
     beforeSubmit() {
         const submission = this.dataValue;
+        // Cancel triggered saveDraft
+        if (this.subForm?.draftEnabled && this.subForm.triggerSaveDraft?.cancel) {
+            this.subForm.triggerSaveDraft.cancel();
+        }
         const isAlreadySubmitted = submission && submission._id && submission.form;
         // This submission has already been submitted, so just return the reference data.
         if (isAlreadySubmitted && !this.subForm?.wizard) {

package/lib/mjs/widgets/CalendarWidget.js

@@ -330,7 +330,8 @@ export default class CalendarWidget extends InputWidget {
             this.input.setAttribute('aria-invalid', 'false');
         }
     }
-    validationValue(value) {
+    get validationValue() {
+        const value = this.dataValue;
         if (typeof value === 'string') {
             return new Date(value);
         }
@@ -348,7 +349,7 @@ export default class CalendarWidget extends InputWidget {
     initFlatpickr(Flatpickr) {
         // Create a new flatpickr.
         this.calendar = new Flatpickr(this._input, { ...this.settings, disableMobile: true });
-        this.calendar.altInput.addEventListener('input', (event) => {
+        this.addEventListener(this.calendar.altInput, 'input', (event) => {
             if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
                 this.settings.manualInputValue = event.target.value;
                 this.settings.isManuallyOverriddenValue = true;

package/lib/mjs/widgets/InputWidget.js

@@ -38,8 +38,8 @@ export default class InputWidget extends Element {
     getValueAsString(value) {
         return value;
     }
-    validationValue(value) {
-        return value;
+    get validationValue() {
+        return this.dataValue;
     }
     addPrefix() {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.42",
+  "version": "5.0.0-rc.43",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -86,7 +86,7 @@
   "dependencies": {
     "@formio/bootstrap": "^3.0.0-rc.22",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "^2.0.0-tt.dev-882e7ea",
+    "@formio/core": "^2.1.0-dev.tt.2",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -95,10 +95,10 @@
     "browser-cookies": "^1.2.0",
     "browser-md5-file": "^1.1.1",
     "compare-versions": "^6.0.0-rc.2",
-    "core-js": "^3.36.0",
+    "core-js": "^3.37.0",
     "dialog-polyfill": "^0.5.6",
     "dom-autoscroller": "^2.3.4",
-    "dompurify": "^3.0.9",
+    "dompurify": "^3.1.0",
     "downloadjs": "^1.4.7",
     "dragula": "^3.7.3",
     "eventemitter3": "^5.0.1",
@@ -122,9 +122,9 @@
     "vanilla-picker": "^2.12.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.3.0",
-    "@typescript-eslint/parser": "^7.3.0",
-    "ace-builds": "1.32.9",
+    "@typescript-eslint/eslint-plugin": "^7.6.0",
+    "@typescript-eslint/parser": "^7.6.0",
+    "ace-builds": "1.33.0",
     "async-limiter": "^2.0.0",
     "bootstrap-icons": "^1.10.5",
     "bootswatch": "^5.3.3",
@@ -154,7 +154,7 @@
     "gulp-sync": "^0.1.4",
     "gulp-watch": "^5.0.1",
     "hoek": "^6.1.3",
-    "jsdom": "^24.0.0",
+    "jsdom": "22.1.0",
     "jsdom-global": "^3.0.2",
     "karma": "^6.4.3",
     "karma-chrome-launcher": "^3.2.0",
@@ -170,15 +170,15 @@
     "pretty": "^2.0.0",
     "pygments-css": "^1.0.0",
     "raw-loader": "^4.0.2",
-    "sass": "^1.72.0",
+    "sass": "^1.74.1",
     "shortcut-buttons-flatpickr": "^0.4.0",
     "sinon": "^17.0.1",
     "string-replace-loader": "^3.1.0",
     "ts-loader": "^9.4.4",
     "ts-node": "^10.9.1",
-    "typescript": "5.3.3",
+    "typescript": "5.3.2",
     "webpack": "^5.90.3",
-    "webpack-bundle-analyzer": "^4.9.0",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-stream": "^7.0.0",