Refactor #10922

primefaces · Dec 7, 2021 · 022e574 · 022e574
1 parent 302cb38
commit 022e574
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/app/components/calendar/calendar.ts b/src/app/components/calendar/calendar.ts
@@ -345,7 +345,9 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
                 this.isMonthNavigate = false;
             }
             else {
-                this.initFocusableCell();
+                if (!this.focus) {
+                    this.initFocusableCell();
+                }
             }
         }
     };
@@ -2339,6 +2341,7 @@ export class Calendar implements OnInit,OnDestroy,ControlValueAccessor {
                     this.overlay = event.element;
                     this.overlay.setAttribute(this.attributeSelector, '');
                     this.appendOverlay();
+                    this.updateFocus();
                     if (this.autoZIndex) {
                         if (this.touchUI)
                             ZIndexUtils.set('modal', this.overlay, this.baseZIndex || this.config.zIndex.modal);