@formio/js 5.0.0-dev.5875.f359435 → 5.0.0-dev.5879.21c1482

package/lib/cjs/Webform.js

@@ -1533,7 +1533,7 @@ class Webform extends NestedDataComponent_1.default {
             return;
         }
         const captchaComponent = [];
-        (0, formUtils_1.eachComponentData)(this.components, {}, (component) => {
+        (0, formUtils_1.eachComponent)(this.components, (component) => {
             if (/^(re)?captcha$/.test(component.type) && component.component.eventType === 'formLoad') {
                 captchaComponent.push(component);
             }

package/lib/cjs/Wizard.js

@@ -916,7 +916,7 @@ class Wizard extends Webform_1.default {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

package/lib/cjs/components/day/Day.d.ts

@@ -11,6 +11,7 @@ export default class DayComponent extends Field {
         operators: string[];
     };
     static savedValueTypes(schema: any): string[];
+    static oldEmptyValue: string;
     static get serverConditionSettings(): {
         operators: string[];
     };

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

@@ -104,6 +104,12 @@ class DayComponent extends Field_1.default {
         info.changeEvent = 'input';
         return info;
     }
+    isEmpty(value = this.dataValue) {
+        if (value === DayComponent.oldEmptyValue) {
+            return true;
+        }
+        return super.isEmpty(value);
+    }
     inputDefinition(name) {
         let min, max;
         if (name === 'day') {
@@ -337,6 +343,10 @@ class DayComponent extends Field_1.default {
         }
     }
     normalizeValue(value) {
+        // Adjust the value from old to new format
+        if (value === DayComponent.oldEmptyValue) {
+            value = '';
+        }
         if (!value || this.valueMask.test(value)) {
             return value;
         }
@@ -643,4 +653,6 @@ class DayComponent extends Field_1.default {
         return validationFormat;
     }
 }
+// Empty value used before 9.3.x
+DayComponent.oldEmptyValue = '00/00/0000';
 exports.default = DayComponent;

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

@@ -13,7 +13,6 @@ const utils_1 = require("../../utils/utils");
 const EditRowState = {
     New: 'new',
     Editing: 'editing',
-    Saving: 'saving',
     Saved: 'saved',
     Viewing: 'viewing',
     Removed: 'removed',
@@ -809,10 +808,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         if (!this.component.rowDrafts) {
             editRow.components.forEach((comp) => comp.setPristine(false));
         }
-        // Mark the row with a 'Saving' state to trigger validation for future row changes
-        if (editRow.state === EditRowState.New) {
-            editRow.state = EditRowState.Saving;
-        }
         const errors = this.validateRow(editRow, true);
         if (!this.component.rowDrafts) {
             if (errors.length) {
@@ -825,7 +820,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
                 this.root.focusedComponent = null;
             }
             switch (editRow.state) {
-                case EditRowState.Saving: {
+                case EditRowState.New: {
                     const newIndex = dataValue.length;
                     dataValue.push(editRow.data);
                     editRow.components.forEach(component => component.rowIndex = newIndex);
@@ -985,7 +980,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
     }
     shouldValidateRow(editRow, dirty, fromSubmission) {
         return this.shouldValidateDraft(editRow) ||
-            editRow.state === EditRowState.Saving ||
+            editRow.state === EditRowState.New ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
             fromSubmission ||
@@ -1001,7 +996,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             editGridValue[editRow.rowIndex] = editRow.data;
             lodash_1.default.set(rootValue, this.path, editGridValue);
             const validationProcessorProcess = (context) => this.validationProcessor(context, { dirty, silentCheck });
-            editRow.errors = (0, process_1.processSync)({
+            const errors = (0, process_1.processSync)({
                 components: (0, utils_1.fastCloneDeep)(this.component.components).map((component) => {
                     component.parentPath = `${this.path}[${editRow.rowIndex}]`;
                     return component;
@@ -1018,6 +1013,9 @@ class EditGridComponent extends NestedArrayComponent_1.default {
                     }
                 ]
             }).errors;
+            editRow.errors = (this.component.modal || this.component.rowDrafts)
+                ? errors
+                : errors.filter((err) => lodash_1.default.find(this.visibleErrors, ['component.id', err.component.id]));
         }
         // TODO: this is essentially running its own custom validation and should be moved into a validation rule
         if (this.component.validate && this.component.validate.row) {

package/lib/mjs/Webform.js

@@ -7,7 +7,7 @@ import { Formio } from "./Formio";
 import Components from "./components/Components";
 import NestedDataComponent from "./components/_classes/nesteddata/NestedDataComponent";
 import { fastCloneDeep, currentTimezone, unescapeHTML, getStringFromComponentPath, convertStringToHTMLElement, getArrayFromComponentPath, } from "./utils/utils";
-import { eachComponent, eachComponentData } from "./utils/formUtils";
+import { eachComponent } from "./utils/formUtils";
 // We need this here because dragula pulls in CustomEvent class that requires global to exist.
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;
@@ -1536,7 +1536,7 @@ export default class Webform extends NestedDataComponent {
             return;
         }
         const captchaComponent = [];
-        eachComponentData(this.components, {}, (component) => {
+        eachComponent(this.components, (component) => {
             if (/^(re)?captcha$/.test(component.type) && component.component.eventType === 'formLoad') {
                 captchaComponent.push(component);
             }

package/lib/mjs/Wizard.js

@@ -903,7 +903,7 @@ export default class Wizard extends Webform {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

package/lib/mjs/components/day/Day.d.ts

@@ -11,6 +11,7 @@ export default class DayComponent extends Field {
         operators: string[];
     };
     static savedValueTypes(schema: any): string[];
+    static oldEmptyValue: string;
     static get serverConditionSettings(): {
         operators: string[];
     };

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

@@ -49,6 +49,8 @@ export default class DayComponent extends Field {
         schema = schema || {};
         return getComponentSavedTypes(schema) || [componentValueTypes.string];
     }
+    // Empty value used before 9.3.x
+    static oldEmptyValue = '00/00/0000';
     constructor(component, options, data) {
         if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
             component.maxDate = moment(component.maxDate, 'YYYY-MM-DD').toISOString();
@@ -102,6 +104,12 @@ export default class DayComponent extends Field {
         info.changeEvent = 'input';
         return info;
     }
+    isEmpty(value = this.dataValue) {
+        if (value === DayComponent.oldEmptyValue) {
+            return true;
+        }
+        return super.isEmpty(value);
+    }
     inputDefinition(name) {
         let min, max;
         if (name === 'day') {
@@ -335,6 +343,10 @@ export default class DayComponent extends Field {
         }
     }
     normalizeValue(value) {
+        // Adjust the value from old to new format
+        if (value === DayComponent.oldEmptyValue) {
+            value = '';
+        }
         if (!value || this.valueMask.test(value)) {
             return value;
         }

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

@@ -8,7 +8,6 @@ import { fastCloneDeep, Evaluator, getArrayFromComponentPath, eachComponent } fr
 const EditRowState = {
     New: 'new',
     Editing: 'editing',
-    Saving: 'saving',
     Saved: 'saved',
     Viewing: 'viewing',
     Removed: 'removed',
@@ -799,10 +798,6 @@ export default class EditGridComponent extends NestedArrayComponent {
         if (!this.component.rowDrafts) {
             editRow.components.forEach((comp) => comp.setPristine(false));
         }
-        // Mark the row with a 'Saving' state to trigger validation for future row changes
-        if (editRow.state === EditRowState.New) {
-            editRow.state = EditRowState.Saving;
-        }
         const errors = this.validateRow(editRow, true);
         if (!this.component.rowDrafts) {
             if (errors.length) {
@@ -815,7 +810,7 @@ export default class EditGridComponent extends NestedArrayComponent {
                 this.root.focusedComponent = null;
             }
             switch (editRow.state) {
-                case EditRowState.Saving: {
+                case EditRowState.New: {
                     const newIndex = dataValue.length;
                     dataValue.push(editRow.data);
                     editRow.components.forEach(component => component.rowIndex = newIndex);
@@ -975,7 +970,7 @@ export default class EditGridComponent extends NestedArrayComponent {
     }
     shouldValidateRow(editRow, dirty, fromSubmission) {
         return this.shouldValidateDraft(editRow) ||
-            editRow.state === EditRowState.Saving ||
+            editRow.state === EditRowState.New ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
             fromSubmission ||
@@ -990,7 +985,7 @@ export default class EditGridComponent extends NestedArrayComponent {
             editGridValue[editRow.rowIndex] = editRow.data;
             _.set(rootValue, this.path, editGridValue);
             const validationProcessorProcess = (context) => this.validationProcessor(context, { dirty, silentCheck });
-            editRow.errors = processSync({
+            const errors = processSync({
                 components: fastCloneDeep(this.component.components).map((component) => {
                     component.parentPath = `${this.path}[${editRow.rowIndex}]`;
                     return component;
@@ -1007,6 +1002,9 @@ export default class EditGridComponent extends NestedArrayComponent {
                     }
                 ]
             }).errors;
+            editRow.errors = (this.component.modal || this.component.rowDrafts)
+                ? errors
+                : errors.filter((err) => _.find(this.visibleErrors, ['component.id', err.component.id]));
         }
         // TODO: this is essentially running its own custom validation and should be moved into a validation rule
         if (this.component.validate && this.component.validate.row) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5875.f359435",
+  "version": "5.0.0-dev.5879.21c1482",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {