firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Data Table Class with Borders Like Table Widgets (#36837) (#92670)

Browse Source
This commit is contained in:
Dheeraj Verma 2021-11-01 21:38:05 +05:30 committed by GitHub
parent c97a8622bf
commit 8880008452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/material/data_table.dart
View File

@ -391,6 +391,7 @@ class DataTable extends StatelessWidget {
this.dividerThickness,
required this.rows,
this.checkboxHorizontalMargin,
this.border,
}) : assert(columns != null),
assert(columns.isNotEmpty),
assert(sortColumnIndex == null || (sortColumnIndex >= 0 && sortColumnIndex < columns.length)),
@ -615,6 +616,9 @@ class DataTable extends StatelessWidget {
/// and the content in the first data column. This value defaults to 24.0.
final double? checkboxHorizontalMargin;
/// The style to use when painting the boundary and interior divisions of the table.
final TableBorder? border;
// Set by the constructor to the index of the only Column that is
// non-numeric, if there is exactly one, otherwise null.
final int? _onlyTextColumn;
@ -1022,6 +1026,7 @@ class DataTable extends StatelessWidget {
child: Table(
columnWidths: tableColumns.asMap(),
children: tableRows,
border: border,
),
),
);

65
packages/flutter/test/material/data_table_test.dart
View File

@ -1670,4 +1670,69 @@ void main() {
expect(find.widgetWithText(TableRowInkWell, 'Bug'), findsNothing);
expect(find.widgetWithText(TableRowInkWell, 'GitHub'), findsNothing);
});
testWidgets('DataTable set interior border test', (WidgetTester tester) async {
const List<DataColumn> columns = <DataColumn>[
DataColumn(label: Text('column1')),
DataColumn(label: Text('column2')),
];
const List<DataCell> cells = <DataCell>[
DataCell(Text('cell1')),
DataCell(Text('cell2')),
];
const List<DataRow> rows = <DataRow>[
DataRow(cells: cells),
DataRow(cells: cells),
];
await tester.pumpWidget(
MaterialApp(
home: Material(
child: DataTable(
border: TableBorder.all(width: 2, color: Colors.red),
columns: columns,
rows: rows,
),
),
),
);
final Finder finder = find.byType(DataTable);
expect(tester.getSize(finder), equals(const Size(800, 600)));
await tester.pumpWidget(
MaterialApp(
home: Material(
child: DataTable(
border: TableBorder.all(color: Colors.red),
columns: columns,
rows: rows,
),
),
),
);
Table table = tester.widget(find.byType(Table));
TableBorder? tableBorder = table.border;
expect(tableBorder!.top.color, Colors.red);
expect(tableBorder.bottom.width, 1);
await tester.pumpWidget(
MaterialApp(
home: Material(
child: DataTable(
columns: columns,
rows: rows,
),
),
),
);
table = tester.widget(find.byType(Table));
tableBorder = table.border;
expect(tableBorder?.bottom.width, null);
expect(tableBorder?.top.color, null);
});
}