refactor: fix possible memory leak

taiga-family · Mar 7, 2024 · fa85894 · fa85894
1 parent 4556b42
commit fa85894
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/projects/addon-mobile/directives/ripple/ripple.directive.ts b/projects/addon-mobile/directives/ripple/ripple.directive.ts
@@ -38,7 +38,9 @@ export class TuiRippleDirective {
         const touchEnd$ = tuiTypedFromEvent(this.el, 'touchend');
         const touchMove$ = tuiTypedFromEvent(this.el, 'touchmove');
 
-        this.end$.subscribe(element => this.renderer.removeChild(this.el, element));
+        this.end$
+            .pipe(takeUntil(this.destroy$))
+            .subscribe(element => this.renderer.removeChild(this.el, element));
 
         this.start$
             .pipe(

diff --git a/projects/core/components/link/link.component.ts b/projects/core/components/link/link.component.ts
@@ -19,7 +19,7 @@ import {
 import {MODE_PROVIDER} from '@taiga-ui/core/providers';
 import {TUI_MODE} from '@taiga-ui/core/tokens';
 import type {TuiHorizontalDirection} from '@taiga-ui/core/types';
-import {map, merge} from 'rxjs';
+import {map, merge, takeUntil} from 'rxjs';
 
 // @bad TODO: Think about extending Interactive
 @Component({
@@ -70,9 +70,11 @@ export class TuiLinkComponent implements TuiFocusableElementAccessor {
     protected readonly mode$ = inject(TUI_MODE);
 
     constructor() {
-        inject(TuiFocusVisibleService).subscribe(visible => {
-            this.focusVisible = visible;
-        });
+        inject(TuiFocusVisibleService)
+            .pipe(takeUntil(inject(TuiDestroyService, {self: true})))
+            .subscribe(visible => {
+                this.focusVisible = visible;
+            });
     }
 
     public get nativeFocusableElement(): TuiNativeFocusableElement {

diff --git a/projects/kit/components/action/action.component.ts b/projects/kit/components/action/action.component.ts
@@ -15,6 +15,7 @@ import {
     TuiFocusVisibleService,
     tuiIsNativeFocused,
 } from '@taiga-ui/cdk';
+import {takeUntil} from 'rxjs';
 
 @Component({
     selector: 'button[tuiAction], a[tuiAction]',
@@ -41,9 +42,9 @@ export class TuiActionComponent extends AbstractTuiInteractive {
     constructor() {
         super();
 
-        inject(TuiFocusVisibleService).subscribe(visible => {
-            this.updateFocusVisible(visible);
-        });
+        inject(TuiFocusVisibleService)
+            .pipe(takeUntil(inject(TuiDestroyService, {self: true})))
+            .subscribe(visible => this.updateFocusVisible(visible));
     }
 
     public get nativeFocusableElement(): TuiNativeFocusableElement | null {

diff --git a/projects/kit/components/stepper/step/step.component.ts b/projects/kit/components/stepper/step/step.component.ts
@@ -11,7 +11,7 @@ import {RouterLinkActive} from '@angular/router';
 import {TuiDestroyService, TuiFocusVisibleService} from '@taiga-ui/cdk';
 import {TUI_COMMON_ICONS} from '@taiga-ui/core';
 import type {Observable} from 'rxjs';
-import {EMPTY, filter} from 'rxjs';
+import {EMPTY, filter, takeUntil} from 'rxjs';
 
 import {TuiStepperComponent} from '../stepper.component';
 
@@ -46,13 +46,16 @@ export class TuiStepComponent {
     protected readonly icons = inject(TUI_COMMON_ICONS);
 
     constructor() {
-        this.routerLinkActive$.pipe(filter(Boolean)).subscribe(() => {
-            this.activate();
-        });
+        this.routerLinkActive$
+            .pipe(filter(Boolean))
+            .pipe(takeUntil(inject(TuiDestroyService, {self: true})))
+            .subscribe(() => this.activate());
 
-        this.focusVisible$.subscribe(visible => {
-            this.focusVisible = visible;
-        });
+        this.focusVisible$
+            .pipe(takeUntil(inject(TuiDestroyService, {self: true})))
+            .subscribe(visible => {
+                this.focusVisible = visible;
+            });
     }
 
     @HostBinding('class._active')