@formio/js 5.0.0-dev.5878.d6b667a → 5.0.0-dev.5879.21c1482

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/cjs/components/number/Number.js

@@ -84,7 +84,6 @@ class NumberComponent extends Input_1.default {
             decimalLimit: lodash_1.default.get(this.component, 'decimalLimit', this.decimalLimit),
             allowNegative: lodash_1.default.get(this.component, 'allowNegative', true),
             allowDecimal: this.isDecimalAllowed(),
-            allowScientificNotation: lodash_1.default.get(this.component, 'allowScientificNotation', false),
         });
     }
     get defaultSchema() {
@@ -117,10 +116,6 @@ class NumberComponent extends Input_1.default {
     parseNumber(value) {
         // Remove delimiters and convert decimal separator to dot.
         value = value.split(this.delimiter).join('').replace(this.decimalSeparator, '.');
-        // Add support for scientific notation
-        if (/^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/.test(value)) {
-            return Number(value);
-        }
         if (this.component.validate && this.component.validate.integer) {
             return parseInt(value, 10);
         }
@@ -176,17 +171,8 @@ class NumberComponent extends Input_1.default {
             input = input.split(this.delimiter).join('').replace(this.decimalSeparator, '.');
         }
         let value = parseFloat(input);
-        if (this.component.allowScientificNotation) {
-            value = Number(input);
-        }
         if (!lodash_1.default.isNaN(value)) {
-            // Format scientific notation
-            if (/e/i.test(String(value))) {
-                value = value.toExponential(this.decimalLimit);
-            }
-            else {
-                value = String(value).replace('.', this.decimalSeparator);
-            }
+            value = String(value).replace('.', this.decimalSeparator);
         }
         else {
             value = null;

package/lib/cjs/components/number/editForm/Number.edit.data.js

@@ -25,14 +25,6 @@ exports.default = [
         label: 'Require Decimal',
         tooltip: 'Always show decimals, even if trailing zeros.'
     },
-    {
-        type: 'checkbox',
-        input: true,
-        weight: 100,
-        key: 'allowScientificNotation',
-        label: 'Allow Scientific Notation',
-        tooltip: 'Allow scientific notation for numbers.'
-    },
     {
         key: 'case',
         ignore: true,

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/lib/mjs/components/number/Number.js

@@ -82,7 +82,6 @@ export default class NumberComponent extends Input {
             decimalLimit: _.get(this.component, 'decimalLimit', this.decimalLimit),
             allowNegative: _.get(this.component, 'allowNegative', true),
             allowDecimal: this.isDecimalAllowed(),
-            allowScientificNotation: _.get(this.component, 'allowScientificNotation', false),
         });
     }
     get defaultSchema() {
@@ -115,10 +114,6 @@ export default class NumberComponent extends Input {
     parseNumber(value) {
         // Remove delimiters and convert decimal separator to dot.
         value = value.split(this.delimiter).join('').replace(this.decimalSeparator, '.');
-        // Add support for scientific notation
-        if (/^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/.test(value)) {
-            return Number(value);
-        }
         if (this.component.validate && this.component.validate.integer) {
             return parseInt(value, 10);
         }
@@ -174,17 +169,8 @@ export default class NumberComponent extends Input {
             input = input.split(this.delimiter).join('').replace(this.decimalSeparator, '.');
         }
         let value = parseFloat(input);
-        if (this.component.allowScientificNotation) {
-            value = Number(input);
-        }
         if (!_.isNaN(value)) {
-            // Format scientific notation
-            if (/e/i.test(String(value))) {
-                value = value.toExponential(this.decimalLimit);
-            }
-            else {
-                value = String(value).replace('.', this.decimalSeparator);
-            }
+            value = String(value).replace('.', this.decimalSeparator);
         }
         else {
             value = null;

package/lib/mjs/components/number/editForm/Number.edit.data.js

@@ -23,14 +23,6 @@ export default [
         label: 'Require Decimal',
         tooltip: 'Always show decimals, even if trailing zeros.'
     },
-    {
-        type: 'checkbox',
-        input: true,
-        weight: 100,
-        key: 'allowScientificNotation',
-        label: 'Allow Scientific Notation',
-        tooltip: 'Allow scientific notation for numbers.'
-    },
     {
         key: 'case',
         ignore: true,

package/package.json

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