@formio/js 5.0.0-dev.5860.a296208 → 5.0.0-dev.5863.a2bd4af

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

@@ -1757,12 +1757,12 @@ class Component extends Element_1.default {
         var _a, _b, _c;
         if ((_a = this.root) === null || _a === void 0 ? void 0 : _a.currentSelection) {
             if ((_b = this.refs.input) === null || _b === void 0 ? void 0 : _b.length) {
-                const { selection, index } = this.root.currentSelection;
+                const { index } = this.root.currentSelection;
                 let input = this.refs.input[index];
                 const isInputRangeSelectable = (i) => /text|search|password|tel|url/i.test((i === null || i === void 0 ? void 0 : i.type) || '');
                 if (input) {
                     if (isInputRangeSelectable(input)) {
-                        input.setSelectionRange(...selection);
+                        input.setSelectionRange(input.value.length, input.value.length);
                     }
                 }
                 else {
@@ -2962,12 +2962,14 @@ class Component extends Element_1.default {
         if (flags.silentCheck) {
             return [];
         }
-        let isDirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            isDirty = true;
+            flags.dirty = true;
         }
-        this.setDirty(isDirty);
-        return this.setComponentValidity(errors, isDirty, flags.silentCheck, flags.fromSubmission);
+        if (flags.fromSubmission && this.hasValue(data)) {
+            flags.dirty = this.pristine && this.component.protected ? false : true;
+        }
+        this.setDirty(flags.dirty);
+        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.

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

@@ -584,6 +584,9 @@ class DayComponent extends Field_1.default {
      * @returns {string|null} - The string value of the date.
      */
     getValueAsString(value) {
+        if (!value) {
+            return '';
+        }
         return this.getDate(value) || '';
     }
     focus(field) {

package/lib/cjs/components/editgrid/EditGrid.d.ts

@@ -89,8 +89,8 @@ export default class EditGridComponent extends NestedArrayComponent {
     hasOpenRows(): any;
     getAttachedData(data?: null): any;
     shouldValidateDraft(editRow: any): any;
-    shouldValidateRow(editRow: any, dirty: any, fromSubmission: any): any;
-    validateRow(editRow: any, dirty: any, forceSilentCheck: any, fromSubmission: any): any;
+    shouldValidateRow(editRow: any, dirty: any): any;
+    validateRow(editRow: any, dirty: any, forceSilentCheck: any): any;
     showRowErrorAlerts(editRow: any, errors: any): void;
     /**
      * @returns {boolean} - Return that this component processes its own validation.

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

@@ -983,18 +983,17 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             !this.hasOpenRows()) ||
             ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submitted);
     }
-    shouldValidateRow(editRow, dirty, fromSubmission) {
+    shouldValidateRow(editRow, dirty) {
         return this.shouldValidateDraft(editRow) ||
             editRow.state === EditRowState.Saving ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
-            fromSubmission ||
             dirty;
     }
-    validateRow(editRow, dirty, forceSilentCheck, fromSubmission) {
+    validateRow(editRow, dirty, forceSilentCheck) {
         var _a;
         editRow.errors = [];
-        if (this.shouldValidateRow(editRow, dirty, fromSubmission)) {
+        if (this.shouldValidateRow(editRow, dirty)) {
             const silentCheck = (this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck;
             const rootValue = (0, utils_1.fastCloneDeep)(this.rootValue);
             const editGridValue = lodash_1.default.get(rootValue, this.path, []);
@@ -1066,7 +1065,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
     }
     checkComponentValidity(data, dirty, row, options = {}, errors = []) {
         var _a, _b;
-        const { silentCheck, fromSubmission } = options;
+        const { silentCheck } = options;
         const superValid = super.checkComponentValidity(data, dirty, row, options, errors);
         // If super tells us that component invalid and there is no need to update alerts, just return false
         if (!superValid && (!this.alert && !this.hasOpenRows())) {
@@ -1076,7 +1075,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         const allRowErrors = [];
         this.editRows.forEach((editRow, index) => {
             // Trigger all errors on the row.
-            const rowErrors = this.validateRow(editRow, dirty, silentCheck, fromSubmission);
+            const rowErrors = this.validateRow(editRow, dirty, silentCheck);
             errors.push(...rowErrors);
             allRowErrors.push(...rowErrors);
             if (this.rowRefs) {

package/lib/cjs/components/select/Select.d.ts

@@ -131,7 +131,7 @@ export default class SelectComponent extends ListComponent {
     addCurrentChoices(values: any, items: any, keyValue: any): any;
     getValueAsString(data: any, options: any): any;
     normalizeSingleValue(value: any): any;
-    setMetadata(value: any): any;
+    setMetadata(value: any, flags?: {}): any;
     updateValue(value: any, flags: any): boolean;
     undoValueTyping(value: any): any;
     setValue(value: any, flags?: {}): boolean;

package/lib/cjs/components/select/Select.js

@@ -1204,8 +1204,8 @@ class SelectComponent extends ListComponent_1.default {
         }
         return super.normalizeValue(this.normalizeSingleValue(value));
     }
-    setMetadata(value) {
-        var _a;
+    setMetadata(value, flags = {}) {
+        var _a, _b;
         if (lodash_1.default.isNil(value)) {
             return;
         }
@@ -1239,15 +1239,22 @@ class SelectComponent extends ListComponent_1.default {
             }
             lodash_1.default.set(submission.metadata.selectData, this.path, templateData);
         }
+        if (flags.resetValue && ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submission)) {
+            const submission = this.root.submission;
+            if (!submission.metadata) {
+                submission.metadata = {};
+            }
+            submission.metadata.selectData = {};
+        }
     }
     updateValue(value, flags) {
         const changed = super.updateValue(value, flags);
-        if (changed || !this.selectMetadata) {
+        if (changed || !this.selectMetadata || flags.resetValue) {
             if (this.component.multiple && Array.isArray(this.dataValue)) {
-                this.dataValue.forEach(singleValue => this.setMetadata(singleValue));
+                this.dataValue.forEach(singleValue => this.setMetadata(singleValue, flags));
             }
             else {
-                this.setMetadata(this.dataValue);
+                this.setMetadata(this.dataValue, flags);
             }
         }
         return changed;

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

@@ -1720,12 +1720,12 @@ export default class Component extends Element {
     restoreCaretPosition() {
         if (this.root?.currentSelection) {
             if (this.refs.input?.length) {
-                const { selection, index } = this.root.currentSelection;
+                const { index } = this.root.currentSelection;
                 let input = this.refs.input[index];
                 const isInputRangeSelectable = (i) => /text|search|password|tel|url/i.test(i?.type || '');
                 if (input) {
                     if (isInputRangeSelectable(input)) {
-                        input.setSelectionRange(...selection);
+                        input.setSelectionRange(input.value.length, input.value.length);
                     }
                 }
                 else {
@@ -2926,12 +2926,14 @@ export default class Component extends Element {
         if (flags.silentCheck) {
             return [];
         }
-        let isDirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            isDirty = true;
+            flags.dirty = true;
         }
-        this.setDirty(isDirty);
-        return this.setComponentValidity(errors, isDirty, flags.silentCheck, flags.fromSubmission);
+        if (flags.fromSubmission && this.hasValue(data)) {
+            flags.dirty = this.pristine && this.component.protected ? false : true;
+        }
+        this.setDirty(flags.dirty);
+        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.

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

@@ -582,6 +582,9 @@ export default class DayComponent extends Field {
      * @returns {string|null} - The string value of the date.
      */
     getValueAsString(value) {
+        if (!value) {
+            return '';
+        }
         return this.getDate(value) || '';
     }
     focus(field) {

package/lib/mjs/components/editgrid/EditGrid.d.ts

@@ -89,8 +89,8 @@ export default class EditGridComponent extends NestedArrayComponent {
     hasOpenRows(): any;
     getAttachedData(data?: null): any;
     shouldValidateDraft(editRow: any): any;
-    shouldValidateRow(editRow: any, dirty: any, fromSubmission: any): any;
-    validateRow(editRow: any, dirty: any, forceSilentCheck: any, fromSubmission: any): any;
+    shouldValidateRow(editRow: any, dirty: any): any;
+    validateRow(editRow: any, dirty: any, forceSilentCheck: any): any;
     showRowErrorAlerts(editRow: any, errors: any): void;
     /**
      * @returns {boolean} - Return that this component processes its own validation.

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

@@ -973,17 +973,16 @@ export default class EditGridComponent extends NestedArrayComponent {
             !this.hasOpenRows()) ||
             this.root?.submitted;
     }
-    shouldValidateRow(editRow, dirty, fromSubmission) {
+    shouldValidateRow(editRow, dirty) {
         return this.shouldValidateDraft(editRow) ||
             editRow.state === EditRowState.Saving ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
-            fromSubmission ||
             dirty;
     }
-    validateRow(editRow, dirty, forceSilentCheck, fromSubmission) {
+    validateRow(editRow, dirty, forceSilentCheck) {
         editRow.errors = [];
-        if (this.shouldValidateRow(editRow, dirty, fromSubmission)) {
+        if (this.shouldValidateRow(editRow, dirty)) {
             const silentCheck = (this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck;
             const rootValue = fastCloneDeep(this.rootValue);
             const editGridValue = _.get(rootValue, this.path, []);
@@ -1054,7 +1053,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         return true;
     }
     checkComponentValidity(data, dirty, row, options = {}, errors = []) {
-        const { silentCheck, fromSubmission } = options;
+        const { silentCheck } = options;
         const superValid = super.checkComponentValidity(data, dirty, row, options, errors);
         // If super tells us that component invalid and there is no need to update alerts, just return false
         if (!superValid && (!this.alert && !this.hasOpenRows())) {
@@ -1064,7 +1063,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         const allRowErrors = [];
         this.editRows.forEach((editRow, index) => {
             // Trigger all errors on the row.
-            const rowErrors = this.validateRow(editRow, dirty, silentCheck, fromSubmission);
+            const rowErrors = this.validateRow(editRow, dirty, silentCheck);
             errors.push(...rowErrors);
             allRowErrors.push(...rowErrors);
             if (this.rowRefs) {

package/lib/mjs/components/select/Select.d.ts

@@ -131,7 +131,7 @@ export default class SelectComponent extends ListComponent {
     addCurrentChoices(values: any, items: any, keyValue: any): any;
     getValueAsString(data: any, options: any): any;
     normalizeSingleValue(value: any): any;
-    setMetadata(value: any): any;
+    setMetadata(value: any, flags?: {}): any;
     updateValue(value: any, flags: any): boolean;
     undoValueTyping(value: any): any;
     setValue(value: any, flags?: {}): boolean;

package/lib/mjs/components/select/Select.js

@@ -1233,7 +1233,7 @@ export default class SelectComponent extends ListComponent {
         }
         return super.normalizeValue(this.normalizeSingleValue(value));
     }
-    setMetadata(value) {
+    setMetadata(value, flags = {}) {
         if (_.isNil(value)) {
             return;
         }
@@ -1267,15 +1267,22 @@ export default class SelectComponent extends ListComponent {
             }
             _.set(submission.metadata.selectData, this.path, templateData);
         }
+        if (flags.resetValue && this.root?.submission) {
+            const submission = this.root.submission;
+            if (!submission.metadata) {
+                submission.metadata = {};
+            }
+            submission.metadata.selectData = {};
+        }
     }
     updateValue(value, flags) {
         const changed = super.updateValue(value, flags);
-        if (changed || !this.selectMetadata) {
+        if (changed || !this.selectMetadata || flags.resetValue) {
             if (this.component.multiple && Array.isArray(this.dataValue)) {
-                this.dataValue.forEach(singleValue => this.setMetadata(singleValue));
+                this.dataValue.forEach(singleValue => this.setMetadata(singleValue, flags));
             }
             else {
-                this.setMetadata(this.dataValue);
+                this.setMetadata(this.dataValue, flags);
             }
         }
         return changed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5860.a296208",
+  "version": "5.0.0-dev.5863.a2bd4af",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {