Skip to content

Commit 9ac1936

Browse files
committed
Attempt to fix CI failure.
1 parent d34bdab commit 9ac1936

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {Directionality} from '@angular/cdk/bidi';
1111
import {fromEvent, merge, ReplaySubject} from 'rxjs';
1212
import {filter, map, mapTo, pairwise, startWith, take, takeUntil} from 'rxjs/operators';
1313

14-
import {closest, matches} from '@angular/cdk-experimental/popover-edit/polyfill';
14+
import {_closest, _matches} from '@angular/cdk-experimental/popover-edit';
1515

1616
import {ColumnResizeNotifier, ColumnResizeNotifierSource} from './column-resize-notifier';
1717
import {HEADER_CELL_SELECTOR, RESIZE_OVERLAY_SELECTOR} from './constants';
@@ -65,12 +65,12 @@ export abstract class ColumnResize implements AfterViewInit, OnDestroy {
6565

6666
fromEvent<MouseEvent>(element, 'mouseover').pipe(
6767
takeUntil(this.destroyed),
68-
map(event => closest(event.target, HEADER_CELL_SELECTOR)),
68+
map(event => _closest(event.target, HEADER_CELL_SELECTOR)),
6969
).subscribe(this.eventDispatcher.headerCellHovered);
7070
fromEvent<MouseEvent>(element, 'mouseleave').pipe(
7171
takeUntil(this.destroyed),
7272
filter(event => !!event.relatedTarget &&
73-
!matches(event.relatedTarget as Element, RESIZE_OVERLAY_SELECTOR)),
73+
!_matches(event.relatedTarget as Element, RESIZE_OVERLAY_SELECTOR)),
7474
mapTo(null),
7575
).subscribe(this.eventDispatcher.headerCellHovered);
7676
});

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {Injectable, NgZone} from '@angular/core';
1010
import {combineLatest, MonoTypeOperatorFunction, Observable, Subject} from 'rxjs';
1111
import {distinctUntilChanged, map, share, skip, startWith} from 'rxjs/operators';
1212

13-
import {closest} from '@angular/cdk-experimental/popover-edit/polyfill';
13+
import {_closest} from '@angular/cdk-experimental/popover-edit';
1414

1515
import {HEADER_ROW_SELECTOR} from './constants';
1616

@@ -30,12 +30,12 @@ export class HeaderRowEventDispatcher {
3030

3131
readonly headerRowHoveredOrActiveDistinct = combineLatest(
3232
this.headerCellHoveredDistinct.pipe(
33-
map(cell => closest(cell, HEADER_ROW_SELECTOR)),
33+
map(cell => _closest(cell, HEADER_ROW_SELECTOR)),
3434
startWith(null),
3535
distinctUntilChanged(),
3636
),
3737
this.overlayHandleActiveForCell.pipe(
38-
map(cell => closest(cell, HEADER_ROW_SELECTOR)),
38+
map(cell => _closest(cell, HEADER_ROW_SELECTOR)),
3939
startWith(null),
4040
distinctUntilChanged(),
4141
),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
takeUntil,
2323
} from 'rxjs/operators';
2424

25-
import {closest} from '@angular/cdk-experimental/popover-edit/polyfill';
25+
import {_closest} from '@angular/cdk-experimental/popover-edit';
2626

2727
import {HEADER_CELL_SELECTOR} from './constants';
2828
import {ColumnResizeNotifierSource} from './column-resize-notifier';
@@ -66,7 +66,7 @@ export abstract class ResizeOverlayHandle implements AfterViewInit, OnDestroy {
6666
fromEvent<MouseEvent>(this.elementRef.nativeElement!, 'mouseleave').pipe(
6767
takeUntilDestroyed,
6868
map(event => event.relatedTarget &&
69-
closest(event.relatedTarget as Element, HEADER_CELL_SELECTOR)),
69+
_closest(event.relatedTarget as Element, HEADER_CELL_SELECTOR)),
7070
).subscribe(cell => this.eventDispatcher.headerCellHovered.next(cell));
7171

7272
fromEvent<MouseEvent>(this.elementRef.nativeElement!, 'mousedown')

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {CdkColumnDef} from '@angular/cdk/table';
2222
import {merge, ReplaySubject} from 'rxjs';
2323
import {filter, takeUntil} from 'rxjs/operators';
2424

25-
import {closest} from '@angular/cdk-experimental/popover-edit/polyfill';
25+
import {_closest} from '@angular/cdk-experimental/popover-edit';
2626

2727
import {HEADER_ROW_SELECTOR} from './constants';
2828
import {ResizeOverlayHandle} from './overlay-handle';
@@ -132,7 +132,7 @@ export abstract class Resizable<HandleComponent extends ResizeOverlayHandle>
132132
const takeUntilDestroyed = takeUntil<boolean>(this.destroyed);
133133

134134

135-
this.eventDispatcher.resizeOverlayVisibleForHeaderRow(closest(element, HEADER_ROW_SELECTOR)!)
135+
this.eventDispatcher.resizeOverlayVisibleForHeaderRow(_closest(element, HEADER_ROW_SELECTOR)!)
136136
.pipe(takeUntilDestroyed).subscribe(hoveringRow => {
137137
if (hoveringRow) {
138138
if (!this.overlayRef) {

src/cdk-experimental/popover-edit/public-api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ export * from './popover-edit-module';
1515
export * from './popover-edit-position-strategy-factory';
1616
export * from './table-directives';
1717

18+
// Private to Angular Components
1819
export {CELL_SELECTOR as _CELL_SELECTOR} from './constants';
19-
export {closest as _closest} from './polyfill';
20+
export {closest as _closest, matches as _matches} from './polyfill';

0 commit comments

Comments
 (0)