@formio/js 5.0.0-bb.dev.3 → 5.0.0-bb.dev.4

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

@@ -587,7 +587,8 @@ class DataGridComponent extends NestedArrayComponent_1.default {
         const isSettingSubmission = flags.fromSubmission && !lodash_1.default.isEqual(value, this.emptyValue);
         const changed = this.hasChanged(value, this.dataValue);
         this.dataValue = value;
-        if (this.initRows || isSettingSubmission) {
+        if (this.initRows || isSettingSubmission ||
+            (Array.isArray(this.dataValue) && this.dataValue.length !== this.rows.length)) {
             if (!this.createRows() && changed) {
                 this.redraw();
             }

package/lib/cjs/components/datagrid/fixtures/comp-with-allow-calculate-override.js

@@ -42,7 +42,7 @@ exports.default = {
                     lastName: ''
                 }
             ],
-            calculateValue: "var temp = [\n    {'firstName': 'initial 1','lastName': 'initial 2'},\n    {'firstName': 'initial 1b','lastName': 'initial 2b'},\n  ];\n  if(data.select === 'a')\n  {\n    temp = [{'firstName': 'A f 1','lastName': 'A l 1'}];\n  } else if(data.select === 'b') {  \n    temp = [{'firstName': 'B f 1','lastName': 'B l 1'}  \n    ,{'firstName': 'B f 2','lastName': 'B l 2'}];\n  } else if(data.select === 'c') {  \n    temp = [{'firstName': 'C f 1','lastName': 'C l 1'}];\n  }\n  value = temp;",
+            calculateValue: "var temp = instance.defaultValue;\n  if(data.select === 'a')\n  {\n    temp = [{'firstName': 'A f 1','lastName': 'A l 1'}];\n  } else if(data.select === 'b') {  \n    temp = [{'firstName': 'B f 1','lastName': 'B l 1'}  \n    ,{'firstName': 'B f 2','lastName': 'B l 2'}];\n  } else if(data.select === 'c') {  \n    temp = [{'firstName': 'C f 1','lastName': 'C l 1'}];\n  }\n  value = temp;",
             allowCalculateOverride: true,
             key: 'dataGrid',
             type: 'datagrid',

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

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

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.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"));
@@ -34,3 +34,5 @@ const comp_with_collapsible_groups_1 = __importDefault(require("./comp-with-coll
 exports.withCollapsibleRowGroups = comp_with_collapsible_groups_1.default;
 const comp_with_allow_calculate_override_1 = __importDefault(require("./comp-with-allow-calculate-override"));
 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;

package/lib/cjs/components/datagrid/fixtures/two-comp-with-allow-calculate-override.d.ts

@@ -0,0 +1,53 @@
+declare namespace _default {
+    const type: string;
+    const display: string;
+    const components: ({
+        label: string;
+        widget: string;
+        tableView: boolean;
+        data: {
+            values: {
+                label: string;
+                value: string;
+            }[];
+        };
+        key: string;
+        type: string;
+        input: boolean;
+        reorder?: undefined;
+        addAnotherPosition?: undefined;
+        layoutFixed?: undefined;
+        enableRowGroups?: undefined;
+        initEmpty?: undefined;
+        defaultValue?: undefined;
+        allowCalculateOverride?: undefined;
+        components?: undefined;
+    } | {
+        label: string;
+        reorder: boolean;
+        addAnotherPosition: string;
+        layoutFixed: boolean;
+        enableRowGroups: boolean;
+        initEmpty: boolean;
+        tableView: boolean;
+        defaultValue: {
+            firstName: string;
+            lastName: string;
+        }[];
+        calculateValue: string;
+        allowCalculateOverride: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            tableView: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+        }[];
+        widget?: undefined;
+        data?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/datagrid/fixtures/two-comp-with-allow-calculate-override.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Select',
+            widget: 'choicesjs',
+            tableView: true,
+            data: {
+                values: [
+                    {
+                        label: 'a',
+                        value: 'a'
+                    },
+                    {
+                        label: 'b',
+                        value: 'b'
+                    },
+                    {
+                        label: 'c',
+                        value: 'c'
+                    }
+                ]
+            },
+            key: 'select',
+            type: 'select',
+            input: true
+        },
+        {
+            label: 'Data Grid',
+            reorder: false,
+            addAnotherPosition: 'bottom',
+            layoutFixed: false,
+            enableRowGroups: false,
+            initEmpty: false,
+            tableView: false,
+            defaultValue: [
+                {
+                    firstName: '',
+                    lastName: ''
+                }
+            ],
+            calculateValue: "var temp = instance.defaultValue;\n  if(data.select === 'a')\n  {\n    temp = [{'firstName': 'A f 1','lastName': 'A l 1'}];\n  } else if(data.select === 'b') {  \n    temp = [{'firstName': 'B f 1','lastName': 'B l 1'}  \n    ,{'firstName': 'B f 2','lastName': 'B l 2'}];\n  } else if(data.select === 'c') {  \n    temp = [{'firstName': 'C f 1','lastName': 'C l 1'}];\n  }\n  value = temp;",
+            allowCalculateOverride: true,
+            key: 'dataGrid',
+            type: 'datagrid',
+            input: true,
+            components: [
+                {
+                    label: 'First Name',
+                    tableView: true,
+                    key: 'firstName',
+                    type: 'textfield',
+                    input: true
+                },
+                {
+                    label: 'Last Name',
+                    tableView: true,
+                    key: 'lastName',
+                    type: 'textfield',
+                    input: true
+                }
+            ]
+        },
+        {
+            label: 'Data Grid 2',
+            reorder: false,
+            addAnotherPosition: 'bottom',
+            layoutFixed: false,
+            enableRowGroups: false,
+            initEmpty: false,
+            tableView: false,
+            defaultValue: [
+                {
+                    firstName: '',
+                    lastName: ''
+                }
+            ],
+            calculateValue: "var temp = instance.defaultValue;\n  if(data.select === 'a')\n  {\n    temp = [{'firstName': 'A f 1','lastName': 'A l 1'}];\n  } else if(data.select === 'b') {  \n    temp = [{'firstName': 'B f 1','lastName': 'B l 1'}  \n    ,{'firstName': 'B f 2','lastName': 'B l 2'}];\n  } else if(data.select === 'c') {  \n    temp = [{'firstName': 'C f 1','lastName': 'C l 1'}];\n  }\n  value = temp;",
+            allowCalculateOverride: true,
+            key: 'dataGrid2',
+            type: 'datagrid',
+            input: true,
+            components: [
+                {
+                    label: 'First Name',
+                    tableView: true,
+                    key: 'firstName',
+                    type: 'textfield',
+                    input: true
+                },
+                {
+                    label: 'Last Name',
+                    tableView: true,
+                    key: 'lastName',
+                    type: 'textfield',
+                    input: true
+                }
+            ]
+        }
+    ]
+};

package/lib/cjs/components/datamap/DataMap.d.ts

@@ -1,10 +1,11 @@
 export default class DataMapComponent extends DataGridComponent {
     static savedValueTypes(schema: any): string[];
     constructor(component: any, options: any, data: any);
+    get schema(): Pick<any, string | number | symbol>;
     get emptyValue(): {};
     set dataValue(arg: any);
     get dataValue(): any;
-    get defaultValue(): any;
+    get defaultValue(): {};
     get keySchema(): {
         type: string;
         input: boolean;