react-native 0.69.1 → 0.70.0-rc.0

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.h

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <ReactCommon/TurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+namespace facebook {
+namespace react {
+
+class CompositeTurboModuleManagerDelegate
+    : public jni::HybridClass<
+          CompositeTurboModuleManagerDelegate,
+          TurboModuleManagerDelegate> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/CompositeReactPackageTurboModuleManagerDelegate;";
+
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
+
+  static void registerNatives();
+
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string &moduleName,
+      const std::shared_ptr<CallInvoker> &jsInvoker) override;
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string &moduleName,
+      const JavaTurboModule::InitParams &params) override;
+
+ private:
+  friend HybridBase;
+  using HybridBase::HybridBase;
+  std::unordered_set<TurboModuleManagerDelegate *> mDelegates_;
+
+  void addTurboModuleManagerDelegate(
+      jni::alias_ref<TurboModuleManagerDelegate::javaobject>
+          turboModuleManagerDelegate);
+};
+
+} // namespace react
+} // namespace facebook

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp

@@ -9,6 +9,7 @@
 #include <fbjni/fbjni.h>
 #include <reactperflogger/JNativeModulePerfLogger.h>
 
+#include "CompositeTurboModuleManagerDelegate.h"
 #include "TurboModuleManager.h"
 
 void jniEnableCppLogging(
@@ -25,6 +26,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     // "ComponentDescriptorFactory" is defined in Fabric
     facebook::react::TurboModuleManager::registerNatives();
 
+    facebook::react::CompositeTurboModuleManagerDelegate::registerNatives();
+
     facebook::jni::registerNatives(
         "com/facebook/react/turbomodule/core/TurboModulePerfLogger",
         {makeNativeMethod("jniEnableCppLogging", jniEnableCppLogging)});

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp

@@ -20,6 +20,17 @@
 namespace facebook {
 namespace react {
 
+constexpr static auto ReactFeatureFlagsJavaDescriptor =
+    "com/facebook/react/config/ReactFeatureFlags";
+
+static int getFeatureFlagValue(const char *name) {
+  static const auto reactFeatureFlagsJavaDescriptor =
+      jni::findClassStatic(ReactFeatureFlagsJavaDescriptor);
+  const auto field =
+      reactFeatureFlagsJavaDescriptor->getStaticField<jint>(name);
+  return reactFeatureFlagsJavaDescriptor->getStaticFieldValue(field);
+}
+
 TurboModuleManager::TurboModuleManager(
     jni::alias_ref<TurboModuleManager::javaobject> jThis,
     RuntimeExecutor runtimeExecutor,
@@ -169,12 +180,13 @@ void TurboModuleManager::installJSIBindings() {
       return nullptr;
     };
 
-    if (longLivedObjectCollection_) {
-      TurboModuleBinding::install(
-          runtime, std::move(turboModuleProvider), longLivedObjectCollection_);
-    } else {
-      TurboModuleBinding::install(runtime, std::move(turboModuleProvider));
-    }
+    TurboModuleBindingMode bindingMode = static_cast<TurboModuleBindingMode>(
+        getFeatureFlagValue("turboModuleBindingMode"));
+    TurboModuleBinding::install(
+        runtime,
+        std::move(turboModuleProvider),
+        bindingMode,
+        longLivedObjectCollection_);
   });
 }
 

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h

@@ -23,11 +23,11 @@ class TurboModuleManagerDelegate
       "Lcom/facebook/react/turbomodule/core/TurboModuleManagerDelegate;";
 
   virtual std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
+      const std::string &name,
       const JavaTurboModule::InitParams &params) = 0;
   virtual std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
-      const std::shared_ptr<CallInvoker> jsInvoker) = 0;
+      const std::string &name,
+      const std::shared_ptr<CallInvoker> &jsInvoker) = 0;
 
  private:
   friend HybridBase;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK

@@ -18,6 +18,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
     ],
@@ -54,6 +55,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     provided_deps = [
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
@@ -105,6 +107,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
     ],

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

@@ -64,6 +64,82 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   private static final String STATE_EXPANDED = "expanded";
   private static final String STATE_MIXED = "mixed";
 
+  @Override
+  protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T view) {
+    // Reset tags
+    view.setTag(R.id.pointer_enter, null);
+    view.setTag(R.id.pointer_leave, null);
+    view.setTag(R.id.pointer_move, null);
+    view.setTag(R.id.react_test_id, null);
+    view.setTag(R.id.view_tag_native_id, null);
+    view.setTag(R.id.labelled_by, null);
+    view.setTag(R.id.accessibility_label, null);
+    view.setTag(R.id.accessibility_hint, null);
+    view.setTag(R.id.accessibility_role, null);
+    view.setTag(R.id.accessibility_state, null);
+    view.setTag(R.id.accessibility_actions, null);
+    view.setTag(R.id.accessibility_value, null);
+
+    // This indirectly calls (and resets):
+    // setTranslationX
+    // setTranslationY
+    // setRotation
+    // setRotationX
+    // setRotationY
+    // setScaleX
+    // setScaleY
+    // setCameraDistance
+    setTransform(view, null);
+
+    // RenderNode params not covered by setTransform above
+    view.setPivotX(0);
+    view.setPivotY(0);
+    view.setTop(0);
+    view.setBottom(0);
+    view.setLeft(0);
+    view.setRight(0);
+    view.setElevation(0);
+    view.setAnimationMatrix(null);
+
+    // setShadowColor
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      view.setOutlineAmbientShadowColor(Color.BLACK);
+      view.setOutlineSpotShadowColor(Color.BLACK);
+    }
+
+    // Focus IDs
+    // Also see in AOSP source:
+    // https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#4493
+    view.setNextFocusDownId(View.NO_ID);
+    view.setNextFocusForwardId(View.NO_ID);
+    view.setNextFocusRightId(View.NO_ID);
+    view.setNextFocusUpId(View.NO_ID);
+
+    // This is possibly subject to change and overrideable per-platform, but these
+    // are the default view flags in View.java:
+    // https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#2712
+    // `mViewFlags = SOUND_EFFECTS_ENABLED | HAPTIC_FEEDBACK_ENABLED | LAYOUT_DIRECTION_INHERIT`
+    // Therefore we set the following options as such:
+    view.setFocusable(false);
+    view.setFocusableInTouchMode(false);
+
+    // https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-mainline-12.0.0_r96/core/java/android/view/View.java#5491
+    view.setElevation(0);
+
+    // Predictably, alpha defaults to 1:
+    // https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#2186
+    // This accounts for resetting mBackfaceOpacity and mBackfaceVisibility
+    view.setAlpha(1);
+
+    // setPadding is a noop for most View types, but it is not for Text
+    setPadding(view, 0, 0, 0, 0);
+
+    // Other stuff
+    view.setForeground(null);
+
+    return view;
+  }
+
   @Override
   @ReactProp(
       name = ViewProps.BACKGROUND_COLOR,
@@ -175,6 +251,20 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     view.setTag(R.id.accessibility_role, AccessibilityRole.fromValue(accessibilityRole));
   }
 
+  @Override
+  @ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION)
+  public void setAccessibilityCollection(
+      @NonNull T view, @Nullable ReadableMap accessibilityCollection) {
+    view.setTag(R.id.accessibility_collection, accessibilityCollection);
+  }
+
+  @Override
+  @ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION_ITEM)
+  public void setAccessibilityCollectionItem(
+      @NonNull T view, @Nullable ReadableMap accessibilityCollectionItem) {
+    view.setTag(R.id.accessibility_collection_item, accessibilityCollectionItem);
+  }
+
   @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_STATE)
   public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {
@@ -462,33 +552,32 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
                     "phasedRegistrationNames",
                     MapBuilder.of("bubbled", "onPointerDown", "captured", "onPointerDownCapture")))
             .put(
-                "topPointerEnter2",
+                "topPointerEnter",
                 MapBuilder.of(
                     "phasedRegistrationNames",
                     MapBuilder.of(
                         "bubbled",
-                        "onPointerEnter2",
+                        "onPointerEnter",
                         "captured",
-                        "onPointerEnter2Capture",
+                        "onPointerEnterCapture",
                         "skipBubbling",
                         true)))
             .put(
-                "topPointerLeave2",
+                "topPointerLeave",
                 MapBuilder.of(
                     "phasedRegistrationNames",
                     MapBuilder.of(
                         "bubbled",
-                        "onPointerLeave2",
+                        "onPointerLeave",
                         "captured",
-                        "onPointerLeave2Capture",
+                        "onPointerLeaveCapture",
                         "skipBubbling",
                         true)))
             .put(
-                "topPointerMove2",
+                "topPointerMove",
                 MapBuilder.of(
                     "phasedRegistrationNames",
-                    MapBuilder.of(
-                        "bubbled", "onPointerMove2", "captured", "onPointerMove2Capture")))
+                    MapBuilder.of("bubbled", "onPointerMove", "captured", "onPointerMoveCapture")))
             .put(
                 "topPointerUp",
                 MapBuilder.of(
@@ -542,21 +631,39 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     FLog.w(ReactConstants.TAG, "%s doesn't support property '%s'", getName(), propName);
   }
 
+  /* Experimental W3C Pointer events start */
   @ReactProp(name = "onPointerEnter")
   public void setPointerEnter(@NonNull T view, boolean value) {
     view.setTag(R.id.pointer_enter, value);
   }
 
+  @ReactProp(name = "onPointerEnterCapture")
+  public void setPointerEnterCapture(@NonNull T view, boolean value) {
+    view.setTag(R.id.pointer_enter_capture, value);
+  }
+
   @ReactProp(name = "onPointerLeave")
   public void setPointerLeave(@NonNull T view, boolean value) {
     view.setTag(R.id.pointer_leave, value);
   }
 
+  @ReactProp(name = "onPointerLeaveCapture")
+  public void setPointerLeaveCapture(@NonNull T view, boolean value) {
+    view.setTag(R.id.pointer_leave_capture, value);
+  }
+
   @ReactProp(name = "onPointerMove")
   public void setPointerMove(@NonNull T view, boolean value) {
     view.setTag(R.id.pointer_move, value);
   }
 
+  @ReactProp(name = "onPointerMoveCapture")
+  public void setPointerMoveCapture(@NonNull T view, boolean value) {
+    view.setTag(R.id.pointer_move_capture, value);
+  }
+
+  /* Experimental W3C Pointer events end */
+
   @ReactProp(name = "onMoveShouldSetResponder")
   public void setMoveShouldSetResponder(@NonNull T view, boolean value) {
     // no-op, handled by JSResponder

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

@@ -31,6 +31,14 @@ public abstract class BaseViewManagerAdapter<T extends View>
   @Override
   public void setAccessibilityRole(@NonNull T view, @Nullable String accessibilityRole) {}
 
+  @Override
+  public void setAccessibilityCollection(
+      @NonNull T view, @Nullable ReadableMap accessibilityCollection) {}
+
+  @Override
+  public void setAccessibilityCollectionItem(
+      @NonNull T view, @Nullable ReadableMap accessibilityCollectionItem) {}
+
   @Override
   public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {}
 

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

@@ -48,6 +48,12 @@ public abstract class BaseViewManagerDelegate<T extends View, U extends BaseView
       case ViewProps.ACCESSIBILITY_STATE:
         mViewManager.setViewState(view, (ReadableMap) value);
         break;
+      case ViewProps.ACCESSIBILITY_COLLECTION:
+        mViewManager.setAccessibilityCollection(view, (ReadableMap) value);
+        break;
+      case ViewProps.ACCESSIBILITY_COLLECTION_ITEM:
+        mViewManager.setAccessibilityCollectionItem(view, (ReadableMap) value);
+        break;
       case ViewProps.BACKGROUND_COLOR:
         mViewManager.setBackgroundColor(
             view, value == null ? 0 : ColorPropConverter.getColor(value, view.getContext()));

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

@@ -28,6 +28,10 @@ public interface BaseViewManagerInterface<T extends View> {
 
   void setAccessibilityRole(T view, @Nullable String accessibilityRole);
 
+  void setAccessibilityCollection(T view, @Nullable ReadableMap accessibilityCollection);
+
+  void setAccessibilityCollectionItem(T view, @Nullable ReadableMap accessibilityCollectionItem);
+
   void setViewState(T view, @Nullable ReadableMap accessibilityState);
 
   void setBackgroundColor(T view, int backgroundColor);

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

@@ -7,13 +7,13 @@
 
 package com.facebook.react.uimanager;
 
+import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.ChoreographerCompat;
 
 /**
  * Abstract base for a Choreographer FrameCallback that should have any RuntimeExceptions it throws
- * handled by the {@link com.facebook.react.bridge.NativeModuleCallExceptionHandler} registered if
- * the app is in dev mode.
+ * handled by the {@link JSExceptionHandler} registered if the app is in dev mode.
  */
 public abstract class GuardedFrameCallback extends ChoreographerCompat.FrameCallback {