@formio/js 5.0.0-dev.5875.f359435 → 5.0.0-dev.5878.d6b667a

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

@@ -84,6 +84,7 @@ 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() {
@@ -116,6 +117,10 @@ 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);
         }
@@ -171,8 +176,17 @@ 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)) {
-            value = String(value).replace('.', this.decimalSeparator);
+            // Format scientific notation
+            if (/e/i.test(String(value))) {
+                value = value.toExponential(this.decimalLimit);
+            }
+            else {
+                value = String(value).replace('.', this.decimalSeparator);
+            }
         }
         else {
             value = null;

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

@@ -25,6 +25,14 @@ 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/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/number/Number.js

@@ -82,6 +82,7 @@ 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() {
@@ -114,6 +115,10 @@ 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);
         }
@@ -169,8 +174,17 @@ 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)) {
-            value = String(value).replace('.', this.decimalSeparator);
+            // Format scientific notation
+            if (/e/i.test(String(value))) {
+                value = value.toExponential(this.decimalLimit);
+            }
+            else {
+                value = String(value).replace('.', this.decimalSeparator);
+            }
         }
         else {
             value = null;

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

@@ -23,6 +23,14 @@ 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.5875.f359435",
+  "version": "5.0.0-dev.5878.d6b667a",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {