react-native-tvos 0.75.4-0 → 0.76.0-0

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/FilterHelper.kt

@@ -8,11 +8,16 @@
 package com.facebook.react.uimanager
 
 import android.annotation.TargetApi
+import android.graphics.BlendMode
+import android.graphics.BlendModeColorFilter
+import android.graphics.Color
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
 import android.graphics.RenderEffect
 import android.graphics.Shader
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.PixelUtil.dpToPx
 import kotlin.math.cos
 import kotlin.math.sin
 
@@ -26,19 +31,21 @@ internal object FilterHelper {
     for (i in 0 until filters.size()) {
       val filter = filters.getMap(i).entryIterator.next()
       val filterName = filter.key
-      val amount = (filter.value as Double).toFloat()
 
       chainedEffects =
           when (filterName) {
-            "brightness" -> createBrightnessEffect(amount, chainedEffects)
-            "contrast" -> createContrastEffect(amount, chainedEffects)
-            "grayscale" -> createGrayscaleEffect(amount, chainedEffects)
-            "sepia" -> createSepiaEffect(amount, chainedEffects)
-            "saturate" -> createSaturateEffect(amount, chainedEffects)
-            "hueRotate" -> createHueRotateEffect(amount, chainedEffects)
-            "invert" -> createInvertEffect(amount, chainedEffects)
-            "blur" -> createBlurEffect(amount, chainedEffects)
-            "opacity" -> createOpacityEffect(amount, chainedEffects)
+            "brightness" ->
+                createBrightnessEffect((filter.value as Double).toFloat(), chainedEffects)
+            "contrast" -> createContrastEffect((filter.value as Double).toFloat(), chainedEffects)
+            "grayscale" -> createGrayscaleEffect((filter.value as Double).toFloat(), chainedEffects)
+            "sepia" -> createSepiaEffect((filter.value as Double).toFloat(), chainedEffects)
+            "saturate" -> createSaturateEffect((filter.value as Double).toFloat(), chainedEffects)
+            "hueRotate" -> createHueRotateEffect((filter.value as Double).toFloat(), chainedEffects)
+            "invert" -> createInvertEffect((filter.value as Double).toFloat(), chainedEffects)
+            "blur" -> createBlurEffect((filter.value as Double).toFloat(), chainedEffects)
+            "opacity" -> createOpacityEffect((filter.value as Double).toFloat(), chainedEffects)
+            "dropShadow" ->
+                parseAndCreateDropShadowEffect(filter.value as ReadableMap, chainedEffects)
             else -> throw IllegalArgumentException("Invalid filter name: $filterName")
           }
     }
@@ -76,11 +83,14 @@ internal object FilterHelper {
 
   @JvmStatic
   public fun isOnlyColorMatrixFilters(filters: ReadableArray?): Boolean {
-    filters ?: return false
+    if (filters == null || filters.size() == 0) {
+      return false
+    }
+
     for (i in 0 until filters.size()) {
       val filter = filters.getMap(i).entryIterator.next()
       val filterName = filter.key
-      if (filterName == "blur") {
+      if (filterName == "blur" || filterName == "dropShadow") {
         return false
       }
     }
@@ -93,11 +103,7 @@ internal object FilterHelper {
       return null
     }
 
-    // Android takes blur amount as a radius while web takes a sigma. This value
-    // is used under the hood to convert between them on Android
-    // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/libs/hwui/jni/RenderEffect.cpp
-    val sigmaToRadiusRatio = 0.57_735f
-    val radius = (PixelUtil.toPixelFromDIP(sigma) - 0.5f) / sigmaToRadiusRatio
+    val radius: Float = sigmaToRadius(sigma)
     return if (chainedEffects == null) {
       RenderEffect.createBlurEffect(radius, radius, Shader.TileMode.DECAL)
     } else {
@@ -127,6 +133,64 @@ internal object FilterHelper {
     return createColorMatrixEffect(createOpacityColorMatrix(amount), chainedEffects)
   }
 
+  // https://www.w3.org/TR/filter-effects-1/#dropshadowEquivalent
+  public fun createDropShadowEffect(
+      offsetX: Float,
+      offsetY: Float,
+      blurRadius: Float,
+      color: Int,
+      chainedEffects: RenderEffect? = null
+  ): RenderEffect {
+    val identity: RenderEffect
+    val offsetEffect: RenderEffect
+
+    /*
+     * identity is set to an offset RenderEffect of 0 to keep track of the identity/original content.
+     * we then create offset effect for the first step of the shadow
+     */
+    if (chainedEffects == null) {
+      identity = RenderEffect.createOffsetEffect(0f, 0f)
+      offsetEffect = RenderEffect.createOffsetEffect(offsetX, offsetY)
+    } else {
+      identity = RenderEffect.createOffsetEffect(0f, 0f, chainedEffects)
+      offsetEffect = RenderEffect.createOffsetEffect(offsetX, offsetY, chainedEffects)
+    }
+
+    /*
+     * create color effect, blend with offset effect with SRC_IN and apply blur on top
+     * SRC_IN finds the alpha intersection of colorEffect and offset
+     * https://developer.android.com/reference/android/graphics/BlendMode#SRC_IN
+     */
+    val colorEffect: RenderEffect =
+        RenderEffect.createColorFilterEffect(
+            BlendModeColorFilter(color, BlendMode.SRC_IN), offsetEffect)
+    val blurEffect: RenderEffect =
+        RenderEffect.createBlurEffect(blurRadius, blurRadius, colorEffect, Shader.TileMode.DECAL)
+
+    /*
+     * at this point blurEffect contains all of drop-shadow's combined effects (offset, color & blur)
+     * we then blend it with identity/original content with SRC_OVER
+     * SRC_OVER layers blurEffect's alpha behind identity for the desired result
+     * https://developer.android.com/reference/android/graphics/BlendMode#SRC_OVER
+     */
+    return RenderEffect.createBlendModeEffect(blurEffect, identity, BlendMode.SRC_OVER)
+  }
+
+  public fun parseAndCreateDropShadowEffect(
+      filterValues: ReadableMap,
+      chainedEffects: RenderEffect? = null
+  ): RenderEffect {
+    val offsetX: Float = filterValues.getDouble("offsetX").dpToPx()
+    val offsetY: Float = filterValues.getDouble("offsetY").dpToPx()
+    val color: Int = if (filterValues.hasKey("color")) filterValues.getInt("color") else Color.BLACK
+    val radius: Float =
+        if (filterValues.hasKey("standardDeviation"))
+            sigmaToRadius(filterValues.getDouble("standardDeviation").toFloat())
+        else 0f
+
+    return createDropShadowEffect(offsetX, offsetY, radius, color, chainedEffects)
+  }
+
   public fun createOpacityColorMatrix(amount: Float): ColorMatrix {
     val matrix = ColorMatrix()
     matrix.setScale(1f, 1f, 1f, amount)
@@ -326,4 +390,12 @@ internal object FilterHelper {
       RenderEffect.createColorFilterEffect(ColorMatrixColorFilter(colorMatrix), chainedEffects)
     }
   }
+
+  internal fun sigmaToRadius(sigma: Float): Float {
+    // Android takes blur amount as a radius while web takes a sigma. This value
+    // is used under the hood to convert between them on Android
+    // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/libs/hwui/jni/RenderEffect.cpp
+    val sigmaToRadiusRatio = 0.57_735f
+    return (PixelUtil.toPixelFromDIP(sigma) - 0.5f) / sigmaToRadiusRatio
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/IViewGroupManager.kt

@@ -0,0 +1,35 @@
+/*
+ * 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
+
+import android.view.View
+import com.facebook.react.bridge.UiThreadUtil
+
+/** Interface providing children management API for view managers of classes extending ViewGroup. */
+public interface IViewGroupManager<T : View> : IViewManagerWithChildren {
+
+  /** Adds a child view into the parent at the index specified as a parameter */
+  public fun addView(parent: T, child: View, index: Int)
+
+  /** @return child of the parent view at the index specified as a parameter. */
+  public fun getChildAt(parent: T, index: Int): View?
+
+  /** Removes View from the parent View at the index specified as a parameter. */
+  public fun removeViewAt(parent: T, index: Int)
+
+  /** Remove all child views from the parent View. */
+  public fun removeAllViews(parent: T) {
+    UiThreadUtil.assertOnUiThread()
+    for (i in getChildCount(parent) - 1 downTo 0) {
+      removeViewAt(parent, i)
+    }
+  }
+
+  /** Return the amount of children contained by the view specified as a parameter. */
+  public fun getChildCount(parent: T): Int
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/{IViewManagerWithChildren.java → IViewManagerWithChildren.kt}

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager
 
-public interface IViewManagerWithChildren {
+public fun interface IViewManagerWithChildren {
   /**
    * Returns whether this View type needs to handle laying out its own children instead of deferring
    * to the standard css-layout algorithm. Returns true for the layout to *not* be automatically
@@ -16,5 +16,5 @@ public interface IViewManagerWithChildren {
    * of automatically laying out children without going through the ViewGroup's onLayout method. In
    * that case, onLayout for this View type must *not* call layout on its children.
    */
-  boolean needsCustomLayoutForChildren();
+  public fun needsCustomLayoutForChildren(): Boolean
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java

@@ -9,10 +9,15 @@ package com.facebook.react.uimanager;
 
 import android.view.MotionEvent;
 import android.view.ViewGroup;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.TouchEvent;
 import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper;
@@ -30,12 +35,14 @@ public class JSTouchDispatcher {
   private final float[] mTargetCoordinates = new float[2];
   private boolean mChildIsHandlingNativeGesture = false;
   private long mGestureStartTime = TouchEvent.UNSET;
-  private final ViewGroup mRootViewGroup;
+
+  private final ViewGroup mViewGroup;
+
   private final TouchEventCoalescingKeyHelper mTouchEventCoalescingKeyHelper =
       new TouchEventCoalescingKeyHelper();
 
   public JSTouchDispatcher(ViewGroup viewGroup) {
-    mRootViewGroup = viewGroup;
+    mViewGroup = viewGroup;
   }
 
   public void onChildStartedNativeGesture(
@@ -57,6 +64,10 @@ public class JSTouchDispatcher {
     mChildIsHandlingNativeGesture = false;
   }
 
+  public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
+    handleTouchEvent(ev, eventDispatcher, null);
+  }
+
   /**
    * Main catalyst view is responsible for collecting and sending touch events to JS. This method
    * reacts for an incoming android native touch events ({@link MotionEvent}) and calls into {@link
@@ -65,7 +76,8 @@ public class JSTouchDispatcher {
    * method for figuring out a react view ID in the case of ACTION_DOWN event (when the gesture
    * starts).
    */
-  public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
+  public void handleTouchEvent(
+      MotionEvent ev, EventDispatcher eventDispatcher, @Nullable ReactContext reactContext) {
     int action = ev.getAction() & MotionEvent.ACTION_MASK;
     if (action == MotionEvent.ACTION_DOWN) {
       if (mTargetTag != -1) {
@@ -78,11 +90,13 @@ public class JSTouchDispatcher {
       // this gesture
       mChildIsHandlingNativeGesture = false;
       mGestureStartTime = ev.getEventTime();
-
       mTargetTag = findTargetTagAndSetCoordinates(ev);
+      int surfaceId = UIManagerHelper.getSurfaceId(mViewGroup);
+      markActiveTouchForTag(surfaceId, mTargetTag, reactContext);
+
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
-              UIManagerHelper.getSurfaceId(mRootViewGroup),
+              UIManagerHelper.getSurfaceId(mViewGroup),
               mTargetTag,
               TouchEventType.START,
               ev,
@@ -105,9 +119,10 @@ public class JSTouchDispatcher {
       // End of the gesture. We reset target tag to -1 and expect no further event associated with
       // this gesture.
       findTargetTagAndSetCoordinates(ev);
+      int surfaceId = UIManagerHelper.getSurfaceId(mViewGroup);
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
-              UIManagerHelper.getSurfaceId(mRootViewGroup),
+              surfaceId,
               mTargetTag,
               TouchEventType.END,
               ev,
@@ -115,6 +130,7 @@ public class JSTouchDispatcher {
               mTargetCoordinates[0],
               mTargetCoordinates[1],
               mTouchEventCoalescingKeyHelper));
+      sweepActiveTouchForTag(surfaceId, mTargetTag, reactContext);
       mTargetTag = -1;
       mGestureStartTime = TouchEvent.UNSET;
     } else if (action == MotionEvent.ACTION_MOVE) {
@@ -122,7 +138,7 @@ public class JSTouchDispatcher {
       findTargetTagAndSetCoordinates(ev);
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
-              UIManagerHelper.getSurfaceId(mRootViewGroup),
+              UIManagerHelper.getSurfaceId(mViewGroup),
               mTargetTag,
               TouchEventType.MOVE,
               ev,
@@ -134,7 +150,7 @@ public class JSTouchDispatcher {
       // New pointer goes down, this can only happen after ACTION_DOWN is sent for the first pointer
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
-              UIManagerHelper.getSurfaceId(mRootViewGroup),
+              UIManagerHelper.getSurfaceId(mViewGroup),
               mTargetTag,
               TouchEventType.START,
               ev,
@@ -146,7 +162,7 @@ public class JSTouchDispatcher {
       // Exactly one of the pointers goes up
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
-              UIManagerHelper.getSurfaceId(mRootViewGroup),
+              UIManagerHelper.getSurfaceId(mViewGroup),
               mTargetTag,
               TouchEventType.END,
               ev,
@@ -162,6 +178,9 @@ public class JSTouchDispatcher {
             ReactConstants.TAG,
             "Received an ACTION_CANCEL touch event for which we have no corresponding ACTION_DOWN");
       }
+      int surfaceId = UIManagerHelper.getSurfaceId(mViewGroup);
+      sweepActiveTouchForTag(surfaceId, mTargetTag, reactContext);
+
       mTargetTag = -1;
       mGestureStartTime = TouchEvent.UNSET;
     } else {
@@ -171,10 +190,38 @@ public class JSTouchDispatcher {
     }
   }
 
+  private void markActiveTouchForTag(
+      int surfaceId, int reactTag, @Nullable ReactContext reactContext) {
+    if (!ReactNativeFeatureFlags.enableEventEmitterRetentionDuringGesturesOnAndroid()) {
+      return;
+    }
+    if (reactContext == null) {
+      return;
+    }
+    UIManager uiManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC);
+    if (uiManager != null) {
+      uiManager.markActiveTouchForTag(surfaceId, reactTag);
+    }
+  }
+
+  private void sweepActiveTouchForTag(
+      int surfaceId, int reactTag, @Nullable ReactContext reactContext) {
+    if (!ReactNativeFeatureFlags.enableEventEmitterRetentionDuringGesturesOnAndroid()) {
+      return;
+    }
+    if (reactContext == null) {
+      return;
+    }
+    UIManager uiManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC);
+    if (uiManager != null) {
+      uiManager.sweepActiveTouchForTag(surfaceId, reactTag);
+    }
+  }
+
   private int findTargetTagAndSetCoordinates(MotionEvent ev) {
     // This method updates `mTargetCoordinates` with coordinates for the motion event.
     return TouchTargetHelper.findTargetTagAndCoordinatesForTouch(
-        ev.getX(), ev.getY(), mRootViewGroup, mTargetCoordinates, null);
+        ev.getX(), ev.getY(), mViewGroup, mTargetCoordinates, null);
   }
 
   private void dispatchCancelEvent(MotionEvent androidEvent, EventDispatcher eventDispatcher) {
@@ -195,7 +242,7 @@ public class JSTouchDispatcher {
     Assertions.assertNotNull(eventDispatcher)
         .dispatchEvent(
             TouchEvent.obtain(
-                UIManagerHelper.getSurfaceId(mRootViewGroup),
+                UIManagerHelper.getSurfaceId(mViewGroup),
                 mTargetTag,
                 TouchEventType.CANCEL,
                 androidEvent,

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt

@@ -0,0 +1,29 @@
+/*
+ * 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
+
+import android.view.View
+import com.facebook.yoga.YogaDirection
+
+internal object LayoutDirectionUtil {
+  @JvmStatic
+  public fun toAndroidFromYoga(direction: YogaDirection): Int =
+      when (direction) {
+        YogaDirection.LTR -> View.LAYOUT_DIRECTION_LTR
+        YogaDirection.RTL -> View.LAYOUT_DIRECTION_RTL
+        else -> View.LAYOUT_DIRECTION_INHERIT
+      }
+
+  @JvmStatic
+  public fun toYogaFromAndroid(direction: Int): YogaDirection =
+      when (direction) {
+        View.LAYOUT_DIRECTION_LTR -> YogaDirection.LTR
+        View.LAYOUT_DIRECTION_RTL -> YogaDirection.RTL
+        else -> YogaDirection.INHERIT
+      }
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java

@@ -330,7 +330,7 @@ public class LayoutShadowNode extends ReactShadowNodeImpl {
     flexBasis.recycle();
   }
 
-  @ReactProp(name = ViewProps.ASPECT_RATIO, defaultFloat = YogaConstants.UNDEFINED)
+  @ReactProp(name = ViewProps.ASPECT_RATIO, defaultFloat = Float.NaN)
   public void setAspectRatio(float aspectRatio) {
     setStyleAspectRatio(aspectRatio);
   }
@@ -863,7 +863,7 @@ public class LayoutShadowNode extends ReactShadowNodeImpl {
         ViewProps.BORDER_LEFT_WIDTH,
         ViewProps.BORDER_RIGHT_WIDTH,
       },
-      defaultFloat = YogaConstants.UNDEFINED)
+      defaultFloat = Float.NaN)
   public void setBorderWidths(int index, float borderWidth) {
     if (isVirtual()) {
       return;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/LengthPercentage.kt

@@ -11,6 +11,7 @@ import com.facebook.common.logging.FLog
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.uimanager.style.CornerRadii
 import java.lang.NumberFormatException
 
 public enum class LengthPercentageType {
@@ -18,9 +19,9 @@ public enum class LengthPercentageType {
   PERCENT,
 }
 
-public class LengthPercentage(
+public data class LengthPercentage(
     private val value: Float,
-    public val unit: LengthPercentageType,
+    public val type: LengthPercentageType,
 ) {
   public companion object {
     @JvmStatic
@@ -29,7 +30,7 @@ public class LengthPercentage(
         ReadableType.Number -> {
           val value = dynamic.asDouble()
           if (value >= 0f) {
-            LengthPercentage(PixelUtil.toPixelFromDIP(value), LengthPercentageType.POINT)
+            LengthPercentage(value.toFloat(), LengthPercentageType.POINT)
           } else {
             null
           }
@@ -61,12 +62,12 @@ public class LengthPercentage(
     }
   }
 
-  public fun resolve(width: Float, height: Float): Float {
-    if (unit == LengthPercentageType.PERCENT) {
-      return (value / 100) * Math.min(width, height)
+  public fun resolve(width: Float, height: Float): CornerRadii {
+    if (type == LengthPercentageType.PERCENT) {
+      return CornerRadii((value / 100) * width, (value / 100) * height)
     }
 
-    return value
+    return CornerRadii(value, value)
   }
 
   public constructor() : this(0f, LengthPercentageType.POINT)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java

@@ -27,11 +27,13 @@ import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
+import com.facebook.yoga.YogaDirection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
@@ -77,7 +79,7 @@ public class NativeViewHierarchyManager {
   private final LayoutAnimationController mLayoutAnimator = new LayoutAnimationController();
   private final RectF mBoundingBox = new RectF();
 
-  private boolean mLayoutAnimationEnabled;
+  private volatile boolean mLayoutAnimationEnabled;
   private HashMap<Integer, Set<Integer>> mPendingDeletionsForTag;
 
   public NativeViewHierarchyManager(ViewManagerRegistry viewManagers) {
@@ -153,8 +155,17 @@ public class NativeViewHierarchyManager {
     viewManager.updateExtraData(viewToUpdate, extraData);
   }
 
+  /**
+   * @deprecated Please use {@link #updateLayout(int tag, int x, int y, int width, int height,
+   *     YogaDirection layoutDirection)} instead.
+   */
+  @Deprecated
+  public void updateLayout(int tag, int x, int y, int width, int height) {
+    updateLayout(tag, tag, x, y, width, height, YogaDirection.INHERIT);
+  }
+
   public synchronized void updateLayout(
-      int parentTag, int tag, int x, int y, int width, int height) {
+      int parentTag, int tag, int x, int y, int width, int height, YogaDirection layoutDirection) {
     if (DEBUG_MODE) {
       FLog.d(TAG, "updateLayout[%d]->[%d]: %d %d %d %d", tag, parentTag, x, y, width, height);
     }
@@ -167,6 +178,10 @@ public class NativeViewHierarchyManager {
     try {
       View viewToUpdate = resolveView(tag);
 
+      if (ReactNativeFeatureFlags.setAndroidLayoutDirection()) {
+        viewToUpdate.setLayoutDirection(LayoutDirectionUtil.toAndroidFromYoga(layoutDirection));
+      }
+
       // Even though we have exact dimensions, we still call measure because some platform views
       // (e.g.
       // Switch) assume that method will always be called before onLayout and onDraw. They use it to
@@ -231,7 +246,7 @@ public class NativeViewHierarchyManager {
   }
 
   @Nullable
-  public long getInstanceHandle(int reactTag) {
+  public synchronized long getInstanceHandle(int reactTag) {
     View view = mTagsToViews.get(reactTag);
     if (view == null) {
       throw new IllegalViewOperationException("Unable to find view for tag: " + reactTag);
@@ -799,15 +814,16 @@ public class NativeViewHierarchyManager {
     mJSResponderHandler.setJSResponder(initialReactTag, view.getParent());
   }
 
-  public void clearJSResponder() {
+  public synchronized void clearJSResponder() {
     mJSResponderHandler.clearJSResponder();
   }
 
-  void configureLayoutAnimation(final ReadableMap config, final Callback onAnimationComplete) {
+  synchronized void configureLayoutAnimation(
+      final ReadableMap config, final Callback onAnimationComplete) {
     mLayoutAnimator.initializeFromConfig(config, onAnimationComplete);
   }
 
-  void clearLayoutAnimation() {
+  synchronized void clearLayoutAnimation() {
     mLayoutAnimator.reset();
   }
 
@@ -870,7 +886,7 @@ public class NativeViewHierarchyManager {
     return (ThemedReactContext) view.getContext();
   }
 
-  public void sendAccessibilityEvent(int tag, int eventType) {
+  public synchronized void sendAccessibilityEvent(int tag, int eventType) {
     View view = mTagsToViews.get(tag);
     if (view == null) {
       throw new RetryableMountingLayerException("Could not find view with tag " + tag);

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java

@@ -206,7 +206,8 @@ public class NativeViewHierarchyOptimizer {
           node.getScreenX(),
           node.getScreenY(),
           node.getScreenWidth(),
-          node.getScreenHeight());
+          node.getScreenHeight(),
+          node.getLayoutDirection());
       return;
     }
 
@@ -370,7 +371,8 @@ public class NativeViewHierarchyOptimizer {
           x,
           y,
           toUpdate.getScreenWidth(),
-          toUpdate.getScreenHeight());
+          toUpdate.getScreenHeight(),
+          toUpdate.getLayoutDirection());
       return;
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt

@@ -15,6 +15,10 @@ public object PixelUtil {
   /** Convert from DIP to PX */
   @JvmStatic
   public fun toPixelFromDIP(value: Float): Float {
+    if (value.isNaN()) {
+      return Float.NaN
+    }
+
     return TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_DIP, value, DisplayMetricsHolder.getWindowDisplayMetrics())
   }
@@ -29,6 +33,10 @@ public object PixelUtil {
   @JvmOverloads
   @JvmStatic
   public fun toPixelFromSP(value: Float, maxFontScale: Float = Float.NaN): Float {
+    if (value.isNaN()) {
+      return Float.NaN
+    }
+
     val displayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics()
     val scaledValue = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, value, displayMetrics)
 
@@ -48,6 +56,10 @@ public object PixelUtil {
   /** Convert from PX to DP */
   @JvmStatic
   public fun toDIPFromPixel(value: Float): Float {
+    if (value.isNaN()) {
+      return Float.NaN
+    }
+
     return value / DisplayMetricsHolder.getWindowDisplayMetrics().density
   }
 
@@ -55,4 +67,13 @@ public object PixelUtil {
   @JvmStatic
   public fun getDisplayMetricDensity(): Float =
       DisplayMetricsHolder.getWindowDisplayMetrics().density
+
+  /* Kotlin extensions */
+  public fun Float.dpToPx(): Float = PixelUtil.toPixelFromDIP(this)
+
+  public fun Double.dpToPx(): Float = PixelUtil.toPixelFromDIP(this)
+
+  public fun Float.pxToDp(): Float = PixelUtil.toDIPFromPixel(this)
+
+  public fun Double.pxToDp(): Float = PixelUtil.toDIPFromPixel(this.toFloat())
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java

@@ -406,7 +406,8 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
               getScreenX(),
               getScreenY(),
               getScreenWidth(),
-              getScreenHeight());
+              getScreenHeight(),
+              getLayoutDirection());
         }
       }
     }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java

@@ -135,7 +135,7 @@ public class TouchTargetHelper {
         firstReactAncestor++;
       }
 
-      if (firstReactAncestor > 0) {
+      if (firstReactAncestor > 0 && firstReactAncestor <= pathAccumulator.size()) {
         // Drop non-React views from the path trace
         pathAccumulator = pathAccumulator.subList(firstReactAncestor, pathAccumulator.size());
       }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java

@@ -204,6 +204,20 @@ public class UIImplementation {
     dispatchViewUpdatesIfNeeded();
   }
 
+  public void updateInsetsPadding(int nodeViewTag, int top, int left, int bottom, int right) {
+    ReactShadowNode cssNode = mShadowNodeRegistry.getNode(nodeViewTag);
+    if (cssNode == null) {
+      FLog.w(ReactConstants.TAG, "Tried to update size of non-existent tag: " + nodeViewTag);
+      return;
+    }
+    cssNode.setPadding(Spacing.START, (float) left);
+    cssNode.setPadding(Spacing.TOP, (float) top);
+    cssNode.setPadding(Spacing.END, (float) right);
+    cssNode.setPadding(Spacing.BOTTOM, (float) bottom);
+
+    dispatchViewUpdatesIfNeeded();
+  }
+
   public void setViewLocalData(int tag, Object data) {
     ReactShadowNode shadowNode = mShadowNodeRegistry.getNode(tag);