diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 97434b8b351..6bfea48a515 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3315,6 +3315,7 @@ public abstract class com/facebook/react/uimanager/BaseViewManager : com/faceboo public fun getExportedCustomBubblingEventTypeConstants ()Ljava/util/Map; public fun getExportedCustomDirectEventTypeConstants ()Ljava/util/Map; protected fun onAfterUpdateTransaction (Landroid/view/View;)V + public fun onDropViewInstance (Landroid/view/View;)V public fun onLayoutChange (Landroid/view/View;IIIIIIII)V protected fun prepareToRecycleView (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)Landroid/view/View; public fun setAccessibilityActions (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;)V 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 5b9ce2188f1..ff335564809 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 @@ -173,30 +173,19 @@ public abstract class BaseViewManager { - if (originalFocusChangeListener != null) { - originalFocusChangeListener.onFocusChange(v, hasFocus); - } - int surfaceId = UIManagerHelper.getSurfaceId(v.getContext()); - if (surfaceId == View.NO_ID) { - return; - } - if (view.getContext() instanceof ThemedReactContext) { - ThemedReactContext themedReactContext = (ThemedReactContext) v.getContext(); - @Nullable - EventDispatcher eventDispatcher = - UIManagerHelper.getEventDispatcherForReactTag(themedReactContext, view.getId()); - if (eventDispatcher != null) { - if (hasFocus) { - eventDispatcher.dispatchEvent(new FocusEvent(surfaceId, view.getId())); - } else { - eventDispatcher.dispatchEvent(new BlurEvent(surfaceId, view.getId())); - } - } - } - }); + BaseVMFocusChangeListener focusChangeListener = + new BaseVMFocusChangeListener(view.getOnFocusChangeListener()); + focusChangeListener.attach(view); + } + + @Override + public void onDropViewInstance(@NonNull T view) { + super.onDropViewInstance(view); + + @Nullable OnFocusChangeListener focusChangeListener = view.getOnFocusChangeListener(); + if (focusChangeListener instanceof BaseVMFocusChangeListener) { + ((BaseVMFocusChangeListener) focusChangeListener).detach(view); + } } // Currently, layout listener is only attached when transform or transformOrigin is set. @@ -1052,4 +1041,49 @@ public abstract class BaseViewManager implements OnFocusChangeListener { + private @Nullable OnFocusChangeListener mOriginalFocusChangeListener; + + public BaseVMFocusChangeListener(@Nullable OnFocusChangeListener originalFocusChangeListener) { + mOriginalFocusChangeListener = originalFocusChangeListener; + } + + public void attach(T view) { + view.setOnFocusChangeListener(this); + } + + public void detach(T view) { + view.setOnFocusChangeListener(mOriginalFocusChangeListener); + } + + @Override + public void onFocusChange(View view, boolean hasFocus) { + if (mOriginalFocusChangeListener != null) { + mOriginalFocusChangeListener.onFocusChange(view, hasFocus); + } + int surfaceId = UIManagerHelper.getSurfaceId(view.getContext()); + if (surfaceId == View.NO_ID) { + return; + } + if (view.getContext() instanceof ThemedReactContext) { + ThemedReactContext themedReactContext = (ThemedReactContext) view.getContext(); + @Nullable + EventDispatcher eventDispatcher = + UIManagerHelper.getEventDispatcherForReactTag(themedReactContext, view.getId()); + if (eventDispatcher != null) { + if (hasFocus) { + eventDispatcher.dispatchEvent(new FocusEvent(surfaceId, view.getId())); + } else { + eventDispatcher.dispatchEvent(new BlurEvent(surfaceId, view.getId())); + } + } + } + } + } } 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 f99ded815f2..39aae436333 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 @@ -93,4 +93,21 @@ class BaseViewManagerTest { view.onFocusChangeListener.onFocusChange(view, true) verify(originalFocusListener, times(1)).onFocusChange(view, true) } + + @Test + fun testDroppingViewInstanceRestoresFocusChangeListener() { + val originalFocusListener = mock() + view.onFocusChangeListener = originalFocusListener + viewManager.addEventEmitters(themedReactContext, view) + Assertions.assertThat(view.onFocusChangeListener).isNotEqualTo(originalFocusListener) + + view.onFocusChangeListener.onFocusChange(view, true) + verify(originalFocusListener, times(1)).onFocusChange(view, true) + Assertions.assertThat(originalFocusListener).isNotEqualTo(view.onFocusChangeListener) + + viewManager.onDropViewInstance(view) + view.onFocusChangeListener.onFocusChange(view, true) + verify(originalFocusListener, times(2)).onFocusChange(view, true) + Assertions.assertThat(originalFocusListener).isEqualTo(view.onFocusChangeListener) + } }