Skip to content

Fix crash when currently focused element gets marked as enableFocusRing=false #14306

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 2 commits into from
Jan 25, 2025
Merged

Fix crash when currently focused element gets marked as enableFocusRing=false #14306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17cb571
Fix crash when currently focused element gets marked as enableFocusRi…
acoates-ms Jan 24, 2025
abd0b62
Change files
acoates-ms Jan 24, 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-9fae9acd-d5a6-48d1-9d63-c333ad09ca76.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fix crash when currently focused element gets marked as enableFocusRing=false",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
13 changes: 8 additions & 5 deletions vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,14 @@ void ComponentView::updateProps(
m_componentHostingFocusVisual->hostFocusVisual(false, get_strong());
}

if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive) {
m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive->updateProps(oldViewProps, newViewProps);
}
if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive) {
m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive->updateProps(oldViewProps, newViewProps);
// We have to check m_componentHostingFocusVisual again, as it can be set to null by above hostFocusVisual call
if (m_componentHostingFocusVisual) {
if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive) {
m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive->updateProps(oldViewProps, newViewProps);
}
if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive) {
m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive->updateProps(oldViewProps, newViewProps);
}
}
}
if ((m_flags & ComponentViewFeatures::ShadowProps) == ComponentViewFeatures::ShadowProps) {
Expand Down