react-native 0.66.2 → 0.67.0-rc.3

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

@@ -7,11 +7,13 @@
 
 package com.facebook.react.devsupport.interfaces;
 
+import android.app.Activity;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import java.io.File;
 
@@ -107,4 +109,16 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
   }
 
   void setPackagerLocationCustomizer(PackagerLocationCustomizer packagerLocationCustomizer);
+
+  @Nullable
+  Activity getCurrentActivity();
+
+  /**
+   * Create the surface delegate that the provided module should use to interact with
+   *
+   * @param moduleName the module name that helps decide which surface it should interact with
+   * @return a {@link SurfaceDelegate} instance
+   */
+  @Nullable
+  SurfaceDelegate createSurfaceDelegate(String moduleName);
 }

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

@@ -9,12 +9,13 @@ package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 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.queue.MessageQueueThread;
+import com.facebook.react.bridge.RuntimeScheduler;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
@@ -37,9 +38,9 @@ public class Binding {
 
   private native void installFabricUIManager(
       RuntimeExecutor runtimeExecutor,
+      RuntimeScheduler runtimeScheduler,
       Object uiManager,
       EventBeatManager eventBeatManager,
-      MessageQueueThread jsMessageQueueThread,
       ComponentFactory componentsRegistry,
       Object reactNativeConfig);
 
@@ -83,17 +84,17 @@ public class Binding {
 
   public void register(
       @NonNull RuntimeExecutor runtimeExecutor,
+      @Nullable RuntimeScheduler runtimeScheduler,
       @NonNull FabricUIManager fabricUIManager,
       @NonNull EventBeatManager eventBeatManager,
-      @NonNull MessageQueueThread jsMessageQueueThread,
       @NonNull ComponentFactory componentFactory,
       @NonNull ReactNativeConfig reactNativeConfig) {
     fabricUIManager.setBinding(this);
     installFabricUIManager(
         runtimeExecutor,
+        runtimeScheduler,
         fabricUIManager,
         eventBeatManager,
-        jsMessageQueueThread,
         componentFactory,
         reactNativeConfig);
 

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

@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
-import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.common.mapbuffer.ReadableMapBufferSoLoader;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
@@ -41,23 +40,20 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.get");
     final EventBeatManager eventBeatManager = new EventBeatManager(mReactApplicationContext);
     final FabricUIManager uiManager = createUIManager(eventBeatManager);
+
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding");
     final Binding binding = new Binding();
+
     if (ReactFeatureFlags.enableEagerInitializeMapBufferSoFile) {
       ReadableMapBufferSoLoader.staticInit();
     }
-    MessageQueueThread jsMessageQueueThread =
-        mReactApplicationContext
-            .getCatalystInstance()
-            .getReactQueueConfiguration()
-            .getJSQueueThread();
 
     binding.register(
         mReactApplicationContext.getCatalystInstance().getRuntimeExecutor(),
+        mReactApplicationContext.getCatalystInstance().getRuntimeScheduler(),
         uiManager,
         eventBeatManager,
-        jsMessageQueueThread,
         mComponentFactory,
         mConfig);
 

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

@@ -77,6 +77,7 @@ 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.EventCategoryDef;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcherImpl;
 import com.facebook.react.uimanager.events.LockFreeEventDispatcherImpl;
@@ -627,6 +628,15 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
           public int getSurfaceId() {
             return View.NO_ID;
           }
+
+          @Override
+          public String toString() {
+            String propsString =
+                IS_DEVELOPMENT_ENVIRONMENT
+                    ? (props != null ? props.toHashMap().toString() : "<null>")
+                    : "<hidden>";
+            return String.format("SYNC UPDATE PROPS [%d]: %s", reactTag, propsString);
+          }
         };
 
     // If the reactTag exists, we assume that it might at the end of the next
@@ -829,6 +839,23 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     receiveEvent(surfaceId, reactTag, eventName, false, 0, params);
   }
 
+  public void receiveEvent(
+      int surfaceId,
+      int reactTag,
+      String eventName,
+      boolean canCoalesceEvent,
+      int customCoalesceKey,
+      @Nullable WritableMap params) {
+    receiveEvent(
+        surfaceId,
+        reactTag,
+        eventName,
+        canCoalesceEvent,
+        customCoalesceKey,
+        params,
+        EventCategoryDef.UNSPECIFIED);
+  }
+
   /**
    * receiveEvent API that emits an event to C++. If `canCoalesceEvent` is true, that signals that
    * C++ may coalesce the event optionally. Otherwise, coalescing can happen in Java before
@@ -842,6 +869,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
    * @param canCoalesceEvent
    * @param customCoalesceKey
    * @param params
+   * @param eventCategory
    */
   public void receiveEvent(
       int surfaceId,
@@ -849,7 +877,8 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
       String eventName,
       boolean canCoalesceEvent,
       int customCoalesceKey,
-      @Nullable WritableMap params) {
+      @Nullable WritableMap params,
+      @EventCategoryDef int eventCategory) {
     if (ReactBuildConfig.DEBUG && surfaceId == View.NO_ID) {
       FLog.d(TAG, "Emitted event without surfaceId: [%d] %s", reactTag, eventName);
     }
@@ -870,7 +899,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
     if (canCoalesceEvent) {
       eventEmitter.invokeUnique(eventName, params, customCoalesceKey);
     } else {
-      eventEmitter.invoke(eventName, params);
+      eventEmitter.invoke(eventName, params, eventCategory);
     }
   }
 
@@ -996,6 +1025,11 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
           public int getSurfaceId() {
             return surfaceId;
           }
+
+          @Override
+          public String toString() {
+            return String.format("SET_JS_RESPONDER [%d] [surface:%d]", reactTag, surfaceId);
+          }
         });
   }
 
@@ -1015,6 +1049,11 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
           public int getSurfaceId() {
             return View.NO_ID;
           }
+
+          @Override
+          public String toString() {
+            return "CLEAR_JS_RESPONDER";
+          }
         });
   }
 

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

@@ -16,6 +16,7 @@ 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;
 
 /**
  * This class holds reference to the C++ EventEmitter object. Instances of this class are created on
@@ -36,7 +37,8 @@ public class EventEmitterWrapper {
     mHybridData = initHybrid();
   }
 
-  private native void invokeEvent(@NonNull String eventName, @NonNull NativeMap params);
+  private native void invokeEvent(
+      @NonNull String eventName, @NonNull NativeMap params, @EventCategoryDef int category);
 
   private native void invokeUniqueEvent(
       @NonNull String eventName, @NonNull NativeMap params, int customCoalesceKey);
@@ -47,12 +49,15 @@ public class EventEmitterWrapper {
    * @param eventName {@link String} name of the event to execute.
    * @param params {@link WritableMap} payload of the event
    */
-  public synchronized void invoke(@NonNull String eventName, @Nullable WritableMap params) {
+  public synchronized void invoke(
+      @NonNull String eventName,
+      @Nullable WritableMap params,
+      @EventCategoryDef int eventCategory) {
     if (!isValid()) {
       return;
     }
     NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
-    invokeEvent(eventName, payload);
+    invokeEvent(eventName, payload, eventCategory);
   }
 
   /**

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

@@ -10,8 +10,6 @@ package com.facebook.react.fabric.events;
 import static com.facebook.react.uimanager.events.TouchesHelper.CHANGED_TOUCHES_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_SURFACE_KEY;
-import static com.facebook.react.uimanager.events.TouchesHelper.TOP_TOUCH_CANCEL_KEY;
-import static com.facebook.react.uimanager.events.TouchesHelper.TOP_TOUCH_END_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TOUCHES_KEY;
 
 import android.util.Pair;
@@ -24,7 +22,9 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.fabric.FabricUIManager;
+import com.facebook.react.uimanager.events.EventCategoryDef;
 import com.facebook.react.uimanager.events.RCTModernEventEmitter;
+import com.facebook.react.uimanager.events.TouchEventType;
 import com.facebook.systrace.Systrace;
 import java.util.HashSet;
 import java.util.Set;
@@ -47,7 +47,7 @@ public class FabricEventEmitter implements RCTModernEventEmitter {
   @Override
   public void receiveEvent(
       int surfaceId, int reactTag, String eventName, @Nullable WritableMap params) {
-    receiveEvent(surfaceId, reactTag, eventName, false, 0, params);
+    receiveEvent(surfaceId, reactTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED);
   }
 
   @Override
@@ -57,29 +57,46 @@ public class FabricEventEmitter implements RCTModernEventEmitter {
       String eventName,
       boolean canCoalesceEvent,
       int customCoalesceKey,
-      @Nullable WritableMap params) {
+      @Nullable WritableMap params,
+      @EventCategoryDef int category) {
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
         "FabricEventEmitter.receiveEvent('" + eventName + "')");
     mUIManager.receiveEvent(
-        surfaceId, reactTag, eventName, canCoalesceEvent, customCoalesceKey, params);
+        surfaceId, reactTag, eventName, canCoalesceEvent, customCoalesceKey, params, category);
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
   }
 
+  /**
+   * Processes touches in a JS compatible way and send it to Fabric core
+   *
+   * @param eventName the event name (see {@link TouchEventType})
+   * @param touches all the touch data extracted from MotionEvent
+   * @param changedIndices the indices of the pointers that changed (MOVE/CANCEL includes all
+   *     touches, START/END only the one that was added/removed)
+   */
   @Override
   public void receiveTouches(
-      @NonNull String eventTopLevelType,
+      @NonNull String eventName,
       @NonNull WritableArray touches,
       @NonNull WritableArray changedIndices) {
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+        "FabricEventEmitter.receiveTouches('" + eventName + "')");
+
+    boolean isFinalEvent =
+        TouchEventType.END.getJsName().equalsIgnoreCase(eventName)
+            || TouchEventType.CANCEL.getJsName().equalsIgnoreCase(eventName);
+
     Pair<WritableArray, WritableArray> result =
-        TOP_TOUCH_END_KEY.equalsIgnoreCase(eventTopLevelType)
-                || TOP_TOUCH_CANCEL_KEY.equalsIgnoreCase(eventTopLevelType)
+        isFinalEvent
             ? removeTouchesAtIndices(touches, changedIndices)
             : touchSubsequence(touches, changedIndices);
 
     WritableArray changedTouches = result.first;
     touches = result.second;
 
+    int eventCategory = getTouchCategory(eventName);
     for (int jj = 0; jj < changedTouches.size(); jj++) {
       WritableMap touch = getWritableMap(changedTouches.getMap(jj));
       // Touch objects can fulfill the role of `DOM` `Event` objects if we set
@@ -97,8 +114,10 @@ public class FabricEventEmitter implements RCTModernEventEmitter {
         rootNodeID = targetReactTag;
       }
 
-      receiveEvent(targetSurfaceId, rootNodeID, eventTopLevelType, false, 0, touch);
+      receiveEvent(targetSurfaceId, rootNodeID, eventName, false, 0, touch, eventCategory);
     }
+
+    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
   }
 
   /** TODO T31905686 optimize this to avoid copying arrays */
@@ -174,4 +193,19 @@ public class FabricEventEmitter implements RCTModernEventEmitter {
     map.merge(readableMap);
     return map;
   }
+
+  @EventCategoryDef
+  private static int getTouchCategory(String touchEventType) {
+    int category = EventCategoryDef.UNSPECIFIED;
+    if (TouchEventType.MOVE.getJsName().equals(touchEventType)) {
+      category = EventCategoryDef.CONTINUOUS;
+    } else if (TouchEventType.START.getJsName().equals(touchEventType)) {
+      category = EventCategoryDef.CONTINUOUS_START;
+    } else if (TouchEventType.END.getJsName().equals(touchEventType)
+        || TouchEventType.CANCEL.getJsName().equals(touchEventType)) {
+      category = EventCategoryDef.CONTINUOUS_END;
+    }
+
+    return category;
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

@@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
+LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry libreact_render_runtimescheduler
 
 LOCAL_STATIC_LIBRARIES :=
 
@@ -56,6 +56,7 @@ $(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/imagemanager)
 $(call import-module,react/renderer/mapbuffer)
 $(call import-module,react/renderer/mounting)
+$(call import-module,react/renderer/runtimescheduler)
 $(call import-module,react/renderer/scheduler)
 $(call import-module,react/renderer/templateprocessor)
 $(call import-module,react/renderer/textlayoutmanager)

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeatV2.cpp

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <jsi/jsi.h>
+#include <react/renderer/core/EventBeat.h>
+#include <react/renderer/uimanager/primitives.h>
+
+#include "AsyncEventBeatV2.h"
+
+namespace facebook::react {
+
+AsyncEventBeatV2::AsyncEventBeatV2(
+    EventBeat::SharedOwnerBox const &ownerBox,
+    EventBeatManager *eventBeatManager,
+    RuntimeExecutor runtimeExecutor,
+    jni::global_ref<jobject> javaUIManager)
+    : EventBeat(ownerBox),
+      eventBeatManager_(eventBeatManager),
+      runtimeExecutor_(runtimeExecutor),
+      javaUIManager_(javaUIManager) {
+  eventBeatManager->addObserver(*this);
+}
+
+AsyncEventBeatV2::~AsyncEventBeatV2() {
+  eventBeatManager_->removeObserver(*this);
+}
+
+void AsyncEventBeatV2::tick() const {
+  if (!isRequested_ || isBeatCallbackScheduled_) {
+    return;
+  }
+
+  isRequested_ = false;
+  isBeatCallbackScheduled_ = true;
+
+  runtimeExecutor_([this, ownerBox = ownerBox_](jsi::Runtime &runtime) {
+    isBeatCallbackScheduled_ = false;
+    auto owner = ownerBox->owner.lock();
+    if (!owner) {
+      return;
+    }
+
+    if (beatCallback_) {
+      beatCallback_(runtime);
+    }
+  });
+}
+
+void AsyncEventBeatV2::induce() const {
+  tick();
+}
+
+void AsyncEventBeatV2::request() const {
+  bool alreadyRequested = isRequested_;
+  EventBeat::request();
+  if (!alreadyRequested) {
+    // Notifies java side that an event will be dispatched (e.g. LayoutEvent)
+    static auto onRequestEventBeat =
+        jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+            ->getMethod<void()>("onRequestEventBeat");
+    onRequestEventBeat(javaUIManager_);
+  }
+}
+
+} // namespace facebook::react

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeatV2.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/EventBeat.h>
+
+#include "EventBeatManager.h"
+
+namespace facebook::react {
+
+class AsyncEventBeatV2 final : public EventBeat,
+                               public EventBeatManagerObserver {
+ public:
+  AsyncEventBeatV2(
+      EventBeat::SharedOwnerBox const &ownerBox,
+      EventBeatManager *eventBeatManager,
+      RuntimeExecutor runtimeExecutor,
+      jni::global_ref<jobject> javaUIManager);
+
+  ~AsyncEventBeatV2() override;
+
+  void tick() const override;
+
+  void induce() const override;
+
+  void request() const override;
+
+ private:
+  EventBeatManager *eventBeatManager_;
+  RuntimeExecutor runtimeExecutor_;
+  jni::global_ref<jobject> javaUIManager_;
+  mutable std::atomic<bool> isBeatCallbackScheduled_{false};
+};
+
+} // namespace facebook::react

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK

@@ -11,12 +11,8 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/fabric",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
+    compiler_flags_enable_exceptions = True,
+    compiler_flags_enable_rtti = True,  # dynamic_cast used within Binding.cpp
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     platforms = ANDROID,