[iOS] Preserve ScrollView offsets when Orientation changes to Neither

[Vignesh-SF3580]

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

On iOS, changing ScrollView.Orientation to Neither resets ScrollX and ScrollY to 0 instead of preserving the current scroll position.

Regression Details

PR: #30991
The change came from PR #30991 (commit 2b13a90). The PR description indicates the goal was to align iOS ScrollView behavior with Android by preventing scrolling on disallowed axes, so clamping logic was introduced to enforce orientation behavior. No review comment or PR note explains why ScrollOrientation.Neither was included in both clamp conditions.
The clamping logic appears intentional, but the inclusion of Neither was likely an overextension or unintended side effect of that fix.

Root Cause

MauiScrollView.LayoutSubviews treated ScrollOrientation.Neither as a resize-to-viewport scenario by clamping both width and height to the frame size. As a result, ContentSize shrank to the viewport, causing UIKit to clamp ContentOffset to (0, 0), which led to the issue.

Description of change

The content-size clamping logic has been updated to skip Neither:

• Width is clamped only for Vertical
• Height is clamped only for Horizontal
• Neither preserves the existing ContentSize, ensuring the current ContentOffset is retained

Issues Fixed

Fixes #34583

Screenshots

Before Issue Fix	After Issue Fix
34583BeforeFix.mov	34583AfterFix.mov

[github-actions]

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

Or

• Run remotely in PowerShell:

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

[MauiBot]

🚦 Gate - Test Before and After Fix

📊 Expand Full Gate — f801766 · Addressed copilot comments.

---

Gate Result: ✅ PASSED

Platform: IOS · Base: main · Merge base: 720a9d4a

Test	Without Fix (expect FAIL)	With Fix (expect PASS)
🖥️ Issue34583 Issue34583	✅ FAIL — 203s	✅ PASS — 87s

🔴 Without fix — 🖥️ Issue34583: FAIL ✅ · 203s

  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 564 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 554 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 7.07 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/Foldable/src/Controls.Foldable.csproj (in 7.23 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 7.23 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Xaml/Controls.Xaml.csproj (in 7.23 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj (in 7.23 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/Maps/src/Controls.Maps.csproj (in 7.24 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj (in 7.24 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/maps/src/Maps.csproj (in 7.24 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 7.25 sec).
/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0-ios26.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0-ios26.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0-ios26.0/Microsoft.Maui.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Maps.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.Foldable -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Foldable/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Foldable.dll
  Controls.Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Maps.dll
  Microsoft.AspNetCore.Components.WebView.Maui -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Microsoft.AspNetCore.Components.WebView.Maui/Debug/net10.0-ios26.0/Microsoft.AspNetCore.Components.WebView.Maui.dll
  Controls.Xaml -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Xaml/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Xaml.dll
  Detected signing identity:
    Code Signing Key: "" (-)
    Provisioning Profile: "" () - no entitlements
    Bundle Id: com.microsoft.maui.uitests
    App Id: com.microsoft.maui.uitests
  Controls.TestCases.HostApp -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-ios/iossimulator-arm64/Controls.TestCases.HostApp.dll
  Optimizing assemblies for size may change the behavior of the app. Be sure to test after publishing. See: https://aka.ms/dotnet-illink
  Optimizing assemblies for size. This process might take a while.

Build succeeded.

/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
    1 Warning(s)
    0 Error(s)

Time Elapsed 00:01:40.68
  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 849 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/tests/CustomAttributes/Controls.CustomAttributes.csproj (in 845 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.Core/UITest.Core.csproj (in 849 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 852 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/VisualTestUtils/VisualTestUtils.csproj (in 0.9 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 919 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 936 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 275 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.NUnit/UITest.NUnit.csproj (in 1.62 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj (in 1.87 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.Analyzers/UITest.Analyzers.csproj (in 2.54 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/VisualTestUtils.MagickNet/VisualTestUtils.MagickNet.csproj (in 3.05 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj (in 3.07 sec).
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.CustomAttributes -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.CustomAttributes/Debug/net10.0/Controls.CustomAttributes.dll
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0/Microsoft.Maui.Controls.dll
  UITest.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Core/Debug/net10.0/UITest.Core.dll
  VisualTestUtils -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils/Debug/netstandard2.0/VisualTestUtils.dll
  UITest.NUnit -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.NUnit/Debug/net10.0/UITest.NUnit.dll
  VisualTestUtils.MagickNet -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils.MagickNet/Debug/netstandard2.0/VisualTestUtils.MagickNet.dll
  UITest.Appium -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Appium/Debug/net10.0/UITest.Appium.dll
  UITest.Analyzers -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Analyzers/Debug/netstandard2.0/UITest.Analyzers.dll
  Controls.TestCases.iOS.Tests -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
Test run for /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll (.NETCoreApp,Version=v10.0)
VSTest version 18.0.1 (arm64)

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
/Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
[xUnit.net 00:00:00.00] xUnit.net VSTest Adapter v2.8.2+699d445a1a (64-bit .NET 10.0.0)
[xUnit.net 00:00:00.04]   Discovering: Controls.TestCases.iOS.Tests
[xUnit.net 00:00:00.13]   Discovered:  Controls.TestCases.iOS.Tests
NUnit Adapter 4.5.0.0: Test execution started
Running selected tests in /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
   NUnit3TestExecutor discovered 1 of 1 NUnit test cases using Current Discovery mode, Non-Explicit run
>>>>> 3/30/2026 7:13:11 AM FixtureSetup for Issue34583(iOS)
>>>>> 3/30/2026 7:13:14 AM ScrollPositionIsPreservedWhenOrientationChangesToNeither Start
>>>>> 3/30/2026 7:13:16 AM ScrollPositionIsPreservedWhenOrientationChangesToNeither Stop
>>>>> 3/30/2026 7:13:16 AM Log types: syslog, crashlog, performance, safariConsole, safariNetwork, server
  Failed ScrollPositionIsPreservedWhenOrientationChangesToNeither [2 s]
  Error Message:
     ScrollX should remain non-zero after setting orientation to Neither.
Assert.That(scrollX, Is.GreaterThan(0d))
  Expected: greater than 0.0d
  But was:  0.0d

  Stack Trace:
     at Microsoft.Maui.TestCases.Tests.Issues.Issue34583.ScrollPositionIsPreservedWhenOrientationChangesToNeither() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue34583.cs:line 40

1)    at Microsoft.Maui.TestCases.Tests.Issues.Issue34583.ScrollPositionIsPreservedWhenOrientationChangesToNeither() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue34583.cs:line 40


NUnit Adapter 4.5.0.0: Test execution complete

Total tests: 1
     Failed: 1
Test Run Failed.
 Total time: 59.0355 Seconds

🟢 With fix — 🖥️ Issue34583: PASS ✅ · 87s

  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 324 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 339 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 344 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 395 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 411 ms).
  6 of 11 projects are up-to-date for restore.
/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0-ios26.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0-ios26.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0-ios26.0/Microsoft.Maui.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Maps.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Microsoft.AspNetCore.Components.WebView.Maui -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Microsoft.AspNetCore.Components.WebView.Maui/Debug/net10.0-ios26.0/Microsoft.AspNetCore.Components.WebView.Maui.dll
  Controls.Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Maps.dll
  Controls.Foldable -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Foldable/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Foldable.dll
  Controls.Xaml -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Xaml/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Xaml.dll
  Detected signing identity:
    Code Signing Key: "" (-)
    Provisioning Profile: "" () - no entitlements
    Bundle Id: com.microsoft.maui.uitests
    App Id: com.microsoft.maui.uitests
  Controls.TestCases.HostApp -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-ios/iossimulator-arm64/Controls.TestCases.HostApp.dll
  Optimizing assemblies for size may change the behavior of the app. Be sure to test after publishing. See: https://aka.ms/dotnet-illink
  Optimizing assemblies for size. This process might take a while.

Build succeeded.

/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
    1 Warning(s)
    0 Error(s)

Time Elapsed 00:00:43.71
  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 340 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 337 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 343 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 360 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 373 ms).
  8 of 13 projects are up-to-date for restore.
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0/Microsoft.Maui.Graphics.dll
  Controls.CustomAttributes -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.CustomAttributes/Debug/net10.0/Controls.CustomAttributes.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687631
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0/Microsoft.Maui.Controls.dll
  UITest.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Core/Debug/net10.0/UITest.Core.dll
  VisualTestUtils -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils/Debug/netstandard2.0/VisualTestUtils.dll
  UITest.NUnit -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.NUnit/Debug/net10.0/UITest.NUnit.dll
  VisualTestUtils.MagickNet -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils.MagickNet/Debug/netstandard2.0/VisualTestUtils.MagickNet.dll
  UITest.Appium -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Appium/Debug/net10.0/UITest.Appium.dll
  UITest.Analyzers -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Analyzers/Debug/netstandard2.0/UITest.Analyzers.dll
  Controls.TestCases.iOS.Tests -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
Test run for /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll (.NETCoreApp,Version=v10.0)
VSTest version 18.0.1 (arm64)

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
/Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
[xUnit.net 00:00:00.00] xUnit.net VSTest Adapter v2.8.2+699d445a1a (64-bit .NET 10.0.0)
[xUnit.net 00:00:00.05]   Discovering: Controls.TestCases.iOS.Tests
[xUnit.net 00:00:00.14]   Discovered:  Controls.TestCases.iOS.Tests
NUnit Adapter 4.5.0.0: Test execution started
Running selected tests in /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
   NUnit3TestExecutor discovered 1 of 1 NUnit test cases using Current Discovery mode, Non-Explicit run
>>>>> 3/30/2026 7:14:38 AM FixtureSetup for Issue34583(iOS)
>>>>> 3/30/2026 7:14:42 AM ScrollPositionIsPreservedWhenOrientationChangesToNeither Start
>>>>> 3/30/2026 7:14:43 AM ScrollPositionIsPreservedWhenOrientationChangesToNeither Stop
  Passed ScrollPositionIsPreservedWhenOrientationChangesToNeither [1 s]
NUnit Adapter 4.5.0.0: Test execution complete

Test Run Successful.
Total tests: 1
     Passed: 1
 Total time: 17.6826 Seconds

📁 Fix files reverted (2 files)

• eng/pipelines/ci-copilot.yml
• src/Core/src/Platform/iOS/MauiScrollView.cs

---

[MauiBot]

🤖 AI Summary

📊 Expand Full Review — f801766 · Addressed copilot comments.

---

🔍 Pre-Flight — Context & Validation

---

Issue: #34583 - Incorrect implementation of ScrollView.Orientation
PR: #34672 - [iOS] Preserve ScrollView offsets when Orientation changes to Neither
Platforms Affected: iOS (regression; also runs on Android/MacCatalyst for broader coverage)
Files Changed: 1 implementation, 2 test

Key Findings

• Root Cause: MauiScrollView.LayoutSubviews() on iOS included ScrollOrientation.Neither in both the "clamp width" and "clamp height" conditions. When Neither is set, both dimensions get clamped to the frame size, which causes the ContentSize to shrink to the viewport, and UIKit then resets ContentOffset to (0,0).
• Regression introduced in PR [Testing] Feature matrix UITest Cases for ScrollView Control (#30188) #30991 (commit 2b13a90). The goal was to align iOS with Android by preventing scrolling on disallowed axes, but Neither was unintentionally included in both clamp conditions.
• Fix is minimal: Only 4 lines changed in the core fix file (MauiScrollView.cs). ScrollOrientation.Neither is simply removed from both if conditions — width is clamped only for Vertical, height only for Horizontal.
• Prior agent review present: A prior AI Summary was detected in PR comments. All 6 inline review comments from copilot-pull-request-reviewer were addressed and resolved by the author (Vignesh-SF3580). Key fixes applied:
  1. HostApp _offsetLabel.Text now uses CultureInfo.InvariantCulture to format scroll values (prevents culture-sensitive parse failure in test).
  2. Test already uses InvariantCulture for parsing (correct).
  3. Comment for the height-clamping block updated to clarify the Neither exclusion.
  4. Added WaitForTextToBePresentInElement("LastActionLabel", "Scrolled to approx") after scroll tap to avoid async race.
• One outstanding disagreement: Copilot suggested restricting the test #if guard to TEST_FAILS_ON_WINDOWS && (IOS || MACCATALYST), but the author explicitly declined, citing repository convention of running tests on all platforms for broader regression coverage. The current guard is #if TEST_FAILS_ON_WINDOWS only.
• Gate: ✅ PASSED — tests fail without fix, pass with fix on iOS.

Fix Candidates

#	Source	Approach	Test Result	Files Changed	Notes
PR	PR #34672	Remove Neither from both clamping conditions in MauiScrollView.LayoutSubviews; width clamped only for Vertical, height clamped only for Horizontal	✅ PASSED (Gate)	MauiScrollView.cs	Original PR; minimal, targeted fix

---

🔧 Fix — Analysis & Comparison

---

Fix Candidates

#	Source	Approach	Test Result	Files Changed	Notes
1	try-fix (claude-opus-4.6)	Wrap entire clamping block in guard	Pass	MauiScrollView.cs (+10/-5)	Structurally different: 1 guard vs 2 condition edits; functionally equivalent
2	try-fix (claude-sonnet-4.6)	For , compute position-preserving minimum size () via if/else; Vertical/Horizontal handled in else	ContentSize Pass	MauiScrollView.cs (+14/-8)	More semantically explicit; ensures ContentSize always covers current scroll offset
3	try-fix (gpt-5.3-codex)	After clamping, at ContentSize assignment stage: for , take to prevent shrinkage	Pass	MauiScrollView.cs (+9/-0)	Different fixes at assignment point rather than in clamping conditions
4	try-fix (gpt-5.4)	Cache last scrollable content size ( field); when , reuse cached extent instead of letting ContentSize collapse	Pass	MauiScrollView.cs (+20/-6)	Stateful approach; tracks and reuses prior scrollable extent
PR	PR #34672	Remove from both clamping conditions; width clamped only for , height only for	PASSED (Gate)	MauiScrollView.cs (+4/-3)	Original PR; most minimal targeted fix

Cross-Pollination

Model	Round	New Ideas?	Details
claude-opus-4.6	2	NO NEW IDEAS	All structural variations of the clamping fix have been covered
claude-sonnet-4.6	2	NO NEW IDEAS	ContentOffset-save/restore variant is less safe (async layout); covered by existing approaches
gpt-5.3-codex	2	NO NEW IDEAS	Handler/mapper-based fix would require more invasive changes with no benefit over simpler approaches
gpt-5.4	2	NO NEW IDEAS	All major fix strategies (guard, min-size, cache) exhausted

Exhausted: Yes
Selected Fix: PR # The PR's direct removal of Neither from both clamping if conditions is the simplest, most targeted, most readable solution. All 4 alternatives pass the test but are more complex. The PR's +4/-3 change (vs +9 to +20 for alternatives) is the minimal necessary fix with no behavioral overhead.34672

---

📋 Report — Final Recommendation

---

✅ Final Recommendation: APPROVE

Phase Status

Phase	Status	Notes
Pre-Flight	✅ COMPLETE	Issue #34583, iOS regression from PR #30991
Gate	✅ PASSED	iOS — tests fail without fix, pass with fix
Try-Fix	✅ COMPLETE	4 attempts, all 4 passing; PR's fix selected as best
Report	✅ COMPLETE

Summary

PR #34672 fixes an iOS regression where changing ScrollView.Orientation to Neither incorrectly resets ScrollX/ScrollY to zero. The fix is minimal (+4/-3 lines in MauiScrollView.cs), correctly targeted, and gate-verified. All prior copilot inline review comments have been addressed by the author.

Root Cause

MauiScrollView.LayoutSubviews() on iOS included ScrollOrientation.Neither in both the width-clamping and height-clamping conditions. When Neither is set, both dimensions were clamped to the frame size, shrinking ContentSize to the viewport. UIKit then resets ContentOffset to (0,0) since the content no longer extends beyond the visible area. The regression was introduced in PR #30991.

Fix Quality

The PR's fix is the best available: Three independent try-fix models (claude-opus-4.6, claude-sonnet-4.6, gpt-5.3-codex, gpt-5.4) all produced passing alternatives, but each required more code (+9 to +20 lines vs +4). The PR's approach — simply removing ScrollOrientation.Neither from both if conditions — is:

• Minimal: +4/-3 lines, single file change
• Direct: Fixes exactly the wrong condition, nothing more
• Readable: The intent is immediately clear from the condition change
• Safe: No new state, no new code paths, no risk of introducing side effects

Test quality: The UI test is well-structured with proper async wait (WaitForTextToBePresentInElement on LastActionLabel), culture-invariant string formatting (fixed per inline review), and clear assertions. One open question: the test uses #if TEST_FAILS_ON_WINDOWS only (runs on Android/MacCatalyst too). The author declined to restrict to iOS-only, arguing cross-platform coverage is the repo convention. This is a reasonable trade-off — the test won't fail on other platforms since ScrollOrientation.Neither doesn't cause the same regression there.

Selected Fix: PR #34672 (PR's fix picked over all alternatives)

---

[kubaflo]

Looks good! Is it ready?

[sheiksyedm]

Looks good! Is it ready?

@kubaflo yes, its ready now.

[Copilot]

Pull request overview

Fixes an iOS regression where changing ScrollView.Orientation to Neither resets the scroll offset to (0,0) by preventing iOS ContentSize clamping from shrinking the content and forcing UIKit to clamp the offset.

Changes:

• Updated iOS MauiScrollView.LayoutSubviews content-size clamping to exclude ScrollOrientation.Neither.
• Added a HostApp reproduction page for issue #34583.
• Added a corresponding UI test to validate scroll offset preservation.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.

File	Description
src/Core/src/Platform/iOS/MauiScrollView.cs	Adjusts content-size clamping rules so Neither preserves ContentSize/offset.
src/Controls/tests/TestCases.HostApp/Issues/Issue34583.cs	Adds a manual repro page and automation IDs for validating the scenario.
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue34583.cs	Adds an automated UI test asserting scroll offsets remain non-zero after switching to Neither.