Skip to content

Commit 64af59e

Browse files
authored
[two_dimensional_scrollables] Fix repaint boundary override in builder delegate (#4814)
Fixes flutter/flutter#133582 This fixes a small bug where we accidentally overwrote the default of addRepaintBoundaries Because of this, I had to refactor a test here that used keys to identify children, but now that an additional render object widget is inserted through the RepaintBoundary, the look-ups broke.
1 parent b4985e2 commit 64af59e

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

packages/two_dimensional_scrollables/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.0.2
2+
3+
* Fixes override of default TwoDimensionalChildBuilderDelegate.addRepaintBoundaries.
4+
15
## 0.0.1+1
26

37
* Adds pub topics to package metadata.

packages/two_dimensional_scrollables/lib/src/table_view/table_delegate.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class TableCellBuilderDelegate extends TwoDimensionalChildBuilderDelegate
124124
required int rowCount,
125125
int pinnedColumnCount = 0,
126126
int pinnedRowCount = 0,
127-
super.addRepaintBoundaries = false,
127+
super.addRepaintBoundaries,
128128
required TableViewCellBuilder cellBuilder,
129129
required TableSpanBuilder columnBuilder,
130130
required TableSpanBuilder rowBuilder,

packages/two_dimensional_scrollables/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: two_dimensional_scrollables
22
description: Widgets that scroll using the two dimensional scrolling foundation.
3-
version: 0.0.1+1
3+
version: 0.0.2
44
repository: https://github.com/flutter/packages/tree/main/packages/two_dimensional_scrollables
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+two_dimensional_scrollables%22+
66

packages/two_dimensional_scrollables/test/table_view/table_delegate_test.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,17 @@ void main() {
146146
expect(delegate.maxXIndex, 4); // columns
147147
});
148148

149+
test('Respects super class default for addRepaintBoundaries', () {
150+
final TableCellBuilderDelegate delegate = TableCellBuilderDelegate(
151+
cellBuilder: (_, __) => cell,
152+
columnBuilder: (_) => span,
153+
rowBuilder: (_) => span,
154+
columnCount: 5,
155+
rowCount: 6,
156+
);
157+
expect(delegate.addRepaintBoundaries, isTrue);
158+
});
159+
149160
test('Notifies listeners & rebuilds', () {
150161
int notified = 0;
151162
TableCellBuilderDelegate oldDelegate;

packages/two_dimensional_scrollables/test/table_view/table_test.dart

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -287,24 +287,17 @@ void main() {
287287
expect(viewport.mainAxis, Axis.vertical);
288288
// first child
289289
TableVicinity vicinity = const TableVicinity(column: 0, row: 0);
290-
expect(
291-
parentDataOf(viewport.firstChild!).vicinity,
292-
vicinity,
293-
);
294290
TableViewParentData parentData = parentDataOf(
295-
tester.renderObject<RenderBox>(find.byKey(childKeys[vicinity]!)),
291+
viewport.firstChild!,
296292
);
297293
expect(parentData.vicinity, vicinity);
298294
expect(parentData.layoutOffset, Offset.zero);
299295
expect(parentData.isVisible, isTrue);
300296
// after first child
301297
vicinity = const TableVicinity(column: 1, row: 0);
302-
expect(
303-
parentDataOf(viewport.childAfter(viewport.firstChild!)!).vicinity,
304-
vicinity,
305-
);
298+
306299
parentData = parentDataOf(
307-
tester.renderObject<RenderBox>(find.byKey(childKeys[vicinity]!)),
300+
viewport.childAfter(viewport.firstChild!)!,
308301
);
309302
expect(parentData.vicinity, vicinity);
310303
expect(parentData.layoutOffset, const Offset(200, 0.0));
@@ -317,13 +310,7 @@ void main() {
317310

318311
// last child
319312
vicinity = const TableVicinity(column: 4, row: 4);
320-
expect(
321-
parentDataOf(viewport.lastChild!).vicinity,
322-
vicinity,
323-
);
324-
parentData = parentDataOf(
325-
tester.renderObject<RenderBox>(find.byKey(childKeys[vicinity]!)),
326-
);
313+
parentData = parentDataOf(viewport.lastChild!);
327314
expect(parentData.vicinity, vicinity);
328315
expect(parentData.layoutOffset, const Offset(800.0, 800.0));
329316
expect(parentData.isVisible, isFalse);
@@ -334,12 +321,8 @@ void main() {
334321
);
335322
// before last child
336323
vicinity = const TableVicinity(column: 3, row: 4);
337-
expect(
338-
parentDataOf(viewport.childBefore(viewport.lastChild!)!).vicinity,
339-
vicinity,
340-
);
341324
parentData = parentDataOf(
342-
tester.renderObject<RenderBox>(find.byKey(childKeys[vicinity]!)),
325+
viewport.childBefore(viewport.lastChild!)!,
343326
);
344327
expect(parentData.vicinity, vicinity);
345328
expect(parentData.layoutOffset, const Offset(600.0, 800.0));

0 commit comments

Comments
 (0)