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

package/lib/mjs/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/mjs/components/datagrid/fixtures/comp-with-checkboxes.js

@@ -0,0 +1,34 @@
+export 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/mjs/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/mjs/components/datagrid/fixtures/index.js

@@ -14,4 +14,5 @@ import withLogic from './comp-with-logic';
 import withCollapsibleRowGroups from './comp-with-collapsible-groups';
 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/mjs/components/radio/Radio.js

@@ -200,7 +200,8 @@ export default class RadioComponent extends ListComponent {
         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 && _.isObject(this.loadedOptions[index].value)) ?
@@ -322,7 +323,7 @@ export default class RadioComponent extends ListComponent {
             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/mjs/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/mjs/components/select/Select.js

@@ -58,7 +58,6 @@ export default class SelectComponent extends ListComponent {
         return SelectComponent.conditionOperatorsSettings;
     }
     static get conditionOperatorsSettings() {
-        const numberType = () => ({ type: 'number' });
         return {
             ...super.conditionOperatorsSettings,
             valueComponent(classComp) {
@@ -75,18 +74,7 @@ export default class SelectComponent extends ListComponent {
           `;
                 }
                 return valueComp;
-            },
-            dataTypeOperators: {
-                number: ['lessThan', 'greaterThan', 'lessThanOrEqual', 'greaterThanOrEqual'],
-            },
-            dataTypeValueComponents: {
-                number: {
-                    lessThan: numberType,
-                    greaterThan: numberType,
-                    lessThanOrEqual: numberType,
-                    greaterThanOrEqual: numberType,
-                },
-            },
+            }
         };
     }
     static savedValueTypes(schema) {

package/lib/mjs/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/mjs/components/select/fixtures/index.js

@@ -22,5 +22,4 @@ 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 };

package/lib/mjs/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/mjs/translations/en.js

@@ -71,5 +71,7 @@ export 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/mjs/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/mjs/utils/ChoicesWrapper.js

@@ -99,10 +99,21 @@ class ChoicesWrapper extends Choices {
             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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5656.925a8ee",
+  "version": "5.0.0-dev.5661.22d0f16",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {

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

@@ -1,44 +0,0 @@
-declare namespace _default {
-    let title: string;
-    let name: string;
-    let path: string;
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        widget: string;
-        tableView: boolean;
-        data: {
-            values: {
-                label: string;
-                value: string;
-            }[];
-        };
-        dataType: string;
-        key: string;
-        type: string;
-        input: boolean;
-        applyMaskOn?: undefined;
-        conditional?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        conditional: {
-            show: boolean;
-            conjunction: string;
-            conditions: {
-                component: string;
-                operator: string;
-                value: number;
-            }[];
-        };
-        widget?: undefined;
-        data?: undefined;
-        dataType?: undefined;
-    })[];
-}
-export default _default;

package/lib/cjs/components/select/fixtures/comp25.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    title: 'FIO-8072',
-    name: 'fio8072',
-    path: 'fio8072',
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Select',
-            widget: 'choicesjs',
-            tableView: true,
-            data: {
-                values: [
-                    {
-                        label: 'A',
-                        value: '1',
-                    },
-                    {
-                        label: 'B',
-                        value: '2',
-                    },
-                    {
-                        label: 'C',
-                        value: '10',
-                    },
-                    {
-                        label: 'D',
-                        value: '1d',
-                    },
-                ],
-            },
-            dataType: 'number',
-            key: 'select',
-            type: 'select',
-            input: true,
-        },
-        {
-            label: 'Text Field',
-            applyMaskOn: 'change',
-            tableView: true,
-            key: 'textField',
-            type: 'textfield',
-            input: true,
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'select',
-                        operator: 'lessThan',
-                        value: 5,
-                    },
-                ],
-            },
-        },
-    ],
-};

package/lib/mjs/components/select/fixtures/comp25.d.ts

@@ -1,44 +0,0 @@
-declare namespace _default {
-    let title: string;
-    let name: string;
-    let path: string;
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        widget: string;
-        tableView: boolean;
-        data: {
-            values: {
-                label: string;
-                value: string;
-            }[];
-        };
-        dataType: string;
-        key: string;
-        type: string;
-        input: boolean;
-        applyMaskOn?: undefined;
-        conditional?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        conditional: {
-            show: boolean;
-            conjunction: string;
-            conditions: {
-                component: string;
-                operator: string;
-                value: number;
-            }[];
-        };
-        widget?: undefined;
-        data?: undefined;
-        dataType?: undefined;
-    })[];
-}
-export default _default;

package/lib/mjs/components/select/fixtures/comp25.js

@@ -1,57 +0,0 @@
-export default {
-    title: 'FIO-8072',
-    name: 'fio8072',
-    path: 'fio8072',
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Select',
-            widget: 'choicesjs',
-            tableView: true,
-            data: {
-                values: [
-                    {
-                        label: 'A',
-                        value: '1',
-                    },
-                    {
-                        label: 'B',
-                        value: '2',
-                    },
-                    {
-                        label: 'C',
-                        value: '10',
-                    },
-                    {
-                        label: 'D',
-                        value: '1d',
-                    },
-                ],
-            },
-            dataType: 'number',
-            key: 'select',
-            type: 'select',
-            input: true,
-        },
-        {
-            label: 'Text Field',
-            applyMaskOn: 'change',
-            tableView: true,
-            key: 'textField',
-            type: 'textfield',
-            input: true,
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'select',
-                        operator: 'lessThan',
-                        value: 5,
-                    },
-                ],
-            },
-        },
-    ],
-};