Skip to content

Commit 8a4625f

Browse files
committed
refactor(material/toolbar): convert to standalone
Converts `material/toolbar` to standalone.
1 parent b081cd6 commit 8a4625f

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

src/material/toolbar/testing/toolbar-harness.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ describe('MatToolbarHarness', () => {
1111

1212
beforeEach(async () => {
1313
await TestBed.configureTestingModule({
14-
imports: [MatToolbarModule],
15-
declarations: [ToolbarHarnessTest],
14+
imports: [MatToolbarModule, ToolbarHarnessTest],
1615
}).compileComponents();
1716

1817
fixture = TestBed.createComponent(ToolbarHarnessTest);
@@ -75,6 +74,8 @@ describe('MatToolbarHarness', () => {
7574
</mat-toolbar-row>
7675
</mat-toolbar>
7776
`,
77+
standalone: true,
78+
imports: [MatToolbarModule],
7879
})
7980
class ToolbarHarnessTest {}
8081

src/material/toolbar/toolbar-module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import {MatCommonModule} from '@angular/material/core';
1111
import {MatToolbar, MatToolbarRow} from './toolbar';
1212

1313
@NgModule({
14-
imports: [MatCommonModule],
14+
imports: [MatCommonModule, MatToolbar, MatToolbarRow],
1515
exports: [MatToolbar, MatToolbarRow, MatCommonModule],
16-
declarations: [MatToolbar, MatToolbarRow],
1716
})
1817
export class MatToolbarModule {}

src/material/toolbar/toolbar.spec.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import {MatToolbarModule} from './index';
77
describe('MatToolbar', () => {
88
beforeEach(waitForAsync(() => {
99
TestBed.configureTestingModule({
10-
imports: [MatToolbarModule, CommonModule],
11-
declarations: [
10+
imports: [
11+
MatToolbarModule,
12+
CommonModule,
1213
ToolbarSingleRow,
1314
ToolbarMultipleRows,
1415
ToolbarMixedRowModes,
@@ -109,6 +110,8 @@ describe('MatToolbar', () => {
109110
<span>First Row</span>
110111
</mat-toolbar>
111112
`,
113+
standalone: true,
114+
imports: [MatToolbarModule, CommonModule],
112115
})
113116
class ToolbarSingleRow {
114117
toolbarColor: string;
@@ -121,6 +124,8 @@ class ToolbarSingleRow {
121124
<mat-toolbar-row>Second Row</mat-toolbar-row>
122125
</mat-toolbar>
123126
`,
127+
standalone: true,
128+
imports: [MatToolbarModule, CommonModule],
124129
})
125130
class ToolbarMultipleRows {}
126131

@@ -133,6 +138,8 @@ class ToolbarMultipleRows {}
133138
}
134139
</mat-toolbar>
135140
`,
141+
standalone: true,
142+
imports: [MatToolbarModule, CommonModule],
136143
})
137144
class ToolbarMixedRowModes {
138145
showToolbarRow: boolean = true;
@@ -148,5 +155,7 @@ class ToolbarMixedRowModes {
148155
}
149156
</mat-toolbar>
150157
`,
158+
standalone: true,
159+
imports: [MatToolbarModule, CommonModule],
151160
})
152161
class ToolbarMultipleIndirectRows {}

src/material/toolbar/toolbar.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
selector: 'mat-toolbar-row',
2626
exportAs: 'matToolbarRow',
2727
host: {'class': 'mat-toolbar-row'},
28+
standalone: true,
2829
})
2930
export class MatToolbarRow {}
3031

@@ -41,6 +42,7 @@ export class MatToolbarRow {}
4142
},
4243
changeDetection: ChangeDetectionStrategy.OnPush,
4344
encapsulation: ViewEncapsulation.None,
45+
standalone: true,
4446
})
4547
export class MatToolbar implements AfterViewInit {
4648
// TODO: should be typed as `ThemePalette` but internal apps pass in arbitrary strings.

tools/public_api_guard/material/toolbar.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { AfterViewInit } from '@angular/core';
88
import { ElementRef } from '@angular/core';
99
import * as i0 from '@angular/core';
10-
import * as i2 from '@angular/material/core';
10+
import * as i1 from '@angular/material/core';
1111
import { Platform } from '@angular/cdk/platform';
1212
import { QueryList } from '@angular/core';
1313

@@ -21,7 +21,7 @@ export class MatToolbar implements AfterViewInit {
2121
ngAfterViewInit(): void;
2222
_toolbarRows: QueryList<MatToolbarRow>;
2323
// (undocumented)
24-
static ɵcmp: i0.ɵɵComponentDeclaration<MatToolbar, "mat-toolbar", ["matToolbar"], { "color": { "alias": "color"; "required": false; }; }, {}, ["_toolbarRows"], ["*", "mat-toolbar-row"], false, never>;
24+
static ɵcmp: i0.ɵɵComponentDeclaration<MatToolbar, "mat-toolbar", ["matToolbar"], { "color": { "alias": "color"; "required": false; }; }, {}, ["_toolbarRows"], ["*", "mat-toolbar-row"], true, never>;
2525
// (undocumented)
2626
static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbar, never>;
2727
}
@@ -33,13 +33,13 @@ export class MatToolbarModule {
3333
// (undocumented)
3434
static ɵinj: i0.ɵɵInjectorDeclaration<MatToolbarModule>;
3535
// (undocumented)
36-
static ɵmod: i0.ɵɵNgModuleDeclaration<MatToolbarModule, [typeof i1.MatToolbar, typeof i1.MatToolbarRow], [typeof i2.MatCommonModule], [typeof i1.MatToolbar, typeof i1.MatToolbarRow, typeof i2.MatCommonModule]>;
36+
static ɵmod: i0.ɵɵNgModuleDeclaration<MatToolbarModule, never, [typeof i1.MatCommonModule, typeof i2.MatToolbar, typeof i2.MatToolbarRow], [typeof i2.MatToolbar, typeof i2.MatToolbarRow, typeof i1.MatCommonModule]>;
3737
}
3838

3939
// @public (undocumented)
4040
export class MatToolbarRow {
4141
// (undocumented)
42-
static ɵdir: i0.ɵɵDirectiveDeclaration<MatToolbarRow, "mat-toolbar-row", ["matToolbarRow"], {}, {}, never, never, false, never>;
42+
static ɵdir: i0.ɵɵDirectiveDeclaration<MatToolbarRow, "mat-toolbar-row", ["matToolbarRow"], {}, {}, never, never, true, never>;
4343
// (undocumented)
4444
static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbarRow, never>;
4545
}

0 commit comments

Comments
 (0)