diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Always.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Always.png new file mode 100644 index 000000000000..3ba084e399b4 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Always.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Default.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Default.png new file mode 100644 index 000000000000..7818c9ef4425 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Default.png differ diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Never.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Never.png new file mode 100644 index 000000000000..d2855ba9bcda Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue33400_Never.png differ diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue33400.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue33400.cs new file mode 100644 index 000000000000..c2aedf64dc0c --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue33400.cs @@ -0,0 +1,59 @@ +namespace Maui.Controls.Sample.Issues; + +[Issue(IssueTracker.Github, 33400, "Runtime Scrollbar visibility not updating correctly on Android platform", PlatformAffected.Android)] +public class Issue33400 : ContentPage +{ + readonly ScrollView scrollView; + + public Issue33400() + { + var grid = new Grid + { + RowDefinitions = { + new RowDefinition { Height = GridLength.Auto }, + new RowDefinition { Height = GridLength.Auto } + }, + RowSpacing = 10 + }; + scrollView = new ScrollView + { + Orientation = ScrollOrientation.Horizontal, + AutomationId = "TestScrollView" + }; + + var horizontalStack = new HorizontalStackLayout(); + + var neverButton = new Button { Text = "Never", AutomationId = "Issue33400HorizontalNeverButton" }; + neverButton.Clicked += (s, e) => { scrollView.HorizontalScrollBarVisibility = ScrollBarVisibility.Never; }; + + var defaultButton = new Button { Text = "Default", AutomationId = "Issue33400HorizontalDefaultButton" }; + defaultButton.Clicked += (s, e) => + { + scrollView.HorizontalScrollBarVisibility = ScrollBarVisibility.Default; + scrollView.ScrollToAsync(100, 0, true); //Slight scroll to show the scrollbar + }; + + var alwaysButton = new Button { Text = "Always", AutomationId = "Issue33400HorizontalAlwaysButton" }; + alwaysButton.Clicked += (s, e) => { scrollView.HorizontalScrollBarVisibility = ScrollBarVisibility.Always; }; + + horizontalStack.Add(neverButton); + horizontalStack.Add(defaultButton); + horizontalStack.Add(alwaysButton); + + var label = new Label + { + Padding = new Thickness(10), + Text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.", + }; + + scrollView.Content = label; + + grid.Add(horizontalStack); + Grid.SetRow(horizontalStack, 0); + grid.Add(scrollView); + Grid.SetRow(scrollView, 1); + + Content = grid; + + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33400.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33400.cs new file mode 100644 index 000000000000..eac3e7a49bf4 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33400.cs @@ -0,0 +1,43 @@ +#if ANDROID || WINDOWS // https://github.com/dotnet/maui/issues/7767#issuecomment-1792186959 +using NUnit.Framework; +using UITest.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests.Issues; + +public class Issue33400 : _IssuesUITest +{ + public Issue33400(TestDevice device) : base(device) + { + } + + public override string Issue => "Runtime Scrollbar visibility not updating correctly on Android platform"; + + [Test, Order(1)] + [Category(UITestCategories.ScrollView)] + public void Issue33400ScrollbarVisibilityNever() + { + App.WaitForElement("Issue33400HorizontalNeverButton"); + App.Tap("Issue33400HorizontalNeverButton"); + VerifyScreenshot("Issue33400_Never"); + } + + [Test, Order(2)] + [Category(UITestCategories.ScrollView)] + public void Issue33400ScrollbarVisibilityAlways() + { + App.WaitForElement("Issue33400HorizontalAlwaysButton"); + App.Tap("Issue33400HorizontalAlwaysButton"); + VerifyScreenshot("Issue33400_Always"); + } + + [Test, Order(3)] + [Category(UITestCategories.ScrollView)] + public void Issue33400ScrollbarVisibilityDefault() + { + App.WaitForElement("Issue33400HorizontalDefaultButton"); + App.Tap("Issue33400HorizontalDefaultButton"); + VerifyScreenshot("Issue33400_Default"); + } +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue33400_Never.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue33400_Never.png new file mode 100644 index 000000000000..06e3c33f6f54 Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue33400_Never.png differ diff --git a/src/Core/src/Platform/Android/MauiScrollView.cs b/src/Core/src/Platform/Android/MauiScrollView.cs index 61e9af6a0a24..bc92251800b6 100644 --- a/src/Core/src/Platform/Android/MauiScrollView.cs +++ b/src/Core/src/Platform/Android/MauiScrollView.cs @@ -128,7 +128,7 @@ public void SetHorizontalScrollBarVisibility(ScrollBarVisibility scrollBarVisibi _hScrollView.HorizontalScrollBarEnabled = scrollBarVisibility == ScrollBarVisibility.Always; _hScrollView.ScrollbarFadingEnabled = _horizontalScrollVisibility != ScrollBarVisibility.Always; - PlatformInterop.RequestLayoutIfNeeded(this); + PlatformInterop.RequestLayoutIfNeeded(_hScrollView); } public void SetVerticalScrollBarVisibility(ScrollBarVisibility scrollBarVisibility)