fix(module:tooltip): fix hiding when hover popover (NG-ZORRO#4418)

* fix(module:tooltip): fix hiding when hover popover * fix(module:tooltip): fix accessing destroyed view close NG-ZORRO#4417
Ricbet · Apr 9, 2020 · 71cffa5 · 71cffa5
1 parent a945068
commit 71cffa5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/components/tooltip/base/nz-tooltip-base.directive.ts b/components/tooltip/base/nz-tooltip-base.directive.ts
@@ -201,7 +201,6 @@ export abstract class NzTooltipBaseDirective implements OnChanges, OnInit, OnDes
     this.$destroy.complete();
 
     // Clear toggling timer. Issue #3875 #4317 #4386
-    this.hide();
     this.clearTogglingTimer();
     this.removeTriggerListeners();
 
@@ -342,9 +341,9 @@ export abstract class NzTooltipBaseDirective implements OnChanges, OnInit, OnDes
   }
 
   private delayEnterLeave(isOrigin: boolean, isEnter: boolean, delay: number = -1): void {
-    this.clearTogglingTimer();
-
-    if (delay > 0) {
+    if (this.delayTimer) {
+      this.clearTogglingTimer();
+    } else if (delay > 0) {
       this.delayTimer = setTimeout(() => {
         this.delayTimer = undefined;
         isEnter ? this.show() : this.hide();