Skip to content

Commit f468321

Browse files
crisbetojelbourn
authored andcommitted
refactor: remove ViewportRuler and ScrollDispatcher exports from overlay (#13047)
Along the same lines as #12871. Replaces the imports for `ViewportRuler` and `ScrollDispatcher` with ones pointing directly to `cdk/scrolling`, rather than going through `cdk/overlay`.
1 parent c2e502c commit f468321

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
2-
import {CdkScrollable, ScrollingModule} from '@angular/cdk/scrolling';
2+
import {CdkScrollable, ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling';
33
import {MockNgZone} from '@angular/cdk/testing';
44
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
55
import {inject, TestBed} from '@angular/core/testing';
@@ -13,7 +13,6 @@ import {
1313
OverlayContainer,
1414
OverlayModule,
1515
OverlayRef,
16-
ViewportRuler,
1716
} from '../index';
1817

1918

src/lib/autocomplete/autocomplete-trigger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
OverlayRef,
1515
PositionStrategy,
1616
ScrollStrategy,
17-
ViewportRuler,
1817
} from '@angular/cdk/overlay';
1918
import {TemplatePortal} from '@angular/cdk/portal';
2019
import {DOCUMENT} from '@angular/common';
@@ -33,6 +32,7 @@ import {
3332
Optional,
3433
ViewContainerRef,
3534
} from '@angular/core';
35+
import {ViewportRuler} from '@angular/cdk/scrolling';
3636
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
3737
import {
3838
_countGroupLabelsBeforeOption,

src/lib/bottom-sheet/bottom-sheet.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {Directionality} from '@angular/cdk/bidi';
22
import {A, ESCAPE} from '@angular/cdk/keycodes';
3-
import {OverlayContainer, ViewportRuler} from '@angular/cdk/overlay';
3+
import {OverlayContainer} from '@angular/cdk/overlay';
4+
import {ViewportRuler} from '@angular/cdk/scrolling';
45
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
56
import {
67
Component,

src/lib/datepicker/datepicker.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {ENTER, ESCAPE, RIGHT_ARROW, UP_ARROW, DOWN_ARROW} from '@angular/cdk/keycodes';
2-
import {Overlay, OverlayContainer, ScrollDispatcher} from '@angular/cdk/overlay';
2+
import {Overlay, OverlayContainer} from '@angular/cdk/overlay';
3+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
34
import {
45
createKeyboardEvent,
56
dispatchEvent,

src/lib/dialog/dialog.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import {Location} from '@angular/common';
2424
import {SpyLocation} from '@angular/common/testing';
2525
import {Directionality} from '@angular/cdk/bidi';
2626
import {MatDialogContainer} from './dialog-container';
27-
import {OverlayContainer, ScrollStrategy, ScrollDispatcher, Overlay} from '@angular/cdk/overlay';
27+
import {OverlayContainer, ScrollStrategy, Overlay} from '@angular/cdk/overlay';
28+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
2829
import {A, ESCAPE} from '@angular/cdk/keycodes';
2930
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
3031
import {

src/lib/select/select.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
Overlay,
2727
RepositionScrollStrategy,
2828
ScrollStrategy,
29-
ViewportRuler,
3029
} from '@angular/cdk/overlay';
30+
import {ViewportRuler} from '@angular/cdk/scrolling';
3131
import {
3232
AfterContentInit,
3333
Attribute,

src/lib/tooltip/tooltip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import {
1818
Overlay,
1919
OverlayConnectionPosition,
2020
OverlayRef,
21-
ScrollDispatcher,
2221
ScrollStrategy,
2322
VerticalConnectionPos,
2423
} from '@angular/cdk/overlay';
24+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
2525
import {Platform} from '@angular/cdk/platform';
2626
import {ComponentPortal} from '@angular/cdk/portal';
2727
import {take, takeUntil} from 'rxjs/operators';

0 commit comments

Comments
 (0)