react-native 0.71.6 → 0.72.0-rc.1

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

@@ -27,6 +27,7 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.FloatUtil;
 import com.facebook.react.uimanager.Spacing;
@@ -86,6 +87,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
   private @Nullable BorderStyle mBorderStyle;
 
   private @Nullable Path mInnerClipPathForBorderRadius;
+  private @Nullable Path mBackgroundColorRenderPath;
   private @Nullable Path mOuterClipPathForBorderRadius;
   private @Nullable Path mPathForBorderRadiusOutline;
   private @Nullable Path mPathForBorder;
@@ -107,6 +109,13 @@ public class ReactViewBackgroundDrawable extends Drawable {
   private int mColor = Color.TRANSPARENT;
   private int mAlpha = 255;
 
+  // There is a small gap between the edges of adjacent paths
+  // such as between the mBackgroundColorRenderPath and its border.
+  // The smallest amount (found to be 0.8f) is used to extend
+  // the paths, overlapping them and closing the visible gap.
+  private final float mGapBetweenPaths =
+      ReactFeatureFlags.enableCloseVisibleGapBetweenPaths ? 0.8f : 0.0f;
+
   private @Nullable float[] mBorderCornerRadii;
   private final Context mContext;
   private int mLayoutDirection;
@@ -119,7 +128,11 @@ public class ReactViewBackgroundDrawable extends Drawable {
     TOP_START,
     TOP_END,
     BOTTOM_START,
-    BOTTOM_END
+    BOTTOM_END,
+    END_END,
+    END_START,
+    START_END,
+    START_START
   }
 
   public ReactViewBackgroundDrawable(Context context) {
@@ -262,7 +275,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
 
   public void setRadius(float radius, int position) {
     if (mBorderCornerRadii == null) {
-      mBorderCornerRadii = new float[8];
+      mBorderCornerRadii = new float[12];
       Arrays.fill(mBorderCornerRadii, YogaConstants.UNDEFINED);
     }
 
@@ -329,11 +342,15 @@ public class ReactViewBackgroundDrawable extends Drawable {
     updatePath();
     canvas.save();
 
+    // Clip outer border
+    canvas.clipPath(mOuterClipPathForBorderRadius, Region.Op.INTERSECT);
+
+    // Draws the View without its border first (with background color fill)
     int useColor = ColorUtil.multiplyColorAlpha(mColor, mAlpha);
     if (Color.alpha(useColor) != 0) { // color is not transparent
       mPaint.setColor(useColor);
       mPaint.setStyle(Paint.Style.FILL);
-      canvas.drawPath(mInnerClipPathForBorderRadius, mPaint);
+      canvas.drawPath(mBackgroundColorRenderPath, mPaint);
     }
 
     final RectF borderWidth = getDirectionAwareBorderInsets();
@@ -342,6 +359,21 @@ public class ReactViewBackgroundDrawable extends Drawable {
     int colorRight = getBorderColor(Spacing.RIGHT);
     int colorBottom = getBorderColor(Spacing.BOTTOM);
 
+    int colorBlock = getBorderColor(Spacing.BLOCK);
+    int colorBlockStart = getBorderColor(Spacing.BLOCK_START);
+    int colorBlockEnd = getBorderColor(Spacing.BLOCK_END);
+
+    if (isBorderColorDefined(Spacing.BLOCK)) {
+      colorBottom = colorBlock;
+      colorTop = colorBlock;
+    }
+    if (isBorderColorDefined(Spacing.BLOCK_END)) {
+      colorBottom = colorBlockEnd;
+    }
+    if (isBorderColorDefined(Spacing.BLOCK_START)) {
+      colorTop = colorBlockStart;
+    }
+
     if (borderWidth.top > 0
         || borderWidth.bottom > 0
         || borderWidth.left > 0
@@ -369,8 +401,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
       else {
         mPaint.setStyle(Paint.Style.FILL);
 
-        // Draw border
-        canvas.clipPath(mOuterClipPathForBorderRadius, Region.Op.INTERSECT);
+        // Clip inner border
         canvas.clipPath(mInnerClipPathForBorderRadius, Region.Op.DIFFERENCE);
 
         final boolean isRTL = getResolvedLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
@@ -416,27 +447,29 @@ public class ReactViewBackgroundDrawable extends Drawable {
         final float top = mOuterClipTempRectForBorderRadius.top;
         final float bottom = mOuterClipTempRectForBorderRadius.bottom;
 
+        // mGapBetweenPaths is used to close the gap between the diagonal
+        // edges of the quadrilaterals on adjacent sides of the rectangle
         if (borderWidth.left > 0) {
           final float x1 = left;
-          final float y1 = top;
+          final float y1 = top - mGapBetweenPaths;
           final float x2 = mInnerTopLeftCorner.x;
-          final float y2 = mInnerTopLeftCorner.y;
+          final float y2 = mInnerTopLeftCorner.y - mGapBetweenPaths;
           final float x3 = mInnerBottomLeftCorner.x;
-          final float y3 = mInnerBottomLeftCorner.y;
+          final float y3 = mInnerBottomLeftCorner.y + mGapBetweenPaths;
           final float x4 = left;
-          final float y4 = bottom;
+          final float y4 = bottom + mGapBetweenPaths;
 
           drawQuadrilateral(canvas, colorLeft, x1, y1, x2, y2, x3, y3, x4, y4);
         }
 
         if (borderWidth.top > 0) {
-          final float x1 = left;
+          final float x1 = left - mGapBetweenPaths;
           final float y1 = top;
-          final float x2 = mInnerTopLeftCorner.x;
+          final float x2 = mInnerTopLeftCorner.x - mGapBetweenPaths;
           final float y2 = mInnerTopLeftCorner.y;
-          final float x3 = mInnerTopRightCorner.x;
+          final float x3 = mInnerTopRightCorner.x + mGapBetweenPaths;
           final float y3 = mInnerTopRightCorner.y;
-          final float x4 = right;
+          final float x4 = right + mGapBetweenPaths;
           final float y4 = top;
 
           drawQuadrilateral(canvas, colorTop, x1, y1, x2, y2, x3, y3, x4, y4);
@@ -444,25 +477,25 @@ public class ReactViewBackgroundDrawable extends Drawable {
 
         if (borderWidth.right > 0) {
           final float x1 = right;
-          final float y1 = top;
+          final float y1 = top - mGapBetweenPaths;
           final float x2 = mInnerTopRightCorner.x;
-          final float y2 = mInnerTopRightCorner.y;
+          final float y2 = mInnerTopRightCorner.y - mGapBetweenPaths;
           final float x3 = mInnerBottomRightCorner.x;
-          final float y3 = mInnerBottomRightCorner.y;
+          final float y3 = mInnerBottomRightCorner.y + mGapBetweenPaths;
           final float x4 = right;
-          final float y4 = bottom;
+          final float y4 = bottom + mGapBetweenPaths;
 
           drawQuadrilateral(canvas, colorRight, x1, y1, x2, y2, x3, y3, x4, y4);
         }
 
         if (borderWidth.bottom > 0) {
-          final float x1 = left;
+          final float x1 = left - mGapBetweenPaths;
           final float y1 = bottom;
-          final float x2 = mInnerBottomLeftCorner.x;
+          final float x2 = mInnerBottomLeftCorner.x - mGapBetweenPaths;
           final float y2 = mInnerBottomLeftCorner.y;
-          final float x3 = mInnerBottomRightCorner.x;
+          final float x3 = mInnerBottomRightCorner.x + mGapBetweenPaths;
           final float y3 = mInnerBottomRightCorner.y;
-          final float x4 = right;
+          final float x4 = right + mGapBetweenPaths;
           final float y4 = bottom;
 
           drawQuadrilateral(canvas, colorBottom, x1, y1, x2, y2, x3, y3, x4, y4);
@@ -484,6 +517,10 @@ public class ReactViewBackgroundDrawable extends Drawable {
       mInnerClipPathForBorderRadius = new Path();
     }
 
+    if (mBackgroundColorRenderPath == null) {
+      mBackgroundColorRenderPath = new Path();
+    }
+
     if (mOuterClipPathForBorderRadius == null) {
       mOuterClipPathForBorderRadius = new Path();
     }
@@ -513,6 +550,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
     }
 
     mInnerClipPathForBorderRadius.reset();
+    mBackgroundColorRenderPath.reset();
     mOuterClipPathForBorderRadius.reset();
     mPathForBorderRadiusOutline.reset();
     mCenterDrawPath.reset();
@@ -529,13 +567,19 @@ public class ReactViewBackgroundDrawable extends Drawable {
     int colorRight = getBorderColor(Spacing.RIGHT);
     int colorBottom = getBorderColor(Spacing.BOTTOM);
     int borderColor = getBorderColor(Spacing.ALL);
+    int colorBlock = getBorderColor(Spacing.BLOCK);
+    int colorBlockStart = getBorderColor(Spacing.BLOCK_START);
+    int colorBlockEnd = getBorderColor(Spacing.BLOCK_END);
 
     // 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) {
+        && Color.alpha(borderColor) != 0
+        && Color.alpha(colorBlock) != 0
+        && Color.alpha(colorBlockStart) != 0
+        && Color.alpha(colorBlockEnd) != 0) {
 
       mInnerClipTempRectForBorderRadius.top += borderWidth.top;
       mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;
@@ -562,6 +606,11 @@ public class ReactViewBackgroundDrawable extends Drawable {
     float bottomStartRadius = getBorderRadius(BorderRadiusLocation.BOTTOM_START);
     float bottomEndRadius = getBorderRadius(BorderRadiusLocation.BOTTOM_END);
 
+    float endEndRadius = getBorderRadius(BorderRadiusLocation.END_END);
+    float endStartRadius = getBorderRadius(BorderRadiusLocation.END_START);
+    float startEndRadius = getBorderRadius(BorderRadiusLocation.START_END);
+    float startStartRadius = getBorderRadius(BorderRadiusLocation.START_START);
+
     if (I18nUtil.getInstance().doLeftAndRightSwapInRTL(mContext)) {
       if (YogaConstants.isUndefined(topStartRadius)) {
         topStartRadius = topLeftRadius;
@@ -579,20 +628,44 @@ public class ReactViewBackgroundDrawable extends Drawable {
         bottomEndRadius = bottomRightRadius;
       }
 
-      final float directionAwareTopLeftRadius = isRTL ? topEndRadius : topStartRadius;
-      final float directionAwareTopRightRadius = isRTL ? topStartRadius : topEndRadius;
-      final float directionAwareBottomLeftRadius = isRTL ? bottomEndRadius : bottomStartRadius;
-      final float directionAwareBottomRightRadius = isRTL ? bottomStartRadius : bottomEndRadius;
+      final float logicalTopStartRadius =
+          YogaConstants.isUndefined(topStartRadius) ? startStartRadius : topStartRadius;
+      final float logicalTopEndRadius =
+          YogaConstants.isUndefined(topEndRadius) ? startEndRadius : topEndRadius;
+      final float logicalBottomStartRadius =
+          YogaConstants.isUndefined(bottomStartRadius) ? endStartRadius : bottomStartRadius;
+      final float logicalBottomEndRadius =
+          YogaConstants.isUndefined(bottomEndRadius) ? endEndRadius : bottomEndRadius;
+
+      final float directionAwareTopLeftRadius = isRTL ? logicalTopEndRadius : logicalTopStartRadius;
+      final float directionAwareTopRightRadius =
+          isRTL ? logicalTopStartRadius : logicalTopEndRadius;
+      final float directionAwareBottomLeftRadius =
+          isRTL ? logicalBottomEndRadius : logicalBottomStartRadius;
+      final float directionAwareBottomRightRadius =
+          isRTL ? logicalBottomStartRadius : logicalBottomEndRadius;
 
       topLeftRadius = directionAwareTopLeftRadius;
       topRightRadius = directionAwareTopRightRadius;
       bottomLeftRadius = directionAwareBottomLeftRadius;
       bottomRightRadius = directionAwareBottomRightRadius;
     } else {
-      final float directionAwareTopLeftRadius = isRTL ? topEndRadius : topStartRadius;
-      final float directionAwareTopRightRadius = isRTL ? topStartRadius : topEndRadius;
-      final float directionAwareBottomLeftRadius = isRTL ? bottomEndRadius : bottomStartRadius;
-      final float directionAwareBottomRightRadius = isRTL ? bottomStartRadius : bottomEndRadius;
+      final float logicalTopStartRadius =
+          YogaConstants.isUndefined(topStartRadius) ? startStartRadius : topStartRadius;
+      final float logicalTopEndRadius =
+          YogaConstants.isUndefined(topEndRadius) ? startEndRadius : topEndRadius;
+      final float logicalBottomStartRadius =
+          YogaConstants.isUndefined(bottomStartRadius) ? endStartRadius : bottomStartRadius;
+      final float logicalBottomEndRadius =
+          YogaConstants.isUndefined(bottomEndRadius) ? endEndRadius : bottomEndRadius;
+
+      final float directionAwareTopLeftRadius = isRTL ? logicalTopEndRadius : logicalTopStartRadius;
+      final float directionAwareTopRightRadius =
+          isRTL ? logicalTopStartRadius : logicalTopEndRadius;
+      final float directionAwareBottomLeftRadius =
+          isRTL ? logicalBottomEndRadius : logicalBottomStartRadius;
+      final float directionAwareBottomRightRadius =
+          isRTL ? logicalBottomStartRadius : logicalBottomEndRadius;
 
       if (!YogaConstants.isUndefined(directionAwareTopLeftRadius)) {
         topLeftRadius = directionAwareTopLeftRadius;
@@ -634,6 +707,27 @@ public class ReactViewBackgroundDrawable extends Drawable {
         },
         Path.Direction.CW);
 
+    // There is a small gap between mBackgroundColorRenderPath and its
+    // border. mGapBetweenPaths is used to slightly enlarge the rectangle
+    // (mInnerClipTempRectForBorderRadius), ensuring the border can be
+    // drawn on top without the gap.
+    mBackgroundColorRenderPath.addRoundRect(
+        mInnerClipTempRectForBorderRadius.left - mGapBetweenPaths,
+        mInnerClipTempRectForBorderRadius.top - mGapBetweenPaths,
+        mInnerClipTempRectForBorderRadius.right + mGapBetweenPaths,
+        mInnerClipTempRectForBorderRadius.bottom + mGapBetweenPaths,
+        new float[] {
+          innerTopLeftRadiusX,
+          innerTopLeftRadiusY,
+          innerTopRightRadiusX,
+          innerTopRightRadiusY,
+          innerBottomRightRadiusX,
+          innerBottomRightRadiusY,
+          innerBottomLeftRadiusX,
+          innerBottomLeftRadiusY,
+        },
+        Path.Direction.CW);
+
     mOuterClipPathForBorderRadius.addRoundRect(
         mOuterClipTempRectForBorderRadius,
         new float[] {
@@ -817,7 +911,10 @@ public class ReactViewBackgroundDrawable extends Drawable {
     }
 
     mInnerBottomLeftCorner.x = mInnerClipTempRectForBorderRadius.left;
-    mInnerBottomLeftCorner.y = mInnerClipTempRectForBorderRadius.bottom * -2;
+    mInnerBottomLeftCorner.y =
+        borderWidth.bottom != 0
+            ? mInnerClipTempRectForBorderRadius.bottom * -2
+            : mInnerClipTempRectForBorderRadius.bottom;
 
     getEllipseIntersectionWithLine(
         // Ellipse Bounds
@@ -869,7 +966,10 @@ public class ReactViewBackgroundDrawable extends Drawable {
     }
 
     mInnerBottomRightCorner.x = mInnerClipTempRectForBorderRadius.right;
-    mInnerBottomRightCorner.y = mInnerClipTempRectForBorderRadius.bottom * -2;
+    mInnerBottomRightCorner.y =
+        borderWidth.bottom != 0
+            ? mInnerClipTempRectForBorderRadius.bottom * -2
+            : mInnerClipTempRectForBorderRadius.bottom;
 
     getEllipseIntersectionWithLine(
         // Ellipse Bounds
@@ -1055,6 +1155,21 @@ public class ReactViewBackgroundDrawable extends Drawable {
       int colorRight = getBorderColor(Spacing.RIGHT);
       int colorBottom = getBorderColor(Spacing.BOTTOM);
 
+      int colorBlock = getBorderColor(Spacing.BLOCK);
+      int colorBlockStart = getBorderColor(Spacing.BLOCK_START);
+      int colorBlockEnd = getBorderColor(Spacing.BLOCK_END);
+
+      if (isBorderColorDefined(Spacing.BLOCK)) {
+        colorBottom = colorBlock;
+        colorTop = colorBlock;
+      }
+      if (isBorderColorDefined(Spacing.BLOCK_END)) {
+        colorBottom = colorBlockEnd;
+      }
+      if (isBorderColorDefined(Spacing.BLOCK_START)) {
+        colorTop = colorBlockStart;
+      }
+
       final boolean isRTL = getResolvedLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
       int colorStart = getBorderColor(Spacing.START);
       int colorEnd = getBorderColor(Spacing.END);

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

@@ -19,6 +19,7 @@ public class ReactViewBackgroundManager {
 
   private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
   private View mView;
+  private int mColor = Color.TRANSPARENT;
 
   public ReactViewBackgroundManager(View view) {
     this.mView = view;
@@ -56,6 +57,10 @@ public class ReactViewBackgroundManager {
     }
   }
 
+  public int getBackgroundColor() {
+    return mColor;
+  }
+
   public void setBorderWidth(int position, float width) {
     getOrCreateReactViewBackground().setBorderWidth(position, width);
   }

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

@@ -13,12 +13,14 @@ import android.os.Build;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.PixelUtil;
@@ -47,6 +49,9 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     Spacing.BOTTOM,
     Spacing.START,
     Spacing.END,
+    Spacing.BLOCK,
+    Spacing.BLOCK_END,
+    Spacing.BLOCK_START
   };
   private static final int CMD_HOTSPOT_UPDATE = 1;
   private static final int CMD_SET_PRESSED = 2;
@@ -119,6 +124,10 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
         ViewProps.BORDER_TOP_END_RADIUS,
         ViewProps.BORDER_BOTTOM_START_RADIUS,
         ViewProps.BORDER_BOTTOM_END_RADIUS,
+        ViewProps.BORDER_END_END_RADIUS,
+        ViewProps.BORDER_END_START_RADIUS,
+        ViewProps.BORDER_START_END_RADIUS,
+        ViewProps.BORDER_START_START_RADIUS,
       },
       defaultFloat = YogaConstants.UNDEFINED)
   public void setBorderRadius(ReactViewGroup view, int index, float borderRadius) {
@@ -145,9 +154,6 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   @ReactProp(name = "hitSlop")
   public void setHitSlop(final ReactViewGroup view, Dynamic hitSlop) {
     switch (hitSlop.getType()) {
-      case Null:
-        view.setHitSlopRect(null);
-        break;
       case Map:
         ReadableMap hitSlopMap = hitSlop.asMap();
         view.setHitSlopRect(
@@ -170,8 +176,11 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
         view.setHitSlopRect(new Rect(hitSlopValue, hitSlopValue, hitSlopValue, hitSlopValue));
         break;
       default:
-        throw new JSApplicationIllegalArgumentException(
-            "Invalid type for 'hitSlop' value " + hitSlop.getType());
+        FLog.w(ReactConstants.TAG, "Invalid type for 'hitSlop' value " + hitSlop.getType());
+        /* falls through */
+      case Null:
+        view.setHitSlopRect(null);
+        break;
     }
   }
 
@@ -234,7 +243,10 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
         ViewProps.BORDER_TOP_COLOR,
         ViewProps.BORDER_BOTTOM_COLOR,
         ViewProps.BORDER_START_COLOR,
-        ViewProps.BORDER_END_COLOR
+        ViewProps.BORDER_END_COLOR,
+        ViewProps.BORDER_BLOCK_COLOR,
+        ViewProps.BORDER_BLOCK_END_COLOR,
+        ViewProps.BORDER_BLOCK_START_COLOR
       },
       customType = "Color")
   public void setBorderColor(ReactViewGroup view, int index, Integer color) {

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

@@ -10,10 +10,10 @@ package com.facebook.react.views.view
 import android.view.View
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.touch.JSResponderHandler
+import com.facebook.react.uimanager.IViewGroupManager
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManager
 
 interface ReactViewManagerWrapper {
@@ -41,7 +41,7 @@ interface ReactViewManagerWrapper {
 
   fun getName(): String
 
-  val viewGroupManager: ViewGroupManager<*>
+  val viewGroupManager: IViewGroupManager<*>
 
   class DefaultViewManager(private val viewManager: ViewManager<View, *>) :
       ReactViewManagerWrapper {
@@ -64,7 +64,7 @@ interface ReactViewManagerWrapper {
     }
 
     override fun receiveCommand(root: View, commandId: Int, args: ReadableArray?) {
-      viewManager.receiveCommand(root, commandId, args)
+      @Suppress("DEPRECATION") viewManager.receiveCommand(root, commandId, args)
     }
 
     override fun setPadding(view: View, left: Int, top: Int, right: Int, bottom: Int) {
@@ -84,7 +84,7 @@ interface ReactViewManagerWrapper {
 
     override fun getName(): String = viewManager.name
 
-    override val viewGroupManager: ViewGroupManager<*>
-      get() = viewManager as ViewGroupManager<*>
+    override val viewGroupManager: IViewGroupManager<*>
+      get() = viewManager as IViewGroupManager<*>
   }
 }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java

@@ -25,14 +25,6 @@ public abstract class YogaConfig {
    */
   public abstract void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour);
 
-  /**
-   * If this flag is set then yoga would diff the layout without legacy flag and would set a bool in
-   * YogaNode(mDoesLegacyStretchFlagAffectsLayout) with true if the layouts were different and false
-   * if not
-   */
-  public abstract void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
-      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour);
-
   public abstract void setLogger(YogaLogger logger);
 
   public abstract YogaLogger getLogger();

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfigJNIBase.java

@@ -52,17 +52,6 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
     YogaNative.jni_YGConfigSetUseLegacyStretchBehaviourJNI(mNativePointer, useLegacyStretchBehaviour);
   }
 
-  /**
-   * If this flag is set then yoga would diff the layout without legacy flag and would set a bool in
-   * YogaNode(mDoesLegacyStretchFlagAffectsLayout) with true if the layouts were different and false
-   * if not
-   */
-  public void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
-      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour) {
-      YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI(
-          mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
-  }
-
   public void setLogger(YogaLogger logger) {
     mLogger = logger;
     YogaNative.jni_YGConfigSetLoggerJNI(mNativePointer, logger);

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java

@@ -10,7 +10,9 @@
 package com.facebook.yoga;
 
 public enum YogaExperimentalFeature {
-  WEB_FLEX_BASIS(0);
+  WEB_FLEX_BASIS(0),
+  ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE(1),
+  FIX_ABSOLUTE_TRAILING_COLUMN_MARGIN(2);
 
   private final int mIntValue;
 
@@ -25,6 +27,8 @@ public enum YogaExperimentalFeature {
   public static YogaExperimentalFeature fromInt(int value) {
     switch (value) {
       case 0: return WEB_FLEX_BASIS;
+      case 1: return ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE;
+      case 2: return FIX_ABSOLUTE_TRAILING_COLUMN_MARGIN;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);
     }
   }

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java

@@ -9,7 +9,7 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.yoga.annotations.DoNotStrip;
 
 @DoNotStrip
 public enum YogaLogLevel {

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java

@@ -7,7 +7,7 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.yoga.annotations.DoNotStrip;
 
 /**
  * Interface for receiving logs from native layer. Use by setting YogaNode.setLogger(myLogger);

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java

@@ -7,7 +7,7 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.yoga.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 
 @DoNotStrip
@@ -25,7 +25,6 @@ public class YogaNative {
   static native void jni_YGConfigSetPrintTreeFlagJNI(long nativePointer, boolean enable);
   static native void jni_YGConfigSetPointScaleFactorJNI(long nativePointer, float pixelsInPoint);
   static native void jni_YGConfigSetUseLegacyStretchBehaviourJNI(long nativePointer, boolean useLegacyStretchBehaviour);
-  static native void jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI(long nativePointer, boolean shouldDiffLayoutWithoutLegacyStretchBehaviour);
   static native void jni_YGConfigSetLoggerJNI(long nativePointer, YogaLogger logger);
 
   // YGNode related

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java

@@ -7,7 +7,7 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.yoga.annotations.DoNotStrip;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -19,7 +19,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   private static final byte MARGIN = 1;
   private static final byte PADDING = 2;
   private static final byte BORDER = 4;
-  private static final byte DOES_LEGACY_STRETCH_BEHAVIOUR = 8;
   private static final byte HAS_NEW_LAYOUT = 16;
 
   private static final byte LAYOUT_EDGE_SET_FLAG_INDEX = 0;
@@ -606,12 +605,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     return arr != null ? arr[LAYOUT_HEIGHT_INDEX] : 0;
   }
 
-  public boolean getDoesLegacyStretchFlagAffectsLayout() {
-    return arr != null
-        && (((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & DOES_LEGACY_STRETCH_BEHAVIOUR)
-            == DOES_LEGACY_STRETCH_BEHAVIOUR);
-  }
-
   @Override
   public float getLayoutMargin(YogaEdge edge) {
     if (arr != null && ((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & MARGIN) == MARGIN) {

package/ReactAndroid/src/main/java/com/facebook/yoga/annotations/DoNotStrip.java

@@ -0,0 +1,18 @@
+/*
+ * 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.yoga.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
+@Retention(CLASS)
+public @interface DoNotStrip { }