Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit904792a

Browse files
committed
refactor(tooltip): for use with IntersectionService providedIn root
1 parentce32217 commit904792a

File tree

2 files changed

+36
-28
lines changed

2 files changed

+36
-28
lines changed
Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import{ChangeDetectorRef,ElementRef,Renderer2,ViewContainerRef}from'@angular/core';
2+
import{TestBed}from'@angular/core/testing';
23
import{IntersectionService,ListenersService}from'../services';
34
import{TooltipDirective}from'./tooltip.directive';
45

@@ -11,16 +12,22 @@ describe('TooltipDirective', () => {
1112

1213
it('should create an instance',()=>{
1314
constlistenersService=newListenersService(renderer);
14-
constintersectionService=newIntersectionService();
15-
constdirective=newTooltipDirective(
16-
document,
17-
renderer,
18-
hostElement,
19-
viewContainerRef,
20-
listenersService,
21-
changeDetectorRef,
22-
intersectionService
23-
);
24-
expect(directive).toBeTruthy();
15+
TestBed.configureTestingModule({
16+
providers:[IntersectionService]
17+
});
18+
constintersectionService=TestBed.inject(IntersectionService);
19+
TestBed.runInInjectionContext(()=>{
20+
constdirective=newTooltipDirective(
21+
document,
22+
renderer,
23+
hostElement,
24+
viewContainerRef,
25+
listenersService,
26+
changeDetectorRef,
27+
intersectionService
28+
);
29+
expect(directive).toBeTruthy();
30+
});
31+
2532
});
2633
});

‎projects/coreui-angular/src/lib/tooltip/tooltip.directive.ts‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ import {
22
AfterViewInit,
33
ChangeDetectorRef,
44
ComponentRef,
5+
DestroyRef,
56
Directive,
67
ElementRef,
78
HostBinding,
9+
inject,
810
Inject,
911
Input,
1012
OnChanges,
@@ -15,9 +17,9 @@ import {
1517
TemplateRef,
1618
ViewContainerRef
1719
}from'@angular/core';
20+
import{takeUntilDestroyed}from'@angular/core/rxjs-interop';
1821
import{DOCUMENT}from'@angular/common';
19-
import{Subscription}from'rxjs';
20-
import{debounceTime}from'rxjs/operators';
22+
import{debounceTime,finalize}from'rxjs/operators';
2123
import{createPopper,Instance,Options}from'@popperjs/core';
2224

2325
import{Triggers}from'../coreui.types';
@@ -96,7 +98,7 @@ export class TooltipDirective implements OnChanges, OnDestroy, OnInit, AfterView
9698
]
9799
};
98100

99-
privateintersectingSubscription?:Subscription;
101+
readonly #destroyRef=inject(DestroyRef);
100102

101103
constructor(
102104
@Inject(DOCUMENT)privatedocument:Document,
@@ -109,7 +111,6 @@ export class TooltipDirective implements OnChanges, OnDestroy, OnInit, AfterView
109111
){}
110112

111113
ngAfterViewInit():void{
112-
this.intersectionService.createIntersectionObserver(this.hostElement);
113114
this.intersectionServiceSubscribe();
114115
}
115116

@@ -122,7 +123,6 @@ export class TooltipDirective implements OnChanges, OnDestroy, OnInit, AfterView
122123
ngOnDestroy():void{
123124
this.clearListeners();
124125
this.destroyTooltipElement();
125-
this.intersectionServiceSubscribe(false);
126126
}
127127

128128
ngOnInit():void{
@@ -154,18 +154,19 @@ export class TooltipDirective implements OnChanges, OnDestroy, OnInit, AfterView
154154
}
155155

156156
privateintersectionServiceSubscribe(subscribe:boolean=true):void{
157-
if(subscribe){
158-
this.intersectingSubscription=this.intersectionService.intersecting$
159-
.pipe(
160-
debounceTime(100)
161-
)
162-
.subscribe(isIntersecting=>{
163-
this.visible=isIntersecting ?this.visible :false;
164-
!this.visible&&this.removeTooltipElement();
165-
});
166-
}else{
167-
this.intersectingSubscription?.unsubscribe();
168-
}
157+
this.intersectionService.createIntersectionObserver(this.hostElement);
158+
this.intersectionService.intersecting$
159+
.pipe(
160+
debounceTime(100),
161+
finalize(()=>{
162+
this.intersectionService.unobserve(this.hostElement);
163+
}),
164+
takeUntilDestroyed(this.#destroyRef)
165+
)
166+
.subscribe(isIntersecting=>{
167+
this.visible=isIntersecting ?this.visible :false;
168+
!this.visible&&this.removeTooltipElement();
169+
});
169170
}
170171

171172
privategetUID(prefix:string):string{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp