yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Niels Lyngsø
2024-03-27 09:15:14 +01:00
parent 8a1b6693cb
commit d52321b241
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/packages/core/validation/mixins/form-control.mixin.ts
View File

@@ -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<HTMLInputElement, 'validity' | 'checkValidity' | 'validationMessage'> &
type UmbNativeFormControlElement = Pick<HTMLInputElement, 'validity' | 'checkValidity' | 'validationMessage'> &
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<ValueType, DefaultValue
protected _internals: ElementInternals;
protected _runValidators(): void;
protected addValidator: (flagKey: FlagTypes, getMessageMethod: () => 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();

3
src/Umbraco.Web.UI.Client/src/packages/core/validation/validators/form-control.validator.ts
View File

@@ -11,7 +11,6 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal
#control: UmbFormControlMixinInterface<unknown, unknown>;
readonly controllerAlias: UmbControllerAlias;
#validationMode = false;
#isValid = false;
constructor(host: UmbControllerHost, formControl: UmbFormControlMixinInterface<unknown, unknown>) {
@@ -41,7 +40,6 @@ export class UmbFormControlValidator extends UmbControllerBase implements UmbVal
#setValid = this.#setIsValid.bind(this, true);
validate(): Promise<boolean> {
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.
}