fix(core) Remove shadow dom example | Add composedPath method check (#…

…3511)
SAP · Sep 30, 2020 · 5cd5ba7 · 5cd5ba7
1 parent bae50da
commit 5cd5ba7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/...p/core/component-docs/popover/examples/popover-dialog/popover-dialog-example.component.ts b/...p/core/component-docs/popover/examples/popover-dialog/popover-dialog-example.component.ts
@@ -1,5 +1,5 @@
 import { Component, TemplateRef } from '@angular/core';
-import { DialogConfig, DialogService } from '@fundamental-ngx/core';
+import { DialogService } from '@fundamental-ngx/core';
 
 @Component({
     selector: 'fd-popover-dialog-example',

diff --git a/...re/component-docs/popover/examples/popover-dropdown/popover-dropdown-example.component.ts b/...re/component-docs/popover/examples/popover-dropdown/popover-dropdown-example.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { RtlService } from '@fundamental-ngx/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 const bottomStart = 'bottom-start';

diff --git a/.../src/app/core/component-docs/popover/examples/popover-simple/popover-example.component.ts b/.../src/app/core/component-docs/popover/examples/popover-simple/popover-example.component.ts
@@ -8,7 +8,7 @@ import { map } from 'rxjs/operators';
     selector: 'fd-popover-example',
     templateUrl: './popover-example.component.html',
     styleUrls: ['popover-example.component.scss'],
-    encapsulation: ViewEncapsulation.ShadowDom
+    encapsulation: ViewEncapsulation.None
 })
 export class PopoverExampleComponent {
     leftPlacement$: Observable<Placement>;
@@ -24,10 +24,4 @@ export class PopoverExampleComponent {
         { text: 'Option 2', url: '#' },
         { text: 'Option 3', url: '#' }
     ];
-
-    list2 = [
-        { text: 'Option 3', url: '#' },
-        { text: 'Option 4', url: '#' },
-        { text: 'Option 5', url: '#' }
-    ];
 }
diff --git a/libs/core/src/lib/popover/popover-directive/popover.directive.ts b/libs/core/src/lib/popover/popover-directive/popover.directive.ts
@@ -416,13 +416,19 @@ export class PopoverDirective implements OnInit, OnDestroy, OnChanges {
     /** @hidden */
     private _containerContainsTarget(event: Event): boolean {
         const containerElement = this.containerRef.location.nativeElement;
-        return containerElement.contains(event.composedPath()[0]);
+        return containerElement.contains(this._getEventTarget(event));
     }
 
     /** @hidden */
     private _triggerContainsTarget(event: Event): boolean {
         const triggerElement = this.triggerRef.nativeElement;
-        return triggerElement.contains(event.composedPath()[0]);
+        return triggerElement.contains(this._getEventTarget(event));
+    }
+
+    private _getEventTarget(event: Event): EventTarget {
+        return event.composedPath
+            ? event.composedPath()[0]
+            : event.target;
     }
 
     /** @hidden */