From 175943f15b200319aecd4e1d8a4c00463553c293 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 10 Aug 2024 00:01:24 -0700 Subject: [PATCH] Fix Fabric logging when ReactNativeFeatureFlags.setAndroidLayoutDirection is enabled (#45953) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/45953 Fabric logging was broken when ReactNativeFeatureFlags.setAndroidLayoutDirection is enabled, I'm fixing it here changelog: [internal] internal Reviewed By: NickGerleman, bvanderhoof Differential Revision: D61002408 fbshipit-source-id: bff76ce145d4619635a4b55a4750c3e51bb4d8d7 --- .../mountitems/IntBufferBatchMountItem.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java index 7551fd5b239..449acd8f9a3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java @@ -223,16 +223,18 @@ final class IntBufferBatchMountItem implements BatchMountItem { } else if (type == INSTRUCTION_UPDATE_LAYOUT) { int reactTag = mIntBuffer[i++]; int parentTag = mIntBuffer[i++]; + int x = mIntBuffer[i++]; + int y = mIntBuffer[i++]; + int w = mIntBuffer[i++]; + int h = mIntBuffer[i++]; + int displayType = mIntBuffer[i++]; + int layoutDirection = + ReactNativeFeatureFlags.setAndroidLayoutDirection() ? mIntBuffer[i++] : 0; s.append( String.format( - "UPDATE LAYOUT [%d]->[%d]: x:%d y:%d w:%d h:%d displayType:%d\n", - parentTag, - reactTag, - mIntBuffer[i++], - mIntBuffer[i++], - mIntBuffer[i++], - mIntBuffer[i++], - mIntBuffer[i++])); + "UPDATE LAYOUT [%d]->[%d]: x:%d y:%d w:%d h:%d displayType:%d layoutDirection:" + + " %d\n", + parentTag, reactTag, x, y, w, h, displayType, layoutDirection)); } else if (type == INSTRUCTION_UPDATE_PADDING) { s.append( String.format(