Skip to content

Commit a071cb7

Browse files
committed
Reset nextFocusLeft when recycling Android views
1 parent bbfd391 commit a071cb7

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ public BaseViewManager(@Nullable ReactApplicationContext reactContext) {
157157
// https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#4493
158158
view.setNextFocusDownId(View.NO_ID);
159159
view.setNextFocusForwardId(View.NO_ID);
160+
view.setNextFocusLeftId(View.NO_ID);
160161
view.setNextFocusRightId(View.NO_ID);
161162
view.setNextFocusUpId(View.NO_ID);
162163

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,13 @@ class BaseViewManagerTest {
347347
Assertions.assertThat(recycled.getTag(R.id.original_focusability)).isNull()
348348
}
349349

350+
@Test
351+
fun testRecycledViewDropsTheNextFocusLeftOfItsPreviousProps() {
352+
val recycled = recycleView(JavaOnlyMap.of("nextFocusLeft", 10))
353+
354+
Assertions.assertThat(recycled.nextFocusLeftId).isEqualTo(View.NO_ID)
355+
}
356+
350357
@Test
351358
fun testNaNElevationLeavesTheViewUnelevated() {
352359
val unelevated = createView(JavaOnlyMap.of(ViewProps.ELEVATION, Double.NaN))

0 commit comments

Comments
 (0)