Skip to content

[two_dimensional_scrollables] Infinite TableView #6411

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 17 commits into from
Mar 29, 2024
Merged

[two_dimensional_scrollables] Infinite TableView #6411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c59808e
Pausing for other change
Piinks Mar 22, 2024
3859c27
++
Piinks Mar 25, 2024
02167b4
+++
Piinks Mar 25, 2024
ca141cd
Docs
Piinks Mar 25, 2024
fbfaf59
Finished?
Piinks Mar 25, 2024
88d0757
Unrelated changes
Piinks Mar 26, 2024
34d1f8d
Finsihed tests, need self review
Piinks Mar 26, 2024
bbb3520
Broke some stuff, investigating
Piinks Mar 26, 2024
91c282e
Fixed, still needs self review
Piinks Mar 26, 2024
a9f18d3
Self review
Piinks Mar 27, 2024
7ed4434
++
Piinks Mar 27, 2024
f0f9e30
Review feedback
Piinks Mar 29, 2024
3b6d7ce
Unintended changes
Piinks Mar 29, 2024
a825b06
Self review
Piinks Mar 29, 2024
9dbea74
Little more cleanup
Piinks Mar 29, 2024
9798f06
Update packages/two_dimensional_scrollables/lib/src/table_view/table_…
Piinks Mar 29, 2024
7b4b3d6
Format
Piinks Mar 29, 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
Next Next commit
Finished?
  • Loading branch information
@Piinks
Piinks committed Mar 25, 2024
commit fbfaf59793cf5747b0d0e02e610bcce7cb3bb66a
4 changes: 2 additions & 2 deletions packages/two_dimensional_scrollables/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class _TableExampleState extends State<TableExample> {
);
}

TableSpan _buildColumnSpan(int index) {
TableSpan? _buildColumnSpan(int index) {
const TableSpanDecoration decoration = TableSpanDecoration(
border: TableSpanBorder(
trailing: BorderSide(),
Expand Down Expand Up @@ -148,7 +148,7 @@ class _TableExampleState extends State<TableExample> {
'This should be unreachable, as every index is accounted for in the switch clauses.');
}

TableSpan _buildRowSpan(int index) {
TableSpan? _buildRowSpan(int index) {
final TableSpanDecoration decoration = TableSpanDecoration(
color: index.isEven ? Colors.purple[100] : null,
border: const TableSpanBorder(
Expand Down
72 changes: 36 additions & 36 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 @@ -330,7 +330,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
int? _lastNonPinnedRow;
int? _lastNonPinnedColumn;

bool _columnNullTerminated = false;
int? _columnNullTerminated;
Copy link
Member

@goderbauer goderbauer Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for my own understanding (and maybe to clarify in the name): This is the index at which the columns are null terminated, right? The current name made it sound like this should be a boolean indicating whether the column builder has returned null yet.

Copy link
Contributor Author

@Piinks Piinks Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct! I am changing the name to indicate this better. Funny you imagined a bool - at one point it was!

bool get _columnsAreInfinite => delegate.columnCount == null;
// How far columns should be laid out in a given frame.
double get _targetColumnPixel {
Expand All @@ -340,7 +340,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
_pinnedColumnsExtent;
}

bool _rowNullTerminated = false;
int? _rowNullTerminated;
bool get _rowsAreInfinite => delegate.rowCount == null;
// How far rows should be laid out in a given frame.
double get _targetRowPixel {
Expand Down Expand Up @@ -449,8 +449,6 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {

// Updates the cached column metrics for the table.
Copy link
Member

@goderbauer goderbauer Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To help future readers: maybe document the meaning of the arguments to this method here since they are not immediately clear.

Copy link
Contributor Author

@Piinks Piinks Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

void _updateColumnMetrics({bool appendColumns = false, int? toColumnIndex}) {
final Map<int, _Span> oldColumnMetrics = _columnMetrics;
_columnMetrics.clear();
double startOfRegularColumn = 0;
double startOfPinnedColumn = 0;
if (appendColumns) {
Expand All @@ -460,22 +458,23 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
// number of columns is infinite, and saves us going through all the
// columns we already know about.
assert(_columnsAreInfinite);
assert(oldColumnMetrics.isNotEmpty);
for (int cachedColumn = 0; cachedColumn < oldColumnMetrics.length; cachedColumn++) {
_columnMetrics[cachedColumn] = oldColumnMetrics[cachedColumn]!;
}
assert(_columnMetrics.isNotEmpty);
if (_firstNonPinnedColumn != 0) {
startOfPinnedColumn = oldColumnMetrics[_firstNonPinnedColumn]!.trailingOffset;
startOfPinnedColumn = _columnMetrics[_firstNonPinnedColumn]!.trailingOffset;
}
startOfRegularColumn = oldColumnMetrics[_lastNonPinnedColumn]!.trailingOffset;
startOfRegularColumn = _columnMetrics[_lastNonPinnedColumn]!.trailingOffset;
}
_firstNonPinnedColumn = null;
_lastNonPinnedColumn = null;
_columnNullTerminated = false;
int column = appendColumns ? oldColumnMetrics.length : 0;
_columnNullTerminated = needsDelegateRebuild ? null : _columnNullTerminated;
int column = appendColumns ? _columnMetrics.length : 0;

bool reachedColumnEnd() {
if (_columnsAreInfinite) {
if (_columnNullTerminated != null) {
_lastNonPinnedColumn ??= _columnMetrics.length - 1;
return true;
}
if (toColumnIndex != null) {
// Column metrics should be computed up to the provided index.
// Only relevant when we are filling in missing column metrics in an
Expand All @@ -494,7 +493,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
final bool isPinned = column < delegate.pinnedColumnCount;
final double leadingOffset =
isPinned ? startOfPinnedColumn : startOfRegularColumn;
_Span? span = oldColumnMetrics.remove(column);
_Span? span = _columnMetrics.remove(column);
final TableSpan? configuration = needsDelegateRebuild || span == null
? delegate.buildColumn(column)
: span.configuration;
Expand All @@ -503,7 +502,8 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
// This happens when a row count has not been specified, but we have
// reached the end.
assert(_columnsAreInfinite);
_columnNullTerminated = true;
_columnNullTerminated = column;
_updateScrollBounds();
break;
}
span ??= _Span();
Expand Down Expand Up @@ -536,15 +536,10 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
}

assert(_columnMetrics.length >= delegate.pinnedColumnCount);
for (final _Span span in oldColumnMetrics.values) {
span.dispose();
}
}

// Updates the cached row metrics for the table.
void _updateRowMetrics({bool appendRows = false, int? toRowIndex}) {
final Map<int, _Span> oldRowMetrics = _rowMetrics;
_rowMetrics.clear();
double startOfRegularRow = 0;
double startOfPinnedRow = 0;
if (appendRows) {
Expand All @@ -553,22 +548,23 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
// updating. This should only be the case when the number of rows is
// infinite.
assert(_rowsAreInfinite);
assert(oldRowMetrics.isNotEmpty);
for (int cachedRow = 0; cachedRow < oldRowMetrics.length; cachedRow++) {
_rowMetrics[cachedRow] = oldRowMetrics[cachedRow]!;
}
assert(_rowMetrics.isNotEmpty);
if (_firstNonPinnedRow != 0) {
startOfPinnedRow = oldRowMetrics[_firstNonPinnedRow]!.trailingOffset;
startOfPinnedRow = _rowMetrics[_firstNonPinnedRow]!.trailingOffset;
}
startOfRegularRow = oldRowMetrics[_lastNonPinnedRow]!.trailingOffset;
startOfRegularRow = _rowMetrics[_lastNonPinnedRow]!.trailingOffset;
}
_firstNonPinnedRow = null;
_lastNonPinnedRow = null;
_rowNullTerminated = false;
int row = appendRows ? oldRowMetrics.length : 0;
_rowNullTerminated = needsDelegateRebuild ? null : _rowNullTerminated;
int row = appendRows ? _rowMetrics.length : 0;

bool reachedRowEnd() {
if (_rowsAreInfinite) {
if (_rowNullTerminated != null) {
_lastNonPinnedRow ??= _rowMetrics.length - 1;
return true;
}
if (toRowIndex != null) {
// Row metrics should be computed up to the provided index.
// Only relevant when we are filling in missing column metrics in an
Expand All @@ -587,14 +583,15 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
final bool isPinned = row < delegate.pinnedRowCount;
final double leadingOffset =
isPinned ? startOfPinnedRow : startOfRegularRow;
_Span? span = oldRowMetrics.remove(row);
_Span? span = _rowMetrics.remove(row);
final TableSpan? configuration = needsDelegateRebuild || span == null ? delegate.buildRow(row) : span.configuration;
if (configuration == null) {
// We have reached the end of rows based on a null termination. This
// This happens when a row count has not been specified, but we have
// reached the end.
assert(_rowsAreInfinite);
_rowNullTerminated = true;
_rowNullTerminated = row;
_updateScrollBounds();
break;
}
span ??= _Span();
Expand Down Expand Up @@ -627,14 +624,11 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
}

assert(_rowMetrics.length >= delegate.pinnedRowCount);
for (final _Span span in oldRowMetrics.values) {
span.dispose();
}
}

void _updateScrollBounds() {
final double maxVerticalScrollExtent;
if (_rowsAreInfinite && !_rowNullTerminated) {
if (_rowsAreInfinite && _rowNullTerminated == null) {
maxVerticalScrollExtent = double.infinity;
} else if (!_rowsAreInfinite && _rowMetrics.length <= delegate.pinnedRowCount) {
assert(_firstNonPinnedRow == null && _lastNonPinnedRow == null);
Expand All @@ -653,7 +647,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
}

final double maxHorizontalScrollExtent;
if (_columnsAreInfinite && !_columnNullTerminated) {
if (_columnsAreInfinite && _columnNullTerminated == null) {
maxHorizontalScrollExtent = double.infinity;
} else if (!_columnsAreInfinite &&
_columnMetrics.length <= delegate.pinnedColumnCount) {
Expand Down Expand Up @@ -690,7 +684,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
_updateColumnMetrics(appendColumns: true);
lastKnownColumn = _columnMetrics[_columnMetrics.length - 1]!;
assert(_columnMetrics.length == delegate.columnCount ||
lastKnownColumn.trailingOffset >= _targetColumnPixel);
lastKnownColumn.trailingOffset >= _targetColumnPixel || _columnNullTerminated != null);
}
}
_firstNonPinnedColumn = null;
Expand Down Expand Up @@ -721,7 +715,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
_updateRowMetrics(appendRows: true);
lastKnownRow = _rowMetrics[_rowMetrics.length - 1]!;
assert(_rowMetrics.length == delegate.rowCount ||
lastKnownRow.trailingOffset >= _targetRowPixel);
lastKnownRow.trailingOffset >= _targetRowPixel || _rowNullTerminated != null);
}
}
_firstNonPinnedRow = null;
Expand Down Expand Up @@ -1618,6 +1612,12 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
_clipPinnedRowsHandle.layer = null;
_clipPinnedColumnsHandle.layer = null;
_clipCellsHandle.layer = null;
for (final _Span span in _rowMetrics.values) {
span.dispose();
}
for (final _Span span in _columnMetrics.values) {
span.dispose();
}
super.dispose();
}
}
Expand Down