@mgdis/mg-components 6.17.0 → 6.19.0

package/dist/collection/components/molecules/inputs/mg-input-combobox/mg-input-combobox.js

@@ -26,7 +26,7 @@ const isFetchmappings = (value) => {
         const { request, response } = value;
         if ([request, response].some(property => !isObject(property)))
             return false;
-        const isValidRequest = typeof request.filter === 'string';
+        const isValidRequest = typeof request.filter === 'string' && (request.filterTransform === undefined || typeof request.filterTransform === 'function');
         const isValidResponse = typeof response === 'object' &&
             typeof response.total === 'string' &&
             typeof response.items === 'string' &&
@@ -41,13 +41,9 @@ const isFetchmappings = (value) => {
 };
 export class MgInputCombobox {
     constructor() {
-        /************
-         * Internal *
-         ************/
-        // Classes
-        this.classFocus = 'mg-u-is-focused';
         // hasDisplayedError (triggered by blur event)
         this.hasDisplayedError = false;
+        this.customErrorMessage = { lock: false };
         /**
          * Input name
          * If not set the value equals the identifier
@@ -102,7 +98,7 @@ export class MgInputCombobox {
          * @param event - option element click event
          */
         this.handleOptionClick = (event) => {
-            this.setValue(this.options.items.find(option => formatID(option.value) === event.target.id));
+            this.setValue(this.options.items.find(option => toString(option.value) === event.target.dataset.value));
             this.popoverDisplay = false;
         };
         /**
@@ -182,7 +178,7 @@ export class MgInputCombobox {
             // override keys actions
             switch (event.key) {
                 case Keys.TAB:
-                case Keys.ENTER:
+                case Keys.ENTER: {
                     guard = event.key === Keys.ENTER;
                     const option = (_a = this.option) !== null && _a !== void 0 ? _a : this.options.items.find(this.isCurrentOption);
                     // Sets the value to the content of the focused option in the listbox.
@@ -192,12 +188,13 @@ export class MgInputCombobox {
                     // Closes the popover.
                     this.popoverDisplay = false;
                     break;
+                }
                 case Keys.DOWN:
                 case Keys.ARROWDOWN:
                 case Keys.UP:
-                case Keys.ARROWUP:
+                case Keys.ARROWUP: {
                     guard = true;
-                    if (this.isLoading || !(this.page.total > 0)) {
+                    if (this.isLoading || this.page.total === 0) {
                         this.popoverDisplay = true;
                         break;
                     }
@@ -228,12 +225,13 @@ export class MgInputCombobox {
                     // open popover
                     this.popoverDisplay = true;
                     break;
+                }
                 case Keys.LEFT:
                 case Keys.ARROWLEFT:
                 case Keys.HOME:
                 case Keys.RIGHT:
                 case Keys.ARROWRIGHT:
-                case Keys.END:
+                case Keys.END: {
                     // skip process if visual focus is not in popover
                     if (!isItem(this.option))
                         break;
@@ -253,8 +251,9 @@ export class MgInputCombobox {
                         this.input.setSelectionRange(index, index);
                     }
                     break;
+                }
                 case Keys.ESC:
-                case Keys.ESCAPE:
+                case Keys.ESCAPE: {
                     guard = true;
                     if (this.popoverDisplay) {
                         // If the popover is displayed, closes it.
@@ -268,10 +267,12 @@ export class MgInputCombobox {
                         this.option = null;
                     }
                     break;
-                default:
+                }
+                default: {
                     // Remove visual focus from popover options
                     this.option = null;
                     break;
+                }
             }
             if (guard) {
                 event.stopPropagation();
@@ -317,40 +318,41 @@ export class MgInputCombobox {
         };
         /**
          * Set input error message
-         * @param errorMessage - errorMessage override
+         * @param fromSetErrorContext - context come from `setError` method
          */
-        this.setErrorMessage = (errorMessage) => {
+        this.setErrorMessage = (fromSetErrorContext = false) => {
             // Set error message
             this.errorMessage = undefined;
-            // Does have a custom error message
-            if (!this.valid && errorMessage !== undefined) {
-                this.errorMessage = errorMessage;
-            }
-            // required
-            else if (!this.valid && this.input.validity.valueMissing) {
-                this.errorMessage = this.messages.errors.required;
+            if (!this.valid) {
+                // Does have a new custom error message OR does have a custom error message locked
+                if (fromSetErrorContext || (this.customErrorMessage.lock && this.customErrorMessage.message !== undefined)) {
+                    this.errorMessage = this.customErrorMessage.message;
+                }
+                // required
+                else if (this.input.validity.valueMissing) {
+                    this.errorMessage = this.messages.errors.required;
+                }
             }
         };
         /**
-         * Get filtered options from `filter` input value
-         * @returns filtered options
+         * Get first page with filter applied
+         * @returns first page with filter applied
          */
-        this.optionsFilter = (option) => (this.filter === '' ? true : option.title.toLocaleLowerCase().includes(this.filter.toLocaleLowerCase()));
+        this.getFirstPage = () => this.options.getPage(0, option => this.filter === '' || option.title.toLocaleLowerCase().includes(this.filter.toLocaleLowerCase()));
         /**
          * Loading wrapper with a given action
          * @param action - wrapped loading action
          * @returns promisified action
          */
         this.loadingWrapper = (action) => {
+            var _a;
             let promise;
             let index;
             // cache initial loading action if not defined
-            if (!Boolean(this.loadingAction)) {
-                this.loadingAction = action.name;
-            }
+            (_a = this.loadingAction) !== null && _a !== void 0 ? _a : (this.loadingAction = action.name);
             // update index
             if (Boolean(this.option) && this.loadingAction !== 'load-more') {
-                index = this.page.items.findIndex(option => option.value.toString() === this.option.value.toString());
+                index = this.page.items.findIndex(option => toString(option.value) === toString(this.option.value));
             }
             else if (this.loadingAction === 'load-more') {
                 index = this.page.items.length - this.page.baseIndex;
@@ -380,7 +382,7 @@ export class MgInputCombobox {
             return promise()
                 .then(() => {
                 // parse full items list from options
-                const options = this.options.items.filter(this.optionsFilter);
+                const options = this.filter === '' ? this.options.items : this.options.items.filter(option => option.title.includes(this.filter));
                 // update visual focus
                 if (action.name !== 'load-data') {
                     index = this.page.getIndexFromCursor(action.cursor, this.loadingAction === 'load-more' && index >= 0 ? options[index] : this.option);
@@ -403,14 +405,14 @@ export class MgInputCombobox {
          */
         this.goToNextPage = () => {
             this.showMore.emit();
-            if (Boolean(this.fetchurl)) {
+            if (this.fetchurl !== undefined) {
                 return this.getOptions(typeof this.page.next === 'string' ? this.page.next : undefined).then(nextPage => {
-                    if (!Boolean(nextPage))
-                        return;
-                    // merge items from current page and next page
-                    const items = [...this.page.items, ...nextPage.items];
-                    // create new options pagination withe merged items
-                    this.options = new Paginate(items, { total: nextPage.total, next: nextPage.next, top: items.length });
+                    if (nextPage !== undefined) {
+                        // merge items from current page and next page
+                        const items = [...this.page.items, ...nextPage.items];
+                        // create new options pagination withe merged items
+                        this.options = new Paginate(items, { total: nextPage.total, next: nextPage.next, top: items.length });
+                    }
                 });
             }
             else {
@@ -427,16 +429,16 @@ export class MgInputCombobox {
          * @returns promise
          */
         this.updatePage = async () => {
-            if (Boolean(this.fetchurl)) {
+            if (this.fetchurl !== undefined) {
                 return this.getOptions().then(page => {
-                    if (!Boolean(page))
-                        return;
-                    // reset current options pagination from API response
-                    this.options = new Paginate(page.items, { total: page.total, next: page.next, top: page.top });
+                    if (page !== undefined) {
+                        // reset current options pagination from API response
+                        this.options = new Paginate(page.items, { total: page.total, next: page.next, top: page.top });
+                    }
                 });
             }
             else {
-                this.page = this.options.getPage(0, this.optionsFilter);
+                this.page = this.getFirstPage();
             }
         };
         /**
@@ -445,8 +447,9 @@ export class MgInputCombobox {
          * @returns new page from url
          */
         this.getOptions = async (url = this.fetchurl) => {
-            // add text filter
-            const updateUrl = (typeof url === 'string' ? url : url.toString()).replaceAll(this.fetchmappings.request.filter, encodeURIComponent(this.filter));
+            // add text filter to url
+            const filter = typeof this.fetchmappings.request.filterTransform === 'function' ? this.fetchmappings.request.filterTransform(this.filter) : this.filter;
+            const updateUrl = (typeof url === 'string' ? url : url.toString()).replaceAll(this.fetchmappings.request.filter, encodeURIComponent(filter));
             try {
                 const response = await fetch(updateUrl, this.fetchoptions);
                 if (!response.ok) {
@@ -454,10 +457,13 @@ export class MgInputCombobox {
                     return;
                 }
                 const json = await response.json();
-                const items = getObjectValueFromKey(json, this.fetchmappings.response.items).map((item) => ({
-                    title: getObjectValueFromKey(item, this.fetchmappings.response.itemTitle),
-                    value: this.fetchmappings.response.itemValue !== undefined ? getObjectValueFromKey(item, this.fetchmappings.response.itemValue) : item,
-                }));
+                const items = getObjectValueFromKey(json, this.fetchmappings.response.items).map((item) => {
+                    var _a;
+                    return ({
+                        title: getObjectValueFromKey(item, this.fetchmappings.response.itemTitle),
+                        value: (_a = getObjectValueFromKey(item, this.fetchmappings.response.itemValue)) !== null && _a !== void 0 ? _a : item,
+                    });
+                });
                 const total = Number(getObjectValueFromKey(json, this.fetchmappings.response.total, 0));
                 let next = getObjectValueFromKey(json, this.fetchmappings.response.next);
                 if (URL.canParse(updateUrl) && Boolean(next) && !URL.canParse(next)) {
@@ -478,11 +484,11 @@ export class MgInputCombobox {
         this.valueChange.emit(newValue);
     }
     watchItems(newValue) {
-        if (Boolean(this.fetchurl) && !Boolean(newValue)) {
+        if (this.fetchurl !== undefined && newValue === undefined) {
             // skip newValue check
             return;
         }
-        else if (Boolean(this.fetchurl) && Boolean(newValue)) {
+        else if (this.fetchurl !== undefined && newValue !== undefined) {
             throw new Error(`<mg-input-combobox> prop "items" values cannot be use with "fetchurl" prop defined. Passed value: ${toString(newValue)}.`);
         }
         // Empty options
@@ -502,7 +508,7 @@ export class MgInputCombobox {
         }
     }
     watchIdentifier(newValue) {
-        if (Boolean(newValue)) {
+        if (isValidString(newValue)) {
             this.popoverId = `${newValue}-popover`;
             this.element.dataset.mgPopoverGuard = this.popoverId;
         }
@@ -542,7 +548,7 @@ export class MgInputCombobox {
         this.classCollection = new ClassList(this.classCollection.classes);
     }
     watchFetchUrl(newValue) {
-        if (Boolean(newValue)) {
+        if (newValue !== undefined) {
             this.loadingWrapper({ name: 'load-data' });
         }
     }
@@ -550,20 +556,17 @@ export class MgInputCombobox {
         if (this.fetchurl && newValue && !isObject(newValue)) {
             throw new Error(`<mg-input-combobox> prop "fetchoptions" value must be a valid RequestInit. Passed value: ${toString(newValue)}.`);
         }
-        else {
-            new Request(this.fetchurl, newValue);
-        }
     }
     watchFetchMappings(newValue) {
-        if (Boolean(this.fetchurl) && !Boolean(newValue)) {
+        if (this.fetchurl !== undefined && !isObject(newValue)) {
             throw new Error(`<mg-input-combobox> prop "fetchmappings" is required with "fetchurl" prop.`);
         }
-        else if (Boolean(newValue) && !isFetchmappings(newValue)) {
+        else if (newValue !== undefined && !isFetchmappings(newValue)) {
             throw new Error(`<mg-input-combobox> prop "fetchmappings" value must be { request: RequestMappingType, response: ResponseMappingType }. Passed value: ${toString(newValue)}.`);
         }
     }
-    watchOptions(newValue) {
-        this.page = newValue.getPage(0, Boolean(this.filter) ? this.optionsFilter : undefined);
+    watchOptions() {
+        this.page = this.getFirstPage();
     }
     watchFilter(newValue) {
         this.loadingWrapper({ name: 'load-data' });
@@ -571,7 +574,6 @@ export class MgInputCombobox {
     }
     watchPopoverDisplay(newValue) {
         if (newValue) {
-            this.classCollection.add(this.classFocus);
             this.input.focus();
         }
         else {
@@ -579,7 +581,6 @@ export class MgInputCombobox {
             this.option = null;
             // reset filter with value
             this.filter = this.getValueTitle();
-            this.classCollection.delete(this.classFocus);
             this.handlerInProgress = 'blur';
             this.displayError().finally(() => {
                 // reset guard
@@ -620,17 +621,22 @@ export class MgInputCombobox {
      * When used to set validity to `false`, you should use this method again to reset the validity to `true`.
      * @param valid - value indicating the validity
      * @param errorMessage - the error message to display
+     * @param errorMessageLock - lock the error message and validity state
      */
-    async setError(valid, errorMessage) {
+    async setError(valid, errorMessage, errorMessageLock = false) {
         if (typeof valid !== 'boolean') {
             throw new Error('<mg-input-combobox> method "setError()" param "valid" must be a boolean.');
         }
-        else if (!isValidString(errorMessage)) {
+        else if (errorMessage !== undefined && !isValidString(errorMessage)) {
             throw new Error('<mg-input-combobox> method "setError()" param "errorMessage" must be a string.');
         }
         else {
+            this.customErrorMessage = {
+                lock: valid ? false : errorMessageLock,
+                message: valid ? undefined : errorMessage,
+            };
             this.setValidity(valid);
-            this.setErrorMessage(valid ? undefined : errorMessage);
+            this.setErrorMessage(true);
             this.hasDisplayedError = this.invalid;
         }
     }
@@ -650,6 +656,8 @@ export class MgInputCombobox {
             // - Keep everything in sync both inside and outside the component
             return new Promise(resolve => {
                 requestAnimationFrame(() => {
+                    // unlock validity check by reseting customErrorMessage
+                    this.customErrorMessage = { lock: false };
                     this.checkValidity();
                     this.errorMessage = undefined;
                     this.hasDisplayedError = false;
@@ -678,11 +686,13 @@ export class MgInputCombobox {
      * @param newValue - valid new value
      */
     setValidity(newValue) {
-        const oldValidValue = this.valid;
-        this.valid = newValue;
+        const oldValue = this.valid;
+        if (!this.customErrorMessage.lock || (this.customErrorMessage.message !== undefined && !newValue)) {
+            this.valid = newValue;
+        }
         this.invalid = !this.valid;
         // We need to send valid event even if it is the same value
-        if (this.handlerInProgress === undefined || (this.handlerInProgress === 'blur' && this.valid !== oldValidValue))
+        if (this.handlerInProgress === undefined || (this.handlerInProgress === 'blur' && this.valid !== oldValue))
             this.inputValid.emit(this.valid);
     }
     /*************
@@ -698,13 +708,13 @@ export class MgInputCombobox {
         // Validate
         this.watchIdentifier(this.identifier);
         this.watchItems(this.items);
-        if (Boolean(this.fetchurl)) {
+        if (this.fetchurl !== undefined) {
             this.watchFetchOptions(this.fetchoptions);
             this.watchFetchMappings(this.fetchmappings);
             this.loadingWrapper({ name: 'load-data' });
         }
         this.watchValue(this.value);
-        this.watchOptions(this.options);
+        this.watchOptions();
         this.watchMgWidth(this.mgWidth);
         this.watchReadonly(this.readonly);
         this.watchDisabled(this.disabled);
@@ -725,14 +735,17 @@ export class MgInputCombobox {
         const readonlyValue = this.getValueTitle();
         const withResetButton = this.value && !this.disabled;
         let popoverContent;
-        if (((_a = this.page) === null || _a === void 0 ? void 0 : _a.items.length) > 0)
+        if (((_a = this.page) === null || _a === void 0 ? void 0 : _a.items.length) > 0) {
             popoverContent = 'list';
-        else if (((_b = this.page) === null || _b === void 0 ? void 0 : _b.items.length) === 0 && Boolean(this.filter))
+        }
+        else if (((_b = this.page) === null || _b === void 0 ? void 0 : _b.items.length) === 0 && this.filter.length > 0) {
             popoverContent = 'notfound';
-        else if (((_c = this.page) === null || _c === void 0 ? void 0 : _c.items.length) === 0)
+        }
+        else if (((_c = this.page) === null || _c === void 0 ? void 0 : _c.items.length) === 0) {
             popoverContent = 'notavailable';
+        }
         let activeDescendant;
-        if (Boolean((_d = this.option) === null || _d === void 0 ? void 0 : _d.value)) {
+        if (((_d = this.option) === null || _d === void 0 ? void 0 : _d.value) !== undefined) {
             activeDescendant = this.option.value;
         }
         else if (typeof this.value === 'string') {
@@ -741,8 +754,8 @@ export class MgInputCombobox {
         else {
             activeDescendant = (_e = this.value) === null || _e === void 0 ? void 0 : _e.value;
         }
-        return (h("mg-input", { key: '79e5263cd3b1c0fa0b3f386a547f2bdd48a33b28', label: this.label, identifier: this.identifier, class: this.classCollection.classes.join(' '), ariaDescribedbyIDs: popoverContent && popoverContent !== 'list' ? popoverContent : undefined, labelOnTop: this.labelOnTop, labelHide: this.labelHide, required: this.required, tooltip: this.tooltip, tooltipPosition: this.readonly && this.value === undefined ? 'label' : this.tooltipPosition, helpText: this.helpText, errorMessage: this.errorMessage }, this.readonly ? (readonlyValue && h("b", { class: "mg-c-input__readonly-value" }, readonlyValue)) : (h("mg-popover", { identifier: this.popoverId, placement: "bottom-start", display: this.popoverDisplay, "arrow-hide": true, style: {
-                '--mg-c-input-list-width': Boolean((_f = this.input) === null || _f === void 0 ? void 0 : _f.offsetWidth) ? `${this.input.offsetWidth}px` : undefined,
+        return (h("mg-input", { key: 'fd5a59f1e0bf31342a3bf935a60a2877e5df1772', label: this.label, identifier: this.identifier, class: this.classCollection.classes.join(' '), ariaDescribedbyIDs: popoverContent && popoverContent !== 'list' ? popoverContent : undefined, labelOnTop: this.labelOnTop, labelHide: this.labelHide, required: this.required, tooltip: this.tooltip, tooltipPosition: this.readonly && this.value === undefined ? 'label' : this.tooltipPosition, helpText: this.helpText, errorMessage: this.errorMessage }, this.readonly ? (readonlyValue && h("b", { class: "mg-c-input__readonly-value" }, readonlyValue)) : (h("mg-popover", { identifier: this.popoverId, placement: "bottom-start", display: this.popoverDisplay, "arrow-hide": true, style: {
+                '--mg-c-input-list-width': ((_f = this.input) === null || _f === void 0 ? void 0 : _f.offsetWidth) > 0 ? `${this.input.offsetWidth}px` : undefined,
             }, "data-fallback-placement": "bottom-end", "onDisplay-change": this.handlePopoverDisplay }, h("div", { class: "mg-c-input__input-group-container" }, h("mg-icon", { icon: "magnifying-glass" }), h("input", { type: "text", role: "combobox", class: "mg-c-input__box mg-c-input__box--width", value: this.filter, id: this.identifier, name: this.name, placeholder: this.placeholder, title: this.placeholder, disabled: this.disabled, required: this.required, autocomplete: "off", "aria-autocomplete": "list", "aria-expanded": this.popoverDisplay.toString(), "aria-controls": listId, "aria-invalid": (this.invalid === true).toString(), "aria-activedescendant": formatID(activeDescendant), onInput: this.handleFilterInput, onBlur: this.handleFilterBlur, onFocus: this.handleFilterFocus, onKeyDown: this.handleFilterKeydown, ref: (el) => {
                 if (el !== null)
                     this.input = el;
@@ -756,7 +769,7 @@ export class MgInputCombobox {
                         'mg-c-input__input-list-item': true,
                         'mg-c-input__input-list-item--focus-visible': JSON.stringify((_a = this.option) === null || _a === void 0 ? void 0 : _a.value) === JSON.stringify(option.value),
                         'mg-c-input__input-list-item--selected': this.isCurrentOption(option),
-                    }, key: option.title, id: formatID(option.value), "aria-selected": this.isCurrentOption(option).toString(), onClick: this.handleOptionClick }, option.title, this.isCurrentOption(option) && h("mg-icon", { icon: "check" })));
+                    }, key: option.title, id: formatID(option.value), "aria-selected": this.isCurrentOption(option).toString(), "data-value": toString(option.value), onClick: this.handleOptionClick }, option.title, this.isCurrentOption(option) && h("mg-icon", { icon: "check" })));
             })),
             this.isLoading && h("mg-loader", { key: "loader", message: this.messages.input.combobox.search, class: { 'mg-u-visually-hidden': Boolean(this.page.next) } }),
             this.page.next && (h("mg-button", { key: "load-more", variant: "flat", class: "mg-c-input__load-more", tabIndex: -1, disabled: this.isLoading, "full-width": true, "disable-on-click": true, onClick: this.handleLoadMoreButton, "aria-controls": listId, ref: (el) => {
@@ -1384,7 +1397,7 @@ export class MgInputCombobox {
             },
             "setError": {
                 "complexType": {
-                    "signature": "(valid: MgInputCombobox[\"valid\"], errorMessage: string) => Promise<void>",
+                    "signature": "(valid: MgInputCombobox[\"valid\"], errorMessage?: string, errorMessageLock?: boolean) => Promise<void>",
                     "parameters": [{
                             "name": "valid",
                             "type": "boolean",
@@ -1393,6 +1406,10 @@ export class MgInputCombobox {
                             "name": "errorMessage",
                             "type": "string",
                             "docs": "- the error message to display"
+                        }, {
+                            "name": "errorMessageLock",
+                            "type": "boolean",
+                            "docs": "- lock the error message and validity state"
                         }],
                     "references": {
                         "Promise": {
@@ -1414,6 +1431,9 @@ export class MgInputCombobox {
                         }, {
                             "name": "param",
                             "text": "errorMessage - the error message to display"
+                        }, {
+                            "name": "param",
+                            "text": "errorMessageLock - lock the error message and validity state"
                         }]
                 }
             },

package/dist/collection/components/molecules/inputs/mg-input-date/mg-input-date.js

@@ -8,6 +8,7 @@ export class MgInputDate {
     constructor() {
         // hasDisplayedError (triggered by blur event)
         this.hasDisplayedError = false;
+        this.customErrorMessage = { lock: false };
         /**
          * Input name
          * If not set the value equals the identifier
@@ -120,39 +121,41 @@ export class MgInputDate {
          */
         this.getInputError = () => {
             var _a;
+            let error;
             // bad input or pattern
             if (this.input.validity.badInput || (this.value && !this.isValidPattern(this.value))) {
-                return 'badInput';
+                error = 'badInput';
             }
             // required
-            if (this.input.validity.valueMissing) {
-                return 'required';
+            else if (this.input.validity.valueMissing) {
+                error = 'required';
             }
             // min & max
-            if ((this.input.validity.rangeUnderflow || this.input.validity.rangeOverflow) && ((_a = this.min) === null || _a === void 0 ? void 0 : _a.length) > 0 && this.max !== DEFAULT_MAX_DATE) {
-                return 'minMax';
+            else if ((this.input.validity.rangeUnderflow || this.input.validity.rangeOverflow) && ((_a = this.min) === null || _a === void 0 ? void 0 : _a.length) > 0 && this.max !== DEFAULT_MAX_DATE) {
+                error = 'minMax';
             }
             // min
-            if (this.input.validity.rangeUnderflow) {
-                return 'min';
+            else if (this.input.validity.rangeUnderflow) {
+                error = 'min';
             }
             // max
-            if (this.input.validity.rangeOverflow) {
-                return 'max';
+            else if (this.input.validity.rangeOverflow) {
+                error = 'max';
             }
-            return null;
+            return error;
         };
         /**
          * Check input errors
-         * @param errorMessage - errorMessage override
+         * @param fromSetErrorContext - context come from `setError` method
          */
-        this.setErrorMessage = (errorMessage) => {
+        this.setErrorMessage = (fromSetErrorContext = false) => {
             // Set error message
             this.errorMessage = undefined;
             if (!this.valid) {
                 const inputError = this.getInputError();
-                if (errorMessage !== undefined) {
-                    this.errorMessage = errorMessage;
+                // Does have a new custom error message OR does have a custom error message locked
+                if (fromSetErrorContext || (this.customErrorMessage.lock && this.customErrorMessage.message !== undefined)) {
+                    this.errorMessage = this.customErrorMessage.message;
                 }
                 // required
                 else if (inputError === 'required') {
@@ -264,17 +267,22 @@ export class MgInputDate {
      * When used to set validity to `false`, you should use this method again to reset the validity to `true`.
      * @param valid - value indicating the validity
      * @param errorMessage - the error message to display
+     * @param errorMessageLock - lock the error message and validity state
      */
-    async setError(valid, errorMessage) {
+    async setError(valid, errorMessage, errorMessageLock = false) {
         if (typeof valid !== 'boolean') {
             throw new Error('<mg-input-date> method "setError()" param "valid" must be a boolean.');
         }
-        else if (!isValidString(errorMessage)) {
+        else if (errorMessage !== undefined && !isValidString(errorMessage)) {
             throw new Error('<mg-input-date> method "setError()" param "errorMessage" must be a string.');
         }
         else {
+            this.customErrorMessage = {
+                lock: valid ? false : errorMessageLock,
+                message: valid ? undefined : errorMessage,
+            };
             this.setValidity(valid);
-            this.setErrorMessage(valid ? undefined : errorMessage);
+            this.setErrorMessage(true);
             this.hasDisplayedError = this.invalid;
         }
     }
@@ -292,6 +300,8 @@ export class MgInputDate {
             // - Keep everything in sync both inside and outside the component
             return new Promise(resolve => {
                 requestAnimationFrame(() => {
+                    // unlock validity check by reseting customErrorMessage
+                    this.customErrorMessage = { lock: false };
                     this.checkValidity();
                     this.errorMessage = undefined;
                     this.hasDisplayedError = false;
@@ -305,11 +315,13 @@ export class MgInputDate {
      * @param newValue - valid new value
      */
     setValidity(newValue) {
-        const oldValidValue = this.valid;
-        this.valid = newValue;
+        const oldValue = this.valid;
+        if (!this.customErrorMessage.lock || (this.customErrorMessage.message !== undefined && !newValue)) {
+            this.valid = newValue;
+        }
         this.invalid = !this.valid;
         // We need to send valid event even if it is the same value
-        if (this.handlerInProgress === undefined || (this.handlerInProgress === 'blur' && this.valid !== oldValidValue))
+        if (this.handlerInProgress === undefined || (this.handlerInProgress === 'blur' && this.valid !== oldValue))
             this.inputValid.emit(this.valid);
     }
     /*************
@@ -345,7 +357,7 @@ export class MgInputDate {
      * @returns HTML Element
      */
     render() {
-        return (h("mg-input", { key: '31c223be6c69af4ffa89f74102c41a27040ad031', label: this.label, identifier: this.identifier, class: this.classCollection.join(), labelOnTop: this.labelOnTop, labelHide: this.labelHide, required: this.required, tooltip: this.tooltip, tooltipPosition: this.readonly && this.value === null ? 'label' : this.tooltipPosition, helpText: this.formatHelpText(this.helpText), errorMessage: this.errorMessage }, this.readonly ? (this.value && h("b", { class: "mg-c-input__readonly-value" }, localeDate(this.value, this.locale))) : (h("input", { type: "date", class: "mg-c-input__box", min: this.min, max: this.max, value: this.value, id: this.identifier, name: this.name, disabled: this.disabled, required: this.required, "aria-invalid": (this.invalid === true).toString(), onInput: this.handleInput, onBlur: this.handleBlur, onKeyDown: this.handleKeyDown, ref: (el) => {
+        return (h("mg-input", { key: '1428f0f9f11d829ec8d3ed507c8690d63839ff17', label: this.label, identifier: this.identifier, class: this.classCollection.join(), labelOnTop: this.labelOnTop, labelHide: this.labelHide, required: this.required, tooltip: this.tooltip, tooltipPosition: this.readonly && this.value === null ? 'label' : this.tooltipPosition, helpText: this.formatHelpText(this.helpText), errorMessage: this.errorMessage }, this.readonly ? (this.value && h("b", { class: "mg-c-input__readonly-value" }, localeDate(this.value, this.locale))) : (h("input", { type: "date", class: "mg-c-input__box", min: this.min, max: this.max, value: this.value, id: this.identifier, name: this.name, disabled: this.disabled, required: this.required, "aria-invalid": (this.invalid === true).toString(), onInput: this.handleInput, onBlur: this.handleBlur, onKeyDown: this.handleKeyDown, ref: (el) => {
                 if (el !== null)
                     this.input = el;
             } }))));
@@ -771,7 +783,7 @@ export class MgInputDate {
             },
             "setError": {
                 "complexType": {
-                    "signature": "(valid: MgInputDate[\"valid\"], errorMessage: string) => Promise<void>",
+                    "signature": "(valid: MgInputDate[\"valid\"], errorMessage?: string, errorMessageLock?: boolean) => Promise<void>",
                     "parameters": [{
                             "name": "valid",
                             "type": "boolean",
@@ -780,6 +792,10 @@ export class MgInputDate {
                             "name": "errorMessage",
                             "type": "string",
                             "docs": "- the error message to display"
+                        }, {
+                            "name": "errorMessageLock",
+                            "type": "boolean",
+                            "docs": "- lock the error message and validity state"
                         }],
                     "references": {
                         "Promise": {
@@ -801,6 +817,9 @@ export class MgInputDate {
                         }, {
                             "name": "param",
                             "text": "errorMessage - the error message to display"
+                        }, {
+                            "name": "param",
+                            "text": "errorMessageLock - lock the error message and validity state"
                         }]
                 }
             },