react-native-tvos 0.71.13-1 → 0.72.4-0

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

@@ -53,13 +53,14 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.events.FabricEventEmitter;
+import com.facebook.react.fabric.interop.InteropEventEmitter;
 import com.facebook.react.fabric.mounting.MountItemDispatcher;
 import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.fabric.mounting.SurfaceMountingManager.ViewEvent;
+import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.DispatchIntCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.DispatchStringCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.IntBufferBatchMountItem;
@@ -78,13 +79,14 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManagerPropertyUpdater;
 import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
 import com.facebook.react.uimanager.events.EventCategoryDef;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcherImpl;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -167,7 +169,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   @NonNull private final MountItemDispatcher mMountItemDispatcher;
   @NonNull private final ViewManagerRegistry mViewManagerRegistry;
 
-  @NonNull private final EventBeatManager mEventBeatManager;
+  @NonNull private final BatchEventDispatchedListener mBatchEventDispatchedListener;
 
   @NonNull
   private final CopyOnWriteArrayList<UIManagerListener> mListeners = new CopyOnWriteArrayList<>();
@@ -182,9 +184,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
    */
   private volatile boolean mDestroyed = false;
 
-  // TODO T83943316: Delete this variable once StaticViewConfigs are enabled by default
-  private volatile boolean mShouldDeallocateEventDispatcher = false;
-
   private boolean mDriveCxxAnimations = false;
 
   private long mDispatchViewUpdatesTime = 0l;
@@ -209,40 +208,17 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
         }
       };
 
-  // TODO T83943316: Deprecate and delete this constructor once StaticViewConfigs are enabled by
-  // default
-  @Deprecated
   public FabricUIManager(
-      ReactApplicationContext reactContext,
-      ViewManagerRegistry viewManagerRegistry,
-      EventDispatcher eventDispatcher,
-      EventBeatManager eventBeatManager) {
-    mDispatchUIFrameCallback = new DispatchUIFrameCallback(reactContext);
-    mReactApplicationContext = reactContext;
-    mMountingManager = new MountingManager(viewManagerRegistry, mMountItemExecutor);
-    mMountItemDispatcher =
-        new MountItemDispatcher(mMountingManager, new MountItemDispatchListener());
-    mEventDispatcher = eventDispatcher;
-    mShouldDeallocateEventDispatcher = false;
-    mEventBeatManager = eventBeatManager;
-    mReactApplicationContext.addLifecycleEventListener(this);
-
-    mViewManagerRegistry = viewManagerRegistry;
-    mReactApplicationContext.registerComponentCallbacks(viewManagerRegistry);
-  }
-
-  public FabricUIManager(
-      ReactApplicationContext reactContext,
-      ViewManagerRegistry viewManagerRegistry,
-      EventBeatManager eventBeatManager) {
+      @NonNull ReactApplicationContext reactContext,
+      @NonNull ViewManagerRegistry viewManagerRegistry,
+      @NonNull BatchEventDispatchedListener batchEventDispatchedListener) {
     mDispatchUIFrameCallback = new DispatchUIFrameCallback(reactContext);
     mReactApplicationContext = reactContext;
     mMountingManager = new MountingManager(viewManagerRegistry, mMountItemExecutor);
     mMountItemDispatcher =
         new MountItemDispatcher(mMountingManager, new MountItemDispatchListener());
     mEventDispatcher = new EventDispatcherImpl(reactContext);
-    mShouldDeallocateEventDispatcher = true;
-    mEventBeatManager = eventBeatManager;
+    mBatchEventDispatchedListener = batchEventDispatchedListener;
     mReactApplicationContext.addLifecycleEventListener(this);
 
     mViewManagerRegistry = viewManagerRegistry;
@@ -302,13 +278,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     return mBinding.getInspectorDataForInstance(eventEmitter);
   }
 
-  @Override
-  public void preInitializeViewManagers(List<String> viewManagerNames) {
-    for (String viewManagerName : viewManagerNames) {
-      mMountingManager.initializeViewManager(viewManagerName);
-    }
-  }
-
   @Override
   @AnyThread
   @ThreadConfined(ANY)
@@ -417,13 +386,18 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   @Override
   public void initialize() {
     mEventDispatcher.registerEventEmitter(FABRIC, new FabricEventEmitter(this));
-    mEventDispatcher.addBatchEventDispatchedListener(mEventBeatManager);
+    mEventDispatcher.addBatchEventDispatchedListener(mBatchEventDispatchedListener);
     if (ENABLE_FABRIC_PERF_LOGS) {
       mDevToolsReactPerfLogger = new DevToolsReactPerfLogger();
       mDevToolsReactPerfLogger.addDevToolsReactPerfLoggerListener(FABRIC_PERF_LOGGER);
 
       ReactMarker.addFabricListener(mDevToolsReactPerfLogger);
     }
+    if (ReactFeatureFlags.unstable_useFabricInterop) {
+      InteropEventEmitter interopEventEmitter = new InteropEventEmitter(mReactApplicationContext);
+      mReactApplicationContext.internal_registerInteropModule(
+          RCTEventEmitter.class, interopEventEmitter);
+    }
   }
 
   // This is called on the JS thread (see CatalystInstanceImpl).
@@ -451,7 +425,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     // memory immediately.
     mDispatchUIFrameCallback.stop();
 
-    mEventDispatcher.removeBatchEventDispatchedListener(mEventBeatManager);
+    mEventDispatcher.removeBatchEventDispatchedListener(mBatchEventDispatchedListener);
     mEventDispatcher.unregisterEventEmitter(FABRIC);
 
     mReactApplicationContext.unregisterComponentCallbacks(mViewManagerRegistry);
@@ -467,10 +441,11 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
 
     ViewManagerPropertyUpdater.clear();
 
-    // When using StaticViewConfigs is enabled, FabriUIManager is
-    // responsible for initializing and deallocating EventDispatcher.
+    // When StaticViewConfigs is enabled, FabriUIManager is
+    // responsible for initializing and deallocating EventDispatcher. StaticViewConfigs is enabled
+    // only in Bridgeless for now.
     // TODO T83943316: Remove this IF once StaticViewConfigs are enabled by default
-    if (mShouldDeallocateEventDispatcher) {
+    if (!ReactFeatureFlags.enableBridgelessArchitecture) {
       mEventDispatcher.onCatalystInstanceDestroyed();
     }
   }
@@ -1065,8 +1040,16 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       final int reactTag,
       final String commandId,
       @Nullable final ReadableArray commandArgs) {
-    mMountItemDispatcher.dispatchCommandMountItem(
-        new DispatchStringCommandMountItem(surfaceId, reactTag, commandId, commandArgs));
+    if (ReactFeatureFlags.unstable_useFabricInterop) {
+      // For Fabric Interop, we check if the commandId is an integer. If it is, we use the integer
+      // overload of dispatchCommand. Otherwise, we use the string overload.
+      // and the events won't be correctly dispatched.
+      mMountItemDispatcher.dispatchCommandMountItem(
+          createDispatchCommandMountItemForInterop(surfaceId, reactTag, commandId, commandArgs));
+    } else {
+      mMountItemDispatcher.dispatchCommandMountItem(
+          new DispatchStringCommandMountItem(surfaceId, reactTag, commandId, commandArgs));
+    }
   }
 
   @Override
@@ -1088,6 +1071,8 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       eventType = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
     } else if ("click".equals(eventTypeJS)) {
       eventType = AccessibilityEvent.TYPE_VIEW_CLICKED;
+    } else if ("viewHoverEnter".equals(eventTypeJS)) {
+      eventType = AccessibilityEvent.TYPE_VIEW_HOVER_ENTER;
     } else {
       throw new IllegalArgumentException(
           "sendAccessibilityEventFromJS: invalid eventType " + eventTypeJS);
@@ -1202,6 +1187,20 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   }
 
   private class MountItemDispatchListener implements MountItemDispatcher.ItemDispatchListener {
+    @Override
+    public void willMountItems() {
+      for (UIManagerListener listener : mListeners) {
+        listener.willMountItems(FabricUIManager.this);
+      }
+    }
+
+    @Override
+    public void didMountItems() {
+      for (UIManagerListener listener : mListeners) {
+        listener.didMountItems(FabricUIManager.this);
+      }
+    }
+
     @Override
     public void didDispatchMountItems() {
       for (UIManagerListener listener : mListeners) {
@@ -1210,6 +1209,24 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     }
   }
 
+  /**
+   * Util function that takes care of handling commands for Fabric Interop. If the command is a
+   * string that represents a number (say "42"), it will be parsed as an integer and the
+   * corresponding dispatch command mount item will be created.
+   */
+  /* package */ DispatchCommandMountItem createDispatchCommandMountItemForInterop(
+      final int surfaceId,
+      final int reactTag,
+      final String commandId,
+      @Nullable final ReadableArray commandArgs) {
+    try {
+      int commandIdInteger = Integer.parseInt(commandId);
+      return new DispatchIntCommandMountItem(surfaceId, reactTag, commandIdInteger, commandArgs);
+    } catch (NumberFormatException e) {
+      return new DispatchStringCommandMountItem(surfaceId, reactTag, commandId, commandArgs);
+    }
+  }
+
   private class DispatchUIFrameCallback extends GuardedFrameCallback {
 
     private volatile boolean mIsMountingEnabled = true;

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

@@ -14,7 +14,6 @@ import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.fabric.FabricSoLoader;
 import com.facebook.react.uimanager.events.EventCategoryDef;
 
@@ -56,8 +55,7 @@ public class EventEmitterWrapper {
     if (!isValid()) {
       return;
     }
-    NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
-    invokeEvent(eventName, payload, eventCategory);
+    invokeEvent(eventName, (NativeMap) params, eventCategory);
   }
 
   /**
@@ -72,8 +70,7 @@ public class EventEmitterWrapper {
     if (!isValid()) {
       return;
     }
-    NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
-    invokeUniqueEvent(eventName, payload, customCoalesceKey);
+    invokeUniqueEvent(eventName, (NativeMap) params, customCoalesceKey);
   }
 
   public synchronized void destroy() {

package/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEvent.java

@@ -0,0 +1,41 @@
+/*
+ * 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.interop;
+
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.uimanager.events.Event;
+
+/**
+ * An {@link Event} class used by the {@link InteropEventEmitter}. This class is just holding the
+ * event name and the data which is received by the `receiveEvent` method and will be passed over
+ * the the {@link com.facebook.react.uimanager.events.EventDispatcher}
+ */
+class InteropEvent extends Event<InteropEvent> {
+
+  private final String mName;
+  private final WritableMap mEventData;
+
+  InteropEvent(String name, @Nullable WritableMap eventData, int surfaceId, int viewTag) {
+    super(surfaceId, viewTag);
+    mName = name;
+    mEventData = eventData;
+  }
+
+  @Override
+  public String getEventName() {
+    return mName;
+  }
+
+  @Override
+  @VisibleForTesting
+  public WritableMap getEventData() {
+    return mEventData;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEventEmitter.java

@@ -0,0 +1,65 @@
+/*
+ * 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.interop;
+
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+
+/**
+ * A reimplementation of {@link RCTEventEmitter} which is using a {@link EventDispatcher} under the
+ * hood.
+ *
+ * <p>On Fabric, you're supposed to use {@link EventDispatcher} to dispatch events. However, we
+ * provide an interop layer for non-Fabric migrated components.
+ *
+ * <p>This instance will be returned if the user is invoking `context.getJsModule(RCTEventEmitter)
+ * and is providing support for the `receiveEvent` method, so that non-Fabric ViewManagers can
+ * continue to deliver events also when Fabric is turned on.
+ */
+public class InteropEventEmitter implements RCTEventEmitter {
+
+  private final ReactContext mReactContext;
+
+  private @Nullable EventDispatcher mEventDispatcherOverride;
+
+  public InteropEventEmitter(ReactContext reactContext) {
+    mReactContext = reactContext;
+  }
+
+  @Override
+  public void receiveEvent(int targetReactTag, String eventName, @Nullable WritableMap eventData) {
+    EventDispatcher dispatcher;
+    if (mEventDispatcherOverride != null) {
+      dispatcher = mEventDispatcherOverride;
+    } else {
+      dispatcher = UIManagerHelper.getEventDispatcherForReactTag(mReactContext, targetReactTag);
+    }
+    int surfaceId = UIManagerHelper.getSurfaceId(mReactContext);
+    if (dispatcher != null) {
+      dispatcher.dispatchEvent(new InteropEvent(eventName, eventData, surfaceId, targetReactTag));
+    }
+  }
+
+  @Override
+  public void receiveTouches(
+      String eventName, WritableArray touches, WritableArray changedIndices) {
+    throw new UnsupportedOperationException(
+        "EventEmitter#receiveTouches is not supported by the Fabric Interop Layer");
+  }
+
+  @VisibleForTesting
+  void overrideEventDispatcher(EventDispatcher eventDispatcherOverride) {
+    mEventDispatcherOverride = eventDispatcherOverride;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java

@@ -193,6 +193,8 @@ public class MountItemDispatcher {
       return false;
     }
 
+    mItemDispatchListener.willMountItems();
+
     // As an optimization, execute all ViewCommands first
     // This should be:
     // 1) Performant: ViewCommands are often a replacement for SetNativeProps, which we've always
@@ -276,6 +278,10 @@ public class MountItemDispatcher {
           // If there's an exception, we want to log diagnostics in prod and rethrow.
           FLog.e(TAG, "dispatchMountItems: caught exception, displaying mount state", e);
           for (MountItem m : mountItemsToDispatch) {
+            if (m == mountItem) {
+              // We want to mark the mount item that caused exception
+              FLog.e(TAG, "dispatchMountItems: mountItem: next mountItem triggered exception!");
+            }
             printMountItem(m, "dispatchMountItems: mountItem");
           }
           if (mountItem.getSurfaceId() != View.NO_ID) {
@@ -295,6 +301,9 @@ public class MountItemDispatcher {
       }
       mBatchedExecutionTime += SystemClock.uptimeMillis() - batchedExecutionStartTime;
     }
+
+    mItemDispatchListener.didMountItems();
+
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
 
     return true;
@@ -411,6 +420,10 @@ public class MountItemDispatcher {
   }
 
   public interface ItemDispatchListener {
+    void willMountItems();
+
+    void didMountItems();
+
     void didDispatchMountItems();
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java

@@ -420,10 +420,6 @@ public class MountingManager {
             attachmentsPositions);
   }
 
-  public void initializeViewManager(String componentName) {
-    mViewManagerRegistry.get(componentName);
-  }
-
   public void enqueuePendingEvent(int reactTag, ViewEvent viewEvent) {
     @Nullable SurfaceMountingManager smm = getSurfaceManagerForView(reactTag);
     if (smm == null) {

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -36,6 +36,7 @@ import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.touch.JSResponderHandler;
+import com.facebook.react.uimanager.IViewGroupManager;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.ReactOverflowViewWithInset;
 import com.facebook.react.uimanager.ReactRoot;
@@ -44,7 +45,6 @@ import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewManager;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.events.EventCategoryDef;
@@ -267,6 +267,7 @@ public class SurfaceMountingManager {
    */
   @AnyThread
   public void stopSurface() {
+    FLog.e(TAG, "Stopping surface [" + mSurfaceId + "]");
     if (isStopped()) {
       return;
     }
@@ -309,6 +310,7 @@ public class SurfaceMountingManager {
             if (ReactFeatureFlags.enableViewRecycling) {
               mViewManagerRegistry.onSurfaceStopped(mSurfaceId);
             }
+            FLog.e(TAG, "Surface [" + mSurfaceId + "] was stopped on SurfaceMountingManager.");
           }
         };
 
@@ -478,7 +480,7 @@ public class SurfaceMountingManager {
       logViewHierarchy(parentView, false);
     }
 
-    ViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(parentViewState);
+    IViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(parentViewState);
 
     // Verify that the view we're about to remove has the same tag we expect
     View view = viewGroupManager.getChildAt(parentView, index);
@@ -639,7 +641,7 @@ public class SurfaceMountingManager {
       logViewHierarchy(parentView, false);
     }
 
-    ViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(parentViewState);
+    IViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(parentViewState);
 
     // Verify that the view we're about to remove has the same tag we expect
     View view = viewGroupManager.getChildAt(parentView, index);
@@ -979,7 +981,7 @@ public class SurfaceMountingManager {
     }
 
     ViewState parentViewState = getViewState(parentTag);
-    ViewGroupManager<?> parentViewManager = null;
+    IViewGroupManager<?> parentViewManager = null;
     if (parentViewState.mViewManager != null) {
       parentViewManager = parentViewState.mViewManager.getViewGroupManager();
     }
@@ -1257,12 +1259,12 @@ public class SurfaceMountingManager {
   }
 
   @SuppressWarnings("unchecked") // prevents unchecked conversion warn of the <ViewGroup> type
-  private static @NonNull ViewGroupManager<ViewGroup> getViewGroupManager(
+  private static @NonNull IViewGroupManager<ViewGroup> getViewGroupManager(
       @NonNull ViewState viewState) {
     if (viewState.mViewManager == null) {
       throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
     }
-    return (ViewGroupManager<ViewGroup>) viewState.mViewManager.getViewGroupManager();
+    return (IViewGroupManager<ViewGroup>) viewState.mViewManager.getViewGroupManager();
   }
 
   public void printSurfaceState() {
@@ -1466,7 +1468,7 @@ public class SurfaceMountingManager {
               // subtree instead of recursing further.
               if (childrenAreManaged) {
                 try {
-                  // This can happen if the removeAllViews method is overriden to throw,
+                  // This can happen if the removeAllViews method is overridden to throw,
                   // which it is explicitly in some cases (for example embedded Litho views,
                   // but there could be other cases). In those cases, we want to fail silently
                   // and then assume the subtree is /not/ managed by React Native.

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java

@@ -16,7 +16,6 @@ import com.facebook.common.logging.FLog;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.fabric.CppViewMutationsWrapper;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.fabric.mounting.SurfaceMountingManager;
@@ -51,7 +50,6 @@ public class IntBufferBatchMountItem implements MountItem {
   static final int INSTRUCTION_UPDATE_PADDING = 512;
   static final int INSTRUCTION_UPDATE_OVERFLOW_INSET = 1024;
   static final int INSTRUCTION_REMOVE_DELETE_TREE = 2048;
-  static final int INSTRUCTION_RUN_CPP_VIEWS = 4096;
 
   private final int mSurfaceId;
   private final int mCommitNumber;
@@ -99,10 +97,6 @@ public class IntBufferBatchMountItem implements MountItem {
     return obj != null ? (EventEmitterWrapper) obj : null;
   }
 
-  private static CppViewMutationsWrapper castToCppViewMutationWrapper(Object obj) {
-    return obj != null ? (CppViewMutationsWrapper) obj : null;
-  }
-
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
     SurfaceMountingManager surfaceMountingManager = mountingManager.getSurfaceManager(mSurfaceId);
@@ -184,8 +178,6 @@ public class IntBufferBatchMountItem implements MountItem {
         } else if (type == INSTRUCTION_UPDATE_EVENT_EMITTER) {
           surfaceMountingManager.updateEventEmitter(
               mIntBuffer[i++], castToEventEmitter(mObjBuffer[j++]));
-        } else if (type == INSTRUCTION_RUN_CPP_VIEWS) {
-          castToCppViewMutationWrapper(mObjBuffer[j++]).runCppViewMutations();
         } else {
           throw new IllegalArgumentException(
               "Invalid type argument to IntBufferBatchMountItem: " + type + " at index: " + i);
@@ -286,9 +278,6 @@ public class IntBufferBatchMountItem implements MountItem {
           } else if (type == INSTRUCTION_UPDATE_EVENT_EMITTER) {
             j += 1;
             s.append(String.format("UPDATE EVENTEMITTER [%d]\n", mIntBuffer[i++]));
-          } else if (type == INSTRUCTION_RUN_CPP_VIEWS) {
-            j += 1;
-            s.append(String.format("RUN CPP_VIEWS [%d]\n", mIntBuffer[i++]));
           } else {
             FLog.e(TAG, "String so far: " + s.toString());
             throw new IllegalArgumentException(

package/ReactAndroid/src/main/java/com/facebook/react/modules/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java

@@ -24,18 +24,15 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 /**
  * Module that monitors and provides information about the state of Touch Exploration service on the
  * device. For API >= 19.
  */
-@ReactModule(name = AccessibilityInfoModule.NAME)
+@ReactModule(name = NativeAccessibilityInfoSpec.NAME)
 public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
     implements LifecycleEventListener {
 
-  public static final String NAME = "AccessibilityInfo";
-
   @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   private class ReactTouchExplorationStateChangeListener
       implements AccessibilityManager.TouchExplorationStateChangeListener {
@@ -101,17 +98,17 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
     mAccessibilityServiceChangeListener = new ReactAccessibilityServiceChangeListener();
   }
 
-  @Override
-  public String getName() {
-    return "AccessibilityInfo";
-  }
-
   @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   private boolean getIsReduceMotionEnabledValue() {
-    String value =
+    // Disabling animations in developer settings will set the animation scale to "0.0"
+    // but setting "reduce motion" / "disable animations" will set the animation scale to "0".
+    String rawValue =
         Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE);
 
-    return value != null && value.equals("0.0");
+    // Parse the value as a float so we can check for a single value.
+    Float parsedValue = rawValue != null ? Float.parseFloat(rawValue) : 1f;
+
+    return parsedValue == 0f;
   }
 
   @Override
@@ -137,9 +134,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
 
       ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
       if (reactApplicationContext != null) {
-        reactApplicationContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(REDUCE_MOTION_EVENT_NAME, mReduceMotionEnabled);
+        reactApplicationContext.emitDeviceEvent(REDUCE_MOTION_EVENT_NAME, mReduceMotionEnabled);
       }
     }
   }
@@ -151,8 +146,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
       ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
       if (reactApplicationContext != null) {
         getReactApplicationContext()
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(TOUCH_EXPLORATION_EVENT_NAME, mTouchExplorationEnabled);
+            .emitDeviceEvent(TOUCH_EXPLORATION_EVENT_NAME, mTouchExplorationEnabled);
       }
     }
   }
@@ -164,8 +158,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
       ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
       if (reactApplicationContext != null) {
         getReactApplicationContext()
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(ACCESSIBILITY_SERVICE_EVENT_NAME, mAccessibilityServiceEnabled);
+            .emitDeviceEvent(ACCESSIBILITY_SERVICE_EVENT_NAME, mAccessibilityServiceEnabled);
       }
     }
   }
@@ -206,12 +199,8 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
 
   @Override
   public void invalidate() {
+    getReactApplicationContext().removeLifecycleEventListener(this);
     super.invalidate();
-
-    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
-    if (applicationContext != null) {
-      applicationContext.removeLifecycleEventListener(this);
-    }
   }
 
   @Override