Browse Source

feat(lib): implement take until destroyed

pull/6498/head
KenTandrian 3 weeks ago
parent
commit
8bbf323767
  1. 24
      libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts

24
libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts

@ -9,14 +9,16 @@ import {
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
DoCheck, DoCheck,
DestroyRef,
ElementRef, ElementRef,
Input, Input,
inject,
OnChanges, OnChanges,
OnDestroy,
OnInit, OnInit,
SimpleChanges, SimpleChanges,
ViewChild ViewChild
} from '@angular/core'; } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { import {
FormControl, FormControl,
FormsModule, FormsModule,
@ -35,13 +37,12 @@ import {
import { MatInput, MatInputModule } from '@angular/material/input'; import { MatInput, MatInputModule } from '@angular/material/input';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { isString } from 'lodash'; import { isString } from 'lodash';
import { Subject, tap } from 'rxjs'; import { tap } from 'rxjs';
import { import {
debounceTime, debounceTime,
distinctUntilChanged, distinctUntilChanged,
filter, filter,
switchMap, switchMap
takeUntil
} from 'rxjs/operators'; } from 'rxjs/operators';
import { translate } from '../i18n'; import { translate } from '../i18n';
@ -77,7 +78,7 @@ import { AbstractMatFormField } from '../shared/abstract-mat-form-field';
}) })
export class GfSymbolAutocompleteComponent export class GfSymbolAutocompleteComponent
extends AbstractMatFormField<LookupItem> extends AbstractMatFormField<LookupItem>
implements DoCheck, OnChanges, OnDestroy, OnInit implements DoCheck, OnChanges, OnInit
{ {
@Input() public defaultLookupItems: LookupItem[] = []; @Input() public defaultLookupItems: LookupItem[] = [];
@Input() public isLoading = false; @Input() public isLoading = false;
@ -91,7 +92,7 @@ export class GfSymbolAutocompleteComponent
public control = new FormControl(); public control = new FormControl();
public lookupItems: (LookupItem & { assetSubClassString: string })[] = []; public lookupItems: (LookupItem & { assetSubClassString: string })[] = [];
private unsubscribeSubject = new Subject<void>(); private readonly destroyRef = inject(DestroyRef);
public constructor( public constructor(
public readonly _elementRef: ElementRef, public readonly _elementRef: ElementRef,
@ -120,7 +121,7 @@ export class GfSymbolAutocompleteComponent
} }
this.control.valueChanges this.control.valueChanges
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(() => { .subscribe(() => {
if (super.value) { if (super.value) {
super.value.dataSource = null; super.value.dataSource = null;
@ -145,7 +146,7 @@ export class GfSymbolAutocompleteComponent
}), }),
debounceTime(400), debounceTime(400),
distinctUntilChanged(), distinctUntilChanged(),
takeUntil(this.unsubscribeSubject), takeUntilDestroyed(this.destroyRef),
switchMap((query: string) => { switchMap((query: string) => {
return this.dataService.fetchSymbols({ return this.dataService.fetchSymbols({
query, query,
@ -202,13 +203,6 @@ export class GfSymbolAutocompleteComponent
} as LookupItem; } as LookupItem;
} }
public ngOnDestroy() {
super.ngOnDestroy();
this.unsubscribeSubject.next();
this.unsubscribeSubject.complete();
}
private showDefaultOptions() { private showDefaultOptions() {
this.lookupItems = this.defaultLookupItems.map((lookupItem) => { this.lookupItems = this.defaultLookupItems.map((lookupItem) => {
return { return {

Loading…
Cancel
Save