View recycling - fix API access and disable when not possible

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

@@ -68,7 +68,7 @@ public BaseViewManager(@Nullable ReactApplicationContext reactContext) {
   }
 
   @Override
-  protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T view) {
+  protected @Nullable T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T view) {
     // Reset tags
     view.setTag(null);
     view.setTag(R.id.pointer_events, null);
@@ -95,13 +95,21 @@ protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T vie
     setTransformProperty(view, null, null);
 
     // RenderNode params not covered by setTransformProperty above
-    view.resetPivot();
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      view.resetPivot();
+    } else {
+      // no way of resetting pivot, or knowing whether it is set
+      return null;
+    }
     view.setTop(0);
     view.setBottom(0);
     view.setLeft(0);
     view.setRight(0);
     view.setElevation(0);
-    view.setAnimationMatrix(null);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      // failsafe - should already be set to null when animation finishes
+      view.setAnimationMatrix(null);
+    }
 
     view.setTag(R.id.transform, null);
     view.setTag(R.id.transform_origin, null);

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

@@ -226,16 +226,20 @@ public void onDropViewInstance(@NonNull T view) {
     int surfaceId = themedReactContext.getSurfaceId();
     @Nullable Stack<T> recyclableViews = getRecyclableViewStack(surfaceId);
     if (recyclableViews != null) {
-      recyclableViews.push(prepareToRecycleView(themedReactContext, view));
+      T recyclableView = prepareToRecycleView(themedReactContext, view);
+      if (recyclableView != null) {
+        recyclableViews.push(recyclableView);
+      }
     }
   }
 
   /**
    * Called when a View is removed from the hierarchy. This should be used to reset any properties.
+   *
+   * @return {@code view} if it was properly recycled, or {@code null} if it could not be recycled
    */
-  protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, @NonNull T view) {
-    return view;
-  }
+  protected abstract @Nullable T prepareToRecycleView(
+      @NonNull ThemedReactContext reactContext, @NonNull T view);
 
   /** Called when a View is going to be reused. */
   protected T recycleView(@NonNull ThemedReactContext reactContext, @NonNull T view) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java

@@ -8,6 +8,8 @@
 package com.facebook.react.views.text;
 
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -32,6 +34,12 @@ public ReactTextView createViewInstance(ThemedReactContext context) {
     throw new IllegalStateException("Attempt to create a native view for RCTRawText");
   }
 
+  @Override
+  protected @Nullable View prepareToRecycleView(
+      @NonNull ThemedReactContext reactContext, @NonNull View view) {
+    throw new IllegalStateException("Attempt to recycle a native view for RCTRawText");
+  }
+
   @Override
   public void updateExtraData(View view, Object extraData) {}
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java

@@ -61,17 +61,16 @@ public ReactTextViewManager(@Nullable ReactTextViewManagerCallback reactTextView
   }
 
   @Override
-  protected ReactTextView prepareToRecycleView(
+  protected @Nullable ReactTextView prepareToRecycleView(
       @NonNull ThemedReactContext reactContext, ReactTextView view) {
     // BaseViewManager
-    super.prepareToRecycleView(reactContext, view);
-
-    // Resets background and borders
-    view.recycleView();
-
-    // Defaults from ReactTextAnchorViewManager
-    setSelectionColor(view, null);
-
+    ReactTextView preparedView = super.prepareToRecycleView(reactContext, view);
+    if (preparedView != null) {
+      // Resets background and borders
+      preparedView.recycleView();
+      // Defaults from ReactTextAnchorViewManager
+      setSelectionColor(preparedView, null);
+    }
     return view;
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -64,13 +64,13 @@ public ReactViewManager() {
   }
 
   @Override
-  protected ReactViewGroup prepareToRecycleView(
+  protected @Nullable ReactViewGroup prepareToRecycleView(
       @NonNull ThemedReactContext reactContext, ReactViewGroup view) {
     // BaseViewManager
-    super.prepareToRecycleView(reactContext, view);
-
-    view.recycleView();
-
+    ReactViewGroup preparedView = super.prepareToRecycleView(reactContext, view);
+    if (preparedView != null) {
+      preparedView.recycleView();
+    }
     return view;
   }