Skip to content

Commit ddef61e

Browse files
authored
[0.74] Narrator doesn't follow focus (#15367)
* Narrator doesn't follow focus * Change files
1 parent c591ac8 commit ddef61e

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Narrator doesn't follow focus",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ void ComponentView::onGotFocus(
381381
focusRect.size.height += (FOCUS_VISUAL_WIDTH * 2);
382382
focusVisualRoot(focusRect)->hostFocusVisual(true, get_strong());
383383
}
384-
if (m_uiaProvider) {
384+
if (EnsureUiaProvider()) {
385385
auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
386386
if (spProviderSimple != nullptr) {
387387
winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(

vnext/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ void RootComponentView::SetFocusedComponent(
8888
->onLostFocus(args);
8989
}
9090

91+
m_focusedComponent = value;
92+
9193
if (value) {
9294
if (auto rootView = m_wkRootView.get()) {
9395
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->TrySetFocus();
9496
}
9597
auto args = winrt::make<winrt::Microsoft::ReactNative::implementation::GotFocusEventArgs>(value, direction);
9698
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(value)->onGotFocus(args);
9799
}
98-
99-
m_focusedComponent = value;
100100
}
101101

102102
bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept {

0 commit comments

Comments
 (0)