[LOCAL] Fix further compilation error introduced by cherry-pick confl…

…icts
facebook · Aug 15, 2024 · 41b188b · 41b188b
1 parent a3187bb
commit 41b188b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/...react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -29,6 +29,8 @@
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
+import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.PointerEventHelper;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;

diff --git a/...s/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.kt b/...s/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.kt
@@ -7,6 +7,8 @@
 
 package com.facebook.react.uimanager.common
 
+import android.view.View
+
 public object ViewUtil {
 
   public const val NO_SURFACE_ID: Int = -1
@@ -26,6 +28,12 @@ public object ViewUtil {
         UIManagerType.DEFAULT
       }
 
+  /**
+   * Overload for {@link #getUIManagerType(int)} that uses the view's id to determine if it
+   * originated from Fabric
+   */
+  @JvmStatic @UIManagerType public fun getUIManagerType(view: View): Int = getUIManagerType(view.id)
+
   /**
    * Version of getUIManagerType that uses both surfaceId and viewTag heuristics
    *