-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[iOS] Fix SwipeView programmatic open when background color is set. #29765
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file added
BIN
+25.8 KB
...roid.Tests/snapshots/android/ProgrammaticallyOpenedSwipeViewShouldBeVisible.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 17204, "SwipeView does not work correctly on iOS when opened programmatically", PlatformAffected.iOS)] | ||
| public class Issue17204 : ContentPage | ||
| { | ||
| public Issue17204() | ||
| { | ||
| var verticalStack = new VerticalStackLayout | ||
| { | ||
| Spacing = 20, | ||
| Padding = new Thickness(20) | ||
| }; | ||
|
|
||
| var swipeView = new SwipeView | ||
| { | ||
| Background = Colors.LightPink, | ||
| }; | ||
|
|
||
| var label = new Label | ||
| { | ||
| HeightRequest = 200, | ||
| VerticalTextAlignment = TextAlignment.Center, | ||
| Text = "Programmatic swipe works" | ||
| }; | ||
|
|
||
| var swipeItemView = new SwipeItemView | ||
| { | ||
| Background = Colors.LightGreen, | ||
| Content = label, | ||
| }; | ||
|
|
||
| var swipeItems = new SwipeItems(); | ||
| swipeItems.Add(swipeItemView); | ||
| swipeView.RightItems = swipeItems; | ||
|
|
||
| swipeView.Content = new Label | ||
| { | ||
| HeightRequest = 200, | ||
| VerticalTextAlignment = TextAlignment.Center, | ||
| Text = "Swipe view" | ||
| }; | ||
|
|
||
| var button = new Button | ||
| { | ||
| Text = "Open SwipeView", | ||
| AutomationId = "OpenSwipeViewButton" | ||
| }; | ||
|
|
||
| button.Clicked += (sender, e) => | ||
| { | ||
| swipeView.Open(OpenSwipeItem.RightItems, false); | ||
| }; | ||
|
|
||
| verticalStack.Add(swipeView); | ||
| verticalStack.Add(button); | ||
| Content = verticalStack; | ||
| } | ||
| } |
Binary file added
BIN
+11.9 KB
...ases.Mac.Tests/snapshots/mac/ProgrammaticallyOpenedSwipeViewShouldBeVisible.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions
24
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17204.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #if TEST_FAILS_ON_WINDOWS // Cannot open programatically a SwipeView on Windows. | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
|
||
| public class Issue17204 : _IssuesUITest | ||
| { | ||
| public override string Issue => "SwipeView does not work correctly on iOS when opened programmatically"; | ||
|
|
||
| public Issue17204(TestDevice device) | ||
| : base(device) | ||
| { } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.SwipeView)] | ||
| public void ProgrammaticallyOpenedSwipeViewShouldBeVisible() | ||
| { | ||
| App.WaitForElement("OpenSwipeViewButton"); | ||
| App.Tap("OpenSwipeViewButton"); | ||
| VerifyScreenshot(); | ||
| } | ||
| } | ||
| #endif | ||
Binary file added
BIN
+26.8 KB
...ases.iOS.Tests/snapshots/ios/ProgrammaticallyOpenedSwipeViewShouldBeVisible.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1144,11 +1144,17 @@ internal void ProgrammaticallyOpenSwipeItem(OpenSwipeItem openSwipeItem, bool an | |
| return; | ||
|
|
||
| UpdateIsOpen(true); | ||
| UpdateSwipeItems(); | ||
|
|
||
| var swipeThreshold = GetSwipeThreshold(); | ||
| UpdateOffset(swipeThreshold); | ||
|
|
||
| UpdateSwipeItems(); | ||
| // Set the background on the swipe view, we need to update the layout. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you expand the comment with more details? |
||
| if (_contentView is WrapperView) | ||
| { | ||
| LayoutIfNeeded(); | ||
| } | ||
|
|
||
| Swipe(animated); | ||
|
|
||
| _swipeOffset = Math.Abs(_swipeOffset); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pending snapshot on Mac and Windows. Running a build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jsuarezruiz, I have updated the snapshot on macOS. On Windows, we have restricted the test because programmatically opening the SwipeView does not work.