fix(popup): Fixed focus events on popup (#243)

edcarroll · Aug 11, 2017 · abeffa7 · abeffa7
1 parent 0720b9f
commit abeffa7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/modules/popup/classes/popup-controller.ts b/src/modules/popup/classes/popup-controller.ts
@@ -165,9 +165,13 @@ export abstract class SuiPopupController implements IPopup, OnDestroy {
         }
     }
 
-    @HostListener("focusout")
-    private onFocusOut():void {
-        if (this.popup.config.trigger === PopupTrigger.Focus) {
+    @HostListener("focusout", ["$event"])
+    private onFocusOut(e:any):void {
+        console.log(e.relatedTarget);
+        if (!this._element.nativeElement.contains(e.relatedTarget) &&
+            !this.popup.elementRef.nativeElement.contains(e.relatedTarget) &&
+            this.popup.config.trigger === PopupTrigger.Focus) {
+
             this.close();
         }
     }

diff --git a/src/modules/popup/components/popup.ts b/src/modules/popup/components/popup.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, ViewContainerRef, ElementRef, EventEmitter, HostListener } from "@angular/core";
+import { Component, ViewChild, ViewContainerRef, ElementRef, EventEmitter, HostListener, HostBinding } from "@angular/core";
 import { PositioningService, IDynamicClasses } from "../../../misc/util";
 import { TransitionController, TransitionDirection, Transition } from "../../transition";
 import { IPopup } from "../classes/popup-controller";
@@ -122,13 +122,18 @@ export class SuiPopup implements IPopup {
     @ViewChild("templateSibling", { read: ViewContainerRef })
     public templateSibling:ViewContainerRef;
 
+    @HostBinding("attr.tabindex")
+    private _tabindex:number;
+
     constructor(public elementRef:ElementRef) {
         this.transitionController = new TransitionController(false);
 
         this._isOpen = false;
 
         this.onOpen = new EventEmitter<void>();
         this.onClose = new EventEmitter<void>();
+
+        this._tabindex = 0;
     }
 
     public open():void {
@@ -187,13 +192,6 @@ export class SuiPopup implements IPopup {
         }
     }
 
-    @HostListener("mousedown", ["$event"])
-    public onMouseDown(e:MouseEvent):void {
-        if (!this.elementRef.nativeElement.contains(e.target)) {
-            e.preventDefault();
-        }
-    }
-
     @HostListener("click", ["$event"])
     public onClick(event:MouseEvent):void {
         // Makes sense here, as the popup shouldn't be attached to any DOM element.