react-native 0.68.2 → 0.69.0-rc.2

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java

@@ -9,6 +9,7 @@ package com.facebook.react.uimanager.events;
 
 import android.view.MotionEvent;
 import android.view.View;
+import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewUtil;
 
 /** Utilities for native Views that interpret native gestures (e.g. ScrollView, ViewPager, etc.). */
@@ -35,6 +36,9 @@ public class NativeGestureUtil {
    * @param event the MotionEvent that caused the gesture to be ended
    */
   public static void notifyNativeGestureEnded(View view, MotionEvent event) {
-    RootViewUtil.getRootView(view).onChildEndedNativeGesture(view, event);
+    RootView rootView = RootViewUtil.getRootView(view);
+    if (rootView != null) {
+      rootView.onChildEndedNativeGesture(view, event);
+    }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.java

@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events;
+
+import android.view.MotionEvent;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pools;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
+import com.facebook.react.bridge.WritableMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class PointerEvent extends Event<PointerEvent> {
+  private static final String TAG = PointerEvent.class.getSimpleName();
+  private static final int POINTER_EVENTS_POOL_SIZE = 6;
+  private static final Pools.SynchronizedPool<PointerEvent> EVENTS_POOL =
+      new Pools.SynchronizedPool<>(POINTER_EVENTS_POOL_SIZE);
+  private static final int UNSET_COALESCING_KEY = -1;
+
+  public static PointerEvent obtain(
+      String eventName, int surfaceId, int viewTag, MotionEvent motionEventToCopy) {
+    PointerEvent event = EVENTS_POOL.acquire();
+    if (event == null) {
+      event = new PointerEvent();
+    }
+    event.init(eventName, surfaceId, viewTag, Assertions.assertNotNull(motionEventToCopy), 0);
+    return event;
+  }
+
+  public static PointerEvent obtain(
+      String eventName,
+      int surfaceId,
+      int viewTag,
+      MotionEvent motionEventToCopy,
+      int coalescingKey) {
+    PointerEvent event = EVENTS_POOL.acquire();
+    if (event == null) {
+      event = new PointerEvent();
+    }
+    event.init(
+        eventName, surfaceId, viewTag, Assertions.assertNotNull(motionEventToCopy), coalescingKey);
+    return event;
+  }
+
+  private @Nullable MotionEvent mMotionEvent;
+  private @Nullable String mEventName;
+  private int mCoalescingKey = UNSET_COALESCING_KEY;
+
+  private void init(
+      String eventName,
+      int surfaceId,
+      int viewTag,
+      MotionEvent motionEventToCopy,
+      int coalescingKey) {
+    super.init(surfaceId, viewTag, motionEventToCopy.getEventTime());
+    mEventName = eventName;
+    mMotionEvent = MotionEvent.obtain(motionEventToCopy);
+    mCoalescingKey = coalescingKey;
+  }
+
+  private PointerEvent() {}
+
+  @Override
+  public String getEventName() {
+    return mEventName;
+  }
+
+  @Override
+  public void dispatch(RCTEventEmitter rctEventEmitter) {
+    // Skip legacy stuff for now?
+    return;
+  }
+
+  @Override
+  public void onDispose() {
+    MotionEvent motionEvent = mMotionEvent;
+    mMotionEvent = null;
+    if (motionEvent != null) {
+      motionEvent.recycle();
+    }
+
+    // Either `this` is in the event pool, or motionEvent
+    // is null. It is in theory not possible for a PointerEvent to
+    // be in the EVENTS_POOL but for motionEvent to be null. However,
+    // out of an abundance of caution and to avoid memory leaks or
+    // other crashes at all costs, we attempt to release here and log
+    // a soft exception here if release throws an IllegalStateException
+    // due to `this` being over-released. This may indicate that there is
+    // a logic error in our events system or pooling mechanism.
+    try {
+      EVENTS_POOL.release(this);
+    } catch (IllegalStateException e) {
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
+    }
+  }
+
+  private ArrayList<WritableMap> createPointerEvents() {
+    MotionEvent motionEvent = mMotionEvent;
+    ArrayList<WritableMap> pointerEvents = new ArrayList<>();
+
+    for (int index = 0; index < motionEvent.getPointerCount(); index++) {
+      pointerEvents.add(this.createPointerEvent(index));
+    }
+
+    return pointerEvents;
+  }
+
+  private WritableMap createPointerEvent(int index) {
+    WritableMap pointerEvent = Arguments.createMap();
+
+    pointerEvent.putDouble("pointerId", mMotionEvent.getPointerId(index));
+    pointerEvent.putDouble("pressure", mMotionEvent.getPressure(index));
+    pointerEvent.putString(
+        "pointerType", PointerEventHelper.getW3CPointerType(mMotionEvent.getToolType(index)));
+
+    // Client refers to upper left edge of the content area (viewport)
+    // We define the viewport to be ReactRootView
+    pointerEvent.putDouble("clientX", mMotionEvent.getX(index));
+    pointerEvent.putDouble("clientY", mMotionEvent.getY(index));
+
+    pointerEvent.putInt("target", this.getViewTag());
+    pointerEvent.putDouble("timestamp", this.getTimestampMs());
+    return pointerEvent;
+  }
+
+  @Override
+  public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
+    if (mMotionEvent == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvehas been recycled"));
+      return;
+    }
+
+    List<WritableMap> relevantPointerEventData = null;
+
+    int activePointerIndex = mMotionEvent.getActionIndex();
+    switch (mEventName) {
+        // Cases where all pointer info is relevant
+      case PointerEventHelper.POINTER_MOVE:
+      case PointerEventHelper.POINTER_CANCEL:
+        relevantPointerEventData = createPointerEvents();
+        break;
+        // Cases where only the "active" pointer info is relevant
+      case PointerEventHelper.POINTER_ENTER:
+      case PointerEventHelper.POINTER_DOWN:
+      case PointerEventHelper.POINTER_UP:
+      case PointerEventHelper.POINTER_LEAVE:
+        relevantPointerEventData = Arrays.asList(createPointerEvent(activePointerIndex));
+        break;
+    }
+
+    if (relevantPointerEventData == null) {
+      // No relevant MotionEvent to dispatch
+      return;
+    }
+
+    boolean shouldCopy = relevantPointerEventData.size() > 1;
+    for (WritableMap pointerEventData : relevantPointerEventData) {
+      WritableMap eventData = shouldCopy ? pointerEventData.copy() : pointerEventData;
+      rctEventEmitter.receiveEvent(
+          this.getSurfaceId(),
+          this.getViewTag(),
+          mEventName,
+          mCoalescingKey != UNSET_COALESCING_KEY,
+          mCoalescingKey,
+          eventData,
+          PointerEventHelper.getEventCategory(mEventName));
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events;
+
+import android.view.MotionEvent;
+
+/** Class responsible for generating catalyst touch events based on android {@link MotionEvent}. */
+public class PointerEventHelper {
+
+  public static final String POINTER_TYPE_TOUCH = "touch";
+  public static final String POINTER_TYPE_PEN = "pen";
+  public static final String POINTER_TYPE_MOUSE = "mouse";
+  public static final String POINTER_TYPE_UNKNOWN = "";
+
+  public static final String POINTER_CANCEL = "topPointerCancel";
+  public static final String POINTER_DOWN = "topPointerDown";
+  public static final String POINTER_ENTER = "topPointerEnter2";
+  public static final String POINTER_LEAVE = "topPointerLeave2";
+  public static final String POINTER_MOVE = "topPointerMove2";
+  public static final String POINTER_UP = "topPointerUp";
+
+  public static String getW3CPointerType(final int toolType) {
+    // https://www.w3.org/TR/pointerevents3/#dom-pointerevent-pointertype
+    switch (toolType) {
+      case MotionEvent.TOOL_TYPE_FINGER:
+        return POINTER_TYPE_TOUCH;
+
+      case MotionEvent.TOOL_TYPE_STYLUS:
+        return POINTER_TYPE_PEN;
+
+      case MotionEvent.TOOL_TYPE_MOUSE:
+        return POINTER_TYPE_MOUSE;
+    }
+    return POINTER_TYPE_UNKNOWN;
+  }
+
+  public static int getEventCategory(String pointerEventType) {
+    if (pointerEventType == null) {
+      return EventCategoryDef.UNSPECIFIED;
+    }
+    // Following:
+    // https://github.com/facebook/react/blob/main/packages/react-dom/src/events/ReactDOMEventListener.js#L435-L437
+    switch (pointerEventType) {
+      case POINTER_DOWN:
+      case POINTER_CANCEL:
+      case POINTER_UP:
+        return EventCategoryDef.DISCRETE;
+      case POINTER_MOVE:
+      case POINTER_ENTER:
+      case POINTER_LEAVE:
+        return EventCategoryDef.CONTINUOUS;
+    }
+
+    return EventCategoryDef.UNSPECIFIED;
+  }
+
+  public static boolean supportsHover(final int toolType) {
+    String pointerType = getW3CPointerType(toolType);
+
+    if (pointerType.equals(POINTER_TYPE_MOUSE)) {
+      return true;
+    } else if (pointerType.equals(POINTER_TYPE_PEN)) {
+      return true; // true?
+    } else if (pointerType.equals(POINTER_TYPE_TOUCH)) {
+      return false;
+    }
+
+    return false;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk

@@ -15,8 +15,6 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
   libglog \
   libglog_init \
   librrc_native \

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK

@@ -12,7 +12,10 @@ rn_xplat_cxx_library(
         prefix = "react/uimanager/jni",
     ),
     fbandroid_allow_jni_merging = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt

@@ -0,0 +1,26 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+
+file(GLOB uimanagerjni_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+add_library(uimanagerjni SHARED ${uimanagerjni_SRC})
+
+target_include_directories(uimanagerjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(uimanagerjni
+        fb
+        fbjni
+        folly_runtime
+        glog
+        glog_init
+        rrc_native
+        yoga
+        callinvokerholder
+        reactnativejni
+        react_render_componentregistry)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/util/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "util",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java

@@ -15,12 +15,13 @@ import java.util.regex.Pattern;
 
 public class JSStackTrace {
 
-  private static final String LINE_NUMBER_KEY = "lineNumber";
+  public static final String LINE_NUMBER_KEY = "lineNumber";
+  public static final String FILE_KEY = "file";
+  public static final String COLUMN_KEY = "column";
+  public static final String METHOD_NAME_KEY = "methodName";
+
   private static final Pattern FILE_ID_PATTERN =
       Pattern.compile("\\b((?:seg-\\d+(?:_\\d+)?|\\d+)\\.js)");
-  private static final String FILE_KEY = "file";
-  private static final String COLUMN_KEY = "column";
-  private static final String METHOD_NAME_KEY = "methodName";
 
   public static String format(String message, ReadableArray stack) {
     StringBuilder stringBuilder = new StringBuilder(message).append(", stack:\n");

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/android/androidx:annotation"),

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["**/*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     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/image/BUCK

@@ -9,7 +9,10 @@ rn_android_library(
     srcs = IMAGE_EVENT_FILES,
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
@@ -34,7 +37,10 @@ rn_android_library(
     ),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
@@ -55,7 +61,6 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
-        react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/modules/fresco:fresco"),

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java

@@ -14,9 +14,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -48,7 +46,6 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
 import com.facebook.react.uimanager.FloatUtil;
 import com.facebook.react.uimanager.PixelUtil;
@@ -70,25 +67,11 @@ import java.util.List;
 public class ReactImageView extends GenericDraweeView {
 
   public static final int REMOTE_IMAGE_FADE_DURATION_MS = 300;
-
   public static final String REMOTE_TRANSPARENT_BITMAP_URI =
       "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
 
   private static float[] sComputedCornerRadii = new float[4];
 
-  /*
-   * Implementation note re rounded corners:
-   *
-   * Fresco's built-in rounded corners only work for 'cover' resize mode -
-   * this is a limitation in Android itself. Fresco has a workaround for this, but
-   * it requires knowing the background color.
-   *
-   * So for the other modes, we use a postprocessor.
-   * Because the postprocessor uses a modified bitmap, that would just get cropped in
-   * 'cover' mode, so we fall back to Fresco's normal implementation.
-   */
-  private static final Matrix sMatrix = new Matrix();
-  private static final Matrix sInverse = new Matrix();
   private ImageResizeMethod mResizeMethod = ImageResizeMethod.AUTO;
 
   public void updateCallerContext(@Nullable Object callerContext) {
@@ -98,61 +81,6 @@ public class ReactImageView extends GenericDraweeView {
     }
   }
 
-  private class RoundedCornerPostprocessor extends BasePostprocessor {
-
-    void getRadii(Bitmap source, float[] computedCornerRadii, float[] mappedRadii) {
-      mScaleType.getTransform(
-          sMatrix,
-          new Rect(0, 0, source.getWidth(), source.getHeight()),
-          source.getWidth(),
-          source.getHeight(),
-          0.0f,
-          0.0f);
-      sMatrix.invert(sInverse);
-
-      mappedRadii[0] = sInverse.mapRadius(computedCornerRadii[0]);
-      mappedRadii[1] = mappedRadii[0];
-
-      mappedRadii[2] = sInverse.mapRadius(computedCornerRadii[1]);
-      mappedRadii[3] = mappedRadii[2];
-
-      mappedRadii[4] = sInverse.mapRadius(computedCornerRadii[2]);
-      mappedRadii[5] = mappedRadii[4];
-
-      mappedRadii[6] = sInverse.mapRadius(computedCornerRadii[3]);
-      mappedRadii[7] = mappedRadii[6];
-    }
-
-    @Override
-    public void process(Bitmap output, Bitmap source) {
-      getCornerRadii(sComputedCornerRadii);
-
-      output.setHasAlpha(true);
-      if (FloatUtil.floatsEqual(sComputedCornerRadii[0], 0f)
-          && FloatUtil.floatsEqual(sComputedCornerRadii[1], 0f)
-          && FloatUtil.floatsEqual(sComputedCornerRadii[2], 0f)
-          && FloatUtil.floatsEqual(sComputedCornerRadii[3], 0f)) {
-        super.process(output, source);
-        return;
-      }
-      Paint paint = new Paint();
-      paint.setAntiAlias(true);
-      paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
-      Canvas canvas = new Canvas(output);
-
-      float[] radii = new float[8];
-
-      getRadii(source, sComputedCornerRadii, radii);
-
-      Path pathForBorderRadius = new Path();
-
-      pathForBorderRadius.addRoundRect(
-          new RectF(0, 0, source.getWidth(), source.getHeight()), radii, Path.Direction.CW);
-
-      canvas.drawPath(pathForBorderRadius, paint);
-    }
-  }
-
   // Fresco lacks support for repeating images, see https://github.com/facebook/fresco/issues/1575
   // We implement it here as a postprocessing step.
   private static final Matrix sTileMatrix = new Matrix();
@@ -198,7 +126,6 @@ public class ReactImageView extends GenericDraweeView {
   private Shader.TileMode mTileMode = ImageResizeMode.defaultTileMode();
   private boolean mIsDirty;
   private final AbstractDraweeControllerBuilder mDraweeControllerBuilder;
-  private @Nullable RoundedCornerPostprocessor mRoundedCornerPostprocessor;
   private @Nullable TilePostprocessor mTilePostprocessor;
   private @Nullable IterativeBoxBlurPostProcessor mIterativeBoxBlurPostProcessor;
   private @Nullable ReactImageDownloadListener mDownloadListener;
@@ -211,8 +138,10 @@ public class ReactImageView extends GenericDraweeView {
 
   // We can't specify rounding in XML, so have to do so here
   private static GenericDraweeHierarchy buildHierarchy(Context context) {
+    RoundingParams roundingParams = RoundingParams.fromCornersRadius(0);
+    roundingParams.setPaintFilterBitmap(true);
     return new GenericDraweeHierarchyBuilder(context.getResources())
-        .setRoundingParams(RoundingParams.fromCornersRadius(0))
+        .setRoundingParams(roundingParams)
         .build();
   }
 
@@ -353,11 +282,6 @@ public class ReactImageView extends GenericDraweeView {
   public void setScaleType(ScalingUtils.ScaleType scaleType) {
     if (mScaleType != scaleType) {
       mScaleType = scaleType;
-      if (shouldUseRoundedCornerPostprocessing()) {
-        mRoundedCornerPostprocessor = new RoundedCornerPostprocessor();
-      } else {
-        mRoundedCornerPostprocessor = null;
-      }
       mIsDirty = true;
     }
   }
@@ -530,9 +454,6 @@ public class ReactImageView extends GenericDraweeView {
       mBackgroundImageDrawable.setRadii(roundingParams.getCornersRadii());
       hierarchy.setBackgroundImage(mBackgroundImageDrawable);
     }
-    if (shouldUseRoundedCornerPostprocessing()) {
-      roundingParams.setCornersRadius(0);
-    }
     roundingParams.setBorder(mBorderColor, mBorderWidth);
     if (mOverlayColor != Color.TRANSPARENT) {
       roundingParams.setOverlayColor(mOverlayColor);
@@ -547,9 +468,6 @@ public class ReactImageView extends GenericDraweeView {
             : mImageSource.isResource() ? 0 : REMOTE_IMAGE_FADE_DURATION_MS);
 
     List<Postprocessor> postprocessors = new LinkedList<>();
-    if (mRoundedCornerPostprocessor != null) {
-      postprocessors.add(mRoundedCornerPostprocessor);
-    }
     if (mIterativeBoxBlurPostProcessor != null) {
       postprocessors.add(mIterativeBoxBlurPostProcessor);
     }
@@ -647,12 +565,6 @@ public class ReactImageView extends GenericDraweeView {
     return mTileMode != Shader.TileMode.CLAMP;
   }
 
-  private boolean shouldUseRoundedCornerPostprocessing() {
-    return mScaleType != ScalingUtils.ScaleType.CENTER_CROP
-        && mScaleType != ScalingUtils.ScaleType.FOCUS_CROP
-        && ReactFeatureFlags.enableRoundedCornerPostprocessing;
-  }
-
   private void setSourceImage() {
     mImageSource = null;
     if (mSources.isEmpty()) {

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

@@ -8,7 +8,10 @@ rn_android_library(
     ),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -24,7 +27,10 @@ rn_android_library(
     srcs = ["MultiSourceHelper.java"],
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java

@@ -12,6 +12,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -47,7 +48,7 @@ public class ResourceDrawableIdHelper {
     if (name == null || name.isEmpty()) {
       return 0;
     }
-    name = name.toLowerCase().replace("-", "_");
+    name = name.toLowerCase(Locale.ROOT).replace("-", "_");
 
     // name could be a resource id.
     try {

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

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
     ],
@@ -21,6 +24,7 @@ rn_android_library(
         react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),