Fixed #10922 - Calendar manual input doesn't work

primefaces · Dec 6, 2021 · 16369cf · 16369cf
1 parent ad49bf0
commit 16369cf
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/app/components/calendar/calendar.ts b/src/app/components/calendar/calendar.ts
@@ -460,6 +460,8 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
 
     _view: string = 'date';
 
+    preventFocus: boolean;
+
     @Input() get view(): string {
         return this._view;
     };
@@ -1844,11 +1846,13 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
         if (cell) {
             cell.tabIndex = '0';
 
-            if (!this.navigationState || !this.navigationState.button) {
+            if (!this.preventFocus && (!this.navigationState || !this.navigationState.button)) {
                 setTimeout(() => {
                     cell.focus();
                 }, 1);
             }
+
+            this.preventFocus = false;
         }
     }
 
@@ -2280,6 +2284,11 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
     showOverlay() {
         if (!this.overlayVisible) {
             this.updateUI();
+
+            if (!this.touchUI) {
+                this.preventFocus = true;
+            }
+
             this.overlayVisible = true;
         }
     }