From 46df827c7ef3baac16d4bf6bcb1a1a90e5ade0ef Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 28 Jan 2021 14:01:07 -0800
Subject: [PATCH] Support RCTModernEventEmitter+RCTEventEmitter in
 ReactAccessibilityDelegate.Anonymous Event class

Summary:
Support RCTModernEventEmitter +RCTEventEmitter in an Event class. This improves perf in Fabric. Migrate any constructor callsites to the new constructor and deprecate the previous one.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D26043393

fbshipit-source-id: b126658d818a18b7ffb2794de8e59a49c0e3d258
---
 .../react/uimanager/ReactAccessibilityDelegate.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
index f371e341f17..5ff4eb75ee7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
@@ -35,7 +35,6 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import java.util.HashMap;
 
 /**
@@ -295,20 +294,21 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
       ReactContext reactContext = (ReactContext) host.getContext();
       if (reactContext.hasActiveCatalystInstance()) {
         final int reactTag = host.getId();
+        final int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
         UIManager uiManager = UIManagerHelper.getUIManager(reactContext, reactTag);
         if (uiManager != null) {
           uiManager
               .<EventDispatcher>getEventDispatcher()
               .dispatchEvent(
-                  new Event(reactTag) {
+                  new Event(surfaceId, reactTag) {
                     @Override
                     public String getEventName() {
                       return TOP_ACCESSIBILITY_ACTION_EVENT;
                     }
 
                     @Override
-                    public void dispatch(RCTEventEmitter rctEventEmitter) {
-                      rctEventEmitter.receiveEvent(reactTag, TOP_ACCESSIBILITY_ACTION_EVENT, event);
+                    protected WritableMap getEventData() {
+                      return event;
                     }
                   });
         }