react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm

@@ -59,7 +59,7 @@ static jsi::Value convertNSNumberToJSINumber(jsi::Runtime &runtime, NSNumber *va
 
 static jsi::String convertNSStringToJSIString(jsi::Runtime &runtime, NSString *value)
 {
-  return jsi::String::createFromUtf8(runtime, [value UTF8String] ? [value UTF8String] : "");
+  return jsi::String::createFromUtf8(runtime, ([value UTF8String] != nullptr) ? [value UTF8String] : "");
 }
 
 static jsi::Object convertNSDictionaryToJSIObject(jsi::Runtime &runtime, NSDictionary *value)
@@ -124,7 +124,7 @@ static NSArray *convertJSIArrayToNSArray(
   for (size_t i = 0; i < size; i++) {
     // Insert kCFNull when it's `undefined` value to preserve the indices.
     id convertedObject = convertJSIValueToObjCObject(runtime, value.getValueAtIndex(runtime, i), jsInvoker, useNSNull);
-    [result addObject:convertedObject ? convertedObject : (id)kCFNull];
+    [result addObject:(convertedObject != nullptr) ? convertedObject : (id)kCFNull];
   }
   return result;
 }
@@ -142,7 +142,7 @@ static NSDictionary *convertJSIObjectToNSDictionary(
     jsi::String name = propertyNames.getValueAtIndex(runtime, i).getString(runtime);
     NSString *k = convertJSIStringToNSString(runtime, name);
     id v = convertJSIValueToObjCObject(runtime, value.getProperty(runtime, name), jsInvoker, useNSNull);
-    if (v) {
+    if (v != nullptr) {
       result[k] = v;
     }
   }
@@ -252,7 +252,7 @@ static jsi::Value convertJSErrorDetailsToJSRuntimeError(jsi::Runtime &runtime, N
 jsi::Value
 ObjCTurboModule::createPromise(jsi::Runtime &runtime, const std::string &methodName, PromiseInvocationBlock invoke)
 {
-  if (!invoke) {
+  if (invoke == nullptr) {
     return jsi::Value::undefined();
   }
 
@@ -388,7 +388,7 @@ id ObjCTurboModule::performMethodInvocation(
 
   void (^block)() = ^{
     id<RCTBridgeModule> strongModule = weakModule;
-    if (!strongModule) {
+    if (strongModule == nullptr) {
       return;
     }
 
@@ -457,7 +457,7 @@ void ObjCTurboModule::performVoidMethodInvocation(
 
   void (^block)() = ^{
     id<RCTBridgeModule> strongModule = weakModule;
-    if (!strongModule) {
+    if (strongModule == nullptr) {
       return;
     }
 
@@ -560,14 +560,14 @@ jsi::Value ObjCTurboModule::convertReturnIdToJSIValue(
  */
 NSString *ObjCTurboModule::getArgumentTypeName(jsi::Runtime &runtime, NSString *methodName, int argIndex)
 {
-  if (!methodArgumentTypeNames_) {
+  if (methodArgumentTypeNames_ == nullptr) {
     NSMutableDictionary<NSString *, NSArray<NSString *> *> *methodArgumentTypeNames = [NSMutableDictionary new];
 
     unsigned int numberOfMethods;
     Class cls = [instance_ class];
     Method *methods = class_copyMethodList(object_getClass(cls), &numberOfMethods);
 
-    if (methods) {
+    if (methods != nullptr) {
       for (unsigned int i = 0; i < numberOfMethods; i++) {
         SEL s = method_getName(methods[i]);
         NSString *mName = NSStringFromSelector(s);
@@ -597,7 +597,7 @@ NSString *ObjCTurboModule::getArgumentTypeName(jsi::Runtime &runtime, NSString *
     methodArgumentTypeNames_ = methodArgumentTypeNames;
   }
 
-  if (methodArgumentTypeNames_[methodName]) {
+  if (methodArgumentTypeNames_[methodName] != nullptr) {
     assert([methodArgumentTypeNames_[methodName] count] > argIndex);
     return methodArgumentTypeNames_[methodName][argIndex];
   }
@@ -656,7 +656,7 @@ void ObjCTurboModule::setInvocationArg(
    */
   BOOL enableModuleArgumentNSNullConversionIOS = ReactNativeFeatureFlags::enableModuleArgumentNSNullConversionIOS();
   id objCArg = convertJSIValueToObjCObject(runtime, arg, jsInvoker_, enableModuleArgumentNSNullConversionIOS);
-  if (objCArg) {
+  if (objCArg != nullptr) {
     NSString *methodNameNSString = @(methodName);
 
     /**
@@ -678,7 +678,7 @@ void ObjCTurboModule::setInvocationArg(
           }
 
           [inv setArgument:(void *)&convertedObjCArg atIndex:i + 2];
-          if (convertedObjCArg) {
+          if (convertedObjCArg != nullptr) {
             [retainedObjectsForInvocation addObject:convertedObjCArg];
           }
           return;
@@ -708,7 +708,7 @@ void ObjCTurboModule::setInvocationArg(
    * Insert converted args unmodified.
    */
   [inv setArgument:(void *)&objCArg atIndex:i + 2];
-  if (objCArg) {
+  if (objCArg != nullptr) {
     [retainedObjectsForInvocation addObject:objCArg];
   }
 }
@@ -848,7 +848,7 @@ jsi::Value ObjCTurboModule::invokeObjCMethod(
 
 BOOL ObjCTurboModule::hasMethodArgConversionSelector(NSString *methodName, size_t argIndex)
 {
-  return methodArgConversionSelectors_ && methodArgConversionSelectors_[methodName] &&
+  return (methodArgConversionSelectors_ != nullptr) && (methodArgConversionSelectors_[methodName] != nullptr) &&
       ![methodArgConversionSelectors_[methodName][argIndex] isEqual:(id)kCFNull];
 }
 
@@ -860,11 +860,11 @@ SEL ObjCTurboModule::getMethodArgConversionSelector(NSString *methodName, size_t
 
 void ObjCTurboModule::setMethodArgConversionSelector(NSString *methodName, size_t argIndex, NSString *fnName)
 {
-  if (!methodArgConversionSelectors_) {
+  if (methodArgConversionSelectors_ == nullptr) {
     methodArgConversionSelectors_ = [NSMutableDictionary new];
   }
 
-  if (!methodArgConversionSelectors_[methodName]) {
+  if (methodArgConversionSelectors_[methodName] == nullptr) {
     auto metaData = methodMap_.at([methodName UTF8String]);
     auto argCount = metaData.argCount;
 

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h

@@ -19,6 +19,7 @@
 
 @class RCTBridgeProxy;
 @class RCTTurboModuleManager;
+@class RCTDevMenuConfigurationDecorator;
 
 @protocol RCTTurboModuleManagerDelegate <NSObject>
 
@@ -73,6 +74,12 @@
                            delegate:(id<RCTTurboModuleManagerDelegate>)delegate
                           jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
 
+- (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+              bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                           delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                          jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+      devMenuConfigurationDecorator:(RCTDevMenuConfigurationDecorator *)devMenuConfigurationDecorator;
+
 - (void)installJSBindings:(facebook::jsi::Runtime &)runtime;
 
 - (void)invalidate;

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

@@ -22,6 +22,7 @@
 #import <React/RCTCallInvokerModule.h>
 #import <React/RCTConstants.h>
 #import <React/RCTCxxModule.h>
+#import <React/RCTDevMenuConfigurationDecorator.h>
 #import <React/RCTInitializing.h>
 #import <React/RCTLog.h>
 #import <React/RCTModuleData.h>
@@ -215,15 +216,17 @@ typedef struct {
 
   RCTBridgeProxy *_bridgeProxy;
   RCTBridgeModuleDecorator *_bridgeModuleDecorator;
+  RCTDevMenuConfigurationDecorator *_devMenuConfigurationDecorator;
 
   dispatch_queue_t _sharedModuleQueue;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
-                   bridgeProxy:(RCTBridgeProxy *)bridgeProxy
-         bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
-                      delegate:(id<RCTTurboModuleManagerDelegate>)delegate
-                     jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+                      bridgeProxy:(RCTBridgeProxy *)bridgeProxy
+            bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                         delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                        jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+    devMenuConfigurationDecorator:(RCTDevMenuConfigurationDecorator *)devMenuConfigurationDecorator
 {
   if (self = [super init]) {
     _jsInvoker = std::move(jsInvoker);
@@ -233,6 +236,7 @@ typedef struct {
     _bridgeModuleDecorator = bridgeModuleDecorator;
     _invalidating = false;
     _sharedModuleQueue = dispatch_queue_create("com.meta.react.turbomodulemanager.queue", DISPATCH_QUEUE_SERIAL);
+    _devMenuConfigurationDecorator = devMenuConfigurationDecorator;
 
     if (RCTTurboModuleInteropEnabled()) {
       // TODO(T174674274): Implement lazy loading of legacy modules in the new architecture.
@@ -273,10 +277,11 @@ typedef struct {
                      jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
 {
   return [self initWithBridge:bridge
-                  bridgeProxy:nil
-        bridgeModuleDecorator:[bridge bridgeModuleDecorator]
-                     delegate:delegate
-                    jsInvoker:jsInvoker];
+                        bridgeProxy:nil
+              bridgeModuleDecorator:[bridge bridgeModuleDecorator]
+                           delegate:delegate
+                          jsInvoker:jsInvoker
+      devMenuConfigurationDecorator:nil];
 }
 
 - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
@@ -285,10 +290,25 @@ typedef struct {
                           jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
 {
   return [self initWithBridge:nil
-                  bridgeProxy:bridgeProxy
-        bridgeModuleDecorator:bridgeModuleDecorator
-                     delegate:delegate
-                    jsInvoker:jsInvoker];
+                        bridgeProxy:bridgeProxy
+              bridgeModuleDecorator:bridgeModuleDecorator
+                           delegate:delegate
+                          jsInvoker:jsInvoker
+      devMenuConfigurationDecorator:nil];
+}
+
+- (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+              bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                           delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                          jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+      devMenuConfigurationDecorator:(RCTDevMenuConfigurationDecorator *)devMenuConfigurationDecorator
+{
+  return [self initWithBridge:nil
+                        bridgeProxy:bridgeProxy
+              bridgeModuleDecorator:bridgeModuleDecorator
+                           delegate:delegate
+                          jsInvoker:jsInvoker
+      devMenuConfigurationDecorator:devMenuConfigurationDecorator];
 }
 
 /**
@@ -770,6 +790,12 @@ typedef struct {
     [(id<RCTInitializing>)module initialize];
   }
 
+#if RCT_DEV_MENU
+
+  [_devMenuConfigurationDecorator decorate:module];
+
+#endif
+
   /**
    * Attach method queue to id<RCTBridgeModule> object.
    * This is necessary because the id<RCTBridgeModule> object can be eagerly created/initialized before the method

package/ReactCommon/react/nativemodule/core/tests/TurboModuleTestFixture.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <ReactCommon/TestCallInvoker.h>
+#include <ReactCommon/TurboModule.h>
 #include <gtest/gtest.h>
 #include <hermes/hermes.h>
 #include <react/bridging/Bridging.h>
@@ -16,23 +17,37 @@
 #include <optional>
 
 namespace facebook::react {
-class TurboModule;
+
+class TurboModuleTestFixtureInternal {
+ public:
+  static bool containsEventEmitter(TurboModule &turboModule, const std::string &eventEmitterName)
+  {
+    return turboModule.eventEmitterMap_.contains(eventEmitterName);
+  }
+
+  static const std::shared_ptr<IAsyncEventEmitter> getEventEmitter(
+      TurboModule &turboModule,
+      const std::string &eventEmitterName)
+  {
+    return turboModule.eventEmitterMap_.at(eventEmitterName);
+  }
+};
 
 template <typename T, typename... Args>
-class TurboModuleTestFixture : public ::testing::Test {
-  static_assert(
-      std::is_base_of<TurboModule, T>::value,
-      "T must be derived from TurboModule");
+class TurboModuleTestFixture : public TurboModuleTestFixtureInternal, public ::testing::Test {
+  static_assert(std::is_base_of<TurboModule, T>::value, "T must be derived from TurboModule");
 
  public:
   explicit TurboModuleTestFixture(Args... args)
       : runtime_(hermes::makeHermesRuntime()),
         jsInvoker_(std::make_shared<TestCallInvoker>(*runtime_)),
-        module_(std::make_shared<T>(jsInvoker_, std::forward<Args>(args)...)) {}
+        module_(std::make_shared<T>(jsInvoker_, std::forward<Args>(args)...))
+  {
+  }
 
-  void SetUp() override {
-    auto setImmediateName =
-        jsi::PropNameID::forAscii(*runtime_, "setImmediate");
+  void SetUp() override
+  {
+    auto setImmediateName = jsi::PropNameID::forAscii(*runtime_, "setImmediate");
     runtime_->global().setProperty(
         *runtime_,
         setImmediateName,
@@ -41,45 +56,55 @@ class TurboModuleTestFixture : public ::testing::Test {
             setImmediateName,
             1,
             [jsInvoker = jsInvoker_](
-                jsi::Runtime& rt,
-                [[maybe_unused]] const jsi::Value& thisVal,
-                const jsi::Value* args,
-                size_t count) {
+                jsi::Runtime &rt, [[maybe_unused]] const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
               react_native_assert(count >= 1);
-              jsInvoker->invokeAsync([cb = std::make_shared<jsi::Value>(
-                                          rt, args[0])](jsi::Runtime& rt) {
+              jsInvoker->invokeAsync([cb = std::make_shared<jsi::Value>(rt, args[0])](jsi::Runtime &rt) {
                 cb->asObject(rt).asFunction(rt).call(rt);
               });
               return jsi::Value::undefined();
             }));
   }
 
-  void TearDown() override {
+  template <typename... EventType, typename Listener>
+  EventSubscription addEventEmitterListener(jsi::Runtime &rt, const std::string &eventEmitterName, Listener &&listener)
+  {
+    EXPECT_TRUE(containsEventEmitter(*module_, eventEmitterName));
+    auto listenJs = bridging::toJs(
+        rt,
+        [listener = std::forward<Listener>(listener)](const EventType &...event) { listener(event...); },
+        jsInvoker_);
+    std::shared_ptr<AsyncEventEmitter<EventType...>> eventEmitter =
+        std::static_pointer_cast<AsyncEventEmitter<EventType...>>(getEventEmitter(*module_, eventEmitterName));
+    jsi::Object eventEmitterJs = bridging::toJs(rt, *eventEmitter, jsInvoker_);
+    auto eventSubscriptionJs =
+        jsi::Object(eventEmitterJs.asFunction(rt).callWithThis(rt, eventEmitterJs, listenJs).asObject(rt));
+    return bridging::fromJs<EventSubscription>(rt, eventSubscriptionJs, jsInvoker_);
+  }
+
+  void TearDown() override
+  {
     module_ = nullptr;
     jsInvoker_ = nullptr;
     runtime_ = nullptr;
   }
 
   template <typename TPromise>
-  std::optional<TPromise> resolvePromise(
-      const AsyncPromise<TPromise>& asyncPromise) {
+  std::optional<TPromise> resolvePromise(const AsyncPromise<TPromise> &asyncPromise)
+  {
     auto promise = asyncPromise.get(*runtime_);
     std::optional<TPromise> result = std::nullopt;
     promise.getPropertyAsFunction(*runtime_, "then")
         .callWithThis(
             *runtime_,
             promise,
-            bridging::toJs(
-                *runtime_,
-                [&](TPromise value) { result = std::move(value); },
-                jsInvoker_));
+            bridging::toJs(*runtime_, [&](TPromise value) { result = std::move(value); }, jsInvoker_));
     jsInvoker_->flushQueue();
     return result;
   }
 
   template <typename TPromise>
-  std::optional<std::string> handleError(
-      const AsyncPromise<TPromise>& asyncPromise) {
+  std::optional<std::string> handleError(const AsyncPromise<TPromise> &asyncPromise)
+  {
     auto promise = asyncPromise.get(*runtime_);
     std::optional<std::string> message;
     promise.getPropertyAsFunction(*runtime_, "catch")
@@ -89,10 +114,8 @@ class TurboModuleTestFixture : public ::testing::Test {
             bridging::toJs(
                 *runtime_,
                 [&](jsi::Object error) {
-                  message = bridging::fromJs<std::string>(
-                      *runtime_,
-                      error.getProperty(*runtime_, "message"),
-                      jsInvoker_);
+                  message =
+                      bridging::fromJs<std::string>(*runtime_, error.getProperty(*runtime_, "message"), jsInvoker_);
                 },
                 jsInvoker_));
     jsInvoker_->flushQueue();
@@ -100,28 +123,25 @@ class TurboModuleTestFixture : public ::testing::Test {
   }
 
   template <typename TEvent>
-  AsyncCallback<TEvent> makeAsyncCallback(
-      std::function<void(TEvent)>&& callback) {
+  AsyncCallback<TEvent> makeAsyncCallback(std::function<void(TEvent)> &&callback)
+  {
     auto func = jsi::Function::createFromHostFunction(
         *runtime_,
         jsi::PropNameID::forAscii(*runtime_, "callback"),
         1,
         [jsInvoker = jsInvoker_, callback = std::move(callback)](
-            jsi::Runtime& rt,
-            [[maybe_unused]] const jsi::Value& thisVal,
-            const jsi::Value* args,
-            size_t count) {
+            jsi::Runtime &rt, [[maybe_unused]] const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
           if (count < 1) {
             throw jsi::JSINativeException("callback: Missing argument");
           }
-          callback(
-              Bridging<TEvent>::fromJs(rt, args[0].asObject(rt), jsInvoker));
+          callback(Bridging<TEvent>::fromJs(rt, args[0].asObject(rt), jsInvoker));
           return jsi::Value::undefined();
         });
     return {*runtime_, std::move(func), jsInvoker_};
   }
 
-  void expectAndFlushQueue(size_t queueSize) {
+  void expectAndFlushQueue(size_t queueSize)
+  {
     EXPECT_EQ(jsInvoker_->queueSize(), queueSize);
     jsInvoker_->flushQueue();
   }

package/ReactCommon/react/nativemodule/cputime/CPUTime.h

@@ -26,7 +26,8 @@ const double NANOSECONDS_IN_A_SECOND = 1000000000;
 #ifdef __MACH__
 
 namespace {
-inline double getConversionFactor() {
+inline double getConversionFactor()
+{
   double conversionFactor;
   mach_timebase_info_data_t info;
   mach_timebase_info(&info);
@@ -41,40 +42,42 @@ namespace facebook::react {
 
 #if defined USE_POSIX_TIME
 
-inline double getCPUTimeNanos() {
-  struct timespec time {};
+inline double getCPUTimeNanos()
+{
+  struct timespec time{};
   clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);
-  return static_cast<double>(time.tv_sec) * NANOSECONDS_IN_A_SECOND +
-      static_cast<double>(time.tv_nsec);
+  return static_cast<double>(time.tv_sec) * NANOSECONDS_IN_A_SECOND + static_cast<double>(time.tv_nsec);
 }
 
-inline bool hasAccurateCPUTimeNanosForBenchmarks() {
+inline bool hasAccurateCPUTimeNanosForBenchmarks()
+{
   return true;
 }
 
 #elif defined __MACH__
 
-inline double getCPUTimeNanos() {
+inline double getCPUTimeNanos()
+{
   static auto conversionFactor = getConversionFactor();
   uint64_t time = mach_absolute_time();
   return static_cast<double>(time) * conversionFactor;
 }
 
-inline bool hasAccurateCPUTimeNanosForBenchmarks() {
+inline bool hasAccurateCPUTimeNanosForBenchmarks()
+{
   return true;
 }
 
 #else
 
-inline double getCPUTimeNanos() {
+inline double getCPUTimeNanos()
+{
   auto now = std::chrono::steady_clock::now();
-  return static_cast<double>(
-      std::chrono::duration_cast<std::chrono::nanoseconds>(
-          now.time_since_epoch())
-          .count());
+  return static_cast<double>(std::chrono::duration_cast<std::chrono::nanoseconds>(now.time_since_epoch()).count());
 }
 
-inline bool hasAccurateCPUTimeNanosForBenchmarks() {
+inline bool hasAccurateCPUTimeNanosForBenchmarks()
+{
   return false;
 }
 

package/ReactCommon/react/nativemodule/cputime/NativeCPUTime.h

@@ -21,8 +21,8 @@ class NativeCPUTime : public NativeCPUTimeCxxSpec<NativeCPUTime> {
  public:
   explicit NativeCPUTime(std::shared_ptr<CallInvoker> jsInvoker);
 
-  double getCPUTimeNanos(jsi::Runtime& runtime);
-  bool hasAccurateCPUTimeNanosForBenchmarks(jsi::Runtime& runtime);
+  double getCPUTimeNanos(jsi::Runtime &runtime);
+  bool hasAccurateCPUTimeNanosForBenchmarks(jsi::Runtime &runtime);
 };
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/defaults/CMakeLists.txt

@@ -21,6 +21,7 @@ target_link_libraries(react_nativemodule_defaults
         react_nativemodule_featureflags
         react_nativemodule_microtasks
         react_nativemodule_idlecallbacks
+        react_nativemodule_intersectionobserver
         react_nativemodule_webperformance
 )
 target_compile_reactnative_options(react_nativemodule_defaults PRIVATE)

package/ReactCommon/react/nativemodule/defaults/DefaultTurboModules.cpp

@@ -10,6 +10,7 @@
 #include <react/nativemodule/dom/NativeDOM.h>
 #include <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
 #include <react/nativemodule/idlecallbacks/NativeIdleCallbacks.h>
+#include <react/nativemodule/intersectionobserver/NativeIntersectionObserver.h>
 #include <react/nativemodule/microtasks/NativeMicrotasks.h>
 #include <react/nativemodule/webperformance/NativePerformance.h>
 
@@ -44,6 +45,12 @@ namespace facebook::react {
     }
   }
 
+  if (ReactNativeFeatureFlags::enableIntersectionObserverByDefault()) {
+    if (name == NativeIntersectionObserver::kModuleName) {
+      return std::make_shared<NativeIntersectionObserver>(jsInvoker);
+    }
+  }
+
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
   if (name == DevToolsRuntimeSettingsModule::kModuleName) {
     return std::make_shared<DevToolsRuntimeSettingsModule>(jsInvoker);

package/ReactCommon/react/nativemodule/defaults/DefaultTurboModules.h

@@ -11,8 +11,8 @@ namespace facebook::react {
 
 struct DefaultTurboModules {
   static std::shared_ptr<TurboModule> getTurboModule(
-      const std::string& name,
-      const std::shared_ptr<CallInvoker>& jsInvoker);
+      const std::string &name,
+      const std::shared_ptr<CallInvoker> &jsInvoker);
 };
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec

@@ -16,7 +16,9 @@ else
   source[:tag] = "v#{version}"
 end
 
-header_search_paths = []
+header_search_paths = [
+  "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+]
 
 if ENV['USE_FRAMEWORKS']
   header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the defaultsnativemodule to access its own files
@@ -40,6 +42,7 @@ Pod::Spec.new do |s|
 
   resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_defaultsnativemodule")
 
+  s.dependency "Yoga"
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
   depend_on_js_engine(s)
@@ -47,9 +50,11 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.dependency "React-domnativemodule"
-  s.dependency "React-featureflagsnativemodule"
   s.dependency "React-microtasksnativemodule"
   s.dependency "React-idlecallbacksnativemodule"
+  s.dependency "React-intersectionobservernativemodule"
   s.dependency "React-webperformancenativemodule"
   add_dependency(s, "React-RCTFBReactNativeSpec")
+  add_dependency(s, "React-featureflags")
+  add_dependency(s, "React-featureflagsnativemodule")
 end

package/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h

@@ -12,16 +12,13 @@
 namespace facebook::react {
 
 class DevToolsRuntimeSettingsModule
-    : public NativeReactDevToolsRuntimeSettingsModuleCxxSpec<
-          DevToolsRuntimeSettingsModule> {
+    : public NativeReactDevToolsRuntimeSettingsModuleCxxSpec<DevToolsRuntimeSettingsModule> {
  public:
   DevToolsRuntimeSettingsModule(std::shared_ptr<CallInvoker> jsInvoker);
 
-  void setReloadAndProfileConfig(
-      jsi::Runtime& rt,
-      NativePartialReloadAndProfileConfig config);
+  void setReloadAndProfileConfig(jsi::Runtime &rt, NativePartialReloadAndProfileConfig config);
 
-  NativeReloadAndProfileConfig getReloadAndProfileConfig(jsi::Runtime& rt);
+  NativeReloadAndProfileConfig getReloadAndProfileConfig(jsi::Runtime &rt);
 };
 
 } // namespace facebook::react