fix popper delays

MrFrankel · Jun 3, 2018 · bda1c7f · bda1c7f
1 parent f7f5a23
commit bda1c7f
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 231 deletions.
diff --git a/example/app/app.component.html b/example/app/app.component.html
@@ -3,8 +3,8 @@
     <div class="example">
       <div #popper1
            [popper]="popper1Content"
-           [popperTarget]="popper1"
-           [popperHideOnScroll]="true"
+           [popperTrigger]="'click'"
+           [popperShowOnStart]="true"
            [popperPlacement]="example1select" class="rel" id="example10reference1">
         <p class="bold">Hey!</p>
         <p class="thin">Choose where to put your popper!</p>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-popper",
-  "version": "2.8.2",
+  "version": "3.0.1",
   "description": "ngx-popper is an angular wrapper for popper.js",
   "directories": {
     "test": "test"

diff --git a/src/popper-directive.ts b/src/popper-directive.ts
@@ -151,16 +151,16 @@ export class PopperController implements OnInit, OnChanges {
         this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchstart', this.toggle.bind(this)));
         break;
       case Triggers.HOVER:
-        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'mouseenter', this.scheduledShow.bind(this)));
-        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchend', this.scheduledHide.bind(this, this.hideTimeout)));
-        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchcancel', this.scheduledHide.bind(this, this.hideTimeout)));
-        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'mouseleave', this.scheduledHide.bind(this, this.hideTimeout)));
+        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'mouseenter', this.scheduledShow.bind(this, this.showDelay)));
+        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchend', this.scheduledHide.bind(this, null, this.hideTimeout)));
+        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchcancel', this.scheduledHide.bind(this, null, this.hideTimeout)));
+        this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'mouseleave', this.scheduledHide.bind(this, null, this.hideTimeout)));
         break;
     }
     if(this.showTrigger !== Triggers.HOVER && this.hideOnMouseLeave){
-      this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchend', this.scheduledHide.bind(this, this.hideTimeout)));
-      this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchcancel', this.scheduledHide.bind(this, this.hideTimeout)));
-      this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'mouseleave', this.scheduledHide.bind(this, this.hideTimeout)));
+      this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchend', this.scheduledHide.bind(this, null, this.hideTimeout)));
+      this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'touchcancel', this.scheduledHide.bind(this, null, this.hideTimeout)));
+      this.eventListeners.push(this.renderer.listen(this.elementRef.nativeElement, 'mouseleave', this.scheduledHide.bind(this, null, this.hideTimeout)));
     }
   }
 
@@ -289,7 +289,7 @@ export class PopperController implements OnInit, OnChanges {
     }, delay)
   }
 
-  scheduledHide($event: any = null, delay: number = 0) {
+  scheduledHide($event: any = null, delay: number = this.hideTimeout) {
     if(this.disabled){
       return;
     }