mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
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`.
This commit is contained in:
committed by
Jeremy Elbourn
parent
c2e502cf52
commit
f468321e17
@@ -1,5 +1,5 @@
|
||||
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
|
||||
import {CdkScrollable, ScrollingModule} from '@angular/cdk/scrolling';
|
||||
import {CdkScrollable, ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling';
|
||||
import {MockNgZone} from '@angular/cdk/testing';
|
||||
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
|
||||
import {inject, TestBed} from '@angular/core/testing';
|
||||
@@ -13,7 +13,6 @@ import {
|
||||
OverlayContainer,
|
||||
OverlayModule,
|
||||
OverlayRef,
|
||||
ViewportRuler,
|
||||
} from '../index';
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ import {
|
||||
OverlayRef,
|
||||
PositionStrategy,
|
||||
ScrollStrategy,
|
||||
ViewportRuler,
|
||||
} from '@angular/cdk/overlay';
|
||||
import {TemplatePortal} from '@angular/cdk/portal';
|
||||
import {DOCUMENT} from '@angular/common';
|
||||
@@ -33,6 +32,7 @@ import {
|
||||
Optional,
|
||||
ViewContainerRef,
|
||||
} from '@angular/core';
|
||||
import {ViewportRuler} from '@angular/cdk/scrolling';
|
||||
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
|
||||
import {
|
||||
_countGroupLabelsBeforeOption,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import {Directionality} from '@angular/cdk/bidi';
|
||||
import {A, ESCAPE} from '@angular/cdk/keycodes';
|
||||
import {OverlayContainer, ViewportRuler} from '@angular/cdk/overlay';
|
||||
import {OverlayContainer} from '@angular/cdk/overlay';
|
||||
import {ViewportRuler} from '@angular/cdk/scrolling';
|
||||
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
|
||||
import {
|
||||
Component,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import {ENTER, ESCAPE, RIGHT_ARROW, UP_ARROW, DOWN_ARROW} from '@angular/cdk/keycodes';
|
||||
import {Overlay, OverlayContainer, ScrollDispatcher} from '@angular/cdk/overlay';
|
||||
import {Overlay, OverlayContainer} from '@angular/cdk/overlay';
|
||||
import {ScrollDispatcher} from '@angular/cdk/scrolling';
|
||||
import {
|
||||
createKeyboardEvent,
|
||||
dispatchEvent,
|
||||
|
||||
@@ -24,7 +24,8 @@ import {Location} from '@angular/common';
|
||||
import {SpyLocation} from '@angular/common/testing';
|
||||
import {Directionality} from '@angular/cdk/bidi';
|
||||
import {MatDialogContainer} from './dialog-container';
|
||||
import {OverlayContainer, ScrollStrategy, ScrollDispatcher, Overlay} from '@angular/cdk/overlay';
|
||||
import {OverlayContainer, ScrollStrategy, Overlay} from '@angular/cdk/overlay';
|
||||
import {ScrollDispatcher} from '@angular/cdk/scrolling';
|
||||
import {A, ESCAPE} from '@angular/cdk/keycodes';
|
||||
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
|
||||
import {
|
||||
|
||||
@@ -26,8 +26,8 @@ import {
|
||||
Overlay,
|
||||
RepositionScrollStrategy,
|
||||
ScrollStrategy,
|
||||
ViewportRuler,
|
||||
} from '@angular/cdk/overlay';
|
||||
import {ViewportRuler} from '@angular/cdk/scrolling';
|
||||
import {
|
||||
AfterContentInit,
|
||||
Attribute,
|
||||
|
||||
@@ -18,10 +18,10 @@ import {
|
||||
Overlay,
|
||||
OverlayConnectionPosition,
|
||||
OverlayRef,
|
||||
ScrollDispatcher,
|
||||
ScrollStrategy,
|
||||
VerticalConnectionPos,
|
||||
} from '@angular/cdk/overlay';
|
||||
import {ScrollDispatcher} from '@angular/cdk/scrolling';
|
||||
import {Platform} from '@angular/cdk/platform';
|
||||
import {ComponentPortal} from '@angular/cdk/portal';
|
||||
import {take, takeUntil} from 'rxjs/operators';
|
||||
|
||||
Reference in New Issue
Block a user