Skip to content

[two_dimensional_scrollables] Fix missing leading cache extent for TableView #9636

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
Jul 17, 2025
Merged

[two_dimensional_scrollables] Fix missing leading cache extent for TableView #9636

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baefef5
Fix missing leading cache extent for TableView
Piinks Jul 16, 2025
6cd0c16
Release infos
Piinks Jul 16, 2025
28cdd46
Update packages/two_dimensional_scrollables/lib/src/table_view/table.…
Piinks Jul 17, 2025
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
4 changes: 4 additions & 0 deletions packages/two_dimensional_scrollables/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.7

* Fixes missing leading cache extent in TableView.

## 0.3.6

* Fixes typo in API docs.
Expand Down
49 changes: 34 additions & 15 deletions packages/two_dimensional_scrollables/lib/src/table_view/table.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,17 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {

int? _columnNullTerminatedIndex;
bool get _columnsAreInfinite => delegate.columnCount == null;
// Where column layout begins, potentially outside of the visible area.
double get _targetLeadingColumnPixel {
return clampDouble(
horizontalOffset.pixels - cacheExtent,
0,
double.infinity,
);
}

// How far columns should be laid out in a given frame.
double get _targetColumnPixel {
double get _targetTrailingColumnPixel {
return cacheExtent +
horizontalOffset.pixels +
viewportDimension.width -
Expand All @@ -343,8 +352,17 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {

int? _rowNullTerminatedIndex;
bool get _rowsAreInfinite => delegate.rowCount == null;
// Where row layout begins, potentially outside of the visible area.
double get _targetLeadingRowPixel {
return clampDouble(
verticalOffset.pixels - cacheExtent,
0,
double.infinity,
);
}

// How far rows should be laid out in a given frame.
double get _targetRowPixel {
double get _targetTrailingRowPixel {
return cacheExtent +
verticalOffset.pixels +
viewportDimension.height -
Expand Down Expand Up @@ -535,11 +553,11 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
);
_columnMetrics[column] = span;
if (!isPinned) {
if (span.trailingOffset >= horizontalOffset.pixels &&
if (span.trailingOffset >= _targetLeadingColumnPixel &&
_firstNonPinnedColumn == null) {
_firstNonPinnedColumn = column;
}
if (span.trailingOffset >= _targetColumnPixel &&
if (span.trailingOffset >= _targetTrailingColumnPixel &&
_lastNonPinnedColumn == null) {
_lastNonPinnedColumn = column;
}
Expand Down Expand Up @@ -637,11 +655,11 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
);
_rowMetrics[row] = span;
if (!isPinned) {
if (span.trailingOffset >= verticalOffset.pixels &&
if (span.trailingOffset >= _targetLeadingRowPixel &&
_firstNonPinnedRow == null) {
_firstNonPinnedRow = row;
}
if (span.trailingOffset > _targetRowPixel &&
if (span.trailingOffset > _targetTrailingRowPixel &&
_lastNonPinnedRow == null) {
_lastNonPinnedRow = row;
}
Expand Down Expand Up @@ -723,13 +741,13 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
if (_columnMetrics.isNotEmpty) {
_Span lastKnownColumn = _columnMetrics[_columnMetrics.length - 1]!;
if (_columnsAreInfinite &&
lastKnownColumn.trailingOffset < _targetColumnPixel) {
lastKnownColumn.trailingOffset < _targetTrailingColumnPixel) {
// This will add the column metrics we do not know about up to the
// _targetColumnPixel, while keeping the ones we already know about.
_updateColumnMetrics(appendColumns: true);
lastKnownColumn = _columnMetrics[_columnMetrics.length - 1]!;
assert(_columnMetrics.length == delegate.columnCount ||
lastKnownColumn.trailingOffset >= _targetColumnPixel ||
lastKnownColumn.trailingOffset >= _targetTrailingColumnPixel ||
_columnNullTerminatedIndex != null);
}
}
Expand All @@ -740,11 +758,12 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
continue;
}
final double endOfColumn = _columnMetrics[column]!.trailingOffset;
if (endOfColumn >= horizontalOffset.pixels &&
if (endOfColumn >= _targetLeadingColumnPixel &&
_firstNonPinnedColumn == null) {
_firstNonPinnedColumn = column;
}
if (endOfColumn >= _targetColumnPixel && _lastNonPinnedColumn == null) {
if (endOfColumn >= _targetTrailingColumnPixel &&
_lastNonPinnedColumn == null) {
_lastNonPinnedColumn = column;
break;
}
Expand All @@ -755,13 +774,14 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {

if (_rowMetrics.isNotEmpty) {
_Span lastKnownRow = _rowMetrics[_rowMetrics.length - 1]!;
if (_rowsAreInfinite && lastKnownRow.trailingOffset < _targetRowPixel) {
if (_rowsAreInfinite &&
lastKnownRow.trailingOffset < _targetTrailingRowPixel) {
// This will add the row metrics we do not know about up to the
// _targetRowPixel, while keeping the ones we already know about.
_updateRowMetrics(appendRows: true);
lastKnownRow = _rowMetrics[_rowMetrics.length - 1]!;
assert(_rowMetrics.length == delegate.rowCount ||
lastKnownRow.trailingOffset >= _targetRowPixel ||
lastKnownRow.trailingOffset >= _targetTrailingRowPixel ||
_rowNullTerminatedIndex != null);
}
}
Expand All @@ -772,10 +792,10 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
continue;
}
final double endOfRow = _rowMetrics[row]!.trailingOffset;
if (endOfRow >= verticalOffset.pixels && _firstNonPinnedRow == null) {
if (endOfRow >= _targetLeadingRowPixel && _firstNonPinnedRow == null) {
_firstNonPinnedRow = row;
}
if (endOfRow >= _targetRowPixel && _lastNonPinnedRow == null) {
if (endOfRow >= _targetTrailingRowPixel && _lastNonPinnedRow == null) {
_lastNonPinnedRow = row;
break;
}
Expand Down Expand Up @@ -831,7 +851,6 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
_rowMetrics[_firstNonPinnedRow]!.leadingOffset -
_pinnedRowsExtent
: null;

if (_lastPinnedRow != null && _lastPinnedColumn != null) {
// Layout cells that are contained in both pinned rows and columns
_layoutCells(
Expand Down
2 changes: 1 addition & 1 deletion packages/two_dimensional_scrollables/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: two_dimensional_scrollables
description: Widgets that scroll using the two dimensional scrolling foundation.
version: 0.3.6
version: 0.3.7
repository: https://github.com/flutter/packages/tree/main/packages/two_dimensional_scrollables
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+two_dimensional_scrollables%22+

Expand Down
Loading