fix: (Core) Add setTimeout for IE11 on InitialFocusDirective (#4623)

SAP · Feb 11, 2021 · d7aecee · d7aecee
1 parent 5c766fd
commit d7aecee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/libs/core/src/lib/utils/directives/initial-focus/initial-focus.directive.spec.ts b/libs/core/src/lib/utils/directives/initial-focus/initial-focus.directive.spec.ts
@@ -1,6 +1,6 @@
 import { InitialFocusDirective } from './initial-focus.directive';
 import { Component, ElementRef, ViewChild } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 
 @Component({
     template: `
@@ -33,14 +33,16 @@ describe('InitialFocusDirective', () => {
         component = fixture.componentInstance;
     });
 
-    it('should focus element', () => {
+    it('should focus element', fakeAsync(() => {
         fixture.detectChanges();
+        tick(10);
         expect(document.activeElement).toBe(component.elementToFocus.nativeElement);
-    });
+    }));
 
-    it('should focus nested element', () => {
+    it('should focus nested element', fakeAsync(() => {
         component.rootElementTabIndex = -1;
         fixture.detectChanges();
+        tick(10);
         expect(document.activeElement).toBe(component.nestedElementToFocus.nativeElement);
-    });
+    }));
 });
diff --git a/libs/core/src/lib/utils/directives/initial-focus/initial-focus.directive.ts b/libs/core/src/lib/utils/directives/initial-focus/initial-focus.directive.ts
@@ -18,7 +18,7 @@ export class InitialFocusDirective implements AfterViewInit {
     /** @hidden */
     ngAfterViewInit(): void {
         if (this.enabled) {
-            this._focusFirstTabbableElement();
+            setTimeout(() => this._focusFirstTabbableElement())
         }
     }