Fix inconsistent Grouped CollectionView (GridItemsLayout) rendering on Windows and iOS/macOS by Shalini-Ashokan · Pull Request #36561 · dotnet/maui

Shalini-Ashokan · 2026-07-14T09:56:28Z

Note

Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Issue Details

Grouped CollectionView with GridItemsLayout (Span > 1, VerticalItemSpacing set) renders inconsistently across platforms. On Windows, the first item in the first group renders smaller than others. On iOS/macOS, no spacing appears between the group header and the first row of items.

Root Cause

Windows: The generated item container style didn't stretch content vertically, so the first grid cell (whose row height differs due to the header) collapsed to its content size instead of filling the row.

iOS/macOS: The grid layout path ( CreateGridLayout -equivalent) never set InterSectionSpacing / ContentInsets for the header-to-item gap — that logic only existed in the list layout path, not the grid layout path.

Description of Change

Windows: Added VerticalContentAlignmentProperty = VerticalAlignment.Stretch to the item container style in StructuredItemsViewHandler.Windows.cs , ensuring all grid cells stretch uniformly to fill their row instead of the first item sizing to content.

iOS/macOS: Extracted the header/footer boundary-spacing logic into a shared ApplyHeaderFooterBoundarySpacing helper in LayoutFactory2.cs , and invoked it from the grid layout as well (previously only the list layout applied it). Also set layoutConfiguration.InterSectionSpacing using the main-axis spacing so consistent gaps appear between the header and first row across grouped sections.

Validated the behavior in the following platforms

Android
Windows
iOS
Mac

Issues Fixed

Fixes #36545

Output ScreenShot

Windows

Before	After

iOS

Before	After

azure-pipelines · 2026-07-14T09:56:46Z

Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run.

dotnet-policy-service · 2026-07-14T09:56:50Z

Hey there @@Shalini-Ashokan! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

vishnumenon2684 · 2026-07-14T10:39:47Z

/azp run maui-pr-uitests

azure-pipelines · 2026-07-14T10:39:56Z

Azure Pipelines: Successfully started running 1 pipeline(s).

github-actions · 2026-07-14T11:42:34Z

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 36561

Or

Run remotely in PowerShell:

iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 36561"

azure-pipelines · 2026-07-14T11:51:41Z

Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run.

Copilot

Pull request overview

Fixes a grouped CollectionView + GridItemsLayout rendering inconsistency by aligning layout spacing/measurement behavior across Windows and iOS/macOS handlers.

Changes:

Windows: Ensure GridViewItem content stretches vertically so the first item in a grouped grid row doesn’t collapse to content size.
iOS/macOS: Apply header/footer boundary spacing logic to the grid compositional layout path (and set InterSectionSpacing) so grouped headers get the expected gap before the first row.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs	Extracts and reuses header/footer boundary spacing logic; adds inter-section spacing for grouped grid layouts.
src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs	Adds vertical content stretching to the grid item container style to keep item sizing consistent in grouped grids.

MauiBot

Expert Review — 1 findings

See inline comments for details.

…dout) The per-category idle-watcher (Invoke-BuildScriptBounded) only measured growth of the child's redirected stdout/stderr. VSTest's `dotnet test` console output is block-buffered by the OS when stdout is a redirected file, so an actively- running category could go >25 min without the watched file growing and get tree-killed as a 'hang' with ZERO results — even though tests were running the whole time. Confirmed on Windows/WinAppDriver #36561 and #33007: the Appium log recorded findElements requests up to ~1 s before the kill, and screenshots/diffs were produced, yet build-output.log had not grown since the `dotnet test` line. Also count growth of the live UI-test artifacts (Appium log + screenshots in CustomAgentLogsTmp/UITests, and the TRX results dir) as progress. Appium appends to its log on every WinAppDriver request, so it grows continuously while tests actually run — immune to stdout buffering. A genuine hang (no stdout AND no artifact activity) is still idle-killed; validated with a two-scenario harness. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 15d2af20-e4ab-4e88-9011-cfbd83513bc0

MauiBot

Expert Review — 1 findings

See inline comments for details.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

…kout The 'Post review-incomplete notice' fallback dot-sourced Remove-StaleMauiBotComments.ps1 from the relative .github path, which on a merge-CONFLICTED PR is the PR HEAD checkout. When that PR branch predates commit 0d1190f (added -IncludeReviewIncomplete), the collapse call failed at runtime with 'A parameter cannot be found that matches parameter name IncludeReviewIncomplete', so prior review-incomplete notices never got collapsed and stacked on repeated conflicted-PR reviews. Source instead from the tamper-proof pipeline-ref copy at $(Build.ArtifactStagingDirectory)/trusted-github/scripts/shared/... (captured in Setup before branch switching, same convention as every -TrustedScriptsDir phase), so the current-branch function with the param is always loaded. Observed on build 14698246 (conflicted #36561). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 15d2af20-e4ab-4e88-9011-cfbd83513bc0

…xit code The snapshot-diff image embed (best-effort) runs native commands (gh/git). When the maui-bot PAT lacks the 'gist' scope, `gh api gists` fails and leaves $LASTEXITCODE non-zero. On a gate-FAILED PR the Post job takes the deferred / no-PRAgent branch, which runs no later native command to reset it, so the whole "Post AI summary review" task inherited exit code 1 and failed (deep results never posted). Reset $LASTEXITCODE to 0 after the best-effort embed so it can never affect the task result. Observed on build 14701124 (PR #36561, catalyst); build 14701123 (PR #36541, gate passed) posted a review afterward and was unaffected. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 15d2af20-e4ab-4e88-9011-cfbd83513bc0

MauiBot · 2026-07-19T22:26:25Z

⚠️ Merge Conflict Detected — This PR has merge conflicts with its target branch. Please rebase onto the target branch and resolve the conflicts.

MauiBot · 2026-07-19T22:26:45Z

Warning

🔍 Automated review could not complete

A stage of the reviewer pipeline could not finish, so no review summary was produced for this run — most often the review stage itself hanging, or the run being canceled by its overall timeout. This is almost always a transient infrastructure issue on the CI agent, not a problem with your PR. (Note: a test-verification gate timeout no longer lands here — it now posts a normal AI Summary whose Gate section explains the timeout.)

Please re-comment /review to retry on a fresh agent.

_{🔍 Automated message from the .NET MAUI Copilot reviewer pipeline · build log}

Shalini-Ashokan · 2026-07-20T05:48:48Z

Could you please resolve conflicts?

I have resolved the conflights

…n Windows and iOS/macOS (#36561)  > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!  ### Issue Details Grouped CollectionView with GridItemsLayout (Span > 1, VerticalItemSpacing set) renders inconsistently across platforms. On Windows, the first item in the first group renders smaller than others. On iOS/macOS, no spacing appears between the group header and the first row of items. ### Root Cause **Windows**: The generated item container style didn't stretch content vertically, so the first grid cell (whose row height differs due to the header) collapsed to its content size instead of filling the row. **iOS/macOS**: The grid layout path ( CreateGridLayout -equivalent) never set InterSectionSpacing / ContentInsets for the header-to-item gap — that logic only existed in the list layout path, not the grid layout path. ### Description of Change **Windows**: Added VerticalContentAlignmentProperty = VerticalAlignment.Stretch to the item container style in StructuredItemsViewHandler.Windows.cs , ensuring all grid cells stretch uniformly to fill their row instead of the first item sizing to content. **iOS/macOS**: Extracted the header/footer boundary-spacing logic into a shared ApplyHeaderFooterBoundarySpacing helper in LayoutFactory2.cs , and invoked it from the grid layout as well (previously only the list layout applied it). Also set layoutConfiguration.InterSectionSpacing using the main-axis spacing so consistent gaps appear between the header and first row across grouped sections. Validated the behavior in the following platforms - [x] Android - [x] Windows - [x] iOS - [x] Mac ### Issues Fixed Fixes #36545 ### Output ScreenShot Windows |Before|After| |--|--| |<img width="1010" height="729" alt="image" src="https://github.com/user-attachments/assets/87bac7a7-e845-4dbd-a5f4-826cab099df8" /> | <img width="1010" height="729" alt="image" src="https://github.com/user-attachments/assets/8efa5cd5-d4c2-4eb5-992b-532486304c81" /> | iOS |Before|After| |--|--| |<img width="752" height="1492" alt="image" src="https://github.com/user-attachments/assets/56f3f126-e830-47f7-9fe8-e29379de542b" /> | <img width="752" height="1492" alt="image" src="https://github.com/user-attachments/assets/9f5dcb2e-1b38-41fe-9a56-670eb6541f92" /> |

Shalini-Ashokan had a problem deploying to copilot-pat-pool July 14, 2026 09:56 — with GitHub Actions Failure

dotnet-policy-service Bot added the community ✨ Community Contribution label Jul 14, 2026

dotnet-policy-service Bot added the partner/syncfusion Issues / PR's with Syncfusion collaboration label Jul 14, 2026

Shalini-Ashokan changed the title ~~[inflight regression] Fix inconsistent Grouped CollectionView (GridItemsLayout) rendering on Windows and iOS/macOS~~ Fix inconsistent Grouped CollectionView (GridItemsLayout) rendering on Windows and iOS/macOS Jul 14, 2026

dotnet deleted a comment from azure-pipelines Bot Jul 14, 2026

Shalini-Ashokan changed the base branch from inflight/candidate to main July 14, 2026 11:27

Shalini-Ashokan force-pushed the fix-35700-Windows branch from 5b954e4 to 98d3e75 Compare July 14, 2026 11:42

sheiksyedm marked this pull request as ready for review July 14, 2026 11:51

Copilot AI review requested due to automatic review settings July 14, 2026 11:51

Copilot started reviewing on behalf of sheiksyedm July 14, 2026 11:51 View session

Copilot AI reviewed Jul 14, 2026

View reviewed changes

Comment thread src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs Outdated

This comment has been minimized.

Sign in to view

github-actions Bot added the s/agent-review-in-progress AI review is currently running for this PR label Jul 14, 2026

MauiBot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs Outdated

MauiBot added s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review) labels Jul 14, 2026

This comment was marked as outdated.

Sign in to view

MauiBot removed the s/agent-review-in-progress AI review is currently running for this PR label Jul 14, 2026

github-actions Bot mentioned this pull request Jul 15, 2026

[PR Review Queue] 2026-07-15 #36583

Closed

MauiBot reviewed Jul 15, 2026

View reviewed changes

Comment thread src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs Outdated

Copilot AI review requested due to automatic review settings July 15, 2026 13:03

Copilot started reviewing on behalf of Shalini-Ashokan July 15, 2026 13:04 View session

Copilot AI reviewed Jul 15, 2026

View reviewed changes

Comment thread src/Controls/tests/TestCases.HostApp/Issues/Issue35700.cs Outdated

Comment thread src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue35700.cs

This comment has been minimized.

Sign in to view

github-actions Bot added the s/agent-review-in-progress AI review is currently running for this PR label Jul 19, 2026

This comment has been minimized.

Sign in to view

MauiBot removed the s/agent-review-in-progress AI review is currently running for this PR label Jul 19, 2026

This comment has been minimized.

Sign in to view

github-actions Bot added the s/agent-review-in-progress AI review is currently running for this PR label Jul 19, 2026

MauiBot removed the s/agent-review-in-progress AI review is currently running for this PR label Jul 20, 2026

Shalini-Ashokan added 7 commits July 20, 2026 11:10

Fixed the collection view measure item issue

6df4373

Modified the fix

68d791c

Fixed the item spacing issue on iOS platfrom

eb38e5d

Moved the item spacing logics to common.

73dfe84

Added the test cases

f55f918

Addressed the AI concerns

b8d57e4

Committed the base images

d870aa2

Shalini-Ashokan force-pushed the fix-35700-Windows branch from ac202a7 to d870aa2 Compare July 20, 2026 05:46

kubaflo merged commit 13533be into dotnet:inflight/current Jul 20, 2026
6 of 38 checks passed

github-actions Bot added this to the .NET 10 SR10 milestone Jul 20, 2026

github-actions Bot mentioned this pull request Jul 22, 2026

[repo-status] 📊 Daily Repo Status — July 22, 2026 #36711

Closed

Uh oh!

Conversation

Shalini-Ashokan commented Jul 14, 2026

Issue Details

Root Cause

Description of Change

Issues Fixed

Output ScreenShot

Uh oh!

azure-pipelines Bot commented Jul 14, 2026

Uh oh!

dotnet-policy-service Bot commented Jul 14, 2026

Uh oh!

vishnumenon2684 commented Jul 14, 2026

Uh oh!

azure-pipelines Bot commented Jul 14, 2026

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

azure-pipelines Bot commented Jul 14, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

This comment has been minimized.

MauiBot left a comment

Choose a reason for hiding this comment

Expert Review — 1 findings

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

MauiBot left a comment

Choose a reason for hiding this comment

Expert Review — 1 findings

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

MauiBot commented Jul 19, 2026

Uh oh!

MauiBot commented Jul 19, 2026

🔍 Automated review could not complete

Uh oh!

Shalini-Ashokan commented Jul 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants