@formio/js 5.0.0-dev.5750.5b1284a → 5.0.0-dev.5755.27ce870

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/file/File.d.ts

@@ -33,12 +33,12 @@ export default class FileComponent extends Field {
     get dataReady(): Promise<any>;
     loadImage(fileInfo: any): any;
     get emptyValue(): never[];
-    getValueAsString(value: any): any;
+    getValueAsString(value: any, options: any): any;
     get defaultValue(): any[];
     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

@@ -103,7 +103,12 @@ export default class FileComponent extends Field {
     get emptyValue() {
         return [];
     }
-    getValueAsString(value) {
+    getValueAsString(value, options) {
+        if (options?.review && !this.component.uploadOnly) {
+            return _.map(value, (val, index) => {
+                return `<a href="${val.url || '#'}" target="_blank" data-path='${this.path}' data-fileindex='${index}'>${val.originalName}</a>`;
+            }).join(', ');
+        }
         if (_.isArray(value)) {
             return _.map(value, 'originalName').join(', ');
         }
@@ -135,7 +140,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/form/editForm/Form.edit.form.js

@@ -44,7 +44,7 @@ export default [
         },
         searchField: 'title__regex',
         template: '<span>{{ item._vid }}</span>',
-        valueProperty: '_id',
+        valueProperty: 'revisionId',
         authenticate: true,
         label: 'Form Revision',
         key: 'revision',

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.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;
@@ -221,7 +212,7 @@ export default class RadioComponent extends ListComponent {
         if (!boolValue(setting) || !value) {
             return true;
         }
-        const values = this.component.values;
+        const values = this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions;
         if (values) {
             return values.findIndex(({ value: optionValue }) => this.normalizeValue(optionValue) === value) !== -1;
         }
@@ -264,6 +255,16 @@ export default class RadioComponent extends ListComponent {
         if (method.toUpperCase() === 'GET') {
             body = null;
         }
+        const limit = this.component.limit || 100;
+        const skip = this.isScrollLoading ? this.selectOptions.length : 0;
+        // Allow for url interpolation.
+        url = this.sanitize(this.interpolate(url, {
+            formioBase: Formio.getBaseUrl(),
+            search,
+            limit,
+            skip,
+            page: Math.abs(Math.floor(skip / limit))
+        }), this.shouldSanitizeValue);
         // Set ignoreCache if it is
         options.ignoreCache = this.component.ignoreCache;
         // Make the request.

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/select/Select.js

@@ -257,7 +257,8 @@ export default class SelectComponent extends ListComponent {
             const value = (typeof itemLabel === 'string') ? this.t(itemLabel, { _userInput: true }) : itemLabel;
             return this.sanitize(value, this.shouldSanitizeValue);
         }
-        if (this.component.multiple && _.isArray(this.dataValue) ? this.dataValue.find((val) => value === val) : (this.dataValue === value)) {
+        if (this.component.multiple
+            && _.isArray(this.dataValue) ? this.dataValue.find((val) => this.normalizeSingleValue(value) === val) : (this.dataValue === value)) {
             const selectData = this.selectData;
             if (selectData) {
                 const templateValue = this.component.reference && value?._id ? value._id.toString() : value;
@@ -538,13 +539,13 @@ export default class SelectComponent extends ListComponent {
             skip,
         };
         // Allow for url interpolation.
-        url = this.interpolate(url, {
+        url = this.sanitize(this.interpolate(url, {
             formioBase: Formio.getBaseUrl(),
             search,
             limit,
             skip,
             page: Math.abs(Math.floor(skip / limit))
-        });
+        }), this.shouldSanitizeValue);
         // Add search capability.
         if (this.component.searchField && search) {
             const searchValue = Array.isArray(search)
@@ -1457,6 +1458,9 @@ export default class SelectComponent extends ListComponent {
             case 'custom':
                 rawItems = this.getCustomItems();
                 break;
+            case 'url':
+                rawItems = this.selectItems;
+                break;
         }
         if (typeof rawItems === 'string') {
             try {
@@ -1514,7 +1518,7 @@ export default class SelectComponent extends ListComponent {
                 if (Array.isArray(data)) {
                     data.forEach((item) => item[valueProperty] = item[valueProperty].toString());
                 }
-                else {
+                else if (_.isObject(data)) {
                     data[valueProperty] = data[valueProperty].toString();
                 }
                 return data;
@@ -1523,11 +1527,7 @@ export default class SelectComponent extends ListComponent {
                 data = data.toString();
             }
             if (Array.isArray(data) && data.some(item => this.isBooleanOrNumber(item))) {
-                data = data.map(item => {
-                    if (this.isBooleanOrNumber(item)) {
-                        item = item.toString();
-                    }
-                });
+                data = data.map(item => this.isBooleanOrNumber(item) ? item.toString() : item);
             }
             return data;
         };
@@ -1549,7 +1549,7 @@ export default class SelectComponent extends ListComponent {
             };
             value = (this.component.multiple && Array.isArray(value))
                 ? _.filter(items, (item) => value.includes(item.value))
-                : valueProperty
+                : (valueProperty && items)
                     ? getFromValues() ?? { value, label: value }
                     : value;
         }
@@ -1593,8 +1593,8 @@ export default class SelectComponent extends ListComponent {
         super.detach();
     }
     focus() {
+        super.focus.call(this);
         if (this.focusableElement) {
-            super.focus.call(this);
             this.focusableElement.focus();
         }
     }

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

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

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

package/lib/mjs/components/signature/editForm/Signature.edit.display.d.ts

@@ -7,7 +7,6 @@ declare const _default: ({
     placeholder: string;
     weight: number;
     conditional?: undefined;
-    customConditional?: undefined;
     ignore?: undefined;
 } | {
     type: string;
@@ -24,7 +23,6 @@ declare const _default: ({
         };
     };
     weight: number;
-    customConditional?: undefined;
     ignore?: undefined;
 } | {
     weight: number;
@@ -32,9 +30,6 @@ declare const _default: ({
     label: string;
     tooltip: string;
     key: string;
-    customConditional: ({ options }: {
-        options: any;
-    }) => boolean;
     input: boolean;
     placeholder?: undefined;
     conditional?: undefined;
@@ -49,6 +44,5 @@ declare const _default: ({
     placeholder?: undefined;
     weight?: undefined;
     conditional?: undefined;
-    customConditional?: undefined;
 })[];
 export default _default;

package/lib/mjs/components/signature/editForm/Signature.edit.display.js

@@ -37,7 +37,6 @@ export default [
         label: 'Keep Overlay Aspect Ratio',
         tooltip: 'If checked, the field will have the same aspect ratio as its preview.',
         key: 'keepOverlayRatio',
-        customConditional: ({ options }) => (options?.editForm?.display === 'pdf'),
         input: true
     },
     {

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.form.js

@@ -1,4 +1,4 @@
-import baseEditForm from '../_classes/component/Component.form';
+import Components from '../Components';
 import TimeEditData from './editForm/Time.edit.data';
 import TimeEditDisplay from './editForm/Time.edit.display';
 /**
@@ -7,7 +7,7 @@ import TimeEditDisplay from './editForm/Time.edit.display';
  * @returns {import('@formio/core').Component[]} - The edit form components.
  */
 export default function (...extend) {
-    return baseEditForm([
+    return Components.baseEditForm([
         {
             key: 'data',
             components: TimeEditData,

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/lib/mjs/utils/conditionOperators/DateGreaterThan.js

@@ -19,7 +19,7 @@ export default class DateGeaterThan extends ConditionOperator {
             return false;
         }
         let conditionTriggerComponent = null;
-        if (instance && instance.root) {
+        if (instance?.root?.getComponent) {
             conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
         }
         if (conditionTriggerComponent && conditionTriggerComponent.isPartialDay && conditionTriggerComponent.isPartialDay(value)) {

package/lib/mjs/utils/conditionOperators/IsEmptyValue.js

@@ -12,8 +12,8 @@ export default class IsEmptyValue extends ConditionOperator {
     }
     execute({ value, instance, conditionComponentPath }) {
         const isEmptyValue = _.isEmpty(_.isNumber(value) ? String(value) : value);
-        if (instance && instance.root) {
-            const conditionTriggerComponent = instance.root?.getComponent && instance.root.getComponent(conditionComponentPath);
+        if (instance?.root?.getComponent) {
+            const conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
             return conditionTriggerComponent?.isEmpty ? conditionTriggerComponent.isEmpty() : isEmptyValue;
         }
         return isEmptyValue;

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

@@ -16,8 +16,8 @@ export default class IsEqualTo extends ConditionOperator {
             // eslint-disable-next-line no-empty
             catch (e) { }
         }
-        if (instance && instance.root) {
-            const conditionTriggerComponent = instance.root?.getComponent && instance.root.getComponent(conditionComponentPath);
+        if (instance?.root?.getComponent) {
+            const conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
             if (conditionTriggerComponent
                 && isSelectResourceWithObjectValue(conditionTriggerComponent.component)
                 && conditionTriggerComponent.component?.template) {

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

@@ -8,11 +8,10 @@ export function findComponents(components: import('@formio/core').Component[], q
 export const flattenComponents: typeof Utils.flattenComponents;
 export const guid: typeof Utils.guid;
 export const uniqueName: typeof Utils.uniqueName;
-export const MODEL_TYPES: Record<string, string[]>;
+export const MODEL_TYPES: any;
 export const getModelType: typeof Utils.getModelType;
 export const getComponentAbsolutePath: typeof Utils.getComponentAbsolutePath;
 export const getComponentPath: typeof Utils.getComponentPath;
-export const isComponentModelType: typeof Utils.isComponentModelType;
 export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
 export const componentPath: typeof Utils.componentPath;
 export const componentChildPath: any;

package/lib/mjs/utils/formUtils.js

@@ -1,5 +1,5 @@
 import { Utils } from '@formio/core';
-const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentModelType, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty } = Utils;
+const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty } = Utils;
 /**
  * Deprecated version of findComponents. Renamed to searchComponents.
  * @param {import('@formio/core').Component[]} components - The components to find components within.
@@ -10,4 +10,4 @@ export function findComponents(components, query) {
     console.warn('formio.js/utils findComponents is deprecated. Use searchComponents instead.');
     return searchComponents(components, query);
 }
-export { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentModelType, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty };
+export { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty };

package/lib/mjs/utils/utils.d.ts

@@ -523,4 +523,4 @@ import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;
-export { jsonLogic, ConditionOperators, Evaluator, _ };
+export { jsonLogic, ConditionOperators, moment, Evaluator, _ };

package/lib/mjs/utils/utils.js

@@ -24,8 +24,7 @@ jsonLogic.add_operation('relativeMinDate', (relativeMinDate) => {
 jsonLogic.add_operation('relativeMaxDate', (relativeMaxDate) => {
     return moment().add(relativeMaxDate, 'days').toISOString();
 });
-export { jsonLogic, ConditionOperators };
-export * as moment from 'moment-timezone/moment-timezone';
+export { jsonLogic, ConditionOperators, moment };
 /**
  * Sets the path to the component and parent schema.
  * @param {import('@formio/core').Component} component - The component to set the path for.

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)) {