diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/mixins/form-control.mixin.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/mixins/form-control.mixin.ts index eab4ece35d..1bf535ff3b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/mixins/form-control.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/mixins/form-control.mixin.ts @@ -3,7 +3,7 @@ import { UmbValidationValidEvent } from '../events/validation-valid.event.js'; import { property, type LitElement } from '@umbraco-cms/backoffice/external/lit'; import type { HTMLElementConstructor } from '@umbraco-cms/backoffice/extension-api'; -type NativeFormControlElement = Pick & +type UmbNativeFormControlElement = Pick & HTMLElement; // Eventually use a specific interface or list multiple options like appending these types: ... | HTMLTextAreaElement | HTMLSelectElement /* FlagTypes type options originate from: @@ -56,7 +56,7 @@ export declare abstract class UmbFormControlMixinElement string, checkMethod: () => boolean) => void; - protected addFormControlElement(element: NativeFormControlElement): void; + protected addFormControlElement(element: UmbNativeFormControlElement): void; //static formAssociated: boolean; getFormElement(): HTMLElement | undefined; @@ -132,7 +132,7 @@ export const UmbFormControlMixin = < protected _internals: ElementInternals; #form: HTMLFormElement | null = null; #validators: Validator[] = []; - #formCtrlElements: NativeFormControlElement[] = []; + #formCtrlElements: UmbNativeFormControlElement[] = []; constructor(...args: any[]) { super(...args); @@ -217,9 +217,9 @@ export const UmbFormControlMixin = < /** * @method addFormControlElement * @description Important notice if adding a native form control then ensure that its value and thereby validity is updated when value is changed from the outside. - * @param element {NativeFormControlElement} - element to validate and include as part of this form association. + * @param element {UmbNativeFormControlElement} - element to validate and include as part of this form association. */ - protected addFormControlElement(element: NativeFormControlElement) { + protected addFormControlElement(element: UmbNativeFormControlElement) { this.#formCtrlElements.push(element); element.addEventListener(UmbValidationInvalidEvent.TYPE, () => { this._runValidators(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/validators/form-control.validator.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/validators/form-control.validator.ts index d7612596f4..b485b02857 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/validators/form-control.validator.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/validators/form-control.validator.ts @@ -11,7 +11,6 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal #control: UmbFormControlMixinInterface; readonly controllerAlias: UmbControllerAlias; - #validationMode = false; #isValid = false; constructor(host: UmbControllerHost, formControl: UmbFormControlMixinInterface) { @@ -41,7 +40,6 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal #setValid = this.#setIsValid.bind(this, true); validate(): Promise { - this.#validationMode = true; this.#isValid = this.#control.checkValidity(); return Promise.resolve(this.#isValid); } @@ -50,7 +48,6 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal * Resets the validation state of this validator. */ reset(): void { - this.#validationMode = false; this.#isValid = false; this.#control.pristine = true; // Make sure the control goes back into not-validation-mode/'untouched'/pristine state. }