fix: fixed datetime picker global listener (#793)

* fixed the datetime picker global listener * also fix datepicker
SAP · May 10, 2019 · eeab56c · eeab56c
1 parent a33dfc2
commit eeab56c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/library/src/lib/date-picker/date-picker.component.ts b/library/src/lib/date-picker/date-picker.component.ts
@@ -131,10 +131,9 @@ export class DatePickerComponent implements OnInit, OnDestroy, ControlValueAcces
         this.closeCalendar();
     }
 
-    @HostListener('document:click', ['$event.path'])
-    public onGlobalClick(targetElementPath: Array<any>) {
-        const elementRefInPath = targetElementPath.find(e => e === this.eRef.nativeElement);
-        if (!elementRefInPath) {
+    @HostListener('document:click', ['$event'])
+    public onGlobalClick(event: MouseEvent) {
+        if (!this.eRef.nativeElement.contains(event.target)) {
             this.closeCalendar();
         }
     }

diff --git a/library/src/lib/datetime-picker/datetime-picker.component.ts b/library/src/lib/datetime-picker/datetime-picker.component.ts
@@ -225,10 +225,9 @@ export class DatetimePickerComponent implements OnInit, OnDestroy, ControlValueA
     }
 
     /** @hidden */
-    @HostListener('document:click', ['$event.path'])
-    public onGlobalClick(targetElementPath: Array<any>): void {
-        const elementRefInPath = targetElementPath.find(e => e === this.elRef.nativeElement);
-        if (!elementRefInPath) {
+    @HostListener('document:click', ['$event'])
+    public onGlobalClick(event: MouseEvent): void {
+        if (!this.elRef.nativeElement.contains(event.target)) {
             this.closePopover();
         }
     }