react-native 0.0.0-e6fc20ee6 → 0.0.0-e9440508e-20211011-2008

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

@@ -29,6 +29,8 @@ import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.config.ReactFeatureFlags;
@@ -39,26 +41,32 @@ import com.facebook.react.touch.ReactInterceptingViewGroup;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.PointerEvents;
+import com.facebook.react.uimanager.ReactClippingProhibitedView;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ReactPointerEventsView;
 import com.facebook.react.uimanager.ReactZIndexedViewGroup;
 import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper;
 import com.facebook.react.uimanager.ViewProps;
+import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.yoga.YogaConstants;
 
 /**
  * Backing for a React View. Has support for borders, but since borders aren't common, lazy
  * initializes most of the storage needed for them.
  */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class ReactViewGroup extends ViewGroup
     implements ReactInterceptingViewGroup,
         ReactClippingViewGroup,
         ReactPointerEventsView,
         ReactHitSlopView,
-        ReactZIndexedViewGroup {
+        ReactZIndexedViewGroup,
+        ReactOverflowView {
 
   private static final int ARRAY_CAPACITY_INCREMENT = 12;
   private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
@@ -118,7 +126,7 @@ public class ReactViewGroup extends ViewGroup
   private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
   private @Nullable OnInterceptTouchEventListener mOnInterceptTouchEventListener;
   private boolean mNeedsOffscreenAlphaCompositing = false;
-  private final ViewGroupDrawingOrderHelper mDrawingOrderHelper;
+  private @Nullable ViewGroupDrawingOrderHelper mDrawingOrderHelper = null;
   private @Nullable Path mPath;
   private int mLayoutDirection;
   private float mBackfaceOpacity = 1.f;
@@ -127,7 +135,13 @@ public class ReactViewGroup extends ViewGroup
   public ReactViewGroup(Context context) {
     super(context);
     setClipChildren(false);
-    mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this);
+  }
+
+  private ViewGroupDrawingOrderHelper getDrawingOrderHelper() {
+    if (mDrawingOrderHelper == null) {
+      mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this);
+    }
+    return mDrawingOrderHelper;
   }
 
   @Override
@@ -145,10 +159,8 @@ public class ReactViewGroup extends ViewGroup
 
   @Override
   public void onRtlPropertiesChanged(int layoutDirection) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      if (mReactBackgroundDrawable != null) {
-        mReactBackgroundDrawable.setResolvedLayoutDirection(mLayoutDirection);
-      }
+    if (mReactBackgroundDrawable != null) {
+      mReactBackgroundDrawable.setResolvedLayoutDirection(mLayoutDirection);
     }
   }
 
@@ -256,33 +268,11 @@ public class ReactViewGroup extends ViewGroup
   public void setBorderRadius(float borderRadius) {
     ReactViewBackgroundDrawable backgroundDrawable = getOrCreateReactViewBackground();
     backgroundDrawable.setRadius(borderRadius);
-
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      final int UPDATED_LAYER_TYPE =
-          backgroundDrawable.hasRoundedBorders()
-              ? View.LAYER_TYPE_SOFTWARE
-              : View.LAYER_TYPE_HARDWARE;
-
-      if (UPDATED_LAYER_TYPE != getLayerType()) {
-        setLayerType(UPDATED_LAYER_TYPE, null);
-      }
-    }
   }
 
   public void setBorderRadius(float borderRadius, int position) {
     ReactViewBackgroundDrawable backgroundDrawable = getOrCreateReactViewBackground();
     backgroundDrawable.setRadius(borderRadius, position);
-
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      final int UPDATED_LAYER_TYPE =
-          backgroundDrawable.hasRoundedBorders()
-              ? View.LAYER_TYPE_SOFTWARE
-              : View.LAYER_TYPE_HARDWARE;
-
-      if (UPDATED_LAYER_TYPE != getLayerType()) {
-        setLayerType(UPDATED_LAYER_TYPE, null);
-      }
-    }
   }
 
   public void setBorderStyle(@Nullable String style) {
@@ -434,9 +424,7 @@ public class ReactViewGroup extends ViewGroup
 
   @Override
   public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
-    return ReactFeatureFlags.clipChildRectsIfOverflowIsHidden
-        ? ReactClippingViewGroupHelper.getChildVisibleRectHelper(child, r, offset, this, mOverflow)
-        : super.getChildVisibleRect(child, r, offset);
+    return super.getChildVisibleRect(child, r, offset);
   }
 
   @Override
@@ -455,12 +443,24 @@ public class ReactViewGroup extends ViewGroup
     }
   }
 
+  private boolean customDrawOrderDisabled() {
+    if (getId() == NO_ID) {
+      return false;
+    }
+    return ViewUtil.getUIManagerType(getId()) == UIManagerType.FABRIC;
+  }
+
   @Override
   public void addView(View child, int index, ViewGroup.LayoutParams params) {
     // This will get called for every overload of addView so there is not need to override every
     // method.
-    mDrawingOrderHelper.handleAddView(child);
-    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+
+    if (!customDrawOrderDisabled()) {
+      getDrawingOrderHelper().handleAddView(child);
+      setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
+    } else {
+      setChildrenDrawingOrderEnabled(false);
+    }
 
     super.addView(child, index, params);
   }
@@ -469,8 +469,12 @@ public class ReactViewGroup extends ViewGroup
   public void removeView(View view) {
     UiThreadUtil.assertOnUiThread();
 
-    mDrawingOrderHelper.handleRemoveView(view);
-    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+    if (!customDrawOrderDisabled()) {
+      getDrawingOrderHelper().handleRemoveView(view);
+      setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
+    } else {
+      setChildrenDrawingOrderEnabled(false);
+    }
 
     super.removeView(view);
   }
@@ -479,30 +483,47 @@ public class ReactViewGroup extends ViewGroup
   public void removeViewAt(int index) {
     UiThreadUtil.assertOnUiThread();
 
-    mDrawingOrderHelper.handleRemoveView(getChildAt(index));
-    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+    if (!customDrawOrderDisabled()) {
+      getDrawingOrderHelper().handleRemoveView(getChildAt(index));
+      setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
+    } else {
+      setChildrenDrawingOrderEnabled(false);
+    }
 
     super.removeViewAt(index);
   }
 
   @Override
   protected int getChildDrawingOrder(int childCount, int index) {
-    return mDrawingOrderHelper.getChildDrawingOrder(childCount, index);
+    UiThreadUtil.assertOnUiThread();
+
+    if (!customDrawOrderDisabled()) {
+      return getDrawingOrderHelper().getChildDrawingOrder(childCount, index);
+    } else {
+      return index;
+    }
   }
 
   @Override
   public int getZIndexMappedChildIndex(int index) {
-    if (mDrawingOrderHelper.shouldEnableCustomDrawingOrder()) {
-      return mDrawingOrderHelper.getChildDrawingOrder(getChildCount(), index);
-    } else {
-      return index;
+    UiThreadUtil.assertOnUiThread();
+
+    if (!customDrawOrderDisabled() && getDrawingOrderHelper().shouldEnableCustomDrawingOrder()) {
+      return getDrawingOrderHelper().getChildDrawingOrder(getChildCount(), index);
     }
+
+    // Fabric behavior
+    return index;
   }
 
   @Override
   public void updateDrawingOrder() {
-    mDrawingOrderHelper.update();
-    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+    if (customDrawOrderDisabled()) {
+      return;
+    }
+
+    getDrawingOrderHelper().update();
+    setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
     invalidate();
   }
 
@@ -534,7 +555,7 @@ public class ReactViewGroup extends ViewGroup
   }
 
   /*package*/ void addViewWithSubviewClippingEnabled(
-      View child, int index, ViewGroup.LayoutParams params) {
+      final View child, int index, ViewGroup.LayoutParams params) {
     Assertions.assertCondition(mRemoveClippedSubviews);
     Assertions.assertNotNull(mClippingRect);
     Assertions.assertNotNull(mAllChildren);
@@ -549,6 +570,29 @@ public class ReactViewGroup extends ViewGroup
     }
     updateSubviewClipStatus(mClippingRect, index, clippedSoFar);
     child.addOnLayoutChangeListener(mChildrenLayoutChangeListener);
+
+    if (child instanceof ReactClippingProhibitedView) {
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              if (!child.isShown()) {
+                ReactSoftExceptionLogger.logSoftException(
+                    TAG,
+                    new ReactNoCrashSoftException(
+                        "Child view has been added to Parent view in which it is clipped and not visible."
+                            + " This is not legal for this particular child view. Child: ["
+                            + child.getId()
+                            + "] "
+                            + child.toString()
+                            + " Parent: ["
+                            + getId()
+                            + "] "
+                            + toString()));
+              }
+            }
+          });
+    }
   }
 
   /*package*/ void removeViewWithSubviewClippingEnabled(View view) {
@@ -656,13 +700,9 @@ public class ReactViewGroup extends ViewGroup
         updateBackgroundDrawable(layerDrawable);
       }
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-        mLayoutDirection =
-            I18nUtil.getInstance().isRTL(getContext())
-                ? LAYOUT_DIRECTION_RTL
-                : LAYOUT_DIRECTION_LTR;
-        mReactBackgroundDrawable.setResolvedLayoutDirection(mLayoutDirection);
-      }
+      mLayoutDirection =
+          I18nUtil.getInstance().isRTL(getContext()) ? LAYOUT_DIRECTION_RTL : LAYOUT_DIRECTION_LTR;
+      mReactBackgroundDrawable.setResolvedLayoutDirection(mLayoutDirection);
     }
     return mReactBackgroundDrawable;
   }
@@ -681,6 +721,7 @@ public class ReactViewGroup extends ViewGroup
     invalidate();
   }
 
+  @Override
   public @Nullable String getOverflow() {
     return mOverflow;
   }
@@ -701,9 +742,7 @@ public class ReactViewGroup extends ViewGroup
     try {
       dispatchOverflowDraw(canvas);
       super.dispatchDraw(canvas);
-    } catch (NullPointerException e) {
-      FLog.e(TAG, "NullPointerException when executing ViewGroup.dispatchDraw method", e);
-    } catch (StackOverflowError e) {
+    } catch (NullPointerException | StackOverflowError e) {
       // Adding special exception management for StackOverflowError for logging purposes.
       // This will be removed in the future.
       RootView rootView = RootViewUtil.getRootView(ReactViewGroup.this);
@@ -721,6 +760,23 @@ public class ReactViewGroup extends ViewGroup
     }
   }
 
+  @Override
+  protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
+    boolean drawWithZ =
+        child.getElevation() > 0 && ReactFeatureFlags.insertZReorderBarriersOnViewGroupChildren;
+
+    if (drawWithZ) {
+      CanvasUtil.enableZ(canvas, true);
+    }
+
+    boolean result = super.drawChild(canvas, child, drawingTime);
+
+    if (drawWithZ) {
+      CanvasUtil.enableZ(canvas, false);
+    }
+    return result;
+  }
+
   private void dispatchOverflowDraw(Canvas canvas) {
     if (mOverflow != null) {
       switch (mOverflow) {
@@ -730,6 +786,7 @@ public class ReactViewGroup extends ViewGroup
           }
           break;
         case ViewProps.HIDDEN:
+        case ViewProps.SCROLL:
           float left = 0f;
           float top = 0f;
           float right = getWidth();
@@ -764,76 +821,74 @@ public class ReactViewGroup extends ViewGroup
                 mReactBackgroundDrawable.getBorderRadiusOrDefaultTo(
                     borderRadius, ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_RIGHT);
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-              final boolean isRTL = mLayoutDirection == View.LAYOUT_DIRECTION_RTL;
-              float topStartBorderRadius =
-                  mReactBackgroundDrawable.getBorderRadius(
-                      ReactViewBackgroundDrawable.BorderRadiusLocation.TOP_START);
-              float topEndBorderRadius =
-                  mReactBackgroundDrawable.getBorderRadius(
-                      ReactViewBackgroundDrawable.BorderRadiusLocation.TOP_END);
-              float bottomStartBorderRadius =
-                  mReactBackgroundDrawable.getBorderRadius(
-                      ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_START);
-              float bottomEndBorderRadius =
-                  mReactBackgroundDrawable.getBorderRadius(
-                      ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_END);
-
-              if (I18nUtil.getInstance().doLeftAndRightSwapInRTL(getContext())) {
-                if (YogaConstants.isUndefined(topStartBorderRadius)) {
-                  topStartBorderRadius = topLeftBorderRadius;
-                }
-
-                if (YogaConstants.isUndefined(topEndBorderRadius)) {
-                  topEndBorderRadius = topRightBorderRadius;
-                }
-
-                if (YogaConstants.isUndefined(bottomStartBorderRadius)) {
-                  bottomStartBorderRadius = bottomLeftBorderRadius;
-                }
-
-                if (YogaConstants.isUndefined(bottomEndBorderRadius)) {
-                  bottomEndBorderRadius = bottomRightBorderRadius;
-                }
-
-                final float directionAwareTopLeftRadius =
-                    isRTL ? topEndBorderRadius : topStartBorderRadius;
-                final float directionAwareTopRightRadius =
-                    isRTL ? topStartBorderRadius : topEndBorderRadius;
-                final float directionAwareBottomLeftRadius =
-                    isRTL ? bottomEndBorderRadius : bottomStartBorderRadius;
-                final float directionAwareBottomRightRadius =
-                    isRTL ? bottomStartBorderRadius : bottomEndBorderRadius;
+            final boolean isRTL = mLayoutDirection == View.LAYOUT_DIRECTION_RTL;
+            float topStartBorderRadius =
+                mReactBackgroundDrawable.getBorderRadius(
+                    ReactViewBackgroundDrawable.BorderRadiusLocation.TOP_START);
+            float topEndBorderRadius =
+                mReactBackgroundDrawable.getBorderRadius(
+                    ReactViewBackgroundDrawable.BorderRadiusLocation.TOP_END);
+            float bottomStartBorderRadius =
+                mReactBackgroundDrawable.getBorderRadius(
+                    ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_START);
+            float bottomEndBorderRadius =
+                mReactBackgroundDrawable.getBorderRadius(
+                    ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_END);
+
+            if (I18nUtil.getInstance().doLeftAndRightSwapInRTL(getContext())) {
+              if (YogaConstants.isUndefined(topStartBorderRadius)) {
+                topStartBorderRadius = topLeftBorderRadius;
+              }
+
+              if (YogaConstants.isUndefined(topEndBorderRadius)) {
+                topEndBorderRadius = topRightBorderRadius;
+              }
+
+              if (YogaConstants.isUndefined(bottomStartBorderRadius)) {
+                bottomStartBorderRadius = bottomLeftBorderRadius;
+              }
+
+              if (YogaConstants.isUndefined(bottomEndBorderRadius)) {
+                bottomEndBorderRadius = bottomRightBorderRadius;
+              }
 
+              final float directionAwareTopLeftRadius =
+                  isRTL ? topEndBorderRadius : topStartBorderRadius;
+              final float directionAwareTopRightRadius =
+                  isRTL ? topStartBorderRadius : topEndBorderRadius;
+              final float directionAwareBottomLeftRadius =
+                  isRTL ? bottomEndBorderRadius : bottomStartBorderRadius;
+              final float directionAwareBottomRightRadius =
+                  isRTL ? bottomStartBorderRadius : bottomEndBorderRadius;
+
+              topLeftBorderRadius = directionAwareTopLeftRadius;
+              topRightBorderRadius = directionAwareTopRightRadius;
+              bottomLeftBorderRadius = directionAwareBottomLeftRadius;
+              bottomRightBorderRadius = directionAwareBottomRightRadius;
+            } else {
+              final float directionAwareTopLeftRadius =
+                  isRTL ? topEndBorderRadius : topStartBorderRadius;
+              final float directionAwareTopRightRadius =
+                  isRTL ? topStartBorderRadius : topEndBorderRadius;
+              final float directionAwareBottomLeftRadius =
+                  isRTL ? bottomEndBorderRadius : bottomStartBorderRadius;
+              final float directionAwareBottomRightRadius =
+                  isRTL ? bottomStartBorderRadius : bottomEndBorderRadius;
+
+              if (!YogaConstants.isUndefined(directionAwareTopLeftRadius)) {
                 topLeftBorderRadius = directionAwareTopLeftRadius;
+              }
+
+              if (!YogaConstants.isUndefined(directionAwareTopRightRadius)) {
                 topRightBorderRadius = directionAwareTopRightRadius;
+              }
+
+              if (!YogaConstants.isUndefined(directionAwareBottomLeftRadius)) {
                 bottomLeftBorderRadius = directionAwareBottomLeftRadius;
+              }
+
+              if (!YogaConstants.isUndefined(directionAwareBottomRightRadius)) {
                 bottomRightBorderRadius = directionAwareBottomRightRadius;
-              } else {
-                final float directionAwareTopLeftRadius =
-                    isRTL ? topEndBorderRadius : topStartBorderRadius;
-                final float directionAwareTopRightRadius =
-                    isRTL ? topStartBorderRadius : topEndBorderRadius;
-                final float directionAwareBottomLeftRadius =
-                    isRTL ? bottomEndBorderRadius : bottomStartBorderRadius;
-                final float directionAwareBottomRightRadius =
-                    isRTL ? bottomStartBorderRadius : bottomEndBorderRadius;
-
-                if (!YogaConstants.isUndefined(directionAwareTopLeftRadius)) {
-                  topLeftBorderRadius = directionAwareTopLeftRadius;
-                }
-
-                if (!YogaConstants.isUndefined(directionAwareTopRightRadius)) {
-                  topRightBorderRadius = directionAwareTopRightRadius;
-                }
-
-                if (!YogaConstants.isUndefined(directionAwareBottomLeftRadius)) {
-                  bottomLeftBorderRadius = directionAwareBottomLeftRadius;
-                }
-
-                if (!YogaConstants.isUndefined(directionAwareBottomRightRadius)) {
-                  bottomRightBorderRadius = directionAwareBottomRightRadius;
-                }
               }
             }
 

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

@@ -239,7 +239,9 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
               if (mEventDispatcher == null) {
                 return;
               }
-              mEventDispatcher.dispatchEvent(new ViewGroupClickEvent(view.getId()));
+              mEventDispatcher.dispatchEvent(
+                  new ViewGroupClickEvent(
+                      UIManagerHelper.getSurfaceId(view.getContext()), view.getId()));
             }
           });
 
@@ -335,10 +337,9 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
       throw new JSApplicationIllegalArgumentException(
           "Illegal number of arguments for 'updateHotspot' command");
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      float x = PixelUtil.toPixelFromDIP(args.getDouble(0));
-      float y = PixelUtil.toPixelFromDIP(args.getDouble(1));
-      root.drawableHotspotChanged(x, y);
-    }
+
+    float x = PixelUtil.toPixelFromDIP(args.getDouble(0));
+    float y = PixelUtil.toPixelFromDIP(args.getDouble(1));
+    root.drawableHotspotChanged(x, y);
   }
 }

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

@@ -7,16 +7,22 @@
 
 package com.facebook.react.views.view;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Represents a Click on the ReactViewGroup */
 public class ViewGroupClickEvent extends Event<ViewGroupClickEvent> {
   private static final String EVENT_NAME = "topClick";
 
+  @Deprecated
   public ViewGroupClickEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
+  }
+
+  public ViewGroupClickEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
@@ -29,8 +35,9 @@ public class ViewGroupClickEvent extends Event<ViewGroupClickEvent> {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), Arguments.createMap());
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }

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

@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 rn_android_library(
     name = "systrace",
     srcs = glob(["*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java

@@ -7,7 +7,6 @@
 
 package com.facebook.systrace;
 
-import android.os.Build;
 import android.os.Trace;
 
 /**
@@ -49,15 +48,11 @@ public class Systrace {
   public static void traceInstant(long tag, final String title, EventScope scope) {}
 
   public static void beginSection(long tag, final String sectionName) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      Trace.beginSection(sectionName);
-    }
+    Trace.beginSection(sectionName);
   }
 
   public static void endSection(long tag) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      Trace.endSection();
-    }
+    Trace.endSection();
   }
 
   public static void beginAsyncSection(long tag, final String sectionName, final int cookie) {}

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

@@ -9,7 +9,15 @@ package com.facebook.yoga;
 
 import javax.annotation.Nullable;
 
-public abstract class YogaNode {
+public abstract class YogaNode implements YogaProps {
+
+  /** The interface the {@link #getData()} object can optionally implement. */
+  public interface Inputs {
+
+    /** Requests the data object to disable mutations of its inputs. */
+    void freeze(final YogaNode node, final @Nullable YogaNode parent);
+  }
+
   public abstract void reset();
 
   public abstract int getChildCount();
@@ -25,12 +33,10 @@ public abstract class YogaNode {
   public abstract YogaNode removeChildAt(int i);
 
   /**
-   * @returns the {@link YogaNode} that owns this {@link YogaNode}.
-   * The owner is used to identify the YogaTree that a {@link YogaNode} belongs
-   * to.
-   * This method will return the parent of the {@link YogaNode} when the
-   * {@link YogaNode} only belongs to one YogaTree or null when the
-   * {@link YogaNode} is shared between two or more YogaTrees.
+   * @returns the {@link YogaNode} that owns this {@link YogaNode}. The owner is used to identify
+   *     the YogaTree that a {@link YogaNode} belongs to. This method will return the parent of the
+   *     {@link YogaNode} when the {@link YogaNode} only belongs to one YogaTree or null when the
+   *     {@link YogaNode} is shared between two or more YogaTrees.
    */
   @Nullable
   public abstract YogaNode getOwner();

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

@@ -83,6 +83,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   public void addChildAt(YogaNode c, int i) {
+    if (!(c instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNodeJNIBase child = (YogaNodeJNIBase) c;
     if (child.mOwner != null) {
       throw new IllegalStateException("Child already has a parent, it must be removed first.");
@@ -105,6 +108,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   public void swapChildAt(YogaNode newChild, int position) {
+    if (!(newChild instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNodeJNIBase child = (YogaNodeJNIBase) newChild;
     mChildren.remove(position);
     mChildren.add(position, child);
@@ -116,6 +122,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   public YogaNodeJNIBase cloneWithChildren() {
     try {
       YogaNodeJNIBase clonedYogaNode = (YogaNodeJNIBase) super.clone();
+      if (clonedYogaNode.mChildren != null) {
+        clonedYogaNode.mChildren = new ArrayList<>(clonedYogaNode.mChildren);
+      }
       long clonedNativePointer = YogaNative.jni_YGNodeCloneJNI(mNativePointer);
       clonedYogaNode.mOwner = null;
       clonedYogaNode.mNativePointer = clonedNativePointer;
@@ -188,12 +197,18 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     long[] nativePointers = null;
     YogaNodeJNIBase[] nodes = null;
 
+    freeze(null);
+
     ArrayList<YogaNodeJNIBase> n = new ArrayList<>();
     n.add(this);
     for (int i = 0; i < n.size(); ++i) {
-      List<YogaNodeJNIBase> children = n.get(i).mChildren;
+      final YogaNodeJNIBase parent = n.get(i);
+      List<YogaNodeJNIBase> children = parent.mChildren;
       if (children != null) {
-        n.addAll(children);
+        for (YogaNodeJNIBase child : children) {
+          child.freeze(parent);
+          n.add(child);
+        }
       }
     }
 
@@ -206,6 +221,13 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     YogaNative.jni_YGNodeCalculateLayoutJNI(mNativePointer, width, height, nativePointers, nodes);
   }
 
+  private void freeze(YogaNode parent) {
+    Object data = getData();
+    if (data instanceof Inputs) {
+      ((Inputs) data).freeze(this, parent);
+    }
+  }
+
   public void dirty() {
     YogaNative.jni_YGNodeMarkDirtyJNI(mNativePointer);
   }
@@ -220,6 +242,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
 
   @Override
   public void copyStyle(YogaNode srcNode) {
+    if (!(srcNode instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNative.jni_YGNodeCopyStyleJNI(mNativePointer, ((YogaNodeJNIBase) srcNode).mNativePointer);
   }