@formio/js 5.0.0-dev.5794.12ca15f → 5.0.0-dev.5798.beb3cc0

package/lib/mjs/components/_classes/multivalue/Multivalue.js

@@ -4,37 +4,39 @@ export default class Multivalue extends Field {
     /**
      * Normalize values coming into updateValue.
      * @param {*} value - The value to normalize before setting.
+     * @param {Object} flags - Flags to use when normalizing the value.
+     * @param {*} emptyValue - The empty value for the field.
      * @returns {*} - The normalized value.
      */
-    normalizeValue(value) {
+    normalizeValue(value, flags = {}, emptyValue = this.emptyValue) {
         if (this.component.multiple) {
             if (Array.isArray(value)) {
                 if (value.length === 0) {
-                    return [this.emptyValue];
+                    return [emptyValue];
                 }
                 if (this.component.storeas === 'array') {
-                    return super.normalizeValue([value]);
+                    return super.normalizeValue([value], flags);
                 }
-                return super.normalizeValue(value);
+                return super.normalizeValue(value, flags);
             }
             else {
-                return super.normalizeValue(value == null ? [this.emptyValue] : [value]);
+                return super.normalizeValue(value == null ? [emptyValue] : [value], flags);
             }
         }
         else {
-            if (Array.isArray(value) && this.component.storeas !== 'array') {
+            if (Array.isArray(value) && !Array.isArray(emptyValue)) {
                 if (this.component.storeas === 'string') {
-                    return super.normalizeValue(value.join(this.delimiter || ''));
+                    return super.normalizeValue(value.join(this.delimiter || ''), flags);
                 }
-                return super.normalizeValue(value[0] || this.emptyValue);
+                return super.normalizeValue(value[0] || emptyValue, flags);
             }
             else {
-                return super.normalizeValue(value);
+                return super.normalizeValue(value, flags);
             }
         }
     }
     get dataValue() {
-        return super.dataValue;
+        return this.normalizeValue(super.dataValue);
     }
     set dataValue(value) {
         super.dataValue = value;

package/lib/mjs/components/day/Day.d.ts

@@ -130,7 +130,6 @@ export default class DayComponent extends Field {
      * @returns {string|null} - The string value of the date.
      */
     getValueAsString(value: any): string | null;
-    focus(field: any): void;
     isPartialDay(value: any): boolean;
     getValidationFormat(): string;
 }

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

@@ -1,22 +1,22 @@
 import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
-import comp10 from './comp10';
-import comp11 from './comp11';
-import comp12 from './comp12';
-import comp13 from './comp13';
-import comp14 from './comp14';
-import comp15 from './comp15';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
+import comp10 from './comp10';
+import comp11 from './comp11';
+import comp12 from './comp12';
+import comp13 from './comp13';
+import comp14 from './comp14';
+import comp15 from './comp15';
 import comp16 from './comp16';
 import comp17 from './comp17';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

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

@@ -19,4 +19,4 @@ import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenE
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

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

@@ -1593,8 +1593,8 @@ export default class SelectComponent extends ListComponent {
         super.detach();
     }
     focus() {
+        super.focus.call(this);
         if (this.focusableElement) {
-            super.focus.call(this);
             this.focusableElement.focus();
         }
     }

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

@@ -1,44 +1,59 @@
 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;
+        modal: boolean;
+        rowDrafts: boolean;
         key: string;
         type: string;
+        displayAsTable: boolean;
         input: boolean;
-        applyMaskOn?: undefined;
-        conditional?: undefined;
+        components: ({
+            label: string;
+            widget: string;
+            tableView: boolean;
+            data: {
+                values: {
+                    label: string;
+                    value: string;
+                }[];
+            };
+            validate: {
+                required: boolean;
+            };
+            key: string;
+            type: string;
+            input: boolean;
+            applyMaskOn?: undefined;
+            validateWhenHidden?: undefined;
+        } | {
+            label: string;
+            applyMaskOn: string;
+            tableView: boolean;
+            validate: {
+                required: boolean;
+            };
+            validateWhenHidden: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            widget?: undefined;
+            data?: undefined;
+        })[];
+        showValidations?: undefined;
+        saveOnEnter?: undefined;
     } | {
         label: string;
-        applyMaskOn: string;
+        showValidations: boolean;
         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;
+        saveOnEnter: boolean;
+        modal?: undefined;
+        rowDrafts?: undefined;
+        displayAsTable?: undefined;
+        components?: undefined;
     })[];
 }
 export default _default;

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

@@ -1,57 +1,64 @@
 export default {
-    title: 'FIO-8072',
-    name: 'fio8072',
-    path: 'fio8072',
-    type: 'form',
-    display: 'form',
-    components: [
+    "components": [
         {
-            label: 'Select',
-            widget: 'choicesjs',
-            tableView: true,
-            data: {
-                values: [
-                    {
-                        label: 'A',
-                        value: '1',
+            "label": "Edit Grid",
+            "tableView": false,
+            "modal": true,
+            "rowDrafts": true,
+            "key": "editGrid",
+            "type": "editgrid",
+            "displayAsTable": false,
+            "input": true,
+            "components": [
+                {
+                    "label": "Select",
+                    "widget": "choicesjs",
+                    "tableView": true,
+                    "data": {
+                        "values": [
+                            {
+                                "label": "a",
+                                "value": "a"
+                            },
+                            {
+                                "label": "b",
+                                "value": "b"
+                            },
+                            {
+                                "label": "c",
+                                "value": "c"
+                            }
+                        ]
                     },
-                    {
-                        label: 'B',
-                        value: '2',
+                    "validate": {
+                        "required": true
                     },
-                    {
-                        label: 'C',
-                        value: '10',
+                    "key": "select",
+                    "type": "select",
+                    "input": true
+                },
+                {
+                    "label": "Text Field",
+                    "applyMaskOn": "change",
+                    "tableView": true,
+                    "validate": {
+                        "required": true
                     },
-                    {
-                        label: 'D',
-                        value: '1d',
-                    },
-                ],
-            },
-            dataType: 'number',
-            key: 'select',
-            type: 'select',
-            input: true,
+                    "validateWhenHidden": false,
+                    "key": "textField",
+                    "type": "textfield",
+                    "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,
-                    },
-                ],
-            },
-        },
-    ],
+            "label": "Submit",
+            "showValidations": false,
+            "tableView": false,
+            "key": "submit",
+            "type": "button",
+            "input": true,
+            "saveOnEnter": false
+        }
+    ]
 };

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

@@ -0,0 +1,44 @@
+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/comp26.js

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

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

@@ -22,5 +22,6 @@ 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 };
+import comp26 from './comp26';
+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, comp26 };
 export { multiSelect, multiSelectOptions } from "./comp3";

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

@@ -23,4 +23,5 @@ 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 };
+import comp26 from './comp26';
+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, comp26 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5794.12ca15f",
+  "version": "5.0.0-dev.5798.beb3cc0",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-dev.98.17ba6ea",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.1.0-dev.105.1bff2e6",
+    "@formio/core": "2.1.0-dev.145.4491833",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",