Skip to content

Commit ac373d6

Browse files
JamesHollyerJamesHollyer
committed
Merge MDCMigration feature branch
2 parents b5ee326 + 389f4b6 commit ac373d6

File tree

102 files changed

+661
-643
lines changed

Some content is hidden

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

102 files changed

+661
-643
lines changed

‎tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ tf_ng_module(
2020
"//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store",
2121
"//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store:types",
2222
"//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data",
23-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
2423
"//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
24+
"//tensorboard/webapp/angular:expect_angular_material_button",
2525
"@npm//@angular/common",
2626
"@npm//@angular/core",
2727
"@npm//@ngrx/store",

‎tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515

1616
import {CommonModule} from '@angular/common';
1717
import {NgModule} from '@angular/core';
18-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
18+
import {MatButtonModule} from '@angular/material/button';
1919
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
2020
import {ExecutionDataModule} from '../execution_data/execution_data_module';
2121
import {TimelineComponent} from './timeline_component';
@@ -26,7 +26,7 @@ import {TimelineContainer} from './timeline_container';
2626
imports: [
2727
CommonModule,
2828
ExecutionDataModule,
29-
MatLegacyButtonModule,
29+
MatButtonModule,
3030
MatLegacySliderModule,
3131
],
3232
// TODO(cais): The following two providers are meant to make the mat-slider

‎tensorboard/webapp/alert/views/BUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ tf_ng_module(
2626
"//tensorboard/webapp/alert:types",
2727
"//tensorboard/webapp/alert/store",
2828
"//tensorboard/webapp/alert/store:types",
29-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
30-
"//tensorboard/webapp/angular:expect_angular_legacy_material_snackbar",
29+
"//tensorboard/webapp/angular:expect_angular_material_button",
30+
"//tensorboard/webapp/angular:expect_angular_material_snackbar",
3131
"//tensorboard/webapp/util:string",
3232
"@npm//@angular/common",
3333
"@npm//@angular/core",
@@ -49,8 +49,8 @@ tf_ts_library(
4949
"//tensorboard/webapp/alert/store:testing",
5050
"//tensorboard/webapp/angular:expect_angular_cdk_overlay",
5151
"//tensorboard/webapp/angular:expect_angular_core_testing",
52-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
53-
"//tensorboard/webapp/angular:expect_angular_legacy_material_snackbar",
52+
"//tensorboard/webapp/angular:expect_angular_material_button",
53+
"//tensorboard/webapp/angular:expect_angular_material_snackbar",
5454
"//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
5555
"//tensorboard/webapp/angular:expect_ngrx_store_testing",
5656
"@npm//@angular/core",

‎tensorboard/webapp/alert/views/alert_display_snackbar_container.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ limitations under the License.
3333
margin-left: auto;
3434
}
3535

36-
button {
36+
button.mat-mdc-button {
37+
color: inherit;
3738
text-transform: uppercase;
3839
}

‎tensorboard/webapp/alert/views/alert_display_snackbar_container.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ See the License for the specific language governing permissions and
1313
limitations under the License.
1414
==============================================================================*/
1515
import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
16-
import {
17-
MatLegacySnackBarRef,
18-
MAT_LEGACY_SNACK_BAR_DATA,
19-
} from '@angular/material/legacy-snack-bar';
16+
import {MatSnackBarRef, MAT_SNACK_BAR_DATA} from '@angular/material/snack-bar';
2017
import {Store} from '@ngrx/store';
2118
import {State} from '../../app_state';
2219
import {splitByURL} from '../../util/string';
@@ -33,8 +30,8 @@ export class AlertDisplaySnackbarContainer {
3330
readonly splitByURL = splitByURL;
3431

3532
constructor(
36-
private readonly snackBarRef: MatLegacySnackBarRef<AlertDisplaySnackbarContainer>,
37-
@Inject(MAT_LEGACY_SNACK_BAR_DATA) readonly unknownData: unknown,
33+
private readonly snackBarRef: MatSnackBarRef<AlertDisplaySnackbarContainer>,
34+
@Inject(MAT_SNACK_BAR_DATA) readonly unknownData: unknown,
3835
private readonly store: Store<State>
3936
) {
4037
this.alert = unknownData as AlertInfo;

‎tensorboard/webapp/alert/views/alert_snackbar_container.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
OnDestroy,
1919
OnInit,
2020
} from '@angular/core';
21-
import {MatLegacySnackBar} from '@angular/material/legacy-snack-bar';
21+
import {MatSnackBar} from '@angular/material/snack-bar';
2222
import {Store} from '@ngrx/store';
2323
import {Subject} from 'rxjs';
2424
import {filter, takeUntil} from 'rxjs/operators';
@@ -40,7 +40,7 @@ export class AlertSnackbarContainer implements OnInit, OnDestroy {
4040

4141
constructor(
4242
private readonly store: Store<State>,
43-
private readonly snackBar: MatLegacySnackBar
43+
private readonly snackBar: MatSnackBar
4444
) {}
4545

4646
ngOnInit() {

‎tensorboard/webapp/alert/views/alert_snackbar_module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ limitations under the License.
1414
==============================================================================*/
1515
import {CommonModule} from '@angular/common';
1616
import {NgModule} from '@angular/core';
17-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
18-
import {MatLegacySnackBarModule} from '@angular/material/legacy-snack-bar';
17+
import {MatButtonModule} from '@angular/material/button';
18+
import {MatSnackBarModule} from '@angular/material/snack-bar';
1919
import {AlertDisplaySnackbarContainer} from './alert_display_snackbar_container';
2020
import {AlertSnackbarContainer} from './alert_snackbar_container';
2121

@@ -25,7 +25,7 @@ import {AlertSnackbarContainer} from './alert_snackbar_container';
2525
@NgModule({
2626
declarations: [AlertSnackbarContainer, AlertDisplaySnackbarContainer],
2727
exports: [AlertSnackbarContainer],
28-
imports: [CommonModule, MatLegacyButtonModule, MatLegacySnackBarModule],
28+
imports: [CommonModule, MatButtonModule, MatSnackBarModule],
2929
entryComponents: [
3030
// Required for non-Ivy Angular apps.
3131
AlertDisplaySnackbarContainer,

‎tensorboard/webapp/alert/views/alert_snackbar_test.ts

+5-12
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ limitations under the License.
1414
==============================================================================*/
1515
import {OverlayContainer} from '@angular/cdk/overlay';
1616
import {TestBed} from '@angular/core/testing';
17-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
18-
import {
19-
MatLegacySnackBar,
20-
MatLegacySnackBarModule,
21-
} from '@angular/material/legacy-snack-bar';
17+
import {MatButtonModule} from '@angular/material/button';
18+
import {MatSnackBar, MatSnackBarModule} from '@angular/material/snack-bar';
2219
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
2320
import {Action, createAction, props, Store} from '@ngrx/store';
2421
import {MockStore, provideMockStore} from '@ngrx/store/testing';
@@ -45,15 +42,11 @@ describe('alert snackbar', () => {
4542
let snackBarOpenSpy: jasmine.Spy;
4643
let recordedActions: Action[] = [];
4744
let overlayContainer: OverlayContainer;
48-
let snackbar: MatLegacySnackBar;
45+
let snackbar: MatSnackBar;
4946

5047
beforeEach(async () => {
5148
await TestBed.configureTestingModule({
52-
imports: [
53-
NoopAnimationsModule,
54-
MatLegacyButtonModule,
55-
MatLegacySnackBarModule,
56-
],
49+
imports: [NoopAnimationsModule, MatButtonModule, MatSnackBarModule],
5750
providers: [
5851
provideMockStore({
5952
initialState: buildStateFromAlertState(buildAlertState({})),
@@ -67,7 +60,7 @@ describe('alert snackbar', () => {
6760
recordedActions.push(action);
6861
});
6962
overlayContainer = TestBed.inject(OverlayContainer);
70-
snackbar = TestBed.inject(MatLegacySnackBar);
63+
snackbar = TestBed.inject(MatSnackBar);
7164
snackBarOpenSpy = spyOn(snackbar, 'openFromComponent').and.callThrough();
7265
});
7366

‎tensorboard/webapp/angular/BUILD

+19-28
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ tf_ts_library(
7171

7272
# This is a dummy rule used as a @angular/material/autocomplete dependency.
7373
tf_ts_library(
74-
name = "expect_angular_legacy_material_autocomplete",
74+
name = "expect_angular_material_autocomplete",
7575
srcs = [],
7676
deps = [
7777
"@npm//@angular/material",
@@ -87,15 +87,6 @@ tf_ts_library(
8787
],
8888
)
8989

90-
# This is a dummy rule used as a @angular/material/legacy_checkbox dependency.
91-
tf_ts_library(
92-
name = "expect_angular_legacy_material_checkbox",
93-
srcs = [],
94-
deps = [
95-
"@npm//@angular/material",
96-
],
97-
)
98-
9990
# This is a dummy rule used as a @angular/material/checkbox/testing dependency.
10091
tf_ts_library(
10192
name = "expect_angular_material_checkbox_testing",
@@ -107,7 +98,7 @@ tf_ts_library(
10798

10899
# This is a dummy rule used as a @angular/material/button dependency.
109100
tf_ts_library(
110-
name = "expect_angular_legacy_material_button",
101+
name = "expect_angular_material_button",
111102
srcs = [],
112103
deps = [
113104
"@npm//@angular/material",
@@ -125,7 +116,7 @@ tf_ts_library(
125116

126117
# This is a dummy rule used as a @angular/material/chips dependency.
127118
tf_ts_library(
128-
name = "expect_angular_legacy_material_chips",
119+
name = "expect_angular_material_chips",
129120
srcs = [],
130121
deps = [
131122
"@npm//@angular/material",
@@ -134,7 +125,7 @@ tf_ts_library(
134125

135126
# This is a dummy rule used as a @angular/material/dialog dependency.
136127
tf_ts_library(
137-
name = "expect_angular_legacy_material_dialog",
128+
name = "expect_angular_material_dialog",
138129
srcs = [],
139130
deps = [
140131
"@npm//@angular/material",
@@ -143,7 +134,7 @@ tf_ts_library(
143134

144135
# This is a dummy rule used as a @angular/material/dialog/testing dependency.
145136
tf_ts_library(
146-
name = "expect_angular_legacy_material_dialog_testing",
137+
name = "expect_angular_material_dialog_testing",
147138
srcs = [],
148139
deps = [
149140
"@npm//@angular/material",
@@ -152,7 +143,7 @@ tf_ts_library(
152143

153144
# This is a dummy rule used as a @angular/material/expansion dependency.
154145
tf_ts_library(
155-
name = "expect_angular_legacy_material_expansion",
146+
name = "expect_angular_material_expansion",
156147
srcs = [],
157148
deps = [
158149
"@npm//@angular/material",
@@ -161,7 +152,7 @@ tf_ts_library(
161152

162153
# This is a dummy rule used as a @angular/material/expansion dependency.
163154
tf_ts_library(
164-
name = "expect_angular_legacy_material_form_field",
155+
name = "expect_angular_material_form_field",
165156
srcs = [],
166157
deps = [
167158
"@npm//@angular/material",
@@ -188,7 +179,7 @@ tf_ts_library(
188179

189180
# This is a dummy rule used as a @angular/material/input dependency.
190181
tf_ts_library(
191-
name = "expect_angular_legacy_material_input",
182+
name = "expect_angular_material_input",
192183
srcs = [],
193184
deps = [
194185
"@npm//@angular/material",
@@ -197,7 +188,7 @@ tf_ts_library(
197188

198189
# This is a dummy rule used as a @angular/material/menu dependency.
199190
tf_ts_library(
200-
name = "expect_angular_legacy_material_menu",
191+
name = "expect_angular_material_menu",
201192
srcs = [],
202193
deps = [
203194
"@npm//@angular/material",
@@ -206,7 +197,7 @@ tf_ts_library(
206197

207198
# This is a dummy rule used as a @angular/material/menu/testing dependency.
208199
tf_ts_library(
209-
name = "expect_angular_legacy_material_menu_testing",
200+
name = "expect_angular_material_menu_testing",
210201
srcs = [],
211202
deps = [
212203
"@npm//@angular/material",
@@ -215,7 +206,7 @@ tf_ts_library(
215206

216207
# This is a dummy rule used as a @angular/material/paginator dependency.
217208
tf_ts_library(
218-
name = "expect_angular_legacy_material_paginator",
209+
name = "expect_angular_material_paginator",
219210
srcs = [],
220211
deps = [
221212
"@npm//@angular/material",
@@ -224,7 +215,7 @@ tf_ts_library(
224215

225216
# This is a dummy rule used as a @angular/material/progress_spinner dependency.
226217
tf_ts_library(
227-
name = "expect_angular_legacy_material_progress_spinner",
218+
name = "expect_angular_material_progress_spinner",
228219
srcs = [],
229220
deps = [
230221
"@npm//@angular/material",
@@ -233,7 +224,7 @@ tf_ts_library(
233224

234225
# This is a dummy rule used as a @angular/material/select dependency.
235226
tf_ts_library(
236-
name = "expect_angular_legacy_material_select",
227+
name = "expect_angular_material_select",
237228
srcs = [],
238229
deps = [
239230
"@npm//@angular/material",
@@ -242,7 +233,7 @@ tf_ts_library(
242233

243234
# This is a dummy rule used as a @angular/material/select/testing dependency.
244235
tf_ts_library(
245-
name = "expect_angular_legacy_material_select_testing",
236+
name = "expect_angular_material_select_testing",
246237
srcs = [],
247238
deps = [
248239
"@npm//@angular/material",
@@ -251,7 +242,7 @@ tf_ts_library(
251242

252243
# This is a dummy rule used as a @angular/material/slide_toggle dependency.
253244
tf_ts_library(
254-
name = "expect_angular_legacy_material_slide_toggle",
245+
name = "expect_angular_material_slide_toggle",
255246
srcs = [],
256247
deps = [
257248
"@npm//@angular/material",
@@ -269,7 +260,7 @@ tf_ts_library(
269260

270261
# This is a dummy rule used as a @angular/material/snackbar dependency.
271262
tf_ts_library(
272-
name = "expect_angular_legacy_material_snackbar",
263+
name = "expect_angular_material_snackbar",
273264
srcs = [],
274265
deps = [
275266
"@npm//@angular/material",
@@ -287,7 +278,7 @@ tf_ts_library(
287278

288279
# This is a dummy rule used as a @angular/material/table dependency.
289280
tf_ts_library(
290-
name = "expect_angular_legacy_material_table",
281+
name = "expect_angular_material_table",
291282
srcs = [],
292283
deps = [
293284
"@npm//@angular/material",
@@ -296,7 +287,7 @@ tf_ts_library(
296287

297288
# This is a dummy rule used as a @angular/material/tabs dependency.
298289
tf_ts_library(
299-
name = "expect_angular_legacy_material_tabs",
290+
name = "expect_angular_material_tabs",
300291
srcs = [],
301292
deps = [
302293
"@npm//@angular/material",
@@ -314,7 +305,7 @@ tf_ts_library(
314305

315306
# This is a dummy rule used as a @angular/material/tooltip dependency.
316307
tf_ts_library(
317-
name = "expect_angular_legacy_material_tooltip",
308+
name = "expect_angular_material_tooltip",
318309
srcs = [],
319310
deps = [
320311
"@npm//@angular/material",

‎tensorboard/webapp/core/views/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tf_ng_module(
1717
],
1818
assets = [":layout_styles"],
1919
deps = [
20-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
20+
"//tensorboard/webapp/angular:expect_angular_material_button",
2121
"//tensorboard/webapp/angular:expect_angular_material_icon",
2222
"//tensorboard/webapp/core:state",
2323
"//tensorboard/webapp/core:types",

‎tensorboard/webapp/core/views/layout_module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ limitations under the License.
1414
==============================================================================*/
1515
import {CommonModule} from '@angular/common';
1616
import {NgModule} from '@angular/core';
17-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
17+
import {MatButtonModule} from '@angular/material/button';
1818
import {MatIconModule} from '@angular/material/icon';
1919
import {LayoutContainer} from './layout_container';
2020

@@ -24,6 +24,6 @@ import {LayoutContainer} from './layout_container';
2424
@NgModule({
2525
declarations: [LayoutContainer],
2626
exports: [LayoutContainer],
27-
imports: [CommonModule, MatIconModule, MatLegacyButtonModule],
27+
imports: [CommonModule, MatIconModule, MatButtonModule],
2828
})
2929
export class LayoutModule {}

0 commit comments

Comments
 (0)