Correctly propagate prepareToRecycleView return value (#49858)

Summary: Pull Request resolved: #49858 `prepareToRecycleView` returns nullable, since we may decide a view is not recyclable. We should respect that and return the view returned by super. Changelog: [Internal] bypass-github-export-checks Reviewed By: fabriziocucci Differential Revision: D70696246 fbshipit-source-id: a8e12320611a3b6a3d05353e4b7556c4da416aea
facebook · Mar 6, 2025 · c08e16a · c08e16a
1 parent ab9f501
commit c08e16a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/...native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -74,7 +74,7 @@ public ReactTextViewManager(@Nullable ReactTextViewManagerCallback reactTextView
       // Defaults from ReactTextAnchorViewManager
       setSelectionColor(preparedView, null);
     }
-    return view;
+    return preparedView;
   }
 
   @Override

diff --git a/...react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt b/...react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt
@@ -72,11 +72,11 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   override fun prepareToRecycleView(
       reactContext: ThemedReactContext,
       view: ReactViewGroup
-  ): ReactViewGroup {
+  ): ReactViewGroup? {
     // BaseViewManager
     val preparedView = super.prepareToRecycleView(reactContext, view)
     preparedView?.recycleView()
-    return view
+    return preparedView
   }
 
   @ReactProp(name = "accessible")