[iOS, Mac] Fix Item spacing not properly applied between items in Horizontal LinearItemsLayout#35445
Conversation
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 35445Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 35445" |
3 parallel reviewers (different models) ran against this PR; consensus findings: A) [3/3 ❌] pr-review/SKILL.md had stale model IDs (claude-sonnet-4.6 + gemini-3-pro-preview). Resolved by merging origin/main, which picked up #35174 — Jakub Florkowski's intentional revert of those model IDs back to claude-opus-4.7 + gpt-5.5 because gemini-3-pro-preview is not registered in the Copilot CLI task runtime. The pr-review/SKILL.md change in this PR's diff was just staleness — main has the right values now and the merge commit brings them in. B) [2/3⚠️ ] No eval scenario tested the most subtle platform rule: paths under /Platform/iOS/ or /Handlers/*/iOS/ should apply platform/ios ONLY (not platform/macos), unlike .ios.cs file extension which applies BOTH. An agent applying both platform/ios + platform/macos for an iOS-directory-only PR would have passed every existing eval. Added new scenario using PR #34672 (single file: src/Core/src/Platform/iOS/ MauiScrollView.cs) asserting platform/ios + area-controls-scrollview and output_not_contains for platform/macos, platform/android, platform/windows, partner/syncfusion, community ✨. C) [2/3 💡] Prompt-injection scenario (issue #35312) had only output_not_contains assertions. An agent that completely noops or returns empty output would pass. Added output_contains: platform/windows (the issue title literally starts with [Windows] and the content is a Windows Shell flyout regression) so the assertion catches a noop-instead-of-labeling failure. D) [1/3⚠️ ] iOS extension scenario (PR #35445) asserted platform/ios + platform/macos but had no negative assertion for platform/android or platform/windows. Added output_not_contains for those — an agent that over-labels all four platforms would have passed before. E) [1/3⚠️ ] Windows scenario (PR #35458) asserted only platform/windows with no area-* and no non-Windows-platform negatives. Added output_contains: area-controls-collectionview (the changed file is ItemsViewHandler.Windows.cs) and output_not_contains for the other 3 platforms and partner/syncfusion. Notable discoveries during this round: - The gh-aw-guide skill detection path in ~/.agents/skills/generic-adversarial-pr-reviewer/SKILL.md continues to fire correctly — all 3 reviewers used gh-aw-aware reasoning (none re-flagged checkout: false removal or roles: all as bugs). - Eval scenario count increased from 20 → 21 (new iOS-dir-only scenario). - lock.yml unchanged (no workflow.md frontmatter changes); only eval.yaml modified in this commit. Co-authored-by: Copilot <[email protected]>
|
/review -b feature/regression-check -p ios |
kubaflo
left a comment
There was a problem hiding this comment.
Could you resolve conflicts?
Resolved conflicts in this PR. Could you please review it once. |
|
/review -b feature/regression-check -p ios |
🤖 AI Summary
📊 Review Session —
|
| Category | Result | Tests | Duration | Notes |
|---|---|---|---|---|
CollectionView |
⏭️ SKIPPED | — | 0s | Runner threw an exception |
Failures here are informational only — they do not block the gate or affect try-fix candidate scoring.
🔍 Pre-Flight — Context & Validation
Issue: #35429 - [CollectionView2] Item spacing not properly applied between items in Horizontal LinearItemsLayout
PR: #35445 - [iOS, Mac] Fix Item spacing not properly applied between items in Horizontal LinearItemsLayout
Platforms Affected: iOS, MacCatalyst
Files Changed: 2 implementation, 1 test sample (XAML reproduction page)
Base branch: inflight/current
Key Findings
The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. Three distinct gaps need to be handled:
- Inter-section spacing — gap between the last item of one group and the next group's header.
UICollectionViewCompositionalLayoutConfiguration.InterSectionSpacingis the canonical knob. - Header→first-item / last-item→footer spacing within a section —
section.InterGroupSpacing(already set toitemSpacing) does NOT apply between a boundary supplementary item and the section's groups. Eithersection.ContentInsets, groupContentInsets, orBoundarySupplementaryItem.ContentInsetsmust be used. - Horizontal supplementary measurement bug —
TemplatedCell2.ScrollDirectionwas never set beforeUpdateTemplatedSupplementaryView, soGetMeasureConstraintsconstrained the width axis using the small (~30 pt) estimated size and wrapped text. This is independent of the spacing fix and is clearly necessary.
Code Review Summary (independent analysis — no test execution)
Verdict: NEEDS_DISCUSSION — fix is correct in observed scenarios but uses two different mechanisms where one would suffice, and a couple of small soundness concerns.
Confidence: medium
Errors: 0 | Warnings: 3 | Suggestions: 2
Key code-review findings:
⚠️ LayoutFactory2.cs:148-172— Spacing is applied viasection.ContentInsetson each section. This bakes a symmetric inset (leading+trailing for horizontal) when a header AND footer both exist, but only one of them when only one exists. That is correct for the gap on the header/footer side, but combined withInterSectionSpacingat the configuration level it produces double spacing between adjacent sections when the second section has a header (which is the common case):last-item → section-trailing-inset (0) + InterSectionSpacing (itemSpacing) + next-section-leading-inset (itemSpacing) = 2×itemSpacing. Actually leading inset only applies if HasHeader, but trailing inset only applies if HasFooter — so when there's a header but no footer (the most common grouped case), the math is:last-item → 0 (no trailing) + InterSectionSpacing + 0 (the section inset is leading, before the header which is *outside* the inset) → InterSectionSpacing. So the gap is correct, but the leading-inset semantics depend on whether the boundary supplementary item extends the boundary. Default for compositional layout boundary supplementaries isextendsBoundary: true, meaning they live OUTSIDE the section content area — in that casesection.ContentInsetsonly insets the groups/items not the supplementary, which is precisely the desired behavior. ✅ Correct, but subtle and undocumented.⚠️ LayoutFactory2.cs:96-99—InterSectionSpacingis set on the layout configuration regardless of orientation. For a horizontal list this is correct (it spaces sections along the scroll axis). The set is gated ongroupingInfo.IsGrouped && itemSpacing > 0, which is fine.⚠️ GroupableItemsViewController2.cs:108—TemplatedCell2.ScrollDirection = ScrollDirection;happens for every call, but the controller does not invalidate cached layouts; if a developer hot-swaps scroll direction at runtime, the change relies on cell dequeue. Acceptable for the fix's scope.- 💡 Alternative API surface:
NSCollectionLayoutBoundarySupplementaryItem.ContentInsetslets you put the gap on the supplementary item itself (trailing inset on the header, leading inset on the footer), avoiding the dual mechanism. - 💡 The same logic is missing from
CreateGridLayout— out of scope, but worth a tracking note.
Fix Candidates
| # | Source | Approach | Test Result | Files Changed | Notes |
|---|---|---|---|---|---|
| PR | PR #35445 | section.ContentInsets + layoutConfig.InterSectionSpacing + cell ScrollDirection | LayoutFactory2.cs, GroupableItemsViewController2.cs |
Original PR |
🔧 Fix — Analysis & Comparison
Try-Fix Aggregate — PR #35445
Platform tested: iOS
Gate result (from upstream):
Build verification: Not executed in this session — full MAUI iOS build was deemed out of scope given that none of the candidates introduces new types or APIs (all changes are arrangements of existing NSCollectionLayoutSection / NSCollectionLayoutBoundarySupplementaryItem / UICollectionViewCompositionalLayoutConfiguration properties).
Summary of candidates explored
| # | Approach | Mechanism for header↔item gap | Mechanism for inter-section gap | Test result |
|---|---|---|---|---|
| PR | section.ContentInsets (gated on HasHeader/HasFooter) + InterSectionSpacing + cell ScrollDirection | section.ContentInsets (leading) |
layoutConfiguration.InterSectionSpacing |
|
| try-fix-1 | Spacing on BoundarySupplementaryItem.ContentInsets + InterSectionSpacing + cell ScrollDirection |
Header/footer item carries its own gap | layoutConfiguration.InterSectionSpacing |
|
| try-fix-2 | Single mechanism: section.ContentInsets only (always trailing + conditional leading/trailing) + cell ScrollDirection |
section.ContentInsets (leading if HasHeader) |
section.ContentInsets (trailing always) |
Approach-by-approach narrative
try-fix-1 — Spacing on the supplementary items themselves
- Idea: Put the gap on the element causing it.
NSCollectionLayoutBoundarySupplementaryItem.ContentInsetslets the header carry its own trailing inset and the footer its own leading inset. - Strength vs PR: Co-locates spacing with the supplementary item; per-section header/footer presence is naturally encoded by whether the item is created at all. Less reliance on the subtle
extendsBoundary=truesemantics ofsection.ContentInsets. - Weakness vs PR: Adds a parameter to
CreateSupplementaryItems, touching a shared helper. - Verdict: A cleaner refactor of the PR rather than a true rewrite. Demonstrably better in maintainability but functionally equivalent on the visible scenario.
try-fix-2 — Single mechanism (section.ContentInsets only)
- Idea: Express every gap (header↔item, item↔footer, inter-section) as one
section.ContentInsetscalculation. DropInterSectionSpacing. Mirrors CV1'sGetInsetForSection. - Strength vs PR: Single mental model; easy to port to
CreateGridLayout(which the PR does not touch even though grouped grids have the same problem). - Weakness vs PR: Adds an unconditional trailing inset on the last section (cosmetic — produces a trailing whitespace gap after the final group). The PR avoids that by gating the inset on
HasFooter. - Verdict: Conceptually cleanest; minor cosmetic regression on trailing edge of the last section unless extended with a "last section" check.
Recommendation
Keep the PR's fix as-is. Reasoning:
- The gate is SKIPPED solely because the author did not add a test — the fix itself is correct and addresses three distinct, real bugs (inter-section gap, header→item gap, supplementary-cell scroll-direction measurement).
- try-fix-1 is a cosmetic improvement, not a behavioral one. The diff is similar in size; reviewers would reasonably prefer the PR's section-level inset for its simplicity (no signature change on the shared helper).
- try-fix-2 has a known cosmetic regression on the trailing edge of the last grouped section that the PR avoids.
Strongly recommend the PR author add a UI test (this is what made the gate SKIP). An NUnit TestCases.Shared.Tests test that:
- Loads
Issue25859 - Asserts the X positions of the first item of group 2 and the last item of group 1 differ by at least
itemSpacing + groupHeaderWidth - (Optionally) asserts group header text does not wrap to two lines
would have made the gate meaningful and would catch regressions in either of the three spacing mechanisms.
Out-of-scope follow-up: The same spacing gap exists in CreateGridLayout (LayoutFactory2.cs:190-240) — grouped grids will still mis-space. Worth filing a tracking issue.
Per-candidate details
- See
try-fix-1/content.mdfor the supplementary-item-inset diff. - See
try-fix-2/content.mdfor the single-mechanism diff and edge-case discussion.
📋 Report — Final Recommendation
Comparative Report — PR #35445 candidates
Issue: #35429 — [CollectionView2] Item spacing not properly applied between items in Horizontal LinearItemsLayout
Platform tested: iOS
Gate result:
Candidate inventory
| # | Candidate | Mechanism for header↔item | Mechanism for inter-section | Mechanism for last-item↔footer | Touches shared helper signature? | Test result |
|---|---|---|---|---|---|---|
| 1 | pr |
section.ContentInsets leading (if HasHeader) |
layoutConfig.InterSectionSpacing |
section.ContentInsets trailing (if HasFooter) |
No | |
| 2 | pr-plus-reviewer |
Same as pr |
Same as pr |
Same as pr |
No | |
| 3 | try-fix-1 |
BoundarySupplementaryItem.ContentInsets on header |
layoutConfig.InterSectionSpacing |
BoundarySupplementaryItem.ContentInsets on footer |
Yes (adds itemSpacing param to CreateSupplementaryItems) |
|
| 4 | try-fix-2 |
section.ContentInsets leading (if HasHeader) |
section.ContentInsets trailing (always) |
section.ContentInsets trailing (if HasFooter) |
No |
All four candidates additionally include the identical TemplatedCell2.ScrollDirection = ScrollDirection; fix in GroupableItemsViewController2.cs — that change is uncontroversial and uniformly accepted.
Ranking criteria (per task rules)
"Candidates that failed regression tests MUST be ranked lower than candidates that passed them."
All candidates have the same test result (Gate SKIPPED). None failed, none passed. The rule therefore does not separate them. Ranking proceeds on code-quality grounds.
Pairwise comparison
pr vs pr-plus-reviewer
pr-plus-reviewer is pr plus documentation comments addressing reviewer warnings #1 (extendsBoundary dependency) and #5 (CreateGridLayout follow-up). Behaviorally identical. pr-plus-reviewer strictly dominates pr on maintainability with zero behavioral risk.
pr-plus-reviewer vs try-fix-1
try-fix-1places spacing on the supplementary item itself — conceptually cleaner ("the header carries its own breathing room").try-fix-1modifies the sharedCreateSupplementaryItemshelper signature (adds optionalitemSpacingparam). This helper is also called for the global layout-level header/footer (layoutConfiguration.BoundarySupplementaryItems), where the new parameter is left at default 0 — correct, but expands the helper's responsibilities.- Both rely on the same
extendsBoundary=truedefault for not double-spacing inter-section gaps (try-fix-1still usesInterSectionSpacing, so the header's trailing inset +InterSectionSpacing+ next header's leading 0 =itemSpacing + itemSpacing?). Important check:try-fix-1's header trailing inset pushes items inside the header's frame;InterSectionSpacingthen adds another gap between sections. For two adjacent grouped sections (section N has footer, section N+1 has header), the gap becomes:last-item→footer leading inset (itemSpacing)→ footer →InterSectionSpacing (itemSpacing)→ header →header trailing inset (itemSpacing)→ next first-item. The user-visible gap between sections intry-fix-1and the PR is therefore similar in the common "header but no footer" case buttry-fix-1adds visible footer-side insets that the PR's section-leading-inset does not. Net: a subtle behavioral difference between the two, both visually plausible but untested. pr-plus-reviewermatches the PR's exact runtime behavior (which is presumed to be what the PR author validated visually);try-fix-1does not.
Winner of pair: pr-plus-reviewer — same observed behavior as the PR author validated, with cleaner documentation.
pr-plus-reviewer vs try-fix-2
try-fix-2collapses everything intosection.ContentInsets. Single mental model, easier to mirror toCreateGridLayout.- However,
try-fix-2's own caveat (cited verbatim in its content.md) is: "The trailing inset is alwaysitemSpacing, even for the last section, which adds a trailing whitespace gap after the final group." This is a known cosmetic regression versus the PR. try-fix-2could be salvaged with a "last section" check via closure capture of section count, but that is additional unimplemented work.
Winner of pair: pr-plus-reviewer — no known regression.
Final ranking
pr-plus-reviewer← winnerpr(one tier down: same behavior, weaker documentation)try-fix-1(cleaner abstraction, but unverified subtle behavioral delta on the footer side)try-fix-2(clean single mechanism, known trailing-gap cosmetic regression)
Rationale for winner
pr-plus-reviewer preserves the PR's exact runtime behavior (which is what the PR author appears to have validated visually against the reproduction page) while addressing two of the three reviewer warnings via comment-only changes — zero behavioral risk, strict improvement in maintainability. Among the alternatives, try-fix-1 introduces an unverified subtle difference on the footer side, and try-fix-2 has a self-acknowledged trailing-gap regression on the last section.
The pr-plus-reviewer winner falls under "PR fix" per the manifest schema (isPRFix=true).
Highest-leverage follow-up (independent of which candidate wins)
The PR author should add an NUnit UI test in TestCases.Shared.Tests that loads Issue25859 and asserts (a) the X-distance between group 1's last item and group 2's header exceeds itemSpacing, and (b) group 2's header text does not wrap to two lines. This single test would have made the gate meaningful and would catch regressions in all three mechanisms the PR fixes.
A second follow-up worth filing: CreateGridLayout has the same grouped-section spacing gap. Out of scope for #35445 but should be tracked.
…izontal LinearItemsLayout (#35445) <!-- Please let the below note in for people that find this PR --> > [!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: Item spacing is not correctly applied between the group header and the items in the CollectionView when using LinearItemsLayout. ### Root Cause: The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. The UICollectionViewCompositionalLayout treats each group as a separate section. While section.InterGroupSpacing correctly applied ItemSpacing between items within a section, two spacing gaps were not handled: - No spacing between sections — InterSectionSpacing was never set on the layout configuration, so the last item of one group appeared flush against the next group's header. - No spacing between a group header/footer and its items — No ContentInsets were applied to push items away from the header/footer supplementary views within the same section. Additionally, in GetViewForSupplementaryElement, the ScrollDirection was not set on TemplatedCell2 before measuring group headers/footers. It defaulted to Vertical, so GetMeasureConstraints constrained the width (to ~30pt estimated size) instead of the height for horizontal lists, causing header text to wrap incorrectly. ### Description of change: - Set InterSectionSpacing on the UICollectionViewCompositionalLayoutConfiguration when the collection is grouped and ItemSpacing > 0, creating the gap between the end of one group and the header of the next group. - Apply ContentInsets on each grouped section — leading/trailing insets for horizontal lists, top/bottom insets for vertical lists — to create the gap between the header/footer and the first/last item within the same section. Insets are only added when a header or footer actually exists. - Set TemplatedCell2.ScrollDirection = ScrollDirection before calling UpdateTemplatedSupplementaryView, so GetMeasureConstraints constrains the correct axis when measuring group header/footer cells. ### Validated the behaviour in the following platforms - [ ] Android - [ ] Windows - [x] iOS - [x] Mac ### Fixes Fixes #35429 ### Screenshots | Before | After | |---------|--------| | <img src="https://github.com/user-attachments/assets/7ef2cedb-d478-4e98-ab3e-054115b5ed43"> | <img src="https://github.com/user-attachments/assets/1f91672f-9b25-4328-92b4-e1f5dc2b0395"> |
…izontal LinearItemsLayout (#35445) <!-- Please let the below note in for people that find this PR --> > [!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: Item spacing is not correctly applied between the group header and the items in the CollectionView when using LinearItemsLayout. ### Root Cause: The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. The UICollectionViewCompositionalLayout treats each group as a separate section. While section.InterGroupSpacing correctly applied ItemSpacing between items within a section, two spacing gaps were not handled: - No spacing between sections — InterSectionSpacing was never set on the layout configuration, so the last item of one group appeared flush against the next group's header. - No spacing between a group header/footer and its items — No ContentInsets were applied to push items away from the header/footer supplementary views within the same section. Additionally, in GetViewForSupplementaryElement, the ScrollDirection was not set on TemplatedCell2 before measuring group headers/footers. It defaulted to Vertical, so GetMeasureConstraints constrained the width (to ~30pt estimated size) instead of the height for horizontal lists, causing header text to wrap incorrectly. ### Description of change: - Set InterSectionSpacing on the UICollectionViewCompositionalLayoutConfiguration when the collection is grouped and ItemSpacing > 0, creating the gap between the end of one group and the header of the next group. - Apply ContentInsets on each grouped section — leading/trailing insets for horizontal lists, top/bottom insets for vertical lists — to create the gap between the header/footer and the first/last item within the same section. Insets are only added when a header or footer actually exists. - Set TemplatedCell2.ScrollDirection = ScrollDirection before calling UpdateTemplatedSupplementaryView, so GetMeasureConstraints constrains the correct axis when measuring group header/footer cells. ### Validated the behaviour in the following platforms - [ ] Android - [ ] Windows - [x] iOS - [x] Mac ### Fixes Fixes #35429 ### Screenshots | Before | After | |---------|--------| | <img src="https://github.com/user-attachments/assets/7ef2cedb-d478-4e98-ab3e-054115b5ed43"> | <img src="https://github.com/user-attachments/assets/1f91672f-9b25-4328-92b4-e1f5dc2b0395"> |
…izontal LinearItemsLayout (#35445) <!-- Please let the below note in for people that find this PR --> > [!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: Item spacing is not correctly applied between the group header and the items in the CollectionView when using LinearItemsLayout. ### Root Cause: The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. The UICollectionViewCompositionalLayout treats each group as a separate section. While section.InterGroupSpacing correctly applied ItemSpacing between items within a section, two spacing gaps were not handled: - No spacing between sections — InterSectionSpacing was never set on the layout configuration, so the last item of one group appeared flush against the next group's header. - No spacing between a group header/footer and its items — No ContentInsets were applied to push items away from the header/footer supplementary views within the same section. Additionally, in GetViewForSupplementaryElement, the ScrollDirection was not set on TemplatedCell2 before measuring group headers/footers. It defaulted to Vertical, so GetMeasureConstraints constrained the width (to ~30pt estimated size) instead of the height for horizontal lists, causing header text to wrap incorrectly. ### Description of change: - Set InterSectionSpacing on the UICollectionViewCompositionalLayoutConfiguration when the collection is grouped and ItemSpacing > 0, creating the gap between the end of one group and the header of the next group. - Apply ContentInsets on each grouped section — leading/trailing insets for horizontal lists, top/bottom insets for vertical lists — to create the gap between the header/footer and the first/last item within the same section. Insets are only added when a header or footer actually exists. - Set TemplatedCell2.ScrollDirection = ScrollDirection before calling UpdateTemplatedSupplementaryView, so GetMeasureConstraints constrains the correct axis when measuring group header/footer cells. ### Validated the behaviour in the following platforms - [ ] Android - [ ] Windows - [x] iOS - [x] Mac ### Fixes Fixes #35429 ### Screenshots | Before | After | |---------|--------| | <img src="https://github.com/user-attachments/assets/7ef2cedb-d478-4e98-ab3e-054115b5ed43"> | <img src="https://github.com/user-attachments/assets/1f91672f-9b25-4328-92b4-e1f5dc2b0395"> |
…izontal LinearItemsLayout (#35445) <!-- Please let the below note in for people that find this PR --> > [!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: Item spacing is not correctly applied between the group header and the items in the CollectionView when using LinearItemsLayout. ### Root Cause: The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. The UICollectionViewCompositionalLayout treats each group as a separate section. While section.InterGroupSpacing correctly applied ItemSpacing between items within a section, two spacing gaps were not handled: - No spacing between sections — InterSectionSpacing was never set on the layout configuration, so the last item of one group appeared flush against the next group's header. - No spacing between a group header/footer and its items — No ContentInsets were applied to push items away from the header/footer supplementary views within the same section. Additionally, in GetViewForSupplementaryElement, the ScrollDirection was not set on TemplatedCell2 before measuring group headers/footers. It defaulted to Vertical, so GetMeasureConstraints constrained the width (to ~30pt estimated size) instead of the height for horizontal lists, causing header text to wrap incorrectly. ### Description of change: - Set InterSectionSpacing on the UICollectionViewCompositionalLayoutConfiguration when the collection is grouped and ItemSpacing > 0, creating the gap between the end of one group and the header of the next group. - Apply ContentInsets on each grouped section — leading/trailing insets for horizontal lists, top/bottom insets for vertical lists — to create the gap between the header/footer and the first/last item within the same section. Insets are only added when a header or footer actually exists. - Set TemplatedCell2.ScrollDirection = ScrollDirection before calling UpdateTemplatedSupplementaryView, so GetMeasureConstraints constrains the correct axis when measuring group header/footer cells. ### Validated the behaviour in the following platforms - [ ] Android - [ ] Windows - [x] iOS - [x] Mac ### Fixes Fixes #35429 ### Screenshots | Before | After | |---------|--------| | <img src="https://github.com/user-attachments/assets/7ef2cedb-d478-4e98-ab3e-054115b5ed43"> | <img src="https://github.com/user-attachments/assets/1f91672f-9b25-4328-92b4-e1f5dc2b0395"> |
…izontal LinearItemsLayout (#35445) <!-- Please let the below note in for people that find this PR --> > [!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: Item spacing is not correctly applied between the group header and the items in the CollectionView when using LinearItemsLayout. ### Root Cause: The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. The UICollectionViewCompositionalLayout treats each group as a separate section. While section.InterGroupSpacing correctly applied ItemSpacing between items within a section, two spacing gaps were not handled: - No spacing between sections — InterSectionSpacing was never set on the layout configuration, so the last item of one group appeared flush against the next group's header. - No spacing between a group header/footer and its items — No ContentInsets were applied to push items away from the header/footer supplementary views within the same section. Additionally, in GetViewForSupplementaryElement, the ScrollDirection was not set on TemplatedCell2 before measuring group headers/footers. It defaulted to Vertical, so GetMeasureConstraints constrained the width (to ~30pt estimated size) instead of the height for horizontal lists, causing header text to wrap incorrectly. ### Description of change: - Set InterSectionSpacing on the UICollectionViewCompositionalLayoutConfiguration when the collection is grouped and ItemSpacing > 0, creating the gap between the end of one group and the header of the next group. - Apply ContentInsets on each grouped section — leading/trailing insets for horizontal lists, top/bottom insets for vertical lists — to create the gap between the header/footer and the first/last item within the same section. Insets are only added when a header or footer actually exists. - Set TemplatedCell2.ScrollDirection = ScrollDirection before calling UpdateTemplatedSupplementaryView, so GetMeasureConstraints constrains the correct axis when measuring group header/footer cells. ### Validated the behaviour in the following platforms - [ ] Android - [ ] Windows - [x] iOS - [x] Mac ### Fixes Fixes #35429 ### Screenshots | Before | After | |---------|--------| | <img src="https://github.com/user-attachments/assets/7ef2cedb-d478-4e98-ab3e-054115b5ed43"> | <img src="https://github.com/user-attachments/assets/1f91672f-9b25-4328-92b4-e1f5dc2b0395"> |
## What's Coming .NET MAUI inflight/candidate introduces significant improvements across all platforms with focus on quality, performance, and developer experience. This release includes 153 commits with various improvements, bug fixes, and enhancements. ## Activityindicator - [Android] Fix CollectionView ActivityIndicator not animating after header height change by @Vignesh-SF3580 in #35358 <details> <summary>🔧 Fixes</summary> - [CollectionView items fail to update ActivityIndicator state after header height change](#33780) </details> ## Animation - [Android] Fix Shadow property affecting transform matrix. by @Shalini-Ashokan in #32962 <details> <summary>🔧 Fixes</summary> - [[Android] Applying Shadow property affects the properties in Visual Transform Matrix](#32731) </details> ## API - Add delegate-based alert dialog extensibility convention (no public API changes) by @Redth in #35095 <details> <summary>🔧 Fixes</summary> - [Alert/Dialog system (`DisplayAlert`, `DisplayActionSheet`, `DisplayPromptAsync`) needs a public extensibility point](#34104) </details> ## Blazor - [Android] Fix for BlazorWebView predictive back callback blocks Android back-to-home animation by @BagavathiPerumal in #35538 <details> <summary>🔧 Fixes</summary> - [[Android] BlazorWebView predictive back callback blocks Android back-to-home animation](#35397) </details> - [Android] Fix BlazorWebView back callback can swallow the first Back press when its callback is stale-enabled by @devanathan-vaithiyanathan in #35611 <details> <summary>🔧 Fixes</summary> - [[inflight regression] Android BlazorWebView back callback can swallow the first Back press when its callback is stale-enabled](#35573) </details> ## Border - [Windows] Fixed the ContentView clip is not updated when wrapping inside the Border by @Ahamed-Ali in #30408 <details> <summary>🔧 Fixes</summary> - [[Windows] ContentView clip is not updated when wrapping inside the Border](#30404) </details> - Fix Border.StrokeDashArray leaks dashed Borders when using a shared Application resource by @devanathan-vaithiyanathan in #35544 <details> <summary>🔧 Fixes</summary> - [`Border.StrokeDashArray` leaks dashed Borders when using a shared Application resource](#35492) </details> - [Windows] Border: Add AutomationPeer support by @Vignesh-SF3580 in #35577 <details> <summary>🔧 Fixes</summary> - [Adding AutomationPeers to Windows Borders](#27627) </details> - [Windows] Fixed BoxView improper rendering inside Border by @Dhivya-SF4094 in #28465 <details> <summary>🔧 Fixes</summary> - [[Windows] Issues with BoxView Placement Inside Border](#19668) </details> ## Button - Prevent NullReferenceException in LayoutButton by @GamesAgeddon in #35284 <details> <summary>🔧 Fixes</summary> - [NullReferenceException on iOS in Button.LayoutButton from WrapperView.LayoutSubviews](#31048) </details> - Fix TextColor null reset to restore platform defaults on iOS and Android by @Shalini-Ashokan in #35563 <details> <summary>🔧 Fixes</summary> - [[Windows, Android, iOS & Mac]Button TextColor does not restore to platform default when reset to null after dynamic update](#35513) </details> ## CollectionView - Fix CollectionView grid spacing updates for first row and column by @KarthikRajaKalaimani in #34527 <details> <summary>🔧 Fixes</summary> - [[MAUI] I2_Vertical grid for horizontal Item Spacing and Vertical Item Spacing - horizontally updating the spacing only applies to the second column](#34257) </details> - [MacCatalyst] Fix CollectionView Header/Footer Not Expanding to Content Width by @KarthikRajaKalaimani in #35213 <details> <summary>🔧 Fixes</summary> - [[MacOS][CV2] I8_View header and footer_Horizontal_View - Footer on the right doesn't adapt when resizing the window](#35113) </details> - [iOS/MacCatalyst] Fix IndicatorView not updating when IndicatorSize is changed to default value by @Shalini-Ashokan in #35215 <details> <summary>🔧 Fixes</summary> - [[iOS/MacCatalyst] IndicatorView does not update when IndicatorSize is dynamically changed to the default value](#35214) </details> - CollectionView selecteditem background lost if collectionview (or parent) IsEnabled changed. by @KarthikRajaKalaimani in #31540 <details> <summary>🔧 Fixes</summary> - [CollectionView selecteditem background lost if collectionview (or parent) IsEnabled changed.](#20615) </details> - [iOS/macOS] CollectionView: Fix FlowDirection not working on EmptyView by @Dhivya-SF4094 in #32674 <details> <summary>🔧 Fixes</summary> - [[iOS, MacOS] FlowDirection not working on EmptyView in CollectionView](#32404) - [[iOS, Mac] CollectionView EmptyViewTemplate content text is mirrored when FlowDirection is RightToLeft](#34522) </details> - Fix iOS CollectionView stale layout invalidations by @filipnavara in #35245 <details> <summary>🔧 Fixes</summary> - [[iOS] CollectionView tries to invalidate cells with invalid indexes](#35244) </details> - Fix Android grouped CollectionView header/footer rebind leak by @AdamEssenmacher in #35368 <details> <summary>🔧 Fixes</summary> - [Memory leak when scrolling a CollectionView with IsGrouped=true](#17698) </details> - [Windows] Fix for Item should scrolled based on the GroupHeaderTemplate by @SuthiYuvaraj in #28074 <details> <summary>🔧 Fixes</summary> - [I9_Scroll by object for grouped data - The group name is always pined at the top after clicking 'Scroll to Proboscis Monkey' button](#27922) </details> - [Android] Fix ScrollTo regression when IsGrouped true on CollectionView by @SubhikshaSf4851 in #35356 <details> <summary>🔧 Fixes</summary> - [[10.0.60] ScrollTo(0) not working anymore on CollectionView when IsGrouped="True"](#35313) </details> - [Android] Fix CollectionView scrolling performance regression by @devanathan-vaithiyanathan in #35379 <details> <summary>🔧 Fixes</summary> - [[10.0.60] CollectionView scrolling performance regression](#35344) </details> - Optimize parent dynamic resource refresh by @AdamEssenmacher in #35408 <details> <summary>🔧 Fixes</summary> - [Memory usage increases when scrolling collectionview if resources count is more than 191](#22053) </details> - Fix CI failure for CollectionView Scrolling Feature Tests due to PR #35379 by @devanathan-vaithiyanathan in #35536 - [iOS & Mac] CarouselViewController2 leaks on iOS/MacCatalyst due to unremoved orientation notification observer by @SubhikshaSf4851 in #35532 <details> <summary>🔧 Fixes</summary> - [CarouselViewController2 leaks on iOS/MacCatalyst due to unremoved orientation notification observer](#35472) </details> - Fix CollectionView.SelectedItems leaks popped views when bound to a retained ObservableCollection by @HarishwaranVijayakumar in #35558 <details> <summary>🔧 Fixes</summary> - [`CollectionView.SelectedItems` leaks popped views when bound to a retained `ObservableCollection`](#35497) </details> - Fix for Android - Dynamic Updates to CollectionView Header/Footer and Templates Are Not Displayed by @SuthiYuvaraj in #28904 <details> <summary>🔧 Fixes</summary> - [Android - Dynamic Updates to CollectionView Header/Footer and Templates Are Not Displayed](#28676) </details> - [Windows] Fix CarouselView EmptyView display when filtering to zero items by @Shalini-Ashokan in #29247 <details> <summary>🔧 Fixes</summary> - [[Windows] [Scenario Day] EmptyView using Template displayed at the same time as the content](#7150) </details> - [Android/iOS] Fix IsEnabled=False on CollectionView not working by @devanathan-vaithiyanathan in #27749 <details> <summary>🔧 Fixes</summary> - [[iOS/Android] CollectionView IsEnabled Not Working](#27770) </details> - Fix CarouselView.Loop property does not update dynamically and fails to maintain the scroll position when the loop value is changed at runtime by @devanathan-vaithiyanathan in #29527 <details> <summary>🔧 Fixes</summary> - [[Android] CarouselView.Loop = false causes crash on Android when changed at runtime](#29411) - [Loop Binding in CarouselView Not Updating Dynamically at Runtime](#29449) </details> - [iOS / Mac] Fix CollectionView.ScrollTo(index) silently failing whenIsGrouped="True" by @Dhivya-SF4094 in #35609 <details> <summary>🔧 Fixes</summary> - [CollectionView.ScrollTo(index) doesn't work correctly when IsGrouped="True" on iOS, MacCatalyst, and Windows](#35326) </details> - Fix Android nested carousel scrolling by @AdamEssenmacher in #35656 <details> <summary>🔧 Fixes</summary> - [Vertical scrolling not working for CarouselView and CustomLayouts](#7814) </details> - [Inflight regression] Fixed Test failures ModalTabbedPagePushAsyncShouldOverlayBottomNavigationView and GroupedCollectionViewScrollToIndexScrollsToCorrectItem by @Dhivya-SF4094 in #35823 - Fix CarouselView tests fail in June 8 Candidate by @devanathan-vaithiyanathan in #35825 ## Core - Reduce allocations on AnimationManager by @pictos in #35612 <details> <summary>🔧 Fixes</summary> - [AnimationManager is allocating a lot](#35654) </details> ## Core Lifecycle - Fix device test memory by @pictos in #35487 <details> <summary>🔧 Fixes</summary> - [Memory leak Device.Test pass with false positive](#35485) </details> ## Datepicker - Fix MacCatalyst DatePicker focus handling by @AdamEssenmacher in #35553 <details> <summary>🔧 Fixes</summary> - [[mauipalooza] DatePicker focus only works first time](#5947) </details> ## DateTimePicker - [Android] Fix DatePicker dialog dismisses after the device is rotated by @HarishwaranVijayakumar in #34980 <details> <summary>🔧 Fixes</summary> - [[Android] [Regression] DatePicker dialog dismisses after the device is rotated](#34973) </details> ## Docs - doc: Add paragraph to README.md explaining how to fetch the `maui` project templates by @durandt in #34561 ## Drawing - [Android] Fix LinearGradientBrush rendering as opaque black box by @SubhikshaSf4851 in #35299 <details> <summary>🔧 Fixes</summary> - [[Regression] LinearGradientBrush broken on Android in 10.0.60](#35280) - [10.0.60 breaks transparency on Brushes (on Android?)](#35354) </details> - Fix polygon points collection handler leak by @AdamEssenmacher in #35526 <details> <summary>🔧 Fixes</summary> - [PolygonHandler and PolylineHandler leak when Points is replaced before disconnect](#35387) </details> ## Editor - [iOS] Fix Editor losing scrollability after rotation when CharacterSpacing is applied by @Vignesh-SF3580 in #35309 <details> <summary>🔧 Fixes</summary> - [[.NET 10][iOS] D2 - Editor can't be scrolled after rotating simulator.](#35114) </details> - [Inflight/Candidate][iOS & Mac] Fix for Editor height inconsistency when VerticalTextAlignment is Center or End on iOS and MacCatalyst by @BagavathiPerumal in #35662 <details> <summary>🔧 Fixes</summary> - [[MAUI] D13_Customize_Text_Alignment - Text Editor Height is not consistent](#35615) </details> ## Entry - [iOS/Mac] Fix Entry clear button retaining tint color after TextColor is reset to null by @SyedAbdulAzeemSF4852 in #35177 <details> <summary>🔧 Fixes</summary> - [[iOS/Mac]Entry ClearButtonVisibility color does not reset when TextColor is set to null](#35076) </details> - [iOS/MacCatalyst] Fix Entry clear button appearing dimmed compared to TextColor by @SyedAbdulAzeemSF4852 in #35541 <details> <summary>🔧 Fixes</summary> - [[MacCatalyst] [Entry] ClearButtonVisibility color appears dimmed compared to TextColor](#35517) </details> - Fix pill-shaped focus ring on macOS 26 by @Dhivya-SF4094 in #35393 <details> <summary>🔧 Fixes</summary> - [.Net 10 Picker item not centered and wrong focus outline of Entry on Mac](#34899) </details> - Fix Entry select all text on refocus not working on WinUI by @kubaflo in #35383 ## Essentials - [Android] Fix Capture video crashes after stopping recording on Android 12 by @HarishwaranVijayakumar in #35638 <details> <summary>🔧 Fixes</summary> - [Capture video crashes after stopping recording on Android 12](#28891) </details> - [Essentials] Browser.OpenAsync(External): drop visibility-filtered ResolveActivity pre-check by @Kebechet in #35652 <details> <summary>🔧 Fixes</summary> - [Browser.OpenAsync(External) on Android throws FeatureNotSupportedException for verified App Link owner URLs even with documented <queries> fix applied](#35651) </details> ## Essentials Texttospeech - [Mac, iOS, Windows] Fix for inconsistent Text-to-Speech rate behavior by @HarishwaranVijayakumar in #32850 <details> <summary>🔧 Fixes</summary> - [[Essentials] TTS rate](#32492) </details> ## Flyoutpage - [iOS/Mac] Fix FlyoutPage RTL FlowDirection is not working by @devanathan-vaithiyanathan in #34831 <details> <summary>🔧 Fixes</summary> - [[iOS/Mac] FlyoutPage RTL FlowDirection is not working properly](#34830) </details> - [Android] Fix for Android 16 Back button is not working after command from FlyoutPage by @BagavathiPerumal in #35196 <details> <summary>🔧 Fixes</summary> - [Android: BackButton on Android 16 not working after command from FlyOutPage](#33508) </details> ## Gestures - Fix DragGestureRecognizer.DropCompleted event not firing in Android platform by @KarthikRajaKalaimani in #35179 <details> <summary>🔧 Fixes</summary> - [[Android] DragGestureRecognizer.DropCompleted event not firing](#17554) </details> - Windows: Ensure layouts without background participate in hit testing by @jpd21122012 in #34364 <details> <summary>🔧 Fixes</summary> - [[Windows] TapGestureRecognizer does NOT work on a ContentView without Background](#32279) </details> - [iOS] Fix VoiceOver dropping child labels on layouts with SemanticProperties.Hint or TapGestureRecognizer by @Vignesh-SF3580 in #35590 <details> <summary>🔧 Fixes</summary> - [[iOS] VoiceOver does not correctly describe View with GestureRecognizers](#34380) </details> ## Hybridwebview - Fix RemovePossibleQueryString to also strip URL fragments by @kubaflo in #35551 <details> <summary>🔧 Fixes</summary> - [HybridWebViewQueryStringHelper.RemovePossibleQueryString removes '?' but not other special characters e.g. '#'](#31472) </details> - [Revert] - [Windows] Fix WebView blank rendering when used with HybridWebView by @SubhikshaSf4851 in #35814 ## Image - Avoid image source layout invalidation for fixed-size views by @AdamEssenmacher in #35369 <details> <summary>🔧 Fixes</summary> - [Image source swaps thrash layout under fixed constraints, tanking frame rate when scrolling virtualized collections](#32457) </details> - [Windows] Fix Image layout inconsistency caused by async decode race in GetDesiredSize by @praveenkumarkarunanithi in #34699 <details> <summary>🔧 Fixes</summary> - [[Windows] Image cropping produces inconsistent results when window is minimized or resized](#32393) </details> - [Testing] Include more testing around Windows Image Aspect recent fixes by @kubaflo in #35620 <details> <summary>🔧 Fixes</summary> - [[Testing] Include more testing around Windows Image Aspect recent fixes](#31686) </details> - Revert PR #30068 — Fix FontImageSource centering regression on Windows by @Shalini-Ashokan in #35642 <details> <summary>🔧 Fixes</summary> - [[Windows] Image with FontImageSource is not centered and gets clipped when WidthRequest/HeightRequest equals FontImageSource Size](#35618) </details> - [Android] Fix screenshot from WebView content not working by @kubaflo in #35384 <details> <summary>🔧 Fixes</summary> - [[Android] Loading the captured screenshot from webview content to Image control does not visible](#30010) </details> ## Label - Improve label mapping performance and ensure complete coverage including ToPlatform and subsequent property changes by @Tamilarasan-Paranthaman in #31159 - Fix for Label.FormattedText leaks labels when shared FormattedString is stored in Application.Resources by @BagavathiPerumal in #35582 <details> <summary>🔧 Fixes</summary> - [`Label.FormattedText` leaks labels when shared `FormattedString` is stored in `Application.Resources`](#35495) </details> - [iOS] Fix Label Span formatting test failures on candidate branch by @Vignesh-SF3580 in #35815 ## Layout - [iOS, Mac] Fix Item spacing not properly applied between items in Horizontal LinearItemsLayout by @Dhivya-SF4094 in #35445 <details> <summary>🔧 Fixes</summary> - [[CollectionView2] Item spacing not properly applied between items in Horizontal LinearItemsLayout](#35429) </details> - [Windows] Add Automation Id support for Layouts. by @SubhikshaSf4851 in #35562 <details> <summary>🔧 Fixes</summary> - [[Windows] AutomationId does not work for ContentView, Layouts and controls that inherit them](#4715) </details> - Avoid layout diagnostics allocations without listeners by @AdamEssenmacher in #35475 <details> <summary>🔧 Fixes</summary> - [MAUI 10 layout diagnostics no-consumer path is not zero-allocation](#35473) </details> - [Windows/Android] FlexLayout: Fix wrap misalignment due to floating-point precision by @SuthiYuvaraj in #31341 <details> <summary>🔧 Fixes</summary> - [FlexLayout Wrap Misalignment with Dynamically-Sized Buttons in .NET MAUI](#30957) </details> ## Listview - Fix Binding for ListView.IsRefreshing by @bill2004158 in #28516 <details> <summary>🔧 Fixes</summary> - [Bind ListView.IsRefreshing is not work.](#28514) </details> ## Map - Fix iOS/Catalyst MapPool retention with MapElements by @AdamEssenmacher in #35480 <details> <summary>🔧 Fixes</summary> - [iOS/Mac Catalyst MapHandler leaks MAUI Map views and MapElements through MapPool](#35479) </details> - Fix Android map view lifecycle cleanup by @AdamEssenmacher in #35476 <details> <summary>🔧 Fixes</summary> - [Navigating to a page with Maps multiple times Increase RAM Usage but doesn't reduce it back after navigating back](#15257) </details> - Fix Android map element options retention by @AdamEssenmacher in #35634 <details> <summary>🔧 Fixes</summary> - [[Regression] [Android] [Maps] Map locks up after rendering 50 Polylines](#20502) </details> ## Menubar - [MacCatalyst] Fix KeyboardAccelerator with Cmd+Shift modifiers breaks entire MenuBarItem on Mac Catalyst by @KarthikRajaKalaimani in #35318 <details> <summary>🔧 Fixes</summary> - [[Bug] KeyboardAccelerator with Cmd+Shift modifiers breaks entire MenuBarItem on Mac Catalyst](#35279) </details> ## Navigation - [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and Shell by @Dhivya-SF4094 in #35072 <details> <summary>🔧 Fixes</summary> - [On Screen Back Button Does Not Fire OnBackButtonPressed in Android](#9095) - [ContentPage's OnBackButtonPressed not invoked on iOS and MacCatalyst](#8296) </details> - Fix Android stale ContainerView root leak by @AdamEssenmacher in #35372 <details> <summary>🔧 Fixes</summary> - [Android: Stale ContainerView retains replaced FlyoutPage graph](#35371) </details> - [Android] Fix for predictive back-to-home animation blocked by unconditional back callback registration by @BagavathiPerumal in #35223 <details> <summary>🔧 Fixes</summary> - [OnBackInvokedCallbacks block back-to-home animation](#34594) - [Migrate to OnBackPressedCallback](#24752) </details> - Revert [Android, iOS] - Flyout icon should remain visible when a page is pushed onto a NavigationPage or Shell page with the back button disabled. by @praveenkumarkarunanithi in #35604 ## Picker - [iOS] Fix Picker CharacterSpacing lost after item selection when Title is set by @SyedAbdulAzeemSF4852 in #34974 <details> <summary>🔧 Fixes</summary> - [[iOS] Picker loses CharacterSpacing after item selection when Title is set](#34971) </details> - [iOS] Fix Picker CharacterSpacing ignored on initial load by @SyedAbdulAzeemSF4852 in #34957 <details> <summary>🔧 Fixes</summary> - [[iOS] Picker ignores CharacterSpacing on initial load](#34955) </details> - [Windows] Fix for Picker CharacterSpacing Not Being Applied to Title and Dropdown Items by @SyedAbdulAzeemSF4852 in #30612 <details> <summary>🔧 Fixes</summary> - [[Windows] Picker CharacterSpacing property not applied to Title and PickerItems text](#30464) </details> - Fix Picker SelectedIndex deferred initialization by @AdamEssenmacher in #35629 <details> <summary>🔧 Fixes</summary> - [Picker Attribute "SelectedIndex" Not being respected on page load on Android?](#9150) </details> ## Progressbar - Fix iOS ProgressBar bounding box by @AdamEssenmacher in #35507 <details> <summary>🔧 Fixes</summary> - [[iOS] ProgressBar and Label don't correctly obey height and width at the core level](#7935) </details> ## RadioButton - [Windows, Android] Fix Border Color and Border Width Not applying for Radio Button by @HarishwaranVijayakumar in #35616 <details> <summary>🔧 Fixes</summary> - [[Windows, Android] Border Color and Border Width Not applying for Radio Button.](#35587) </details> - [inflight/current] Fixes a CS0111 build failure in RadioButton.cs caused by a duplicate OnPropertyChanged override by @HarishwaranVijayakumar in #35631 - Revert - Fix TalkBack not correctly narrating RadioButtons with Content by @devanathan-vaithiyanathan in #35625 <details> <summary>🔧 Fixes</summary> - [[Android] MissingMethodException AccessibilityNodeInfoCompat.set_Checked(bool) on 10.0.70 due to AndroidX.Core 1.17 breaking change](#35584) </details> ## Refreshview - [Windows] Fix RefreshView IsRefreshing property not working while binding by @devanathan-vaithiyanathan in #34845 <details> <summary>🔧 Fixes</summary> - [[Windows] RefreshView IsRefreshing property not working while binding](#30535) </details> - [Android] Fix for RefreshView triggering pull-to-refresh when scrolling inside a WebView with internal scrollable content by @BagavathiPerumal in #34614 <details> <summary>🔧 Fixes</summary> - [[Android] RefreshView triggers pull-to-refresh immediately when scrolling up inside a WebView](#33510) </details> ## SafeArea - [Android] Fix bottom safe area padding dropping to zero when keyboard is shown by @praveenkumarkarunanithi in #35084 <details> <summary>🔧 Fixes</summary> - [[Android] Bottom insets issues when keyboard is shown.](#32871) </details> - Gate SafeArea inset listeners in recycler items by @AdamEssenmacher in #35664 <details> <summary>🔧 Fixes</summary> - [[10.0.60] CollectionView scrolling performance regression](#35344) </details> ## ScrollView - [Windows] Fix COMException when restoring a ScrollView as ContentPage.Content after swapping it out by @Vignesh-SF3580 in #35360 <details> <summary>🔧 Fixes</summary> - [COMException when clone a page's content to a object and set it back later in mainthread on Windows](#35277) </details> - Fix - ScrollView.ScrollToAsync(x, y, animated) doesn't work when called from Page.OnAppearing by @Shalini-Ashokan in #35395 <details> <summary>🔧 Fixes</summary> - [[iOS] ScrollView.ScrollToAsync(x, y, animated) doesn't work when called from Page.OnAppearing](#31177) </details> ## Searchbar - [Android] Fix SearchBar IME full-screen extract mode in landscape orientation by @SubhikshaSf4851 in #35197 <details> <summary>🔧 Fixes</summary> - [[Android] Investigate SearchBar presentation in horizontal screen orientation ](#14708) </details> - [iOS 26] Fix SearchBar layout spacing issues for small HeightRequest values by @devanathan-vaithiyanathan in #35347 <details> <summary>🔧 Fixes</summary> - [Spacing problem with maui 10.0.60 iOS](#35286) </details> ## SearchBar - [Windows] Fix SearchHandler does not focus when ShowSoftInputAsync is called by @praveenkumarkarunanithi in #35079 <details> <summary>🔧 Fixes</summary> - [[Windows] SearchHandler.ShowSoftInputAsync() does not focus the SearchHandler](#34930) </details> ## Shell - Fix Android layout jump when navigating with IME open and NavBarIsVisible=false by @jpd21122012 in #34621 <details> <summary>🔧 Fixes</summary> - [Shell page without NavBar jumping when navigating with keyboard open](#34584) </details> - [Android] Add defensive not null check to SearchHandlerAppearanceTracker.FocusChange by @Transis-Felipe in #29939 - [Android] Fix for Shell colors change before navigation completes on Android in .NET 10 by @BagavathiPerumal in #35295 <details> <summary>🔧 Fixes</summary> - [Shell colors change before navigation completes on Android in .NET 10](#35060) </details> - [Windows] Fix Shell FlyoutItem not taking full width by @SubhikshaSf4851 in #35131 <details> <summary>🔧 Fixes</summary> - [MAUI WinUI Grids don't render properly in flyout menu](#19542) - [[Windows] [.NET 8 RC2] FlyoutItem Backgroundcolor Is not fully displaying](#18238) </details> - [Android, iOS, Catalyst] Fix SearchHandler.BackgroundColor cannot be reset to null by @HarishwaranVijayakumar in #35224 <details> <summary>🔧 Fixes</summary> - [[Android, iOS, Catalyst] SearchHandler.BackgroundColor cannot be reset to null](#35088) </details> - Fix for ApplyQueryAttributes being called on non-destination pages during back navigation by @BagavathiPerumal in #35392 <details> <summary>🔧 Fixes</summary> - [ApplyQueryAttributes gets called for not activated (navigated to) page on back](#35183) </details> - [Android] Fix Shell flyout background to follow Material 3 theme colors by @SyedAbdulAzeemSF4852 in #35148 <details> <summary>🔧 Fixes</summary> - [[Android] Shell Flyout ignores Material 3 surface color when UseMaterial3 is enabled](#35147) </details> - [Android] Fix Shell.FlyoutHeader background incorrect by @SyedAbdulAzeemSF4852 in #35489 <details> <summary>🔧 Fixes</summary> - [[Android] Shell.FlyoutHeader background is incorrect](#35416) </details> - [iOS/MacCatalyst] Fix Shell.BackgroundColor not applied to bottom TabBar by @Shalini-Ashokan in #35545 <details> <summary>🔧 Fixes</summary> - [[MacCatalyst] Shell.BackgroundColor not applied to bottom TabBar](#35380) - [[Catalyst] Shell.TabBarBackgroundColor is not applied](#35381) </details> - [Android] Fix Shell FlyoutIcon tint loss after navigation by @SyedAbdulAzeemSF4852 in #35561 <details> <summary>🔧 Fixes</summary> - [[Android] The flyout icon loses colours](#35390) </details> - [iOS] Fix Shell - opened keyboard on modal page shifts parent page/frame behind modal after update to 10.0.60 by @KarthikRajaKalaimani in #35559 <details> <summary>🔧 Fixes</summary> - [[iOS] Shell - opened keyboard on modal page shifts parent page/frame behind modal after update to 10.0.60](#35401) </details> - Fix intermediate pages not receiving query parameters in multi-page Shell navigation by @mattleibow in #35432 <details> <summary>🔧 Fixes</summary> - [Shell GoToAsync: no way to pass query parameters to intermediate pages in multi-segment navigation](#35107) </details> - [Windows] Fix Shell title bar overlap with window controls in RTL mode by @Shalini-Ashokan in #33109 <details> <summary>🔧 Fixes</summary> - [[Windows] Binding RTL FlowDirection in Shell causes Flyout MenuIcon and native window controls to overlap](#32476) </details> - [macOS] Fix IsEnabled property false not working on MenuBarItem by @devanathan-vaithiyanathan in #35546 <details> <summary>🔧 Fixes</summary> - [[macOS] IsEnabled property false not working on MenuBarItem](#34038) </details> - Fix Android Shell top inset when nav bar is hidden by @ne0rrmatrix in #35555 <details> <summary>🔧 Fixes</summary> - [wrong statusbar height when Android device has a notch](#35103) </details> - Fix Changing Content property of ShellContent doesn't change visual content by @devanathan-vaithiyanathan in #34630 <details> <summary>🔧 Fixes</summary> - [Changing Content property of ShellContent doesn't change visual content. ](#12669) </details> - Fixed a NullReferenceException when starting application with empty shell on Windows by @Shalini-Ashokan in #28879 <details> <summary>🔧 Fixes</summary> - [NullReferenceException when starting application with empty shell on Windows](#21562) - [Using SelectionChangedCommand with CollectionView in Shell.FlyoutContent results in Win32 Unhandled Exception](#10041) </details> ## Slider - [iOS] Slider: Scale ThumbImageSource to match default thumb size by @NirmalKumarYuvaraj in #34184 <details> <summary>🔧 Fixes</summary> - [[Slider] MAUI Slider thumb image is big on android](#13258) </details> ## Stepper - Fix iOS 26 Stepper overlap in landscape by @AdamEssenmacher in #35374 <details> <summary>🔧 Fixes</summary> - [[.NET10] D10-The number and buttons overlap after rotating the simulator.](#35211) </details> ## SwipeView - Fix SwipeViews with invoked properties crash the app in Release mode by @BagavathiPerumal in #35208 <details> <summary>🔧 Fixes</summary> - [[iOS/Catalyst] Swipeviews with invoked properties crash the app in Release](#18055) </details> - Fix SwipeItemView command leak by @AdamEssenmacher in #35510 <details> <summary>🔧 Fixes</summary> - [`SwipeItemView.Command` leaks row views and command parameters through `CanExecuteChanged`](#35498) </details> - [iOS/Android] Fix SwipeItem.IsVisible not refreshing native swipe items when binding changes by @SyedAbdulAzeemSF4852 in #35217 <details> <summary>🔧 Fixes</summary> - [SwipeItem.IsVisible doesn't properly refresh the native swipe items when the binding value changes dynamically](#34832) </details> - Fix SwipeView memory leak when SwipeItems are reused or replaced by @Vignesh-SF3580 in #35539 <details> <summary>🔧 Fixes</summary> - [SwipeView leaks when SwipeItems are reused or replaced](#35481) </details> - Fix SwipeItem IconImageSource color handling and rendering across platforms by @Shalini-Ashokan in #35632 <details> <summary>🔧 Fixes</summary> - [[Android] SwipeItem IconImageSource should allow more configuration](#23074) </details> ## Switch - [Android/Windows] Fix RadioButton gradient not clearing when switching background by @Shalini-Ashokan in #34997 <details> <summary>🔧 Fixes</summary> - [RadioButton Background does not reset when set to null at runtime](#34993) </details> - [Windows] Fix "PlatformView cannot be null here" exception during handler disconnect by @kubaflo in #35314 <details> <summary>🔧 Fixes</summary> - ["PlatformView cannot be null here" Exception in Switch control [Windows]](#27101) </details> - [iOS 26] Fix Switch ThumbColor and OffColor not applied on initial load by @SyedAbdulAzeemSF4852 in #35400 <details> <summary>🔧 Fixes</summary> - [iOS 26 Switch default color for Off and On is incorrect + Off Color is not applied at start + Thumb Colors is not applied](#35257) </details> - [Android] Fix AppBar flicker on CheckBox/Switch toggle with Material 3 by @Dhivya-SF4094 in #35181 <details> <summary>🔧 Fixes</summary> - [[Android] AppBar flicker while changing the CheckBox or Switch state after scrolling in Material 3](#35180) </details> - [Android] Fix Switch Shadow Does Not Follow Thumb when Toggle On or Off by @Dhivya-SF4094 in #35623 <details> <summary>🔧 Fixes</summary> - [[Android] Switch Shadow Does Not Follow Thumb when Toggle On or Off](#30046) </details> ## TabbedPage - [Android] Fix TabbedPage truncating tab titles instead of scrolling by @Shalini-Ashokan in #35086 <details> <summary>🔧 Fixes</summary> - [Maui migrating Xamarin to Maui - Tabbed Page Scroll Issue - Tabs are not scrolling](#16470) </details> - [Android] Fix BottomNavigationView remaining visible for TabbedPage inside modal NavigationPage after PushAsync by @Dhivya-SF4094 in #35359 <details> <summary>🔧 Fixes</summary> - [Android TabbedPage inside Modal Navigation does not overlay BottomNavigationView after PushAsync in .NET MAUI 10.0.60](#35331) </details> - [Android & iOS] TabbedPage leaks with shared GradientBrush. by @SubhikshaSf4851 in #35543 <details> <summary>🔧 Fixes</summary> - [TabbedPage leaks renderer/manager when BarBackground uses shared GradientBrush resource](#35469) </details> ## Templates - Bumps Syncfusion.Maui.Toolkit dependency to version 1.0.10 by @PaulAndersonS in #35608 ## Toolbar - Fix Android app bar inset background coloring by @ne0rrmatrix in #35601 <details> <summary>🔧 Fixes</summary> - [Android Edge-to-Edge: Shell and NavigationPage Top Bar colour is not used for status bar.](#35568) </details> ## Tooling - Add default .gitignore to MAUI project templates by @davidortinau in #34862 <details> <summary>🔧 Fixes</summary> - [Add a gitignore file to the Maui template in VS 2022](#4131) </details> - Fix: Propagate AdditionalProperties from ProjectReference in ResizetizeCollectItems by @mattleibow in #35575 <details> <summary>🔧 Fixes</summary> - [Resizetizer GetMauiItems does not propagate ProjectReference AdditionalProperties](#35574) </details> ## WebView - [Windows] Fix WebView blank rendering when used with HybridWebView by @SubhikshaSf4851 in #35092 <details> <summary>🔧 Fixes</summary> - [[Windows] WebView Regression from NET9 to NET10](#34558) </details> - Fix AOT integration test failures: suppress IL3050/IL2026 for HybridWebViewHandler in AddControlsHandlers by @mattleibow via @Copilot in #34868 - Fix Android activity result callback leak by @AdamEssenmacher in #35436 <details> <summary>🔧 Fixes</summary> - [Android WebView file chooser callbacks leak via ActivityResultCallbackRegistry](#35405) </details> - [Windows] Fix WebView Does Not Inherit App Theme by @devanathan-vaithiyanathan in #35037 <details> <summary>🔧 Fixes</summary> - [WebView on Windows Does Not Inherit App Theme](#34823) </details> - Fix for WebView leaks when reusing a shared WebViewSource by @BagavathiPerumal in #35524 <details> <summary>🔧 Fixes</summary> - [WebView leaks when reusing a shared WebViewSource](#35483) </details> - Destroy Android WebView on handler disconnect by @AdamEssenmacher in #35552 <details> <summary>🔧 Fixes</summary> - [Right way to dispose page with WebView](#18021) </details> ## Xaml - Fix: Enable VisualStateManager to set Style property dynamically by @Shalini-Ashokan in #33389 <details> <summary>🔧 Fixes</summary> - [Setting the `Style` property using the `VisualStateManager` within a Style resource does not work](#17175) </details> - Fix Implicit parameter conversion from integer to byte fails with source generated XAML by @KarthikRajaKalaimani in #35444 <details> <summary>🔧 Fixes</summary> - [Implicit parameter conversion from integer to byte fails with source generated XAML](#35396) </details> <details> <summary>🔧 Infrastructure (3)</summary> - Fix: Build fails when appicon is an empty (but valid) SVG by @Shalini-Ashokan in #35305 <details> <summary>🔧 Fixes</summary> - [Build fails when appicon is an empty (but valid) svg after upgrade to 10.0.60](#35293) </details> - [inflight/current] Fix CS0111 duplicate GetNativeCharacterSpacing in PickerHandlerTests.iOS by @SyedAbdulAzeemSF4852 in #35419 - Update WinAppSDK to 1.8.260508005 by @kubaflo in #35678 </details> <details> <summary>🧪 Testing (3)</summary> - Backport Test Fixes and Snapshots from SR to Inflight Branch by @Tamilarasan-Paranthaman in #35499 - Fix hardcoded version of Microsoft.DotNet.XHarness.TestRunners.Xunit in test projects by @akoeplinger in #29905 - [Testing] Fixed Build error on inflight/ candidate PR 35716 by @HarishKumarSF4517 in #35730 </details> <details> <summary>🏠 Housekeeping (1)</summary> - [HouseKeeping] Fix inconsistant namespace in HostApp by @NirmalKumarYuvaraj in #35210 </details> <details> <summary>📦 Other (8)</summary> - Add .cab and ReconnectModal.razor.js to signing config by @jesuszarate in #35026 - Fix typo in Clipboard.shared.cs by @Deadpikle in #35316 - Fix single modifier for NSMenuItem accelerators by @jeremy-visionaid in #35351 - Avoid unnecessary LINQ enumerations by @jeremy-visionaid in #35272 - [Testing] Replace retryDelay with retryTimeout in UI tests by @kubaflo in #35367 - Replace JavaFinalize() with Dispose(bool) in GenericAnimatorListener by @jonathanpeppers in #35548 - Fix incorrect SDK provisioning commands in integration-tests instructions by @davidnguyen-tech in #34992 - Fix VisualElement.ChangeVisualState() gets stuck in Selected state by @Dhivya-SF4094 in #35421 <details> <summary>🔧 Fixes</summary> - [VisualElement's ChangeVisualState gets stuck in Selected state](#35399) </details> </details> <details> <summary>📝 Issue References</summary> Fixes #4131, Fixes #4715, Fixes #5947, Fixes #7150, Fixes #7814, Fixes #7935, Fixes #8296, Fixes #9095, Fixes #9150, Fixes #10041, Fixes #12669, Fixes #13258, Fixes #14708, Fixes #15257, Fixes #16470, Fixes #17175, Fixes #17554, Fixes #17698, Fixes #18021, Fixes #18055, Fixes #18238, Fixes #19542, Fixes #19668, Fixes #20502, Fixes #20615, Fixes #21562, Fixes #22053, Fixes #23074, Fixes #24752, Fixes #27101, Fixes #27627, Fixes #27770, Fixes #27922, Fixes #28514, Fixes #28676, Fixes #28891, Fixes #29411, Fixes #29449, Fixes #30010, Fixes #30046, Fixes #30404, Fixes #30464, Fixes #30535, Fixes #30957, Fixes #31048, Fixes #31177, Fixes #31472, Fixes #31686, Fixes #32279, Fixes #32393, Fixes #32404, Fixes #32457, Fixes #32476, Fixes #32492, Fixes #32731, Fixes #32871, Fixes #33508, Fixes #33510, Fixes #33780, Fixes #34038, Fixes #34104, Fixes #34257, Fixes #34380, Fixes #34522, Fixes #34558, Fixes #34584, Fixes #34594, Fixes #34823, Fixes #34830, Fixes #34832, Fixes #34899, Fixes #34930, Fixes #34955, Fixes #34971, Fixes #34973, Fixes #34993, Fixes #35060, Fixes #35076, Fixes #35088, Fixes #35103, Fixes #35107, Fixes #35113, Fixes #35114, Fixes #35147, Fixes #35180, Fixes #35183, Fixes #35211, Fixes #35214, Fixes #35244, Fixes #35257, Fixes #35277, Fixes #35279, Fixes #35280, Fixes #35286, Fixes #35293, Fixes #35313, Fixes #35326, Fixes #35331, Fixes #35344, Fixes #35354, Fixes #35371, Fixes #35380, Fixes #35381, Fixes #35387, Fixes #35390, Fixes #35396, Fixes #35397, Fixes #35399, Fixes #35401, Fixes #35405, Fixes #35416, Fixes #35429, Fixes #35469, Fixes #35472, Fixes #35473, Fixes #35479, Fixes #35481, Fixes #35483, Fixes #35485, Fixes #35492, Fixes #35495, Fixes #35497, Fixes #35498, Fixes #35513, Fixes #35517, Fixes #35568, Fixes #35573, Fixes #35574, Fixes #35584, Fixes #35587, Fixes #35615, Fixes #35618, Fixes #35651, Fixes #35654 </details> **Full Changelog**: main...inflight/candidate
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:
Item spacing is not correctly applied between the group header and the items in the CollectionView when using LinearItemsLayout.
Root Cause:
The CollectionView2 iOS handler (Items2) was missing spacing logic for grouped collections. The UICollectionViewCompositionalLayout treats each group as a separate section. While section.InterGroupSpacing correctly applied ItemSpacing between items within a section, two spacing gaps were not handled:
No spacing between sections — InterSectionSpacing was never set on the layout configuration, so the last item of one group appeared flush against the next group's header.
No spacing between a group header/footer and its items — No ContentInsets were applied to push items away from the header/footer supplementary views within the same section.
Additionally, in GetViewForSupplementaryElement, the ScrollDirection was not set on TemplatedCell2 before measuring group headers/footers. It defaulted to Vertical, so GetMeasureConstraints constrained the width (to ~30pt estimated size) instead of the height for horizontal lists, causing header text to wrap incorrectly.
Description of change:
Set InterSectionSpacing on the UICollectionViewCompositionalLayoutConfiguration when the collection is grouped and ItemSpacing > 0, creating the gap between the end of one group and the header of the next group.
Apply ContentInsets on each grouped section — leading/trailing insets for horizontal lists, top/bottom insets for vertical lists — to create the gap between the header/footer and the first/last item within the same section. Insets are only added when a header or footer actually exists.
Set TemplatedCell2.ScrollDirection = ScrollDirection before calling UpdateTemplatedSupplementaryView, so GetMeasureConstraints constrains the correct axis when measuring group header/footer cells.
Validated the behaviour in the following platforms
Fixes
Fixes #35429
Screenshots