react-native 0.68.2 → 0.69.0-rc.2

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/{RedBoxDialog.java → RedBoxContentView.java}

@@ -7,21 +7,20 @@
 
 package com.facebook.react.devsupport;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.text.SpannedString;
 import android.text.method.LinkMovementMethod;
-import android.view.KeyEvent;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -31,8 +30,10 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.devsupport.RedBoxHandler.ReportCompletedListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.ErrorType;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler.ReportCompletedListener;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -41,12 +42,10 @@ import okhttp3.RequestBody;
 import org.json.JSONObject;
 
 /** Dialog for displaying JS errors in an eye-catching form (red box). */
-/* package */ class RedBoxDialog extends Dialog implements AdapterView.OnItemClickListener {
-
-  private final DevSupportManager mDevSupportManager;
-  private final DoubleTapReloadRecognizer mDoubleTapReloadRecognizer;
-  private final @Nullable RedBoxHandler mRedBoxHandler;
+public class RedBoxContentView extends LinearLayout implements AdapterView.OnItemClickListener {
 
+  private @Nullable RedBoxHandler mRedBoxHandler;
+  private DevSupportManager mDevSupportManager;
   private ListView mStackView;
   private Button mReloadJsButton;
   private Button mDismissButton;
@@ -235,17 +234,22 @@ import org.json.JSONObject;
     }
   }
 
-  protected RedBoxDialog(
-      Context context, DevSupportManager devSupportManager, @Nullable RedBoxHandler redBoxHandler) {
-    super(context, R.style.Theme_Catalyst_RedBox);
-
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-    setContentView(R.layout.redbox_view);
+  public RedBoxContentView(Context context) {
+    super(context);
+  }
 
+  public RedBoxContentView setDevSupportManager(DevSupportManager devSupportManager) {
     mDevSupportManager = devSupportManager;
-    mDoubleTapReloadRecognizer = new DoubleTapReloadRecognizer();
+    return this;
+  }
+
+  public RedBoxContentView setRedBoxHandler(@Nullable RedBoxHandler redBoxHandler) {
     mRedBoxHandler = redBoxHandler;
+    return this;
+  }
+
+  public void init() {
+    LayoutInflater.from(getContext()).inflate(R.layout.redbox_view, this);
 
     mStackView = (ListView) findViewById(R.id.rn_redbox_stack);
     mStackView.setOnItemClickListener(this);
@@ -255,7 +259,7 @@ import org.json.JSONObject;
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
-            mDevSupportManager.handleReloadJS();
+            Assertions.assertNotNull(mDevSupportManager).handleReloadJS();
           }
         });
     mDismissButton = (Button) findViewById(R.id.rn_redbox_dismiss_button);
@@ -263,7 +267,7 @@ import org.json.JSONObject;
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
-            dismiss();
+            Assertions.assertNotNull(mDevSupportManager).hideRedboxDialog();
           }
         });
 
@@ -297,20 +301,25 @@ import org.json.JSONObject;
 
   @Override
   public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-    new OpenStackFrameTask(mDevSupportManager)
+    new OpenStackFrameTask(Assertions.assertNotNull(mDevSupportManager))
         .executeOnExecutor(
             AsyncTask.THREAD_POOL_EXECUTOR, (StackFrame) mStackView.getAdapter().getItem(position));
   }
 
-  @Override
-  public boolean onKeyUp(int keyCode, KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_MENU) {
-      mDevSupportManager.showDevOptionsDialog();
-      return true;
-    }
-    if (mDoubleTapReloadRecognizer.didDoubleTapR(keyCode, getCurrentFocus())) {
-      mDevSupportManager.handleReloadJS();
+  /** Refresh the content view with latest errors from dev support manager */
+  public void refreshContentView() {
+    @Nullable String message = mDevSupportManager.getLastErrorTitle();
+    @Nullable StackFrame[] stack = mDevSupportManager.getLastErrorStack();
+    @Nullable ErrorType errorType = mDevSupportManager.getLastErrorType();
+    Pair<String, StackFrame[]> errorInfo =
+        mDevSupportManager.processErrorCustomizers(Pair.create(message, stack));
+    setExceptionDetails(errorInfo.first, errorInfo.second);
+
+    // JS errors are reported here after source mapping.
+    RedBoxHandler redBoxHandler = mDevSupportManager.getRedBoxHandler();
+    if (redBoxHandler != null) {
+      redBoxHandler.handleRedbox(message, stack, errorType);
+      resetReporting();
     }
-    return super.onKeyUp(keyCode, event);
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.view.KeyEvent;
+import android.view.Window;
+import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.R;
+import com.facebook.react.common.ReactConstants;
+import com.facebook.react.common.SurfaceDelegate;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
+
+/**
+ * The implementation of SurfaceDelegate with {@link Activity}. This is the default SurfaceDelegate
+ * for Mobile.
+ */
+public class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
+
+  private final DoubleTapReloadRecognizer mDoubleTapReloadRecognizer;
+  private final DevSupportManager mDevSupportManager;
+
+  private @Nullable Dialog mDialog;
+  private @Nullable RedBoxContentView mRedBoxContentView;
+
+  public RedBoxDialogSurfaceDelegate(DevSupportManager devSupportManager) {
+    mDevSupportManager = devSupportManager;
+    mDoubleTapReloadRecognizer = new DoubleTapReloadRecognizer();
+  }
+
+  @Override
+  public void createContentView(String appKey) {
+    // The content view is created in android instead of using react app. Hence the appKey is not
+    // used here.
+    RedBoxHandler redBoxHandler = mDevSupportManager.getRedBoxHandler();
+    Activity context = mDevSupportManager.getCurrentActivity();
+    if (context == null || context.isFinishing()) {
+      @Nullable String message = mDevSupportManager.getLastErrorTitle();
+      FLog.e(
+          ReactConstants.TAG,
+          "Unable to launch redbox because react activity "
+              + "is not available, here is the error that redbox would've displayed: "
+              + (message != null ? message : "N/A"));
+      return;
+    }
+    // Create a new RedBox when currentActivity get updated
+    mRedBoxContentView = new RedBoxContentView(context);
+    mRedBoxContentView
+        .setDevSupportManager(mDevSupportManager)
+        .setRedBoxHandler(redBoxHandler)
+        .init();
+  }
+
+  @Override
+  public boolean isContentViewReady() {
+    return mRedBoxContentView != null;
+  }
+
+  @Override
+  public void destroyContentView() {
+    mRedBoxContentView = null;
+  }
+
+  @Override
+  public void show() {
+    @Nullable String message = mDevSupportManager.getLastErrorTitle();
+    Activity context = mDevSupportManager.getCurrentActivity();
+    if (context == null || context.isFinishing()) {
+      FLog.e(
+          ReactConstants.TAG,
+          "Unable to launch redbox because react activity "
+              + "is not available, here is the error that redbox would've displayed: "
+              + (message != null ? message : "N/A"));
+      return;
+    }
+
+    if (mRedBoxContentView == null || mRedBoxContentView.getContext() != context) {
+      // Create a new RedBox when currentActivity get updated
+      createContentView("RedBox");
+    }
+
+    mRedBoxContentView.refreshContentView();
+    if (mDialog == null) {
+      mDialog =
+          new Dialog(context, R.style.Theme_Catalyst_RedBox) {
+            @Override
+            public boolean onKeyUp(int keyCode, KeyEvent event) {
+              if (keyCode == KeyEvent.KEYCODE_MENU) {
+                mDevSupportManager.showDevOptionsDialog();
+                return true;
+              }
+              if (mDoubleTapReloadRecognizer.didDoubleTapR(keyCode, getCurrentFocus())) {
+                mDevSupportManager.handleReloadJS();
+              }
+              return super.onKeyUp(keyCode, event);
+            }
+          };
+      mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+      mDialog.setContentView(mRedBoxContentView);
+    }
+    mDialog.show();
+  }
+
+  @Override
+  public void hide() {
+    // dismiss redbox if exists
+    if (mDialog != null) {
+      mDialog.dismiss();
+      destroyContentView();
+      mDialog = null;
+    }
+  }
+
+  @Override
+  public boolean isShowing() {
+    return mDialog != null && mDialog.isShowing();
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java

@@ -8,6 +8,7 @@
 package com.facebook.react.devsupport.interfaces;
 
 import android.app.Activity;
+import android.util.Pair;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
@@ -51,6 +52,8 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
 
   DeveloperSettings getDevSettings();
 
+  RedBoxHandler getRedBoxHandler();
+
   void onNewReactContextCreated(ReactContext reactContext);
 
   void onReactInstanceDestroyed(ReactContext reactContext);
@@ -97,8 +100,12 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
   @Nullable
   ErrorType getLastErrorType();
 
+  int getLastErrorCookie();
+
   void registerErrorCustomizer(ErrorCustomizer errorCustomizer);
 
+  Pair<String, StackFrame[]> processErrorCustomizers(Pair<String, StackFrame[]> errorInfo);
+
   /**
    * The PackagerLocationCustomizer allows you to have a dynamic packager location that is
    * determined right before loading the packager. Your customizer must call |callback|, as loading

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/{RedBoxHandler.java → interfaces/RedBoxHandler.java}

@@ -5,13 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.devsupport;
+package com.facebook.react.devsupport.interfaces;
 
 import android.content.Context;
 import android.text.SpannedString;
 import androidx.annotation.Nullable;
-import com.facebook.react.devsupport.interfaces.ErrorType;
-import com.facebook.react.devsupport.interfaces.StackFrame;
 
 /**
  * Interface used by {@link BridgeDevSupportManager} to allow interception on any redboxes during

package/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK

@@ -1,4 +1,7 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_android_toplevel_dep", "react_native_dep", "react_native_target", "rn_android_library")
+
+# TODO(T115916830): Remove when Kotlin files are used in this module
+KOTLIN_STDLIB_DEPS = [react_native_android_toplevel_dep("third-party/kotlin:kotlin-stdlib")] if IS_OSS_BUILD else []
 
 rn_android_library(
     name = "fabric",
@@ -10,7 +13,11 @@ rn_android_library(
     ]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    language = "KOTLIN",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
@@ -18,6 +25,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
+    pure_kotlin = False,
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
@@ -42,7 +50,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/view:view"),
         react_native_target("java/com/facebook/react/views/text:text"),
         react_native_target("java/com/facebook/react/touch:touch"),
-    ],
-    exported_deps = [
-    ],
+    ] + KOTLIN_STDLIB_DEPS,
 )

package/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java

@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.fabric;
+
+import static com.facebook.react.bridge.ReactMarkerConstants.*;
+
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener {
+
+  private final Map<Integer, FabricCommitPoint> mFabricCommitMarkers = new HashMap<>();
+  private final List<DevToolsReactPerfLoggerListener> mDevToolsReactPerfLoggerListeners =
+      new ArrayList<>();
+
+  public interface DevToolsReactPerfLoggerListener {
+
+    void onFabricCommitEnd(FabricCommitPoint commitPoint);
+  }
+
+  public static class FabricCommitPoint {
+    private final long mCommitNumber;
+    private final Map<ReactMarkerConstants, Long> mPoints = new HashMap<>();
+
+    private FabricCommitPoint(int commitNumber) {
+      this.mCommitNumber = commitNumber;
+    }
+
+    private void addPoint(ReactMarkerConstants key, long time) {
+      mPoints.put(key, time);
+    }
+
+    private long getValue(ReactMarkerConstants marker) {
+      Long value = mPoints.get(marker);
+      return value != null ? value : -1;
+    }
+
+    public long getCommitNumber() {
+      return mCommitNumber;
+    }
+
+    public long getCommitStart() {
+      return getValue(FABRIC_COMMIT_START);
+    }
+
+    public long getCommitEnd() {
+      return getValue(FABRIC_COMMIT_END);
+    }
+
+    public long getFinishTransactionStart() {
+      return getValue(FABRIC_FINISH_TRANSACTION_START);
+    }
+
+    public long getFinishTransactionEnd() {
+      return getValue(FABRIC_FINISH_TRANSACTION_END);
+    }
+
+    public long getDiffStart() {
+      return getValue(FABRIC_DIFF_START);
+    }
+
+    public long getDiffEnd() {
+      return getValue(FABRIC_DIFF_END);
+    }
+
+    public long getLayoutStart() {
+      return getValue(FABRIC_LAYOUT_START);
+    }
+
+    public long getLayoutEnd() {
+      return getValue(FABRIC_LAYOUT_END);
+    }
+
+    public long getBatchExecutionStart() {
+      return getValue(FABRIC_BATCH_EXECUTION_START);
+    }
+
+    public long getBatchExecutionEnd() {
+      return getValue(FABRIC_BATCH_EXECUTION_END);
+    }
+
+    public long getUpdateUIMainThreadStart() {
+      return getValue(FABRIC_UPDATE_UI_MAIN_THREAD_START);
+    }
+
+    public long getUpdateUIMainThreadEnd() {
+      return getValue(FABRIC_UPDATE_UI_MAIN_THREAD_END);
+    }
+  }
+
+  public void addDevToolsReactPerfLoggerListener(DevToolsReactPerfLoggerListener listener) {
+    mDevToolsReactPerfLoggerListeners.add(listener);
+  }
+
+  public void removeDevToolsReactPerfLoggerListener(DevToolsReactPerfLoggerListener listener) {
+    mDevToolsReactPerfLoggerListeners.remove(listener);
+  }
+
+  @Override
+  public void logFabricMarker(
+      ReactMarkerConstants name, @Nullable String tag, int instanceKey, long timestamp) {
+
+    if (isFabricCommitMarker(name)) {
+      FabricCommitPoint commitPoint = mFabricCommitMarkers.get(instanceKey);
+      if (commitPoint == null) {
+        commitPoint = new FabricCommitPoint(instanceKey);
+        mFabricCommitMarkers.put(instanceKey, commitPoint);
+      }
+      commitPoint.addPoint(name, timestamp);
+
+      if (name == ReactMarkerConstants.FABRIC_BATCH_EXECUTION_END) {
+        onFabricCommitEnd(commitPoint);
+        mFabricCommitMarkers.remove(instanceKey);
+      }
+    }
+  }
+
+  private void onFabricCommitEnd(FabricCommitPoint commitPoint) {
+    for (DevToolsReactPerfLoggerListener listener : mDevToolsReactPerfLoggerListeners) {
+      listener.onFabricCommitEnd(commitPoint);
+    }
+  }
+
+  private static boolean isFabricCommitMarker(ReactMarkerConstants name) {
+    return name == FABRIC_COMMIT_START
+        || name == FABRIC_COMMIT_END
+        || name == FABRIC_FINISH_TRANSACTION_START
+        || name == FABRIC_FINISH_TRANSACTION_END
+        || name == FABRIC_DIFF_START
+        || name == FABRIC_DIFF_END
+        || name == FABRIC_LAYOUT_START
+        || name == FABRIC_LAYOUT_END
+        || name == FABRIC_BATCH_EXECUTION_START
+        || name == FABRIC_BATCH_EXECUTION_END
+        || name == FABRIC_UPDATE_UI_MAIN_THREAD_START
+        || name == FABRIC_UPDATE_UI_MAIN_THREAD_END;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/fabric/EmptyReactNativeConfig.java

@@ -19,7 +19,7 @@ public class EmptyReactNativeConfig implements ReactNativeConfig {
   }
 
   @Override
-  public int getInt64(final String s) {
+  public long getInt64(final String s) {
     return 0;
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java

@@ -11,7 +11,7 @@ import androidx.annotation.NonNull;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
-import com.facebook.react.common.mapbuffer.ReadableMapBufferSoLoader;
+import com.facebook.react.common.mapbuffer.MapBufferSoLoader;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
@@ -46,7 +46,7 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
     final Binding binding = new Binding();
 
     if (ReactFeatureFlags.isMapBufferSerializationEnabled()) {
-      ReadableMapBufferSoLoader.staticInit();
+      MapBufferSoLoader.staticInit();
     }
 
     binding.register(

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -105,6 +105,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       ReactFeatureFlags.enableFabricLogs
           || PrinterHolder.getPrinter()
               .shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_UI_MANAGER);
+  public DevToolsReactPerfLogger mDevToolsReactPerfLogger;
 
   static {
     FabricSoLoader.staticInit();
@@ -364,6 +365,34 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   public void initialize() {
     mEventDispatcher.registerEventEmitter(FABRIC, new FabricEventEmitter(this));
     mEventDispatcher.addBatchEventDispatchedListener(mEventBeatManager);
+    if (ENABLE_FABRIC_LOGS) {
+      mDevToolsReactPerfLogger = new DevToolsReactPerfLogger();
+      mDevToolsReactPerfLogger.addDevToolsReactPerfLoggerListener(
+          new DevToolsReactPerfLogger.DevToolsReactPerfLoggerListener() {
+            @Override
+            public void onFabricCommitEnd(DevToolsReactPerfLogger.FabricCommitPoint commitPoint) {
+              FLog.i(
+                  TAG,
+                  "Statistic of Fabric commit #: "
+                      + commitPoint.getCommitNumber()
+                      + "\n - Total commit time: "
+                      + (commitPoint.getFinishTransactionEnd() - commitPoint.getCommitStart())
+                      + " ms.\n - Layout: "
+                      + (commitPoint.getLayoutEnd() - commitPoint.getLayoutStart())
+                      + " ms.\n - Diffing: "
+                      + (commitPoint.getDiffEnd() - commitPoint.getDiffStart())
+                      + " ms.\n"
+                      + " - FinishTransaction (Diffing + JNI serialization): "
+                      + (commitPoint.getFinishTransactionEnd()
+                          - commitPoint.getFinishTransactionStart())
+                      + " ms.\n"
+                      + " - Mounting: "
+                      + (commitPoint.getBatchExecutionEnd() - commitPoint.getBatchExecutionStart())
+                      + " ms.");
+            }
+          });
+      ReactMarker.addFabricListener(mDevToolsReactPerfLogger);
+    }
   }
 
   // This is called on the JS thread (see CatalystInstanceImpl).
@@ -373,6 +402,10 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   public void onCatalystInstanceDestroy() {
     FLog.i(TAG, "FabricUIManager.onCatalystInstanceDestroy");
 
+    if (mDevToolsReactPerfLogger != null) {
+      ReactMarker.removeFabricListener(mDevToolsReactPerfLogger);
+    }
+
     if (mDestroyed) {
       ReactSoftExceptionLogger.logSoftException(
           FabricUIManager.TAG, new IllegalStateException("Cannot double-destroy FabricUIManager"));
@@ -395,17 +428,12 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     mReactApplicationContext.removeLifecycleEventListener(this);
     onHostPause();
 
-    // This is not technically thread-safe, since it's read on the UI thread and written
-    // here on the JS thread. We've marked it as volatile so that this writes to UI-thread
-    // memory immediately.
-    mDispatchUIFrameCallback.stop();
-
     mBinding.unregister();
     mBinding = null;
 
     ViewManagerPropertyUpdater.clear();
 
-    // When using ReactFeatureFlags.enableExperimentalStaticViewConfigs enabled, FabriUIManager is
+    // When using StaticViewConfigs is enabled, FabriUIManager is
     // responsible for initializing and deallocating EventDispatcher.
     // TODO T83943316: Remove this IF once StaticViewConfigs are enabled by default
     if (mShouldDeallocateEventDispatcher) {
@@ -512,8 +540,9 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   private long measureMapBuffer(
       int surfaceId,
       String componentName,
-      ReadableMapBuffer attributedString,
-      ReadableMapBuffer paragraphAttributes,
+      ReadableMapBuffer localData,
+      ReadableMapBuffer props,
+      @Nullable ReadableMapBuffer state,
       float minWidth,
       float maxWidth,
       float minHeight,
@@ -533,11 +562,12 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     }
 
     // TODO: replace ReadableNativeMap -> ReadableMapBuffer
-    return mMountingManager.measureTextMapBuffer(
+    return mMountingManager.measureMapBuffer(
         context,
         componentName,
-        attributedString,
-        paragraphAttributes,
+        localData,
+        props,
+        state,
         getYogaSize(minWidth, maxWidth),
         getYogaMeasureMode(minWidth, maxWidth),
         getYogaSize(minHeight, maxHeight),
@@ -671,7 +701,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       int rootTag,
       int reactTag,
       final String componentName,
-      @Nullable ReadableMap props,
+      @Nullable Object props,
       @Nullable Object stateWrapper,
       @Nullable Object eventEmitterWrapper,
       boolean isLayoutable) {
@@ -767,23 +797,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       ReactMarker.logFabricMarker(
           ReactMarkerConstants.FABRIC_LAYOUT_END, null, commitNumber, layoutEndTime);
       ReactMarker.logFabricMarker(ReactMarkerConstants.FABRIC_COMMIT_END, null, commitNumber);
-
-      if (ENABLE_FABRIC_LOGS) {
-        FLog.i(
-            TAG,
-            "Statistic of Fabric commit #: "
-                + commitNumber
-                + "\n - Total commit time: "
-                + (finishTransactionEndTime - commitStartTime)
-                + " ms.\n - Layout: "
-                + mLayoutTime
-                + " ms.\n - Diffing: "
-                + (diffEndTime - diffStartTime)
-                + " ms.\n"
-                + " - FinishTransaction (Diffing + Processing + Serialization of MountingInstructions): "
-                + mFinishTransactionCPPTime
-                + " ms.");
-      }
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java

@@ -22,6 +22,9 @@ import com.facebook.proguard.annotations.DoNotStrip;
  */
 @DoNotStrip
 public interface ReactNativeConfig {
+
+  ReactNativeConfig DEFAULT_CONFIG = new EmptyReactNativeConfig();
+
   /**
    * Get a boolean param by string name. Default should be false.
    *
@@ -31,12 +34,12 @@ public interface ReactNativeConfig {
   boolean getBool(@NonNull String param);
 
   /**
-   * Get an integer param by string name. Default should be 0.
+   * Get a Long param by string name. Default should be 0.
    *
    * @param param The string name of the parameter being requested.
    */
   @DoNotStrip
-  int getInt64(@NonNull String param);
+  long getInt64(@NonNull String param);
 
   /**
    * Get a string param by string name. Default should be "", empty string.