Move external validation from EditText to TextInput

elsci-io · Apr 26, 2024 · 1893ae6 · 1893ae6
1 parent 5ca9dd1
commit 1893ae6
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/src/EditText/EditText.js b/src/EditText/EditText.js
@@ -14,9 +14,6 @@ export default class EditText extends HTMLElement {
         onChangeValue: []
     }
 
-    /** @type {InputValidator[]} */
-    #externalValidators = [];
-
     connectedCallback() {
         this.innerHTML = this.#htmlTemplate();
         this.#children = {
@@ -49,7 +46,7 @@ export default class EditText extends HTMLElement {
 
     /** @param {InputValidator} validator */
     addExternalValidator(validator) {
-        this.#externalValidators.push(validator);
+        this.#children.input.addExternalValidator(validator);
     }
 
     get value() {
@@ -102,7 +99,7 @@ export default class EditText extends HTMLElement {
     }
 
     #onEnter() {
-        if (this.#validateWithExternalValidators()) {
+        if (this.checkValidity()) {
             this.#children.popup.close();
             this.#updateDisplayTextAndNotifyIfChanged();
         }
@@ -113,23 +110,12 @@ export default class EditText extends HTMLElement {
         event.stopPropagation();
         if (event.target !== this.#children.popup)
             return;
-        if (this.#validateWithExternalValidators()) {
+        if (this.checkValidity()) {
             this.#children.popup.close();
             this.#updateDisplayTextAndNotifyIfChanged();
         }
     }
 
-    #validateWithExternalValidators() {
-        for (const validator of this.#externalValidators) {
-            const result = validator.validate(this, this.value);
-            if (!result.isValid) {
-                this.#children.input.errorMessage = result.errorMessage;
-                return false;
-            }
-        }
-        return true;
-    }
-
     #updateDisplayTextAndNotifyIfChanged() {
         if (!this.#isValid){
             this.#children.input.value = this.#getValueAttr();