fix(module:radio, tab): Fixed memory leak problem. (NG-ZORRO#3354)

* fix(module:radio, tab): Fixed memory leak problem. * fix(module:radio, tab): Fixed memory leak problem. (fix tslint)
hsuanxyz · Apr 25, 2019 · 268e11c · 268e11c
1 parent ba7c4a7
commit 268e11c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/components/radio/nz-radio.component.ts b/components/radio/nz-radio.component.ts
@@ -17,6 +17,7 @@ import {
   HostListener,
   Input,
   OnChanges,
+  OnDestroy,
   Renderer2,
   SimpleChanges,
   ViewChild,
@@ -46,7 +47,7 @@ import { InputBoolean } from 'ng-zorro-antd/core';
     '[class.ant-radio-wrapper-disabled]': 'nzDisabled'
   }
 })
-export class NzRadioComponent implements ControlValueAccessor, AfterViewInit, OnChanges {
+export class NzRadioComponent implements ControlValueAccessor, AfterViewInit, OnChanges, OnDestroy {
   select$ = new Subject<NzRadioComponent>();
   touched$ = new Subject<void>();
   checked = false;
@@ -140,4 +141,8 @@ export class NzRadioComponent implements ControlValueAccessor, AfterViewInit, On
       this.updateAutoFocus();
     }
   }
+
+  ngOnDestroy(): void {
+    this.focusMonitor.stopMonitoring(this.elementRef);
+  }
 }
diff --git a/components/tabs/nz-tabs-nav.component.ts b/components/tabs/nz-tabs-nav.component.ts
@@ -19,6 +19,7 @@ import {
   EventEmitter,
   Input,
   NgZone,
+  OnDestroy,
   Optional,
   Output,
   QueryList,
@@ -47,7 +48,7 @@ export type ScrollDirection = 'after' | 'before';
   encapsulation: ViewEncapsulation.None,
   templateUrl: './nz-tabs-nav.component.html'
 })
-export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit {
+export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit, OnDestroy {
   private _tabPositionMode: NzTabPositionMode = 'horizontal';
   private _scrollDistance = 0;
   private _selectedIndex = 0;
@@ -174,6 +175,12 @@ export class NzTabsNavComponent implements AfterContentChecked, AfterContentInit
     });
   }
 
+  ngOnDestroy(): void {
+    if (this.realignInkBar) {
+      this.realignInkBar.unsubscribe();
+    }
+  }
+
   updateTabScrollPosition(): void {
     const scrollDistance = this.scrollDistance;
     if (this.nzPositionMode === 'horizontal') {