@formio/js 5.0.0-dev.5656.925a8ee → 5.0.0-dev.5661.22d0f16

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

@@ -2665,7 +2665,7 @@ class Component extends Element_1.default {
      */
     resetValue() {
         this.unset();
-        this.setValue(this.emptyValue, {
+        this.setValue(this.defaultValue || this.emptyValue, {
             noUpdateEvent: true,
             noValidate: true,
             resetValue: true

package/lib/cjs/components/_classes/component/fixtures/comp6.d.ts

@@ -0,0 +1,77 @@
+declare namespace _default {
+    let components: ({
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: string;
+        mask?: undefined;
+        delimiter?: undefined;
+        requireDecimal?: undefined;
+        inputFormat?: undefined;
+        truncateMultipleSpaces?: undefined;
+        widget?: undefined;
+        data?: undefined;
+        action?: undefined;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        mask: boolean;
+        tableView: boolean;
+        delimiter: boolean;
+        requireDecimal: boolean;
+        inputFormat: string;
+        truncateMultipleSpaces: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: number;
+        widget?: undefined;
+        data?: undefined;
+        action?: undefined;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        widget: string;
+        tableView: boolean;
+        data: {
+            values: {
+                label: string;
+                value: string;
+            }[];
+        };
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: string;
+        applyMaskOn?: undefined;
+        mask?: undefined;
+        delimiter?: undefined;
+        requireDecimal?: undefined;
+        inputFormat?: undefined;
+        truncateMultipleSpaces?: undefined;
+        action?: undefined;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        action: string;
+        showValidations: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+        defaultValue?: undefined;
+        mask?: undefined;
+        delimiter?: undefined;
+        requireDecimal?: undefined;
+        inputFormat?: undefined;
+        truncateMultipleSpaces?: undefined;
+        widget?: undefined;
+        data?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp6.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    "components": [
+        {
+            "label": "Text Field",
+            "applyMaskOn": "change",
+            "tableView": true,
+            "key": "textField",
+            "type": "textfield",
+            "input": true,
+            "defaultValue": "test"
+        },
+        {
+            "label": "Number",
+            "applyMaskOn": "change",
+            "mask": false,
+            "tableView": false,
+            "delimiter": false,
+            "requireDecimal": false,
+            "inputFormat": "plain",
+            "truncateMultipleSpaces": false,
+            "key": "number",
+            "type": "number",
+            "input": true,
+            "defaultValue": 123
+        },
+        {
+            "label": "Select",
+            "widget": "choicesjs",
+            "tableView": true,
+            "data": {
+                "values": [
+                    {
+                        "label": "a",
+                        "value": "a"
+                    },
+                    {
+                        "label": "b",
+                        "value": "b"
+                    }
+                ]
+            },
+            "key": "select",
+            "type": "select",
+            "input": true,
+            "defaultValue": "a"
+        },
+        {
+            "label": "Reset",
+            "action": "reset",
+            "showValidations": false,
+            "tableView": false,
+            "key": "reset",
+            "type": "button",
+            "input": true
+        },
+    ]
+};

package/lib/cjs/components/_classes/component/fixtures/index.d.ts

@@ -3,4 +3,5 @@ import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
-export { comp1, comp2, comp3, comp4, comp5 };
+import comp6 from './comp6';
+export { comp1, comp2, comp3, comp4, comp5, comp6 };

package/lib/cjs/components/_classes/component/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.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+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"));
@@ -14,3 +14,5 @@ const comp4_1 = __importDefault(require("./comp4"));
 exports.comp4 = comp4_1.default;
 const comp5_1 = __importDefault(require("./comp5"));
 exports.comp5 = comp5_1.default;
+const comp6_1 = __importDefault(require("./comp6"));
+exports.comp6 = comp6_1.default;

package/lib/cjs/components/_classes/input/Input.js

@@ -151,13 +151,15 @@ class Input extends Multivalue_1.default {
             else {
                 this.addClass(element, 'text-danger');
             }
-            this.setContent(element, this.t(`{{ remaining }} ${type} remaining.`, {
-                remaining: remaining
+            this.setContent(element, this.t(`typeRemaining`, {
+                remaining: remaining,
+                type: type
             }));
         }
         else {
-            this.setContent(element, this.t(`{{ count }} ${type}`, {
-                count: count
+            this.setContent(element, this.t(`typeCount`, {
+                count: count,
+                type: type
             }));
         }
     }

package/lib/cjs/components/datagrid/fixtures/comp-with-checkboxes.d.ts

@@ -0,0 +1,29 @@
+declare namespace _default {
+    let label: string;
+    let reorder: boolean;
+    let addAnotherPosition: string;
+    let layoutFixed: boolean;
+    let enableRowGroups: boolean;
+    let initEmpty: boolean;
+    let tableView: boolean;
+    let defaultValue: {}[];
+    let key: string;
+    let type: string;
+    let input: boolean;
+    let components: {
+        label: string;
+        optionsLabelPosition: string;
+        inline: boolean;
+        tableView: boolean;
+        values: {
+            label: string;
+            value: string;
+            shortcut: string;
+        }[];
+        key: string;
+        type: string;
+        input: boolean;
+        inputType: string;
+    }[];
+}
+export default _default;

package/lib/cjs/components/datagrid/fixtures/comp-with-checkboxes.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    'label': 'Data Grid',
+    'reorder': false,
+    'addAnotherPosition': 'bottom',
+    'layoutFixed': false,
+    'enableRowGroups': false,
+    'initEmpty': false,
+    'tableView': false,
+    'defaultValue': [
+        {}
+    ],
+    'key': 'dataGrid',
+    'type': 'datagrid',
+    'input': true,
+    'components': [
+        {
+            'label': 'Radio',
+            'optionsLabelPosition': 'right',
+            'inline': false,
+            'tableView': false,
+            'values': [
+                {
+                    'label': 'yes',
+                    'value': 'yes',
+                    'shortcut': ''
+                }
+            ],
+            'key': 'radio',
+            'type': 'radio',
+            'input': true,
+            'inputType': 'checkbox'
+        }
+    ]
+};

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

@@ -14,4 +14,5 @@ import withRowGroupsAndDefValue from './comp-row-groups-with-def-value';
 import modalWithRequiredFields from './comp-modal-with-required-fields';
 import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride };
+import withCheckboxes from './comp-with-checkboxes';
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes };

package/lib/cjs/components/datagrid/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.twoWithAllowCalculatedOverride = exports.withAllowCalculateOverride = exports.modalWithRequiredFields = exports.withRowGroupsAndDefValue = exports.withLogic = exports.withDefValue = exports.withConditionalFieldsAndValidations = exports.withCollapsibleRowGroups = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.withCheckboxes = exports.twoWithAllowCalculatedOverride = exports.withAllowCalculateOverride = exports.modalWithRequiredFields = exports.withRowGroupsAndDefValue = exports.withLogic = exports.withDefValue = exports.withConditionalFieldsAndValidations = exports.withCollapsibleRowGroups = 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"));
@@ -36,3 +36,5 @@ const comp_with_allow_calculate_override_1 = __importDefault(require("./comp-wit
 exports.withAllowCalculateOverride = comp_with_allow_calculate_override_1.default;
 const two_comp_with_allow_calculate_override_1 = __importDefault(require("./two-comp-with-allow-calculate-override"));
 exports.twoWithAllowCalculatedOverride = two_comp_with_allow_calculate_override_1.default;
+const comp_with_checkboxes_1 = __importDefault(require("./comp-with-checkboxes"));
+exports.withCheckboxes = comp_with_checkboxes_1.default;

package/lib/cjs/components/radio/Radio.js

@@ -200,7 +200,8 @@ class RadioComponent extends ListComponent_1.default {
         if (this.viewOnly || !this.refs.input || !this.refs.input.length) {
             return this.dataValue;
         }
-        let value = this.dataValue;
+        // If the input type of the component is checkbox the value should be determined by the checkboxes checked property
+        let value = this.component.inputType === 'checkbox' ? '' : this.dataValue;
         this.refs.input.forEach((input, index) => {
             if (input.checked) {
                 value = (this.isSelectURL && lodash_1.default.isObject(this.loadedOptions[index].value)) ?
@@ -322,7 +323,7 @@ class RadioComponent extends ListComponent_1.default {
             const value = this.dataValue;
             this.refs.wrapper.forEach((wrapper, index) => {
                 const input = this.refs.input[index];
-                const checked = (input.type === 'checkbox') ? value[input.value] : (input.value.toString() === value.toString());
+                const checked = (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);

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

@@ -9,47 +9,9 @@ export default class SelectComponent extends ListComponent {
     };
     static get serverConditionSettings(): {
         valueComponent(classComp: any): any;
-        dataTypeOperators: {
-            number: string[];
-        };
-        dataTypeValueComponents: {
-            number: {
-                lessThan: () => {
-                    type: string;
-                };
-                greaterThan: () => {
-                    type: string;
-                };
-                lessThanOrEqual: () => {
-                    type: string;
-                };
-                greaterThanOrEqual: () => {
-                    type: string;
-                };
-            };
-        };
     };
     static get conditionOperatorsSettings(): {
         valueComponent(classComp: any): any;
-        dataTypeOperators: {
-            number: string[];
-        };
-        dataTypeValueComponents: {
-            number: {
-                lessThan: () => {
-                    type: string;
-                };
-                greaterThan: () => {
-                    type: string;
-                };
-                lessThanOrEqual: () => {
-                    type: string;
-                };
-                greaterThanOrEqual: () => {
-                    type: string;
-                };
-            };
-        };
     };
     static savedValueTypes(schema: any): any[];
     templateData: {} | undefined;

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

@@ -63,7 +63,6 @@ class SelectComponent extends ListComponent_1.default {
         return SelectComponent.conditionOperatorsSettings;
     }
     static get conditionOperatorsSettings() {
-        const numberType = () => ({ type: 'number' });
         return Object.assign(Object.assign({}, super.conditionOperatorsSettings), { valueComponent(classComp) {
                 const valueComp = Object.assign(Object.assign({}, classComp), { type: 'select' });
                 if ((0, utils_1.isSelectResourceWithObjectValue)(classComp)) {
@@ -78,15 +77,6 @@ class SelectComponent extends ListComponent_1.default {
           `;
                 }
                 return valueComp;
-            }, dataTypeOperators: {
-                number: ['lessThan', 'greaterThan', 'lessThanOrEqual', 'greaterThanOrEqual'],
-            }, dataTypeValueComponents: {
-                number: {
-                    lessThan: numberType,
-                    greaterThan: numberType,
-                    lessThanOrEqual: numberType,
-                    greaterThanOrEqual: numberType,
-                },
             } });
     }
     static savedValueTypes(schema) {

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

@@ -21,6 +21,5 @@ import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './comp23';
 import comp24 from './comp24';
-import comp25 from './comp25';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25 };
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24 };
 export { multiSelect, multiSelectOptions } from "./comp3";

package/lib/cjs/components/select/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.comp25 = exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
+exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -53,5 +53,3 @@ const comp23_1 = __importDefault(require("./comp23"));
 exports.comp23 = comp23_1.default;
 const comp24_1 = __importDefault(require("./comp24"));
 exports.comp24 = comp24_1.default;
-const comp25_1 = __importDefault(require("./comp25"));
-exports.comp25 = comp25_1.default;

package/lib/cjs/translations/en.d.ts

@@ -72,5 +72,7 @@ declare namespace _default {
     let reCaptchaTokenValidationError: string;
     let reCaptchaTokenNotSpecifiedError: string;
     let apiKey: string;
+    let typeRemaining: string;
+    let typeCount: string;
 }
 export default _default;

package/lib/cjs/translations/en.js

@@ -73,5 +73,7 @@ exports.default = {
     submitButtonAriaLabel: 'Submit Form button. Click to submit the form',
     reCaptchaTokenValidationError: 'ReCAPTCHA: Token validation error',
     reCaptchaTokenNotSpecifiedError: 'ReCAPTCHA: Token is not specified in submission',
-    apiKey: 'API Key is not unique: {{key}}'
+    apiKey: 'API Key is not unique: {{key}}',
+    typeRemaining: '{{ remaining }} {{ type }} remaining.',
+    typeCount: '{{ count }} {{ type }}'
 };

package/lib/cjs/utils/ChoicesWrapper.d.ts

@@ -24,7 +24,7 @@ declare class ChoicesWrapper extends Choices {
     _onEnterKey(args: any): void;
     _onDirectionKey(...args: any[]): void;
     timeout: NodeJS.Timeout | undefined;
-    _selectHighlightedChoice(activeItems: any): void;
+    _selectHighlightedChoice(): void;
     _onKeyDown(event: any): void;
     onSelectValue({ event, activeItems, hasActiveDropdown }: {
         event: any;

package/lib/cjs/utils/ChoicesWrapper.js

@@ -105,10 +105,21 @@ class ChoicesWrapper extends choices_js_1.default {
             this._selectHighlightedChoice(activeItems);
         }
     }
-    _selectHighlightedChoice(activeItems) {
+    _selectHighlightedChoice() {
         const highlightedChoice = this.dropdown.getChild(`.${this.config.classNames.highlightedState}`);
         if (highlightedChoice) {
-            this._handleChoiceAction(activeItems, highlightedChoice);
+            const id = highlightedChoice.dataset.id;
+            const choice = id && this._store.getChoiceById(id);
+            this._addItem({
+                value: choice.value,
+                label: choice.label,
+                choiceId: choice.id,
+                groupId: choice.groupId,
+                customProperties: choice.customProperties,
+                placeholder: choice.placeholder,
+                keyCode: choice.keyCode
+            });
+            this._triggerChange(choice.value);
         }
         event.preventDefault();
     }

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

@@ -2634,7 +2634,7 @@ export default class Component extends Element {
      */
     resetValue() {
         this.unset();
-        this.setValue(this.emptyValue, {
+        this.setValue(this.defaultValue || this.emptyValue, {
             noUpdateEvent: true,
             noValidate: true,
             resetValue: true

package/lib/mjs/components/_classes/component/fixtures/comp6.d.ts

@@ -0,0 +1,77 @@
+declare namespace _default {
+    let components: ({
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: string;
+        mask?: undefined;
+        delimiter?: undefined;
+        requireDecimal?: undefined;
+        inputFormat?: undefined;
+        truncateMultipleSpaces?: undefined;
+        widget?: undefined;
+        data?: undefined;
+        action?: undefined;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        mask: boolean;
+        tableView: boolean;
+        delimiter: boolean;
+        requireDecimal: boolean;
+        inputFormat: string;
+        truncateMultipleSpaces: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: number;
+        widget?: undefined;
+        data?: undefined;
+        action?: undefined;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        widget: string;
+        tableView: boolean;
+        data: {
+            values: {
+                label: string;
+                value: string;
+            }[];
+        };
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: string;
+        applyMaskOn?: undefined;
+        mask?: undefined;
+        delimiter?: undefined;
+        requireDecimal?: undefined;
+        inputFormat?: undefined;
+        truncateMultipleSpaces?: undefined;
+        action?: undefined;
+        showValidations?: undefined;
+    } | {
+        label: string;
+        action: string;
+        showValidations: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+        defaultValue?: undefined;
+        mask?: undefined;
+        delimiter?: undefined;
+        requireDecimal?: undefined;
+        inputFormat?: undefined;
+        truncateMultipleSpaces?: undefined;
+        widget?: undefined;
+        data?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/_classes/component/fixtures/comp6.js

@@ -0,0 +1,57 @@
+export default {
+    "components": [
+        {
+            "label": "Text Field",
+            "applyMaskOn": "change",
+            "tableView": true,
+            "key": "textField",
+            "type": "textfield",
+            "input": true,
+            "defaultValue": "test"
+        },
+        {
+            "label": "Number",
+            "applyMaskOn": "change",
+            "mask": false,
+            "tableView": false,
+            "delimiter": false,
+            "requireDecimal": false,
+            "inputFormat": "plain",
+            "truncateMultipleSpaces": false,
+            "key": "number",
+            "type": "number",
+            "input": true,
+            "defaultValue": 123
+        },
+        {
+            "label": "Select",
+            "widget": "choicesjs",
+            "tableView": true,
+            "data": {
+                "values": [
+                    {
+                        "label": "a",
+                        "value": "a"
+                    },
+                    {
+                        "label": "b",
+                        "value": "b"
+                    }
+                ]
+            },
+            "key": "select",
+            "type": "select",
+            "input": true,
+            "defaultValue": "a"
+        },
+        {
+            "label": "Reset",
+            "action": "reset",
+            "showValidations": false,
+            "tableView": false,
+            "key": "reset",
+            "type": "button",
+            "input": true
+        },
+    ]
+};

package/lib/mjs/components/_classes/component/fixtures/index.d.ts

@@ -3,4 +3,5 @@ import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
-export { comp1, comp2, comp3, comp4, comp5 };
+import comp6 from './comp6';
+export { comp1, comp2, comp3, comp4, comp5, comp6 };

package/lib/mjs/components/_classes/component/fixtures/index.js

@@ -3,4 +3,5 @@ import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
-export { comp1, comp2, comp3, comp4, comp5 };
+import comp6 from './comp6';
+export { comp1, comp2, comp3, comp4, comp5, comp6 };

package/lib/mjs/components/_classes/input/Input.js

@@ -146,13 +146,15 @@ export default class Input extends Multivalue {
             else {
                 this.addClass(element, 'text-danger');
             }
-            this.setContent(element, this.t(`{{ remaining }} ${type} remaining.`, {
-                remaining: remaining
+            this.setContent(element, this.t(`typeRemaining`, {
+                remaining: remaining,
+                type: type
             }));
         }
         else {
-            this.setContent(element, this.t(`{{ count }} ${type}`, {
-                count: count
+            this.setContent(element, this.t(`typeCount`, {
+                count: count,
+                type: type
             }));
         }
     }