feat(android): move retreiving margin and padding insets to FabricUiManager

Author: paradowstack

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -21,6 +21,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Point;
+import android.graphics.RectF;
 import android.os.SystemClock;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -1335,13 +1336,23 @@ public Map<String, Long> getPerformanceCounters() {
   }
 
   @Nullable
-  public float[] getComputedMarginInsets(int surfaceId, int viewTag) {
-    return mBinding != null ? mBinding.getComputedMarginInsets(surfaceId, viewTag) : null;
+  private RectF computeInsetsToRectF(@Nullable float[] insets, int surfaceId, int viewTag) {
+    if (insets == null || surfaceId == View.NO_ID || viewTag == View.NO_ID) {
+      return null;
+    }
+    return new RectF(insets[0], insets[1], insets[2], insets[3]);
+  }
+
+  @Nullable
+  public RectF getComputedMarginInsets(int surfaceId, int viewTag) {
+    float[] insets = mBinding != null ? mBinding.getComputedMarginInsets(surfaceId, viewTag) : null;
+    return computeInsetsToRectF(insets, surfaceId, viewTag);
   }
 
   @Nullable
-  public float[] getComputedPaddingInsets(int surfaceId, int viewTag) {
-    return mBinding != null ? mBinding.getComputedPaddingInsets(surfaceId, viewTag) : null;
+  public RectF getComputedPaddingInsets(int surfaceId, int viewTag) {
+    float[] insets = mBinding != null ? mBinding.getComputedPaddingInsets(surfaceId, viewTag) : null;
+    return computeInsetsToRectF(insets, surfaceId, viewTag);
   }
 
   private class MountItemDispatchListener implements MountItemDispatcher.ItemDispatchListener {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt

@@ -54,6 +54,8 @@ import com.facebook.react.uimanager.style.GeometryBoxUtil.getGeometryBoxBounds
 import com.facebook.react.uimanager.style.LogicalEdge
 import com.facebook.react.uimanager.style.OutlineStyle
 import androidx.core.graphics.withSave
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.fabric.FabricUIManager
 
 /**
  * Utility object responsible for applying backgrounds, borders, and related visual effects to
@@ -494,8 +496,12 @@ public object BackgroundStyleApplicator {
 
     canvas.withSave {
       val composite = getCompositeBackgroundDrawable(view)
-      val computedMarginInsets = UIManagerHelper.getComputedMarginInsets(view)
-      val computedPaddingInsets = UIManagerHelper.getComputedPaddingInsets(view)
+      val uiManager =
+        UIManagerHelper.getUIManager(view.context as ReactContext, UIManagerType.FABRIC) as? FabricUIManager
+      val surfaceId = UIManagerHelper.getSurfaceId(view)
+      val viewId = view.id
+      val computedMarginInsets = uiManager?.getComputedMarginInsets(surfaceId, viewId)
+      val computedPaddingInsets = uiManager?.getComputedPaddingInsets(surfaceId, viewId)
       val computedBorderInsets =
         composite?.borderInsets?.resolve(composite.layoutDirection, view.context)
       val bounds = getGeometryBoxBounds(

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.kt

@@ -11,7 +11,6 @@ package com.facebook.react.uimanager
 
 import android.content.Context
 import android.content.ContextWrapper
-import android.graphics.RectF
 import android.view.View
 import android.widget.EditText
 import androidx.core.view.ViewCompat
@@ -248,35 +247,4 @@ public object UIManagerHelper {
     padding[PADDING_BOTTOM_INDEX] = PixelUtil.toDIPFromPixel(editText.paddingBottom.toFloat())
     return padding
   }
-
-  @JvmStatic
-  public fun getComputedMarginInsets(view: View): RectF? =
-    getComputedLayoutMetrics(view) { uiManager, surfaceId, viewTag ->
-      uiManager.getComputedMarginInsets(surfaceId, viewTag)
-    }
-
-  @JvmStatic
-  public fun getComputedPaddingInsets(view: View): RectF? =
-    getComputedLayoutMetrics(view) { uiManager, surfaceId, viewTag ->
-      uiManager.getComputedPaddingInsets(surfaceId, viewTag)
-    }
-
-  private inline fun getComputedLayoutMetrics(
-    view: View,
-    getter: (com.facebook.react.fabric.FabricUIManager, Int, Int) -> FloatArray?
-  ): RectF? {
-    val viewTag = view.id
-    if (viewTag == View.NO_ID || getUIManagerType(viewTag) != UIManagerType.FABRIC) {
-      return null
-    }
-
-    val context = view.context as? ThemedReactContext ?: return null
-    val surfaceId = getSurfaceId(context)
-    val uiManager = getUIManager(
-      context.reactApplicationContext,
-      UIManagerType.FABRIC
-    ) as? com.facebook.react.fabric.FabricUIManager ?: return null
-    val array = getter(uiManager, surfaceId, viewTag) ?: return null
-    return RectF(array[0], array[1], array[2], array[3])
-  }
 }