Skip to content

Commit

Permalink
fix(material/table): rename flex example (#20316)
Browse files Browse the repository at this point in the history
(cherry picked from commit 3396b4b)
  • Loading branch information
andrewseguin authored and wagnermaciel committed Aug 18, 2020
1 parent d79ff1d commit be244f2
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ const ELEMENT_DATA: PeriodicElement[] = [
* @title Basic use of `<cdk-table>` (uses display flex)
*/
@Component({
selector: 'cdk-table-basic-flex-example',
styleUrls: ['cdk-table-basic-flex-example.css'],
templateUrl: 'cdk-table-basic-flex-example.html',
selector: 'cdk-table-flex-basic-example',
styleUrls: ['cdk-table-flex-basic-example.css'],
templateUrl: 'cdk-table-flex-basic-example.html',
})
export class CdkTableBasicFlexExample {
export class CdkTableFlexBasicExample {
displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];
dataSource = new ExampleDataSource();
}
Expand Down
6 changes: 3 additions & 3 deletions src/components-examples/cdk/table/index.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {CdkTableModule} from '@angular/cdk/table';
import {NgModule} from '@angular/core';
import {CdkTableBasicFlexExample} from './cdk-table-basic-flex/cdk-table-basic-flex-example';
import {CdkTableFlexBasicExample} from './cdk-table-flex-basic/cdk-table-flex-basic-example';
import {CdkTableBasicExample} from './cdk-table-basic/cdk-table-basic-example';

export {
CdkTableBasicExample,
CdkTableBasicFlexExample,
CdkTableFlexBasicExample,
};

const EXAMPLES = [
CdkTableBasicExample,
CdkTableBasicFlexExample,
CdkTableFlexBasicExample,
];

@NgModule({
Expand Down
6 changes: 3 additions & 3 deletions src/components-examples/material/table/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {MatTableModule} from '@angular/material/table';
import {DragDropModule} from '@angular/cdk/drag-drop';
import {CdkTableModule} from '@angular/cdk/table';

import {TableBasicFlexExample} from './table-basic-flex/table-basic-flex-example';
import {TableFlexBasicExample} from './table-flex-basic/table-flex-basic-example';
import {TableBasicExample} from './table-basic/table-basic-example';
import {TableDynamicColumnsExample} from './table-dynamic-columns/table-dynamic-columns-example';
import {TableExpandableRowsExample} from './table-expandable-rows/table-expandable-rows-example';
Expand Down Expand Up @@ -42,7 +42,7 @@ import {TableWrappedExample, WrapperTable} from './table-wrapped/table-wrapped-e
import {TableReorderableExample} from './table-reorderable/table-reorderable-example';

export {
TableBasicExample, TableBasicFlexExample,
TableBasicExample, TableFlexBasicExample,
TableDynamicColumnsExample, TableExpandableRowsExample,
TableFilteringExample, TableFooterRowExample,
TableHttpExample, TableMultipleHeaderFooterExample,
Expand All @@ -57,7 +57,7 @@ export {
};

const EXAMPLES = [
TableBasicExample, TableBasicFlexExample,
TableBasicExample, TableFlexBasicExample,
TableDynamicColumnsExample, TableExpandableRowsExample,
TableFilteringExample, TableFooterRowExample,
TableHttpExample, TableMultipleHeaderFooterExample,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ const ELEMENT_DATA: PeriodicElement[] = [
* @title Basic use of `<mat-table>` (uses display flex)
*/
@Component({
selector: 'table-basic-flex-example',
styleUrls: ['table-basic-flex-example.css'],
templateUrl: 'table-basic-flex-example.html',
selector: 'table-flex-basic-example',
styleUrls: ['table-flex-basic-example.css'],
templateUrl: 'table-flex-basic-example.html',
})
export class TableBasicFlexExample {
export class TableFlexBasicExample {
displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];
dataSource = ELEMENT_DATA;
}
4 changes: 2 additions & 2 deletions src/dev-app/table/table-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ <h3>Cdk table basic</h3>
<cdk-table-basic-example></cdk-table-basic-example>

<h3>Cdk table basic flex</h3>
<cdk-table-basic-flex-example></cdk-table-basic-flex-example>
<cdk-table-flex-basic-example></cdk-table-flex-basic-example>

<h3>Table basic</h3>
<table-basic-example></table-basic-example>

<h3>Table basic flex</h3>
<table-basic-flex-example></table-basic-flex-example>
<table-flex-basic-example></table-flex-basic-example>

<h3>Table dynamic columns</h3>
<table-dynamic-columns-example></table-dynamic-columns-example>
Expand Down

0 comments on commit be244f2

Please sign in to comment.