react-native-tvos 0.73.7-1 → 0.74.0-0

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java

@@ -195,8 +195,8 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
-    super.onCatalystInstanceDestroy();
+  public void invalidate() {
+    super.invalidate();
     mEventDispatcher.onCatalystInstanceDestroyed();
     mUIImplementation.onCatalystInstanceDestroyed();
 
@@ -247,22 +247,26 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
-  public @Nullable WritableMap getConstantsForViewManager(@Nullable String viewManagerName) {
-    ViewManager targetView =
-        viewManagerName != null ? mUIImplementation.resolveViewManager(viewManagerName) : null;
+  public @Nullable WritableMap getConstantsForViewManager(String viewManagerName) {
+    ViewManager targetView = mUIImplementation.resolveViewManager(viewManagerName);
     if (targetView == null) {
       return null;
     }
 
+    return getConstantsForViewManager(targetView, mCustomDirectEvents);
+  }
+
+  public static @Nullable WritableMap getConstantsForViewManager(
+      ViewManager viewManager, Map<String, Object> customDirectEvents) {
     SystraceMessage.beginSection(
             Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIManagerModule.getConstantsForViewManager")
-        .arg("ViewManager", targetView.getName())
+        .arg("ViewManager", viewManager.getName())
         .arg("Lazy", true)
         .flush();
     try {
       Map<String, Object> viewManagerConstants =
           UIManagerModuleConstantsHelper.createConstantsForViewManager(
-              targetView, null, null, null, mCustomDirectEvents);
+              viewManager, null, null, null, customDirectEvents);
       if (viewManagerConstants != null) {
         return Arguments.makeNativeMap(viewManagerConstants);
       }
@@ -313,7 +317,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   }
 
   public <T extends View> int addRootView(final T rootView) {
-    return addRootView(rootView, null, null);
+    return addRootView(rootView, null);
   }
 
   /**
@@ -341,8 +345,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
    * <p>TODO(6242243): Make addRootView thread safe NB: this method is horribly not-thread-safe.
    */
   @Override
-  public <T extends View> int addRootView(
-      final T rootView, WritableMap initialProps, @Nullable String initialUITemplate) {
+  public <T extends View> int addRootView(final T rootView, WritableMap initialProps) {
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIManagerModule.addRootView");
     final int tag = ReactRootViewTagGenerator.getNextRootViewTag();
     final ReactApplicationContext reactApplicationContext = getReactApplicationContext();
@@ -487,32 +490,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule
     mUIImplementation.setChildren(viewTag, childrenTags);
   }
 
-  /**
-   * Replaces the View specified by oldTag with the View specified by newTag within oldTag's parent.
-   * This resolves to a simple {@link #manageChildren} call, but React doesn't have enough info in
-   * JS to formulate it itself.
-   *
-   * @deprecated This method will not be available in Fabric UIManager class.
-   */
-  @ReactMethod
-  @Deprecated
-  public void replaceExistingNonRootView(int oldTag, int newTag) {
-    mUIImplementation.replaceExistingNonRootView(oldTag, newTag);
-  }
-
-  /**
-   * Method which takes a container tag and then releases all subviews for that container upon
-   * receipt.
-   *
-   * @param containerTag the tag of the container for which the subviews must be removed
-   * @deprecated This method will not be available in Fabric UIManager class.
-   */
-  @ReactMethod
-  @Deprecated
-  public void removeSubviewsFromContainerWithID(int containerTag) {
-    mUIImplementation.removeSubviewsFromContainerWithID(containerTag);
-  }
-
   /**
    * Determines the location on screen, width, and height of the given view and returns the values
    * via an async callback.
@@ -641,6 +618,10 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   /**
    * Show a PopupMenu.
    *
+   * <p>This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   *
    * @param reactTag the tag of the anchor view (the PopupMenu is displayed next to this view); this
    *     needs to be the tag of a native view (shadow views can not be anchors)
    * @param items the menu items as an array of strings
@@ -649,11 +630,18 @@ public class UIManagerModule extends ReactContextBaseJavaModule
    *     no arguments if the menu is dismissed
    */
   @ReactMethod
+  @Deprecated
   public void showPopupMenu(int reactTag, ReadableArray items, Callback error, Callback success) {
     mUIImplementation.showPopupMenu(reactTag, items, error, success);
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   */
   @ReactMethod
+  @Deprecated
   public void dismissPopupMenu() {
     mUIImplementation.dismissPopupMenu();
   }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java

@@ -7,15 +7,12 @@
 
 package com.facebook.react.uimanager;
 
-import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.systrace.SystraceMessage;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,7 +24,7 @@ import java.util.Set;
  * Helps generate constants map for {@link UIManagerModule} by collecting and merging constants from
  * registered view managers.
  */
-/* package */ class UIManagerModuleConstantsHelper {
+public class UIManagerModuleConstantsHelper {
   private static final String TAG = "UIManagerModuleConstantsHelper";
   private static final String BUBBLING_EVENTS_KEY = "bubblingEventTypes";
   private static final String DIRECT_EVENTS_KEY = "directEventTypes";
@@ -46,7 +43,7 @@ import java.util.Set;
     return constants;
   }
 
-  /* package */ static Map<String, Object> getDefaultExportableEventTypes() {
+  public static Map<String, Object> getDefaultExportableEventTypes() {
     return MapBuilder.<String, Object>of(
         BUBBLING_EVENTS_KEY, UIManagerModuleConstants.getBubblingEventTypeConstants(),
         DIRECT_EVENTS_KEY, UIManagerModuleConstants.getDirectEventTypeConstants());
@@ -112,21 +109,11 @@ import java.util.Set;
     for (ViewManager viewManager : viewManagers) {
       final String viewManagerName = viewManager.getName();
 
-      SystraceMessage.beginSection(
-              TRACE_TAG_REACT_JAVA_BRIDGE, "UIManagerModuleConstantsHelper.createConstants")
-          .arg("ViewManager", viewManagerName)
-          .arg("Lazy", false)
-          .flush();
-
-      try {
-        Map viewManagerConstants =
-            createConstantsForViewManager(
-                viewManager, null, null, allBubblingEventTypes, allDirectEventTypes);
-        if (!viewManagerConstants.isEmpty()) {
-          constants.put(viewManagerName, viewManagerConstants);
-        }
-      } finally {
-        SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+      Map viewManagerConstants =
+          createConstantsForViewManager(
+              viewManager, null, null, allBubblingEventTypes, allDirectEventTypes);
+      if (!viewManagerConstants.isEmpty()) {
+        constants.put(viewManagerName, viewManagerConstants);
       }
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java

@@ -25,6 +25,7 @@ import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.systrace.Systrace;
@@ -94,41 +95,6 @@ public class UIViewOperationQueue {
     }
   }
 
-  private final class EmitOnLayoutEventOperation extends ViewOperation {
-
-    private final int mScreenX;
-    private final int mScreenY;
-    private final int mScreenWidth;
-    private final int mScreenHeight;
-
-    public EmitOnLayoutEventOperation(
-        int tag, int screenX, int screenY, int screenWidth, int screenHeight) {
-      super(tag);
-      mScreenX = screenX;
-      mScreenY = screenY;
-      mScreenWidth = screenWidth;
-      mScreenHeight = screenHeight;
-    }
-
-    @Override
-    public void execute() {
-      UIManagerModule uiManager = mReactApplicationContext.getNativeModule(UIManagerModule.class);
-
-      if (uiManager != null) {
-        uiManager
-            .getEventDispatcher()
-            .dispatchEvent(
-                OnLayoutEvent.obtain(
-                    -1 /* SurfaceId not used in classic renderer */,
-                    mTag,
-                    mScreenX,
-                    mScreenY,
-                    mScreenWidth,
-                    mScreenHeight));
-      }
-    }
-  }
-
   private final class UpdateInstanceHandleOperation extends ViewOperation {
 
     private final long mInstanceHandle;
@@ -377,6 +343,12 @@ public class UIViewOperationQueue {
     }
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   private final class ShowPopupMenuOperation extends ViewOperation {
 
     private final ReadableArray mItems;
@@ -396,6 +368,12 @@ public class UIViewOperationQueue {
     }
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   private final class DismissPopupMenuOperation implements UIOperation {
     @Override
     public void execute() {
@@ -737,11 +715,23 @@ public class UIViewOperationQueue {
     mOperations.add(new UpdateViewExtraData(reactTag, extraData));
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   public void enqueueShowPopupMenu(
       int reactTag, ReadableArray items, Callback error, Callback success) {
     mOperations.add(new ShowPopupMenuOperation(reactTag, items, error, success));
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   public void enqueueDismissPopupMenu() {
     mOperations.add(new DismissPopupMenuOperation());
   }
@@ -767,12 +757,6 @@ public class UIViewOperationQueue {
     mOperations.add(new UpdatePropertiesOperation(reactTag, props));
   }
 
-  public void enqueueOnLayoutEvent(
-      int tag, int screenX, int screenY, int screenWidth, int screenHeight) {
-    mOperations.add(
-        new EmitOnLayoutEventOperation(tag, screenX, screenY, screenWidth, screenHeight));
-  }
-
   public void enqueueUpdateLayout(
       int parentTag, int reactTag, int x, int y, int width, int height) {
     mOperations.add(new UpdateLayoutOperation(parentTag, reactTag, x, y, width, height));
@@ -1003,8 +987,10 @@ public class UIViewOperationQueue {
 
   /* package */ void resumeFrameCallback() {
     mIsDispatchUIFrameCallbackEnqueued = true;
-    ReactChoreographer.getInstance()
-        .postFrameCallback(ReactChoreographer.CallbackType.DISPATCH_UI, mDispatchUIFrameCallback);
+    if (!ReactFeatureFlags.enableFabricRendererExclusively) {
+      ReactChoreographer.getInstance()
+          .postFrameCallback(ReactChoreographer.CallbackType.DISPATCH_UI, mDispatchUIFrameCallback);
+    }
   }
 
   /* package */ void pauseFrameCallback() {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java

@@ -89,14 +89,6 @@ public abstract class ViewGroupManager<T extends ViewGroup>
     }
   }
 
-  public void removeAllViews(T parent) {
-    UiThreadUtil.assertOnUiThread();
-
-    for (int i = getChildCount(parent) - 1; i >= 0; i--) {
-      removeViewAt(parent, i);
-    }
-  }
-
   /**
    * Returns whether this View type needs to handle laying out its own children instead of deferring
    * to the standard css-layout algorithm. Returns true for the layout to *not* be automatically

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java

@@ -14,7 +14,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class ViewHierarchyDumper {
+class ViewHierarchyDumper {
 
   public static JSONObject toJSON(View view) throws JSONException {
     UiThreadUtil.assertOnUiThread();

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java

@@ -53,16 +53,32 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 {
    * @return the {@link ViewManager} registered to the className received as a parameter
    */
   public synchronized ViewManager get(String className) {
+    // 1. Try to get the manager without the prefix.
     ViewManager viewManager = mViewManagers.get(className);
     if (viewManager != null) {
       return viewManager;
     }
+
+    // 2. Try to get the manager with the RCT prefix.
+    String rctViewManagerName = "RCT" + className;
+    viewManager = mViewManagers.get(rctViewManagerName);
+    if (viewManager != null) {
+      return viewManager;
+    }
     if (mViewManagerResolver != null) {
+      // 1. Try to get the manager without the prefix.
       viewManager = getViewManagerFromResolver(className);
       if (viewManager != null) return viewManager;
+
+      // 2. Try to get the manager with the RCT prefix.
+      viewManager = getViewManagerFromResolver(rctViewManagerName);
+      if (viewManager != null) return viewManager;
+
       throw new IllegalViewOperationException(
-          "ViewManagerResolver returned null for "
+          "ViewManagerResolver returned null for either "
               + className
+              + " or "
+              + rctViewManagerName
               + ", existing names are: "
               + mViewManagerResolver.getViewManagerNames());
     }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java

@@ -11,7 +11,7 @@ import com.facebook.react.common.ClearableSynchronizedPool;
 import com.facebook.yoga.YogaNode;
 
 /** Static holder for a recycling pool of YogaNodes. */
-public class YogaNodePool {
+class YogaNodePool {
 
   private static final Object sInitLock = new Object();
   private static ClearableSynchronizedPool<YogaNode> sPool;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.java

@@ -10,6 +10,7 @@ package com.facebook.react.uimanager.annotations;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import androidx.annotation.Nullable;
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -46,6 +47,7 @@ import java.lang.annotation.Target;
  */
 @Retention(RUNTIME)
 @Target(ElementType.METHOD)
+@DeprecatedInNewArchitecture
 public @interface ReactProp {
 
   // Used as a default value for "customType" property as "null" is not allowed. Moreover, when this

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.java

@@ -10,6 +10,7 @@ package com.facebook.react.uimanager.annotations;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import androidx.annotation.Nullable;
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -40,6 +41,7 @@ import java.lang.annotation.Target;
  * provided as a default.
  */
 @Retention(RUNTIME)
+@DeprecatedInNewArchitecture
 @Target(ElementType.METHOD)
 public @interface ReactPropGroup {
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropertyHolder.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.uimanager.annotations;
 
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
@@ -16,4 +17,5 @@ import java.lang.annotation.Target;
 @Inherited
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
+@DeprecatedInNewArchitecture
 public @interface ReactPropertyHolder {}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java

@@ -12,10 +12,12 @@ import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import androidx.annotation.IntDef;
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import java.lang.annotation.Retention;
 
 @Retention(SOURCE)
 @IntDef({DEFAULT, FABRIC})
+@DeprecatedInNewArchitecture
 public @interface UIManagerType {
   int DEFAULT = 1;
   int FABRIC = 2;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.java

@@ -10,6 +10,9 @@ package com.facebook.react.uimanager.common;
 import static com.facebook.react.uimanager.common.UIManagerType.DEFAULT;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 
+import com.facebook.infer.annotation.Nullsafe;
+
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ViewUtil {
 
   public static final int NO_SURFACE_ID = -1;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.uimanager.debug;
 
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.uimanager.UIManagerModule;
 
 /**
@@ -16,6 +17,7 @@ import com.facebook.react.uimanager.UIManagerModule;
  * <p>NB: while onViewHierarchyUpdateFinished will always be called from the UI thread, there are no
  * guarantees what thread onViewHierarchyUpdateEnqueued is called on.
  */
+@DeprecatedInNewArchitecture
 public interface NotThreadSafeViewHierarchyUpdateDebugListener {
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.java

@@ -8,11 +8,13 @@
 package com.facebook.react.uimanager.events;
 
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 
 /**
  * A singleton class that overrides {@link EventDispatcher} with no-op methods, to be used by
  * callers that expect an EventDispatcher when the instance doesn't exist.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class BlackHoleEventDispatcher implements EventDispatcher {
 
   private static final EventDispatcher sEventDispatcher = new BlackHoleEventDispatcher();

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java

@@ -7,11 +7,18 @@
 
 package com.facebook.react.uimanager.events;
 
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.PixelUtil;
 
-/** Event dispatched when total width or height of a view's children changes */
+/**
+ * Event dispatched when total width or height of a view's children changes.
+ *
+ * @deprecated Please define your own event for custom components
+ */
+@Nullsafe(Nullsafe.Mode.LOCAL)
+@Deprecated
 public class ContentSizeChangeEvent extends Event<ContentSizeChangeEvent> {
 
   public static final String EVENT_NAME = "topContentSizeChange";

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java

@@ -8,9 +8,9 @@
 package com.facebook.react.uimanager.events;
 
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.SystemClock;
-import com.facebook.react.uimanager.IllegalViewOperationException;
 
 /**
  * A UI event that can be dispatched to JS.
@@ -28,6 +28,7 @@ import com.facebook.react.uimanager.IllegalViewOperationException;
  * surfaceId. Fabric will work without surfaceId - making {@code Event} backwards-compatible - but
  * Events without SurfaceId are slightly slower to propagate.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class Event<T extends Event> {
 
   private static int sUniqueID = 0;
@@ -158,20 +159,10 @@ public abstract class Event<T extends Event> {
    */
   @Deprecated
   public void dispatch(RCTEventEmitter rctEventEmitter) {
-    WritableMap eventData = getEventData();
-    if (eventData == null) {
-      throw new IllegalViewOperationException(
-          "Event: you must return a valid, non-null value from `getEventData`, or override `dispatch` and `dispatchModern`. Event: "
-              + getEventName());
-    }
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
+    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), getEventData());
   }
 
-  /**
-   * Can be overridden by classes to make migrating to RCTModernEventEmitter support easier. If this
-   * class returns null, the RCTEventEmitter interface will be used instead of
-   * RCTModernEventEmitter. In the future, returning null here will be an error.
-   */
+  /** Can be overridden by classes when no custom logic for dispatching is needed. */
   @Nullable
   protected WritableMap getEventData() {
     return null;
@@ -193,23 +184,19 @@ public abstract class Event<T extends Event> {
    *
    * @see #dispatch
    */
-  @Deprecated
   public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
     if (getSurfaceId() != -1) {
-      WritableMap eventData = getEventData();
-      if (eventData != null) {
-        rctEventEmitter.receiveEvent(
-            getSurfaceId(),
-            getViewTag(),
-            getEventName(),
-            canCoalesce(),
-            getCoalescingKey(),
-            eventData,
-            getEventCategory());
-        return;
-      }
+      rctEventEmitter.receiveEvent(
+          getSurfaceId(),
+          getViewTag(),
+          getEventName(),
+          canCoalesce(),
+          getCoalescingKey(),
+          getEventData(),
+          getEventCategory());
+    } else {
+      dispatch(rctEventEmitter);
     }
-    dispatch(rctEventEmitter);
   }
 
   public interface EventAnimationDriverMatchSpec {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java

@@ -8,12 +8,14 @@
 package com.facebook.react.uimanager.events;
 
 import android.util.LongSparseArray;
+import android.view.Choreographer;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.MapBuilder;
-import com.facebook.react.modules.core.ChoreographerCompat;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.systrace.Systrace;
@@ -54,6 +56,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * <p>Event Cookie Composition: VIEW_TAG_MASK = 0x00000000ffffffff EVENT_TYPE_ID_MASK =
  * 0x0000ffff00000000 COALESCING_KEY_MASK = 0xffff000000000000
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListener {
 
   private static final Comparator<Event> EVENT_COMPARATOR =
@@ -272,7 +275,7 @@ public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListe
     mReactEventEmitter.unregister(uiManagerType);
   }
 
-  private class ScheduleDispatchFrameCallback extends ChoreographerCompat.FrameCallback {
+  private class ScheduleDispatchFrameCallback implements Choreographer.FrameCallback {
     private volatile boolean mIsPosted = false;
     private boolean mShouldStop = false;
 
@@ -315,8 +318,11 @@ public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListe
     }
 
     private void post() {
-      ReactChoreographer.getInstance()
-          .postFrameCallback(ReactChoreographer.CallbackType.TIMERS_EVENTS, mCurrentFrameCallback);
+      if (!ReactFeatureFlags.enableFabricRendererExclusively) {
+        ReactChoreographer.getInstance()
+            .postFrameCallback(
+                ReactChoreographer.CallbackType.TIMERS_EVENTS, mCurrentFrameCallback);
+      }
     }
 
     public void maybePostFromNonUI() {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.java

@@ -7,10 +7,11 @@
 
 package com.facebook.react.uimanager.events;
 
+import android.view.Choreographer;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.modules.core.ChoreographerCompat;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.systrace.Systrace;
@@ -20,6 +21,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * A singleton class that overrides {@link EventDispatcher} with no-op methods, to be used by
  * callers that expect an EventDispatcher when the instance doesn't exist.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class FabricEventDispatcher implements EventDispatcher, LifecycleEventListener {
   private final ReactEventEmitter mReactEventEmitter;
   private final ReactApplicationContext mReactContext;
@@ -38,10 +40,10 @@ public class FabricEventDispatcher implements EventDispatcher, LifecycleEventLis
 
   @Override
   public void dispatchEvent(Event event) {
-    event.dispatchModern(mReactEventEmitter);
     for (EventDispatcherListener listener : mListeners) {
       listener.onEventDispatch(event);
     }
+    event.dispatchModern(mReactEventEmitter);
 
     event.dispose();
     maybePostFrameCallbackFromNonUI();
@@ -125,7 +127,7 @@ public class FabricEventDispatcher implements EventDispatcher, LifecycleEventLis
     mReactEventEmitter.unregister(uiManagerType);
   }
 
-  private class ScheduleDispatchFrameCallback extends ChoreographerCompat.FrameCallback {
+  private class ScheduleDispatchFrameCallback implements Choreographer.FrameCallback {
     private volatile boolean mIsPosted = false;
     private boolean mShouldStop = false;