Skip to content

Properly hook up root uia provider to island #14643

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

Merged
acoates-ms merged 3 commits into from
May 7, 2025
Merged

Properly hook up root uia provider to island #14643

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
51aa801
Properly hook up root uia provider to island
acoates-ms May 6, 2025
541c9f6
Change files
acoates-ms May 6, 2025
9e90941
Merge branch 'main' into uiarootisland
acoates-ms May 7, 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
7 changes: 7 additions & 0 deletions change/react-native-windows-26d524ee-3303-4cbf-a1d5-2c876d58c088.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Properly hook up root uia provider to island",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
12 changes: 3 additions & 9 deletions vnext/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,12 @@ winrt::IInspectable ReactNativeIsland::GetUiaProvider() noexcept {
if (m_uiaProvider == nullptr) {
m_uiaProvider =
winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider>(*this);
if (m_hwnd && !m_island) {
if (m_hwnd || m_island) {
auto pRootProvider =
static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
m_uiaProvider.as<IRawElementProviderSimple>().get());
if (pRootProvider != nullptr) {
pRootProvider->SetIsland(m_island);
pRootProvider->SetHwnd(m_hwnd);
}
}
Expand Down Expand Up @@ -875,14 +876,7 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
winrt::Microsoft::UI::Content::ContentIsland const &,
winrt::Microsoft::UI::Content::ContentIslandAutomationProviderRequestedEventArgs const &args) {
if (auto pThis = weakThis.get()) {
auto provider = pThis->GetUiaProvider();
auto pRootProvider =
static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
provider.as<IRawElementProviderSimple>().get());
if (pRootProvider != nullptr) {
pRootProvider->SetIsland(pThis->m_island);
}
args.AutomationProvider(std::move(provider));
args.AutomationProvider(pThis->GetUiaProvider());
args.Handled(true);
}
});
Expand Down
Loading