fix(keyfilter): regex test with the correct value onKeyPress

primefaces · Jul 23, 2024 · b00a21b · b00a21b
1 parent 98f9682
commit b00a21b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/app/components/keyfilter/keyfilter.ts b/src/app/components/keyfilter/keyfilter.ts
@@ -113,7 +113,11 @@ export class KeyFilter implements Validator {
 
     lastValue: any;
 
-    constructor(@Inject(DOCUMENT) private document: Document, @Inject(PLATFORM_ID) private platformId: any, public el: ElementRef) {
+    constructor(
+        @Inject(DOCUMENT) private document: Document,
+        @Inject(PLATFORM_ID) private platformId: any,
+        public el: ElementRef
+    ) {
         if (isPlatformBrowser(this.platformId)) {
             this.isAndroid = DomHandler.isAndroid();
         } else {
@@ -227,8 +231,9 @@ export class KeyFilter implements Validator {
         }
 
         let valueCheck = this.el.nativeElement.value || '';
-
-        let val = valueCheck + cc;
+        const selectionStart = (<HTMLInputElement>e.currentTarget).selectionStart || 0;
+        const selectionEnd = (<HTMLInputElement>e.currentTarget).selectionEnd || 0;
+        let val = valueCheck.substring(0, selectionStart) + cc + valueCheck.substring(selectionEnd);
 
         ok = (<RegExp>this.regex).test(val);