@umbraco-cms/backoffice 14.0.0-rc2 → 14.0.0-rc3

package/dist-cms/packages/core/validation/context/validation.context.js

@@ -1,46 +1,36 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _UmbValidationContext_instances, _UmbValidationContext_validators, _UmbValidationContext_validationMode, _UmbValidationContext_isValid, _UmbValidationContext_destroyValidators;
 import { UmbValidationMessagesManager } from './validation-messages.manager.js';
 import { UMB_VALIDATION_CONTEXT } from './validation.context-token.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 export class UmbValidationContext extends UmbContextBase {
+    #validators;
+    #validationMode;
+    #isValid;
     constructor(host) {
         super(host, UMB_VALIDATION_CONTEXT);
-        _UmbValidationContext_instances.add(this);
-        _UmbValidationContext_validators.set(this, []);
-        _UmbValidationContext_validationMode.set(this, false);
-        _UmbValidationContext_isValid.set(this, false);
+        this.#validators = [];
+        this.#validationMode = false;
+        this.#isValid = false;
         this.messages = new UmbValidationMessagesManager();
     }
     get isValid() {
-        return __classPrivateFieldGet(this, _UmbValidationContext_isValid, "f");
+        return this.#isValid;
     }
     addValidator(validator) {
-        if (__classPrivateFieldGet(this, _UmbValidationContext_validators, "f").includes(validator))
+        if (this.#validators.includes(validator))
             return;
-        __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").push(validator);
+        this.#validators.push(validator);
         //validator.addEventListener('change', this.#onValidatorChange);
-        if (__classPrivateFieldGet(this, _UmbValidationContext_validationMode, "f")) {
+        if (this.#validationMode) {
             this.validate();
         }
     }
     removeValidator(validator) {
-        const index = __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").indexOf(validator);
+        const index = this.#validators.indexOf(validator);
         if (index !== -1) {
             // Remove the validator:
-            __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").splice(index, 1);
+            this.#validators.splice(index, 1);
             // If we are in validation mode then we should re-validate to focus next invalid element:
-            if (__classPrivateFieldGet(this, _UmbValidationContext_validationMode, "f")) {
+            if (this.#validationMode) {
                 this.validate();
             }
         }
@@ -69,12 +59,12 @@ export class UmbValidationContext extends UmbContextBase {
      */
     async validate() {
         // TODO: clear server messages here?, well maybe only if we know we will get new server messages? Do the server messages hook into the system like another validator?
-        __classPrivateFieldSet(this, _UmbValidationContext_validationMode, true, "f");
-        const resultsStatus = await Promise.all(__classPrivateFieldGet(this, _UmbValidationContext_validators, "f").map((v) => v.validate())).then(() => Promise.resolve(true), () => Promise.reject(false));
+        this.#validationMode = true;
+        const resultsStatus = await Promise.all(this.#validators.map((v) => v.validate())).then(() => Promise.resolve(true), () => Promise.reject(false));
         // If we have any messages then we are not valid, otherwise lets check the validation results: [NL]
         // This enables us to keep client validations though UI is not present anymore — because the client validations got defined as messages. [NL]
         const isValid = this.messages.getHasAnyMessages() ? false : resultsStatus;
-        __classPrivateFieldSet(this, _UmbValidationContext_isValid, isValid, "f");
+        this.#isValid = isValid;
         if (isValid === false) {
             // Focus first invalid element:
             this.focusFirstInvalidElement();
@@ -83,26 +73,26 @@ export class UmbValidationContext extends UmbContextBase {
         return Promise.resolve();
     }
     focusFirstInvalidElement() {
-        const firstInvalid = __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").find((v) => !v.isValid);
+        const firstInvalid = this.#validators.find((v) => !v.isValid);
         if (firstInvalid) {
             firstInvalid.focusFirstInvalidElement();
         }
     }
     reset() {
-        __classPrivateFieldSet(this, _UmbValidationContext_validationMode, false, "f");
-        __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").forEach((v) => v.reset());
+        this.#validationMode = false;
+        this.#validators.forEach((v) => v.reset());
+    }
+    #destroyValidators() {
+        if (this.#validators === undefined || this.#validators.length === 0)
+            return;
+        this.#validators.forEach((validator) => {
+            validator.destroy();
+            //validator.removeEventListener('change', this.#runValidate);
+        });
+        this.#validators = [];
     }
     destroy() {
-        __classPrivateFieldGet(this, _UmbValidationContext_instances, "m", _UmbValidationContext_destroyValidators).call(this);
+        this.#destroyValidators();
         super.destroy();
     }
 }
-_UmbValidationContext_validators = new WeakMap(), _UmbValidationContext_validationMode = new WeakMap(), _UmbValidationContext_isValid = new WeakMap(), _UmbValidationContext_instances = new WeakSet(), _UmbValidationContext_destroyValidators = function _UmbValidationContext_destroyValidators() {
-    if (__classPrivateFieldGet(this, _UmbValidationContext_validators, "f") === undefined || __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").length === 0)
-        return;
-    __classPrivateFieldGet(this, _UmbValidationContext_validators, "f").forEach((validator) => {
-        validator.destroy();
-        //validator.removeEventListener('change', this.#runValidate);
-    });
-    __classPrivateFieldSet(this, _UmbValidationContext_validators, [], "f");
-};

package/dist-cms/packages/core/validation/controllers/bind-validation-message-to-form-control.controller.js

@@ -1,34 +1,28 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _UmbBindValidationMessageToFormControl_instances, _UmbBindValidationMessageToFormControl_context, _UmbBindValidationMessageToFormControl_control, _UmbBindValidationMessageToFormControl_controlValidator, _UmbBindValidationMessageToFormControl_messages, _UmbBindValidationMessageToFormControl_isValid, _UmbBindValidationMessageToFormControl_value, _UmbBindValidationMessageToFormControl_setup, _UmbBindValidationMessageToFormControl_demolish;
 import { UMB_VALIDATION_CONTEXT } from '../context/validation.context-token.js';
 import { jsonStringComparison } from '../../../../libs/observable-api/index.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 const ctrlSymbol = Symbol();
 const observeSymbol = Symbol();
 export class UmbBindValidationMessageToFormControl extends UmbControllerBase {
+    #context;
+    #control;
+    #controlValidator;
+    #messages = [];
+    #isValid = false;
+    #value;
     set value(value) {
-        if (__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_isValid, "f")) {
+        if (this.#isValid) {
             // If valid lets just parse it on [NL]
-            __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_value, value, "f");
+            this.#value = value;
         }
         else {
             // If not valid lets see if we should remove server validation [NL]
-            if (!jsonStringComparison(__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_value, "f"), value)) {
-                __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_value, value, "f");
+            if (!jsonStringComparison(this.#value, value)) {
+                this.#value = value;
                 // Only remove server validations from validation context [NL]
-                __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_messages, "f").forEach((message) => {
+                this.#messages.forEach((message) => {
                     if (message.type === 'server') {
-                        __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_context, "f")?.messages.removeMessageByKey(message.key);
+                        this.#context?.messages.removeMessageByKey(message.key);
                     }
                 });
             }
@@ -36,68 +30,62 @@ export class UmbBindValidationMessageToFormControl extends UmbControllerBase {
     }
     constructor(host, formControl, dataPath) {
         super(host, ctrlSymbol);
-        _UmbBindValidationMessageToFormControl_instances.add(this);
-        _UmbBindValidationMessageToFormControl_context.set(this, void 0);
-        _UmbBindValidationMessageToFormControl_control.set(this, void 0);
-        _UmbBindValidationMessageToFormControl_controlValidator.set(this, void 0);
-        _UmbBindValidationMessageToFormControl_messages.set(this, []);
-        _UmbBindValidationMessageToFormControl_isValid.set(this, false);
-        _UmbBindValidationMessageToFormControl_value.set(this, void 0);
-        __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_control, formControl, "f");
+        this.#control = formControl;
         this.consumeContext(UMB_VALIDATION_CONTEXT, (context) => {
-            __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_context, context, "f");
+            this.#context = context;
             this.observe(context.messages.messagesOfTypeAndPath('server', dataPath), (messages) => {
-                __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_messages, messages, "f");
-                __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_isValid, messages.length === 0, "f");
-                if (!__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_isValid, "f")) {
-                    __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_instances, "m", _UmbBindValidationMessageToFormControl_setup).call(this);
+                this.#messages = messages;
+                this.#isValid = messages.length === 0;
+                if (!this.#isValid) {
+                    this.#setup();
                 }
                 else {
-                    __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_instances, "m", _UmbBindValidationMessageToFormControl_demolish).call(this);
+                    this.#demolish();
                 }
             }, observeSymbol);
         });
     }
+    #setup() {
+        if (!this.#controlValidator) {
+            this.#controlValidator = this.#control.addValidator('customError', () => this.#messages.map((x) => x.message).join(', '), () => !this.#isValid);
+            //this.#control.addEventListener('change', this.#onControlChange);
+            // Legacy event, used by some controls:
+            //this.#control.addEventListener('property-value-change', this.#onControlChange);
+        }
+        this.#control.checkValidity();
+    }
+    #demolish() {
+        if (!this.#control || !this.#controlValidator)
+            return;
+        this.#control.removeValidator(this.#controlValidator);
+        //this.#control.removeEventListener('change', this.#onControlChange);
+        // Legacy event, used by some controls:
+        //this.#control.removeEventListener('property-value-change', this.#onControlChange);
+        this.#controlValidator = undefined;
+        this.#control.checkValidity();
+    }
     validate() {
         //this.#isValid = this.#control.checkValidity();
-        return __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_isValid, "f") ? Promise.resolve() : Promise.reject();
+        return this.#isValid ? Promise.resolve() : Promise.reject();
     }
     /**
      * Resets the validation state of this validator.
      */
     reset() {
-        __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_isValid, false, "f");
-        __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f").pristine = true; // Make sure the control goes back into not-validation-mode/'untouched'/pristine state.
+        this.#isValid = false;
+        this.#control.pristine = true; // Make sure the control goes back into not-validation-mode/'untouched'/pristine state.
     }
     /*getMessages(): string[] {
         return [this.#control.validationMessage];
     }*/
     focusFirstInvalidElement() {
-        __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f").focusFirstInvalidElement();
+        this.#control.focusFirstInvalidElement();
     }
     destroy() {
-        __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_context, undefined, "f");
+        this.#context = undefined;
         // Reset control setup.
-        __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_instances, "m", _UmbBindValidationMessageToFormControl_demolish).call(this);
-        __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_control, undefined, "f");
+        this.#demolish();
+        this.#control = undefined;
         super.destroy();
     }
 }
-_UmbBindValidationMessageToFormControl_context = new WeakMap(), _UmbBindValidationMessageToFormControl_control = new WeakMap(), _UmbBindValidationMessageToFormControl_controlValidator = new WeakMap(), _UmbBindValidationMessageToFormControl_messages = new WeakMap(), _UmbBindValidationMessageToFormControl_isValid = new WeakMap(), _UmbBindValidationMessageToFormControl_value = new WeakMap(), _UmbBindValidationMessageToFormControl_instances = new WeakSet(), _UmbBindValidationMessageToFormControl_setup = function _UmbBindValidationMessageToFormControl_setup() {
-    if (!__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_controlValidator, "f")) {
-        __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_controlValidator, __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f").addValidator('customError', () => __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_messages, "f").map((x) => x.message).join(', '), () => !__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_isValid, "f")), "f");
-        //this.#control.addEventListener('change', this.#onControlChange);
-        // Legacy event, used by some controls:
-        //this.#control.addEventListener('property-value-change', this.#onControlChange);
-    }
-    __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f").checkValidity();
-}, _UmbBindValidationMessageToFormControl_demolish = function _UmbBindValidationMessageToFormControl_demolish() {
-    if (!__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f") || !__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_controlValidator, "f"))
-        return;
-    __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f").removeValidator(__classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_controlValidator, "f"));
-    //this.#control.removeEventListener('change', this.#onControlChange);
-    // Legacy event, used by some controls:
-    //this.#control.removeEventListener('property-value-change', this.#onControlChange);
-    __classPrivateFieldSet(this, _UmbBindValidationMessageToFormControl_controlValidator, undefined, "f");
-    __classPrivateFieldGet(this, _UmbBindValidationMessageToFormControl_control, "f").checkValidity();
-};

package/dist-cms/packages/core/validation/controllers/form-control-validator.controller.js

@@ -1,103 +1,90 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbFormControlValidator_instances, _UmbFormControlValidator_dataPath, _UmbFormControlValidator_context, _UmbFormControlValidator_control, _UmbFormControlValidator_isValid, _UmbFormControlValidator_setIsValid, _UmbFormControlValidator_setInvalid, _UmbFormControlValidator_setValid;
 import { UMB_VALIDATION_CONTEXT } from '../context/validation.context-token.js';
 import { UmbValidationInvalidEvent } from '../events/validation-invalid.event.js';
 import { UmbValidationValidEvent } from '../events/validation-valid.event.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 export class UmbFormControlValidator extends UmbControllerBase {
+    // The path to the data that this validator is validating. Public so the ValidationContext can access it.
+    #dataPath;
+    #context;
+    #control;
+    #isValid = true;
     constructor(host, formControl, dataPath) {
         super(host);
-        _UmbFormControlValidator_instances.add(this);
-        // The path to the data that this validator is validating. Public so the ValidationContext can access it.
-        _UmbFormControlValidator_dataPath.set(this, void 0);
-        _UmbFormControlValidator_context.set(this, void 0);
-        _UmbFormControlValidator_control.set(this, void 0);
-        _UmbFormControlValidator_isValid.set(this, true);
-        _UmbFormControlValidator_setInvalid.set(this, __classPrivateFieldGet(this, _UmbFormControlValidator_instances, "m", _UmbFormControlValidator_setIsValid).bind(this, false));
-        _UmbFormControlValidator_setValid.set(this, __classPrivateFieldGet(this, _UmbFormControlValidator_instances, "m", _UmbFormControlValidator_setIsValid).bind(this, true));
-        __classPrivateFieldSet(this, _UmbFormControlValidator_dataPath, dataPath, "f");
+        this.#dataPath = dataPath;
         this.consumeContext(UMB_VALIDATION_CONTEXT, (context) => {
-            if (__classPrivateFieldGet(this, _UmbFormControlValidator_context, "f")) {
-                __classPrivateFieldGet(this, _UmbFormControlValidator_context, "f").removeValidator(this);
+            if (this.#context) {
+                this.#context.removeValidator(this);
             }
-            __classPrivateFieldSet(this, _UmbFormControlValidator_context, context, "f");
+            this.#context = context;
             context.addValidator(this);
             // If we have a message already, then un-pristine the control:
             if (dataPath && context.messages.getHasMessagesOfPathAndDescendant(dataPath)) {
                 formControl.pristine = false;
             }
         });
-        __classPrivateFieldSet(this, _UmbFormControlValidator_control, formControl, "f");
-        __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").addEventListener(UmbValidationInvalidEvent.TYPE, __classPrivateFieldGet(this, _UmbFormControlValidator_setInvalid, "f"));
-        __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").addEventListener(UmbValidationValidEvent.TYPE, __classPrivateFieldGet(this, _UmbFormControlValidator_setValid, "f"));
+        this.#control = formControl;
+        this.#control.addEventListener(UmbValidationInvalidEvent.TYPE, this.#setInvalid);
+        this.#control.addEventListener(UmbValidationValidEvent.TYPE, this.#setValid);
     }
     get isValid() {
-        return __classPrivateFieldGet(this, _UmbFormControlValidator_isValid, "f");
+        return this.#isValid;
     }
+    #setIsValid(newVal) {
+        if (this.#isValid === newVal)
+            return;
+        this.#isValid = newVal;
+        if (this.#dataPath) {
+            if (newVal) {
+                this.#context?.messages.removeMessagesByTypeAndPath('client', this.#dataPath);
+            }
+            else {
+                this.#context?.messages.addMessages('client', this.#dataPath, [this.#control.validationMessage]);
+            }
+        }
+        //this.dispatchEvent(new CustomEvent('change')); // To let the ValidationContext know that the validation state has changed.
+    }
+    #setInvalid = this.#setIsValid.bind(this, false);
+    #setValid = this.#setIsValid.bind(this, true);
     validate() {
-        __classPrivateFieldSet(this, _UmbFormControlValidator_isValid, __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").checkValidity(), "f");
-        return __classPrivateFieldGet(this, _UmbFormControlValidator_isValid, "f") ? Promise.resolve() : Promise.reject();
+        this.#isValid = this.#control.checkValidity();
+        return this.#isValid ? Promise.resolve() : Promise.reject();
     }
     /**
      * Resets the validation state of this validator.
      */
     reset() {
-        __classPrivateFieldSet(this, _UmbFormControlValidator_isValid, false, "f");
-        __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").pristine = true; // Make sure the control goes back into not-validation-mode/'untouched'/pristine state.
+        this.#isValid = false;
+        this.#control.pristine = true; // Make sure the control goes back into not-validation-mode/'untouched'/pristine state.
     }
     /*getMessages(): string[] {
         return [this.#control.validationMessage];
     }*/
     focusFirstInvalidElement() {
-        __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").focusFirstInvalidElement();
+        this.#control.focusFirstInvalidElement();
     }
     hostConnected() {
         super.hostConnected();
-        if (__classPrivateFieldGet(this, _UmbFormControlValidator_context, "f")) {
-            __classPrivateFieldGet(this, _UmbFormControlValidator_context, "f").addValidator(this);
+        if (this.#context) {
+            this.#context.addValidator(this);
         }
     }
     hostDisconnected() {
         super.hostDisconnected();
-        if (__classPrivateFieldGet(this, _UmbFormControlValidator_context, "f")) {
-            __classPrivateFieldGet(this, _UmbFormControlValidator_context, "f").removeValidator(this);
+        if (this.#context) {
+            this.#context.removeValidator(this);
             // Remove any messages that this validator has added:
-            if (__classPrivateFieldGet(this, _UmbFormControlValidator_dataPath, "f")) {
+            if (this.#dataPath) {
                 //this.#context.messages.removeMessagesByTypeAndPath('client', this.#dataPath);
             }
-            __classPrivateFieldSet(this, _UmbFormControlValidator_context, undefined, "f");
+            this.#context = undefined;
         }
     }
     destroy() {
-        if (__classPrivateFieldGet(this, _UmbFormControlValidator_control, "f")) {
-            __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").removeEventListener(UmbValidationInvalidEvent.TYPE, __classPrivateFieldGet(this, _UmbFormControlValidator_setInvalid, "f"));
-            __classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").removeEventListener(UmbValidationValidEvent.TYPE, __classPrivateFieldGet(this, _UmbFormControlValidator_setValid, "f"));
-            __classPrivateFieldSet(this, _UmbFormControlValidator_control, undefined, "f");
+        if (this.#control) {
+            this.#control.removeEventListener(UmbValidationInvalidEvent.TYPE, this.#setInvalid);
+            this.#control.removeEventListener(UmbValidationValidEvent.TYPE, this.#setValid);
+            this.#control = undefined;
         }
         super.destroy();
     }
 }
-_UmbFormControlValidator_dataPath = new WeakMap(), _UmbFormControlValidator_context = new WeakMap(), _UmbFormControlValidator_control = new WeakMap(), _UmbFormControlValidator_isValid = new WeakMap(), _UmbFormControlValidator_setInvalid = new WeakMap(), _UmbFormControlValidator_setValid = new WeakMap(), _UmbFormControlValidator_instances = new WeakSet(), _UmbFormControlValidator_setIsValid = function _UmbFormControlValidator_setIsValid(newVal) {
-    if (__classPrivateFieldGet(this, _UmbFormControlValidator_isValid, "f") === newVal)
-        return;
-    __classPrivateFieldSet(this, _UmbFormControlValidator_isValid, newVal, "f");
-    if (__classPrivateFieldGet(this, _UmbFormControlValidator_dataPath, "f")) {
-        if (newVal) {
-            __classPrivateFieldGet(this, _UmbFormControlValidator_context, "f")?.messages.removeMessagesByTypeAndPath('client', __classPrivateFieldGet(this, _UmbFormControlValidator_dataPath, "f"));
-        }
-        else {
-            __classPrivateFieldGet(this, _UmbFormControlValidator_context, "f")?.messages.addMessages('client', __classPrivateFieldGet(this, _UmbFormControlValidator_dataPath, "f"), [__classPrivateFieldGet(this, _UmbFormControlValidator_control, "f").validationMessage]);
-        }
-    }
-    //this.dispatchEvent(new CustomEvent('change')); // To let the ValidationContext know that the validation state has changed.
-};

package/dist-cms/packages/core/validation/events/validation-invalid.event.js

@@ -1,7 +1,7 @@
 import { UmbValidationEvent } from './validation.event.js';
 export class UmbValidationInvalidEvent extends UmbValidationEvent {
+    static { this.TYPE = 'invalid'; }
     constructor() {
         super(UmbValidationInvalidEvent.TYPE);
     }
 }
-UmbValidationInvalidEvent.TYPE = 'invalid';

package/dist-cms/packages/core/validation/events/validation-valid.event.js

@@ -1,7 +1,7 @@
 import { UmbValidationEvent } from './validation.event.js';
 export class UmbValidationValidEvent extends UmbValidationEvent {
+    static { this.TYPE = 'valid'; }
     constructor() {
         super(UmbValidationValidEvent.TYPE);
     }
 }
-UmbValidationValidEvent.TYPE = 'valid';