diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 100e3b8327d..a5d30309eff 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -429,31 +429,10 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { float maxWidth, float minHeight, float maxHeight) { + ReactContext context = + rootTag < 0 ? mReactApplicationContext : mReactContextForRootTag.get(rootTag); return mMountingManager.measure( - mReactContextForRootTag.get(rootTag), - componentName, - localData, - props, - state, - getYogaSize(minWidth, maxWidth), - getYogaMeasureMode(minWidth, maxWidth), - getYogaSize(minHeight, maxHeight), - getYogaMeasureMode(minHeight, maxHeight)); - } - - @DoNotStrip - @SuppressWarnings("unused") - private long measure( - String componentName, - @NonNull ReadableMap localData, - @NonNull ReadableMap props, - @NonNull ReadableMap state, - float minWidth, - float maxWidth, - float minHeight, - float maxHeight) { - return mMountingManager.measure( - mReactApplicationContext, + context, componentName, localData, props, diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp index c5d38147b62..93456a2a9bd 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp +++ b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp @@ -46,6 +46,7 @@ Size TextLayoutManager::doMeasure( static auto measure = jni::findClassStatic("com/facebook/react/fabric/FabricUIManager") ->getMethod(paragraphAttributesRNM.get())); return yogaMeassureToSize(measure( fabricUIManager, + -1, componentName.get(), attributedStringRM.get(), paragraphAttributesRM.get(),