Skip to content

Commit 2c620fb

Browse files
committed
Move takeUntil to the end of pipe chains
1 parent 0830c27 commit 2c620fb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/cdk-experimental/column-resize/column-resize.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ export abstract class ColumnResize implements AfterViewInit, OnDestroy {
6767
const element = this.elementRef.nativeElement!;
6868

6969
fromEvent<MouseEvent>(element, 'mouseover').pipe(
70-
takeUntil(this.destroyed),
7170
map(event => _closest(event.target, HEADER_CELL_SELECTOR)),
71+
takeUntil(this.destroyed),
7272
).subscribe(this.eventDispatcher.headerCellHovered);
7373
fromEvent<MouseEvent>(element, 'mouseleave').pipe(
74-
takeUntil(this.destroyed),
7574
filter(event => !!event.relatedTarget &&
7675
!_matches(event.relatedTarget as Element, RESIZE_OVERLAY_SELECTOR)),
7776
mapTo(null),
77+
takeUntil(this.destroyed),
7878
).subscribe(this.eventDispatcher.headerCellHovered);
7979
});
8080
}
@@ -94,9 +94,9 @@ export abstract class ColumnResize implements AfterViewInit, OnDestroy {
9494

9595
private _listenForHoverActivity() {
9696
this.eventDispatcher.headerRowHoveredOrActiveDistinct.pipe(
97-
takeUntil(this.destroyed),
9897
startWith(null),
9998
pairwise(),
99+
takeUntil(this.destroyed),
100100
).subscribe(([previousRow, hoveredRow]) => {
101101
if (hoveredRow) {
102102
hoveredRow.classList.add(HOVER_OR_ACTIVE_CLASS);

0 commit comments

Comments
 (0)