Skip to content

Commit 44f185b

Browse files
committed
Revert "chore(dev-app): add lazy loading (#15522)"
This reverts commit 1dce080.
1 parent 3add6de commit 44f185b

File tree

64 files changed

+408
-1953
lines changed

Some content is hidden

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

64 files changed

+408
-1953
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
/src/dev-app/connected-overlay/** @jelbourn @crisbeto
112112
/src/dev-app/dataset/** @andrewseguin
113113
/src/dev-app/datepicker/** @mmalerba
114-
/src/dev-app/dev-app/** @mmalerba
114+
/src/dev-app/dev-app-layout/** @mmalerba
115115
/src/dev-app/dialog/** @jelbourn @crisbeto
116116
/src/dev-app/drag-drop/** @crisbeto
117117
/src/dev-app/drawer/** @mmalerba

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
MatFormFieldModule,
1717
MatInputModule
1818
} from '@angular/material';
19-
import {RouterModule} from '@angular/router';
2019
import {AutocompleteDemo} from './autocomplete-demo';
2120

2221
@NgModule({
@@ -29,7 +28,6 @@ import {AutocompleteDemo} from './autocomplete-demo';
2928
MatFormFieldModule,
3029
MatInputModule,
3130
ReactiveFormsModule,
32-
RouterModule.forChild([{path: '', component: AutocompleteDemo}]),
3331
],
3432
declarations: [AutocompleteDemo],
3533
})

src/dev-app/badge/badge-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
1212
import {MatBadgeModule, MatButtonModule, MatIconModule} from '@angular/material';
13-
import {RouterModule} from '@angular/router';
1413
import {BadgeDemo} from './badge-demo';
1514

1615
@NgModule({
@@ -20,7 +19,6 @@ import {BadgeDemo} from './badge-demo';
2019
MatBadgeModule,
2120
MatButtonModule,
2221
MatIconModule,
23-
RouterModule.forChild([{path: '', component: BadgeDemo}]),
2422
],
2523
declarations: [BadgeDemo],
2624
})

src/dev-app/baseline/baseline-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
MatSelectModule,
1818
MatToolbarModule
1919
} from '@angular/material';
20-
import {RouterModule} from '@angular/router';
2120
import {BaselineDemo} from './baseline-demo';
2221

2322
@NgModule({
@@ -30,7 +29,6 @@ import {BaselineDemo} from './baseline-demo';
3029
MatRadioModule,
3130
MatSelectModule,
3231
MatToolbarModule,
33-
RouterModule.forChild([{path: '', component: BaselineDemo}]),
3432
],
3533
declarations: [BaselineDemo],
3634
})

src/dev-app/bottom-sheet/bottom-sheet-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
MatListModule,
2121
MatSelectModule
2222
} from '@angular/material';
23-
import {RouterModule} from '@angular/router';
2423
import {BottomSheetDemo, ExampleBottomSheet} from './bottom-sheet-demo';
2524

2625
@NgModule({
@@ -36,7 +35,6 @@ import {BottomSheetDemo, ExampleBottomSheet} from './bottom-sheet-demo';
3635
MatInputModule,
3736
MatListModule,
3837
MatSelectModule,
39-
RouterModule.forChild([{path: '', component: BottomSheetDemo}]),
4038
],
4139
declarations: [BottomSheetDemo, ExampleBottomSheet],
4240
entryComponents: [ExampleBottomSheet],

src/dev-app/button-toggle/button-toggle-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
1212
import {MatButtonToggleModule, MatCheckboxModule, MatIconModule} from '@angular/material';
13-
import {RouterModule} from '@angular/router';
1413
import {ButtonToggleDemo} from './button-toggle-demo';
1514

1615
@NgModule({
@@ -20,7 +19,6 @@ import {ButtonToggleDemo} from './button-toggle-demo';
2019
MatButtonToggleModule,
2120
MatCheckboxModule,
2221
MatIconModule,
23-
RouterModule.forChild([{path: '', component: ButtonToggleDemo}]),
2422
],
2523
declarations: [ButtonToggleDemo],
2624
})

src/dev-app/button/button-demo-module.ts

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

99
import {NgModule} from '@angular/core';
1010
import {MatButtonModule, MatIconModule} from '@angular/material';
11-
import {RouterModule} from '@angular/router';
1211
import {ButtonDemo} from './button-demo';
1312

1413
@NgModule({
1514
imports: [
1615
MatButtonModule,
1716
MatIconModule,
18-
RouterModule.forChild([{path: '', component: ButtonDemo}]),
1917
],
2018
declarations: [ButtonDemo],
2119
})

src/dev-app/card/card-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
MatDividerModule,
1414
MatProgressBarModule
1515
} from '@angular/material';
16-
import {RouterModule} from '@angular/router';
1716
import {CardDemo} from './card-demo';
1817

1918
@NgModule({
@@ -22,7 +21,6 @@ import {CardDemo} from './card-demo';
2221
MatCardModule,
2322
MatDividerModule,
2423
MatProgressBarModule,
25-
RouterModule.forChild([{path: '', component: CardDemo}]),
2624
],
2725
declarations: [CardDemo],
2826
})

src/dev-app/checkbox/checkbox-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
1212
import {MatCheckboxModule, MatPseudoCheckboxModule} from '@angular/material';
13-
import {RouterModule} from '@angular/router';
1413
import {CheckboxDemo, MatCheckboxDemoNestedChecklist} from './checkbox-demo';
1514

1615
@NgModule({
@@ -19,7 +18,6 @@ import {CheckboxDemo, MatCheckboxDemoNestedChecklist} from './checkbox-demo';
1918
FormsModule,
2019
MatCheckboxModule,
2120
MatPseudoCheckboxModule,
22-
RouterModule.forChild([{path: '', component: CheckboxDemo}]),
2321
],
2422
declarations: [CheckboxDemo, MatCheckboxDemoNestedChecklist],
2523
})

src/dev-app/chips/chips-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
MatIconModule,
1919
MatToolbarModule
2020
} from '@angular/material';
21-
import {RouterModule} from '@angular/router';
2221
import {ChipsDemo} from './chips-demo';
2322

2423
@NgModule({
@@ -32,7 +31,6 @@ import {ChipsDemo} from './chips-demo';
3231
MatFormFieldModule,
3332
MatIconModule,
3433
MatToolbarModule,
35-
RouterModule.forChild([{path: '', component: ChipsDemo}]),
3634
],
3735
declarations: [ChipsDemo],
3836
})

src/dev-app/connected-overlay/connected-overlay-demo-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
1212
import {FormsModule} from '@angular/forms';
1313
import {MatButtonModule, MatCheckboxModule, MatRadioModule} from '@angular/material';
14-
import {RouterModule} from '@angular/router';
1514
import {ConnectedOverlayDemo} from './connected-overlay-demo';
1615

1716
@NgModule({
@@ -22,7 +21,6 @@ import {ConnectedOverlayDemo} from './connected-overlay-demo';
2221
MatCheckboxModule,
2322
MatRadioModule,
2423
OverlayModule,
25-
RouterModule.forChild([{path: '', component: ConnectedOverlayDemo}]),
2624
],
2725
declarations: [ConnectedOverlayDemo],
2826
})

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ import {
1616
MatFormFieldModule,
1717
MatIconModule,
1818
MatInputModule,
19-
MatNativeDateModule,
2019
MatSelectModule
2120
} from '@angular/material';
22-
import {RouterModule} from '@angular/router';
2321
import {CustomHeader, CustomHeaderNgContent, DatepickerDemo} from './datepicker-demo';
2422

2523
@NgModule({
@@ -32,10 +30,8 @@ import {CustomHeader, CustomHeaderNgContent, DatepickerDemo} from './datepicker-
3230
MatFormFieldModule,
3331
MatIconModule,
3432
MatInputModule,
35-
MatNativeDateModule,
3633
MatSelectModule,
3734
ReactiveFormsModule,
38-
RouterModule.forChild([{path: '', component: DatepickerDemo}]),
3935
],
4036
declarations: [CustomHeader, CustomHeaderNgContent, DatepickerDemo],
4137
entryComponents: [CustomHeader, CustomHeaderNgContent],

src/dev-app/dev-app/dev-app-module.ts renamed to src/dev-app/dev-app-layout/dev-app-layout-module.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import {
1616
MatToolbarModule
1717
} from '@angular/material';
1818
import {RouterModule} from '@angular/router';
19-
import {DevApp404} from './dev-app-404';
20-
import {DevAppHome} from './dev-app-home';
2119
import {DevAppLayout} from './dev-app-layout';
2220

2321
@NgModule({
@@ -30,8 +28,8 @@ import {DevAppLayout} from './dev-app-layout';
3028
MatToolbarModule,
3129
RouterModule,
3230
],
33-
declarations: [DevAppLayout, DevAppHome, DevApp404],
31+
declarations: [DevAppLayout],
3432
exports: [DevAppLayout],
3533
})
36-
export class DevAppModule {
34+
export class DevAppLayoutModule {
3735
}

src/dev-app/dev-app/dev-app-layout.html renamed to src/dev-app/dev-app-layout/dev-app-layout.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ <h1>Angular Material Demos</h1>
3737
<button mat-button (click)="rippleOptions.disabled = !rippleOptions.disabled">
3838
{{rippleOptions.disabled ? 'Enable' : 'Disable'}} ripples
3939
</button>
40-
<button mat-button (click)="dir.value = (dir.value === 'rtl' ? 'ltr' : 'rtl')"
40+
<button mat-button (click)="root.dir = (root.dir === 'rtl' ? 'ltr' : 'rtl')"
4141
title="Toggle between RTL and LTR">
42-
{{dir.value.toUpperCase()}}
42+
{{root.dir.toUpperCase()}}
4343
</button>
4444
</div>
4545
</div>
4646
</mat-toolbar>
4747

48-
<div [attr.dir]="dir.value" class="demo-content mat-app-background">
48+
<div #root="dir" dir="ltr" class="demo-content mat-app-background">
4949
<ng-content></ng-content>
5050
</div>
5151
</main>

src/dev-app/dev-app/dev-app-layout.ts renamed to src/dev-app/dev-app-layout/dev-app-layout.ts

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

9-
import {Directionality} from '@angular/cdk/bidi';
109
import {OverlayContainer} from '@angular/cdk/overlay';
11-
import {ChangeDetectorRef, Component, ElementRef, Inject, ViewEncapsulation} from '@angular/core';
10+
import {Component, ElementRef, ViewEncapsulation} from '@angular/core';
1211
import {DevAppRippleOptions} from '../ripple/ripple-options';
13-
import {DevAppDirectionality} from './dev-app-directionality';
1412

1513
/** Root component for the dev-app demos. */
1614
@Component({
@@ -72,10 +70,7 @@ export class DevAppLayout {
7270

7371
constructor(
7472
private _element: ElementRef<HTMLElement>, private _overlayContainer: OverlayContainer,
75-
public rippleOptions: DevAppRippleOptions,
76-
@Inject(Directionality) public dir: DevAppDirectionality, cdr: ChangeDetectorRef) {
77-
dir.change.subscribe(() => cdr.markForCheck());
78-
}
73+
public rippleOptions: DevAppRippleOptions) {}
7974

8075
toggleFullscreen() {
8176
// Cast to `any`, because the typings don't include the browser-prefixed methods.

src/dev-app/dev-app-module.ts

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
import {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
10+
import {HttpClientModule} from '@angular/common/http';
11+
import {NgModule} from '@angular/core';
12+
import {MAT_RIPPLE_GLOBAL_OPTIONS} from '@angular/material';
13+
import {BrowserModule} from '@angular/platform-browser';
14+
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
15+
import {RouterModule} from '@angular/router';
16+
import {AutocompleteDemoModule} from './autocomplete/autocomplete-demo-module';
17+
import {BadgeDemoModule} from './badge/badge-demo-module';
18+
import {BaselineDemoModule} from './baseline/baseline-demo-module';
19+
import {BottomSheetDemoModule} from './bottom-sheet/bottom-sheet-demo-module';
20+
import {ButtonToggleDemoModule} from './button-toggle/button-toggle-demo-module';
21+
import {ButtonDemoModule} from './button/button-demo-module';
22+
import {CardDemoModule} from './card/card-demo-module';
23+
import {CheckboxDemoModule} from './checkbox/checkbox-demo-module';
24+
import {ChipsDemoModule} from './chips/chips-demo-module';
25+
import {ConnectedOverlayDemoModule} from './connected-overlay/connected-overlay-demo-module';
26+
import {DatepickerDemoModule} from './datepicker/datepicker-demo-module';
27+
import {DevApp404, DevAppComponent, DevAppHome} from './dev-app';
28+
import {DevAppLayoutModule} from './dev-app-layout/dev-app-layout-module';
29+
import {DialogDemoModule} from './dialog/dialog-demo-module';
30+
import {DragDropDemoModule} from './drag-drop/drag-drop-demo-module';
31+
import {DrawerDemoModule} from './drawer/drawer-demo-module';
32+
import {ExamplesPageModule} from './examples-page/examples-page-module';
33+
import {ExpansionDemoModule} from './expansion/expansion-demo-module';
34+
import {FocusOriginDemoModule} from './focus-origin/focus-origin-demo-module';
35+
import {GesturesDemoModule} from './gestures/gestures-demo-module';
36+
import {GridListDemoModule} from './grid-list/grid-list-demo-module';
37+
import {IconDemoModule} from './icon/icon-demo-module';
38+
import {InputDemoModule} from './input/input-demo-module';
39+
import {ListDemoModule} from './list/list-demo-module';
40+
import {LiveAnnouncerDemoModule} from './live-announcer/live-announcer-demo-module';
41+
import {MenuDemoModule} from './menu/menu-demo-module';
42+
import {PaginatorDemoModule} from './paginator/paginator-demo-module';
43+
import {PlatformDemoModule} from './platform/platform-demo-module';
44+
import {PortalDemoModule} from './portal/portal-demo-module';
45+
import {ProgressBarDemoModule} from './progress-bar/progress-bar-demo-module';
46+
import {ProgressSpinnerDemoModule} from './progress-spinner/progress-spinner-demo-module';
47+
import {RadioDemoModule} from './radio/radio-demo-module';
48+
import {RippleDemoModule} from './ripple/ripple-demo-module';
49+
import {DevAppRippleOptions} from './ripple/ripple-options';
50+
import {DEV_APP_ROUTES} from './routes';
51+
import {ScreenTypeDemoModule} from './screen-type/screen-type-demo-module';
52+
import {SelectDemoModule} from './select/select-demo-module';
53+
import {SidenavDemoModule} from './sidenav/sidenav-demo-module';
54+
import {SlideToggleDemoModule} from './slide-toggle/slide-toggle-demo-module';
55+
import {SliderDemoModule} from './slider/slider-demo-module';
56+
import {SnackBarDemoModule} from './snack-bar/snack-bar-demo-module';
57+
import {StepperDemoModule} from './stepper/stepper-demo-module';
58+
import {TableDemoModule} from './table/table-demo-module';
59+
import {TabsDemoModule} from './tabs/tabs-demo-module';
60+
import {ToolbarDemoModule} from './toolbar/toolbar-demo-module';
61+
import {TooltipDemoModule} from './tooltip/tooltip-demo-module';
62+
import {TreeDemoModule} from './tree/tree-demo-module';
63+
import {TypographyDemoModule} from './typography/typography-demo-module';
64+
import {VirtualScrollDemoModule} from './virtual-scroll/virtual-scroll-demo-module';
65+
66+
@NgModule({
67+
imports: [
68+
BrowserAnimationsModule,
69+
BrowserModule,
70+
DevAppLayoutModule,
71+
HttpClientModule,
72+
RouterModule.forRoot(DEV_APP_ROUTES),
73+
74+
// Demo pages
75+
AutocompleteDemoModule,
76+
BadgeDemoModule,
77+
BaselineDemoModule,
78+
BottomSheetDemoModule,
79+
ButtonDemoModule,
80+
ButtonToggleDemoModule,
81+
CardDemoModule,
82+
CheckboxDemoModule,
83+
ChipsDemoModule,
84+
ConnectedOverlayDemoModule,
85+
DatepickerDemoModule,
86+
DialogDemoModule,
87+
DragDropDemoModule,
88+
DrawerDemoModule,
89+
ExamplesPageModule,
90+
ExpansionDemoModule,
91+
FocusOriginDemoModule,
92+
GesturesDemoModule,
93+
GridListDemoModule,
94+
IconDemoModule,
95+
InputDemoModule,
96+
ListDemoModule,
97+
LiveAnnouncerDemoModule,
98+
MenuDemoModule,
99+
PaginatorDemoModule,
100+
PlatformDemoModule,
101+
PortalDemoModule,
102+
ProgressBarDemoModule,
103+
ProgressSpinnerDemoModule,
104+
RadioDemoModule,
105+
RippleDemoModule,
106+
ScreenTypeDemoModule,
107+
SelectDemoModule,
108+
SidenavDemoModule,
109+
SliderDemoModule,
110+
SlideToggleDemoModule,
111+
SnackBarDemoModule,
112+
StepperDemoModule,
113+
TableDemoModule,
114+
TabsDemoModule,
115+
ToolbarDemoModule,
116+
TooltipDemoModule,
117+
TreeDemoModule,
118+
TypographyDemoModule,
119+
VirtualScrollDemoModule,
120+
],
121+
declarations: [
122+
DevAppComponent,
123+
DevAppHome,
124+
DevApp404,
125+
],
126+
providers: [
127+
{provide: OverlayContainer, useClass: FullscreenOverlayContainer},
128+
{provide: MAT_RIPPLE_GLOBAL_OPTIONS, useExisting: DevAppRippleOptions},
129+
],
130+
bootstrap: [DevAppComponent],
131+
})
132+
export class DevAppModule {
133+
}

0 commit comments

Comments
 (0)