@formio/js 5.0.0-dev.5703.20a26ed → 5.0.0-dev.5704.50db01f

package/lib/mjs/components/_classes/nested/NestedComponent.js

@@ -493,6 +493,7 @@ export default class NestedComponent extends Field {
             header: 'single',
             collapsed: this.collapsed,
             [this.nestedKey]: 'single',
+            messageContainer: 'single-scope',
         });
         let childPromise = Promise.resolve();
         if (this.refs[this.nestedKey]) {
@@ -677,8 +678,11 @@ export default class NestedComponent extends Field {
     isValid(data, dirty) {
         return this.getComponents().reduce((valid, comp) => comp.isValid(data, dirty) && valid, super.isValid(data, dirty));
     }
-    validationProcessor({ scope, data, row, instance }, flags) {
+    validationProcessor({ scope, data, row, instance, component }, flags) {
         const { dirty } = flags;
+        if (this.root.hasExtraPages && this.page !== this.root.page) {
+            instance = this.getComponent(component.path);
+        }
         if (!instance) {
             return;
         }

package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.d.ts

@@ -12,6 +12,9 @@ export default class NestedArrayComponent extends NestedDataComponent {
     hasAddButton(): any;
     getComponent(path: any, fn: any, originalPath: any): any;
     everyComponent(fn: any, rowIndex: any, options?: {}): void;
+    _getEmailTableHeader(options: any): string;
+    _getEmailTableBody(options: any): string;
     getComponents(rowIndex: any): any;
+    removeSubmissionMetadataRow(index: any): void;
 }
 import NestedDataComponent from '../nesteddata/NestedDataComponent';

package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.js

@@ -1,6 +1,6 @@
 'use strict';
 import _ from 'lodash';
-import { componentValueTypes, getStringFromComponentPath } from '../../../utils/utils';
+import { componentValueTypes, getStringFromComponentPath, isLayoutComponent } from '../../../utils/utils';
 import Component from '../component/Component';
 import NestedDataComponent from '../nesteddata/NestedDataComponent';
 export default class NestedArrayComponent extends NestedDataComponent {
@@ -145,38 +145,60 @@ export default class NestedArrayComponent extends NestedDataComponent {
             }
         });
     }
+    _getEmailTableHeader(options) {
+        let row = '';
+        const getHeaderCell = (component) => {
+            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
+                return '';
+            }
+            const label = component.label || component.key;
+            return `<th style="padding: 5px 10px;">${label}</th>`;
+        };
+        const components = this.getComponents(0);
+        for (const component of components) {
+            if (component.isInputComponent) {
+                row += getHeaderCell(component);
+            }
+            else if (isLayoutComponent(component) && typeof component.everyComponent === 'function') {
+                component.everyComponent((comp) => {
+                    row += getHeaderCell(comp);
+                }, options);
+            }
+        }
+        return `<thead><tr>${row}</tr></thead>`;
+    }
+    _getEmailTableBody(options) {
+        const getBodyCell = (component) => {
+            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
+                return '';
+            }
+            return `<td style="padding: 5px 10px;">${component.getView(component.dataValue, options)}</td>`;
+        };
+        const rows = [];
+        for (const { components } of this.iteratableRows) {
+            let row = '';
+            for (const component of components) {
+                if (component.isInputComponent) {
+                    row += getBodyCell(component);
+                }
+                else if (isLayoutComponent(component) && typeof component.everyComponent === 'function') {
+                    component.everyComponent((comp) => {
+                        row += getBodyCell(comp);
+                    }, options);
+                }
+            }
+            rows.push(`<tr>${row}</tr>`);
+        }
+        return `<tbody>${rows.join('')}</tbody>`;
+    }
     getValueAsString(value, options) {
         if (options?.email) {
-            let result = (`
+            return `
         <table border="1" style="width:100%">
-          <thead>
-            <tr>
-      `);
-            this.component.components?.forEach((component) => {
-                const label = component.label || component.key;
-                result += `<th style="padding: 5px 10px;">${label}</th>`;
-            });
-            result += (`
-          </tr>
-        </thead>
-        <tbody>
-      `);
-            this.iteratableRows.forEach(({ components }) => {
-                result += '<tr>';
-                _.each(components, (component) => {
-                    result += '<td style="padding:5px 10px;">';
-                    if (component.isInputComponent && component.visible && !component.skipInEmail) {
-                        result += component.getView(component.dataValue, options);
-                    }
-                    result += '</td>';
-                });
-                result += '</tr>';
-            });
-            result += (`
-          </tbody>
+          ${this._getEmailTableHeader(options)}
+          ${this._getEmailTableBody(options)}
         </table>
-      `);
-            return result;
+      `;
         }
         if (!value || !value.length) {
             return '';
@@ -192,4 +214,10 @@ export default class NestedArrayComponent extends NestedDataComponent {
         }
         return super.getComponents();
     }
+    removeSubmissionMetadataRow(index) {
+        const componentMetadata = _.get(this.root, `submission.metadata.selectData.${this.path}`, null);
+        if (_.isArray(componentMetadata)) {
+            componentMetadata.splice(index, 1);
+        }
+    }
 }

package/lib/mjs/components/address/Address.d.ts

@@ -11,6 +11,12 @@ export default class AddressComponent extends ContainerComponent {
         weight: number;
         schema: any;
     };
+    static get serverConditionSettings(): {
+        operators: string[];
+    };
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+    };
     static get modeSwitcherRef(): string;
     static get removeValueIconRef(): string;
     static get searchInputRef(): string;

package/lib/mjs/components/address/Address.js

@@ -91,6 +91,15 @@ export default class AddressComponent extends ContainerComponent {
             schema: AddressComponent.schema(),
         };
     }
+    static get serverConditionSettings() {
+        return AddressComponent.conditionOperatorsSettings;
+    }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isEmpty', 'isNotEmpty'],
+        };
+    }
     mergeSchema(component = {}) {
         let { defaultSchema } = this;
         if (component.components) {
@@ -181,7 +190,7 @@ export default class AddressComponent extends ContainerComponent {
         return (this.manualModeEnabled && this.dataValue) ? this.dataValue.address : this.dataValue;
     }
     set address(value) {
-        if (this.manualModeEnabled && !this.isMultiple) {
+        if (this.manualModeEnabled && !this.isMultiple && !_.isEqual(value, this.emptyValue)) {
             this.dataValue.address = value;
         }
         else {

package/lib/mjs/components/currency/Currency.d.ts

@@ -2,6 +2,8 @@ export default class CurrencyComponent extends NumberComponent {
     constructor(component: any, options: any, data: any);
     currencyPrefix: any;
     currencySuffix: any;
+    parseNumber(value: any): number;
+    parseValue(value: any): string | null;
     addZerosAndFormatValue(value: any): any;
     stripPrefixSuffix(value: any): any;
 }

package/lib/mjs/components/datagrid/DataGrid.d.ts

@@ -59,7 +59,6 @@ export default class DataGridComponent extends NestedArrayComponent {
     getRows(): {}[];
     getColumns(): any[];
     hasHeader(): any;
-    loadRefs(element: any, refs: any): void;
     dragula: any;
     getComponentsContainer(): any;
     /**

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

@@ -260,13 +260,6 @@ export default class DataGridComponent extends NestedArrayComponent {
             return hasHeader || ((col.label || col.title) && !col.hideLabel);
         }, false);
     }
-    loadRefs(element, refs) {
-        super.loadRefs(element, refs);
-        if (refs['messageContainer'] === 'single') {
-            const container = _.last(element.querySelectorAll(`[${this._referenceAttributeName}=messageContainer]`));
-            this.refs['messageContainer'] = container || this.refs['messageContainer'];
-        }
-    }
     attach(element) {
         this.loadRefs(element, {
             [`${this.datagridKey}-row`]: 'multiple',
@@ -275,7 +268,6 @@ export default class DataGridComponent extends NestedArrayComponent {
             [`${this.datagridKey}-removeRow`]: 'multiple',
             [`${this.datagridKey}-group-header`]: 'multiple',
             [this.datagridKey]: 'multiple',
-            'messageContainer': 'single'
         });
         if (this.allowReorder) {
             this.refs[`${this.datagridKey}-row`].forEach((row, index) => {
@@ -440,10 +432,11 @@ export default class DataGridComponent extends NestedArrayComponent {
     }
     removeRow(index) {
         const makeEmpty = index === 0 && this.rows.length === 1;
-        const flags = { isReordered: !makeEmpty, resetValue: makeEmpty };
+        const flags = { isReordered: !makeEmpty, resetValue: makeEmpty, modified: true };
         this.splice(index, flags);
         this.emit('dataGridDeleteRow', { index });
         const [row] = this.rows.splice(index, 1);
+        this.removeSubmissionMetadataRow(index);
         this.removeRowComponents(row);
         this.updateRowsComponents(index);
         this.setValue(this.dataValue, flags);

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

@@ -0,0 +1,50 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        reorder: boolean;
+        addAnotherPosition: string;
+        layoutFixed: boolean;
+        enableRowGroups: boolean;
+        initEmpty: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            widget: string;
+            tableView: boolean;
+            data: {
+                values: {
+                    label: string;
+                    value: string;
+                }[];
+            };
+            validateWhenHidden: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            defaultValue: string;
+        }[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        reorder?: undefined;
+        addAnotherPosition?: undefined;
+        layoutFixed?: undefined;
+        enableRowGroups?: undefined;
+        initEmpty?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;

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

@@ -0,0 +1,53 @@
+export default {
+    title: 'Select in Data Grid',
+    name: 'selectInDataGrid',
+    path: 'selectInDataGrid',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Data Grid',
+            reorder: false,
+            addAnotherPosition: 'bottom',
+            layoutFixed: false,
+            enableRowGroups: false,
+            initEmpty: false,
+            tableView: false,
+            key: 'dataGrid',
+            type: 'datagrid',
+            input: true,
+            components: [
+                {
+                    label: 'Select',
+                    widget: 'choicesjs',
+                    tableView: true,
+                    data: {
+                        values: [
+                            {
+                                label: 'Individual',
+                                value: 'individual'
+                            },
+                            {
+                                label: 'Entity',
+                                value: 'entity'
+                            }
+                        ]
+                    },
+                    validateWhenHidden: false,
+                    key: 'select',
+                    type: 'select',
+                    input: true,
+                    defaultValue: 'entity'
+                },
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

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

@@ -8,6 +8,7 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
+import comp11 from './comp11';
 import withCollapsibleRowGroups from './comp-with-collapsible-groups';
 import withConditionalFieldsAndValidations from './comp-with-conditional-components-and-validations';
 import withDefValue from './comp-with-def-value';
@@ -18,4 +19,4 @@ import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
 import withCheckboxes from './comp-with-checkboxes';
 import withReorder from './comp-with-reorder';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };

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

@@ -8,6 +8,7 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
+import comp11 from './comp11';
 import withDefValue from './comp-with-def-value';
 import withRowGroupsAndDefValue from './comp-row-groups-with-def-value';
 import modalWithRequiredFields from './comp-modal-with-required-fields';
@@ -18,4 +19,4 @@ import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
 import withCheckboxes from './comp-with-checkboxes';
 import withReorder from './comp-with-reorder';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };

package/lib/mjs/components/datamap/DataMap.js

@@ -236,7 +236,7 @@ export default class DataMapComponent extends DataGridComponent {
             delete dataValue[key];
             const comp = components[this.valueKey];
             comp.component.key = newKey;
-            comp.path = Components.calculateComponentPath(comp);
+            comp.path = Components.getComponentPath(comp);
             key = newKey;
         });
         const valueComponent = _.clone(this.component.valueComponent);

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

@@ -17,9 +17,9 @@ export default class DayComponent extends Field {
     constructor(component: any, options: any, data: any);
     /**
      * The empty value for day component.
-     * @returns {'00/00/0000'} - The empty value of the day component.
+     * @returns {''} - The empty value of the day component.
      */
-    get emptyValue(): "00/00/0000";
+    get emptyValue(): "";
     get valueMask(): RegExp;
     get dayRequired(): any;
     get showDay(): boolean;
@@ -130,8 +130,7 @@ 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(): "DD-MM-YYYY" | "MM-DD-YYYY";
+    getValidationFormat(): string;
 }
 import Field from '../_classes/field/Field';

package/lib/mjs/components/day/Day.js

@@ -25,7 +25,8 @@ export default class DayComponent extends Field {
                     required: false
                 }
             },
-            dayFirst: false
+            dayFirst: false,
+            defaultValue: ''
         }, ...extend);
     }
     static get builderInfo() {
@@ -62,10 +63,10 @@ export default class DayComponent extends Field {
     }
     /**
      * The empty value for day component.
-     * @returns {'00/00/0000'} - The empty value of the day component.
+     * @returns {''} - The empty value of the day component.
      */
     get emptyValue() {
-        return '00/00/0000';
+        return '';
     }
     get valueMask() {
         return /^\d{2}\/\d{2}\/\d{4}$/;
@@ -341,15 +342,21 @@ export default class DayComponent extends Field {
         const valueParts = value.split('/');
         const [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
         const defaultValue = this.component.defaultValue ? this.component.defaultValue.split('/') : '';
-        const getNextPart = (shouldTake, defaultValue) => dateParts.push(shouldTake ? valueParts.shift() : defaultValue);
+        const getNextPart = (shouldTake, defaultValue) => {
+            // Only push the part if it's not an empty string
+            const part = shouldTake ? valueParts.shift() : defaultValue;
+            if (part !== '') {
+                dateParts.push(part);
+            }
+        };
         if (this.dayFirst) {
-            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '00');
+            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '');
         }
-        getNextPart(this.showMonth, defaultValue ? defaultValue[MONTH] : '00');
+        getNextPart(this.showMonth, defaultValue ? defaultValue[MONTH] : '');
         if (!this.dayFirst) {
-            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '00');
+            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '');
         }
-        getNextPart(this.showYear, defaultValue ? defaultValue[YEAR] : '0000');
+        getNextPart(this.showYear, defaultValue ? defaultValue[YEAR] : '');
         return dateParts.join('/');
     }
     /**
@@ -361,7 +368,7 @@ export default class DayComponent extends Field {
     setValueAt(index, value) {
         // temporary solution to avoid input reset
         // on invalid date.
-        if (!value || value === 'Invalid date') {
+        if (value === 'Invalid date') {
             return null;
         }
         const parts = value.split('/');
@@ -554,9 +561,22 @@ export default class DayComponent extends Field {
         }
         const [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
         const values = value.split('/');
+        if (values.length < 3) {
+            return true;
+        }
         return (values[DAY] === '00' || values[MONTH] === '00' || values[YEAR] === '0000');
     }
     getValidationFormat() {
-        return this.dayFirst ? 'DD-MM-YYYY' : 'MM-DD-YYYY';
+        let validationFormat = this.dayFirst ? 'DD-MM-YYYY' : 'MM-DD-YYYY';
+        if (this.fields?.day?.hide) {
+            validationFormat = validationFormat.replace('DD-', '');
+        }
+        if (this.fields?.month?.hide) {
+            validationFormat = validationFormat.replace('MM-', '');
+        }
+        if (this.fields?.year?.hide) {
+            validationFormat = validationFormat.replace('-YYYY', '');
+        }
+        return validationFormat;
     }
 }

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

@@ -484,11 +484,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         else {
             this.removeClass(this.refs.component, `formio-component-${this.component.type}-row-open`);
         }
-        const superAttach = super.attach(element);
-        this.loadRefs(element, {
-            messageContainer: 'single-scope',
-        });
-        return superAttach;
+        return super.attach(element);
     }
     flattenRowDataValue(dataValue) {
         const flattened = {};
@@ -889,6 +885,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         }
         this.clearErrors(rowIndex);
         this.baseRemoveRow(rowIndex);
+        this.removeSubmissionMetadataRow(rowIndex);
         this.splice(rowIndex);
         this.emit('editGridDeleteRow', {
             index: rowIndex

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

@@ -0,0 +1,80 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        rowDrafts: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            collapsible: boolean;
+            key: string;
+            type: string;
+            label: string;
+            input: boolean;
+            tableView: boolean;
+            components: {
+                label: string;
+                columns: ({
+                    components: {
+                        label: string;
+                        optionsLabelPosition: string;
+                        inline: boolean;
+                        tableView: boolean;
+                        values: {
+                            label: string;
+                            value: string;
+                            shortcut: string;
+                        }[];
+                        key: string;
+                        type: string;
+                        input: boolean;
+                    }[];
+                    width: number;
+                    offset: number;
+                    push: number;
+                    pull: number;
+                    size: string;
+                    currentWidth: number;
+                } | {
+                    components: {
+                        label: string;
+                        applyMaskOn: string;
+                        autoExpand: boolean;
+                        tableView: boolean;
+                        key: string;
+                        conditional: {
+                            show: boolean;
+                            conjunction: string;
+                        };
+                        type: string;
+                        input: boolean;
+                    }[];
+                    width: number;
+                    offset: number;
+                    push: number;
+                    pull: number;
+                    size: string;
+                    currentWidth: number;
+                })[];
+                key: string;
+                type: string;
+                input: boolean;
+                tableView: boolean;
+            }[];
+        }[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        rowDrafts?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;