react-native 0.69.0-rc.6 → 0.70.0-rc.0

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java

@@ -9,6 +9,7 @@ package com.facebook.react.views.text;
 
 import android.content.Context;
 import android.text.Spannable;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableMap;
@@ -46,6 +47,30 @@ public class ReactTextViewManager
 
   protected @Nullable ReactTextViewManagerCallback mReactTextViewManagerCallback;
 
+  public ReactTextViewManager() {
+    this(null);
+  }
+
+  public ReactTextViewManager(@Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
+    mReactTextViewManagerCallback = reactTextViewManagerCallback;
+    setupViewRecycling();
+  }
+
+  @Override
+  protected ReactTextView prepareToRecycleView(
+      @NonNull ThemedReactContext reactContext, ReactTextView view) {
+    // BaseViewManager
+    super.prepareToRecycleView(reactContext, view);
+
+    // Resets background and borders
+    view.recycleView();
+
+    // Defaults from ReactTextAnchorViewManager
+    setSelectionColor(view, null);
+
+    return view;
+  }
+
   @Override
   public String getName() {
     return REACT_CLASS;
@@ -106,12 +131,8 @@ public class ReactTextViewManager
 
   @Override
   public Object updateState(
-      ReactTextView view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {
-    if (stateWrapper == null) {
-      return null;
-    }
-
-    if (ReactFeatureFlags.isMapBufferSerializationEnabled()) {
+      ReactTextView view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
+    if (ReactFeatureFlags.mapBufferSerializationEnabled) {
       MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
       if (stateMapBuffer != null) {
         return getReactTextUpdate(view, props, stateMapBuffer);

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java

@@ -29,6 +29,7 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.MapBuffer;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaMeasureMode;
@@ -205,19 +206,25 @@ public class TextLayoutManagerMapBuffer {
 
     Spannable preparedSpannableText;
 
-    synchronized (sSpannableCacheLock) {
-      preparedSpannableText = sSpannableCache.get(attributedString);
-      if (preparedSpannableText != null) {
-        return preparedSpannableText;
+    if (ReactFeatureFlags.enableSpannableCache) {
+      synchronized (sSpannableCacheLock) {
+        preparedSpannableText = sSpannableCache.get(attributedString);
+        if (preparedSpannableText != null) {
+          return preparedSpannableText;
+        }
       }
-    }
 
-    preparedSpannableText =
-        createSpannableFromAttributedString(
-            context, attributedString, reactTextViewManagerCallback);
+      preparedSpannableText =
+          createSpannableFromAttributedString(
+              context, attributedString, reactTextViewManagerCallback);
 
-    synchronized (sSpannableCacheLock) {
-      sSpannableCache.put(attributedString, preparedSpannableText);
+      synchronized (sSpannableCacheLock) {
+        sSpannableCache.put(attributedString, preparedSpannableText);
+      }
+    } else {
+      preparedSpannableText =
+          createSpannableFromAttributedString(
+              context, attributedString, reactTextViewManagerCallback);
     }
 
     return preparedSpannableText;

package/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK

@@ -9,6 +9,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK

@@ -9,6 +9,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -101,7 +101,7 @@ public class ReactEditText extends AppCompatEditText
   private @Nullable SelectionWatcher mSelectionWatcher;
   private @Nullable ContentSizeWatcher mContentSizeWatcher;
   private @Nullable ScrollWatcher mScrollWatcher;
-  private final InternalKeyListener mKeyListener;
+  private InternalKeyListener mKeyListener;
   private boolean mDetectScrollMovement = false;
   private boolean mOnKeyPress = false;
   private TextAttributes mTextAttributes;
@@ -114,8 +114,7 @@ public class ReactEditText extends AppCompatEditText
 
   private ReactViewBackgroundManager mReactBackgroundManager;
 
-  private final @Nullable FabricViewStateManager mFabricViewStateManager =
-      new FabricViewStateManager();
+  private final FabricViewStateManager mFabricViewStateManager = new FabricViewStateManager();
   protected boolean mDisableTextDiffing = false;
 
   protected boolean mIsSettingTextFromState = false;
@@ -141,7 +140,9 @@ public class ReactEditText extends AppCompatEditText
     mListeners = null;
     mTextWatcherDelegator = null;
     mStagedInputType = getInputType();
-    mKeyListener = new InternalKeyListener();
+    if (mKeyListener == null) {
+      mKeyListener = new InternalKeyListener();
+    }
     mScrollWatcher = null;
     mTextAttributes = new TextAttributes();
 
@@ -452,6 +453,10 @@ public class ReactEditText extends AppCompatEditText
     // We override the KeyListener so that all keys on the soft input keyboard as well as hardware
     // keyboards work. Some KeyListeners like DigitsKeyListener will display the keyboard but not
     // accept all input from it
+    if (mKeyListener == null) {
+      mKeyListener = new InternalKeyListener();
+    }
+
     mKeyListener.setInputType(type);
     setKeyListener(mKeyListener);
   }
@@ -751,6 +756,7 @@ public class ReactEditText extends AppCompatEditText
     if (mFabricViewStateManager != null
         && !mFabricViewStateManager.hasStateWrapper()
         && !reactContext.isBridgeless()) {
+
       final ReactTextInputLocalData localData = new ReactTextInputLocalData(this);
       UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
       if (uiManager != null) {
@@ -986,7 +992,7 @@ public class ReactEditText extends AppCompatEditText
    */
   private void updateCachedSpannable(boolean resetStyles) {
     // Noops in non-Fabric
-    if (mFabricViewStateManager != null && !mFabricViewStateManager.hasStateWrapper()) {
+    if (mFabricViewStateManager == null || !mFabricViewStateManager.hasStateWrapper()) {
       return;
     }
     // If this view doesn't have an ID yet, we don't have a cache key, so bail here

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -27,7 +27,6 @@ import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.autofill.HintConstants;
@@ -972,12 +971,11 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     return UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.getId());
   }
 
-  private class ReactTextInputTextWatcher implements TextWatcher {
-
-    private EventDispatcher mEventDispatcher;
-    private ReactEditText mEditText;
+  private final class ReactTextInputTextWatcher implements TextWatcher {
+    private final ReactEditText mEditText;
+    private final EventDispatcher mEventDispatcher;
+    private final int mSurfaceId;
     private String mPreviousText;
-    private int mSurfaceId;
 
     public ReactTextInputTextWatcher(
         final ReactContext reactContext, final ReactEditText editText) {
@@ -1013,24 +1011,23 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
         return;
       }
 
-      if (mEditText.getFabricViewStateManager().hasStateWrapper()) {
+      FabricViewStateManager stateManager = mEditText.getFabricViewStateManager();
+      if (stateManager.hasStateWrapper()) {
         // Fabric: communicate to C++ layer that text has changed
         // We need to call `incrementAndGetEventCounter` here explicitly because this
         // update may race with other updates.
         // We simply pass in the cache ID, which never changes, but UpdateState will still be called
         // on the native side, triggering a measure.
-        mEditText
-            .getFabricViewStateManager()
-            .setState(
-                new FabricViewStateManager.StateUpdateCallback() {
-                  @Override
-                  public WritableMap getStateUpdate() {
-                    WritableMap map = new WritableNativeMap();
-                    map.putInt("mostRecentEventCount", mEditText.incrementAndGetEventCounter());
-                    map.putInt("opaqueCacheId", mEditText.getId());
-                    return map;
-                  }
-                });
+        stateManager.setState(
+            new FabricViewStateManager.StateUpdateCallback() {
+              @Override
+              public WritableMap getStateUpdate() {
+                WritableMap map = new WritableNativeMap();
+                map.putInt("mostRecentEventCount", mEditText.incrementAndGetEventCounter());
+                map.putInt("opaqueCacheId", mEditText.getId());
+                return map;
+              }
+            });
       }
 
       // The event that contains the event counter and updates it must be sent first.
@@ -1126,11 +1123,11 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   }
 
   private static class ReactContentSizeWatcher implements ContentSizeWatcher {
-    private ReactEditText mEditText;
-    private @Nullable EventDispatcher mEventDispatcher;
+    private final ReactEditText mEditText;
+    private final EventDispatcher mEventDispatcher;
+    private final int mSurfaceId;
     private int mPreviousContentWidth = 0;
     private int mPreviousContentHeight = 0;
-    private int mSurfaceId;
 
     public ReactContentSizeWatcher(ReactEditText editText) {
       mEditText = editText;
@@ -1174,17 +1171,15 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     }
   }
 
-  private class ReactSelectionWatcher implements SelectionWatcher {
-
-    private ReactEditText mReactEditText;
-    private EventDispatcher mEventDispatcher;
+  private static class ReactSelectionWatcher implements SelectionWatcher {
+    private final ReactEditText mReactEditText;
+    private final EventDispatcher mEventDispatcher;
+    private final int mSurfaceId;
     private int mPreviousSelectionStart;
     private int mPreviousSelectionEnd;
-    private int mSurfaceId;
 
     public ReactSelectionWatcher(ReactEditText editText) {
       mReactEditText = editText;
-
       ReactContext reactContext = getReactContext(editText);
       mEventDispatcher = getEventDispatcher(reactContext, editText);
       mSurfaceId = UIManagerHelper.getSurfaceId(reactContext);
@@ -1213,12 +1208,11 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   }
 
   private static class ReactScrollWatcher implements ScrollWatcher {
-
-    private ReactEditText mReactEditText;
-    private EventDispatcher mEventDispatcher;
+    private final ReactEditText mReactEditText;
+    private final EventDispatcher mEventDispatcher;
+    private final int mSurfaceId;
     private int mPreviousHoriz;
     private int mPreviousVert;
-    private int mSurfaceId;
 
     public ReactScrollWatcher(ReactEditText editText) {
       mReactEditText = editText;
@@ -1272,40 +1266,34 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     view.setPadding(left, top, right, bottom);
   }
 
-  /**
-   * May be overridden by subclasses that would like to provide their own instance of the internal
-   * {@code EditText} this class uses to determine the expected size of the view.
-   */
-  protected EditText createInternalEditText(ThemedReactContext themedReactContext) {
-    return new EditText(themedReactContext);
-  }
-
   @Override
   public Object updateState(
-      ReactEditText view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {
-
+      ReactEditText view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
     if (ReactEditText.DEBUG_MODE) {
       FLog.e(TAG, "updateState: [" + view.getId() + "]");
     }
 
-    view.getFabricViewStateManager().setStateWrapper(stateWrapper);
-
-    if (stateWrapper == null) {
-      return null;
+    FabricViewStateManager stateManager = view.getFabricViewStateManager();
+    if (!stateManager.hasStateWrapper()) {
+      // HACK: In Fabric, we assume all components start off with zero padding, which is
+      // not true for TextInput components. We expose the theme's default padding via
+      // AndroidTextInputComponentDescriptor, which will be applied later though setPadding.
+      // TODO T58784068: move this constructor once Fabric is shipped
+      view.setPadding(0, 0, 0, 0);
     }
 
-    ReadableNativeMap state = stateWrapper.getStateData();
+    stateManager.setStateWrapper(stateWrapper);
 
+    ReadableNativeMap state = stateWrapper.getStateData();
     if (state == null) {
       return null;
     }
-
     if (!state.hasKey("attributedString")) {
       return null;
     }
+
     ReadableMap attributedString = state.getMap("attributedString");
     ReadableMap paragraphAttributes = state.getMap("paragraphAttributes");
-
     if (attributedString == null || paragraphAttributes == null) {
       throw new IllegalArgumentException("Invalid TextInput State was received as a parameters");
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK

@@ -9,6 +9,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),

package/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK

@@ -39,5 +39,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+        react_native_target("res:uimanager"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt

@@ -55,6 +55,9 @@ object ReactMapBufferPropSetter {
   private const val VP_TEST_ID = 32
   private const val VP_TRANSFORM = 33
   private const val VP_ZINDEX = 34
+  private const val VP_POINTER_ENTER_CAPTURE = 38
+  private const val VP_POINTER_LEAVE_CAPTURE = 39
+  private const val VP_POINTER_MOVE_CAPTURE = 40
 
   // Yoga values
   private const val YG_BORDER_WIDTH = 100
@@ -185,6 +188,15 @@ object ReactMapBufferPropSetter {
         VP_POINTER_MOVE -> {
           viewManager.setPointerMove(view, entry.booleanValue)
         }
+        VP_POINTER_ENTER_CAPTURE -> {
+          viewManager.setPointerEnterCapture(view, entry.booleanValue)
+        }
+        VP_POINTER_LEAVE_CAPTURE -> {
+          viewManager.setPointerLeaveCapture(view, entry.booleanValue)
+        }
+        VP_POINTER_MOVE_CAPTURE -> {
+          viewManager.setPointerMoveCapture(view, entry.booleanValue)
+        }
         VP_REMOVE_CLIPPED_SUBVIEW -> {
           viewManager.setRemoveClippedSubviews(view, entry.booleanValue)
         }

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java

@@ -89,7 +89,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
   private @Nullable Path mOuterClipPathForBorderRadius;
   private @Nullable Path mPathForBorderRadiusOutline;
   private @Nullable Path mPathForBorder;
-  private Path mPathForSingleBorder = new Path();
+  private final Path mPathForSingleBorder = new Path();
   private @Nullable Path mCenterDrawPath;
   private @Nullable RectF mInnerClipTempRectForBorderRadius;
   private @Nullable RectF mOuterClipTempRectForBorderRadius;
@@ -217,6 +217,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
   public void setBorderColor(int position, float rgb, float alpha) {
     this.setBorderRGB(position, rgb);
     this.setBorderAlpha(position, alpha);
+    mNeedUpdatePathForBorderRadius = true;
   }
 
   private void setBorderRGB(int position, float rgb) {
@@ -523,10 +524,24 @@ public class ReactViewBackgroundDrawable extends Drawable {
 
     final RectF borderWidth = getDirectionAwareBorderInsets();
 
-    mInnerClipTempRectForBorderRadius.top += borderWidth.top;
-    mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;
-    mInnerClipTempRectForBorderRadius.left += borderWidth.left;
-    mInnerClipTempRectForBorderRadius.right -= borderWidth.right;
+    int colorLeft = getBorderColor(Spacing.LEFT);
+    int colorTop = getBorderColor(Spacing.TOP);
+    int colorRight = getBorderColor(Spacing.RIGHT);
+    int colorBottom = getBorderColor(Spacing.BOTTOM);
+    int borderColor = getBorderColor(Spacing.ALL);
+
+    // Clip border ONLY if its color is non transparent
+    if (Color.alpha(colorLeft) != 0
+        && Color.alpha(colorTop) != 0
+        && Color.alpha(colorRight) != 0
+        && Color.alpha(colorBottom) != 0
+        && Color.alpha(borderColor) != 0) {
+
+      mInnerClipTempRectForBorderRadius.top += borderWidth.top;
+      mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;
+      mInnerClipTempRectForBorderRadius.left += borderWidth.left;
+      mInnerClipTempRectForBorderRadius.right -= borderWidth.right;
+    }
 
     mTempRectForCenterDrawPath.top += borderWidth.top * 0.5f;
     mTempRectForCenterDrawPath.bottom -= borderWidth.bottom * 0.5f;

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java

@@ -24,6 +24,12 @@ public class ReactViewBackgroundManager {
     this.mView = view;
   }
 
+  public void cleanup() {
+    ViewCompat.setBackground(mView, null);
+    this.mView = null;
+    this.mReactBackgroundDrawable = null;
+  }
+
   private ReactViewBackgroundDrawable getOrCreateReactViewBackground() {
     if (mReactBackgroundDrawable == null) {
       mReactBackgroundDrawable = new ReactViewBackgroundDrawable(mView.getContext());

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java

@@ -116,26 +116,67 @@ public class ReactViewGroup extends ViewGroup
   // whenever the option is set. We also override {@link ViewGroup#getChildAt} and
   // {@link ViewGroup#getChildCount} so those methods may return views that are not attached.
   // This is risky but allows us to perform a correct cleanup in {@link NativeViewHierarchyManager}.
-  private boolean mRemoveClippedSubviews = false;
-  private @Nullable View[] mAllChildren = null;
+  private boolean mRemoveClippedSubviews;
+  private @Nullable View[] mAllChildren;
   private int mAllChildrenCount;
   private @Nullable Rect mClippingRect;
   private @Nullable Rect mHitSlopRect;
   private @Nullable String mOverflow;
-  private PointerEvents mPointerEvents = PointerEvents.AUTO;
+  private PointerEvents mPointerEvents;
   private @Nullable ChildrenLayoutChangeListener mChildrenLayoutChangeListener;
   private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
   private @Nullable OnInterceptTouchEventListener mOnInterceptTouchEventListener;
-  private boolean mNeedsOffscreenAlphaCompositing = false;
-  private @Nullable ViewGroupDrawingOrderHelper mDrawingOrderHelper = null;
+  private boolean mNeedsOffscreenAlphaCompositing;
+  private @Nullable ViewGroupDrawingOrderHelper mDrawingOrderHelper;
   private @Nullable Path mPath;
   private int mLayoutDirection;
-  private float mBackfaceOpacity = 1.f;
-  private String mBackfaceVisibility = "visible";
+  private float mBackfaceOpacity;
+  private String mBackfaceVisibility;
 
   public ReactViewGroup(Context context) {
     super(context);
+    initView();
+  }
+
+  /**
+   * Set all default values here as opposed to in the constructor or field defaults. It is important
+   * that these properties are set during the constructor, but also on-demand whenever an existing
+   * ReactTextView is recycled.
+   */
+  private void initView() {
     setClipChildren(false);
+
+    mRemoveClippedSubviews = false;
+    mAllChildren = null;
+    mAllChildrenCount = 0;
+    mClippingRect = null;
+    mHitSlopRect = null;
+    mOverflow = null;
+    mPointerEvents = PointerEvents.AUTO;
+    mChildrenLayoutChangeListener = null;
+    mReactBackgroundDrawable = null;
+    mOnInterceptTouchEventListener = null;
+    mNeedsOffscreenAlphaCompositing = false;
+    mDrawingOrderHelper = null;
+    mPath = null;
+    mLayoutDirection = 0; // set when background is created
+    mBackfaceOpacity = 1.f;
+    mBackfaceVisibility = "visible";
+  }
+
+  /* package */ void recycleView() {
+    // Set default field values
+    initView();
+    mOverflowInset.setEmpty();
+    sHelperRect.setEmpty();
+
+    // Remove any children
+    removeAllViews();
+
+    // Reset background, borders
+    updateBackgroundDrawable(null);
+
+    resetPointerEvents();
   }
 
   private ViewGroupDrawingOrderHelper getDrawingOrderHelper() {
@@ -224,7 +265,7 @@ public class ReactViewGroup extends ViewGroup
       return true;
     }
     // We intercept the touch event if the children are not supposed to receive it.
-    if (mPointerEvents == PointerEvents.NONE || mPointerEvents == PointerEvents.BOX_ONLY) {
+    if (!PointerEvents.canChildrenBeTouchTarget(mPointerEvents)) {
       return true;
     }
     return super.onInterceptTouchEvent(ev);
@@ -233,7 +274,7 @@ public class ReactViewGroup extends ViewGroup
   @Override
   public boolean onTouchEvent(MotionEvent ev) {
     // We do not accept the touch event if this view is not supposed to receive it.
-    if (mPointerEvents == PointerEvents.NONE || mPointerEvents == PointerEvents.BOX_NONE) {
+    if (!PointerEvents.canBeTouchTarget(mPointerEvents)) {
       return false;
     }
     // The root view always assumes any view that was tapped wants the touch
@@ -244,6 +285,16 @@ public class ReactViewGroup extends ViewGroup
     return true;
   }
 
+  @Override
+  public boolean dispatchGenericPointerEvent(MotionEvent ev) {
+    // We do not dispatch the pointer event if its children are not supposed to receive it
+    if (!PointerEvents.canChildrenBeTouchTarget(mPointerEvents)) {
+      return false;
+    }
+
+    return super.dispatchGenericPointerEvent(ev);
+  }
+
   /**
    * We override this to allow developers to determine whether they need offscreen alpha compositing
    * or not. See the documentation of needsOffscreenAlphaCompositing in View.js.
@@ -543,6 +594,10 @@ public class ReactViewGroup extends ViewGroup
     mPointerEvents = pointerEvents;
   }
 
+  /*package*/ void resetPointerEvents() {
+    mPointerEvents = PointerEvents.AUTO;
+  }
+
   /*package*/ int getAllChildrenCount() {
     return mAllChildrenCount;
   }
@@ -686,7 +741,7 @@ public class ReactViewGroup extends ViewGroup
     return DEFAULT_BACKGROUND_COLOR;
   }
 
-  private ReactViewBackgroundDrawable getOrCreateReactViewBackground() {
+  /* package */ ReactViewBackgroundDrawable getOrCreateReactViewBackground() {
     if (mReactBackgroundDrawable == null) {
       mReactBackgroundDrawable = new ReactViewBackgroundDrawable(getContext());
       Drawable backgroundDrawable = getBackground();
@@ -744,7 +799,7 @@ public class ReactViewGroup extends ViewGroup
    * @param drawable {@link Drawable} The Drawable to use as the background, or null to remove the
    *     background
    */
-  private void updateBackgroundDrawable(Drawable drawable) {
+  /* package */ void updateBackgroundDrawable(Drawable drawable) {
     super.setBackground(drawable);
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -52,6 +52,23 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   private static final int CMD_SET_PRESSED = 2;
   private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate";
 
+  public ReactViewManager() {
+    super();
+
+    setupViewRecycling();
+  }
+
+  @Override
+  protected ReactViewGroup prepareToRecycleView(
+      @NonNull ThemedReactContext reactContext, ReactViewGroup view) {
+    // BaseViewManager
+    super.prepareToRecycleView(reactContext, view);
+
+    view.recycleView();
+
+    return view;
+  }
+
   @ReactProp(name = "accessible")
   public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);

package/ReactAndroid/src/main/java/com/facebook/systrace/BUCK

@@ -4,6 +4,7 @@ rn_android_library(
     name = "systrace",
     srcs = glob(["*.java"]),
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -16,8 +16,12 @@ function(add_react_android_subdir relative_path)
   add_subdirectory(${REACT_ANDROID_DIR}/${relative_path} ReactAndroid/${relative_path})
 endfunction()
 
+function(add_react_build_subdir relative_path)
+  add_subdirectory(${REACT_BUILD_DIR}/${relative_path} build/${relative_path})
+endfunction()
+
 function(add_react_third_party_ndk_subdir relative_path)
-  add_react_android_subdir(build/third-party-ndk/${relative_path})
+  add_react_build_subdir(third-party-ndk/${relative_path})
 endfunction()
 
 function(add_react_common_subdir relative_path)
@@ -84,7 +88,7 @@ add_react_common_subdir(react/renderer/mapbuffer)
 add_react_common_subdir(react/nativemodule/core)
 
 # ReactAndroid JNI targets
-add_react_android_subdir(build/generated/source/codegen/jni)
+add_react_build_subdir(generated/source/codegen/jni)
 add_react_android_subdir(src/main/java/com/facebook/hermes/reactexecutor)
 add_react_android_subdir(src/main/jni/first-party/fbjni)
 add_react_android_subdir(src/main/jni/first-party/fb)

package/ReactAndroid/src/main/jni/react/jni/BUCK

@@ -8,7 +8,6 @@ EXPORTED_HEADERS = [
     "JavaScriptExecutorHolder.h",
     "JCallback.h",
     "JMessageQueueThread.h",
-    "JNativeRunnable.h",
     "JReactMarker.h",
     "JSLoader.h",
     "JSLogging.h",

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -35,7 +35,6 @@
 #include <logger/react_native_log.h>
 
 #include "CxxModuleWrapper.h"
-#include "JNativeRunnable.h"
 #include "JReactCxxErrorHandler.h"
 #include "JReactSoftExceptionLogger.h"
 #include "JavaScriptExecutorHolder.h"
@@ -155,8 +154,6 @@ void CatalystInstanceImpl::registerNatives() {
           "warnOnLegacyNativeModuleSystemUse",
           CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse),
   });
-
-  JNativeRunnable::registerNatives();
 }
 
 void log(ReactNativeLogLevel level, const char *message) {