react-native 0.0.0-17be3a003 → 0.0.0-18697adec

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

@@ -26,13 +26,35 @@ TurboModuleManager::TurboModuleManager(
     RuntimeExecutor runtimeExecutor,
     std::shared_ptr<CallInvoker> jsCallInvoker,
     std::shared_ptr<CallInvoker> nativeCallInvoker,
-    jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate)
+    jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
+    bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+    bool useTurboModuleManagerCallbackCleanupScope)
     : javaPart_(jni::make_global(jThis)),
       runtimeExecutor_(runtimeExecutor),
       jsCallInvoker_(jsCallInvoker),
       nativeCallInvoker_(nativeCallInvoker),
       delegate_(jni::make_global(delegate)),
-      turboModuleCache_(std::make_shared<TurboModuleCache>()) {}
+      turboModuleCache_(std::make_shared<TurboModuleCache>()) {
+  if (useGlobalCallbackCleanupScopeUsingRetainJSCallback) {
+    longLivedObjectCollection_ = nullptr;
+    retainJSCallback_ = [](jsi::Function &&callback,
+                           jsi::Runtime &runtime,
+                           std::shared_ptr<CallInvoker> jsInvoker) {
+      return CallbackWrapper::createWeak(
+          std::move(callback), runtime, jsInvoker);
+    };
+  } else if (useTurboModuleManagerCallbackCleanupScope) {
+    longLivedObjectCollection_ = std::make_shared<LongLivedObjectCollection>();
+    retainJSCallback_ = [longLivedObjectCollection =
+                             longLivedObjectCollection_](
+                            jsi::Function &&callback,
+                            jsi::Runtime &runtime,
+                            std::shared_ptr<CallInvoker> jsInvoker) {
+      return CallbackWrapper::createWeak(
+          longLivedObjectCollection, std::move(callback), runtime, jsInvoker);
+    };
+  }
+}
 
 jni::local_ref<TurboModuleManager::jhybriddata> TurboModuleManager::initHybrid(
     jni::alias_ref<jhybridobject> jThis,
@@ -40,20 +62,19 @@ jni::local_ref<TurboModuleManager::jhybriddata> TurboModuleManager::initHybrid(
     jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder,
     jni::alias_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder,
     jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
-    bool useTurboModulesRAIICallbackManager) {
+    bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+    bool useTurboModuleManagerCallbackCleanupScope) {
   auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
   auto nativeCallInvoker = nativeCallInvokerHolder->cthis()->getCallInvoker();
 
-  if (useTurboModulesRAIICallbackManager) {
-    JavaTurboModule::enableUseTurboModulesRAIICallbackManager(true);
-  }
-
   return makeCxxInstance(
       jThis,
       runtimeExecutor->cthis()->get(),
       jsCallInvoker,
       nativeCallInvoker,
-      delegate);
+      delegate,
+      useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      useTurboModuleManagerCallbackCleanupScope);
 }
 
 void TurboModuleManager::registerNatives() {
@@ -75,7 +96,8 @@ void TurboModuleManager::installJSIBindings() {
          jsCallInvoker_ = std::weak_ptr<CallInvoker>(jsCallInvoker_),
          nativeCallInvoker_ = std::weak_ptr<CallInvoker>(nativeCallInvoker_),
          delegate_ = jni::make_weak(delegate_),
-         javaPart_ = jni::make_weak(javaPart_)](
+         javaPart_ = jni::make_weak(javaPart_),
+         retainJSCallback = retainJSCallback_](
             const std::string &name) -> std::shared_ptr<TurboModule> {
       auto turboModuleCache = turboModuleCache_.lock();
       auto jsCallInvoker = jsCallInvoker_.lock();
@@ -136,7 +158,8 @@ void TurboModuleManager::installJSIBindings() {
             .moduleName = name,
             .instance = moduleInstance,
             .jsInvoker = jsCallInvoker,
-            .nativeInvoker = nativeCallInvoker};
+            .nativeInvoker = nativeCallInvoker,
+            .retainJSCallback = retainJSCallback};
 
         auto turboModule = delegate->cthis()->getTurboModule(name, params);
         turboModuleCache->insert({name, turboModule});
@@ -147,7 +170,12 @@ void TurboModuleManager::installJSIBindings() {
       return nullptr;
     };
 
-    TurboModuleBinding::install(runtime, std::move(turboModuleProvider));
+    if (longLivedObjectCollection_) {
+      TurboModuleBinding::install(
+          runtime, std::move(turboModuleProvider), longLivedObjectCollection_);
+    } else {
+      TurboModuleBinding::install(runtime, std::move(turboModuleProvider));
+    }
   });
 }
 

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

@@ -9,6 +9,7 @@
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/LongLivedObject.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
@@ -33,7 +34,8 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
       jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder,
       jni::alias_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
-      bool useTurboModulesRAIICallbackManager);
+      bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      bool useTurboModuleManagerCallbackCleanupScope);
   static void registerNatives();
 
  private:
@@ -44,6 +46,9 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   std::shared_ptr<CallInvoker> nativeCallInvoker_;
   jni::global_ref<TurboModuleManagerDelegate::javaobject> delegate_;
 
+  JSCallbackRetainer retainJSCallback_;
+  std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
+
   using TurboModuleCache =
       std::unordered_map<std::string, std::shared_ptr<react::TurboModule>>;
 
@@ -61,7 +66,9 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
       RuntimeExecutor runtimeExecutor,
       std::shared_ptr<CallInvoker> jsCallInvoker,
       std::shared_ptr<CallInvoker> nativeCallInvoker,
-      jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
+      jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
+      bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      bool useTurboModuleManagerCallbackCleanupScope);
 };
 
 } // namespace react

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

@@ -13,9 +13,8 @@ import android.view.Display;
 import android.view.WindowManager;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
@@ -81,40 +80,20 @@ public class DisplayMetricsHolder {
     return sScreenDisplayMetrics;
   }
 
-  public static Map<String, Map<String, Object>> getDisplayMetricsMap(double fontScale) {
+  public static WritableMap getDisplayMetricsWritableMap(double fontScale) {
     Assertions.assertCondition(
         sWindowDisplayMetrics != null && sScreenDisplayMetrics != null,
-        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics");
-    final Map<String, Map<String, Object>> result = new HashMap<>();
-    result.put("windowPhysicalPixels", getPhysicalPixelsMap(sWindowDisplayMetrics, fontScale));
-    result.put("screenPhysicalPixels", getPhysicalPixelsMap(sScreenDisplayMetrics, fontScale));
-    return result;
-  }
-
-  public static WritableNativeMap getDisplayMetricsNativeMap(double fontScale) {
-    Assertions.assertCondition(
-        sWindowDisplayMetrics != null && sScreenDisplayMetrics != null,
-        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics");
+        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or"
+            + " initDisplayMetrics");
     final WritableNativeMap result = new WritableNativeMap();
     result.putMap(
-        "windowPhysicalPixels", getPhysicalPixelsNativeMap(sWindowDisplayMetrics, fontScale));
+        "windowPhysicalPixels", getPhysicalPixelsWritableMap(sWindowDisplayMetrics, fontScale));
     result.putMap(
-        "screenPhysicalPixels", getPhysicalPixelsNativeMap(sScreenDisplayMetrics, fontScale));
-    return result;
-  }
-
-  private static Map<String, Object> getPhysicalPixelsMap(
-      DisplayMetrics displayMetrics, double fontScale) {
-    final Map<String, Object> result = new HashMap<>();
-    result.put("width", displayMetrics.widthPixels);
-    result.put("height", displayMetrics.heightPixels);
-    result.put("scale", displayMetrics.density);
-    result.put("fontScale", fontScale);
-    result.put("densityDpi", displayMetrics.densityDpi);
+        "screenPhysicalPixels", getPhysicalPixelsWritableMap(sScreenDisplayMetrics, fontScale));
     return result;
   }
 
-  private static WritableNativeMap getPhysicalPixelsNativeMap(
+  private static WritableMap getPhysicalPixelsWritableMap(
       DisplayMetrics displayMetrics, double fontScale) {
     final WritableNativeMap result = new WritableNativeMap();
     result.putInt("width", displayMetrics.widthPixels);

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

@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.TouchEvent;
 import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper;
@@ -50,14 +51,22 @@ public class JSTouchDispatcher {
     mTargetTag = -1;
   }
 
+  /**
+   * See Event.java. By contract, this surfaceId should be a valid SurfaceId in Fabric, and should
+   * ALWAYS return -1 in non-Fabric.
+   *
+   * @return
+   */
   private int getSurfaceId() {
-    if (mRootViewGroup instanceof ReactRoot) {
+    if (mRootViewGroup != null
+        && mRootViewGroup instanceof ReactRoot
+        && ((ReactRoot) mRootViewGroup).getUIManagerType() == UIManagerType.FABRIC) {
+      if (mRootViewGroup.getContext() instanceof ThemedReactContext) {
+        ThemedReactContext context = (ThemedReactContext) mRootViewGroup.getContext();
+        return context.getSurfaceId();
+      }
       return ((ReactRoot) mRootViewGroup).getRootViewTag();
     }
-    if (mRootViewGroup != null && mRootViewGroup.getContext() instanceof ThemedReactContext) {
-      ThemedReactContext context = (ThemedReactContext) mRootViewGroup.getContext();
-      return context.getSurfaceId();
-    }
     return -1;
   }
 

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

@@ -30,7 +30,6 @@ import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
@@ -852,9 +851,8 @@ public class NativeViewHierarchyManager {
               + commandId);
     }
     ViewManager viewManager = resolveViewManager(reactTag);
-    ViewManagerDelegate delegate;
-    if (ReactFeatureFlags.useViewManagerDelegatesForCommands
-        && (delegate = viewManager.getDelegate()) != null) {
+    ViewManagerDelegate delegate = viewManager.getDelegate();
+    if (delegate != null) {
       delegate.receiveCommand(view, commandId, args);
     } else {
       viewManager.receiveCommand(view, commandId, args);

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

@@ -13,7 +13,6 @@ import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.config.ReactFeatureFlags;
 
 /**
  * Class responsible for optimizing the native view hierarchy while still respecting the final UI
@@ -425,18 +424,16 @@ public class NativeViewHierarchyOptimizer {
     // Bit of a hack: we need to update the layout of this node's children now that it's no longer
     // layout-only, but we may still receive more layout updates at the end of this batch that we
     // don't want to ignore.
-    if (ReactFeatureFlags.enableTransitionLayoutOnlyViewCleanup) {
-      FLog.i(
-          TAG,
-          "Transitioning LayoutOnlyView - tag: "
-              + node.getReactTag()
-              + " - rootTag: "
-              + node.getRootTag()
-              + " - hasProps: "
-              + (props != null)
-              + " - tagsWithLayout.size: "
-              + mTagsWithLayoutVisited.size());
-    }
+    FLog.i(
+        TAG,
+        "Transitioning LayoutOnlyView - tag: "
+            + node.getReactTag()
+            + " - rootTag: "
+            + node.getRootTag()
+            + " - hasProps: "
+            + (props != null)
+            + " - tagsWithLayout.size: "
+            + mTagsWithLayoutVisited.size());
     Assertions.assertCondition(mTagsWithLayoutVisited.size() == 0);
     applyLayoutBase(node);
     for (int i = 0; i < node.getChildCount(); i++) {

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

@@ -24,11 +24,6 @@ public class PixelUtil {
     return toPixelFromDIP((float) value);
   }
 
-  /** Convert from PX to SP */
-  public static float toSPFromPixel(float value) {
-    return value / DisplayMetricsHolder.getScreenDisplayMetrics().scaledDensity;
-  }
-
   /** Convert from SP to PX */
   public static float toPixelFromSP(float value) {
     return toPixelFromSP(value, Float.NaN);
@@ -58,6 +53,6 @@ public class PixelUtil {
 
   /** @return {@link float} that represents the density of the display metrics for device screen. */
   public static float getDisplayMetricDensity() {
-    return DisplayMetricsHolder.getScreenDisplayMetrics().density;
+    return DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 }

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

@@ -26,7 +26,7 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -82,6 +82,7 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
   public enum AccessibilityRole {
     NONE,
     BUTTON,
+    TOGGLEBUTTON,
     LINK,
     SEARCH,
     IMAGE,
@@ -106,12 +107,15 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
     TAB,
     TABLIST,
     TIMER,
+    LIST,
     TOOLBAR;
 
     public static String getValue(AccessibilityRole role) {
       switch (role) {
         case BUTTON:
           return "android.widget.Button";
+        case TOGGLEBUTTON:
+          return "android.widget.ToggleButton";
         case SEARCH:
           return "android.widget.EditText";
         case IMAGE:
@@ -132,6 +136,8 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
           return "android.widget.SpinButton";
         case SWITCH:
           return "android.widget.Switch";
+        case LIST:
+          return "android.widget.AbsListView";
         case NONE:
         case LINK:
         case SUMMARY:
@@ -313,7 +319,7 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
                   });
         }
       } else {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG, new ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"));
       }
 
@@ -382,16 +388,16 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
         spannable.setSpan(new URLSpan(""), 0, spannable.length(), 0);
         nodeInfo.setText(spannable);
       }
-    } else if (role.equals(AccessibilityRole.SEARCH)) {
-      nodeInfo.setRoleDescription(context.getString(R.string.search_description));
     } else if (role.equals(AccessibilityRole.IMAGE)) {
       nodeInfo.setRoleDescription(context.getString(R.string.image_description));
     } else if (role.equals(AccessibilityRole.IMAGEBUTTON)) {
       nodeInfo.setRoleDescription(context.getString(R.string.imagebutton_description));
       nodeInfo.setClickable(true);
     } else if (role.equals(AccessibilityRole.BUTTON)) {
-      nodeInfo.setRoleDescription(context.getString(R.string.button_description));
       nodeInfo.setClickable(true);
+    } else if (role.equals(AccessibilityRole.TOGGLEBUTTON)) {
+      nodeInfo.setClickable(true);
+      nodeInfo.setCheckable(true);
     } else if (role.equals(AccessibilityRole.SUMMARY)) {
       nodeInfo.setRoleDescription(context.getString(R.string.summary_description));
     } else if (role.equals(AccessibilityRole.HEADER)) {

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

@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.uimanager;
+
+/**
+ * Some Views may not function if added directly to a ViewGroup that clips them. For example, TTRC
+ * markers may rely on `onDraw` functionality to work properly, and will break if they're clipped
+ * out of the View hierarchy for any resaon.
+ *
+ * <p>This situation can occur more often in Fabric with View Flattening. We may prevent this sort
+ * of View Flattening from occurring in the future, but the connection is not entirely certain.
+ *
+ * <p>This can occur either because ReactViewGroup clips them out, using the ordinarary subview
+ * clipping feature. It is also possible if a View is added directly to a ReactRootView below the
+ * fold of the screen.
+ *
+ * <p>Generally the solution is to prevent View flattening in JS by adding `collapsable=false` to a
+ * parent component of the clipped view, and/or move the View higher up in the hierarchy so it is
+ * always rendered within the first page of the screen.
+ */
+public interface ReactClippingProhibitedView {}

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

@@ -43,12 +43,16 @@ public class ReactClippingViewGroupHelper {
         // Intersect the view with the parent's rectangle
         // This will result in the overlap with coordinates in the parent space
         if (!sHelperRect.intersect(
-            view.getLeft(), view.getTop(), view.getRight(), view.getBottom())) {
+            view.getLeft(),
+            view.getTop() + (int) view.getTranslationY(),
+            view.getRight(),
+            view.getBottom() + (int) view.getTranslationY())) {
           outputRect.setEmpty();
           return;
         }
         // Now we move the coordinates to the View's coordinate space
         sHelperRect.offset(-view.getLeft(), -view.getTop());
+        sHelperRect.offset(-(int) view.getTranslationX(), -(int) view.getTranslationY());
         sHelperRect.offset(view.getScrollX(), view.getScrollY());
         outputRect.set(sHelperRect);
         return;

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

@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.uimanager;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+/**
+ * Interface that should be implemented by {@link View} subclasses that support {@code overflow}
+ * style. This allows the overflow information to be used by {@link TouchTargetHelper} to determine
+ * if a View is touchable.
+ */
+public interface ReactOverflowView {
+  /**
+   * Gets the overflow state of a view. If set, this should be one of {@link ViewProps#HIDDEN},
+   * {@link ViewProps#VISIBLE} or {@link ViewProps#SCROLL}.
+   */
+  @Nullable
+  String getOverflow();
+}