-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Fix initial page and back button Navigation events #12348
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6087a5f
Fix initial page and back button Navigation events
PureWeen babda89
- add tests for backbutton
PureWeen a06c1cf
- add comments and consolidate
PureWeen 87ca40d
Update VisualElement.cs
PureWeen 171c718
- validate pushed page fires navigated
PureWeen 02b4ed8
- fix tests
PureWeen cd47f5c
- fix tests for reals
PureWeen a9330a9
- fix exception messages
PureWeen b9e1f81
Revert "Update VisualElement.cs"
PureWeen cdcdab1
- add fix for iOS14
PureWeen 438e78b
Merge branch 'main' into fix_initial_navigated_ios
PureWeen 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
35 changes: 34 additions & 1 deletion
35
src/Controls/tests/DeviceTests/Elements/NavigationPage/NavigationPageTests.iOS.cs
This file contains 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 |
---|---|---|
@@ -1,8 +1,41 @@ | ||
using Xunit; | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Text; | ||
using System.Threading.Tasks; | ||
using Microsoft.Maui.Controls; | ||
using Microsoft.Maui.Platform; | ||
using Microsoft.Maui.Controls.Platform; | ||
using Microsoft.Maui.Controls.Handlers.Compatibility; | ||
using Microsoft.Maui.DeviceTests.Stubs; | ||
using Microsoft.Maui.Handlers; | ||
using Microsoft.Maui.Hosting; | ||
using UIKit; | ||
using Xunit; | ||
|
||
namespace Microsoft.Maui.DeviceTests | ||
{ | ||
public partial class NavigationPageTests : ControlsHandlerTestBase | ||
{ | ||
[Fact] | ||
public async Task NavigatingBackViaBackButtonFiresNavigatedEvent() | ||
{ | ||
SetupBuilder(); | ||
var page = new ContentPage(); | ||
|
||
var navPage = new NavigationPage(page) { Title = "App Page" }; | ||
|
||
await navPage.PushAsync(new ContentPage()); | ||
await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(navPage), async (handler) => | ||
{ | ||
await OnNavigatedToAsync(navPage.CurrentPage); | ||
var navController = navPage.Handler as UINavigationController; | ||
|
||
Assert.False(page.HasNavigatedTo); | ||
navController.NavigationBar.TapBackButton(); | ||
await OnNavigatedToAsync(page); | ||
Assert.True(page.HasNavigatedTo); | ||
}); | ||
} | ||
} | ||
} |
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.
All of the code was just passing false to
requestedFromHandler
so I removed it.