Skip to content

Commit d66d735

Browse files
devversionmmalerba
authored andcommitted
chore: add md-table to universal app (#6356)
* Adds the md-table component to the universal app. This means that it will be verified by the prerender task on the CI.
1 parent d48b957 commit d66d735

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

src/universal-app/kitchen-sink/kitchen-sink.html

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,24 @@ <h2>Expansion Panel</h2>
250250

251251
<h2>CDK Table</h2>
252252

253-
<cdk-table #table [dataSource]="cdkTableDataSource">
253+
<cdk-table #table [dataSource]="tableDataSource">
254254
<ng-container cdkColumnDef="userId">
255255
<cdk-header-cell *cdkHeaderCellDef>ID</cdk-header-cell>
256256
<cdk-cell *cdkCellDef="let row">{{row.userId}}</cdk-cell>
257257
</ng-container>
258258

259-
<cdk-header-row *cdkHeaderRowDef="cdkTableColumns" ></cdk-header-row>
260-
<cdk-row *cdkRowDef="let row; columns: cdkTableColumns;"></cdk-row>
259+
<cdk-header-row *cdkHeaderRowDef="tableColumns" ></cdk-header-row>
260+
<cdk-row *cdkRowDef="let row; columns: tableColumns;"></cdk-row>
261261
</cdk-table>
262+
263+
<h2>Material Table</h2>
264+
265+
<md-table [dataSource]="tableDataSource">
266+
<ng-container cdkColumnDef="userId">
267+
<md-header-cell *cdkHeaderCellDef>ID</md-header-cell>
268+
<md-cell *cdkCellDef="let row"> {{row.userId}} </md-cell>
269+
</ng-container>
270+
271+
<md-header-row *cdkHeaderRowDef="tableColumns"></md-header-row>
272+
<md-row *cdkRowDef="let row; columns: tableColumns;"></md-row>
273+
</md-table>

src/universal-app/kitchen-sink/kitchen-sink.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import {
2727
MdSlideToggleModule,
2828
MdSnackBarModule,
2929
MdSortModule,
30+
MdTableModule,
3031
MdTabsModule,
3132
MdToolbarModule,
3233
MdTooltipModule,
@@ -45,11 +46,11 @@ import 'rxjs/add/observable/of';
4546
})
4647
export class KitchenSink {
4748

48-
/** List of columns for the CDK table. */
49-
cdkTableColumns = ['userId'];
49+
/** List of columns for the CDK and Material table. */
50+
tableColumns = ['userId'];
5051

51-
/** Data source for the CDK table. */
52-
cdkTableDataSource: DataSource<any> = {
52+
/** Data source for the CDK and Material table. */
53+
tableDataSource: DataSource<any> = {
5354
connect: () => Observable.of([
5455
{ userId: 1 },
5556
{ userId: 2 }
@@ -93,6 +94,7 @@ export class KitchenSink {
9394
MdTooltipModule,
9495
MdExpansionModule,
9596
MdSortModule,
97+
MdTableModule,
9698

9799
// CDK Modules
98100
CdkTableModule

0 commit comments

Comments
 (0)