@formio/js 5.0.0-rc.75 → 5.0.0-rc.77

package/lib/mjs/components/_classes/multivalue/Multivalue.d.ts

@@ -1,6 +1,5 @@
 export default class Multivalue extends Field {
     get addAnother(): string;
-    useWrapper(): any;
     /**
      * @returns {Field} - The created field.
      */

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

@@ -1,12 +1,40 @@
 import Field from '../field/Field';
 import _ from 'lodash';
 export default class Multivalue extends Field {
-    get dataValue() {
-        const parent = super.dataValue;
-        if (!parent && this.component.multiple) {
-            return [];
+    /**
+     * Normalize values coming into updateValue.
+     * @param {*} value - The value to normalize before setting.
+     * @returns {*} - The normalized value.
+     */
+    normalizeValue(value) {
+        if (this.component.multiple) {
+            if (Array.isArray(value)) {
+                if (value.length === 0) {
+                    return [this.emptyValue];
+                }
+                if (this.component.storeas === 'array') {
+                    return super.normalizeValue([value]);
+                }
+                return super.normalizeValue(value);
+            }
+            else {
+                return super.normalizeValue(value == null ? [this.emptyValue] : [value]);
+            }
+        }
+        else {
+            if (Array.isArray(value) && this.component.storeas !== 'array') {
+                if (this.component.storeas === 'string') {
+                    return super.normalizeValue(value.join(this.delimiter || ''));
+                }
+                return super.normalizeValue(value[0] || this.emptyValue);
+            }
+            else {
+                return super.normalizeValue(value);
+            }
         }
-        return parent;
+    }
+    get dataValue() {
+        return super.dataValue;
     }
     set dataValue(value) {
         super.dataValue = value;
@@ -26,30 +54,20 @@ export default class Multivalue extends Field {
     get addAnother() {
         return this.t(this.component.addAnother || 'Add Another');
     }
-    useWrapper() {
-        return this.component.hasOwnProperty('multiple') && this.component.multiple;
-    }
     /**
      * @returns {Field} - The created field.
      */
     render() {
-        // If single value field.
-        if (!this.useWrapper()) {
-            return super.render(`<div ${this._referenceAttributeName}="element">
-          ${this.renderElement(this.component.type !== 'hidden' ? this.dataValue : '')}
-        </div>`);
-        }
-        // Make sure dataValue is in the correct array format.
-        let dataValue = this.dataValue;
-        if (!Array.isArray(dataValue)) {
-            dataValue = dataValue ? [dataValue] : [];
-        }
-        // If multiple value field.
-        return super.render(this.renderTemplate('multiValueTable', {
-            rows: dataValue.map(this.renderRow.bind(this)).join(''),
-            disabled: this.disabled,
-            addAnother: this.addAnother,
-        }));
+        let dataValue = this.normalizeValue(this.dataValue);
+        return this.component.hasOwnProperty('multiple') && this.component.multiple
+            ? super.render(this.renderTemplate('multiValueTable', {
+                rows: dataValue.map(this.renderRow.bind(this)).join(''),
+                disabled: this.disabled,
+                addAnother: this.addAnother,
+            }))
+            : super.render(`<div ${this._referenceAttributeName}="element">
+            ${this.renderElement(this.component.type !== 'hidden' ? dataValue : '')}
+          </div>`);
     }
     renderElement() {
         return '';

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

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

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

@@ -192,4 +192,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/datagrid/DataGrid.js

@@ -421,6 +421,7 @@ export default class DataGridComponent extends NestedArrayComponent {
         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

@@ -7,6 +7,7 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
+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';
@@ -17,4 +18,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, 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

@@ -7,6 +7,8 @@ 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 withDefValue from './comp-with-def-value';
 import withRowGroupsAndDefValue from './comp-row-groups-with-def-value';
 import modalWithRequiredFields from './comp-modal-with-required-fields';
@@ -17,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, 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/day/Day.d.ts

@@ -132,6 +132,6 @@ export default class DayComponent extends Field {
     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() {
@@ -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('/');
     }
     /**
@@ -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

@@ -875,6 +875,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/file/File.d.ts

@@ -38,7 +38,7 @@ export default class FileComponent extends Field {
     get hasTypes(): any;
     _fileBrowseHidden: any;
     get shouldSyncFiles(): boolean;
-    get autoSync(): any;
+    get autoSync(): boolean;
     get columnsSize(): {
         name: number;
         size: number;

package/lib/mjs/components/file/File.js

@@ -135,7 +135,9 @@ export default class FileComponent extends Field {
         return Boolean(this.filesToSync.filesToDelete.length || this.filesToSync.filesToUpload.length);
     }
     get autoSync() {
-        return _.get(this, 'component.autoSync', false);
+        // Disable autoSync for now
+        return false;
+        // return _.get(this, 'component.autoSync', false);
     }
     get columnsSize() {
         const actionsColumn = this.disabled ? 0 : this.autoSync ? 2 : 1;

package/lib/mjs/components/file/editForm/File.edit.display.js

@@ -4,7 +4,7 @@ export default [
         ignore: true
     },
     {
-        type: 'checkbox',
+        type: 'hidden',
         label: 'Files Synchronization feature',
         tooltip: 'Enable ability to control files synchronization. Files will be auto synced before submit.',
         key: 'autoSync',

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

@@ -8,26 +8,10 @@ export default class RadioComponent extends ListComponent {
         schema: any;
     };
     static get conditionOperatorsSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: any;
-            data: {
-                custom(): any;
-            };
-        };
+        valueComponent(classComp: any): any;
     };
     static get serverConditionSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: any;
-            data: {
-                custom: string;
-            };
-        };
+        valueComponent(classComp: any): any;
     };
     static savedValueTypes(schema: any): any[];
     constructor(component: any, options: any, data: any);

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

@@ -30,35 +30,26 @@ export default class RadioComponent extends ListComponent {
         return {
             ...super.conditionOperatorsSettings,
             valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: classComp.dataType || '',
-                    data: {
-                        custom() {
-                            return classComp.values;
+                const isValuesSrc = !classComp.dataSrc || classComp.dataSrc === 'values';
+                return isValuesSrc
+                    ? {
+                        type: 'select',
+                        dataSrc: 'custom',
+                        valueProperty: 'value',
+                        dataType: classComp.dataType || '',
+                        data: {
+                            custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`,
                         }
-                    },
-                };
+                    }
+                    : {
+                        ...classComp,
+                        type: 'select',
+                    };
             }
         };
     }
     static get serverConditionSettings() {
-        return {
-            ...super.serverConditionSettings,
-            valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: classComp.dataType || '',
-                    data: {
-                        custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`,
-                    },
-                };
-            },
-        };
+        return RadioComponent.conditionOperatorsSettings;
     }
     static savedValueTypes(schema) {
         const { boolean, string, number, object, array } = componentValueTypes;

package/lib/mjs/components/recaptcha/ReCaptcha.d.ts

@@ -1,6 +1,12 @@
 export default class ReCaptchaComponent extends Component {
     static get builderInfo(): {};
     static savedValueTypes(): never[];
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+    };
+    static get serverConditionSettings(): {
+        operators: string[];
+    };
     render(): string;
     recaptchaResult: any;
     createInput(): void;

package/lib/mjs/components/recaptcha/ReCaptcha.js

@@ -17,6 +17,15 @@ export default class ReCaptchaComponent extends Component {
     static savedValueTypes() {
         return [];
     }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isEmpty', 'isNotEmpty'],
+        };
+    }
+    static get serverConditionSettings() {
+        return ReCaptchaComponent.conditionOperatorsSettings;
+    }
     render() {
         this.recaptchaResult = null;
         if (this.builderMode) {

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

@@ -1,26 +1,4 @@
 export default class SelectBoxesComponent extends RadioComponent {
-    static get serverConditionSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: string;
-            data: {
-                custom: string;
-            };
-        };
-    };
-    static get conditionOperatorsSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: string;
-            data: {
-                custom: string;
-            };
-        };
-    };
     static savedValueTypes(schema: any): string[];
     constructor(...args: any[]);
     get emptyValue(): any;

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

@@ -27,15 +27,22 @@ export default class SelectBoxesComponent extends RadioComponent {
         return {
             ...super.conditionOperatorsSettings,
             valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: 'string',
-                    data: {
-                        custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`
-                    },
-                };
+                const isValuesSrc = !classComp.dataSrc || classComp.dataSrc === 'values';
+                return isValuesSrc
+                    ? {
+                        type: 'select',
+                        dataSrc: 'custom',
+                        valueProperty: 'value',
+                        dataType: 'string',
+                        data: {
+                            custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`
+                        },
+                    }
+                    : {
+                        ...classComp,
+                        dataType: 'string',
+                        type: 'select',
+                    };
             }
         };
     }

package/lib/mjs/components/tags/Tags.js

@@ -116,12 +116,12 @@ export default class TagsComponent extends Input {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/lib/mjs/components/time/Time.js

@@ -13,17 +13,6 @@ export default class TimeComponent extends TextFieldComponent {
             dataFormat: defaultDataFormat,
         }, ...extend);
     }
-    static get serverConditionSettings() {
-        return {
-            ...super.serverConditionSettings,
-            valueComponent(classComp) {
-                return {
-                    ...classComp,
-                    type: 'time',
-                };
-            },
-        };
-    }
     constructor(component, options, data) {
         super(component, options, data);
         const { edge: isEdgeBrowser, version: edgeVersion } = getBrowserInfo();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.75",
+  "version": "5.0.0-rc.77",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-rc.37",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.2.2-rc.3",
+    "@formio/core": "2.2.2",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",