From 67632cac4c1535b70e9498d0a7e8a2c869f6804d Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:49:45 +0300 Subject: [PATCH 01/10] fix(components/tabs): update tab #759 --- .../tabs-example-closable.component.html | 4 +++- .../tabs-example-closable.component.ts | 1 + .../components/tabs/components/tab.component.ts | 11 +++++------ .../src/lib/components/tabs/tabs.component.ts | 2 ++ .../src/lib/components/tabs/tabs.service.ts | 16 +++++++++++++++- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.html b/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.html index 82bf5e3e9c..8ba43c5a9e 100644 --- a/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.html +++ b/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.html @@ -1,5 +1,5 @@
- +
+ +
activeTabIndex: [{{ activeTabIndex }}]
diff --git a/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.ts b/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.ts index 1297b713f8..35a63b2199 100644 --- a/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.ts +++ b/apps/doc/src/app/components/tabs/examples/tabs-example-closable/tabs-example-closable.component.ts @@ -8,6 +8,7 @@ import { PrizmTabItem } from '@prizm-ui/components'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class TabsExampleClosableComponent { + activeTabIndex = 0; public tabs: PrizmTabItem[] = [ { title: 'Вкладка 1', diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index e1c2969f56..35de5cab21 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -4,7 +4,6 @@ import { ElementRef, EventEmitter, HostBinding, - HostListener, Input, OnDestroy, OnInit, @@ -14,10 +13,10 @@ import { import { PrizmTabType } from '../tabs.interface'; import { PrizmTabsService } from '../tabs.service'; import { PolymorphContent } from '../../../directives'; -import { combineLatest, fromEvent, Observable, of, switchMap, timeout } from 'rxjs'; -import { PrizmDestroyService, PrizmLetContextService } from '@prizm-ui/helpers'; +import { combineLatest, fromEvent, merge, Observable, of, switchMap, timeout } from 'rxjs'; +import { moveInEventLoopIteration, PrizmDestroyService, PrizmLetContextService } from '@prizm-ui/helpers'; import { PrizmTabContext, PrizmTabMenuContext } from '../tabs.model'; -import { filter, first, map, takeUntil, tap } from 'rxjs/operators'; +import { filter, first, map, startWith, takeUntil, tap } from 'rxjs/operators'; import { PrizmAbstractTestId } from '../../../abstract/interactive'; @Component({ @@ -72,7 +71,7 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On tap(tab => { if (tab === this) this.tabsService.removeTab(tab); }), - takeUntil(this.destroy) + timeout(25) ) .subscribe(); } @@ -86,7 +85,7 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On } public ngOnInit(): void { - this.tabsService.tabs$ + merge(this.tabsService.removed$$.pipe(moveInEventLoopIteration(1), startWith(void 0))) .pipe( filter(() => this.isMainProjectedTab()), tap(() => { diff --git a/libs/components/src/lib/components/tabs/tabs.component.ts b/libs/components/src/lib/components/tabs/tabs.component.ts index becf1c0e4a..ae0f7c7299 100644 --- a/libs/components/src/lib/components/tabs/tabs.component.ts +++ b/libs/components/src/lib/components/tabs/tabs.component.ts @@ -78,6 +78,7 @@ export class PrizmTabsComponent extends PrizmAbstractTestId implements OnInit, O constructor( private readonly cdRef: ChangeDetectorRef, + private readonly elRef: ElementRef, private readonly destroy$: PrizmDestroyService, private readonly tabsService: PrizmTabsService ) { @@ -85,6 +86,7 @@ export class PrizmTabsComponent extends PrizmAbstractTestId implements OnInit, O } public ngOnInit(): void { + this.tabsService.initObservingTabsParent(this.elRef.nativeElement); this.mutationObserver = new MutationObserver(() => this.mutationDetector$.next()); this.resizeObserver = new ResizeObserver(() => this.mutationDetector$.next()); this.mutationObserver.observe(this.tabsContainer.nativeElement, { diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 2c75686cb7..5d4f743b63 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -2,16 +2,22 @@ import { Injectable, OnDestroy } from '@angular/core'; import { BehaviorSubject, combineLatest, concat, Observable, of, Subject } from 'rxjs'; import { distinctUntilChanged, filter, map, startWith, take, takeUntil, tap } from 'rxjs/operators'; import { PrizmTabComponent } from './components/tab.component'; -import { filterTruthy, PrizmDestroyService } from '@prizm-ui/helpers'; +import { filterTruthy, PrizmDestroyService, prizmFromMutationObserver$ } from '@prizm-ui/helpers'; import { PrizmTabCanOpen } from './tabs.model'; @Injectable() export class PrizmTabsService implements OnDestroy { readonly tabs = new Map(); readonly changes$$ = new Subject>(); + readonly removed$$ = new Subject(); + private changeParent$_!: Observable; + get changeParent$() { + return this.changeParent$_; + } readonly closeTab$$ = new Subject>(); private readonly activeTabIdx$$ = new BehaviorSubject(0); readonly activeTabIdx$ = this.activeTabIdx$$.pipe(distinctUntilChanged()); + get activeTabIdx() { return this.activeTabIdx$$.value; } @@ -22,6 +28,11 @@ export class PrizmTabsService implements OnDestroy { constructor(private readonly destroy: PrizmDestroyService) {} + public initObservingTabsParent(el: HTMLElement) { + this.changeParent$_ = prizmFromMutationObserver$(el, { + childList: true, + }); + } public isActiveTab(tab: PrizmTabComponent): Observable { return combineLatest([this.activeTabIdx$$, this.tabs$]).pipe( map(([activeTabIdx]) => { @@ -47,8 +58,11 @@ export class PrizmTabsService implements OnDestroy { const idx = this.findTabIdx(tab); this.tabs.delete(idx); const currentTabIdx = this.findTabIdx(tab); + + this.removed$$.next(tab); if (currentTabIdx === -1) return; this.correctActiveTabIdx(currentTabIdx); + this.changes$$.next(this.tabs); } From 0deab6984a3715d7a455aa1b344f5fc91a8acb93 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:50:21 +0300 Subject: [PATCH 02/10] fix(components/tabs): update tab #759 --- .../components/src/lib/components/tabs/tabs.component.ts | 1 - libs/components/src/lib/components/tabs/tabs.service.ts | 9 --------- 2 files changed, 10 deletions(-) diff --git a/libs/components/src/lib/components/tabs/tabs.component.ts b/libs/components/src/lib/components/tabs/tabs.component.ts index ae0f7c7299..73963b9b59 100644 --- a/libs/components/src/lib/components/tabs/tabs.component.ts +++ b/libs/components/src/lib/components/tabs/tabs.component.ts @@ -86,7 +86,6 @@ export class PrizmTabsComponent extends PrizmAbstractTestId implements OnInit, O } public ngOnInit(): void { - this.tabsService.initObservingTabsParent(this.elRef.nativeElement); this.mutationObserver = new MutationObserver(() => this.mutationDetector$.next()); this.resizeObserver = new ResizeObserver(() => this.mutationDetector$.next()); this.mutationObserver.observe(this.tabsContainer.nativeElement, { diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 5d4f743b63..dbaab72d60 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -10,10 +10,6 @@ export class PrizmTabsService implements OnDestroy { readonly tabs = new Map(); readonly changes$$ = new Subject>(); readonly removed$$ = new Subject(); - private changeParent$_!: Observable; - get changeParent$() { - return this.changeParent$_; - } readonly closeTab$$ = new Subject>(); private readonly activeTabIdx$$ = new BehaviorSubject(0); readonly activeTabIdx$ = this.activeTabIdx$$.pipe(distinctUntilChanged()); @@ -28,11 +24,6 @@ export class PrizmTabsService implements OnDestroy { constructor(private readonly destroy: PrizmDestroyService) {} - public initObservingTabsParent(el: HTMLElement) { - this.changeParent$_ = prizmFromMutationObserver$(el, { - childList: true, - }); - } public isActiveTab(tab: PrizmTabComponent): Observable { return combineLatest([this.activeTabIdx$$, this.tabs$]).pipe( map(([activeTabIdx]) => { From dd3ca21eea304e5f5431dc197d835d7e1f49d248 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:57:32 +0300 Subject: [PATCH 03/10] fix(components/tabs): update tab #759 --- .../lib/components/tabs/components/tab.component.ts | 13 +++++++++++-- .../src/lib/components/tabs/tabs.component.ts | 1 + .../src/lib/components/tabs/tabs.service.ts | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index 35de5cab21..39d669ca4d 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -84,9 +84,11 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On return !this.isFromMenuTab(); } - public ngOnInit(): void { - merge(this.tabsService.removed$$.pipe(moveInEventLoopIteration(1), startWith(void 0))) + private initUpdateIndexOnDomUpdateListener(): void { + this.tabsService.removed$$ .pipe( + switchMap(() => this.tabsService.changeParent$), + startWith(void 0), filter(() => this.isMainProjectedTab()), tap(() => { const currentDomIdx = Array.from(this.el.nativeElement.parentElement?.children ?? []).indexOf( @@ -97,7 +99,9 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On takeUntil(this.destroy) ) .subscribe(); + } + private initClickListenerToSelectTab(): void { fromEvent(this.el.nativeElement, 'click') .pipe( switchMap(() => { @@ -109,6 +113,11 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On .subscribe(); } + public ngOnInit(): void { + this.initUpdateIndexOnDomUpdateListener(); + this.initClickListenerToSelectTab(); + } + public selectTab$(): Observable { return this.tab$.pipe( first(), diff --git a/libs/components/src/lib/components/tabs/tabs.component.ts b/libs/components/src/lib/components/tabs/tabs.component.ts index 73963b9b59..3e4e8f25d4 100644 --- a/libs/components/src/lib/components/tabs/tabs.component.ts +++ b/libs/components/src/lib/components/tabs/tabs.component.ts @@ -86,6 +86,7 @@ export class PrizmTabsComponent extends PrizmAbstractTestId implements OnInit, O } public ngOnInit(): void { + this.tabsService.initObservingTabsParent(this.tabsContainer.nativeElement); this.mutationObserver = new MutationObserver(() => this.mutationDetector$.next()); this.resizeObserver = new ResizeObserver(() => this.mutationDetector$.next()); this.mutationObserver.observe(this.tabsContainer.nativeElement, { diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index dbaab72d60..c1f36997ff 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -10,6 +10,10 @@ export class PrizmTabsService implements OnDestroy { readonly tabs = new Map(); readonly changes$$ = new Subject>(); readonly removed$$ = new Subject(); + private changeParent$_!: Observable; + get changeParent$() { + return this.changeParent$_; + } readonly closeTab$$ = new Subject>(); private readonly activeTabIdx$$ = new BehaviorSubject(0); readonly activeTabIdx$ = this.activeTabIdx$$.pipe(distinctUntilChanged()); @@ -24,6 +28,12 @@ export class PrizmTabsService implements OnDestroy { constructor(private readonly destroy: PrizmDestroyService) {} + public initObservingTabsParent(el: HTMLElement) { + this.changeParent$_ = prizmFromMutationObserver$(el, { + subtree: true, + childList: true, + }); + } public isActiveTab(tab: PrizmTabComponent): Observable { return combineLatest([this.activeTabIdx$$, this.tabs$]).pipe( map(([activeTabIdx]) => { From 1c2d3acc41d9f100250a6a8aebac12509823bbe3 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 12 Oct 2023 13:11:54 +0300 Subject: [PATCH 04/10] fix(components/tabs): move tab index --- .../components/tabs/components/tab.component.ts | 15 +++++++++++++-- .../src/lib/components/tabs/tabs.service.ts | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index 39d669ca4d..7636227aad 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -14,7 +14,12 @@ import { PrizmTabType } from '../tabs.interface'; import { PrizmTabsService } from '../tabs.service'; import { PolymorphContent } from '../../../directives'; import { combineLatest, fromEvent, merge, Observable, of, switchMap, timeout } from 'rxjs'; -import { moveInEventLoopIteration, PrizmDestroyService, PrizmLetContextService } from '@prizm-ui/helpers'; +import { + Compare, + moveInEventLoopIteration, + PrizmDestroyService, + PrizmLetContextService, +} from '@prizm-ui/helpers'; import { PrizmTabContext, PrizmTabMenuContext } from '../tabs.model'; import { filter, first, map, startWith, takeUntil, tap } from 'rxjs/operators'; import { PrizmAbstractTestId } from '../../../abstract/interactive'; @@ -44,6 +49,7 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On } @Output() public closeTab = new EventEmitter(); + private currentDomIdx!: number; override readonly testId_ = 'ui_tab'; readonly isActiveTab$: Observable = combineLatest([ this.idx$, @@ -94,7 +100,12 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On const currentDomIdx = Array.from(this.el.nativeElement.parentElement?.children ?? []).indexOf( this.el.nativeElement ); - this.tabsService.updateTab(this, currentDomIdx); + if (Compare.isNotNullish(this.currentDomIdx) && currentDomIdx !== this.currentDomIdx) { + this.tabsService.moveTab(this.currentDomIdx, currentDomIdx, this); + } else { + this.tabsService.updateTab(this, currentDomIdx); + } + this.currentDomIdx = currentDomIdx; }), takeUntil(this.destroy) ) diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index c1f36997ff..5a6c03b3ac 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -48,6 +48,12 @@ export class PrizmTabsService implements OnDestroy { return this.tabs.get(idx) as PrizmTabComponent; } + public moveTab(idx: number, toIndex: number, tab: PrizmTabComponent): void { + if (tab !== this.getTabByIdx(idx)) return; + this.tabs.delete(idx); + this.updateTab(tab, toIndex); + } + public updateTab(tab: PrizmTabComponent, idx?: number): void { const tabIdx = typeof idx !== 'number' ? this.tabs.size : idx; if (this.tabs.get(tabIdx) === tab) return; From f5b9ee87dbdac01cadefe799341d3ca8aaa6435a Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:57:15 +0300 Subject: [PATCH 05/10] fix(components/tabs): fix last tab idx --- .../src/lib/components/tabs/tabs.service.ts | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 5a6c03b3ac..a985f52382 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -52,6 +52,9 @@ export class PrizmTabsService implements OnDestroy { if (tab !== this.getTabByIdx(idx)) return; this.tabs.delete(idx); this.updateTab(tab, toIndex); + if (this.activeTabIdx$$.value === idx) { + this.activeTabIdx$$.next(toIndex); + } } public updateTab(tab: PrizmTabComponent, idx?: number): void { @@ -64,21 +67,19 @@ export class PrizmTabsService implements OnDestroy { public removeTab(tab: PrizmTabComponent): void { const idx = this.findTabIdx(tab); this.tabs.delete(idx); - const currentTabIdx = this.findTabIdx(tab); - this.removed$$.next(tab); - if (currentTabIdx === -1) return; - this.correctActiveTabIdx(currentTabIdx); - - this.changes$$.next(this.tabs); + const newIdx = this.correctActiveTabIdx(idx); + if (idx !== newIdx) this.changes$$.next(this.tabs); } - private correctActiveTabIdx(idx: number = this.activeTabIdx$$.value): void { - const isActiveTab = this.activeTabIdx$$.value === idx; - let newIdx = idx - 1; - if (isActiveTab) newIdx++; - if (!this.tabs.size) newIdx = 0; - if (isActiveTab && this.activeTabIdx$$.value !== newIdx) this.activeTabIdx$$.next(newIdx); + private correctActiveTabIdx(idx: number = this.activeTabIdx$$.value): number { + if (this.tabs.has(this.activeTabIdx$$.value)) return this.activeTabIdx$$.value; + if (!this.tabs.size) return -1; + const indexes = Array.from(this.tabs.keys()).sort(); + const nextIdx = indexes.find(i => i > idx); + const newIdx = nextIdx ?? (Array.from(this.tabs.keys()).sort().pop() as number); + this.activeTabIdx$$.next(newIdx); + return newIdx; } public findTabIdx(tab: PrizmTabComponent): number { return Array.from(this.tabs.entries()).find(([, t]) => t === tab)?.[0] ?? -1; From 06681b06eaf1735b182cb5ea41e21ef2f0c9e144 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:58:05 +0300 Subject: [PATCH 06/10] fix(components/tabs): fix last tab idx --- libs/components/src/lib/components/tabs/tabs.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index a985f52382..9606f4d75a 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -77,7 +77,7 @@ export class PrizmTabsService implements OnDestroy { if (!this.tabs.size) return -1; const indexes = Array.from(this.tabs.keys()).sort(); const nextIdx = indexes.find(i => i > idx); - const newIdx = nextIdx ?? (Array.from(this.tabs.keys()).sort().pop() as number); + const newIdx = nextIdx ?? (indexes.pop() as number); this.activeTabIdx$$.next(newIdx); return newIdx; } From 92a3c288c43dc7b671d4cb33e6fe2d4f6b2f35f0 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:24:36 +0300 Subject: [PATCH 07/10] fix(components/tabs): fix first tab selecting --- .../src/lib/components/tabs/components/tab.component.ts | 2 +- libs/components/src/lib/components/tabs/tabs.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index 7636227aad..2d6c4ba981 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -83,7 +83,7 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On } private isFromMenuTab(): boolean { - return !!this.inMenuContextService?.context?.inMenuIdx; + return Compare.isNotNullish(this.inMenuContextService?.context?.inMenuIdx); } private isMainProjectedTab(): boolean { diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 9606f4d75a..51bf283e3a 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -86,6 +86,7 @@ export class PrizmTabsService implements OnDestroy { } public selectTab(tab: PrizmTabComponent): void { const idx = this.findTabIdx(tab); + if (idx === -1) { return; } @@ -96,7 +97,6 @@ export class PrizmTabsService implements OnDestroy { if (idx === this.activeTabIdx) { return; } - (typeof this.canOpenTab === 'function' ? this.canOpenTab(tab) : of(true)) .pipe( take(1), From 0c84908ae05e478728d985dce18ae9f7a41f9647 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:14:29 +0300 Subject: [PATCH 08/10] feat(doc/tabs): api page update --- apps/doc/src/app/components/tabs/tabs-example.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/tabs/tabs-example.component.html b/apps/doc/src/app/components/tabs/tabs-example.component.html index f7492f5335..4d4a3ff501 100644 --- a/apps/doc/src/app/components/tabs/tabs-example.component.html +++ b/apps/doc/src/app/components/tabs/tabs-example.component.html @@ -37,11 +37,11 @@
Date: Fri, 13 Oct 2023 15:38:48 +0300 Subject: [PATCH 09/10] Update libs/components/src/lib/components/tabs/components/tab.component.ts Co-authored-by: ickisIckis --- .../src/lib/components/tabs/components/tab.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index 2d6c4ba981..fc171904ee 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -13,7 +13,7 @@ import { import { PrizmTabType } from '../tabs.interface'; import { PrizmTabsService } from '../tabs.service'; import { PolymorphContent } from '../../../directives'; -import { combineLatest, fromEvent, merge, Observable, of, switchMap, timeout } from 'rxjs'; +import { combineLatest, fromEvent, Observable, of, switchMap, timeout } from 'rxjs'; import { Compare, moveInEventLoopIteration, From f95545f9e0120f20f0e1d31a3036b31f8c3ee35e Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:38:56 +0300 Subject: [PATCH 10/10] Update libs/components/src/lib/components/tabs/components/tab.component.ts Co-authored-by: ickisIckis --- .../src/lib/components/tabs/components/tab.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index fc171904ee..5d322c60a2 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -16,7 +16,6 @@ import { PolymorphContent } from '../../../directives'; import { combineLatest, fromEvent, Observable, of, switchMap, timeout } from 'rxjs'; import { Compare, - moveInEventLoopIteration, PrizmDestroyService, PrizmLetContextService, } from '@prizm-ui/helpers';