@formio/js 5.0.0-dev.5796.ee2613b → 5.0.0-dev.5797.3f96a70

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

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

package/lib/mjs/components/datetime/fixtures/comp14.d.ts

@@ -0,0 +1,35 @@
+declare namespace _default {
+    let components: {
+        label: string;
+        tableView: boolean;
+        datePicker: {
+            disableWeekends: boolean;
+            disableWeekdays: boolean;
+        };
+        enableMinDateInput: boolean;
+        enableMaxDateInput: boolean;
+        validateWhenHidden: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        widget: {
+            type: string;
+            displayInTimezone: string;
+            locale: string;
+            useLocaleSettings: boolean;
+            allowInput: boolean;
+            mode: string;
+            enableTime: boolean;
+            noCalendar: boolean;
+            format: string;
+            hourIncrement: number;
+            minuteIncrement: number;
+            time_24hr: boolean;
+            minDate: null;
+            disableWeekends: boolean;
+            disableWeekdays: boolean;
+            maxDate: null;
+        };
+    }[];
+}
+export default _default;

package/lib/mjs/components/datetime/fixtures/comp14.js

@@ -0,0 +1,36 @@
+export default {
+    components: [
+        {
+            "label": "Date / Time",
+            "tableView": false,
+            "datePicker": {
+                "disableWeekends": false,
+                "disableWeekdays": false
+            },
+            "enableMinDateInput": false,
+            "enableMaxDateInput": false,
+            "validateWhenHidden": false,
+            "key": "dateTime",
+            "type": "datetime",
+            "input": true,
+            "widget": {
+                "type": "calendar",
+                "displayInTimezone": "viewer",
+                "locale": "en",
+                "useLocaleSettings": false,
+                "allowInput": true,
+                "mode": "single",
+                "enableTime": true,
+                "noCalendar": false,
+                "format": "yyyy-MM-dd hh:mm a",
+                "hourIncrement": 1,
+                "minuteIncrement": 1,
+                "time_24hr": false,
+                "minDate": null,
+                "disableWeekends": false,
+                "disableWeekdays": false,
+                "maxDate": null
+            }
+        }
+    ]
+};

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

@@ -1,8 +1,4 @@
 import comp1 from './comp1';
-import comp10 from './comp10';
-import comp11 from './comp11';
-import comp12 from './comp12';
-import comp13 from './comp13';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp5 from './comp5';
@@ -10,4 +6,9 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
-export { comp1, comp10, comp11, comp12, comp13, comp2, comp3, comp5, comp6, comp7, comp8, comp9 };
+import comp10 from './comp10';
+import comp11 from './comp11';
+import comp12 from './comp12';
+import comp13 from './comp13';
+import comp14 from './comp14';
+export { comp1, comp2, comp3, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14 };

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

@@ -10,4 +10,5 @@ import comp10 from './comp10';
 import comp11 from './comp11';
 import comp12 from './comp12';
 import comp13 from './comp13';
-export { comp1, comp10, comp11, comp12, comp13, comp2, comp3, comp5, comp6, comp7, comp8, comp9 };
+import comp14 from './comp14';
+export { comp1, comp2, comp3, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14 };

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

@@ -97,6 +97,11 @@ export default class DayComponent extends Field {
      * @returns {null|void} - Returns null if the value is invalid, otherwise void.
      */
     setValueAt(index: number, value: any): null | void;
+    getDayWithHiddenFields(parts: any): {
+        month: any;
+        day: any;
+        year: any;
+    };
     getFieldValue(name: any): number;
     get parts(): {
         day: number;

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

@@ -342,6 +342,18 @@ 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('/') : '';
+        let defaultDay = '';
+        let defaultMonth = '';
+        let defaultYear = '';
+        if (defaultValue) {
+            const hasHiddenFields = defaultValue.length !== 3;
+            defaultDay = hasHiddenFields ? this.getDayWithHiddenFields(defaultValue).day : defaultValue[DAY];
+            defaultMonth = hasHiddenFields ? this.getDayWithHiddenFields(defaultValue).month : defaultValue[MONTH];
+            defaultYear = hasHiddenFields ? this.getDayWithHiddenFields(defaultValue).year : defaultValue[YEAR];
+        }
+        if (this.options.building && defaultValue.length === 3) {
+            return this.component.defaultValue;
+        }
         const getNextPart = (shouldTake, defaultValue) => {
             // Only push the part if it's not an empty string
             const part = shouldTake ? valueParts.shift() : defaultValue;
@@ -350,13 +362,13 @@ export default class DayComponent extends Field {
             }
         };
         if (this.dayFirst) {
-            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '');
+            getNextPart(this.showDay, defaultDay);
         }
-        getNextPart(this.showMonth, defaultValue ? defaultValue[MONTH] : '');
+        getNextPart(this.showMonth, defaultMonth);
         if (!this.dayFirst) {
-            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '');
+            getNextPart(this.showDay, defaultDay);
         }
-        getNextPart(this.showYear, defaultValue ? defaultValue[YEAR] : '');
+        getNextPart(this.showYear, defaultYear);
         return dateParts.join('/');
     }
     /**
@@ -371,16 +383,23 @@ export default class DayComponent extends Field {
         if (value === 'Invalid date') {
             return null;
         }
+        let day, month, year;
         const parts = value.split('/');
-        let day;
-        if (this.component.dayFirst) {
-            day = parts.shift();
+        if (parts.length !== 3) {
+            day = this.getDayWithHiddenFields(parts).day;
+            month = this.getDayWithHiddenFields(parts).month;
+            year = this.getDayWithHiddenFields(parts).year;
         }
-        const month = parts.shift();
-        if (!this.component.dayFirst) {
-            day = parts.shift();
+        else {
+            if (this.component.dayFirst) {
+                day = parts.shift();
+            }
+            month = parts.shift();
+            if (!this.component.dayFirst) {
+                day = parts.shift();
+            }
+            year = parts.shift();
         }
-        const year = parts.shift();
         if (this.refs.day && this.showDay) {
             this.refs.day.value = day === '00' ? '' : parseInt(day, 10);
         }
@@ -391,6 +410,27 @@ export default class DayComponent extends Field {
             this.refs.year.value = year === '0000' ? '' : parseInt(year, 10);
         }
     }
+    getDayWithHiddenFields(parts) {
+        let [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
+        if (!this.showDay) {
+            MONTH = MONTH === 0 ? 0 : MONTH - 1;
+            YEAR = YEAR - 1;
+            DAY = null;
+        }
+        if (!this.showMonth) {
+            DAY = DAY === 0 ? 0 : DAY - 1;
+            YEAR = YEAR - 1;
+            MONTH = null;
+        }
+        if (!this.showYear) {
+            YEAR = null;
+        }
+        return {
+            month: _.isNull(MONTH) ? '' : parts[MONTH],
+            day: _.isNull(DAY) ? '' : parts[DAY],
+            year: _.isNull(YEAR) ? '' : parts[YEAR],
+        };
+    }
     getFieldValue(name) {
         const parts = this.dataValue ? this.dataValue.split('/') : [];
         let val = 0;

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

@@ -14,6 +14,7 @@ declare const _default: ({
     input?: undefined;
     placeholder?: undefined;
     tooltip?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
@@ -25,16 +26,32 @@ declare const _default: ({
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
     label: string;
     tooltip: string;
     key: string;
+    onChange: ({ data }: {
+        data: any;
+    }) => void;
     input: boolean;
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
     placeholder?: undefined;
+} | {
+    weight: number;
+    type: string;
+    label: string;
+    tooltip: string;
+    key: string;
+    input: boolean;
+    wieght?: undefined;
+    datasrc?: undefined;
+    data?: undefined;
+    placeholder?: undefined;
+    onChange?: undefined;
 })[];
 export default _default;

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

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export default [
     {
         wieght: 200,
@@ -33,6 +34,21 @@ export default [
         label: 'Hidden',
         tooltip: 'Hide the Day part of the component.',
         key: 'fields.day.hide',
+        onChange: ({ data }) => {
+            if (data.defaultValue) {
+                const defaultValueParts = data.defaultValue.split('/');
+                if (!data.fields.day.hide && defaultValueParts.length !== 3) {
+                    const newDefaultValue = ['00'];
+                    if (!data.fields.month.hide) {
+                        data.dayFirst ? newDefaultValue.push(defaultValueParts[0]) : newDefaultValue.unshift(defaultValueParts[0]);
+                    }
+                    if (!data.fields.year.hide) {
+                        newDefaultValue.push(defaultValueParts[1]);
+                    }
+                    _.set(data, 'defaultValue', newDefaultValue.join('/'));
+                }
+            }
+        },
         input: true
     },
     {

package/lib/mjs/components/day/editForm/Day.edit.month.d.ts

@@ -14,6 +14,7 @@ declare const _default: ({
     input?: undefined;
     placeholder?: undefined;
     tooltip?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
@@ -25,12 +26,16 @@ declare const _default: ({
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
     label: string;
     tooltip: string;
     key: string;
+    onChange: ({ data }: {
+        data: any;
+    }) => void;
     input: boolean;
     wieght?: undefined;
     datasrc?: undefined;

package/lib/mjs/components/day/editForm/Day.edit.month.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export default [
     {
         wieght: 200,
@@ -33,6 +34,21 @@ export default [
         label: 'Hidden',
         tooltip: 'Hide the Month part of the component.',
         key: 'fields.month.hide',
+        onChange: ({ data }) => {
+            if (data.defaultValue) {
+                const defaultValueParts = data.defaultValue.split('/');
+                if (!data.fields.month.hide && defaultValueParts.length !== 3) {
+                    const newDefaultValue = ['00'];
+                    if (!data.fields.day.hide) {
+                        data.dayFirst ? newDefaultValue.unshift(defaultValueParts[0]) : newDefaultValue.push(defaultValueParts[0]);
+                    }
+                    if (!data.fields.year.hide) {
+                        newDefaultValue.push(defaultValueParts[1]);
+                    }
+                    _.set(data, 'defaultValue', newDefaultValue.join('/'));
+                }
+            }
+        },
         input: true
     },
 ];

package/lib/mjs/components/day/editForm/Day.edit.year.d.ts

@@ -14,6 +14,7 @@ declare const _default: ({
     input?: undefined;
     placeholder?: undefined;
     tooltip?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
@@ -25,12 +26,16 @@ declare const _default: ({
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
     label: string;
     tooltip: string;
     key: string;
+    onChange: ({ data }: {
+        data: any;
+    }) => void;
     input: boolean;
     wieght?: undefined;
     datasrc?: undefined;

package/lib/mjs/components/day/editForm/Day.edit.year.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export default [
     {
         wieght: 200,
@@ -51,6 +52,15 @@ export default [
         label: 'Hidden',
         tooltip: 'Hide the Year part of the component.',
         key: 'fields.year.hide',
+        onChange: ({ data }) => {
+            if (data.defaultValue) {
+                const defaultValueParts = data.defaultValue.split('/');
+                if (!data.fields.month.hide && defaultValueParts.length !== 3) {
+                    defaultValueParts.push('0000');
+                    _.set(data, 'defaultValue', defaultValueParts.join('/'));
+                }
+            }
+        },
         input: true
     },
 ];

package/lib/mjs/components/html/HTML.js

@@ -5,7 +5,7 @@ export default class HTMLComponent extends Component {
         return Component.schema({
             label: 'HTML',
             type: 'htmlelement',
-            tag: 'p',
+            tag: 'div',
             attrs: [],
             content: '',
             input: false,

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

@@ -212,7 +212,7 @@ export default class RadioComponent extends ListComponent {
         if (!boolValue(setting) || !value) {
             return true;
         }
-        const values = this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions;
+        const values = this.component.values;
         if (values) {
             return values.findIndex(({ value: optionValue }) => this.normalizeValue(optionValue) === value) !== -1;
         }

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

@@ -1457,9 +1457,6 @@ export default class SelectComponent extends ListComponent {
             case 'custom':
                 rawItems = this.getCustomItems();
                 break;
-            case 'url':
-                rawItems = this.selectItems;
-                break;
         }
         if (typeof rawItems === 'string') {
             try {

package/lib/mjs/components/select/editForm/Select.edit.validation.js

@@ -24,8 +24,7 @@ export default [
                     [
                         'values',
                         'json',
-                        'custom',
-                        'url'
+                        'custom'
                     ],
                 ],
             },

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

@@ -256,7 +256,7 @@ export default class SelectBoxesComponent extends RadioComponent {
         if (!boolValue(setting) || !value) {
             return true;
         }
-        const values = this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions;
+        const values = this.component.values;
         const availableValueKeys = (values || []).map(({ value: optionValue }) => optionValue);
         const valueKeys = Object.keys(value);
         return valueKeys.every((key) => availableValueKeys.includes(key));

package/lib/mjs/widgets/CalendarWidget.js

@@ -96,14 +96,8 @@ export default class CalendarWidget extends InputWidget {
         this.settings.dateFormat = convertFormatToFlatpickr(this.settings.dateFormat);
         this.settings.position = 'auto center';
         this.settings.onChange = () => {
-            if (this.settings.allowInput) {
-                if (this.settings.isManuallyOverriddenValue && this.settings.enableTime) {
-                    this.calendar._input.value = this.settings.manualInputValue;
-                }
-                else {
-                    this.settings.manualInputValue = '';
-                }
-                this.settings.isManuallyOverriddenValue = false;
+            if (this.settings.allowInput && this.settings.enableTime) {
+                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
             }
             this.emit('update');
         };
@@ -112,8 +106,7 @@ export default class CalendarWidget extends InputWidget {
             this.hook('onCalendarClose');
             this.closedOn = Date.now();
             if (this.settings.allowInput && this.settings.enableTime) {
-                this.calendar._input.value = this.settings.manualInputValue || this.calendar._input.value;
-                this.settings.isManuallyOverriddenValue = false;
+                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
                 this.emit('update');
             }
             if (this.settings.wasDefaultValueChanged) {
@@ -349,9 +342,14 @@ export default class CalendarWidget extends InputWidget {
         this.calendar = new Flatpickr(this._input, { ...this.settings, disableMobile: true });
         this.addEventListener(this.calendar.altInput, 'input', (event) => {
             if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
+                if (event.target.mask) {
+                    event.target.mask.textMaskInputElement.update();
+                }
                 this.settings.manualInputValue = event.target.value;
+                this._input.value = this.settings.manualInputValue;
                 this.settings.isManuallyOverriddenValue = true;
                 this.settings.currentValue = event.target.value;
+                this.emit('update');
             }
             if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
                 this.settings.wasDefaultValueChanged = true;
@@ -362,6 +360,18 @@ export default class CalendarWidget extends InputWidget {
                 this.settings.wasDefaultValueChanged = false;
             }
         });
+        if (this.calendar.daysContainer) {
+            this.calendar.daysContainer.addEventListener('click', () => {
+                this.settings.isManuallyOverriddenValue = false;
+                this.calendar.updateValue(false);
+            });
+        }
+        if (this.calendar.timeContainer) {
+            this.calendar.timeContainer.addEventListener('click', () => {
+                this.settings.isManuallyOverriddenValue = false;
+                this.calendar.updateValue(false);
+            });
+        }
         const excludedFromMaskFormats = ['MMMM'];
         if (!this.settings.readOnly && !_.some(excludedFromMaskFormats, format => _.includes(this.settings.format, format))) {
             // Enforce the input mask of the format.
@@ -387,6 +397,10 @@ export default class CalendarWidget extends InputWidget {
         }
         // Make sure we commit the value after a blur event occurs.
         this.addEventListener(this.calendar._input, 'blur', (event) => {
+            // If we have manually overridden the value then we shouldn't call setDate because this will fill the input mask
+            if (this.settings.isManuallyOverriddenValue) {
+                return;
+            }
             const activeElement = this.settings.shadowRoot ? this.settings.shadowRoot.activeElement : document.activeElement;
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {

package/package.json

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