From a071cb7742ac21c44ecd077192ca7cbd8f9bc9d2 Mon Sep 17 00:00:00 2001 From: lazerg Date: Fri, 20 Nov 2026 08:55:56 +0500 Subject: [PATCH] Reset nextFocusLeft when recycling Android views --- .../java/com/facebook/react/uimanager/BaseViewManager.java | 1 + .../com/facebook/react/uimanager/BaseViewManagerTest.kt | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index db3dd2871cc6..bdd1d042a5da 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -157,6 +157,7 @@ public BaseViewManager(@Nullable ReactApplicationContext reactContext) { // https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#4493 view.setNextFocusDownId(View.NO_ID); view.setNextFocusForwardId(View.NO_ID); + view.setNextFocusLeftId(View.NO_ID); view.setNextFocusRightId(View.NO_ID); view.setNextFocusUpId(View.NO_ID); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt index 666aa2bd71e2..4ac67438bb15 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt @@ -347,6 +347,13 @@ class BaseViewManagerTest { Assertions.assertThat(recycled.getTag(R.id.original_focusability)).isNull() } + @Test + fun testRecycledViewDropsTheNextFocusLeftOfItsPreviousProps() { + val recycled = recycleView(JavaOnlyMap.of("nextFocusLeft", 10)) + + Assertions.assertThat(recycled.nextFocusLeftId).isEqualTo(View.NO_ID) + } + @Test fun testNaNElevationLeavesTheViewUnelevated() { val unelevated = createView(JavaOnlyMap.of(ViewProps.ELEVATION, Double.NaN))