@formio/js 5.0.0-dev.5712.d53f35e → 5.0.0-dev.5713.ee12658

package/lib/cjs/components/currency/Currency.d.ts

@@ -2,7 +2,6 @@ export default class CurrencyComponent extends NumberComponent {
     constructor(component: any, options: any, data: any);
     currencyPrefix: any;
     currencySuffix: any;
-    parseNumber(value: any): number;
     parseValue(value: any): string | null;
     addZerosAndFormatValue(value: any): any;
     stripPrefixSuffix(value: any): any;

package/lib/cjs/components/number/Number.d.ts

@@ -27,13 +27,7 @@ export default class NumberComponent extends Input {
      */
     createNumberMask(): any;
     isDecimalAllowed(): any;
-    /**
-     * parses a numeric string by removing the delimiters and replacing the decimal separator back to '.' so that it can
-     * be processed by either parseInt or parseFloat
-     * @param {string} value the value to be parsed
-     * @returns {number} a parsed number
-     */
-    parseNumber(value: string): number;
+    parseNumber(value: any): number;
     setInputMask(input: any): void;
     getValueAt(index: any): number | null;
     setValueAt(index: any, value: any, flags?: {}): void;

package/lib/cjs/components/number/Number.js

@@ -91,11 +91,6 @@ class NumberComponent extends Input_1.default {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
-            // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
-            // parseNumber on it
-            defaultValue = this.parseNumber(defaultValue);
-        }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;
         }
@@ -107,12 +102,6 @@ class NumberComponent extends Input_1.default {
     isDecimalAllowed() {
         return lodash_1.default.get(this.component, 'allowDecimal', !(this.component.validate && this.component.validate.integer));
     }
-    /**
-     * parses a numeric string by removing the delimiters and replacing the decimal separator back to '.' so that it can
-     * be processed by either parseInt or parseFloat
-     * @param {string} value the value to be parsed
-     * @returns {number} a parsed number
-     */
     parseNumber(value) {
         // Remove delimiters and convert decimal separator to dot.
         value = value.split(this.delimiter).join('').replace(this.decimalSeparator, '.');

package/lib/cjs/components/number/editForm/Number.edit.data.d.ts

@@ -5,6 +5,36 @@ declare const _default: ({
     key: string;
     label: string;
     tooltip: string;
+    conditional?: undefined;
+    defaultValue?: undefined;
+    ignore?: undefined;
+} | {
+    type: string;
+    input: boolean;
+    weight: number;
+    key: string;
+    label: string;
+    conditional: {
+        show: boolean;
+        conjunction: string;
+        conditions: {
+            component: string;
+            operator: string;
+            value: boolean;
+        }[];
+    };
+    defaultValue: string;
+    tooltip?: undefined;
+    ignore?: undefined;
+} | {
+    type: string;
+    input: boolean;
+    weight: number;
+    key: string;
+    label: string;
+    defaultValue: string;
+    tooltip?: undefined;
+    conditional?: undefined;
     ignore?: undefined;
 } | {
     key: string;
@@ -14,5 +44,7 @@ declare const _default: ({
     weight?: undefined;
     label?: undefined;
     tooltip?: undefined;
+    conditional?: undefined;
+    defaultValue?: undefined;
 })[];
 export default _default;

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

@@ -10,9 +10,36 @@ exports.default = [
         tooltip: 'Separate thousands by local delimiter.'
     },
     {
-        type: 'number',
+        type: "textfield",
         input: true,
         weight: 80,
+        key: "thousandsSeparator",
+        label: "Thousands Separator",
+        conditional: {
+            show: true,
+            conjunction: "all",
+            conditions: [
+                {
+                    component: "delimiter",
+                    operator: "isEqual",
+                    value: true
+                }
+            ]
+        },
+        defaultValue: ","
+    },
+    {
+        type: "textfield",
+        input: true,
+        weight: 90,
+        key: "decimalSymbol",
+        label: "Decimal Symbol",
+        defaultValue: "."
+    },
+    {
+        type: 'number',
+        input: true,
+        weight: 100,
         key: 'decimalLimit',
         label: 'Decimal Places',
         tooltip: 'The maximum number of decimal places.'
@@ -20,7 +47,7 @@ exports.default = [
     {
         type: 'checkbox',
         input: true,
-        weight: 90,
+        weight: 110,
         key: 'requireDecimal',
         label: 'Require Decimal',
         tooltip: 'Always show decimals, even if trailing zeros.'

package/lib/cjs/components/number/fixtures/index.d.ts

@@ -7,5 +7,4 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
-import comp10 from './comp10';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10 };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9 };

package/lib/cjs/components/number/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -22,5 +22,3 @@ const comp8_1 = __importDefault(require("./comp8"));
 exports.comp8 = comp8_1.default;
 const comp9_1 = __importDefault(require("./comp9"));
 exports.comp9 = comp9_1.default;
-const comp10_1 = __importDefault(require("./comp10"));
-exports.comp10 = comp10_1.default;

package/lib/cjs/components/time/Time.d.ts

@@ -1,12 +1,12 @@
 export default class TimeComponent extends TextFieldComponent {
-    rawData: any;
+    rawData: string | never[];
     get dataFormat(): any;
     get skipMaskValidation(): boolean;
     isNotCompleteInput(value: any): any;
     removeValue(index: any): void;
     resetRawData(index: any): void;
     setRawValue(value: any, index: any): void;
-    getRawValue(index: any): any;
+    getRawValue(index: any): string | never[];
     getValueAt(index: any): any;
     setValueAt(index: any, value: any): void;
     getStringAsValue(view: any): any;

package/lib/cjs/components/time/Time.js

@@ -30,8 +30,7 @@ class TimeComponent extends TextField_1.default {
         this.component.inputType = isEdgeBrowser && edgeVersion <= 18
             ? 'text'
             : (this.component.inputType || 'time');
-        // If default value is given then the raw data needs to be set
-        this.rawData = this.component.multiple ? [] : this.getValueAsString(this.defaultValue) || this.emptyValue;
+        this.rawData = this.component.multiple ? [] : this.emptyValue;
     }
     static get builderInfo() {
         return {
@@ -62,7 +61,7 @@ class TimeComponent extends TextField_1.default {
         return value;
     }
     get validationValue() {
-        if ((Array.isArray(this.rawData) && !this.rawData.length) || !this.rawData) {
+        if (Array.isArray(this.rawData) && !this.rawData.length || !this.rawData) {
             return this.dataValue;
         }
         return this.rawData;

package/lib/cjs/components/time/fixtures/index.d.ts

@@ -1,7 +1,6 @@
 import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
-import comp4 from './comp4';
 import timeForm from './timeForm';
 import timeForm2 from './timeForm2';
-export { comp1, comp2, comp3, comp4, timeForm, timeForm2 };
+export { comp1, comp2, comp3, timeForm, timeForm2 };

package/lib/cjs/components/time/fixtures/index.js

@@ -3,15 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeForm2 = exports.timeForm = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.timeForm2 = exports.timeForm = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
 exports.comp2 = comp2_1.default;
 const comp3_1 = __importDefault(require("./comp3"));
 exports.comp3 = comp3_1.default;
-const comp4_1 = __importDefault(require("./comp4"));
-exports.comp4 = comp4_1.default;
 const timeForm_1 = __importDefault(require("./timeForm"));
 exports.timeForm = timeForm_1.default;
 const timeForm2_1 = __importDefault(require("./timeForm2"));

package/lib/mjs/components/currency/Currency.d.ts

@@ -2,7 +2,6 @@ export default class CurrencyComponent extends NumberComponent {
     constructor(component: any, options: any, data: any);
     currencyPrefix: any;
     currencySuffix: any;
-    parseNumber(value: any): number;
     parseValue(value: any): string | null;
     addZerosAndFormatValue(value: any): any;
     stripPrefixSuffix(value: any): any;

package/lib/mjs/components/number/Number.d.ts

@@ -27,13 +27,7 @@ export default class NumberComponent extends Input {
      */
     createNumberMask(): any;
     isDecimalAllowed(): any;
-    /**
-     * parses a numeric string by removing the delimiters and replacing the decimal separator back to '.' so that it can
-     * be processed by either parseInt or parseFloat
-     * @param {string} value the value to be parsed
-     * @returns {number} a parsed number
-     */
-    parseNumber(value: string): number;
+    parseNumber(value: any): number;
     setInputMask(input: any): void;
     getValueAt(index: any): number | null;
     setValueAt(index: any, value: any, flags?: {}): void;

package/lib/mjs/components/number/Number.js

@@ -89,11 +89,6 @@ export default class NumberComponent extends Input {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
-            // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
-            // parseNumber on it
-            defaultValue = this.parseNumber(defaultValue);
-        }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;
         }
@@ -105,12 +100,6 @@ export default class NumberComponent extends Input {
     isDecimalAllowed() {
         return _.get(this.component, 'allowDecimal', !(this.component.validate && this.component.validate.integer));
     }
-    /**
-     * parses a numeric string by removing the delimiters and replacing the decimal separator back to '.' so that it can
-     * be processed by either parseInt or parseFloat
-     * @param {string} value the value to be parsed
-     * @returns {number} a parsed number
-     */
     parseNumber(value) {
         // Remove delimiters and convert decimal separator to dot.
         value = value.split(this.delimiter).join('').replace(this.decimalSeparator, '.');

package/lib/mjs/components/number/editForm/Number.edit.data.d.ts

@@ -5,6 +5,36 @@ declare const _default: ({
     key: string;
     label: string;
     tooltip: string;
+    conditional?: undefined;
+    defaultValue?: undefined;
+    ignore?: undefined;
+} | {
+    type: string;
+    input: boolean;
+    weight: number;
+    key: string;
+    label: string;
+    conditional: {
+        show: boolean;
+        conjunction: string;
+        conditions: {
+            component: string;
+            operator: string;
+            value: boolean;
+        }[];
+    };
+    defaultValue: string;
+    tooltip?: undefined;
+    ignore?: undefined;
+} | {
+    type: string;
+    input: boolean;
+    weight: number;
+    key: string;
+    label: string;
+    defaultValue: string;
+    tooltip?: undefined;
+    conditional?: undefined;
     ignore?: undefined;
 } | {
     key: string;
@@ -14,5 +44,7 @@ declare const _default: ({
     weight?: undefined;
     label?: undefined;
     tooltip?: undefined;
+    conditional?: undefined;
+    defaultValue?: undefined;
 })[];
 export default _default;

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

@@ -8,9 +8,36 @@ export default [
         tooltip: 'Separate thousands by local delimiter.'
     },
     {
-        type: 'number',
+        type: "textfield",
         input: true,
         weight: 80,
+        key: "thousandsSeparator",
+        label: "Thousands Separator",
+        conditional: {
+            show: true,
+            conjunction: "all",
+            conditions: [
+                {
+                    component: "delimiter",
+                    operator: "isEqual",
+                    value: true
+                }
+            ]
+        },
+        defaultValue: ","
+    },
+    {
+        type: "textfield",
+        input: true,
+        weight: 90,
+        key: "decimalSymbol",
+        label: "Decimal Symbol",
+        defaultValue: "."
+    },
+    {
+        type: 'number',
+        input: true,
+        weight: 100,
         key: 'decimalLimit',
         label: 'Decimal Places',
         tooltip: 'The maximum number of decimal places.'
@@ -18,7 +45,7 @@ export default [
     {
         type: 'checkbox',
         input: true,
-        weight: 90,
+        weight: 110,
         key: 'requireDecimal',
         label: 'Require Decimal',
         tooltip: 'Always show decimals, even if trailing zeros.'

package/lib/mjs/components/number/fixtures/index.d.ts

@@ -7,5 +7,4 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
-import comp10 from './comp10';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10 };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9 };

package/lib/mjs/components/number/fixtures/index.js

@@ -7,5 +7,4 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
-import comp10 from './comp10';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10 };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9 };

package/lib/mjs/components/time/Time.d.ts

@@ -1,12 +1,12 @@
 export default class TimeComponent extends TextFieldComponent {
-    rawData: any;
+    rawData: string | never[];
     get dataFormat(): any;
     get skipMaskValidation(): boolean;
     isNotCompleteInput(value: any): any;
     removeValue(index: any): void;
     resetRawData(index: any): void;
     setRawValue(value: any, index: any): void;
-    getRawValue(index: any): any;
+    getRawValue(index: any): string | never[];
     getValueAt(index: any): any;
     setValueAt(index: any, value: any): void;
     getStringAsValue(view: any): any;

package/lib/mjs/components/time/Time.js

@@ -31,8 +31,7 @@ export default class TimeComponent extends TextFieldComponent {
         this.component.inputType = isEdgeBrowser && edgeVersion <= 18
             ? 'text'
             : (this.component.inputType || 'time');
-        // If default value is given then the raw data needs to be set
-        this.rawData = this.component.multiple ? [] : this.getValueAsString(this.defaultValue) || this.emptyValue;
+        this.rawData = this.component.multiple ? [] : this.emptyValue;
     }
     static get builderInfo() {
         return {
@@ -63,7 +62,7 @@ export default class TimeComponent extends TextFieldComponent {
         return value;
     }
     get validationValue() {
-        if ((Array.isArray(this.rawData) && !this.rawData.length) || !this.rawData) {
+        if (Array.isArray(this.rawData) && !this.rawData.length || !this.rawData) {
             return this.dataValue;
         }
         return this.rawData;

package/lib/mjs/components/time/fixtures/index.d.ts

@@ -1,7 +1,6 @@
 import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
-import comp4 from './comp4';
 import timeForm from './timeForm';
 import timeForm2 from './timeForm2';
-export { comp1, comp2, comp3, comp4, timeForm, timeForm2 };
+export { comp1, comp2, comp3, timeForm, timeForm2 };

package/lib/mjs/components/time/fixtures/index.js

@@ -1,7 +1,6 @@
 import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
-import comp4 from './comp4';
 import timeForm from './timeForm';
 import timeForm2 from './timeForm2';
-export { comp1, comp2, comp3, comp4, timeForm, timeForm2 };
+export { comp1, comp2, comp3, timeForm, timeForm2 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5712.d53f35e",
+  "version": "5.0.0-dev.5713.ee12658",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {

package/lib/cjs/components/number/fixtures/comp10.d.ts

@@ -1,18 +0,0 @@
-declare namespace _default {
-    let components: {
-        label: string;
-        applyMaskOn: string;
-        mask: boolean;
-        tableView: boolean;
-        delimiter: boolean;
-        requireDecimal: boolean;
-        inputFormat: string;
-        truncateMultipleSpaces: boolean;
-        validateWhenHidden: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        defaultValue: string;
-    }[];
-}
-export default _default;

package/lib/cjs/components/number/fixtures/comp10.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    components: [
-        {
-            "label": "Number",
-            "applyMaskOn": "change",
-            "mask": false,
-            "tableView": false,
-            "delimiter": false,
-            "requireDecimal": false,
-            "inputFormat": "plain",
-            "truncateMultipleSpaces": false,
-            "validateWhenHidden": false,
-            "key": "number",
-            "type": "number",
-            "input": true,
-            "defaultValue": "123.23"
-        }
-    ]
-};

package/lib/cjs/components/time/fixtures/comp4.d.ts

@@ -1,166 +0,0 @@
-declare namespace _default {
-    let type: string;
-    let display: string;
-    let components: {
-        title: string;
-        breadcrumbClickable: boolean;
-        buttonSettings: {
-            previous: boolean;
-            cancel: boolean;
-            next: boolean;
-        };
-        navigateOnEnter: boolean;
-        saveOnEnter: boolean;
-        scrollToTop: boolean;
-        collapsible: boolean;
-        key: string;
-        type: string;
-        label: string;
-        components: {
-            label: string;
-            disabled: boolean;
-            alwaysEnabled: boolean;
-            tableView: boolean;
-            defaultValue: string;
-            key: string;
-            type: string;
-            input: boolean;
-            inputMask: string;
-            hideOnChildrenHidden: boolean;
-            id: string;
-            placeholder: string;
-            prefix: string;
-            customClass: string;
-            suffix: string;
-            multiple: boolean;
-            protected: boolean;
-            unique: boolean;
-            persistent: boolean;
-            hidden: boolean;
-            clearOnHide: boolean;
-            refreshOn: string;
-            redrawOn: string;
-            modalEdit: boolean;
-            dataGridLabel: boolean;
-            labelPosition: string;
-            description: string;
-            errorLabel: string;
-            tooltip: string;
-            hideLabel: boolean;
-            tabindex: string;
-            autofocus: boolean;
-            dbIndex: boolean;
-            customDefaultValue: string;
-            calculateValue: string;
-            calculateServer: boolean;
-            widget: {
-                type: string;
-            };
-            attributes: {};
-            validateOn: string;
-            validate: {
-                required: boolean;
-                custom: string;
-                customPrivate: boolean;
-                strictDateValidation: boolean;
-                multiple: boolean;
-                unique: boolean;
-                minLength: string;
-                maxLength: string;
-                pattern: string;
-            };
-            conditional: {
-                show: null;
-                when: null;
-                eq: string;
-            };
-            overlay: {
-                style: string;
-                left: string;
-                top: string;
-                width: string;
-                height: string;
-            };
-            allowCalculateOverride: boolean;
-            encrypted: boolean;
-            showCharCount: boolean;
-            showWordCount: boolean;
-            properties: {};
-            allowMultipleMasks: boolean;
-            addons: never[];
-            mask: boolean;
-            inputType: string;
-            inputFormat: string;
-            displayMask: string;
-            spellcheck: boolean;
-            truncateMultipleSpaces: boolean;
-            format: string;
-            dataFormat: string;
-        }[];
-        input: boolean;
-        tableView: boolean;
-        id: string;
-        placeholder: string;
-        prefix: string;
-        customClass: string;
-        suffix: string;
-        multiple: boolean;
-        defaultValue: null;
-        protected: boolean;
-        unique: boolean;
-        persistent: boolean;
-        hidden: boolean;
-        clearOnHide: boolean;
-        refreshOn: string;
-        redrawOn: string;
-        modalEdit: boolean;
-        dataGridLabel: boolean;
-        labelPosition: string;
-        description: string;
-        errorLabel: string;
-        tooltip: string;
-        hideLabel: boolean;
-        tabindex: string;
-        disabled: boolean;
-        autofocus: boolean;
-        dbIndex: boolean;
-        customDefaultValue: string;
-        calculateValue: string;
-        calculateServer: boolean;
-        widget: null;
-        attributes: {};
-        validateOn: string;
-        validate: {
-            required: boolean;
-            custom: string;
-            customPrivate: boolean;
-            strictDateValidation: boolean;
-            multiple: boolean;
-            unique: boolean;
-        };
-        conditional: {
-            show: null;
-            when: null;
-            eq: string;
-        };
-        overlay: {
-            style: string;
-            left: string;
-            top: string;
-            width: string;
-            height: string;
-        };
-        allowCalculateOverride: boolean;
-        encrypted: boolean;
-        showCharCount: boolean;
-        showWordCount: boolean;
-        properties: {};
-        allowMultipleMasks: boolean;
-        addons: never[];
-        tree: boolean;
-        lazyLoad: boolean;
-        theme: string;
-        breadcrumb: string;
-    }[];
-}
-export default _default;