Skip to content

Commit c309f7c

Browse files
mmalerbammalerba
committed
update dev-app
1 parent f48755f commit c309f7c

File tree

13 files changed

+107
-106
lines changed

13 files changed

+107
-106
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
/src/dev-app/mdc-progress-spinner/** @mmalerba
202202
/src/dev-app/mdc-radio/** @mmalerba
203203
/src/dev-app/legacy-select/** @crisbeto
204-
/src/dev-app/mdc-snack-bar/** @andrewseguin
204+
/src/dev-app/legacy-snack-bar/** @andrewseguin
205205
/src/dev-app/mdc-snack-bar/** @andrewseguin
206206
/src/dev-app/mdc-slide-toggle/** @crisbeto
207207
/src/dev-app/mdc-slider/** @devversion

‎src/dev-app/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ ng_module(
5050
"//src/dev-app/legacy-input",
5151
"//src/dev-app/legacy-paginator",
5252
"//src/dev-app/legacy-select",
53+
"//src/dev-app/legacy-snack-bar",
5354
"//src/dev-app/legacy-table",
5455
"//src/dev-app/legacy-tooltip",
5556
"//src/dev-app/list",
@@ -67,7 +68,6 @@ ng_module(
6768
"//src/dev-app/mdc-radio",
6869
"//src/dev-app/mdc-slide-toggle",
6970
"//src/dev-app/mdc-slider",
70-
"//src/dev-app/mdc-snack-bar",
7171
"//src/dev-app/mdc-tabs",
7272
"//src/dev-app/menu",
7373
"//src/dev-app/menubar",

‎src/dev-app/dev-app/dev-app-layout.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,35 @@ export class DevAppLayout {
4646
strongFocus = false;
4747
navItems = [
4848
{name: 'Examples', route: '/examples'},
49+
{name: 'CDK Dialog', route: '/cdk-dialog'},
50+
{name: 'CDK Experimental Combobox', route: '/cdk-experimental-combobox'},
51+
{name: 'CDK Listbox', route: '/cdk-listbox'},
52+
{name: 'CDK Menu', route: '/cdk-menu'},
4953
{name: 'Autocomplete', route: '/autocomplete'},
5054
{name: 'Badge', route: '/badge'},
5155
{name: 'Bottom sheet', route: '/bottom-sheet'},
5256
{name: 'Button Toggle', route: '/button-toggle'},
5357
{name: 'Button', route: '/button'},
5458
{name: 'Card', route: '/card'},
55-
{name: 'CDK Dialog', route: '/cdk-dialog'},
56-
{name: 'CDK Listbox', route: '/cdk-listbox'},
57-
{name: 'CDK Menu', route: '/cdk-menu'},
58-
{name: 'CDK Experimental Combobox', route: '/cdk-experimental-combobox'},
5959
{name: 'Checkbox', route: '/checkbox'},
6060
{name: 'Chips', route: '/chips'},
6161
{name: 'Clipboard', route: '/clipboard'},
6262
{name: 'Column Resize', route: 'column-resize'},
6363
{name: 'Connected Overlay', route: '/connected-overlay'},
6464
{name: 'Datepicker', route: '/datepicker'},
6565
{name: 'Dialog', route: '/dialog'},
66-
{name: 'Drawer', route: '/drawer'},
6766
{name: 'Drag and Drop', route: '/drag-drop'},
67+
{name: 'Drawer', route: '/drawer'},
6868
{name: 'Expansion Panel', route: '/expansion'},
6969
{name: 'Focus Origin', route: '/focus-origin'},
7070
{name: 'Focus Trap', route: '/focus-trap'},
7171
{name: 'Google Map', route: '/google-map'},
7272
{name: 'Grid List', route: '/grid-list'},
7373
{name: 'Icon', route: '/icon'},
74-
{name: 'Input', route: '/input'},
7574
{name: 'Input Modality', route: '/input-modality'},
76-
{name: 'List', route: '/list'},
75+
{name: 'Input', route: '/input'},
7776
{name: 'Layout', route: '/layout'},
77+
{name: 'List', route: '/list'},
7878
{name: 'Live Announcer', route: '/live-announcer'},
7979
{name: 'Menu', route: '/menu'},
8080
{name: 'Menubar', route: '/menubar'},
@@ -94,8 +94,8 @@ export class DevAppLayout {
9494
{name: 'Slider', route: '/slider'},
9595
{name: 'Snack Bar', route: '/snack-bar'},
9696
{name: 'Stepper', route: '/stepper'},
97-
{name: 'Table', route: '/table'},
9897
{name: 'Table Scroll Container', route: '/table-scroll-container'},
98+
{name: 'Table', route: '/table'},
9999
{name: 'Tabs', route: '/tabs'},
100100
{name: 'Toolbar', route: '/toolbar'},
101101
{name: 'Tooltip', route: '/tooltip'},
@@ -111,18 +111,18 @@ export class DevAppLayout {
111111
{name: 'MDC Dialog', route: '/mdc-dialog'},
112112
{name: 'MDC List', route: '/mdc-list'},
113113
{name: 'MDC Menu', route: '/mdc-menu'},
114-
{name: 'MDC Radio', route: '/mdc-radio'},
115114
{name: 'MDC Progress Bar', route: '/mdc-progress-bar'},
116115
{name: 'MDC Progress Spinner', route: '/mdc-progress-spinner'},
117-
{name: 'MDC Tabs', route: '/mdc-tabs'},
116+
{name: 'MDC Radio', route: '/mdc-radio'},
118117
{name: 'MDC Slide Toggle', route: '/mdc-slide-toggle'},
119118
{name: 'MDC Slider', route: '/mdc-slider'},
120-
{name: 'MDC Snack Bar', route: '/mdc-snack-bar'},
119+
{name: 'MDC Tabs', route: '/mdc-tabs'},
120+
{name: 'Legacy Input', route: '/legacy-input'},
121+
{name: 'Legacy Paginator', route: '/legacy-paginator'},
121122
{name: 'Legacy Select', route: '/legacy-select'},
122-
{name: 'Legacy Tooltip', route: '/legacy-tooltip'},
123+
{name: 'Legacy Snack Bar', route: '/legacy-snack-bar'},
123124
{name: 'Legacy Table', route: '/legacy-table'},
124-
{name: 'Legacy Paginator', route: '/legacy-paginator'},
125-
{name: 'Legacy Input', route: '/legacy-input'},
125+
{name: 'Legacy Tooltip', route: '/legacy-tooltip'},
126126
];
127127

128128
/** Currently selected density scale based on the index. */

‎src/dev-app/legacy-snack-bar/BUILD.bazel‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
load("//tools:defaults.bzl", "ng_module", "sass_binary")
2+
3+
package(default_visibility = ["//visibility:public"])
4+
5+
ng_module(
6+
name = "legacy-snack-bar",
7+
srcs = glob(["**/*.ts"]),
8+
assets = [
9+
"legacy-snack-bar-demo.html",
10+
":legacy_snack_bar_demo_scss",
11+
],
12+
deps = [
13+
"//src/cdk/bidi",
14+
"//src/material/legacy-button",
15+
"//src/material/legacy-checkbox",
16+
"//src/material/legacy-form-field",
17+
"//src/material/legacy-input",
18+
"//src/material/legacy-select",
19+
"//src/material/legacy-snack-bar",
20+
"@npm//@angular/forms",
21+
],
22+
)
23+
24+
sass_binary(
25+
name = "legacy_snack_bar_demo_scss",
26+
src = "legacy-snack-bar-demo.scss",
27+
)

‎src/dev-app/mdc-snack-bar/mdc-snack-bar-demo.html‎ renamed to ‎src/dev-app/legacy-snack-bar/legacy-snack-bar-demo.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ <h1>SnackBar demo</h1>
66
<div>
77
<div>Position in page: </div>
88
<mat-form-field>
9-
<mat-label>Horizontal</mat-label>
109
<mat-select [(ngModel)]="horizontalPosition">
1110
<mat-option value="start">Start</mat-option>
1211
<mat-option value="end">End</mat-option>
@@ -16,7 +15,6 @@ <h1>SnackBar demo</h1>
1615
</mat-select>
1716
</mat-form-field>
1817
<mat-form-field>
19-
<mat-label>Vertical</mat-label>
2018
<mat-select [(ngModel)]="verticalPosition">
2119
<mat-option value="top">Top</mat-option>
2220
<mat-option value="bottom">Bottom</mat-option>

‎src/dev-app/mdc-snack-bar/mdc-snack-bar-demo.scss‎ renamed to ‎src/dev-app/legacy-snack-bar/legacy-snack-bar-demo.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.demo-party .mdc-snackbar__surface {
1+
.demo-party {
22
animation: demo-party 5000ms infinite;
33
}
44

‎src/dev-app/mdc-snack-bar/mdc-snack-bar-demo.ts‎ renamed to ‎src/dev-app/legacy-snack-bar/legacy-snack-bar-demo.ts‎

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

9-
import {Directionality} from '@angular/cdk/bidi';
109
import {Component, TemplateRef, ViewChild, ViewEncapsulation} from '@angular/core';
11-
import {
12-
MatSnackBar,
13-
MatSnackBarConfig,
14-
MatSnackBarHorizontalPosition,
15-
MatSnackBarVerticalPosition,
16-
MatSnackBarModule,
17-
} from '@angular/material/snack-bar';
10+
import {Directionality} from '@angular/cdk/bidi';
1811
import {CommonModule} from '@angular/common';
1912
import {FormsModule} from '@angular/forms';
20-
import {MatButtonModule} from '@angular/material/button';
21-
import {MatCheckboxModule} from '@angular/material/checkbox';
22-
import {MatInputModule} from '@angular/material/input';
23-
import {MatSelectModule} from '@angular/material/select';
13+
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
14+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
15+
import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
16+
import {MatLegacyInputModule} from '@angular/material/legacy-input';
17+
import {MatLegacySelectModule} from '@angular/material/legacy-select';
18+
import {
19+
MatLegacySnackBar,
20+
MatLegacySnackBarConfig,
21+
MatLegacySnackBarHorizontalPosition,
22+
MatLegacySnackBarModule,
23+
MatLegacySnackBarVerticalPosition,
24+
} from '@angular/material/legacy-snack-bar';
2425

2526
@Component({
26-
selector: 'mdc-snack-bar-demo',
27-
templateUrl: 'mdc-snack-bar-demo.html',
28-
styleUrls: ['mdc-snack-bar-demo.css'],
27+
selector: 'legacy-snack-bar-demo',
28+
styleUrls: ['legacy-snack-bar-demo.css'],
29+
templateUrl: 'legacy-snack-bar-demo.html',
2930
encapsulation: ViewEncapsulation.None,
3031
standalone: true,
3132
imports: [
32-
MatSnackBarModule,
3333
CommonModule,
3434
FormsModule,
35-
MatButtonModule,
36-
MatCheckboxModule,
37-
MatInputModule,
38-
MatSelectModule,
35+
MatLegacyButtonModule,
36+
MatLegacyCheckboxModule,
37+
MatLegacyFormFieldModule,
38+
MatLegacyInputModule,
39+
MatLegacySelectModule,
40+
MatLegacySnackBarModule,
3941
],
4042
})
41-
export class MdcSnackBarDemo {
43+
export class LegacySnackBarDemo {
4244
@ViewChild('template') template: TemplateRef<any>;
4345
message = 'Snack Bar opened.';
4446
actionButtonLabel = 'Retry';
4547
action = false;
4648
setAutoHide = true;
4749
autoHide = 10000;
4850
addExtraClass = false;
49-
horizontalPosition: MatSnackBarHorizontalPosition = 'center';
50-
verticalPosition: MatSnackBarVerticalPosition = 'bottom';
51+
horizontalPosition: MatLegacySnackBarHorizontalPosition = 'center';
52+
verticalPosition: MatLegacySnackBarVerticalPosition = 'bottom';
5153

52-
constructor(public snackBar: MatSnackBar, private _dir: Directionality) {}
54+
constructor(public snackBar: MatLegacySnackBar, private _dir: Directionality) {}
5355

5456
open() {
5557
const config = this._createConfig();
@@ -62,7 +64,7 @@ export class MdcSnackBarDemo {
6264
}
6365

6466
private _createConfig() {
65-
const config = new MatSnackBarConfig();
67+
const config = new MatLegacySnackBarConfig();
6668
config.verticalPosition = this.verticalPosition;
6769
config.horizontalPosition = this.horizontalPosition;
6870
config.duration = this.setAutoHide ? this.autoHide : 0;

‎src/dev-app/mdc-snack-bar/BUILD.bazel‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/dev-app/routes.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ export const DEV_APP_ROUTES: Routes = [
204204
loadComponent: () => import('./select/select-demo').then(m => m.SelectDemo),
205205
},
206206
{
207-
path: 'mdc-snack-bar',
208-
loadComponent: () => import('./mdc-snack-bar/mdc-snack-bar-demo').then(m => m.MdcSnackBarDemo),
207+
path: 'snack-bar',
208+
loadComponent: () => import('./snack-bar/snack-bar-demo').then(m => m.SnackBarDemo),
209209
},
210210
{
211211
path: 'mdc-slide-toggle',
@@ -283,8 +283,9 @@ export const DEV_APP_ROUTES: Routes = [
283283
loadComponent: () => import('./slider/slider-demo').then(m => m.SliderDemo),
284284
},
285285
{
286-
path: 'snack-bar',
287-
loadComponent: () => import('./snack-bar/snack-bar-demo').then(m => m.SnackBarDemo),
286+
path: 'legacy-snack-bar',
287+
loadComponent: () =>
288+
import('./legacy-snack-bar/legacy-snack-bar-demo').then(m => m.LegacySnackBarDemo),
288289
},
289290
{
290291
path: 'stepper',

‎src/dev-app/snack-bar/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ ng_module(
1111
],
1212
deps = [
1313
"//src/cdk/bidi",
14-
"//src/material/legacy-button",
15-
"//src/material/legacy-checkbox",
16-
"//src/material/legacy-form-field",
17-
"//src/material/legacy-input",
18-
"//src/material/legacy-select",
19-
"//src/material/legacy-snack-bar",
14+
"//src/material/button",
15+
"//src/material/checkbox",
16+
"//src/material/form-field",
17+
"//src/material/input",
18+
"//src/material/select",
19+
"//src/material/snack-bar",
2020
"@npm//@angular/forms",
2121
],
2222
)

0 commit comments

Comments
 (0)