From 9a95dea56720cef94041b5d140175e9174120d9f Mon Sep 17 00:00:00 2001 From: Vineeth <66076509+vineethkuttan@users.noreply.github.com> Date: Fri, 3 Jul 2026 11:41:48 +0530 Subject: [PATCH 1/2] [0.81] - Fix Focus Outline for Programmatical focus (#16282) * Remove Focus Outline for Programmatical Focus * Change files * format changes --- ...ative-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json | 7 +++++++ .../Fabric/Composition/RootComponentView.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json diff --git a/change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json b/change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json new file mode 100644 index 00000000000..2f758b17fd8 --- /dev/null +++ b/change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Remove Focus Outline for Programmatical Focus", + "packageName": "react-native-windows", + "email": "66076509+vineethkuttan@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp index b2a6b887ee3..3c2f49fa834 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp @@ -100,7 +100,7 @@ void RootComponentView::SetFocusedComponent( m_focusedComponent = value; if (focusState == winrt::Microsoft::ReactNative::FocusState::Programmatic) { focusState = - (!m_useKeyboardForProgrammaticFocus || m_focusState == winrt::Microsoft::ReactNative::FocusState::Pointer) + (!m_useKeyboardForProgrammaticFocus || m_focusState != winrt::Microsoft::ReactNative::FocusState::Keyboard) ? winrt::Microsoft::ReactNative::FocusState::Pointer : winrt::Microsoft::ReactNative::FocusState::Keyboard; } From f9c37958e5f57dc8f1e106920e1ac85ede69d60c Mon Sep 17 00:00:00 2001 From: vineethkuttan <66076509+vineethkuttan@users.noreply.github.com> Date: Tue, 18 Aug 2026 13:57:38 +0530 Subject: [PATCH 2/2] Change files --- ...ive-windows-6edc9831-103f-4ab1-ad63-20824f1d2d3e.json} | 4 ++-- change/react-native-windows-capture-null-guard-main.json | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) rename change/{react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json => react-native-windows-6edc9831-103f-4ab1-ad63-20824f1d2d3e.json} (62%) diff --git a/change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json b/change/react-native-windows-6edc9831-103f-4ab1-ad63-20824f1d2d3e.json similarity index 62% rename from change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json rename to change/react-native-windows-6edc9831-103f-4ab1-ad63-20824f1d2d3e.json index 2f758b17fd8..9eba3d9e8df 100644 --- a/change/react-native-windows-85a3d26d-f9c2-4888-9e32-a6a3f9f4a2b9.json +++ b/change/react-native-windows-6edc9831-103f-4ab1-ad63-20824f1d2d3e.json @@ -1,6 +1,6 @@ { - "type": "patch", - "comment": "Remove Focus Outline for Programmatical Focus", + "type": "prerelease", + "comment": "Fix Focus Outline for Programmatical focus", "packageName": "react-native-windows", "email": "66076509+vineethkuttan@users.noreply.github.com", "dependentChangeType": "patch" diff --git a/change/react-native-windows-capture-null-guard-main.json b/change/react-native-windows-capture-null-guard-main.json index dd867f51aa1..66033062c7b 100644 --- a/change/react-native-windows-capture-null-guard-main.json +++ b/change/react-native-windows-capture-null-guard-main.json @@ -1 +1,7 @@ -{"type":"prerelease","dependentChangeType":"patch","email":"collindanielschneide@gmail.com","packageName":"react-native-windows","comment":"Null-check the capturing component view before notifying OnPointerCaptureLost (crash when the capturing component was unmounted)"} +{ + "type": "prerelease", + "dependentChangeType": "patch", + "email": "collindanielschneide@gmail.com", + "packageName": "react-native-windows", + "comment": "Null-check the capturing component view before notifying OnPointerCaptureLost (crash when the capturing component was unmounted)" +} \ No newline at end of file