Xaml UI Hosting #15223
+438
−49
There are no files selected for viewing
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,7 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "Introduce xamlhost component", | ||
| "packageName": "react-native-windows", | ||
| "email": "[email protected]", | ||
| "dependentChangeType": "patch" | ||
| } | ||
|
Contributor
There was a problem hiding this comment. What are these changes for? Please drop them if unnecessary.
Contributor
Author
There was a problem hiding this comment. this got auto-generated.
Contributor
There was a problem hiding this comment. Yeah, but it's unneeded i.e. your changes will build with no changes to the solution file too, then by include it? Please unstage and drop this file from the PR. It'd be noise otherwise. If these changes are needed for your PR to work, then we need to understand what changed in this file. |
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
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,6 @@ | ||
| <Application | ||
| x:Class="Microsoft.ReactNative.XamlApplication" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:Microsoft.ReactNative"> | ||
| </Application> |
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
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
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
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
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
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 |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |
|
|
||
| #include <Fabric/FabricUIManagerModule.h> | ||
| #include <winrt/Microsoft.UI.Input.h> | ||
| #include "CompositionDynamicAutomationProvider.h" | ||
| #include "CompositionRootAutomationProvider.h" | ||
| #include "ReactNativeIsland.h" | ||
| #include "Theme.h" | ||
|
|
@@ -275,7 +276,7 @@ facebook::react::Point RootComponentView::getClientOffset() const noexcept { | |
| return {}; | ||
| } | ||
|
|
||
| winrt::IUnknown RootComponentView::UiaProviderFromPoint(const POINT &ptPixels, const POINT &ptScreen) noexcept { | ||
| facebook::react::Point ptDips{ | ||
| static_cast<facebook::react::Float>(ptPixels.x) / m_layoutMetrics.pointScaleFactor, | ||
| static_cast<facebook::react::Float>(ptPixels.y) / m_layoutMetrics.pointScaleFactor}; | ||
|
|
@@ -295,7 +296,41 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel | |
| if (view == nullptr) | ||
| return nullptr; | ||
|
|
||
| auto uiaProvider = | ||
| winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider(); | ||
|
|
||
| // TODO: Avoid exposing CompositionDynamicAutomationProvider in RootComponentView | ||
|
Contributor
There was a problem hiding this comment. Please file a follow-up task for this and paste its link here.
Contributor
Author
There was a problem hiding this comment. #15317 - I already created a task and adding pending sub tasks to it. Will add this here.
Contributor
There was a problem hiding this comment. Sure, please add the task to the comment too. |
||
| auto dynamicProvider = | ||
| uiaProvider.try_as<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>(); | ||
| if (dynamicProvider) { | ||
| if (auto childProvider = dynamicProvider->TryGetChildSiteLinkAutomationProvider()) { | ||
| // ChildProvider is the the automation provider from the ChildSiteLink. In the case of WinUI, this | ||
| // is a pointer to WinUI's internal CUIAHostWindow object. | ||
| // It seems odd, but even though this node doesn't behave as a fragment root in our case (the real fragment root | ||
| // is the RootComponentView's UIA provider), we still use its IRawElementProviderFragmentRoot -- just so | ||
| // we can do the ElementProviderFromPoint call. (this was recommended by the team who did the initial | ||
| // architecture work). | ||
| if (auto fragmentRoot = childProvider.try_as<IRawElementProviderFragmentRoot>()) { | ||
| com_ptr<IRawElementProviderFragment> frag; | ||
| // WinUI then does its own hitTest inside the XAML tree. | ||
| fragmentRoot->ElementProviderFromPoint( | ||
| ptScreen | ||
| .x, // Note since we're going through IRawElementProviderFragment the coordinates are in screen space. | ||
| ptScreen.y, | ||
| frag.put()); | ||
| // We return the specific child provider(frag) when hosted XAML has an element | ||
| // under the cursor. This satisfies the UIA "element at point" contract and exposes | ||
| // the control’s patterns/properties. If the hosted tree finds nothing, we fall back | ||
| // to the RNW container’s provider (uiaProvider) to keep the island accessible. | ||
| // (A Microsoft_UI_Xaml!CUIAWrapper object) | ||
| if (frag) { | ||
| return frag.as<winrt::IUnknown>(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return uiaProvider; | ||
| } | ||
|
|
||
| float RootComponentView::FontSizeMultiplier() const noexcept { | ||
|
|
||
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.