react-native-tvos 0.77.1-0 → 0.78.0-0

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<0b07eaeba8112f65ecb18d53b7b893af>>
+ * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
  */
 
 /**
@@ -42,10 +42,7 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool disableMountItemReorderingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableAlignItemsBaselineOnFabricIOS(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool enableAndroidLineHeightCentering(
+  static bool enableAccumulatedUpdatesInRawPropsAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool enableBridgelessArchitecture(
@@ -69,9 +66,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableFabricRenderer(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableFabricRendererExclusively(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool enableFixForViewCommandRace(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -81,6 +75,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableIOSViewClipToPaddingBox(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableImagePrefetchingAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableLayoutAnimationsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -114,13 +111,13 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool excludeYogaFromRawProps(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool fixMappingOfEventPrioritiesBetweenFabricAndReact(
+  static bool fixDifferentiatorEmittingUpdatesWithWrongParentTag(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid(
+  static bool fixMappingOfEventPrioritiesBetweenFabricAndReact(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool fuseboxEnabledDebug(
+  static bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool fuseboxEnabledRelease(
@@ -156,6 +153,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useOptimizedEventBatchingOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool useRawPropsJsiValue(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool useRuntimeShadowNodeReferenceUpdate(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp

@@ -41,10 +41,7 @@ static ::hermes::vm::RuntimeConfig makeRuntimeConfig(jlong heapSizeMB) {
 }
 
 static void installBindings(jsi::Runtime& runtime) {
-  react::Logger androidLogger =
-      static_cast<void (*)(const std::string&, unsigned int)>(
-          &reactAndroidLoggingHook);
-  react::bindNativeLogger(runtime, androidLogger);
+  react::bindNativeLogger(runtime, &reactAndroidLoggingHook);
 }
 
 class HermesExecutorHolder

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

@@ -32,7 +32,6 @@ target_include_directories(reactnativejni PUBLIC ../../)
 target_link_libraries(reactnativejni
         android
         callinvokerholder
-        fb
         fbjni
         folly_runtime
         glog_init

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -21,7 +21,6 @@
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/RAMBundleRegistry.h>
 #include <cxxreact/RecoverableError.h>
-#include <fb/log.h>
 #include <fbjni/ByteBuffer.h>
 #include <folly/dynamic.h>
 #include <glog/logging.h>

package/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp

@@ -7,21 +7,16 @@
 
 #include "JSLogging.h"
 
-#include <fb/log.h>
+#include <android/log.h>
 
 namespace facebook::react {
 
-void reactAndroidLoggingHook(
-    const std::string& message,
-    android_LogPriority logLevel) {
-  FBLOG_PRI(logLevel, "ReactNativeJS", "%s", message.c_str());
-}
-
 void reactAndroidLoggingHook(
     const std::string& message,
     unsigned int logLevel) {
-  reactAndroidLoggingHook(
-      message, static_cast<android_LogPriority>(logLevel + ANDROID_LOG_DEBUG));
+  auto logPriority =
+      static_cast<android_LogPriority>(logLevel + ANDROID_LOG_DEBUG);
+  __android_log_write(logPriority, "ReactNativeJS", message.c_str());
 }
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/jni/JSLogging.h

@@ -7,14 +7,10 @@
 
 #pragma once
 
-#include <android/log.h>
 #include <string>
 
 namespace facebook::react {
 
-void reactAndroidLoggingHook(
-    const std::string& message,
-    android_LogPriority logLevel);
 void reactAndroidLoggingHook(const std::string& message, unsigned int logLevel);
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp

@@ -7,7 +7,8 @@
 
 #include "JniJSModulesUnbundle.h"
 
-#include <fb/assert.h>
+#include <react/debug/react_native_assert.h>
+
 #include <libgen.h>
 #include <sys/endian.h>
 #include <cstdint>
@@ -72,9 +73,7 @@ bool JniJSModulesUnbundle::isUnbundle(
 JSModulesUnbundle::Module JniJSModulesUnbundle::getModule(
     uint32_t moduleId) const {
   // can be nullptr for default constructor.
-  FBASSERTMSGF(
-      m_assetManager != nullptr,
-      "Unbundle has not been initialized with an asset manager");
+  react_native_assert(m_assetManager != nullptr);
 
   std::ostringstream sourceUrlBuilder;
   sourceUrlBuilder << moduleId << ".js";

package/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp

@@ -9,8 +9,7 @@
 
 #include <cxxreact/JSBigString.h>
 #include <cxxreact/ModuleRegistry.h>
-#include <cxxreact/SystraceSection.h>
-#include <fb/assert.h>
+#include <cxxreact/TraceSection.h>
 #include <folly/json.h>
 
 #include <memory>
@@ -53,7 +52,7 @@ void ProxyExecutor::initializeRuntime() {
   folly::dynamic nativeModuleConfig = folly::dynamic::array;
 
   {
-    SystraceSection s("collectNativeModuleDescriptions");
+    TraceSection s("collectNativeModuleDescriptions");
     auto moduleRegistry = m_delegate->getModuleRegistry();
     for (const auto& name : moduleRegistry->moduleNames()) {
       auto config = moduleRegistry->getConfig(name);
@@ -65,7 +64,7 @@ void ProxyExecutor::initializeRuntime() {
       "remoteModuleConfig", std::move(nativeModuleConfig));
 
   {
-    SystraceSection t("setGlobalVariable");
+    TraceSection t("setGlobalVariable");
     setGlobalVariable(
         "__fbBatchedBridgeConfig",
         std::make_unique<JSBigStdString>(folly::toJson(config)));

package/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp

@@ -47,6 +47,11 @@ void WritableNativeArray::pushInt(jint value) {
   array_.push_back(value);
 }
 
+void WritableNativeArray::pushLong(jlong value) {
+  throwIfConsumed();
+  array_.push_back(value);
+}
+
 void WritableNativeArray::pushString(jstring value) {
   if (value == NULL) {
     pushNull();
@@ -81,6 +86,7 @@ void WritableNativeArray::registerNatives() {
       makeNativeMethod("pushBoolean", WritableNativeArray::pushBoolean),
       makeNativeMethod("pushDouble", WritableNativeArray::pushDouble),
       makeNativeMethod("pushInt", WritableNativeArray::pushInt),
+      makeNativeMethod("pushLong", WritableNativeArray::pushLong),
       makeNativeMethod("pushString", WritableNativeArray::pushString),
       makeNativeMethod("pushNativeArray", WritableNativeArray::pushNativeArray),
       makeNativeMethod("pushNativeMap", WritableNativeArray::pushNativeMap),

package/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h

@@ -36,6 +36,7 @@ struct WritableNativeArray
   void pushBoolean(jboolean value);
   void pushDouble(jdouble value);
   void pushInt(jint value);
+  void pushLong(jlong value);
   void pushString(jstring value);
   void pushNativeArray(ReadableNativeArray* otherArray);
   void pushNativeMap(ReadableNativeMap* map);

package/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp

@@ -44,6 +44,11 @@ void WritableNativeMap::putInt(std::string key, int val) {
   map_.insert(std::move(key), val);
 }
 
+void WritableNativeMap::putLong(std::string key, jlong val) {
+  throwIfConsumed();
+  map_.insert(std::move(key), val);
+}
+
 void WritableNativeMap::putString(std::string key, alias_ref<jstring> val) {
   if (!val) {
     putNull(std::move(key));
@@ -90,6 +95,7 @@ void WritableNativeMap::registerNatives() {
       makeNativeMethod("putBoolean", WritableNativeMap::putBoolean),
       makeNativeMethod("putDouble", WritableNativeMap::putDouble),
       makeNativeMethod("putInt", WritableNativeMap::putInt),
+      makeNativeMethod("putLong", WritableNativeMap::putLong),
       makeNativeMethod("putString", WritableNativeMap::putString),
       makeNativeMethod("putNativeArray", WritableNativeMap::putNativeArray),
       makeNativeMethod("putNativeMap", WritableNativeMap::putNativeMap),

package/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h

@@ -35,6 +35,7 @@ struct WritableNativeMap
   void putBoolean(std::string key, bool val);
   void putDouble(std::string key, double val);
   void putInt(std::string key, int val);
+  void putLong(std::string key, jlong val);
   void putString(std::string key, jni::alias_ref<jstring> val);
   void putNativeArray(std::string key, ReadableNativeArray* val);
   void putNativeMap(std::string key, ReadableNativeMap* val);

package/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp

@@ -24,17 +24,13 @@ class JSCExecutorFactory : public JSExecutorFactory {
   std::unique_ptr<JSExecutor> createJSExecutor(
       std::shared_ptr<ExecutorDelegate> delegate,
       std::shared_ptr<MessageQueueThread> jsQueue) override {
-    auto installBindings = [](jsi::Runtime& runtime) {
-      react::Logger androidLogger =
-          static_cast<void (*)(const std::string&, unsigned int)>(
-              &reactAndroidLoggingHook);
-      react::bindNativeLogger(runtime, androidLogger);
-    };
     return std::make_unique<JSIExecutor>(
         jsc::makeJSCRuntime(),
         delegate,
         JSIExecutor::defaultTimeoutInvoker,
-        installBindings);
+        [](jsi::Runtime& runtime) {
+          react::bindNativeLogger(runtime, &reactAndroidLoggingHook);
+        });
   }
 };
 

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

@@ -25,7 +25,6 @@ target_include_directories(mapbufferjni
 target_merge_so(mapbufferjni)
 
 target_link_libraries(mapbufferjni
-        fb
         fbjni
         folly_runtime
         glog
@@ -33,6 +32,5 @@ target_link_libraries(mapbufferjni
         react_debug
         react_render_mapbuffer
         react_utils
-        react_config
         yoga
 )

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

@@ -18,7 +18,6 @@ target_merge_so(reactnativeblob)
 
 target_link_libraries(reactnativeblob
         jsireact
-        fb
         fbjni
         folly_runtime
         jsi

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

@@ -17,7 +17,6 @@ target_include_directories(reactperfloggerjni
 
 target_link_libraries(reactperfloggerjni
         INTERFACE
-        fb
         fbjni
         android
         reactperflogger)

package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/JHermesInstance.cpp

@@ -8,19 +8,13 @@
 #include "JHermesInstance.h"
 
 #include <fbjni/fbjni.h>
-#include <react/fabric/ReactNativeConfigHolder.h>
 
 namespace facebook::react {
 
 jni::local_ref<JHermesInstance::jhybriddata> JHermesInstance::initHybrid(
     jni::alias_ref<jclass> /* unused */,
-    jni::alias_ref<jobject> reactNativeConfig,
     bool allocInOldGenBeforeTTI) {
-  std::shared_ptr<const ReactNativeConfig> config = reactNativeConfig != nullptr
-      ? std::make_shared<const ReactNativeConfigHolder>(reactNativeConfig)
-      : nullptr;
-
-  return makeCxxInstance(config, allocInOldGenBeforeTTI);
+  return makeCxxInstance(allocInOldGenBeforeTTI);
 }
 
 void JHermesInstance::registerNatives() {
@@ -32,7 +26,7 @@ void JHermesInstance::registerNatives() {
 std::unique_ptr<JSRuntime> JHermesInstance::createJSRuntime(
     std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept {
   return HermesInstance::createJSRuntime(
-      reactNativeConfig_, nullptr, msgQueueThread, allocInOldGenBeforeTTI_);
+      nullptr, msgQueueThread, allocInOldGenBeforeTTI_);
 }
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/JHermesInstance.h

@@ -13,7 +13,6 @@
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
-#include <react/config/ReactNativeConfig.h>
 #include <react/runtime/JSRuntimeFactory.h>
 #include <react/runtime/hermes/HermesInstance.h>
 #include "../../jni/JJSRuntimeFactory.h"
@@ -28,16 +27,12 @@ class JHermesInstance
 
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jclass> /* unused */,
-      jni::alias_ref<jobject> reactNativeConfig,
       bool allocInOldGenBeforeTTI);
 
   static void registerNatives();
 
-  JHermesInstance(
-      std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
-      bool allocInOldGenBeforeTTI)
-      : reactNativeConfig_(std::move(reactNativeConfig)),
-        allocInOldGenBeforeTTI_(allocInOldGenBeforeTTI){};
+  JHermesInstance(bool allocInOldGenBeforeTTI)
+      : allocInOldGenBeforeTTI_(allocInOldGenBeforeTTI){};
 
   std::unique_ptr<JSRuntime> createJSRuntime(
       std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept;
@@ -47,7 +42,6 @@ class JHermesInstance
  private:
   friend HybridBase;
 
-  std::shared_ptr<const ReactNativeConfig> reactNativeConfig_;
   bool allocInOldGenBeforeTTI_;
 };
 

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

@@ -28,7 +28,6 @@ target_link_libraries(
         fabricjni
         react_featureflagsjni
         turbomodulejsijni
-        fb
         jsi
         fbjni
         bridgeless

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.cpp

@@ -16,20 +16,20 @@
 namespace facebook::react {
 
 namespace {
-class ParsedError : public facebook::jni::JavaClass<ParsedError> {
+class ProcessedError : public facebook::jni::JavaClass<ProcessedError> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedError;";
+      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedError;";
 };
 
-class ParsedStackFrameImpl
-    : public facebook::jni::JavaClass<ParsedStackFrameImpl> {
+class ProcessedErrorStackFrameImpl
+    : public facebook::jni::JavaClass<ProcessedErrorStackFrameImpl> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedStackFrameImpl;";
+      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedErrorStackFrameImpl;";
 
-  static facebook::jni::local_ref<ParsedStackFrameImpl> create(
-      const JsErrorHandler::ParsedError::StackFrame& frame) {
+  static facebook::jni::local_ref<ProcessedErrorStackFrameImpl> create(
+      const JsErrorHandler::ProcessedError::StackFrame& frame) {
     return newInstance(
         frame.file ? jni::make_jstring(*frame.file) : nullptr,
         frame.methodName,
@@ -38,18 +38,19 @@ class ParsedStackFrameImpl
   }
 };
 
-class ParsedErrorImpl
-    : public facebook::jni::JavaClass<ParsedErrorImpl, ParsedError> {
+class ProcessedErrorImpl
+    : public facebook::jni::JavaClass<ProcessedErrorImpl, ProcessedError> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedErrorImpl;";
+      "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ProcessedErrorImpl;";
 
-  static facebook::jni::local_ref<ParsedErrorImpl> create(
+  static facebook::jni::local_ref<ProcessedErrorImpl> create(
       jsi::Runtime& runtime,
-      const JsErrorHandler::ParsedError& error) {
-    auto stack = facebook::jni::JArrayList<ParsedStackFrameImpl>::create();
+      const JsErrorHandler::ProcessedError& error) {
+    auto stack =
+        facebook::jni::JArrayList<ProcessedErrorStackFrameImpl>::create();
     for (const auto& frame : error.stack) {
-      stack->add(ParsedStackFrameImpl::create(frame));
+      stack->add(ProcessedErrorStackFrameImpl::create(frame));
     }
 
     auto extraDataDynamic =
@@ -75,12 +76,12 @@ class ParsedErrorImpl
 
 void JReactExceptionManager::reportJsException(
     jsi::Runtime& runtime,
-    const JsErrorHandler::ParsedError& error) {
+    const JsErrorHandler::ProcessedError& error) {
   static const auto method =
-      javaClassStatic()->getMethod<void(jni::alias_ref<ParsedError>)>(
+      javaClassStatic()->getMethod<void(jni::alias_ref<ProcessedError>)>(
           "reportJsException");
   if (self() != nullptr) {
-    method(self(), ParsedErrorImpl::create(runtime, error));
+    method(self(), ProcessedErrorImpl::create(runtime, error));
   }
 }
 

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.h

@@ -21,7 +21,7 @@ class JReactExceptionManager
 
   void reportJsException(
       jsi::Runtime& runtime,
-      const JsErrorHandler::ParsedError& error);
+      const JsErrorHandler::ProcessedError& error);
 };
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp

@@ -53,7 +53,7 @@ JReactInstance::JReactInstance(
   auto onJsError =
       [weakJReactExceptionManager = jni::make_weak(jReactExceptionManager)](
           jsi::Runtime& runtime,
-          const JsErrorHandler::ParsedError& error) mutable noexcept {
+          const JsErrorHandler::ProcessedError& error) mutable noexcept {
         if (auto jReactExceptionManager =
                 weakJReactExceptionManager.lockLocal()) {
           jReactExceptionManager->reportJsException(runtime, error);

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

@@ -30,7 +30,6 @@ target_include_directories(callinvokerholder
         )
 
 target_link_libraries(callinvokerholder
-        fb
         fbjni
         runtimeexecutor
         callinvoker
@@ -61,7 +60,6 @@ target_include_directories(
 )
 
 target_link_libraries(turbomodulejsijni
-        fb
         fbjni
         jsi
         react_nativemodule_core

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

@@ -25,7 +25,6 @@ target_include_directories(uimanagerjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(uimanagerjni
         bridgelessnativeviewconfig
         callinvokerholder
-        fb
         fbjni
         folly_runtime
         glog

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- tag used to store state of ReactViewGroup subview clipping -->
+  <item type="id" name="view_clipped"/>
+</resources>

package/ReactCommon/React-Fabric.podspec

@@ -221,6 +221,13 @@ Pod::Spec.new do |s|
 
   end
 
+  s.subspec "consistency" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/consistency/**/*.{m,mm,cpp,h}"
+    ss.header_dir           = "react/renderer/consistency"
+  end
+
   s.subspec "uimanager" do |ss|
     ss.subspec "consistency" do |sss|
       sss.dependency             folly_dep_name, folly_version
@@ -249,6 +256,7 @@ Pod::Spec.new do |s|
     {
       :name => '[RN]Check rncore',
       :execution_position => :before_compile,
+      :always_out_of_date => '1',
       :script => <<-EOS
 echo "Checking whether Codegen has run..."
 rncorePath="$REACT_NATIVE_PATH/ReactCommon/react/renderer/components/rncore"

package/ReactCommon/React-FabricComponents.podspec

@@ -136,8 +136,7 @@ Pod::Spec.new do |s|
     ss.subspec "scrollview" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "react/renderer/components/scrollview/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "react/renderer/components/scrollview/tests"
+      sss.source_files         = "react/renderer/components/scrollview/*.{m,mm,cpp,h}"
       sss.header_dir           = "react/renderer/components/scrollview"
 
     end
@@ -194,6 +193,7 @@ Pod::Spec.new do |s|
     {
       :name => '[RN]Check rncore',
       :execution_position => :before_compile,
+      :always_out_of_date => '1',
       :script => <<-EOS
 echo "Checking whether Codegen has run..."
 rncorePath="$REACT_NATIVE_PATH/ReactCommon/react/renderer/components/rncore"

package/ReactCommon/React-FabricImage.podspec

@@ -79,10 +79,13 @@ Pod::Spec.new do |s|
   s.dependency "fast_float", "6.1.4"
   s.dependency "fmt", "9.1.0"
   s.dependency "React-featureflags"
-  s.dependency "React-ImageManager"
   s.dependency "React-utils"
   s.dependency "Yoga"
 
+  add_dependency(s, "React-ImageManager", :additional_framework_paths => [
+    "react/renderer/components/view/platform/cxx",
+    "react/renderer/imagemanager/platform/ios",
+  ])
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core")
   add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
   add_dependency(s, "React-Fabric", :additional_framework_paths => [

package/ReactCommon/cxxreact/CxxNativeModule.cpp

@@ -14,7 +14,7 @@
 
 #include "JsArgumentHelpers.h"
 #include "MessageQueueThread.h"
-#include "SystraceSection.h"
+#include "TraceSection.h"
 
 #include <logger/react_native_log.h>
 
@@ -188,7 +188,7 @@ void CxxNativeModule::invoke(
   // mhorowitz #7128529: convert C++ exceptions to Java
 
   const auto& moduleName = name_;
-  SystraceSection s(
+  TraceSection s(
       "CxxMethodCallQueue", "module", moduleName, "method", method.name);
   messageQueueThread_->runOnQueue([method,
                                    moduleName,
@@ -203,7 +203,7 @@ void CxxNativeModule::invoke(
 #else
     (void)(callId);
 #endif
-    SystraceSection s(
+    TraceSection s(
         "CxxMethodCallDispatch", "module", moduleName, "method", method.name);
     try {
       method.func(std::move(params), first, second);

package/ReactCommon/cxxreact/Instance.cpp

@@ -16,7 +16,7 @@
 #include "NativeToJsBridge.h"
 #include "RAMBundleRegistry.h"
 #include "RecoverableError.h"
-#include "SystraceSection.h"
+#include "TraceSection.h"
 
 #include <cxxreact/JSIndexedRAMBundle.h>
 #include <folly/json.h>
@@ -133,7 +133,7 @@ void Instance::loadBundle(
     std::unique_ptr<const JSBigString> string,
     std::string sourceURL) {
   callback_->incrementPendingJSCalls();
-  SystraceSection s("Instance::loadBundle", "sourceURL", sourceURL);
+  TraceSection s("Instance::loadBundle", "sourceURL", sourceURL);
   nativeToJsBridge_->loadBundle(
       std::move(bundleRegistry), std::move(string), std::move(sourceURL));
 }
@@ -145,14 +145,14 @@ void Instance::loadBundleSync(
   std::unique_lock<std::mutex> lock(m_syncMutex);
   m_syncCV.wait(lock, [this] { return m_syncReady; });
 
-  SystraceSection s("Instance::loadBundleSync", "sourceURL", sourceURL);
+  TraceSection s("Instance::loadBundleSync", "sourceURL", sourceURL);
   nativeToJsBridge_->loadBundleSync(
       std::move(bundleRegistry), std::move(string), std::move(sourceURL));
 }
 
 void Instance::setSourceURL(std::string sourceURL) {
   callback_->incrementPendingJSCalls();
-  SystraceSection s("Instance::setSourceURL", "sourceURL", sourceURL);
+  TraceSection s("Instance::setSourceURL", "sourceURL", sourceURL);
 
   nativeToJsBridge_->loadBundle(nullptr, nullptr, std::move(sourceURL));
 }
@@ -161,7 +161,7 @@ void Instance::loadScriptFromString(
     std::unique_ptr<const JSBigString> string,
     std::string sourceURL,
     bool loadSynchronously) {
-  SystraceSection s("Instance::loadScriptFromString", "sourceURL", sourceURL);
+  TraceSection s("Instance::loadScriptFromString", "sourceURL", sourceURL);
   if (loadSynchronously) {
     loadBundleSync(nullptr, std::move(string), std::move(sourceURL));
   } else {
@@ -241,7 +241,7 @@ void Instance::callJSFunction(
 }
 
 void Instance::callJSCallback(uint64_t callbackId, folly::dynamic&& params) {
-  SystraceSection s("Instance::callJSCallback");
+  TraceSection s("Instance::callJSCallback");
   callback_->incrementPendingJSCalls();
   nativeToJsBridge_->invokeCallback((double)callbackId, std::move(params));
 }

package/ReactCommon/cxxreact/JSBigString.cpp

@@ -38,7 +38,7 @@ JSBigFileString::JSBigFileString(int fd, size_t size, off_t offset /*= 0*/)
     const static auto ps = sysconf(_SC_PAGESIZE);
     auto d = lldiv(offset, ps);
 
-    m_mapOff = static_cast<off_t>(d.quot);
+    m_mapOff = static_cast<off_t>(d.quot) * ps;
     m_pageOff = static_cast<off_t>(d.rem);
     m_size = size + m_pageOff;
   } else {