react-native 0.0.0-16bb2ae4f → 0.0.0-18697adec

package/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK

@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )

package/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK

@@ -23,6 +23,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/network:network"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java

@@ -41,6 +41,7 @@ public final class ReconnectingWebSocket extends WebSocketListener {
 
   private final String mUrl;
   private final Handler mHandler;
+  private final OkHttpClient mOkHttpClient;
   private boolean mClosed = false;
   private boolean mSuppressConnectionErrors;
   private @Nullable WebSocket mWebSocket;
@@ -48,12 +49,20 @@ public final class ReconnectingWebSocket extends WebSocketListener {
   private @Nullable ConnectionCallback mConnectionCallback;
 
   public ReconnectingWebSocket(
-      String url, MessageCallback messageCallback, ConnectionCallback connectionCallback) {
+      String url,
+      @Nullable MessageCallback messageCallback,
+      @Nullable ConnectionCallback connectionCallback) {
     super();
     mUrl = url;
     mMessageCallback = messageCallback;
     mConnectionCallback = connectionCallback;
     mHandler = new Handler(Looper.getMainLooper());
+    mOkHttpClient =
+        new OkHttpClient.Builder()
+            .connectTimeout(10, TimeUnit.SECONDS)
+            .writeTimeout(10, TimeUnit.SECONDS)
+            .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
+            .build();
   }
 
   public void connect() {
@@ -61,15 +70,8 @@ public final class ReconnectingWebSocket extends WebSocketListener {
       throw new IllegalStateException("Can't connect closed client");
     }
 
-    OkHttpClient httpClient =
-        new OkHttpClient.Builder()
-            .connectTimeout(10, TimeUnit.SECONDS)
-            .writeTimeout(10, TimeUnit.SECONDS)
-            .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
-            .build();
-
     Request request = new Request.Builder().url(mUrl).build();
-    httpClient.newWebSocket(request, this);
+    mOkHttpClient.newWebSocket(request, this);
   }
 
   private synchronized void delayedReconnect() {

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

@@ -34,7 +34,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/camera:camera"),
         react_native_target("java/com/facebook/react/modules/clipboard:clipboard"),
         react_native_target("java/com/facebook/react/modules/core:core"),
-        react_native_target("java/com/facebook/react/modules/datepicker:datepicker"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
         react_native_target("java/com/facebook/react/modules/dialog:dialog"),
         react_native_target("java/com/facebook/react/modules/fresco:fresco"),

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java

@@ -23,7 +23,6 @@ import com.facebook.react.modules.blob.BlobModule;
 import com.facebook.react.modules.blob.FileReaderModule;
 import com.facebook.react.modules.camera.ImageStoreManager;
 import com.facebook.react.modules.clipboard.ClipboardModule;
-import com.facebook.react.modules.datepicker.DatePickerDialogModule;
 import com.facebook.react.modules.dialog.DialogModule;
 import com.facebook.react.modules.fresco.FrescoModule;
 import com.facebook.react.modules.i18nmanager.I18nManagerModule;
@@ -72,7 +71,6 @@ import java.util.Map;
       FileReaderModule.class,
       AsyncStorageModule.class,
       ClipboardModule.class,
-      DatePickerDialogModule.class,
       DialogModule.class,
       FrescoModule.class,
       I18nManagerModule.class,
@@ -117,8 +115,6 @@ public class MainReactPackage extends TurboReactPackage {
         return new AsyncStorageModule(context);
       case ClipboardModule.NAME:
         return new ClipboardModule(context);
-      case DatePickerDialogModule.FRAGMENT_TAG:
-        return new DatePickerDialogModule(context);
       case DialogModule.NAME:
         return new DialogModule(context);
       case FrescoModule.NAME:
@@ -199,7 +195,6 @@ public class MainReactPackage extends TurboReactPackage {
             FileReaderModule.class,
             AsyncStorageModule.class,
             ClipboardModule.class,
-            DatePickerDialogModule.class,
             DialogModule.class,
             FrescoModule.class,
             I18nManagerModule.class,

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

@@ -60,7 +60,8 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
             (CallInvokerHolderImpl) jsCallInvokerHolder,
             (CallInvokerHolderImpl) nativeCallInvokerHolder,
             delegate,
-            ReactFeatureFlags.useTurboModulesRAIICallbackManager);
+            ReactFeatureFlags.useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+            ReactFeatureFlags.useTurboModuleManagerCallbackCleanupScope);
     installJSIBindings();
 
     mEagerInitModuleNames =
@@ -293,7 +294,8 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
       CallInvokerHolderImpl jsCallInvokerHolder,
       CallInvokerHolderImpl nativeCallInvokerHolder,
       TurboModuleManagerDelegate tmmDelegate,
-      boolean useTurboModulesRAIICallbackManager);
+      boolean useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      boolean useTurboModuleManagerCallbackCleanupScope);
 
   private native void installJSIBindings();
 

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/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;
@@ -319,7 +319,7 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
                   });
         }
       } else {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG, new ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"));
       }
 

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();
+}