react-native-tvos 0.77.0-0rc5 → 0.78.0-0

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt

@@ -16,6 +16,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.fabric.ComponentFactory
+import com.facebook.react.runtime.BindingsInstaller
 import com.facebook.react.runtime.JSCInstance
 import com.facebook.react.runtime.ReactHostImpl
 import com.facebook.react.runtime.cxxreactpackage.CxxReactPackage
@@ -42,11 +43,12 @@ public object DefaultReactHost {
    *   `index.<platform>`
    * @param jsBundleAssetPath the path to the JS bundle relative to the assets directory. Will be
    *   composed in a `asset://...` URL
+   * @param jsBundleFilePath the path to the JS bundle on the filesystem. Will be composed in a
+   *   `file://...` URL
    * @param isHermesEnabled whether to use Hermes as the JS engine, default to true.
    * @param useDevSupport whether to enable dev support, default to ReactBuildConfig.DEBUG.
    * @param cxxReactPackageProviders a list of cxxreactpackage providers (to register c++ turbo
    *   modules)
-   * @param jsBundleLoader a [JSBundleLoader] to use for creating the [ReactHost]
    *
    * TODO(T186951312): Should this be @UnstableReactNativeAPI?
    */
@@ -70,9 +72,9 @@ public object DefaultReactHost {
           jsBundleFilePath,
           isHermesEnabled,
           useDevSupport,
-          cxxReactPackageProviders) {
-            throw it
-          }
+          cxxReactPackageProviders,
+          { throw it },
+          null)
 
   /**
    * Util function to create a default [ReactHost] to be used in your application. This method is
@@ -84,13 +86,15 @@ public object DefaultReactHost {
    *   `index.<platform>`
    * @param jsBundleAssetPath the path to the JS bundle relative to the assets directory. Will be
    *   composed in a `asset://...` URL
+   * @param jsBundleFilePath the path to the JS bundle on the filesystem. Will be composed in a
+   *   `file://...` URL
    * @param isHermesEnabled whether to use Hermes as the JS engine, default to true.
    * @param useDevSupport whether to enable dev support, default to ReactBuildConfig.DEBUG.
    * @param cxxReactPackageProviders a list of cxxreactpackage providers (to register c++ turbo
    *   modules)
-   * @param jsBundleLoader a [JSBundleLoader] to use for creating the [ReactHost]
    * @param exceptionHandler Callback that can be used by React Native host applications to react to
    *   exceptions thrown by the internals of React Native.
+   * @param bindingsInstaller that can be used for installing bindings.
    *
    * TODO(T186951312): Should this be @UnstableReactNativeAPI?
    */
@@ -106,6 +110,7 @@ public object DefaultReactHost {
       useDevSupport: Boolean = ReactBuildConfig.DEBUG,
       cxxReactPackageProviders: List<(ReactContext) -> CxxReactPackage> = emptyList(),
       exceptionHandler: (Exception) -> Unit = { throw it },
+      bindingsInstaller: BindingsInstaller? = null,
   ): ReactHost {
     if (reactHost == null) {
 
@@ -128,6 +133,7 @@ public object DefaultReactHost {
               jsBundleLoader = bundleLoader,
               reactPackages = packageList,
               jsRuntimeFactory = jsRuntimeFactory,
+              bindingsInstaller = bindingsInstaller,
               turboModuleManagerDelegateBuilder = defaultTmmDelegateBuilder,
               exceptionHandler = exceptionHandler)
       val componentFactory = ComponentFactory()

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt

@@ -12,7 +12,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.fabric.ReactNativeConfig
 import com.facebook.react.runtime.BindingsInstaller
 import com.facebook.react.runtime.JSRuntimeFactory
 import com.facebook.react.runtime.ReactHostDelegate
@@ -31,8 +30,6 @@ import com.facebook.react.runtime.hermes.HermesInstance
  * @param jsRuntimeFactory Object that holds a native reference to the JS Runtime factory
  * @param bindingsInstaller Object that holds a native C++ references that allow host applications
  *   to install C++ objects into jsi::Runtime during the initialization of React Native
- * @param reactNativeConfig ReactNative Configuration that allows to customize the behavior of
- *   key/value pairs used by the framework to enable/disable experimental capabilities
  * @param exceptionHandler Callback that can be used by React Native host applications to react to
  *   exceptions thrown by the internals of React Native.
  */
@@ -44,12 +41,8 @@ public class DefaultReactHostDelegate(
     override val reactPackages: List<ReactPackage> = emptyList(),
     override val jsRuntimeFactory: JSRuntimeFactory = HermesInstance(),
     override val bindingsInstaller: BindingsInstaller? = null,
-    private val reactNativeConfig: ReactNativeConfig = ReactNativeConfig.DEFAULT_CONFIG,
     private val exceptionHandler: (Exception) -> Unit = { throw it },
     override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder
 ) : ReactHostDelegate {
-
-  override fun getReactNativeConfig(): ReactNativeConfig = reactNativeConfig
-
   override fun handleInstanceException(error: Exception): Unit = exceptionHandler(error)
 }

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt

@@ -18,7 +18,6 @@ import com.facebook.react.bridge.UIManagerProvider
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.fabric.ComponentFactory
 import com.facebook.react.fabric.FabricUIManagerProviderImpl
-import com.facebook.react.fabric.ReactNativeConfig
 import com.facebook.react.uimanager.ViewManagerRegistry
 import com.facebook.react.uimanager.ViewManagerResolver
 
@@ -63,8 +62,7 @@ protected constructor(
                     reactInstanceManager.getOrCreateViewManagers(reactApplicationContext))
               }
 
-          FabricUIManagerProviderImpl(
-                  componentFactory, ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry)
+          FabricUIManagerProviderImpl(componentFactory, viewManagerRegistry)
               .createUIManager(reactApplicationContext)
         }
       } else {

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

@@ -9,6 +9,7 @@ package com.facebook.react.devsupport
 
 import android.content.Context
 import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
@@ -101,7 +102,11 @@ public class DefaultDevSupportManagerFactory : DevSupportManagerFactory {
       useDevSupport: Boolean
   ): DevSupportManager =
       if (!useDevSupport) {
-        ReleaseDevSupportManager()
+        if (ReactBuildConfig.UNSTABLE_ENABLE_FUSEBOX_RELEASE) {
+          PerftestDevSupportManager(applicationContext)
+        } else {
+          ReleaseDevSupportManager()
+        }
       } else {
         BridgelessDevSupportManager(
             applicationContext,

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

@@ -27,7 +27,6 @@ import com.facebook.react.packagerconnection.NotificationOnlyHandler;
 import com.facebook.react.packagerconnection.PackagerConnectionSettings;
 import com.facebook.react.packagerconnection.ReconnectingWebSocket.ConnectionCallback;
 import com.facebook.react.packagerconnection.RequestHandler;
-import com.facebook.react.packagerconnection.RequestOnlyHandler;
 import com.facebook.react.packagerconnection.Responder;
 import com.facebook.react.util.RNLog;
 import java.io.File;
@@ -76,7 +75,8 @@ public class DevServerHelper {
 
     void onPackagerDevMenuCommand();
 
-    void onCaptureHeapCommand(final Responder responder);
+    @Deprecated(forRemoval = true)
+    default void onCaptureHeapCommand(final Responder responder) {}
 
     // Allow apps to provide listeners for custom packager commands.
     @Nullable
@@ -155,14 +155,6 @@ public class DevServerHelper {
                 commandListener.onPackagerDevMenuCommand();
               }
             });
-        handlers.put(
-            "captureHeap",
-            new RequestOnlyHandler() {
-              @Override
-              public void onRequest(@Nullable Object params, Responder responder) {
-                commandListener.onCaptureHeapCommand(responder);
-              }
-            });
         Map<String, RequestHandler> customHandlers = commandListener.customCommandHandlers();
         if (customHandlers != null) {
           handlers.putAll(customHandlers);
@@ -213,17 +205,12 @@ public class DevServerHelper {
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... params) {
-        if (InspectorFlags.getFuseboxEnabled()) {
-          Map<String, String> metadata =
-              AndroidInfoHelpers.getInspectorHostMetadata(mApplicationContext);
-
-          mInspectorPackagerConnection =
-              new CxxInspectorPackagerConnection(
-                  getInspectorDeviceUrl(), metadata.get("deviceName"), mPackageName);
-        } else {
-          mInspectorPackagerConnection =
-              new InspectorPackagerConnection(getInspectorDeviceUrl(), mPackageName);
-        }
+        Map<String, String> metadata =
+            AndroidInfoHelpers.getInspectorHostMetadata(mApplicationContext);
+
+        mInspectorPackagerConnection =
+            new CxxInspectorPackagerConnection(
+                getInspectorDeviceUrl(), metadata.get("deviceName"), mPackageName);
         mInspectorPackagerConnection.connect();
         return null;
       }
@@ -325,11 +312,12 @@ public class DevServerHelper {
   private String getInspectorDeviceUrl() {
     return String.format(
         Locale.US,
-        "http://%s/inspector/device?name=%s&app=%s&device=%s",
+        "http://%s/inspector/device?name=%s&app=%s&device=%s&profiling=%b",
         mPackagerConnectionSettings.getDebugServerHost(),
         Uri.encode(AndroidInfoHelpers.getFriendlyDeviceName()),
         Uri.encode(mPackageName),
-        Uri.encode(getInspectorDeviceId()));
+        Uri.encode(getInspectorDeviceId()),
+        InspectorFlags.getIsProfilingBuild());
   }
 
   public void downloadBundleFromURL(

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

@@ -63,7 +63,6 @@ import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.packagerconnection.RequestHandler;
-import com.facebook.react.packagerconnection.Responder;
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -686,10 +685,12 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
         URL sourceUrl = new URL(getSourceUrl());
         String path = sourceUrl.getPath().substring(1); // strip initial slash in path
         String host = sourceUrl.getHost();
+        String scheme = sourceUrl.getProtocol();
         int port = sourceUrl.getPort() != -1 ? sourceUrl.getPort() : sourceUrl.getDefaultPort();
         mCurrentReactContext
             .getJSModule(HMRClient.class)
-            .setup("android", path, host, port, mDevSettings.isHotModuleReplacementEnabled());
+            .setup(
+                "android", path, host, port, mDevSettings.isHotModuleReplacementEnabled(), scheme);
       } catch (MalformedURLException e) {
         showNewJavaError(e.getMessage(), e);
       }
@@ -865,29 +866,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     return mLastErrorType;
   }
 
-  private void handleCaptureHeap(final Responder responder) {
-    if (mCurrentReactContext == null) {
-      return;
-    }
-    JSCHeapCapture heapCapture = mCurrentReactContext.getNativeModule(JSCHeapCapture.class);
-
-    if (heapCapture != null) {
-      heapCapture.captureHeap(
-          mApplicationContext.getCacheDir().getPath(),
-          new JSCHeapCapture.CaptureCallback() {
-            @Override
-            public void onSuccess(File capture) {
-              responder.respond(capture.toString());
-            }
-
-            @Override
-            public void onFailure(JSCHeapCapture.CaptureException error) {
-              responder.error(error.toString());
-            }
-          });
-    }
-  }
-
   private void updateLastErrorInfo(
       @Nullable final String message,
       final StackFrame[] stack,
@@ -1076,11 +1054,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
               UiThreadUtil.runOnUiThread(() -> showDevOptionsDialog());
             }
 
-            @Override
-            public void onCaptureHeapCommand(final Responder responder) {
-              UiThreadUtil.runOnUiThread(() -> handleCaptureHeap(responder));
-            }
-
             @Override
             public @Nullable Map<String, RequestHandler> customCommandHandlers() {
               return mCustomPackagerCommandHandlers;

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

@@ -26,8 +26,11 @@ public interface HMRClient extends JavaScriptModule {
    * @param host The host that the HMRClient should communicate with.
    * @param port The port that the HMRClient should communicate with on the host.
    * @param isEnabled Whether HMR is enabled initially.
+   * @param scheme The protocol that the HMRClient should communicate with on the host (defaults to
+   *     http).
    */
-  void setup(String platform, String bundleEntry, String host, int port, boolean isEnabled);
+  void setup(
+      String platform, String bundleEntry, String host, int port, boolean isEnabled, String scheme);
 
   /** Registers an additional JS bundle with HMRClient. */
   void registerBundle(String bundleUrl);

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

@@ -17,4 +17,6 @@ public object InspectorFlags {
   }
 
   @DoNotStrip @JvmStatic public external fun getFuseboxEnabled(): Boolean
+
+  @DoNotStrip @JvmStatic public external fun getIsProfilingBuild(): Boolean
 }

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

@@ -15,7 +15,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.devsupport.interfaces.StackFrame;
-import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler.ParsedError;
+import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler.ProcessedError;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -263,10 +263,10 @@ public class StackTraceHelper {
     return stackTrace.toString();
   }
 
-  public static JavaOnlyMap convertParsedError(ParsedError error) {
-    List<ParsedError.StackFrame> frames = error.getStack();
+  public static JavaOnlyMap convertProcessedError(ProcessedError error) {
+    List<ProcessedError.StackFrame> frames = error.getStack();
     List<ReadableMap> readableMapList = new ArrayList<>();
-    for (ParsedError.StackFrame frame : frames) {
+    for (ProcessedError.StackFrame frame : frames) {
       JavaOnlyMap map = new JavaOnlyMap();
       if (frame.getColumn() != null) {
         map.putDouble(COLUMN_KEY, frame.getColumn());

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

@@ -48,6 +48,7 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
@@ -67,6 +68,7 @@ import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.internal.interop.InteropEventEmitter;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.GuardedFrameCallback;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactRoot;
@@ -256,29 +258,6 @@ public class FabricUIManager
     return rootTag;
   }
 
-  /**
-   * This API returns metadata associated to the React Component that rendered the Android View
-   * received as a parameter.
-   *
-   * @param surfaceId {@link int} that represents the surfaceId for the View received as a
-   *     parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
-   *     on the {@link ReactRoot} that holds the View received as a second parameter.
-   * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
-   * @return a {@link ReadableMap} that contains metadata associated to the React Component that
-   *     rendered the Android View received as a parameter. For more details about the keys stored
-   *     in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
-   *     jni/react/fabric/Binding.cpp file.
-   */
-  @UiThread
-  @ThreadConfined(UI)
-  public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
-    UiThreadUtil.assertOnUiThread();
-    int reactTag = view.getId();
-
-    EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
-    return mBinding.getInspectorDataForInstance(eventEmitter);
-  }
-
   @Override
   @AnyThread
   @ThreadConfined(ANY)
@@ -445,12 +424,18 @@ public class FabricUIManager
 
   @Override
   public void markActiveTouchForTag(int surfaceId, int reactTag) {
-    mMountingManager.getSurfaceManager(surfaceId).markActiveTouchForTag(reactTag);
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+    if (surfaceMountingManager != null) {
+      surfaceMountingManager.markActiveTouchForTag(reactTag);
+    }
   }
 
   @Override
   public void sweepActiveTouchForTag(int surfaceId, int reactTag) {
-    mMountingManager.getSurfaceManager(surfaceId).sweepActiveTouchForTag(reactTag);
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+    if (surfaceMountingManager != null) {
+      surfaceMountingManager.sweepActiveTouchForTag(reactTag);
+    }
   }
 
   /**
@@ -872,6 +857,17 @@ public class FabricUIManager
     }
   }
 
+  /**
+   * This method initiates preloading of an image specified by ImageSource. It can later be consumed
+   * by an ImageView.
+   */
+  @UnstableReactNativeAPI
+  public void experimental_prefetchResource(
+      String componentName, int surfaceId, int reactTag, ReadableMapBuffer params) {
+    mMountingManager.experimental_prefetchResource(
+        mReactApplicationContext, componentName, surfaceId, reactTag, params);
+  }
+
   public void setBinding(FabricUIManagerBinding binding) {
     mBinding = binding;
   }
@@ -954,7 +950,6 @@ public class FabricUIManager
    * @param reactTag
    * @param eventName
    * @param canCoalesceEvent
-   * @param customCoalesceKey
    * @param params
    * @param eventCategory
    */

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

@@ -11,12 +11,10 @@ import android.annotation.SuppressLint
 import com.facebook.jni.HybridClassBase
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.NativeMap
-import com.facebook.react.bridge.ReadableNativeMap
 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.fabric.events.EventEmitterWrapper
 import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity
 
 @DoNotStrip
@@ -34,7 +32,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {
       uiManager: FabricUIManager,
       eventBeatManager: EventBeatManager,
       componentsRegistry: ComponentFactory,
-      reactNativeConfig: Any
   )
 
   public external fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
@@ -83,26 +80,16 @@ internal class FabricUIManagerBinding : HybridClassBase() {
 
   public external fun reportMount(surfaceId: Int)
 
-  public external fun getInspectorDataForInstance(
-      eventEmitterWrapper: EventEmitterWrapper?
-  ): ReadableNativeMap?
-
   public fun register(
       runtimeExecutor: RuntimeExecutor,
       runtimeScheduler: RuntimeScheduler,
       fabricUIManager: FabricUIManager,
       eventBeatManager: EventBeatManager,
       componentFactory: ComponentFactory,
-      reactNativeConfig: ReactNativeConfig
   ) {
     fabricUIManager.setBinding(this)
     installFabricUIManager(
-        runtimeExecutor,
-        runtimeScheduler,
-        fabricUIManager,
-        eventBeatManager,
-        componentFactory,
-        reactNativeConfig)
+        runtimeExecutor, runtimeScheduler, fabricUIManager, eventBeatManager, componentFactory)
     setPixelDensity(getDisplayMetricDensity())
   }
 

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

@@ -22,15 +22,11 @@ import com.facebook.systrace.Systrace;
 public class FabricUIManagerProviderImpl implements UIManagerProvider {
 
   private final ComponentFactory mComponentFactory;
-  private final ReactNativeConfig mConfig;
   private final ViewManagerRegistry mViewManagerRegistry;
 
   public FabricUIManagerProviderImpl(
-      ComponentFactory componentFactory,
-      ReactNativeConfig config,
-      ViewManagerRegistry viewManagerRegistry) {
+      ComponentFactory componentFactory, ViewManagerRegistry viewManagerRegistry) {
     mComponentFactory = componentFactory;
-    mConfig = config;
     mViewManagerRegistry = viewManagerRegistry;
   }
 
@@ -56,12 +52,7 @@ public class FabricUIManagerProviderImpl implements UIManagerProvider {
 
     if (runtimeExecutor != null && runtimeScheduler != null) {
       binding.register(
-          runtimeExecutor,
-          runtimeScheduler,
-          fabricUIManager,
-          eventBeatManager,
-          mComponentFactory,
-          mConfig);
+          runtimeExecutor, runtimeScheduler, fabricUIManager, eventBeatManager, mComponentFactory);
     } else {
       throw new IllegalStateException(
           "Unable to register FabricUIManager with CatalystInstance, runtimeExecutor and"

package/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.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.
+ */
+
+package com.facebook.react.fabric.events
+
+import android.annotation.SuppressLint
+import com.facebook.jni.HybridClassBase
+import com.facebook.proguard.annotations.DoNotStripAny
+import com.facebook.react.bridge.NativeMap
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.fabric.FabricSoLoader.staticInit
+import com.facebook.react.uimanager.events.EventCategoryDef
+
+/**
+ * This class holds reference to the C++ EventEmitter object. Instances of this class are created in
+ * FabricMountingManager.cpp, where the pointer to the C++ event emitter is set.
+ */
+@DoNotStripAny
+@SuppressLint("MissingNativeLoadLibrary")
+public class EventEmitterWrapper private constructor() : HybridClassBase() {
+  private external fun dispatchEvent(
+      eventName: String,
+      params: NativeMap?,
+      @EventCategoryDef category: Int
+  )
+
+  private external fun dispatchEventSynchronously(eventName: String, params: NativeMap?)
+
+  private external fun dispatchUniqueEvent(eventName: String, params: NativeMap?)
+
+  /**
+   * Invokes the execution of the C++ EventEmitter.
+   *
+   * @param eventName [String] name of the event to execute.
+   * @param params [WritableMap] payload of the event
+   */
+  @Synchronized
+  public fun dispatch(
+      eventName: String,
+      params: WritableMap?,
+      @EventCategoryDef eventCategory: Int
+  ) {
+    if (!isValid) {
+      return
+    }
+    dispatchEvent(eventName, params as NativeMap?, eventCategory)
+  }
+
+  @Synchronized
+  public fun dispatchEventSynchronously(eventName: String, params: WritableMap?) {
+    if (!isValid) {
+      return
+    }
+    dispatchEventSynchronously(eventName, params as NativeMap?)
+  }
+
+  /**
+   * Invokes the execution of the C++ EventEmitter. C++ will coalesce events sent to the same
+   * target.
+   *
+   * @param eventName [String] name of the event to execute.
+   * @param params [WritableMap] payload of the event
+   */
+  @Synchronized
+  public fun dispatchUnique(eventName: String, params: WritableMap?) {
+    if (!isValid) {
+      return
+    }
+    dispatchUniqueEvent(eventName, params as NativeMap?)
+  }
+
+  @Synchronized
+  public fun destroy() {
+    if (isValid) {
+      resetNative()
+    }
+  }
+
+  private companion object {
+    init {
+      staticInit()
+    }
+  }
+}

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

@@ -18,22 +18,22 @@ import com.facebook.systrace.Systrace
 
 public class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTModernEventEmitter {
   @Deprecated("Deprecated in Java")
-  public override fun receiveEvent(reactTag: Int, eventName: String, params: WritableMap?): Unit {
-    receiveEvent(ViewUtil.NO_SURFACE_ID, reactTag, eventName, params)
+  public override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?): Unit {
+    receiveEvent(ViewUtil.NO_SURFACE_ID, targetTag, eventName, params)
   }
 
   public override fun receiveEvent(
       surfaceId: Int,
-      reactTag: Int,
+      targetTag: Int,
       eventName: String,
       params: WritableMap?
   ) {
-    receiveEvent(surfaceId, reactTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED)
+    receiveEvent(surfaceId, targetTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED)
   }
 
   public override fun receiveEvent(
       surfaceId: Int,
-      reactTag: Int,
+      targetTag: Int,
       eventName: String,
       canCoalesceEvent: Boolean,
       customCoalesceKey: Int,
@@ -43,7 +43,7 @@ public class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTMod
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricEventEmitter.receiveEvent('$eventName')")
     try {
-      uiManager.receiveEvent(surfaceId, reactTag, eventName, canCoalesceEvent, params, category)
+      uiManager.receiveEvent(surfaceId, targetTag, eventName, canCoalesceEvent, params, category)
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE)
     }