Simplify NavigationRootManager.Connect on the Windows platform.
#23345
Conversation
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
|
Hey there @Takym! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
PureWeen
reviewed
Jun 28, 2024
| @@ -89,33 +89,17 @@ public virtual void Connect(UIElement platformView) | |||
| _rootView.Content = null; | |||
| } | |||
|
|
|||
| NavigationView rootNavigationView; | |||
| if (platformView is NavigationView nv) | |||
| _rootView.Content = platformView is NavigationView ? platformView : new RootNavigationView() | |||
There was a problem hiding this comment.
This seems right :-)
I think this existed before the if statement above it, so, at some point those if blogs were doing more
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Foda
approved these changes
Jun 28, 2024
PureWeen
approved these changes
Jun 28, 2024
|
Failure is unrelated |
mattleibow
added a commit
that referenced
this pull request
Jul 1, 2024
* Simplify Development.md (#23142) * Simplify Development.md * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update DEVELOPMENT.md * - modify and move advanced tips to different file * Update DEVELOPMENT.md * Update .github/DEVELOPMENT.md Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * Update docs/DevelopmentTips.md Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * Update docs/DevelopmentTips.md Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * - updates based on review --------- Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * Wire RefreshView up to our xplat layout workflow (#23169) (#23218) * Use better layout/measure path with refreshview * - fix naming * - set RefreshView content to maui compatible container * - add test * - fix null operator * Update Issue23029.xaml.cs * - fix content panel so it removes previous content * - add additional check * Remove adding to FutureAccessList as the app is running with runFullTrust capability (#23047) * Call base.OnResume if Existing NavigationFragment Early (#23187) * VSCode no longer uses MAUI to launch (#23222) * [Android] Fix flyout behaviour switching exception (#22453) * Fix flyout behaviour switching exception * Tests added * Flyout test page added * Flyoutpage test fixes * Flyout toggle test added * Remove duplicate ] characters * Flyout test pages added * Check for platforms * Fix title * - fix tests --------- Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> * Renamed the project because macOS uses .app (#23223) * Renamed the project because macOS uses .app * And the folder * merge first * ns * Move tests to new location (#23251) * Split SingleProject targets (#23269) * Split SingleProject targets * Update Microsoft.Maui.Controls.SingleProject.Before.targets * Update bug-report.yml with 8.0.61 (#23273) * Null terminate Page on TabbedRenderer (#23290) Co-authored-by: Shane Neuville <shneuvil@microsoft.com> * [Windows] Improve performance in accessibility extensions (#22698) * AccessibilityExtensions: Add missing braces * AccessibilityExtensions: Enable nullability and improve performance * Update shipped & unshipped API --------- Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> * [Android] Avoid double event subscribes in gesture manager (#23242) * [Android] Avoid double event subscribes in gesture manager * Fix typo in test text * Bump Microsoft.Web.WebView2 from 1.0.2151.40 to 1.0.2592.51 (#23209) * [tests] test a lot more things in `MemoryTests.cs` (#23324) * [tests] test a lot more things in `MemoryTests.cs` This expands the tests to cover more controls and areas. * Add test cases for more controls: * `Ellipse` * `Grid` * `Path` * `Line` * `Path` * `RadioButton` * `Rectangle` * `RoundRectangle` * Expand tests for a couple controls: * `Border` has a `StrokeShape` * Any `TemplatedView` gets a `ControlTemplate` * Re-enable `ListView` for Android This should work now after merging: * dotnet/android#8900 * #23120 * Add a complicated test case for `BindableLayout` Similar to the case at: * #23199 * Skip `ListView` on API 23 * Bump Appium version to 2.11 (#23337) * Bump Appium version to 2.11 * Update CarouselViewUITests.UpdateCurrentItem.cs * Update appium-install.ps1 * Update CarouselViewUITests.UpdateCurrentItem.cs * Simplify `NavigationRootManager.Connect` on the Windows platform. (#23345) * Simplify `NavigationRootManager.Connect` on the Windows platform. * Use ternary operator syntax * Removed extra tabs * Moved `_disconnected = false;` to `if (_disconnected)` * Bump Appium Drivers (#23349) * Fix Merge --------- Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Thomas Muller <imuller@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> Co-authored-by: Jonathan Dick <jodick@microsoft.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Takym (たかやま) <15681312+Takym@users.noreply.github.com>
samhouts
added
fixed-in-8.0.70
fixed-in-net9.0-nightly
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description of Change
I have found redundant codes in
NavigationRootManager.Connectand this PR resolves it.I think this is redundant because:
_rootView.Contentis not null when this method is called, it will be cleared to null in the first process. So,_rootView.Content is RootNavigationView navViewis always null.rootNavigationViewis set to the same reference as_rootView.Contentbut this variable is not used after codes._disconnected = false;to theif (_disconnected)block because you do not need to set_disconnectedas false when it is already false.However, I am not familiar with this code. So, if my change is missing points, feel free to close this PR.