Skip to content

Commit b85ee8c

Browse files
rafaelss95jelbourn
authored andcommitted
chore: remove duplicate imports (#10692)
1 parent 6449ae1 commit b85ee8c

File tree

58 files changed

+248
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+248
-291
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
import {ElementRef, Component, NgModule, NgZone} from '@angular/core';
2-
import {TestBed, inject} from '@angular/core/testing';
3-
import {CdkScrollable} from '@angular/cdk/scrolling';
4-
import {Subscription} from 'rxjs';
5-
import {ScrollDispatchModule} from '@angular/cdk/scrolling';
6-
import {MockNgZone} from '@angular/cdk/testing';
71
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
2+
import {CdkScrollable, ScrollDispatchModule} from '@angular/cdk/scrolling';
3+
import {MockNgZone} from '@angular/cdk/testing';
4+
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
5+
import {inject, TestBed} from '@angular/core/testing';
6+
import {Subscription} from 'rxjs';
87
import {
9-
OverlayModule,
10-
Overlay,
11-
OverlayRef,
12-
OverlayContainer,
13-
ConnectedPositionStrategy,
148
ConnectedOverlayPositionChange,
9+
ConnectedPositionStrategy,
1510
ConnectionPositionPair,
11+
Overlay,
12+
OverlayContainer,
13+
OverlayModule,
14+
OverlayRef,
1615
} from '../index';
1716

1817

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,21 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {PositionStrategy} from './position-strategy';
10-
import {ElementRef} from '@angular/core';
11-
import {ViewportRuler} from '@angular/cdk/scrolling';
129
import {Direction} from '@angular/cdk/bidi';
10+
import {CdkScrollable, ViewportRuler} from '@angular/cdk/scrolling';
11+
import {ElementRef} from '@angular/core';
12+
import {Observable} from 'rxjs';
13+
import {OverlayRef} from '../overlay-ref';
1314
import {
15+
ConnectedOverlayPositionChange,
1416
ConnectionPositionPair,
1517
OriginConnectionPosition,
1618
OverlayConnectionPosition,
17-
ConnectedOverlayPositionChange,
1819
validateHorizontalPosition,
1920
validateVerticalPosition,
2021
} from './connected-position';
21-
import {Observable} from 'rxjs';
22-
import {CdkScrollable} from '@angular/cdk/scrolling';
23-
import {OverlayRef} from '../overlay-ref';
2422
import {FlexibleConnectedPositionStrategy} from './flexible-connected-position-strategy';
25-
23+
import {PositionStrategy} from './position-strategy';
2624

2725

2826
/**

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import {ElementRef, NgModule, Component, NgZone} from '@angular/core';
2-
import {TestBed, inject} from '@angular/core/testing';
3-
import {CdkScrollable} from '@angular/cdk/scrolling';
4-
import {PortalModule, ComponentPortal} from '@angular/cdk/portal';
1+
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
2+
import {CdkScrollable, ScrollDispatchModule} from '@angular/cdk/scrolling';
3+
import {MockNgZone} from '@angular/cdk/testing';
4+
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
5+
import {inject, TestBed} from '@angular/core/testing';
56
import {Subscription} from 'rxjs';
67
import {map} from 'rxjs/operators';
7-
import {ScrollDispatchModule} from '@angular/cdk/scrolling';
8-
import {MockNgZone} from '@angular/cdk/testing';
98
import {
10-
OverlayModule,
9+
ConnectedOverlayPositionChange,
10+
FlexibleConnectedPositionStrategy,
1111
Overlay,
1212
OverlayConfig,
13-
OverlayRef,
1413
OverlayContainer,
15-
FlexibleConnectedPositionStrategy,
16-
ConnectedOverlayPositionChange,
14+
OverlayModule,
15+
OverlayRef,
1716
ViewportRuler,
1817
} from '../index';
1918

19+
2020
// Default width and height of the overlay and origin panels throughout these tests.
2121
const DEFAULT_HEIGHT = 30;
2222
const DEFAULT_WIDTH = 60;

src/cdk/text-field/autofill.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ import {
1717
OnInit,
1818
Output,
1919
} from '@angular/core';
20-
import {Observable, Subject} from 'rxjs';
21-
import {empty as observableEmpty} from 'rxjs';
20+
import {empty, Observable, Subject} from 'rxjs';
2221

2322

2423
/** An event that is emitted when the autofill state of an input changes. */
@@ -59,7 +58,7 @@ export class AutofillMonitor implements OnDestroy {
5958
*/
6059
monitor(element: Element): Observable<AutofillEvent> {
6160
if (!this._platform.isBrowser) {
62-
return observableEmpty();
61+
return empty();
6362
}
6463

6564
const info = this._monitoredElements.get(element);

src/demo-app/autocomplete/autocomplete-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import {Component, ViewChild, ViewEncapsulation} from '@angular/core';
1010
import {FormControl, NgModel} from '@angular/forms';
11-
import {startWith} from 'rxjs/operators';
12-
import {map} from 'rxjs/operators';
11+
import {map, startWith} from 'rxjs/operators';
12+
1313

1414
export interface State {
1515
code: string;

src/demo-app/datepicker/datepicker-demo.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
import {ChangeDetectionStrategy, Component, Host} from '@angular/core';
1010
import {FormControl} from '@angular/forms';
11-
import {MatDatepickerInputEvent} from '@angular/material/datepicker';
12-
import {DateAdapter} from '@angular/material/core';
13-
import {MatCalendar} from '@angular/material';
14-
import {ThemePalette} from '@angular/material/core';
11+
import {DateAdapter, ThemePalette} from '@angular/material/core';
12+
import {MatCalendar, MatDatepickerInputEvent} from '@angular/material/datepicker';
13+
1514

1615
@Component({
1716
moduleId: module.id,

src/demo-app/overlay/overlay-demo.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import {
1616
ViewContainerRef,
1717
ViewEncapsulation,
1818
} from '@angular/core';
19-
import {filter} from 'rxjs/operators';
20-
import {tap} from 'rxjs/operators';
19+
import {filter, tap} from 'rxjs/operators';
2120

2221

2322
@Component({

src/demo-app/table/table-demo.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
import {animate, state, style, transition, trigger} from '@angular/animations';
10+
import {SelectionModel} from '@angular/cdk/collections';
911
import {Component, ElementRef, ViewChild} from '@angular/core';
12+
import {MatPaginator, MatSort, MatTableDataSource, PageEvent} from '@angular/material';
13+
import {fromEvent} from 'rxjs';
14+
import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
1015
import {PeopleDatabase, UserData} from './people-database';
1116
import {PersonDataSource} from './person-data-source';
12-
import {MatPaginator, MatSort, MatTableDataSource, PageEvent} from '@angular/material';
1317
import {DetailRow, PersonDetailDataSource} from './person-detail-data-source';
14-
import {animate, state, style, transition, trigger} from '@angular/animations';
15-
import {SelectionModel} from '@angular/cdk/collections';
16-
import {distinctUntilChanged} from 'rxjs/operators';
17-
import {debounceTime} from 'rxjs/operators';
18-
import {fromEvent} from 'rxjs';
18+
1919

2020
export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
2121

src/demo-app/tree/dynamic-tree-demo/dynamic-database.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
import {Injectable} from '@angular/core';
99
import {FlatTreeControl} from '@angular/cdk/tree';
1010
import {CollectionViewer, SelectionChange} from '@angular/cdk/collections';
11-
import {BehaviorSubject} from 'rxjs';
12-
import {Observable} from 'rxjs';
13-
import {merge} from 'rxjs';
11+
import {BehaviorSubject, merge, Observable} from 'rxjs';
1412
import {map} from 'rxjs/operators';
1513

14+
1615
/** Flat node with expandable and level information */
1716
export class DynamicFlatNode {
1817
isLoading: boolean = false;

src/demo-app/tree/tree-demo.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {Component} from '@angular/core';
109
import {FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
10+
import {Component} from '@angular/core';
1111
import {
12-
MatTreeFlattener,
1312
MatTreeFlatDataSource,
13+
MatTreeFlattener,
1414
MatTreeNestedDataSource
1515
} from '@angular/material/tree';
16-
import {of as ofObservable} from 'rxjs';
17-
import {Observable} from 'rxjs';
16+
import {Observable, of as ofObservable} from 'rxjs';
17+
import {FileDatabase, FileFlatNode, FileNode} from './file-database';
1818

19-
import {FileNode, FileFlatNode, FileDatabase} from './file-database';
2019

2120
@Component({
2221
moduleId: module.id,

0 commit comments

Comments
 (0)