Skip to content

Commit 41b188b

Browse files
committed
[LOCAL] Fix further compilation error introduced by cherry-pick conflicts
1 parent a3187bb commit 41b188b

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import com.facebook.react.common.ReactConstants;
3030
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
3131
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
32+
import com.facebook.react.uimanager.common.UIManagerType;
33+
import com.facebook.react.uimanager.common.ViewUtil;
3234
import com.facebook.react.uimanager.annotations.ReactProp;
3335
import com.facebook.react.uimanager.events.PointerEventHelper;
3436
import com.facebook.react.uimanager.util.ReactFindViewUtil;

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
package com.facebook.react.uimanager.common
99

10+
import android.view.View
11+
1012
public object ViewUtil {
1113

1214
public const val NO_SURFACE_ID: Int = -1
@@ -26,6 +28,12 @@ public object ViewUtil {
2628
UIManagerType.DEFAULT
2729
}
2830

31+
/**
32+
* Overload for {@link #getUIManagerType(int)} that uses the view's id to determine if it
33+
* originated from Fabric
34+
*/
35+
@JvmStatic @UIManagerType public fun getUIManagerType(view: View): Int = getUIManagerType(view.id)
36+
2937
/**
3038
* Version of getUIManagerType that uses both surfaceId and viewTag heuristics
3139
*

0 commit comments

Comments
 (0)