diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutRenderer.cs index 2bf288734638..f20d145832eb 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutRenderer.cs @@ -94,11 +94,14 @@ touch.View is MPVolumeView || bool IsSwipeView(UIView view) { if (view == null) + { return false; + } - // TODO MAUI - //if (view is SwipeView) - //return true; + if (view is MauiSwipeView) + { + return true; + } return IsSwipeView(view.Superview); } diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue9088.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue9088.cs index c4657dac2213..6f74a25b4243 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue9088.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue9088.cs @@ -1,5 +1,4 @@ -#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS -// On iOS, SwipeView items conflict with Shell menu swipe in from left, Issue: https://github.com/dotnet/maui/issues/26933 +#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // On Catalyst, Swipe actions not supported in Appium. // On Windows, StackLayout AutomationId not works in Automation. using NUnit.Framework; @@ -32,11 +31,11 @@ public void Issue9088SwipeViewConfictWithShellMenuSwipeInFromLeft() App.SwipeRightToLeft(SwipeViewId, 0.67, 250); Assert.That(App.WaitForElement(LeftCountLabelId).GetText(), Is.EqualTo("2")); - App.SwipeRightToLeft(SwipeViewId, 0.67, 100); + App.SwipeRightToLeft(SwipeViewId, 0.67, 200); Assert.That(App.WaitForElement(LeftCountLabelId).GetText(), Is.EqualTo("3")); - App.SwipeLeftToRight(SwipeViewId, 0.67, 100); + App.SwipeLeftToRight(SwipeViewId, 0.67, 200); Assert.That(App.WaitForElement(RightCountLabelId).GetText(), Is.EqualTo("1")); App.SwipeLeftToRight(SwipeViewId, 0.67, 250);