@formio/js 5.1.0-dev.6104.98e707b → 5.1.0-dev.6105.96dde7b

package/lib/cjs/components/datagrid/DataGrid.js

@@ -492,6 +492,10 @@ class DataGridComponent extends NestedArrayComponent_1.default {
             options.row = `${rowIndex}-${colIndex}`;
             options.rowIndex = rowIndex;
             options.onChange = (flags, changed, modified) => {
+                if (changed.component.type === 'form') {
+                    const formComp = (0, utils_1.getComponent)(this.component.components, changed.component.key);
+                    lodash_1.default.set(formComp, 'components', changed.component.components);
+                }
                 this.triggerChange({ modified });
             };
             let columnComponent;

package/lib/cjs/components/radio/Radio.d.ts

@@ -28,7 +28,6 @@ export default class RadioComponent extends ListComponent {
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
     beforeSubmit(): Promise<any>;
-    convertValues(values: any): any;
     render(): string;
     attach(element: any): Promise<void>;
     detach(element: any): void;
@@ -42,12 +41,5 @@ export default class RadioComponent extends ListComponent {
     setSelectedClasses(): void;
     updateValue(value: any, flags: any): boolean;
     currentValue: any;
-    /**
-     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
-     * @param {*} value - The value to normalize
-     * @returns {*} - Returns the normalized value
-     */
-    convertByDataType(value: any): any;
-    normalizeValue(value: any): any;
 }
 import ListComponent from '../_classes/list/ListComponent';

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

@@ -153,12 +153,6 @@ class RadioComponent extends ListComponent_1.default {
             this.dataReady.then(() => res(true));
         });
     }
-    convertValues(values) {
-        if (this.options.renderMode === 'html' && this.type === 'radio') {
-            return values.map(x => (Object.assign(Object.assign({}, x), { value: this.convertByDataType(x.value) })));
-        }
-        return values;
-    }
     render() {
         if (!this.optionsLoaded) {
             return super.render(this.renderTemplate('loader'));
@@ -166,7 +160,7 @@ class RadioComponent extends ListComponent_1.default {
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
-            values: this.component.dataSrc === 'values' ? this.convertValues(this.component.values) : this.loadedOptions,
+            values: this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions,
             value: this.dataValue,
             row: this.row,
         }));
@@ -412,7 +406,7 @@ class RadioComponent extends ListComponent_1.default {
      * @param {*} value - The value to normalize
      * @returns {*} - Returns the normalized value
      */
-    convertByDataType(value) {
+    normalizeValue(value) {
         const dataType = this.component.dataType || 'auto';
         if (value === this.emptyValue) {
             return value;
@@ -444,18 +438,14 @@ class RadioComponent extends ListComponent_1.default {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        return value;
-    }
-    normalizeValue(value) {
-        const valueConverted = this.convertByDataType(value);
-        if (this.isSelectURL && this.templateData && this.templateData[valueConverted]) {
+        if (this.isSelectURL && this.templateData && this.templateData[value]) {
             const submission = this.root.submission;
             if (!submission.metadata.selectData) {
                 submission.metadata.selectData = {};
             }
-            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
+            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[value]);
         }
-        return super.normalizeValue(valueConverted);
+        return super.normalizeValue(value);
     }
 }
 exports.default = RadioComponent;

package/lib/cjs/components/selectboxes/SelectBoxes.d.ts

@@ -8,12 +8,6 @@ export default class SelectBoxesComponent extends RadioComponent {
      * @returns {boolean} - If the value is empty.
      */
     isEmpty(value?: any): boolean;
-    /**
-     * Normalize values coming into updateValue.
-     * @param {any} value - The value to normalize.
-     * @returns {*} - The normalized value
-     */
-    normalizeValue(value: any): any;
     setInputsDisabled(value: any, onlyUnchecked: any): void;
     checkComponentValidity(data: any, dirty: any, rowData: any, options: any, errors?: any[]): boolean;
 }

package/lib/mjs/components/datagrid/DataGrid.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';
-import { fastCloneDeep, getFocusableElements } from '../../utils/utils';
+import { fastCloneDeep, getFocusableElements, getComponent } from '../../utils/utils';
 export default class DataGridComponent extends NestedArrayComponent {
     static schema(...extend) {
         return NestedArrayComponent.schema({
@@ -488,6 +488,10 @@ export default class DataGridComponent extends NestedArrayComponent {
             options.row = `${rowIndex}-${colIndex}`;
             options.rowIndex = rowIndex;
             options.onChange = (flags, changed, modified) => {
+                if (changed.component.type === 'form') {
+                    const formComp = getComponent(this.component.components, changed.component.key);
+                    _.set(formComp, 'components', changed.component.components);
+                }
                 this.triggerChange({ modified });
             };
             let columnComponent;

package/lib/mjs/components/radio/Radio.d.ts

@@ -28,7 +28,6 @@ export default class RadioComponent extends ListComponent {
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
     beforeSubmit(): Promise<any>;
-    convertValues(values: any): any;
     render(): string;
     attach(element: any): Promise<void>;
     detach(element: any): void;
@@ -42,12 +41,5 @@ export default class RadioComponent extends ListComponent {
     setSelectedClasses(): void;
     updateValue(value: any, flags: any): boolean;
     currentValue: any;
-    /**
-     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
-     * @param {*} value - The value to normalize
-     * @returns {*} - Returns the normalized value
-     */
-    convertByDataType(value: any): any;
-    normalizeValue(value: any): any;
 }
 import ListComponent from '../_classes/list/ListComponent';

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

@@ -153,12 +153,6 @@ export default class RadioComponent extends ListComponent {
             this.dataReady.then(() => res(true));
         });
     }
-    convertValues(values) {
-        if (this.options.renderMode === 'html' && this.type === 'radio') {
-            return values.map(x => ({ ...x, value: this.convertByDataType(x.value) }));
-        }
-        return values;
-    }
     render() {
         if (!this.optionsLoaded) {
             return super.render(this.renderTemplate('loader'));
@@ -166,7 +160,7 @@ export default class RadioComponent extends ListComponent {
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
-            values: this.component.dataSrc === 'values' ? this.convertValues(this.component.values) : this.loadedOptions,
+            values: this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions,
             value: this.dataValue,
             row: this.row,
         }));
@@ -412,7 +406,7 @@ export default class RadioComponent extends ListComponent {
      * @param {*} value - The value to normalize
      * @returns {*} - Returns the normalized value
      */
-    convertByDataType(value) {
+    normalizeValue(value) {
         const dataType = this.component.dataType || 'auto';
         if (value === this.emptyValue) {
             return value;
@@ -444,17 +438,13 @@ export default class RadioComponent extends ListComponent {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        return value;
-    }
-    normalizeValue(value) {
-        const valueConverted = this.convertByDataType(value);
-        if (this.isSelectURL && this.templateData && this.templateData[valueConverted]) {
+        if (this.isSelectURL && this.templateData && this.templateData[value]) {
             const submission = this.root.submission;
             if (!submission.metadata.selectData) {
                 submission.metadata.selectData = {};
             }
-            _.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
+            _.set(submission.metadata.selectData, this.path, this.templateData[value]);
         }
-        return super.normalizeValue(valueConverted);
+        return super.normalizeValue(value);
     }
 }

package/lib/mjs/components/selectboxes/SelectBoxes.d.ts

@@ -8,12 +8,6 @@ export default class SelectBoxesComponent extends RadioComponent {
      * @returns {boolean} - If the value is empty.
      */
     isEmpty(value?: any): boolean;
-    /**
-     * Normalize values coming into updateValue.
-     * @param {any} value - The value to normalize.
-     * @returns {*} - The normalized value
-     */
-    normalizeValue(value: any): any;
     setInputsDisabled(value: any, onlyUnchecked: any): void;
     checkComponentValidity(data: any, dirty: any, rowData: any, options: any, errors?: any[]): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6104.98e707b",
+  "version": "5.1.0-dev.6105.96dde7b",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {