diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java index bdab2af5a..bd2a33555 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java @@ -806,7 +806,9 @@ public class UIManagerModule extends ReactContextBaseJavaModule * @return the rootTag */ public int resolveRootTagFromReactTag(int reactTag) { - return mUIImplementation.resolveRootTagFromReactTag(reactTag); + return ViewUtil.isRootTag(reactTag) + ? reactTag + : mUIImplementation.resolveRootTagFromReactTag(reactTag); } /** Dirties the node associated with the given react tag */ diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java index c84d265af..2333fccc1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java @@ -25,4 +25,13 @@ public class ViewUtil { return DEFAULT; } + /** + * @param reactTag {@link int} react tag + * @return if the react tag received by parameter is a RootTag or not. + */ + @Deprecated + public static boolean isRootTag(int reactTag) { + return reactTag % 10 == 1; + } + }