@formio/js 5.0.0-dev.5643.17b8168 → 5.0.0-dev.5647.4cf82e8

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

@@ -14,5 +14,4 @@ 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';
-import withCheckboxes from './comp-with-checkboxes';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride };

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.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;
+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,5 +36,3 @@ 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,8 +200,7 @@ class RadioComponent extends ListComponent_1.default {
         if (this.viewOnly || !this.refs.input || !this.refs.input.length) {
             return 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;
+        let value = this.dataValue;
         this.refs.input.forEach((input, index) => {
             if (input.checked) {
                 value = (this.isSelectURL && lodash_1.default.isObject(this.loadedOptions[index].value)) ?
@@ -323,7 +322,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.checked : (input.value.toString() === value.toString());
+                const checked = (input.type === 'checkbox') ? value[input.value] : (input.value.toString() === value.toString());
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);

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

@@ -14,5 +14,4 @@ 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';
-import withCheckboxes from './comp-with-checkboxes';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride };

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

@@ -14,5 +14,4 @@ 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';
-import withCheckboxes from './comp-with-checkboxes';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride };

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

@@ -200,8 +200,7 @@ export default class RadioComponent extends ListComponent {
         if (this.viewOnly || !this.refs.input || !this.refs.input.length) {
             return 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;
+        let value = this.dataValue;
         this.refs.input.forEach((input, index) => {
             if (input.checked) {
                 value = (this.isSelectURL && _.isObject(this.loadedOptions[index].value)) ?
@@ -323,7 +322,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.checked : (input.value.toString() === value.toString());
+                const checked = (input.type === 'checkbox') ? value[input.value] : (input.value.toString() === value.toString());
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5643.17b8168",
+  "version": "5.0.0-dev.5647.4cf82e8",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {

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

@@ -1,29 +0,0 @@
-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

@@ -1,36 +0,0 @@
-"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/mjs/components/datagrid/fixtures/comp-with-checkboxes.d.ts

@@ -1,29 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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'
-        }
-    ]
-};