react-native-tvos 0.75.2-0rc0 → 0.76.0-0rc0

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h

@@ -7,19 +7,18 @@
 
 #pragma once
 
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+#include <memory>
+#include <unordered_map>
+
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/JavaTurboModule.h>
 #include <ReactCommon/NativeMethodCallInvokerHolder.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-#include <react/bridging/LongLivedObject.h>
-#include <react/jni/CxxModuleWrapper.h>
 #include <react/jni/JRuntimeExecutor.h>
-#include <memory>
-#include <unordered_map>
 
 namespace facebook::react {
 
@@ -44,7 +43,7 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   jni::global_ref<TurboModuleManagerDelegate::javaobject> delegate_;
 
   using ModuleCache =
-      std::unordered_map<std::string, std::shared_ptr<react::TurboModule>>;
+      std::unordered_map<std::string, std::shared_ptr<TurboModule>>;
 
   /**
    * TODO(T48018690):
@@ -52,25 +51,32 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
    * We need to come up with a mechanism to allow modules to specify whether
    * they want to be long-lived or short-lived.
    */
-  std::shared_ptr<ModuleCache> turboModuleCache_;
-  std::shared_ptr<ModuleCache> legacyModuleCache_;
+  ModuleCache turboModuleCache_;
+  ModuleCache legacyModuleCache_;
 
-  static void installJSIBindings(
-      jni::alias_ref<jhybridobject> javaPart,
-      bool shouldCreateLegacyModules,
-      bool enableSyncVoidMethods);
   explicit TurboModuleManager(
       RuntimeExecutor runtimeExecutor,
       std::shared_ptr<CallInvoker> jsCallInvoker,
       std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
 
-  TurboModuleProviderFunctionType createTurboModuleProvider(
+  static void installJSIBindings(
+      jni::alias_ref<jhybridobject> javaPart,
+      bool shouldCreateLegacyModules);
+
+  static TurboModuleProviderFunctionType createTurboModuleProvider(
+      jni::alias_ref<jhybridobject> javaPart,
+      jsi::Runtime* runtime);
+  std::shared_ptr<TurboModule> getTurboModule(
       jni::alias_ref<jhybridobject> javaPart,
-      jsi::Runtime* runtime,
-      bool enableSyncVoidMethods);
-  TurboModuleProviderFunctionType createLegacyModuleProvider(
+      const std::string& name,
+      jsi::Runtime& runtime);
+
+  static TurboModuleProviderFunctionType createLegacyModuleProvider(
       jni::alias_ref<jhybridobject> javaPart);
+  std::shared_ptr<TurboModule> getLegacyModule(
+      jni::alias_ref<jhybridobject> javaPart,
+      const std::string& name);
 };
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt

@@ -8,20 +8,32 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"ReactNative\")
 
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
 file(GLOB uimanagerjni_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-add_library(uimanagerjni SHARED ${uimanagerjni_SRC})
+add_library(uimanagerjni
+        OBJECT
+            ${uimanagerjni_SRC}
+            $<TARGET_OBJECTS:react_render_graphics>
+            $<TARGET_OBJECTS:rrc_legacyviewmanagerinterop>
+            $<TARGET_OBJECTS:rrc_view>
+)
+target_merge_so(uimanagerjni)
 
 target_include_directories(uimanagerjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(uimanagerjni
+        bridgelessnativeviewconfig
+        callinvokerholder
         fb
         fbjni
         folly_runtime
         glog
         glog_init
-        bridgelessnativeviewconfig
+        jsi
+        log
+        react_render_componentregistry
+        reactnativejni
         rrc_native
         yoga
-        callinvokerholder
-        reactnativejni
-        react_render_componentregistry)
+)

package/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

@@ -54,7 +54,7 @@ SET(folly_runtime_SRC
         folly/system/ThreadId.cpp
         folly/system/ThreadName.cpp)
 
-add_library(folly_runtime SHARED ${folly_runtime_SRC})
+add_library(folly_runtime STATIC ${folly_runtime_SRC})
 
 target_compile_options(folly_runtime
         PRIVATE

package/ReactAndroid/src/main/jni/third-party/glog/CMakeLists.txt

@@ -17,7 +17,7 @@ add_compile_options(
 )
 
 add_library(glog
-        SHARED
+        STATIC
         glog-0.3.5/src/demangle.cc
         glog-0.3.5/src/logging.cc
         glog-0.3.5/src/raw_logging.cc

package/ReactAndroid/src/main/res/devsupport/drawable/paused_in_debugger_background.xml

@@ -15,7 +15,7 @@
                     android:color="#FFFFC1"
                     />
                 <stroke
-                    android:color="#D0D0B8" android:width="2dp"
+                    android:color="#B4B49D" android:width="2dp"
                     />
                 <corners
                     android:radius="12dp"

package/ReactAndroid/src/main/res/devsupport/drawable/paused_in_debugger_dialog_background.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource"
+    >
+    <solid android:color="#B3000000"/>
+</shape>

package/ReactAndroid/src/main/res/devsupport/layout/paused_in_debugger_view.xml

@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout"
-    android:layout_width="match_parent"
+    android:id="@+id/button"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="center"
     android:layoutDirection="ltr"
     android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@android:color/transparent"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingStart="17dp"
+    android:paddingEnd="11dp"
     tools:ignore="MissingDefaultResource"
     >
-
     <TextView
-        android:id="@+id/paused_text"
+        android:id="@+id/button_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="14dp"
         android:text=""
-        android:textColor="@android:color/black"
-        android:textSize="16sp"
+        android:textColor="#444"
+        android:textSize="16dp"
         android:textStyle="bold"
+        android:layout_marginBottom="1dp"
         />
-
-    <ImageButton
-        android:id="@+id/resume_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="@drawable/ripple_effect"
-        android:clickable="true"
-        android:focusable="true"
-        android:paddingVertical="8dp"
+    <ImageView
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:src="@drawable/ic_resume"
+        android:layout_marginStart="8dp"
+        android:layout_marginVertical="8dp"
         />
 </LinearLayout>

package/ReactAndroid/src/main/res/devsupport/values/strings.xml

@@ -3,8 +3,8 @@
   <string name="catalyst_reload" project="catalyst" translatable="false">Reload</string>
   <string name="catalyst_reload_error" project="catalyst" translatable="false">Failed to load bundle. Try restarting the bundler or reconnecting your device.</string>
   <string name="catalyst_change_bundle_location" project="catalyst" translatable="false">Change Bundle Location</string>
-  <string name="catalyst_open_debugger_error" project="catalyst" translatable="false">Failed to open debugger. Please check that the dev server is running and reload the app.</string>
-  <string name="catalyst_debug_open" project="catalyst" translatable="false">Open Debugger</string>
+  <string name="catalyst_open_debugger_error" project="catalyst" translatable="false">Failed to open DevTools. Please check that the dev server is running and reload the app.</string>
+  <string name="catalyst_debug_open" project="catalyst" translatable="false">Open DevTools</string>
   <string name="catalyst_debug_open_disabled" project="catalyst" translatable="false">Connect to the bundler to debug JavaScript</string>
   <string name="catalyst_debug_connecting" project="catalyst" translatable="false">Connecting to debugger...</string>
   <string name="catalyst_debug_error" project="catalyst" translatable="false">Failed to connect to debugger!</string>

package/ReactAndroid/src/main/res/devsupport/values/styles.xml

@@ -36,4 +36,8 @@
     <item name="android:textColor">#dddddd</item>
     <item name="android:textSize">14sp</item>
   </style>
+  <style name="NoAnimationDialog" parent="Theme.AppCompat.Dialog">
+    <item name="android:windowEnterAnimation">@null</item>
+    <item name="android:windowExitAnimation">@null</item>
+  </style>
 </resources>

package/ReactAndroid/src/main/res/devsupport/xml/rn_dev_preferences.xml

@@ -33,11 +33,5 @@
         android:summary="Debug server host & port for downloading JS bundle or communicating with JS debugger. With this setting empty launcher should work fine when running on emulator (or genymotion) and connection to debug server running on emulator's host."
         android:defaultValue=""
         />
-    <CheckBoxPreference
-        android:key="start_sampling_profiler_on_init"
-        android:title="Start Sampling Profiler on init"
-        android:summary="If true the Sampling Profiler will start on initialization of JS. Useful for profiling startup of the app. Reload JS or restart the app after changing this setting."
-        android:defaultValue="0"
-        />
   </PreferenceCategory>
 </PreferenceScreen>

package/ReactAndroid/src/main/res/views/alert/layout/alert_title_layout.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical|start"
+    android:orientation="horizontal"
+    android:paddingStart="?android:attr/dialogPreferredPadding"
+    android:paddingTop="18dp"
+    android:paddingEnd="?android:attr/dialogPreferredPadding">
+
+    <TextView
+        android:id="@+id/alert_title"
+        style="?android:attr/windowTitleStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAlignment="viewStart"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="18sp" />
+
+</LinearLayout>

package/ReactAndroid/src/main/res/views/uimanager/values/ids.xml

@@ -62,4 +62,7 @@
 
   <!-- tag is used to store graphical filter effects to apply to the view -->
   <item type="id" name="filter"/>
+
+  <!-- tag is used to store mixBlendMode effects to apply to the view -->
+  <item type="id" name="mix_blend_mode"/>
 </resources>

package/ReactCommon/cxxreact/CMakeLists.txt

@@ -14,7 +14,7 @@ add_compile_options(
         -DLOG_TAG=\"ReactNative\")
 
 file(GLOB react_cxxreact_SRC CONFIGURE_DEPENDS *.cpp)
-add_library(react_cxxreact STATIC ${react_cxxreact_SRC})
+add_library(react_cxxreact OBJECT ${react_cxxreact_SRC})
 
 target_include_directories(react_cxxreact PUBLIC ${REACT_COMMON_DIR})
 
@@ -28,4 +28,5 @@ target_link_libraries(react_cxxreact
         logger
         reactperflogger
         runtimeexecutor
+        react_timing
         react_debug)

package/ReactCommon/cxxreact/CxxModule.h

@@ -14,8 +14,6 @@
 
 #include <folly/dynamic.h>
 
-using namespace std::placeholders;
-
 namespace facebook::react {
 
 class Instance;

package/ReactCommon/cxxreact/JSExecutor.cpp

@@ -12,6 +12,7 @@
 #include <folly/Conv.h>
 #include <jsinspector-modern/ReactCdp.h>
 
+#include <react/timing/primitives.h>
 #include <chrono>
 
 namespace facebook::react {
@@ -26,13 +27,7 @@ std::string JSExecutor::getSyntheticBundlePath(
 }
 
 double JSExecutor::performanceNow() {
-  auto time = std::chrono::steady_clock::now();
-  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
-                      time.time_since_epoch())
-                      .count();
-
-  constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
-  return duration / NANOSECONDS_IN_MILLISECOND;
+  return chronoToDOMHighResTimeStamp(std::chrono::steady_clock::now());
 }
 
 jsinspector_modern::RuntimeTargetDelegate&

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "React-logger", version
   s.dependency "React-debug", version
+  s.dependency "React-timing", version
 
   s.resource_bundles = {'React-cxxreact_privacy' => 'PrivacyInfo.xcprivacy'}
 

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -16,8 +16,9 @@ namespace ReactMarker {
 #pragma clang diagnostic ignored "-Wglobal-constructors"
 #endif
 
-LogTaggedMarker logTaggedMarkerImpl = nullptr;
 LogTaggedMarker logTaggedMarkerBridgelessImpl = nullptr;
+LogTaggedMarker logTaggedMarkerImpl = nullptr;
+std::shared_mutex logTaggedMarkerImplMutex;
 
 #if __clang__
 #pragma clang diagnostic pop
@@ -28,7 +29,14 @@ void logMarker(const ReactMarkerId markerId) {
 }
 
 void logTaggedMarker(const ReactMarkerId markerId, const char* tag) {
-  logTaggedMarkerImpl(markerId, tag);
+  LogTaggedMarker marker = nullptr;
+  {
+    std::shared_lock lock(logTaggedMarkerImplMutex);
+    marker = logTaggedMarkerImpl;
+  }
+  if (marker != nullptr) {
+    marker(markerId, tag);
+  }
 }
 
 void logMarkerBridgeless(const ReactMarkerId markerId) {

package/ReactCommon/cxxreact/ReactMarker.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <cmath>
+#include <shared_mutex>
 
 #ifdef __APPLE__
 #include <functional>
@@ -51,7 +52,10 @@ typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char* tag);
 #define RN_EXPORT __attribute__((visibility("default")))
 #endif
 
-extern RN_EXPORT LogTaggedMarker logTaggedMarkerImpl; // Bridge only
+extern RN_EXPORT std::shared_mutex logTaggedMarkerImplMutex;
+/// - important: To ensure this gets read and written to in a thread safe
+/// manner, make use of `logTaggedMarkerImplMutex`.
+extern RN_EXPORT LogTaggedMarker logTaggedMarkerImpl;
 extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl;
 
 extern RN_EXPORT void logMarker(const ReactMarkerId markerId); // Bridge only

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -16,8 +16,8 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 75;
-  int32_t Patch = 2;
+  int32_t Minor = 76;
+  int32_t Patch = 0;
   std::string_view Prerelease = "0rc0";
 } ReactNativeVersion;
 

package/ReactCommon/cxxreact/SystraceSection.h

@@ -76,6 +76,7 @@ using SystraceSectionUnwrapped = DummySystraceSection;
  */
 #if defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && \
     !defined(WITH_LOOM_TRACE)
+
 namespace systrace {
 
 template <typename T, typename = void>
@@ -95,6 +96,14 @@ static auto render(const T& t)
 
 inline os_log_t instrumentsLogHandle = nullptr;
 
+static inline os_log_t getOrCreateInstrumentsLogHandle() {
+  if (!instrumentsLogHandle) {
+    instrumentsLogHandle = os_log_create(
+        "dev.reactnative.instruments", OS_LOG_CATEGORY_DYNAMIC_TRACING);
+  }
+  return instrumentsLogHandle;
+}
+
 } // namespace systrace
 
 struct SystraceSection {
@@ -102,14 +111,11 @@ struct SystraceSection {
   template <typename... ConvertsToStringPiece>
   explicit SystraceSection(const char* name, ConvertsToStringPiece&&... args)
       : systraceSectionUnwrapped_(name, args...) {
-    if (!systrace::instrumentsLogHandle) {
-      systrace::instrumentsLogHandle = os_log_create(
-          "dev.reactnative.instruments", OS_LOG_CATEGORY_DYNAMIC_TRACING);
-    }
+    os_log_t instrumentsLogHandle = systrace::getOrCreateInstrumentsLogHandle();
 
     // If the log isn't enabled, we don't want the performance overhead of the
     // rest of the code below.
-    if (!os_signpost_enabled(systrace::instrumentsLogHandle)) {
+    if (!os_signpost_enabled(instrumentsLogHandle)) {
       return;
     }
 
@@ -121,13 +127,12 @@ struct SystraceSection {
       argsString += argsVector[i] + "=" + argsVector[i + 1] + ";";
     }
 
-    signpostID_ =
-        os_signpost_id_make_with_pointer(systrace::instrumentsLogHandle, this);
+    signpostID_ = os_signpost_id_make_with_pointer(instrumentsLogHandle, this);
 
     os_signpost_interval_begin(
-        systrace::instrumentsLogHandle,
+        instrumentsLogHandle,
         signpostID_,
-        "SystraceSection",
+        "Systrace",
         "%s begin: %s",
         name,
         argsString.c_str());
@@ -139,7 +144,7 @@ struct SystraceSection {
     os_signpost_interval_end(
         systrace::instrumentsLogHandle,
         signpostID_,
-        "SystraceSection",
+        "Systrace",
         "%s end",
         name_.data());
   }

package/ReactCommon/cxxreact/tests/jsarg_helpers.cpp

@@ -105,7 +105,7 @@ TEST(JsArgumentHelpersTest, args) {
   EXPECT_JSAE(
       jsArgAsInt(args, 4),
       "Error converting javascript arg 4 to C++: "
-      "TypeError: expected dynamic type `int/double/bool/string', but had type `array'");
+      "TypeError: expected dynamic type 'int/double/bool/string', but had type 'array'");
   // type predicate failure
   EXPECT_JSAE(
       jsArgAsObject(args, 4),

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -11,15 +11,15 @@ add_compile_options(-std=c++20)
 file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
         hermes_executor_common
-        STATIC
+        OBJECT
         ${hermes_executor_SRC}
 )
 target_include_directories(hermes_executor_common PUBLIC .)
 target_link_libraries(hermes_executor_common
-        jsireact
         hermes-engine::libhermes
-        jsi
         hermes_inspector_modern
+        jsi
+        reactnative
 )
 
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)

package/ReactCommon/hermes/inspector-modern/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 file(GLOB hermesinspectormodern_SRC CONFIGURE_DEPENDS chrome/*.cpp)
 
 add_library(hermes_inspector_modern
-        STATIC
+        OBJECT
         ${hermesinspectormodern_SRC})
 
 target_compile_options(
@@ -29,9 +29,6 @@ endif()
 
 target_include_directories(hermes_inspector_modern PUBLIC ${REACT_COMMON_DIR})
 target_link_libraries(hermes_inspector_modern
-        jsinspector
-        fb
-        glog
         hermes-engine::libhermes
         jsi
-        runtimeexecutor)
+        reactnative)

package/ReactCommon/jsc/CMakeLists.txt

@@ -17,18 +17,20 @@ add_compile_options(
         -Wno-unused-lambda-capture
         -DLOG_TAG=\"ReactNative\")
 
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
 add_library(jscruntime
-        STATIC
+        OBJECT
         JSCRuntime.h
         JSCRuntime.cpp)
 
 target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_merge_so(jscruntime)
 
 target_link_libraries(jscruntime
-        folly_runtime
         jsc
         jsi
-        glog)
+        reactnative)
 
 if(NOT ${CMAKE_BUILD_TYPE} MATCHES Debug)
         target_compile_options(jscruntime PRIVATE -DNDEBUG)

package/ReactCommon/jserrorhandler/CMakeLists.txt

@@ -11,7 +11,7 @@ add_compile_options(-std=c++20)
 file(GLOB_RECURSE js_error_handler_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
         jserrorhandler
-        STATIC
+        OBJECT
         ${js_error_handler_SRC}
 )
 target_include_directories(jserrorhandler PUBLIC .)