Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[iOS] Fix for Left SwipeView Items Conflict with Shell Menu Swipe Gesture #26976

Merged
merged 3 commits into from
Jan 30, 2025
Merged

[iOS] Fix for Left SwipeView Items Conflict with Shell Menu Swipe Gesture #26976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ece10e9
iOS SwipeView fix.
Tamilarasan-Paranthaman Jan 7, 2025
899047f
Test file changes
Tamilarasan-Paranthaman Jan 7, 2025
e84dce5
Merge remote-tracking branch 'upstream/main' into fix-26933
Tamilarasan-Paranthaman Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
7 changes: 3 additions & 4 deletions src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue9088.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Loading