Skip to content

Defer UIA accessibility provider initialization until requested #14756

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Defer UIA accessibility provider initialization until requested #14756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81a709b
Initial plan for issue
Copilot Jun 10, 2025
ace1209
Defer UIA provider initialization to GetPatternProvider
Copilot Jun 10, 2025
d927cd0
Add change file for UIA provider initialization optimization
Copilot Jun 10, 2025
74cbd54
Format code with clang-format to fix spacing
Copilot Jun 10, 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-4acbe4b2-89e0-4adb-b6b1-9e9bbf4a6220.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Defer UIA accessibility provider initialization until requested",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
29 changes: 16 additions & 13 deletions vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "CompositionDynamicAutomationProvider.h"
#include <Fabric/ComponentView.h>
#include <Fabric/Composition/CompositionAnnotationProvider.h>
#include <Fabric/Composition/CompositionTextProvider.h>
#include <Fabric/Composition/CompositionTextRangeProvider.h>
#include <Fabric/Composition/ParagraphComponentView.h>
#include <Fabric/Composition/ScrollViewComponentView.h>
Expand Down Expand Up @@ -30,19 +31,6 @@ CompositionDynamicAutomationProvider::CompositionDynamicAutomationProvider(
if (props->accessibilityState.has_value() && props->accessibilityState->selected.has_value()) {
AddSelectionItemsToContainer(this);
}

if (strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::WindowsTextInputComponentView>() ||
strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ParagraphComponentView>()) {
m_textProvider = winrt::make<CompositionTextProvider>(
strongView.as<winrt::Microsoft::ReactNative::Composition::ComponentView>(), this)
.try_as<ITextProvider2>();
}

if (strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>()) {
m_annotationProvider = winrt::make<CompositionAnnotationProvider>(
strongView.as<winrt::Microsoft::ReactNative::Composition::ComponentView>(), this)
.try_as<IAnnotationProvider>();
}
}

CompositionDynamicAutomationProvider::CompositionDynamicAutomationProvider(
Expand Down Expand Up @@ -282,16 +270,31 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
if (patternId == UIA_TextPatternId &&
(strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::WindowsTextInputComponentView>() ||
strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ParagraphComponentView>())) {
if (!m_textProvider) {
m_textProvider = winrt::make<CompositionTextProvider>(
strongView.as<winrt::Microsoft::ReactNative::Composition::ComponentView>(), this)
.try_as<ITextProvider2>();
}
m_textProvider.as<IUnknown>().copy_to(pRetVal);
}

if (patternId == UIA_TextPattern2Id &&
strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::WindowsTextInputComponentView>()) {
if (!m_textProvider) {
m_textProvider = winrt::make<CompositionTextProvider>(
strongView.as<winrt::Microsoft::ReactNative::Composition::ComponentView>(), this)
.try_as<ITextProvider2>();
}
m_textProvider.as<IUnknown>().copy_to(pRetVal);
}
if (patternId == UIA_AnnotationPatternId &&
strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>() &&
accessibilityAnnotationHasValue(props->accessibilityAnnotation)) {
if (!m_annotationProvider) {
m_annotationProvider = winrt::make<CompositionAnnotationProvider>(
strongView.as<winrt::Microsoft::ReactNative::Composition::ComponentView>(), this)
.try_as<IAnnotationProvider>();
}
m_annotationProvider.as<IUnknown>().copy_to(pRetVal);
}

Expand Down