@formio/js 5.0.0-rc.92 → 5.0.0-rc.94

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,7 +20,7 @@
 
 /*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
 
-/*! formiojs v5.0.0-rc.92 | https://unpkg.com/formiojs@5.0.0-rc.92/LICENSE.txt */
+/*! formiojs v5.0.0-rc.94 | https://unpkg.com/formiojs@5.0.0-rc.94/LICENSE.txt */
 
 /**
  * @license

package/lib/cjs/Wizard.js

@@ -916,7 +916,7 @@ class Wizard extends Webform_1.default {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

package/lib/cjs/components/_classes/component/Component.d.ts

@@ -1067,7 +1067,7 @@ declare class Component extends Element {
     elementInfo(): any;
     autofocus(): void;
     scrollIntoView(element: any, verticalOnly: any): void;
-    focus(index?: number): void;
+    focus(index: any): void;
     /**
      * Get `Formio` instance for working with files
      * @returns {import('@formio/core').Formio} - The Formio instance file service.

package/lib/cjs/components/_classes/component/Component.js

@@ -2934,14 +2934,12 @@ class Component extends Element_1.default {
         if (flags.silentCheck) {
             return [];
         }
+        let isDirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            flags.dirty = true;
+            isDirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data)) {
-            flags.dirty = this.pristine && this.component.protected ? false : true;
-        }
-        this.setDirty(flags.dirty);
-        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
+        this.setDirty(isDirty);
+        return this.setComponentValidity(errors, isDirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.
@@ -3436,7 +3434,7 @@ class Component extends Element_1.default {
         const { left, top } = element.getBoundingClientRect();
         window.scrollTo(verticalOnly ? window.scrollX : left + window.scrollX, top + window.scrollY);
     }
-    focus(index = (this.refs.input.length - 1)) {
+    focus(index) {
         var _a, _b, _c, _d;
         if ('beforeFocus' in this.parent) {
             this.parent.beforeFocus(this);

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

@@ -11,6 +11,7 @@ export default class DayComponent extends Field {
         operators: string[];
     };
     static savedValueTypes(schema: any): string[];
+    static oldEmptyValue: string;
     static get serverConditionSettings(): {
         operators: string[];
     };
@@ -135,7 +136,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/cjs/components/day/Day.js

@@ -104,6 +104,12 @@ class DayComponent extends Field_1.default {
         info.changeEvent = 'input';
         return info;
     }
+    isEmpty(value = this.dataValue) {
+        if (value === DayComponent.oldEmptyValue) {
+            return true;
+        }
+        return super.isEmpty(value);
+    }
     inputDefinition(name) {
         let min, max;
         if (name === 'day') {
@@ -337,6 +343,10 @@ class DayComponent extends Field_1.default {
         }
     }
     normalizeValue(value) {
+        // Adjust the value from old to new format
+        if (value === DayComponent.oldEmptyValue) {
+            value = '';
+        }
         if (!value || this.valueMask.test(value)) {
             return value;
         }
@@ -643,4 +653,6 @@ class DayComponent extends Field_1.default {
         return validationFormat;
     }
 }
+// Empty value used before 9.3.x
+DayComponent.oldEmptyValue = '00/00/0000';
 exports.default = DayComponent;

package/lib/cjs/components/day/fixtures/comp5.d.ts

@@ -1,7 +1,7 @@
 declare namespace _default {
     let type: string;
     let display: string;
-    let components: {
+    let components: ({
         label: string;
         hideInputLabels: boolean;
         inputsLabelPosition: string;
@@ -24,6 +24,22 @@ declare namespace _default {
         type: string;
         input: boolean;
         defaultValue: string;
-    }[];
+        action?: undefined;
+        theme?: undefined;
+    } | {
+        type: string;
+        action: string;
+        label: string;
+        theme: string;
+        hideInputLabels?: undefined;
+        inputsLabelPosition?: undefined;
+        useLocaleSettings?: undefined;
+        tableView?: undefined;
+        fields?: undefined;
+        validateOn?: undefined;
+        key?: undefined;
+        input?: undefined;
+        defaultValue?: undefined;
+    })[];
 }
 export default _default;

package/lib/cjs/components/day/fixtures/comp5.js

@@ -28,5 +28,11 @@ exports.default = {
             input: true,
             defaultValue: '00/00/0000'
         },
+        {
+            type: 'button',
+            action: 'submit',
+            label: 'Submit',
+            theme: 'primary'
+        }
     ]
 };

package/lib/cjs/components/editgrid/EditGrid.d.ts

@@ -89,8 +89,8 @@ export default class EditGridComponent extends NestedArrayComponent {
     hasOpenRows(): any;
     getAttachedData(data?: null): any;
     shouldValidateDraft(editRow: any): any;
-    shouldValidateRow(editRow: any, dirty: any): any;
-    validateRow(editRow: any, dirty: any, forceSilentCheck: any): any;
+    shouldValidateRow(editRow: any, dirty: any, fromSubmission: any): any;
+    validateRow(editRow: any, dirty: any, forceSilentCheck: any, fromSubmission: any): any;
     showRowErrorAlerts(editRow: any, errors: any): void;
     /**
      * @returns {boolean} - Return that this component processes its own validation.

package/lib/cjs/components/editgrid/EditGrid.js

@@ -973,17 +973,18 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             !this.hasOpenRows()) ||
             ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submitted);
     }
-    shouldValidateRow(editRow, dirty) {
+    shouldValidateRow(editRow, dirty, fromSubmission) {
         return this.shouldValidateDraft(editRow) ||
             editRow.state === EditRowState.Saving ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
+            fromSubmission ||
             dirty;
     }
-    validateRow(editRow, dirty, forceSilentCheck) {
+    validateRow(editRow, dirty, forceSilentCheck, fromSubmission) {
         var _a;
         editRow.errors = [];
-        if (this.shouldValidateRow(editRow, dirty)) {
+        if (this.shouldValidateRow(editRow, dirty, fromSubmission)) {
             const silentCheck = (this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck;
             const rootValue = (0, utils_1.fastCloneDeep)(this.rootValue);
             const editGridValue = lodash_1.default.get(rootValue, this.path, []);
@@ -1055,7 +1056,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
     }
     checkComponentValidity(data, dirty, row, options = {}, errors = []) {
         var _a, _b;
-        const { silentCheck } = options;
+        const { silentCheck, fromSubmission } = options;
         const superValid = super.checkComponentValidity(data, dirty, row, options, errors);
         // If super tells us that component invalid and there is no need to update alerts, just return false
         if (!superValid && (!this.alert && !this.hasOpenRows())) {
@@ -1065,7 +1066,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         const allRowErrors = [];
         this.editRows.forEach((editRow, index) => {
             // Trigger all errors on the row.
-            const rowErrors = this.validateRow(editRow, dirty, silentCheck);
+            const rowErrors = this.validateRow(editRow, dirty, silentCheck, fromSubmission);
             errors.push(...rowErrors);
             allRowErrors.push(...rowErrors);
             if (this.rowRefs) {

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

@@ -21,6 +21,7 @@ export default class RadioComponent extends ListComponent {
     get isRadio(): boolean;
     get optionSelectedClass(): string;
     get listData(): any;
+    get selectMetadata(): any;
     templateData: {} | undefined;
     triggerUpdate: ((...args: any[]) => any) | undefined;
     itemsLoadedResolve: ((value: any) => void) | undefined;

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

@@ -109,6 +109,12 @@ class RadioComponent extends ListComponent_1.default {
         const listData = lodash_1.default.get(this.root, 'submission.metadata.listData', {});
         return lodash_1.default.get(listData, this.path);
     }
+    get selectMetadata() {
+        return super.selectData;
+    }
+    get selectData() {
+        return this.selectMetadata || this.component.selectData;
+    }
     init() {
         super.init();
         this.templateData = {};
@@ -244,12 +250,15 @@ class RadioComponent extends ListComponent_1.default {
         else if (!lodash_1.default.isString(value)) {
             value = lodash_1.default.toString(value);
         }
-        const isModalPreviewWithUrlDataSource = options.modalPreview && this.component.dataSrc === 'url';
-        if (this.component.dataSrc !== 'values' && !isModalPreviewWithUrlDataSource) {
+        const shouldUseSelectData = (options.modalPreview || this.inDataTable)
+            && this.component.dataSrc === 'url' && (this.loadedOptions.length || this.selectData);
+        if (this.component.dataSrc !== 'values' && !shouldUseSelectData) {
             return value;
         }
-        const values = isModalPreviewWithUrlDataSource ? this.loadedOptions : this.component.values;
-        const option = lodash_1.default.find(values, (v) => v.value === value);
+        const values = shouldUseSelectData ? this.loadedOptions : this.component.values;
+        const option = !(values === null || values === void 0 ? void 0 : values.length) && shouldUseSelectData ? {
+            label: this.itemTemplate(this.selectData),
+        } : lodash_1.default.find(values, (v) => v.value === value);
         if (!value) {
             return lodash_1.default.get(option, 'label', '');
         }

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

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

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

@@ -1,59 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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/cjs/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/cjs/components/select/fixtures/comp26.js

@@ -0,0 +1,59 @@
+"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/cjs/components/select/fixtures/index.d.ts

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

package/lib/cjs/components/selectboxes/SelectBoxes.js

@@ -166,12 +166,19 @@ class SelectBoxesComponent extends Radio_1.default {
         return changed;
     }
     getValueAsString(value, options = {}) {
+        var _a, _b;
         if (!value) {
             return '';
         }
         if (this.isSelectURL) {
-            if (options.modalPreview && this.loadedOptions) {
-                return this.loadedOptions.filter((option) => value[option.value]).map((option) => option.label).join(', ');
+            if (options.modalPreview || this.options.readOnly || this.inDataTable) {
+                const checkedItems = lodash_1.default.keys(lodash_1.default.pickBy(value, (val) => val));
+                if (((_a = this.selectData) === null || _a === void 0 ? void 0 : _a.length) === checkedItems.length) {
+                    return this.selectData.map(item => this.itemTemplate(item)).join(', ');
+                }
+                else if ((_b = this.loadedOptions) === null || _b === void 0 ? void 0 : _b.length) {
+                    return this.loadedOptions.filter((option) => value[option.value]).map((option) => option.label).join(', ');
+                }
             }
             return (0, lodash_1.default)(value).pickBy((val) => val).keys().join(', ');
         }

package/lib/cjs/components/textarea/TextArea.d.ts

@@ -20,10 +20,10 @@ export default class TextAreaComponent extends TextFieldComponent {
     setReadOnlyValue(value: any, index: any): void;
     get isJsonValue(): 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
-   */
+     * 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
+     */
     normalizeValue(value: any): any;
     normalizeSingleValue(value: any): any;
     setConvertedValue(value: any, index: any): any;

package/lib/cjs/components/textarea/TextArea.js

@@ -310,10 +310,10 @@ class TextAreaComponent extends TextField_1.default {
         return this.component.as && this.component.as === 'json';
     }
     /**
-   * 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
-   */
+     * 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
+     */
     normalizeValue(value) {
         if (this.component.multiple && Array.isArray(value)) {
             return value.map((singleValue) => this.normalizeSingleValue(singleValue));

package/lib/cjs/utils/conditionOperators/IsEqualTo.js

@@ -27,15 +27,7 @@ class IsEqualTo extends ConditionOperator_1.default {
             if (conditionTriggerComponent
                 && (0, utils_1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
                 && ((_b = conditionTriggerComponent.component) === null || _b === void 0 ? void 0 : _b.template)) {
-                if (!value || !lodash_1.default.isPlainObject(value)) {
-                    return false;
-                }
-                const { template, valueProperty } = conditionTriggerComponent.component;
-                if (valueProperty === 'data') {
-                    value = { data: value };
-                    comparedValue = { data: comparedValue };
-                }
-                return lodash_1.default.every((0, utils_1.getItemTemplateKeys)(template) || [], k => lodash_1.default.isEqual(lodash_1.default.get(value, k), lodash_1.default.get(comparedValue, k)));
+                return (0, utils_1.compareSelectResourceWithObjectTypeValues)(value, comparedValue, conditionTriggerComponent.component);
             }
         }
         //special check for select boxes

package/lib/cjs/utils/formUtils.d.ts

@@ -41,4 +41,7 @@ export const applyFormChanges: typeof Utils.applyFormChanges;
 export const findComponent: typeof Utils.findComponent;
 export const getEmptyValue: typeof Utils.getEmptyValue;
 export const isComponentDataEmpty: typeof Utils.isComponentDataEmpty;
+export const isSelectResourceWithObjectValue: typeof Utils.isSelectResourceWithObjectValue;
+export const compareSelectResourceWithObjectTypeValues: typeof Utils.compareSelectResourceWithObjectTypeValues;
+export const getItemTemplateKeys: typeof Utils.getItemTemplateKeys;
 import { Utils } from '@formio/core';