Skip to content

[two_dimensional_scrollables] Fix merged cells unmerging behind pinned spans#11418

Merged
auto-submit[bot] merged 2 commits intoflutter:mainfrom
Piinks:2d-174862
Apr 2, 2026
Merged

[two_dimensional_scrollables] Fix merged cells unmerging behind pinned spans#11418
auto-submit[bot] merged 2 commits intoflutter:mainfrom
Piinks:2d-174862

Conversation

@Piinks
Copy link
Copy Markdown
Contributor

@Piinks Piinks commented Apr 2, 2026

This PR addresses an issue where merged cells in a TableView would "unmerge" or break when the first cell of the merge was scrolled into the area overlaid by a pinned row or column.

  • Updated RenderTableViewport to expand the _targetLeadingColumnPixel and _targetLeadingRowPixel calculation to include the pinned extent.
  • Strengthened the documentation in TableView and TableViewCell to explicitly state that the same child and merge information must be returned from every vicinity in the merge to avoid unmerging when cells are culled due to lazy loading.

Fixes flutter/flutter#174862

Pre-Review Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

Footnotes

  1. Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. 2

@github-actions github-actions bot added p: two_dimensional_scrollables Issues pertaining to the two_dimensional_scrollables package triage-framework Should be looked at in framework triage labels Apr 2, 2026
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request updates the two_dimensional_scrollables package to version 0.4.2, addressing an issue where merged cells would unmerge when the primary cell was overlaid by a pinned row or column. The fix modifies RenderTableViewport to include pinned row and column extents when calculating the leading layout pixels. Documentation for TableView and TableViewCell has been updated to clarify that consistent merge information must be returned for all vicinities within a merged cell, and new regression tests have been added to verify the behavior. I have no feedback to provide.

@Piinks Piinks added CICD Run CI/CD autosubmit Merge PR when tree becomes green via auto submit App labels Apr 2, 2026
@AbdeMohlbi
Copy link
Copy Markdown
Contributor

Code Review

This pull request updates the two_dimensional_scrollables package to version 0.4.2, addressing an issue where merged cells would unmerge when the primary cell was overlaid by a pinned row or column. The fix modifies RenderTableViewport to include pinned row and column extents when calculating the leading layout pixels. Documentation for TableView and TableViewCell has been updated to clarify that consistent merge information must be returned for all vicinities within a merged cell, and new regression tests have been added to verify the behavior. I have no feedback to provide.

that's new, usually you always seem to have a comment about any change, should we go to a doctor 🫠​?

@auto-submit auto-submit bot merged commit 5d8a4c4 into flutter:main Apr 2, 2026
81 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 2, 2026
jason-simmons pushed a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 2, 2026
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Apr 2, 2026
flutter/packages@b3fcf14...66bf7ec

2026-04-02 jason-simmons@users.noreply.github.com Remove usage of the
env_variables property from .ci.yaml (flutter/packages#11414)
2026-04-02 engine-flutter-autoroll@skia.org Roll Flutter from
fb03253 to 3d69471 (69 revisions) (flutter/packages#11408)
2026-04-02 katelovett@google.com [two_dimensional_scrollables] Fix
merged cells unmerging behind pinned spans (flutter/packages#11418)
2026-04-02 jhy03261997@gmail.com [ci] Update reusable_release.yml to add
`--remote=origin` (flutter/packages#11413)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC flutter-ecosystem@google.com on the revert to ensure that a
human
is aware of the problem.

To file a bug in Flutter:
https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD p: two_dimensional_scrollables Issues pertaining to the two_dimensional_scrollables package triage-framework Should be looked at in framework triage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Proposal] TableView: Disable lazy loading for merged cells

2 participants