@formio/js 5.0.0-rc.19 → 5.0.0-rc.21

package/lib/mjs/components/checkbox/Checkbox.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import { componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
 import Field from '../_classes/field/Field';
 export default class CheckBoxComponent extends Field {
     static schema(...extend) {
@@ -23,14 +24,41 @@ export default class CheckBoxComponent extends Field {
             schema: CheckBoxComponent.schema()
         };
     }
+    static get serverConditionSettings() {
+        return CheckBoxComponent.conditionOperatorsSettings;
+    }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isEqual'],
+            valueComponent() {
+                return {
+                    valueType: 'boolean',
+                    data: {
+                        values: [
+                            { label: 'Checked', value: 'true' },
+                            { label: 'Not Checked', value: 'false' },
+                        ]
+                    },
+                    type: 'select'
+                };
+            }
+        };
+    }
+    static savedValueTypes(schema) {
+        schema = schema || {};
+        const types = getComponentSavedTypes(schema);
+        if (_.isArray(types)) {
+            return types;
+        }
+        if (schema.inputType === 'radio') {
+            return [componentValueTypes.string];
+        }
+        return [componentValueTypes.boolean];
+    }
     get defaultSchema() {
         return CheckBoxComponent.schema();
     }
-    get defaultValue() {
-        const { name } = this.component;
-        const defaultValue = super.defaultValue;
-        return name ? (this.component[name] || this.emptyValue) : (defaultValue || this.component.defaultValue || false).toString() === 'true';
-    }
     get labelClass() {
         let className = '';
         if (this.isInputComponent
@@ -163,6 +191,9 @@ export default class CheckBoxComponent extends Field {
     getValueAsString(value) {
         const { name: componentName, value: componentValue } = this.component;
         const hasValue = componentName ? _.isEqual(value, componentValue) : value;
+        if (_.isUndefined(value) && this.inDataTable) {
+            return '';
+        }
         return this.t(hasValue ? 'Yes' : 'No');
     }
     updateValue(value, flags) {

package/lib/mjs/components/columns/Columns.d.ts

@@ -4,9 +4,11 @@ export default class ColumnsComponent extends NestedComponent {
         icon: string;
         group: string;
         documentation: string;
+        showPreview: boolean;
         weight: number;
         schema: any;
     };
+    static savedValueTypes(): never[];
     rows: any[];
     get columnKey(): string;
     columns: any[] | undefined;

package/lib/mjs/components/columns/Columns.js

@@ -23,10 +23,14 @@ export default class ColumnsComponent extends NestedComponent {
             icon: 'columns',
             group: 'layout',
             documentation: '/userguide/form-building/layout-components#columns',
+            showPreview: false,
             weight: 10,
             schema: ColumnsComponent.schema()
         };
     }
+    static savedValueTypes() {
+        return [];
+    }
     constructor(component, options, data) {
         super(component, options, data);
         this.rows = [];

package/lib/mjs/components/container/Container.d.ts

@@ -4,6 +4,7 @@ export default class ContainerComponent extends NestedDataComponent {
         icon: string;
         group: string;
         documentation: string;
+        showPreview: boolean;
         weight: number;
         schema: any;
     };

package/lib/mjs/components/container/Container.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { getFocusableElements } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes, getFocusableElements } from '../../utils/utils';
 import Component from '../_classes/component/Component';
 import Field from '../_classes/field/Field';
 import NestedDataComponent from '../_classes/nesteddata/NestedDataComponent';
@@ -22,6 +22,7 @@ export default class ContainerComponent extends NestedDataComponent {
             icon: 'folder-open',
             group: 'data',
             documentation: '/userguide/form-building/data-components#container',
+            showPreview: false,
             weight: 10,
             schema: ContainerComponent.schema()
         };
@@ -30,6 +31,9 @@ export default class ContainerComponent extends NestedDataComponent {
         super(...args);
         this.type = 'container';
     }
+    static savedValueTypes(schema) {
+        return getComponentSavedTypes(schema) || [componentValueTypes.object];
+    }
     addComponents(data, options) {
         return super.addComponents(this.dataValue, options);
     }

package/lib/mjs/components/content/Content.d.ts

@@ -8,8 +8,10 @@ export default class ContentComponent extends Component {
         weight: number;
         schema: any;
     };
+    static savedValueTypes(): never[];
     get content(): any;
     render(): any;
+    get dataReady(): any;
     get emptyValue(): string;
 }
 import Component from '../_classes/component/Component';

package/lib/mjs/components/content/Content.js

@@ -1,6 +1,5 @@
 import Component from '../_classes/component/Component';
 import _ from 'lodash';
-import NativePromise from 'native-promise-only';
 export default class ContentComponent extends Component {
     static schema(...extend) {
         return Component.schema({
@@ -22,6 +21,9 @@ export default class ContentComponent extends Component {
             schema: ContentComponent.schema()
         };
     }
+    static savedValueTypes() {
+        return [];
+    }
     get defaultSchema() {
         return ContentComponent.schema();
     }
@@ -45,7 +47,7 @@ export default class ContentComponent extends Component {
         }));
     }
     get dataReady() {
-        return this.root?.submissionReady || NativePromise.resolve();
+        return this.root?.submissionReady || Promise.resolve();
     }
     attach(element) {
         this.loadRefs(element, { html: 'single' });

package/lib/mjs/components/currency/editForm/Currency.edit.data.d.ts

@@ -1,4 +1,15 @@
-declare const _default: {
+declare const _default: ({
+    key: string;
+    ignore: boolean;
+    type?: undefined;
+    input?: undefined;
+    weight?: undefined;
+    label?: undefined;
+    tooltip?: undefined;
+    defaultValue?: undefined;
+    dataSrc?: undefined;
+    data?: undefined;
+} | {
     type: string;
     input: boolean;
     weight: number;
@@ -13,5 +24,6 @@ declare const _default: {
             value: string;
         }[];
     };
-}[];
+    ignore?: undefined;
+})[];
 export default _default;

package/lib/mjs/components/currency/editForm/Currency.edit.data.js

@@ -1,4 +1,8 @@
 export default [
+    {
+        key: 'case',
+        ignore: true
+    },
     {
         type: 'select',
         input: true,

package/lib/mjs/components/currency/editForm/Currency.edit.display.js

@@ -15,6 +15,10 @@ export default [
         key: 'showCharCount',
         ignore: true
     },
+    {
+        key: 'spellcheck',
+        ignore: true
+    },
     {
         type: 'textfield',
         input: true,

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

@@ -4,6 +4,7 @@ export default class DataGridComponent extends NestedArrayComponent {
         icon: string;
         group: string;
         documentation: string;
+        showPreview: boolean;
         weight: number;
         schema: any;
     };

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

@@ -19,6 +19,7 @@ export default class DataGridComponent extends NestedArrayComponent {
             icon: 'th',
             group: 'data',
             documentation: '/userguide/form-building/data-components#data-grid',
+            showPreview: false,
             weight: 30,
             schema: DataGridComponent.schema()
         };
@@ -510,7 +511,13 @@ export default class DataGridComponent extends NestedArrayComponent {
                         (col.checkConditions(data, flags, dataValue[rowIndex]) && col.type !== 'hidden');
                     if (col.component.logic && firstRowCheck) {
                         const compIndex = _.findIndex(this.columns, ['key', key]);
-                        if (!_.isEqual(this.columns[compIndex], col.component)) {
+                        const equalColumns = _.isEqualWith(this.columns[compIndex], col.component, (col1, col2, key) => {
+                            // Don't compare columns by their auto-generated ids.
+                            if (key === 'id') {
+                                return true;
+                            }
+                        });
+                        if (!equalColumns) {
                             logicRebuild = true;
                             this.columns[compIndex] = col.component;
                         }

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

@@ -1,4 +1,5 @@
 export default class DataMapComponent extends DataGridComponent {
+    static savedValueTypes(schema: any): string[];
     constructor(component: any, options: any, data: any);
     get emptyValue(): {};
     set dataValue(arg: any);

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

@@ -2,7 +2,7 @@ import Component from '../_classes/component/Component';
 import DataGridComponent from '../datagrid/DataGrid';
 import _ from 'lodash';
 import EventEmitter from 'eventemitter3';
-import { uniqueKey } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes, uniqueKey } from '../../utils/utils';
 export default class DataMapComponent extends DataGridComponent {
     static schema(...extend) {
         return Component.schema({
@@ -32,6 +32,7 @@ export default class DataMapComponent extends DataGridComponent {
             icon: 'th-list',
             group: 'data',
             documentation: '/userguide/form-building/data-components#data-map',
+            showPreview: false,
             weight: 20,
             schema: DataMapComponent.schema()
         };
@@ -43,6 +44,9 @@ export default class DataMapComponent extends DataGridComponent {
         }
         return _.omit(schema, 'components');
     }
+    static savedValueTypes(schema) {
+        return getComponentSavedTypes(schema) || [componentValueTypes.object];
+    }
     constructor(component, options, data) {
         super(component, options, data);
         this.type = 'datamap';

package/lib/mjs/components/datetime/DateTime.d.ts

@@ -7,6 +7,29 @@ export default class DateTimeComponent extends Input {
         weight: number;
         schema: any;
     };
+    static get serverConditionSettings(): {
+        operators: string[];
+        valueComponent(classComp: any): any;
+        constructor: Function;
+        toString(): string;
+        toLocaleString(): string;
+        valueOf(): Object;
+        hasOwnProperty(v: PropertyKey): boolean;
+        isPrototypeOf(v: Object): boolean;
+        propertyIsEnumerable(v: PropertyKey): boolean;
+    };
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+        valueComponent(classComp: any): any;
+        constructor: Function;
+        toString(): string;
+        toLocaleString(): string;
+        valueOf(): Object;
+        hasOwnProperty(v: PropertyKey): boolean;
+        isPrototypeOf(v: Object): boolean;
+        propertyIsEnumerable(v: PropertyKey): boolean;
+    };
+    static savedValueTypes(schema: any): string[];
     get emptyValue(): string;
     get momentFormat(): string;
     createWrapper(): boolean;

package/lib/mjs/components/datetime/DateTime.js

@@ -1,7 +1,8 @@
 import _ from 'lodash';
 import moment from 'moment';
-import Input from '../_classes/input/Input';
 import FormioUtils from '../../utils';
+import { componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import Input from '../_classes/input/Input';
 export default class DateTimeComponent extends Input {
     static schema(...extend) {
         return Input.schema({
@@ -50,6 +51,25 @@ export default class DateTimeComponent extends Input {
             schema: DateTimeComponent.schema()
         };
     }
+    static get serverConditionSettings() {
+        return DateTimeComponent.conditionOperatorsSettings;
+    }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isDateEqual', 'isNotDateEqual', 'isEmpty', 'isNotEmpty', 'dateLessThan', 'dateGreaterThan', 'dateLessThanOrEqual', 'dateGreaterThanOrEqual'],
+            valueComponent(classComp) {
+                return {
+                    ...classComp,
+                    type: 'datetime',
+                };
+            }
+        };
+    }
+    static savedValueTypes(schema) {
+        schema = schema || {};
+        return getComponentSavedTypes(schema) || [componentValueTypes.date];
+    }
     constructor(component, options, data) {
         super(component, options, data);
         const timezone = (this.component.timezone || this.options.timezone);
@@ -58,9 +78,15 @@ export default class DateTimeComponent extends Input {
         if (!this.component.enableDate) {
             this.component.format = this.component.format.replace(/yyyy-MM-dd /g, '');
         }
+        else if (this.component.enableDate && !/[yMd]/.test(this.component.format) && this.builderMode) {
+            this.component.format = `yyyy-MM-dd ${this.component.format}`;
+        }
         if (!this.component.enableTime) {
             this.component.format = this.component.format.replace(/ hh:mm a$/g, '');
         }
+        else if (this.component.enableTime && !/[mhH]/.test(this.component.format) && this.builderMode) {
+            this.component.format = `${this.component.format} hh:mm a`;
+        }
         else if (time24hr) {
             this.component.format = this.component.format.replace(/hh:mm a$/g, 'HH:mm');
         }

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

@@ -7,6 +7,28 @@ export default class DayComponent extends Field {
         weight: number;
         schema: any;
     };
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+        constructor: Function;
+        toString(): string;
+        toLocaleString(): string;
+        valueOf(): Object;
+        hasOwnProperty(v: PropertyKey): boolean;
+        isPrototypeOf(v: Object): boolean;
+        propertyIsEnumerable(v: PropertyKey): boolean;
+    };
+    static savedValueTypes(schema: any): string[];
+    static get serverConditionSettings(): {
+        operators: string[];
+        constructor: Function;
+        toString(): string;
+        toLocaleString(): string;
+        valueOf(): Object;
+        hasOwnProperty(v: PropertyKey): boolean;
+        isPrototypeOf(v: Object): boolean;
+        propertyIsEnumerable(v: PropertyKey): boolean;
+    };
+    constructor(component: any, options: any, data: any);
     /**
      * The empty value for day component.
      *
@@ -122,7 +144,6 @@ export default class DayComponent extends Field {
      * @returns {Date}
      */
     get date(): Date;
-    normalizeMinMaxDates(): any[];
     /**
      * Return the raw value.
      *

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

@@ -1,6 +1,7 @@
 import _ from 'lodash';
+import moment from 'moment';
 import Field from '../_classes/field/Field';
-import { boolValue, getLocaleDateFormatInfo } from '../../utils/utils';
+import { boolValue, componentValueTypes, getComponentSavedTypes, getLocaleDateFormatInfo } from '../../utils/utils';
 export default class DayComponent extends Field {
     static schema(...extend) {
         return Field.schema({
@@ -37,6 +38,28 @@ export default class DayComponent extends Field {
             schema: DayComponent.schema()
         };
     }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isDateEqual', 'isNotDateEqual', 'isEmpty', 'isNotEmpty', 'dateLessThan', 'dateGreaterThan', 'dateLessThanOrEqual', 'dateGreaterThanOrEqual'],
+        };
+    }
+    static savedValueTypes(schema) {
+        schema = schema || {};
+        return getComponentSavedTypes(schema) || [componentValueTypes.string];
+    }
+    constructor(component, options, data) {
+        if (component.maxDate) {
+            component.maxDate = moment(component.maxDate, 'YYYY-MM-DD').toISOString();
+        }
+        if (component.minDate) {
+            component.minDate = moment(component.minDate, 'YYYY-MM-DD').toISOString();
+        }
+        super(component, options, data);
+    }
+    static get serverConditionSettings() {
+        return DayComponent.conditionOperatorsSettings;
+    }
     /**
      * The empty value for day component.
      *
@@ -459,18 +482,12 @@ export default class DayComponent extends Field {
     get date() {
         return this.getDate();
     }
-    normalizeMinMaxDates() {
-        return [this.component.minDate, this.component.maxDate]
-            .map(date => date ? date.split('-').reverse().join('/') : date);
-    }
     /**
      * Return the raw value.
      *
      * @returns {Date}
      */
     get validationValue() {
-        [this.component.minDate, this.component.maxDate] = this.dayFirst ? this.normalizeMinMaxDates()
-            : [this.component.minDate, this.component.maxDate];
         return this.dataValue;
     }
     getValue() {

package/lib/mjs/components/day/fixtures/comp3.js

@@ -9,8 +9,8 @@ export default {
     'validate': {
         'custom': ''
     },
-    'minDate': '2020-02-04',
-    'maxDate': '2020-02-09',
+    'minDate': '2020-03-01',
+    'maxDate': '2021-01-03',
     'clearOnHide': true,
     'persistent': true,
     'protected': false,

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

@@ -4,6 +4,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         icon: string;
         group: string;
         documentation: string;
+        showPreview: boolean;
         weight: number;
         schema: any;
     };
@@ -68,10 +69,10 @@ export default class EditGridComponent extends NestedArrayComponent {
         error: null;
         rowIndex: any;
     } | undefined;
-    addRowModal(rowIndex: any): any;
+    addRowModal(rowIndex: any): Promise<any>;
     alert: Alert | null | undefined;
-    showDialog(rowIndex: any): any;
-    editRow(rowIndex: any): any;
+    showDialog(rowIndex: any): Promise<any>;
+    editRow(rowIndex: any): Promise<any>;
     clearErrors(rowIndex: any): void;
     cancelRow(rowIndex: any): void;
     saveRow(rowIndex: any, modified: any): boolean | undefined;

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

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import NativePromise from 'native-promise-only';
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';
 import Component from '../_classes/component/Component';
 import Alert from '../alert/Alert';
@@ -43,6 +42,7 @@ export default class EditGridComponent extends NestedArrayComponent {
             icon: 'tasks',
             group: 'data',
             documentation: '/userguide/form-building/data-components#edit-grid',
+            showPreview: false,
             weight: 30,
             schema: EditGridComponent.schema(),
         };
@@ -208,7 +208,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         return !this.inlineEditMode;
     }
     get minLength() {
-        return _.get(this.component, 'validate.minLength', 0);
+        return this.builderMode ? 0 : _.get(this.component, 'validate.minLength', 0);
     }
     get data() {
         return this._data;
@@ -467,7 +467,12 @@ export default class EditGridComponent extends NestedArrayComponent {
                 ].forEach(({ className, event, action, }) => {
                     const elements = row.getElementsByClassName(className);
                     Array.prototype.forEach.call(elements, (element) => {
-                        this.addEventListener(element, event, action);
+                        if (this.options.readOnly && _.intersection(element.classList, ['editRow', 'removeRow']).length) {
+                            element.style.display = 'none';
+                        }
+                        else {
+                            this.addEventListener(element, event, action);
+                        }
                     });
                 });
             }
@@ -664,7 +669,7 @@ export default class EditGridComponent extends NestedArrayComponent {
     showDialog(rowIndex) {
         const editRow = this.editRows[rowIndex];
         if (_.isEqual(editRow.backup, editRow.data)) {
-            return NativePromise.resolve();
+            return Promise.resolve();
         }
         const wrapper = this.ce('div', { ref: 'confirmationDialog' });
         const dialogContent = this.component.dialogTemplate || this.defaultDialogTemplate;
@@ -682,7 +687,7 @@ export default class EditGridComponent extends NestedArrayComponent {
             dialog.close();
         };
         let dialogResult;
-        const promise = new NativePromise((resolve, reject) => {
+        const promise = new Promise((resolve, reject) => {
             dialogResult = { resolve, reject };
         });
         this.addEventListener(wrapper.refs.dialogYesButton, 'click', (event) => {
@@ -700,7 +705,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         const editRow = this.editRows[rowIndex];
         const isAlreadyEditing = editRow.state === EditRowState.Editing || editRow.state === EditRowState.New;
         if (!editRow || isAlreadyEditing) {
-            return NativePromise.resolve();
+            return Promise.resolve();
         }
         editRow.prevState = editRow.state;
         editRow.state = this.options.readOnly ? EditRowState.Viewing : EditRowState.Editing;