@formio/js 5.0.0-dev.5842.5155aaa → 5.0.0-dev.5846.796fec1

package/lib/cjs/Webform.js

@@ -710,6 +710,7 @@ class Webform extends NestedDataComponent_1.default {
      */
     onSetSubmission(submission, flags = {}) {
         this.submissionSet = true;
+        flags.submission = structuredClone(submission);
         this.triggerChange(flags);
         this.emit('beforeSetSubmission', submission);
         this.setValue(submission, flags);
@@ -1247,9 +1248,10 @@ class Webform extends NestedDataComponent_1.default {
             this.pristine = false;
         }
         this.checkData(value.data, flags);
-        const shouldValidate = !flags.noValidate ||
-            flags.fromIframe ||
-            (flags.fromSubmission && this.rootPristine && this.pristine && flags.changed);
+        let shouldValidate = flags.noValidate ? false :
+            lodash_1.default.isUndefined(flags.noValidate) ||
+                flags.fromIframe ||
+                (flags.fromSubmission && this.rootPristine && this.pristine);
         const errors = shouldValidate
             ? this.validate(value.data, Object.assign(Object.assign({}, flags), { noValidate: false, process: 'change' }))
             : [];

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

@@ -2456,7 +2456,6 @@ class Component extends Element_1.default {
             return;
         }
         lodash_1.default.set(this._data, this.key, value);
-        return;
     }
     /**
      * Splice a value from the dataValue.
@@ -2959,17 +2958,19 @@ class Component extends Element_1.default {
      * @returns {boolean} - TRUE if the component is valid.
      */
     showValidationErrors(errors, data, row, flags) {
+        var _a;
         if (flags.silentCheck) {
             return [];
         }
+        let dirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            flags.dirty = true;
+            dirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data) && !(this.pristine && this.protected)) {
-            flags.dirty = true;
+        if (flags.fromSubmission && !lodash_1.default.isUndefined(lodash_1.default.get((_a = flags === null || flags === void 0 ? void 0 : flags.submission) === null || _a === void 0 ? void 0 : _a.data, this.key)) && !(this.pristine && this.protected)) {
+            dirty = true;
         }
-        this.setDirty(flags.dirty);
-        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
+        this.setDirty(dirty);
+        return this.setComponentValidity(errors, dirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.
@@ -3469,14 +3470,16 @@ class Component extends Element_1.default {
         window.scrollTo(verticalOnly ? window.scrollX : left + window.scrollX, top + window.scrollY);
     }
     focus(index) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if ('beforeFocus' in this.parent) {
             this.parent.beforeFocus(this);
         }
-        index = index || ((_a = this.refs.input) === null || _a === void 0 ? void 0 : _a.length) - 1;
-        if ((_b = this.refs.input) === null || _b === void 0 ? void 0 : _b.length) {
+        if (!index && !lodash_1.default.isNumber(index) && ((_b = (_a = this.refs) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.length)) {
+            index = this.refs.input.length - 1;
+        }
+        if ((_c = this.refs.input) === null || _c === void 0 ? void 0 : _c.length) {
             const focusingInput = this.refs.input[index];
-            if (((_c = this.component.widget) === null || _c === void 0 ? void 0 : _c.type) === 'calendar') {
+            if (((_d = this.component.widget) === null || _d === void 0 ? void 0 : _d.type) === 'calendar') {
                 const sibling = focusingInput.nextSibling;
                 if (sibling) {
                     sibling.focus();

package/lib/cjs/components/_classes/nested/NestedComponent.js

@@ -827,22 +827,23 @@ class NestedComponent extends Field_1.default {
     }
     setNestedValue(component, value, flags = {}) {
         component._data = this.componentContext(component);
+        let componentFlags = Object.assign({}, flags);
         if (component.type === 'button') {
             return false;
         }
         if (component.type === 'components') {
             if (component.tree && component.hasValue(value)) {
-                return component.setValue(lodash_1.default.get(value, component.key), flags);
+                return component.setValue(lodash_1.default.get(value, component.key), componentFlags);
             }
-            return component.setValue(value, flags);
+            return component.setValue(value, componentFlags);
         }
         else if (value && component.hasValue(value)) {
-            return component.setValue(lodash_1.default.get(value, component.key), flags);
+            return component.setValue(lodash_1.default.get(value, component.key), componentFlags);
         }
         else if ((!this.rootPristine || component.visible) && component.shouldAddDefaultValue) {
-            flags.noValidate = !flags.dirty;
-            flags.resetValue = true;
-            return component.setValue(component.defaultValue, flags);
+            componentFlags.noValidate = !componentFlags.dirty;
+            componentFlags.resetValue = true;
+            return component.setValue(component.defaultValue, componentFlags);
         }
     }
     setValue(value, flags = {}) {

package/lib/cjs/components/day/Day.js

@@ -286,7 +286,7 @@ class DayComponent extends Field_1.default {
                 if (!this.component.fields.day.hide && maxDay) {
                     this.refs.day.max = maxDay;
                 }
-                if (maxDay && day > maxDay) {
+                if (maxDay && day > maxDay && this.refs.day) {
                     this.refs.day.value = this.refs.day.max;
                 }
                 updateValueAndSaveFocus(this.refs.month, 'month')();
@@ -496,28 +496,40 @@ class DayComponent extends Field_1.default {
         if (defaultValue) {
             defaults = defaultValue.split('/').map(x => parseInt(x, 10));
         }
+        const isModalEditClosed = this.component.modalEdit && !this.componentModal.isOpened;
         if (this.showDay && this.refs.day) {
-            day = this.refs.day.value === '' ? '' : parseInt(this.refs.day.value, 10);
+            day = (this.refs.day.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.day.value, 10);
         }
-        if (day === undefined || lodash_1.default.isNaN(day)) {
-            day = defaults[DAY] && !lodash_1.default.isNaN(defaults[DAY]) ? defaults[DAY] : 0;
+        if (day === undefined || lodash_1.default.isNaN(day) || value) {
+            day = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).day
+                : (defaults[DAY] && !lodash_1.default.isNaN(defaults[DAY]) ? defaults[DAY] : 0);
         }
         if (this.showMonth && this.refs.month) {
             // Months are 0 indexed.
-            month = this.refs.month.value === '' ? '' : parseInt(this.refs.month.value, 10);
+            month = (this.refs.month.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.month.value, 10);
         }
-        if (month === undefined || lodash_1.default.isNaN(month)) {
-            month = defaults[MONTH] && !lodash_1.default.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0;
+        if (month === undefined || lodash_1.default.isNaN(month) || value) {
+            month = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).month
+                : (defaults[MONTH] && !lodash_1.default.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0);
         }
         if (this.showYear && this.refs.year) {
-            year = this.refs.year.value === '' ? '' : parseInt(this.refs.year.value);
+            year = (this.refs.year.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.year.value);
         }
-        if (year === undefined || lodash_1.default.isNaN(year)) {
-            year = defaults[YEAR] && !lodash_1.default.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0;
+        if (year === undefined || lodash_1.default.isNaN(year) || value) {
+            year = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).year
+                : (defaults[YEAR] && !lodash_1.default.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0);
         }
         let result;
         if (!day && !month && !year) {
-            this.dataValue = this.emptyValue;
+            if (!isModalEditClosed) {
+                this.dataValue = this.emptyValue;
+                if (this.options.building) {
+                    this.triggerChange();
+                }
+            }
             return null;
         }
         // add trailing zeros if the data is showed

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

@@ -983,6 +983,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             editRow.state === EditRowState.New ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
+            this.dirty ||
             dirty;
     }
     validateRow(editRow, dirty, forceSilentCheck) {

package/lib/mjs/Webform.js

@@ -708,6 +708,7 @@ export default class Webform extends NestedDataComponent {
      */
     onSetSubmission(submission, flags = {}) {
         this.submissionSet = true;
+        flags.submission = structuredClone(submission);
         this.triggerChange(flags);
         this.emit('beforeSetSubmission', submission);
         this.setValue(submission, flags);
@@ -1249,9 +1250,10 @@ export default class Webform extends NestedDataComponent {
             this.pristine = false;
         }
         this.checkData(value.data, flags);
-        const shouldValidate = !flags.noValidate ||
-            flags.fromIframe ||
-            (flags.fromSubmission && this.rootPristine && this.pristine && flags.changed);
+        let shouldValidate = flags.noValidate ? false :
+            _.isUndefined(flags.noValidate) ||
+                flags.fromIframe ||
+                (flags.fromSubmission && this.rootPristine && this.pristine);
         const errors = shouldValidate
             ? this.validate(value.data, {
                 ...flags,

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

@@ -2422,7 +2422,6 @@ export default class Component extends Element {
             return;
         }
         _.set(this._data, this.key, value);
-        return;
     }
     /**
      * Splice a value from the dataValue.
@@ -2926,14 +2925,15 @@ export default class Component extends Element {
         if (flags.silentCheck) {
             return [];
         }
+        let dirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            flags.dirty = true;
+            dirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data) && !(this.pristine && this.protected)) {
-            flags.dirty = true;
+        if (flags.fromSubmission && !_.isUndefined(_.get(flags?.submission?.data, this.key)) && !(this.pristine && this.protected)) {
+            dirty = true;
         }
-        this.setDirty(flags.dirty);
-        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
+        this.setDirty(dirty);
+        return this.setComponentValidity(errors, dirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.
@@ -3434,7 +3434,9 @@ export default class Component extends Element {
         if ('beforeFocus' in this.parent) {
             this.parent.beforeFocus(this);
         }
-        index = index || this.refs.input?.length - 1;
+        if (!index && !_.isNumber(index) && this.refs?.input?.length) {
+            index = this.refs.input.length - 1;
+        }
         if (this.refs.input?.length) {
             const focusingInput = this.refs.input[index];
             if (this.component.widget?.type === 'calendar') {

package/lib/mjs/components/_classes/nested/NestedComponent.js

@@ -822,22 +822,23 @@ export default class NestedComponent extends Field {
     }
     setNestedValue(component, value, flags = {}) {
         component._data = this.componentContext(component);
+        let componentFlags = { ...flags };
         if (component.type === 'button') {
             return false;
         }
         if (component.type === 'components') {
             if (component.tree && component.hasValue(value)) {
-                return component.setValue(_.get(value, component.key), flags);
+                return component.setValue(_.get(value, component.key), componentFlags);
             }
-            return component.setValue(value, flags);
+            return component.setValue(value, componentFlags);
         }
         else if (value && component.hasValue(value)) {
-            return component.setValue(_.get(value, component.key), flags);
+            return component.setValue(_.get(value, component.key), componentFlags);
         }
         else if ((!this.rootPristine || component.visible) && component.shouldAddDefaultValue) {
-            flags.noValidate = !flags.dirty;
-            flags.resetValue = true;
-            return component.setValue(component.defaultValue, flags);
+            componentFlags.noValidate = !componentFlags.dirty;
+            componentFlags.resetValue = true;
+            return component.setValue(component.defaultValue, componentFlags);
         }
     }
     setValue(value, flags = {}) {

package/lib/mjs/components/day/Day.js

@@ -284,7 +284,7 @@ export default class DayComponent extends Field {
                 if (!this.component.fields.day.hide && maxDay) {
                     this.refs.day.max = maxDay;
                 }
-                if (maxDay && day > maxDay) {
+                if (maxDay && day > maxDay && this.refs.day) {
                     this.refs.day.value = this.refs.day.max;
                 }
                 updateValueAndSaveFocus(this.refs.month, 'month')();
@@ -494,28 +494,40 @@ export default class DayComponent extends Field {
         if (defaultValue) {
             defaults = defaultValue.split('/').map(x => parseInt(x, 10));
         }
+        const isModalEditClosed = this.component.modalEdit && !this.componentModal.isOpened;
         if (this.showDay && this.refs.day) {
-            day = this.refs.day.value === '' ? '' : parseInt(this.refs.day.value, 10);
+            day = (this.refs.day.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.day.value, 10);
         }
-        if (day === undefined || _.isNaN(day)) {
-            day = defaults[DAY] && !_.isNaN(defaults[DAY]) ? defaults[DAY] : 0;
+        if (day === undefined || _.isNaN(day) || value) {
+            day = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).day
+                : (defaults[DAY] && !_.isNaN(defaults[DAY]) ? defaults[DAY] : 0);
         }
         if (this.showMonth && this.refs.month) {
             // Months are 0 indexed.
-            month = this.refs.month.value === '' ? '' : parseInt(this.refs.month.value, 10);
+            month = (this.refs.month.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.month.value, 10);
         }
-        if (month === undefined || _.isNaN(month)) {
-            month = defaults[MONTH] && !_.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0;
+        if (month === undefined || _.isNaN(month) || value) {
+            month = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).month
+                : (defaults[MONTH] && !_.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0);
         }
         if (this.showYear && this.refs.year) {
-            year = this.refs.year.value === '' ? '' : parseInt(this.refs.year.value);
+            year = (this.refs.year.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.year.value);
         }
-        if (year === undefined || _.isNaN(year)) {
-            year = defaults[YEAR] && !_.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0;
+        if (year === undefined || _.isNaN(year) || value) {
+            year = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).year
+                : (defaults[YEAR] && !_.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0);
         }
         let result;
         if (!day && !month && !year) {
-            this.dataValue = this.emptyValue;
+            if (!isModalEditClosed) {
+                this.dataValue = this.emptyValue;
+                if (this.options.building) {
+                    this.triggerChange();
+                }
+            }
             return null;
         }
         // add trailing zeros if the data is showed

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

@@ -973,6 +973,7 @@ export default class EditGridComponent extends NestedArrayComponent {
             editRow.state === EditRowState.New ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
+            this.dirty ||
             dirty;
     }
     validateRow(editRow, dirty, forceSilentCheck) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5842.5155aaa",
+  "version": "5.0.0-dev.5846.796fec1",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {