Skip to content

[two_dimensional_scrollables] Fix layout offset of merged pinned cells #6178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 3 commits into from
Feb 22, 2024
Merged

[two_dimensional_scrollables] Fix layout offset of merged pinned cells #6178

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf36bcc
Fix merged pinned cells
Piinks Feb 22, 2024
40c509b
versioning
Piinks Feb 22, 2024
7055572
Formatting fix
Piinks Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Formatting fix
  • Loading branch information
@Piinks
Piinks committed Feb 22, 2024
commit 705557259709ef7d868157746a2ea07f7b9b126b
236 changes: 120 additions & 116 deletions packages/two_dimensional_scrollables/test/table_view/table_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,34 +1766,35 @@ void main() {
final ScrollController verticalController = ScrollController();
final ScrollController horizontalController = ScrollController();
final TableView tableView = TableView.builder(
verticalDetails: ScrollableDetails.vertical(
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart: bothMerged[vicinity]?.start ??
columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
});
verticalDetails: ScrollableDetails.vertical(
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart:
bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
},
);
await tester.pumpWidget(MaterialApp(home: tableView));
await tester.pumpAndSettle();

Expand Down Expand Up @@ -1875,35 +1876,36 @@ void main() {
final ScrollController verticalController = ScrollController();
final ScrollController horizontalController = ScrollController();
final TableView tableView = TableView.builder(
verticalDetails: ScrollableDetails.vertical(
reverse: true,
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart: bothMerged[vicinity]?.start ??
columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
});
verticalDetails: ScrollableDetails.vertical(
reverse: true,
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart:
bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
},
);
await tester.pumpWidget(MaterialApp(home: tableView));
await tester.pumpAndSettle();

Expand Down Expand Up @@ -1985,35 +1987,36 @@ void main() {
final ScrollController verticalController = ScrollController();
final ScrollController horizontalController = ScrollController();
final TableView tableView = TableView.builder(
verticalDetails: ScrollableDetails.vertical(
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
reverse: true,
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart: bothMerged[vicinity]?.start ??
columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
});
verticalDetails: ScrollableDetails.vertical(
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
reverse: true,
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart:
bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
},
);
await tester.pumpWidget(MaterialApp(home: tableView));
await tester.pumpAndSettle();

Expand Down Expand Up @@ -2095,36 +2098,37 @@ void main() {
final ScrollController verticalController = ScrollController();
final ScrollController horizontalController = ScrollController();
final TableView tableView = TableView.builder(
verticalDetails: ScrollableDetails.vertical(
reverse: true,
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
reverse: true,
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart: bothMerged[vicinity]?.start ??
columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
});
verticalDetails: ScrollableDetails.vertical(
reverse: true,
controller: verticalController,
),
horizontalDetails: ScrollableDetails.horizontal(
reverse: true,
controller: horizontalController,
),
columnCount: 20,
rowCount: 20,
pinnedRowCount: 2,
pinnedColumnCount: 2,
columnBuilder: (_) => span,
rowBuilder: (_) => span,
cellBuilder: (_, TableVicinity vicinity) {
return TableViewCell(
columnMergeStart:
bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start,
columnMergeSpan:
bothMerged[vicinity]?.span ?? columnMerged[vicinity]?.span,
rowMergeStart:
bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start,
rowMergeSpan:
bothMerged[vicinity]?.span ?? rowMerged[vicinity]?.span,
child: Text(
'R${bothMerged[vicinity]?.start ?? rowMerged[vicinity]?.start ?? vicinity.row}:'
'C${bothMerged[vicinity]?.start ?? columnMerged[vicinity]?.start ?? vicinity.column}',
),
);
},
);
await tester.pumpWidget(MaterialApp(home: tableView));
await tester.pumpAndSettle();

Expand Down