@quadrel-enterprise-ui/framework 20.27.3-beta.234.1 → 20.27.3-beta.236.1

package/fesm2022/quadrel-enterprise-ui-framework.mjs

@@ -11767,41 +11767,47 @@ class QdInputComponent {
         if (input?.validity?.badInput)
             return;
         const value = event.target.value;
-        if (this.inputType === 'number' && value && !this.numberInputService.isValidNumber(value)) {
-            this.control?.setErrors({
-                ...this.control.errors,
-                invalidCharacters: this.numberInputService.invalidCharactersErrorKey
-            });
+        if (this.inputType === 'number' && value && !this.handleNumberInput(value))
             return;
-        }
-        if (this.inputType === 'number' && value) {
-            const valueWithoutGroups = value.split(this.numberInputService.groupSeparator).join('');
-            const filtered = this.numberInputService.filterValue(valueWithoutGroups);
-            const hasInvalidChars = filtered !== valueWithoutGroups;
-            if (hasInvalidChars) {
-                this._value = { ...this._value, value: filtered };
-                if (this.control) {
-                    this.control.setErrors({
-                        ...this.control.errors,
-                        invalidCharacters: this.numberInputService.invalidCharactersErrorKey
-                    });
-                }
-                this._isUserTyped = true;
-                this._onTouch();
-                this.emitValue();
-                return;
-            }
-            if (this.control?.errors?.['invalidCharacters']) {
-                const remainingErrors = Object.fromEntries(Object.entries(this.control.errors).filter(([key]) => key !== 'invalidCharacters'));
-                this.control.setErrors(Object.keys(remainingErrors).length ? remainingErrors : null);
-            }
-        }
         this._isUserTyped = true;
         this._value = { ...this._value, value };
+        this._displayValue = String(value ?? '');
         this.loadOptionsForTypedValue(value);
         this.emitValue();
         this._onTouch();
     }
+    handleNumberInput(value) {
+        if (!this.numberInputService.isValidNumber(value)) {
+            this.setInvalidCharactersError();
+            return false;
+        }
+        const valueWithoutGroups = value.split(this.numberInputService.groupSeparator).join('');
+        const filtered = this.numberInputService.filterValue(valueWithoutGroups);
+        if (filtered !== valueWithoutGroups) {
+            this._value = { ...this._value, value: filtered };
+            this.setInvalidCharactersError();
+            this._isUserTyped = true;
+            this._onTouch();
+            this.emitValue();
+            return false;
+        }
+        this.clearInvalidCharactersError();
+        return true;
+    }
+    setInvalidCharactersError() {
+        if (!this.control)
+            return;
+        this.control.setErrors({
+            ...this.control.errors,
+            invalidCharacters: this.numberInputService.invalidCharactersErrorKey
+        });
+    }
+    clearInvalidCharactersError() {
+        if (!this.control?.errors?.['invalidCharacters'])
+            return;
+        const remainingErrors = Object.fromEntries(Object.entries(this.control.errors).filter(([key]) => key !== 'invalidCharacters'));
+        this.control.setErrors(Object.keys(remainingErrors).length ? remainingErrors : null);
+    }
     handleOptionSelected(option) {
         this._value = { ...this._value, value: option.i18n };
         this.popover?.close();