Skip to content

Commit

Permalink
2.5.15, dart format
Browse files Browse the repository at this point in the history
  • Loading branch information
maxim-saplin committed Jun 11, 2024
1 parent 701e22e commit 74e193e
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 19 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.5.15
- `dart fromat .`

## 2.5.14
- Fixing linter warnings (replacing deprecated MaterialStateProperty)

Expand Down
14 changes: 6 additions & 8 deletions lib/src/data_table_2.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1038,8 +1038,7 @@ class DataTable2 extends DataTable {
?.resolve({WidgetState.hovered})
: null),
thickness: (isiOS
? scrollBarTheme.thickness
?.resolve({WidgetState.hovered})
? scrollBarTheme.thickness?.resolve({WidgetState.hovered})
: null),
controller: coreHorizontalController,
child: Column(mainAxisSize: MainAxisSize.min, children: [
Expand Down Expand Up @@ -1181,7 +1180,9 @@ class DataTable2 extends DataTable {
checkboxTheme: headingCheckboxTheme,
tristate: true,
rowHeight: headingHeight)
: SizedBox(height: headingHeight,);
: SizedBox(
height: headingHeight,
);

if (fixedCornerRows != null) {
fixedCornerRows[0].children[0] = headingRow.children[0];
Expand Down Expand Up @@ -1394,11 +1395,8 @@ class DataTable2 extends DataTable {
return tableRows;
}

TableRow _buildHeadingRow(
BuildContext context,
ThemeData theme,
WidgetStateProperty<Color?>? effectiveHeadingRowColor,
int numberOfCols) {
TableRow _buildHeadingRow(BuildContext context, ThemeData theme,
WidgetStateProperty<Color?>? effectiveHeadingRowColor, int numberOfCols) {
var headingRow = TableRow(
key: _headingRowKey,
decoration: BoxDecoration(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: data_table_2
description: In-place substitute for Flutter's DataTable and PaginatedDataTable with fixed/sticky headers and few extra features
version: 2.5.12
version: 2.5.15
homepage: https://github.com/maxim-saplin/data_table_2
repository: https://github.com/maxim-saplin/data_table_2

Expand Down
1 change: 0 additions & 1 deletion test/async_paginated_data_table2_fixed_rows_cols_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@TestOn('!chrome')
library;


import 'dart:async';

import 'package:data_table_2/data_table_2.dart';
Expand Down
1 change: 0 additions & 1 deletion test/chasing_coverage_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@TestOn('!chrome')
library;


import 'dart:async';

import 'package:data_table_2/data_table_2.dart';
Expand Down
8 changes: 2 additions & 6 deletions test/custom_features_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@TestOn('!chrome')
library;


import 'package:data_table_2/data_table_2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
Expand Down Expand Up @@ -666,8 +665,7 @@ void main() {
headingRowColor: WidgetStateProperty.all(Colors.yellow)));

var t = tester.widget(find.byType(DataTable2)) as DataTable2;
expect(
t.headingRowColor!.resolve({WidgetState.focused}), Colors.yellow);
expect(t.headingRowColor!.resolve({WidgetState.focused}), Colors.yellow);

await wrapWidgetSetSurf(tester, buildPaginatedTable());

Expand Down Expand Up @@ -2003,7 +2001,7 @@ void main() {
rows: rows,
));

await tester.pumpAndSettle();
await tester.pumpAndSettle();
expect(find.text('Column1'), findsOneWidget);
expect(find.byType(Checkbox), findsNWidgets(2));

Expand All @@ -2022,8 +2020,6 @@ void main() {
});
}



Tripple<Size> _getColumnSizes(WidgetTester tester, bool header) {
var s0 = tester.getSize(find.byType(DataTable2));

Expand Down
1 change: 0 additions & 1 deletion test/fixed_rows_cols_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@TestOn('!chrome')
library;


import 'dart:async';

import 'package:data_table_2/data_table_2.dart';
Expand Down
1 change: 0 additions & 1 deletion test/paginated_data_table2_fixed_rows_cols_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@TestOn('!chrome')
library;


import 'dart:async';

import 'package:data_table_2/data_table_2.dart';
Expand Down

0 comments on commit 74e193e

Please sign in to comment.