react-native-tvos 0.78.0-0rc4 → 0.79.0-0

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

@@ -0,0 +1,159 @@
+/*
+ * 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.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.View
+import android.view.Window
+import android.widget.FrameLayout
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.facebook.common.logging.FLog
+import com.facebook.react.R
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.common.ReactConstants
+import com.facebook.react.common.SurfaceDelegate
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+
+/**
+ * The implementation of SurfaceDelegate with [Activity]. This is the default [SurfaceDelegate] for
+ * Mobile.
+ */
+internal class RedBoxDialogSurfaceDelegate(private val devSupportManager: DevSupportManager) :
+    SurfaceDelegate {
+  private val doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
+
+  private var dialog: Dialog? = null
+  private var redBoxContentView: RedBoxContentView? = null
+
+  override fun createContentView(appKey: String) {
+    // The content view is created in android instead of using react app. Hence the appKey is not
+    // used here.
+    val redBoxHandler = devSupportManager.redBoxHandler
+    val context = devSupportManager.currentActivity
+    if (context == null || context.isFinishing) {
+      val message = devSupportManager.lastErrorTitle
+      FLog.e(
+          ReactConstants.TAG,
+          "Unable to launch redbox because react activity is not available, here is the error that redbox would've displayed: ${(message ?: "N/A")}")
+      return
+    }
+
+    // Create a new RedBox when currentActivity get updated
+    redBoxContentView =
+        RedBoxContentView(context, devSupportManager, redBoxHandler).also { it.init() }
+  }
+
+  override fun isContentViewReady(): Boolean = redBoxContentView != null
+
+  override fun destroyContentView() {
+    redBoxContentView = null
+  }
+
+  override fun show() {
+    val message: String? = devSupportManager.lastErrorTitle
+    val context: Activity? = devSupportManager.currentActivity
+    if (context == null || context.isFinishing) {
+      devSupportManager.currentReactContext?.let { reactContext ->
+        /**
+         * If the activity isn't available, try again after the next onHostResume(). onHostResume()
+         * is when the activity gets attached to the react native.
+         */
+        runAfterHostResume(reactContext) { this.show() }
+        return
+      }
+      FLog.e(
+          ReactConstants.TAG,
+          "Unable to launch redbox because react activity and react context is not available, here is the error that redbox would've displayed: ${message ?: "N/A"}")
+      return
+    }
+
+    if (redBoxContentView?.context !== context) {
+      // Create a new RedBox when currentActivity get updated
+      createContentView("RedBox")
+    }
+
+    redBoxContentView?.refreshContentView()
+    if (dialog == null) {
+      dialog =
+          object : Dialog(context, R.style.Theme_Catalyst_RedBox) {
+                override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+                  if (keyCode == KeyEvent.KEYCODE_MENU) {
+                    devSupportManager.showDevOptionsDialog()
+                    return true
+                  }
+                  if (doubleTapReloadRecognizer.didDoubleTapR(keyCode, currentFocus)) {
+                    devSupportManager.handleReloadJS()
+                  }
+                  return super.onKeyUp(keyCode, event)
+                }
+
+                override fun onCreate(savedInstanceState: Bundle?) {
+                  // set background color so it will show below transparent system bars on forced
+                  // edge-to-edge
+                  checkNotNull(window).setBackgroundDrawable(ColorDrawable(Color.BLACK))
+                  // register insets listener to update margins on the ReactRootView to avoid
+                  // overlap w/ system bars
+                  val insetsType: Int =
+                      WindowInsetsCompat.Type.systemBars() or
+                          WindowInsetsCompat.Type.displayCutout()
+
+                  ViewCompat.setOnApplyWindowInsetsListener(checkNotNull(redBoxContentView)) {
+                      view: View,
+                      windowInsetsCompat: WindowInsetsCompat ->
+                    val insets: Insets = windowInsetsCompat.getInsets(insetsType)
+                    val lp: FrameLayout.LayoutParams = view.layoutParams as FrameLayout.LayoutParams
+                    lp.setMargins(insets.left, insets.top, insets.right, insets.bottom)
+                    WindowInsetsCompat.CONSUMED
+                  }
+                }
+              }
+              .apply {
+                requestWindowFeature(Window.FEATURE_NO_TITLE)
+                setContentView(checkNotNull(redBoxContentView))
+              }
+    }
+    dialog?.show()
+  }
+
+  override fun hide() {
+    try {
+      // dismiss redbox if exists
+      dialog?.dismiss()
+    } catch (e: IllegalArgumentException) {
+      FLog.e(ReactConstants.TAG, "RedBoxDialogSurfaceDelegate: error while dismissing dialog: ", e)
+    }
+    destroyContentView()
+    dialog = null
+  }
+
+  override fun isShowing(): Boolean = dialog?.isShowing == true
+
+  companion object {
+    private fun runAfterHostResume(reactContext: ReactContext, runnable: Runnable) {
+      reactContext.addLifecycleEventListener(
+          object : LifecycleEventListener {
+            override fun onHostResume() {
+              runnable.run()
+              reactContext.removeLifecycleEventListener(this)
+            }
+
+            override fun onHostPause() = Unit
+
+            override fun onHostDestroy() = Unit
+          })
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt

@@ -36,130 +36,125 @@ public open class ReleaseDevSupportManager : DevSupportManager {
 
   private val defaultJSExceptionHandler: DefaultJSExceptionHandler = DefaultJSExceptionHandler()
 
-  override public fun showNewJavaError(message: String?, e: Throwable?): Unit = Unit
+  public override fun showNewJavaError(message: String?, e: Throwable?): Unit = Unit
 
-  override public fun addCustomDevOption(
+  public override fun addCustomDevOption(
       optionName: String?,
       optionHandler: DevOptionHandler?
   ): Unit = Unit
 
-  override public fun showNewJSError(
+  public override fun showNewJSError(
       message: String?,
       details: ReadableArray?,
       errorCookie: Int
   ): Unit = Unit
 
-  override public fun createRootView(appKey: String?): View? = null
+  public override fun createRootView(appKey: String?): View? = null
 
-  override public fun destroyRootView(rootView: View?): Unit = Unit
+  public override fun destroyRootView(rootView: View?): Unit = Unit
 
-  override public fun hideRedboxDialog(): Unit = Unit
+  public override fun hideRedboxDialog(): Unit = Unit
 
-  override public fun showDevOptionsDialog(): Unit = Unit
+  public override fun showDevOptionsDialog(): Unit = Unit
 
-  override public fun startInspector(): Unit = Unit
+  public override fun startInspector(): Unit = Unit
 
-  override public fun stopInspector(): Unit = Unit
+  public override fun stopInspector(): Unit = Unit
 
-  override public fun setHotModuleReplacementEnabled(isHotModuleReplacementEnabled: Boolean): Unit =
+  public override fun setHotModuleReplacementEnabled(isHotModuleReplacementEnabled: Boolean): Unit =
       Unit
 
-  override public fun setRemoteJSDebugEnabled(isRemoteJSDebugEnabled: Boolean): Unit = Unit
+  public override fun setFpsDebugEnabled(isFpsDebugEnabled: Boolean): Unit = Unit
 
-  override public fun setFpsDebugEnabled(isFpsDebugEnabled: Boolean): Unit = Unit
+  public override fun toggleElementInspector(): Unit = Unit
 
-  override public fun toggleElementInspector(): Unit = Unit
-
-  override public var devSupportEnabled: Boolean
+  public override var devSupportEnabled: Boolean
     get() = false
     @Suppress("UNUSED_PARAMETER") set(isDevSupportEnabled: Boolean): Unit = Unit
 
-  override public val devSettings: DeveloperSettings?
+  public override val devSettings: DeveloperSettings?
     get() = null
 
-  override public val redBoxHandler: RedBoxHandler?
+  public override val redBoxHandler: RedBoxHandler?
     get() = null
 
-  override public fun onNewReactContextCreated(reactContext: ReactContext): Unit = Unit
-
-  override public fun onReactInstanceDestroyed(reactContext: ReactContext): Unit = Unit
+  public override fun onNewReactContextCreated(reactContext: ReactContext): Unit = Unit
 
-  override public val sourceMapUrl: String?
-    get() = null
+  public override fun onReactInstanceDestroyed(reactContext: ReactContext): Unit = Unit
 
-  override public val sourceUrl: String?
+  public override val sourceMapUrl: String?
     get() = null
 
-  override public val jSBundleURLForRemoteDebugging: String?
+  public override val sourceUrl: String?
     get() = null
 
-  override public val downloadedJSBundleFile: String?
+  public override val downloadedJSBundleFile: String?
     get() = null
 
-  override public fun hasUpToDateJSBundleInCache(): Boolean = false
+  public override fun hasUpToDateJSBundleInCache(): Boolean = false
 
-  override public fun reloadSettings(): Unit = Unit
+  public override fun reloadSettings(): Unit = Unit
 
-  override public fun handleReloadJS(): Unit = Unit
+  public override fun handleReloadJS(): Unit = Unit
 
-  override public fun reloadJSFromServer(bundleURL: String, callback: BundleLoadCallback): Unit =
+  public override fun reloadJSFromServer(bundleURL: String, callback: BundleLoadCallback): Unit =
       Unit
 
-  override public fun loadSplitBundleFromServer(
+  public override fun loadSplitBundleFromServer(
       bundlePath: String,
       callback: DevSplitBundleCallback
   ): Unit = Unit
 
-  override public fun isPackagerRunning(callback: PackagerStatusCallback) {
+  public override fun isPackagerRunning(callback: PackagerStatusCallback) {
     callback.onPackagerStatusFetched(false)
   }
 
-  override public fun downloadBundleResourceFromUrlSync(
+  public override fun downloadBundleResourceFromUrlSync(
       resourceURL: String,
       outputFile: File?
   ): File? = null
 
-  override public val lastErrorTitle: String?
+  public override val lastErrorTitle: String?
     get() = null
 
-  override public val lastErrorStack: Array<StackFrame>?
+  public override val lastErrorStack: Array<StackFrame>?
     get() = null
 
-  override public val lastErrorType: ErrorType?
+  public override val lastErrorType: ErrorType?
     get() = null
 
-  override public val lastErrorCookie: Int = 0
+  public override val lastErrorCookie: Int = 0
 
-  override public fun registerErrorCustomizer(errorCustomizer: ErrorCustomizer?): Unit = Unit
+  public override fun registerErrorCustomizer(errorCustomizer: ErrorCustomizer?): Unit = Unit
 
-  override public fun processErrorCustomizers(
+  public override fun processErrorCustomizers(
       errorInfo: Pair<String, Array<StackFrame>>?
   ): Pair<String, Array<StackFrame>>? = errorInfo
 
-  override public fun setPackagerLocationCustomizer(
+  public override fun setPackagerLocationCustomizer(
       packagerLocationCustomizer: PackagerLocationCustomizer?
   ): Unit = Unit
 
-  override public fun handleException(e: Exception) {
+  public override fun handleException(e: Exception) {
     defaultJSExceptionHandler.handleException(e)
   }
 
-  override public val currentActivity: Activity?
+  public override val currentActivity: Activity?
     get() = null
 
-  override public val currentReactContext: ReactContext?
+  public override val currentReactContext: ReactContext?
     get() = null
 
-  override public fun createSurfaceDelegate(moduleName: String?): SurfaceDelegate? = null
+  public override fun createSurfaceDelegate(moduleName: String?): SurfaceDelegate? = null
 
-  override public fun openDebugger(): Unit = Unit
+  public override fun openDebugger(): Unit = Unit
 
-  override public fun showPausedInDebuggerOverlay(
+  public override fun showPausedInDebuggerOverlay(
       message: String,
       listener: PausedInDebuggerOverlayCommandListener
   ): Unit = Unit
 
-  override public fun hidePausedInDebuggerOverlay(): Unit = Unit
+  public override fun hidePausedInDebuggerOverlay(): Unit = Unit
 
-  override public fun setAdditionalOptionForPackager(name: String, value: String): Unit = Unit
+  public override fun setAdditionalOptionForPackager(name: String, value: String): Unit = Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt

@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+@file:Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+
+package com.facebook.react.devsupport.inspector
+
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+internal object InspectorNetworkHelper {
+  private lateinit var client: OkHttpClient
+
+  @JvmStatic
+  fun loadNetworkResource(url: String, listener: InspectorNetworkRequestListener) {
+    if (!::client.isInitialized) {
+      client =
+          OkHttpClient.Builder()
+              .connectTimeout(10, TimeUnit.SECONDS)
+              .writeTimeout(10, TimeUnit.SECONDS)
+              .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
+              .build()
+    }
+
+    val request =
+        try {
+          Request.Builder().url(url).build()
+        } catch (e: IllegalArgumentException) {
+          listener.onError("Not a valid URL: $url")
+          return
+        }
+
+    // TODO(T196951523): Assign cancel function to listener
+    val call = client.newCall(request)
+
+    call.enqueue(
+        object : Callback {
+          override fun onFailure(call: Call, e: IOException) {
+            if (call.isCanceled()) {
+              return
+            }
+
+            listener.onError(e.message)
+          }
+
+          override fun onResponse(call: Call, response: Response) {
+            val headers = response.headers()
+            val headersMap = HashMap<String?, String?>()
+
+            for (name in headers.names()) {
+              headersMap[name] = headers[name]
+            }
+
+            listener.onHeaders(response.code(), headersMap)
+
+            try {
+              response.body().use { responseBody ->
+                if (responseBody != null) {
+                  val inputStream = responseBody.byteStream()
+                  val chunkSize = 1024
+                  val buffer = ByteArray(chunkSize)
+                  var bytesRead: Int
+
+                  inputStream.use { stream ->
+                    while ((stream.read(buffer).also { bytesRead = it }) != -1) {
+                      val chunk = String(buffer, 0, bytesRead)
+                      listener.onData(chunk)
+                    }
+                  }
+                }
+                listener.onCompletion()
+              }
+            } catch (e: IOException) {
+              listener.onError(e.message)
+            }
+          }
+        })
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkRequestListener.kt

@@ -0,0 +1,29 @@
+/*
+ * 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.inspector
+
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.proguard.annotations.DoNotStripAny
+
+/**
+ * JNI wrapper for `jsinspectormodern::NetworkRequestListener`. Handles the `ScopedExecutor`
+ * callback use on the C++ side.
+ */
+@DoNotStripAny
+internal class InspectorNetworkRequestListener(
+    @field:DoNotStrip private val mHybridData: HybridData
+) {
+  external fun onHeaders(httpStatusCode: Int, headers: Map<String?, String?>?)
+
+  external fun onData(data: String?)
+
+  external fun onError(message: String?)
+
+  external fun onCompletion()
+}

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

@@ -28,7 +28,6 @@ public interface DevSupportManager : JSExceptionHandler {
   public val redBoxHandler: RedBoxHandler?
   public val sourceMapUrl: String?
   public val sourceUrl: String?
-  public val jSBundleURLForRemoteDebugging: String?
   public val downloadedJSBundleFile: String?
   public val lastErrorTitle: String?
   public val lastErrorStack: Array<StackFrame>?
@@ -75,8 +74,6 @@ public interface DevSupportManager : JSExceptionHandler {
 
   public fun setHotModuleReplacementEnabled(isHotModuleReplacementEnabled: Boolean)
 
-  public fun setRemoteJSDebugEnabled(isRemoteJSDebugEnabled: Boolean)
-
   public fun setFpsDebugEnabled(isFpsDebugEnabled: Boolean)
 
   public fun toggleElementInspector()

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

@@ -173,13 +173,15 @@ public class FabricUIManager
   private final CopyOnWriteArrayList<UIManagerListener> mListeners = new CopyOnWriteArrayList<>();
 
   private boolean mMountNotificationScheduled = false;
-  private final List<Integer> mMountedSurfaceIds = new ArrayList<>();
+  private List<Integer> mSurfaceIdsWithPendingMountNotification = new ArrayList<>();
 
   @ThreadConfined(UI)
   @NonNull
   private final DispatchUIFrameCallback mDispatchUIFrameCallback;
 
   /** Set of events sent synchronously during the current frame render. Cleared after each frame. */
+  @ThreadConfined(UI)
+  @NonNull
   private final Set<SynchronousEvent> mSynchronousEvents = new HashSet<>();
 
   /**
@@ -609,6 +611,7 @@ public class FabricUIManager
    *     padding used by RN Android TextInput.
    * @return if theme data is available in the output parameters.
    */
+  @SuppressWarnings("unused")
   public boolean getThemeData(int surfaceId, float[] defaultTextInputPadding) {
     SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
     Context context = surfaceMountingManager != null ? surfaceMountingManager.getContext() : null;
@@ -868,7 +871,7 @@ public class FabricUIManager
         mReactApplicationContext, componentName, surfaceId, reactTag, params);
   }
 
-  public void setBinding(FabricUIManagerBinding binding) {
+  void setBinding(FabricUIManagerBinding binding) {
     mBinding = binding;
   }
 
@@ -967,11 +970,11 @@ public class FabricUIManager
   public void receiveEvent(
       int surfaceId,
       int reactTag,
-      String eventName,
+      @NonNull String eventName,
       boolean canCoalesceEvent,
       @Nullable WritableMap params,
       @EventCategoryDef int eventCategory,
-      boolean experimental_isSynchronous) {
+      boolean experimentalIsSynchronous) {
 
     if (ReactBuildConfig.DEBUG && surfaceId == View.NO_ID) {
       FLog.d(TAG, "Emitted event without surfaceId: [%d] %s", reactTag, eventName);
@@ -985,19 +988,20 @@ public class FabricUIManager
     EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
     if (eventEmitter == null) {
       if (mMountingManager.getViewExists(reactTag)) {
-        // The view is preallocated and created. However, it hasn't been mounted yet. We will have
+        // The view is pre-allocated and created. However, it hasn't been mounted yet. We will have
         // access to the event emitter later when the view is mounted. For now just save the event
         // in the view state and trigger it later.
         mMountingManager.enqueuePendingEvent(
             surfaceId, reactTag, eventName, canCoalesceEvent, params, eventCategory);
       } else {
         // This can happen if the view has disappeared from the screen (because of async events)
-        FLog.d(TAG, "Unable to invoke event: " + eventName + " for reactTag: " + reactTag);
+        FLog.i(TAG, "Unable to invoke event: " + eventName + " for reactTag: " + reactTag);
       }
       return;
     }
 
-    if (experimental_isSynchronous) {
+    if (experimentalIsSynchronous) {
+      UiThreadUtil.assertOnUiThread();
       // add() returns true only if there are no equivalent events already in the set
       boolean firstEventForFrame =
           mSynchronousEvents.add(new SynchronousEvent(surfaceId, reactTag, eventName));
@@ -1250,12 +1254,15 @@ public class FabricUIManager
 
       // Collect surface IDs for all the mount items
       for (MountItem mountItem : mountItems) {
-        if (mountItem != null && !mMountedSurfaceIds.contains(mountItem.getSurfaceId())) {
-          mMountedSurfaceIds.add(mountItem.getSurfaceId());
+        if (mountItem != null
+            && !mSurfaceIdsWithPendingMountNotification.contains(mountItem.getSurfaceId())) {
+          mSurfaceIdsWithPendingMountNotification.add(mountItem.getSurfaceId());
         }
       }
 
-      if (!mMountNotificationScheduled && !mMountedSurfaceIds.isEmpty()) {
+      if (!mMountNotificationScheduled && !mSurfaceIdsWithPendingMountNotification.isEmpty()) {
+        mMountNotificationScheduled = true;
+
         // Notify mount when the effects are visible and prevent mount hooks to
         // delay paint.
         UiThreadUtil.getUiThreadHandler()
@@ -1265,17 +1272,19 @@ public class FabricUIManager
                   public void run() {
                     mMountNotificationScheduled = false;
 
+                    // Create a copy in case mount hooks trigger more mutations
+                    final List<Integer> surfaceIdsToReportMount =
+                        mSurfaceIdsWithPendingMountNotification;
+                    mSurfaceIdsWithPendingMountNotification = new ArrayList<>();
+
                     final @Nullable FabricUIManagerBinding binding = mBinding;
                     if (binding == null || mDestroyed) {
-                      mMountedSurfaceIds.clear();
                       return;
                     }
 
-                    for (int surfaceId : mMountedSurfaceIds) {
+                    for (int surfaceId : surfaceIdsToReportMount) {
                       binding.reportMount(surfaceId);
                     }
-
-                    mMountedSurfaceIds.clear();
                   }
                 });
       }
@@ -1373,7 +1382,7 @@ public class FabricUIManager
         mBinding.driveCxxAnimations();
       }
 
-      if (ReactNativeFeatureFlags.useOptimisedViewPreallocationOnAndroid() && mBinding != null) {
+      if (mBinding != null) {
         mBinding.drainPreallocateViewsQueue();
       }
 
@@ -1388,7 +1397,7 @@ public class FabricUIManager
       } catch (Exception ex) {
         FLog.e(TAG, "Exception thrown when executing UIFrameGuarded", ex);
         mIsMountingEnabled = false;
-        throw ex;
+        throw new RuntimeException("Exception thrown when executing UIFrameGuarded", ex);
       } finally {
         schedule();
       }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt

@@ -13,7 +13,6 @@ import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.NativeMap
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.bridge.RuntimeScheduler
-import com.facebook.react.common.mapbuffer.MapBufferSoLoader
 import com.facebook.react.fabric.events.EventBeatManager
 import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity
 
@@ -34,9 +33,9 @@ internal class FabricUIManagerBinding : HybridClassBase() {
       componentsRegistry: ComponentFactory,
   )
 
-  public external fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
+  external fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
 
-  public external fun startSurfaceWithConstraints(
+  external fun startSurfaceWithConstraints(
       surfaceId: Int,
       moduleName: String,
       initialProps: NativeMap,
@@ -50,19 +49,19 @@ internal class FabricUIManagerBinding : HybridClassBase() {
       doLeftAndRightSwapInRTL: Boolean
   )
 
-  public external fun startSurfaceWithSurfaceHandler(
+  external fun startSurfaceWithSurfaceHandler(
       surfaceId: Int,
       surfaceHandler: SurfaceHandlerBinding,
       isMountable: Boolean
   )
 
-  public external fun stopSurface(surfaceId: Int)
+  external fun stopSurface(surfaceId: Int)
 
-  public external fun stopSurfaceWithSurfaceHandler(surfaceHandler: SurfaceHandlerBinding)
+  external fun stopSurfaceWithSurfaceHandler(surfaceHandler: SurfaceHandlerBinding)
 
-  public external fun setPixelDensity(pointScaleFactor: Float)
+  external fun setPixelDensity(pointScaleFactor: Float)
 
-  public external fun setConstraints(
+  external fun setConstraints(
       surfaceId: Int,
       minWidth: Float,
       maxWidth: Float,
@@ -74,13 +73,13 @@ internal class FabricUIManagerBinding : HybridClassBase() {
       doLeftAndRightSwapInRTL: Boolean
   )
 
-  public external fun driveCxxAnimations()
+  external fun driveCxxAnimations()
 
-  public external fun drainPreallocateViewsQueue()
+  external fun drainPreallocateViewsQueue()
 
-  public external fun reportMount(surfaceId: Int)
+  external fun reportMount(surfaceId: Int)
 
-  public fun register(
+  fun register(
       runtimeExecutor: RuntimeExecutor,
       runtimeScheduler: RuntimeScheduler,
       fabricUIManager: FabricUIManager,
@@ -95,14 +94,13 @@ internal class FabricUIManagerBinding : HybridClassBase() {
 
   private external fun uninstallFabricUIManager()
 
-  public fun unregister() {
+  fun unregister() {
     uninstallFabricUIManager()
   }
 
   private companion object {
     init {
       FabricSoLoader.staticInit()
-      MapBufferSoLoader.staticInit()
     }
   }
 }