react-native-tvos 0.76.5-0 → 0.77.0-0

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.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<<ef12745c7462250933c3198115418393>>
+ * @generated SignedSource<<6f11d494553e3f12b2ca326a880746f3>>
  */
 
 /**
@@ -14,7 +14,7 @@
  *   packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js.
  *
  * To regenerate this code, run the following script from the repo root:
- *   yarn featureflags-update
+ *   yarn featureflags --update
  */
 
 #pragma once
@@ -24,6 +24,7 @@
 #include <atomic>
 #include <memory>
 #include <optional>
+#include <string>
 
 namespace facebook::react {
 
@@ -32,55 +33,53 @@ class ReactNativeFeatureFlagsAccessor {
   ReactNativeFeatureFlagsAccessor();
 
   bool commonTestFlag();
-  bool allowRecursiveCommitsWithSynchronousMountOnAndroid();
-  bool batchRenderingUpdatesInEventLoop();
   bool completeReactInstanceCreationOnBgThreadOnAndroid();
-  bool destroyFabricSurfacesInReactInstanceManager();
+  bool disableEventLoopOnBridgeless();
+  bool disableMountItemReorderingAndroid();
   bool enableAlignItemsBaselineOnFabricIOS();
-  bool enableAndroidMixBlendModeProp();
-  bool enableBackgroundStyleApplicator();
-  bool enableCleanTextInputYogaNode();
+  bool enableAndroidLineHeightCentering();
+  bool enableBridgelessArchitecture();
+  bool enableCppPropsIteratorSetter();
+  bool enableDeletionOfUnmountedViews();
   bool enableEagerRootViewAttachment();
   bool enableEventEmitterRetentionDuringGesturesOnAndroid();
   bool enableFabricLogs();
+  bool enableFabricRenderer();
   bool enableFabricRendererExclusively();
+  bool enableFixForViewCommandRace();
   bool enableGranularShadowTreeStateReconciliation();
   bool enableIOSViewClipToPaddingBox();
+  bool enableLayoutAnimationsOnAndroid();
   bool enableLayoutAnimationsOnIOS();
   bool enableLongTaskAPI();
-  bool enableMicrotasks();
+  bool enableNewBackgroundAndBorderDrawables();
+  bool enablePreciseSchedulingForPremountItemsOnAndroid();
   bool enablePropsUpdateReconciliationAndroid();
   bool enableReportEventPaintTime();
   bool enableSynchronousStateUpdates();
   bool enableUIConsistency();
   bool enableViewRecycling();
   bool excludeYogaFromRawProps();
-  bool fetchImagesInViewPreallocation();
-  bool fixIncorrectScrollViewStateUpdateOnAndroid();
   bool fixMappingOfEventPrioritiesBetweenFabricAndReact();
-  bool fixMissedFabricStateUpdatesOnAndroid();
   bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid();
-  bool forceBatchingMountItemsOnAndroid();
   bool fuseboxEnabledDebug();
   bool fuseboxEnabledRelease();
   bool initEagerTurboModulesOnNativeModulesQueueAndroid();
   bool lazyAnimationCallbacks();
   bool loadVectorDrawablesOnImages();
-  bool setAndroidLayoutDirection();
   bool traceTurboModulePromiseRejectionsOnAndroid();
+  bool useAlwaysAvailableJSErrorHandling();
   bool useFabricInterop();
   bool useImmediateExecutorInAndroidBridgeless();
-  bool useModernRuntimeScheduler();
   bool useNativeViewConfigsInBridgelessMode();
-  bool useNewReactImageViewBackgroundDrawing();
   bool useOptimisedViewPreallocationOnAndroid();
   bool useOptimizedEventBatchingOnAndroid();
   bool useRuntimeShadowNodeReferenceUpdate();
-  bool useRuntimeShadowNodeReferenceUpdateOnLayout();
-  bool useStateAlignmentMechanism();
   bool useTurboModuleInterop();
+  bool useTurboModules();
 
   void override(std::unique_ptr<ReactNativeFeatureFlagsProvider> provider);
+  std::optional<std::string> getAccessedFeatureFlagNames() const;
 
  private:
   void markFlagAsAccessed(int position, const char* flagName);
@@ -89,56 +88,53 @@ class ReactNativeFeatureFlagsAccessor {
   std::unique_ptr<ReactNativeFeatureFlagsProvider> currentProvider_;
   bool wasOverridden_;
 
-  std::array<std::atomic<const char*>, 48> accessedFeatureFlags_;
+  std::array<std::atomic<const char*>, 45> accessedFeatureFlags_;
 
   std::atomic<std::optional<bool>> commonTestFlag_;
-  std::atomic<std::optional<bool>> allowRecursiveCommitsWithSynchronousMountOnAndroid_;
-  std::atomic<std::optional<bool>> batchRenderingUpdatesInEventLoop_;
   std::atomic<std::optional<bool>> completeReactInstanceCreationOnBgThreadOnAndroid_;
-  std::atomic<std::optional<bool>> destroyFabricSurfacesInReactInstanceManager_;
+  std::atomic<std::optional<bool>> disableEventLoopOnBridgeless_;
+  std::atomic<std::optional<bool>> disableMountItemReorderingAndroid_;
   std::atomic<std::optional<bool>> enableAlignItemsBaselineOnFabricIOS_;
-  std::atomic<std::optional<bool>> enableAndroidMixBlendModeProp_;
-  std::atomic<std::optional<bool>> enableBackgroundStyleApplicator_;
-  std::atomic<std::optional<bool>> enableCleanTextInputYogaNode_;
+  std::atomic<std::optional<bool>> enableAndroidLineHeightCentering_;
+  std::atomic<std::optional<bool>> enableBridgelessArchitecture_;
+  std::atomic<std::optional<bool>> enableCppPropsIteratorSetter_;
+  std::atomic<std::optional<bool>> enableDeletionOfUnmountedViews_;
   std::atomic<std::optional<bool>> enableEagerRootViewAttachment_;
   std::atomic<std::optional<bool>> enableEventEmitterRetentionDuringGesturesOnAndroid_;
   std::atomic<std::optional<bool>> enableFabricLogs_;
+  std::atomic<std::optional<bool>> enableFabricRenderer_;
   std::atomic<std::optional<bool>> enableFabricRendererExclusively_;
+  std::atomic<std::optional<bool>> enableFixForViewCommandRace_;
   std::atomic<std::optional<bool>> enableGranularShadowTreeStateReconciliation_;
   std::atomic<std::optional<bool>> enableIOSViewClipToPaddingBox_;
+  std::atomic<std::optional<bool>> enableLayoutAnimationsOnAndroid_;
   std::atomic<std::optional<bool>> enableLayoutAnimationsOnIOS_;
   std::atomic<std::optional<bool>> enableLongTaskAPI_;
-  std::atomic<std::optional<bool>> enableMicrotasks_;
+  std::atomic<std::optional<bool>> enableNewBackgroundAndBorderDrawables_;
+  std::atomic<std::optional<bool>> enablePreciseSchedulingForPremountItemsOnAndroid_;
   std::atomic<std::optional<bool>> enablePropsUpdateReconciliationAndroid_;
   std::atomic<std::optional<bool>> enableReportEventPaintTime_;
   std::atomic<std::optional<bool>> enableSynchronousStateUpdates_;
   std::atomic<std::optional<bool>> enableUIConsistency_;
   std::atomic<std::optional<bool>> enableViewRecycling_;
   std::atomic<std::optional<bool>> excludeYogaFromRawProps_;
-  std::atomic<std::optional<bool>> fetchImagesInViewPreallocation_;
-  std::atomic<std::optional<bool>> fixIncorrectScrollViewStateUpdateOnAndroid_;
   std::atomic<std::optional<bool>> fixMappingOfEventPrioritiesBetweenFabricAndReact_;
-  std::atomic<std::optional<bool>> fixMissedFabricStateUpdatesOnAndroid_;
   std::atomic<std::optional<bool>> fixMountingCoordinatorReportedPendingTransactionsOnAndroid_;
-  std::atomic<std::optional<bool>> forceBatchingMountItemsOnAndroid_;
   std::atomic<std::optional<bool>> fuseboxEnabledDebug_;
   std::atomic<std::optional<bool>> fuseboxEnabledRelease_;
   std::atomic<std::optional<bool>> initEagerTurboModulesOnNativeModulesQueueAndroid_;
   std::atomic<std::optional<bool>> lazyAnimationCallbacks_;
   std::atomic<std::optional<bool>> loadVectorDrawablesOnImages_;
-  std::atomic<std::optional<bool>> setAndroidLayoutDirection_;
   std::atomic<std::optional<bool>> traceTurboModulePromiseRejectionsOnAndroid_;
+  std::atomic<std::optional<bool>> useAlwaysAvailableJSErrorHandling_;
   std::atomic<std::optional<bool>> useFabricInterop_;
   std::atomic<std::optional<bool>> useImmediateExecutorInAndroidBridgeless_;
-  std::atomic<std::optional<bool>> useModernRuntimeScheduler_;
   std::atomic<std::optional<bool>> useNativeViewConfigsInBridgelessMode_;
-  std::atomic<std::optional<bool>> useNewReactImageViewBackgroundDrawing_;
   std::atomic<std::optional<bool>> useOptimisedViewPreallocationOnAndroid_;
   std::atomic<std::optional<bool>> useOptimizedEventBatchingOnAndroid_;
   std::atomic<std::optional<bool>> useRuntimeShadowNodeReferenceUpdate_;
-  std::atomic<std::optional<bool>> useRuntimeShadowNodeReferenceUpdateOnLayout_;
-  std::atomic<std::optional<bool>> useStateAlignmentMechanism_;
   std::atomic<std::optional<bool>> useTurboModuleInterop_;
+  std::atomic<std::optional<bool>> useTurboModules_;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.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<<2a078848517574213e02b42dff1af8e8>>
+ * @generated SignedSource<<213e1ad83360a79e27d41c06e20fb8c9>>
  */
 
 /**
@@ -14,7 +14,7 @@
  *   packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js.
  *
  * To regenerate this code, run the following script from the repo root:
- *   yarn featureflags-update
+ *   yarn featureflags --update
  */
 
 #pragma once
@@ -31,35 +31,35 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
-  bool allowRecursiveCommitsWithSynchronousMountOnAndroid() override {
-    return false;
+  bool completeReactInstanceCreationOnBgThreadOnAndroid() override {
+    return true;
   }
 
-  bool batchRenderingUpdatesInEventLoop() override {
+  bool disableEventLoopOnBridgeless() override {
     return false;
   }
 
-  bool completeReactInstanceCreationOnBgThreadOnAndroid() override {
+  bool disableMountItemReorderingAndroid() override {
     return false;
   }
 
-  bool destroyFabricSurfacesInReactInstanceManager() override {
-    return false;
+  bool enableAlignItemsBaselineOnFabricIOS() override {
+    return true;
   }
 
-  bool enableAlignItemsBaselineOnFabricIOS() override {
+  bool enableAndroidLineHeightCentering() override {
     return true;
   }
 
-  bool enableAndroidMixBlendModeProp() override {
+  bool enableBridgelessArchitecture() override {
     return false;
   }
 
-  bool enableBackgroundStyleApplicator() override {
-    return true;
+  bool enableCppPropsIteratorSetter() override {
+    return false;
   }
 
-  bool enableCleanTextInputYogaNode() override {
+  bool enableDeletionOfUnmountedViews() override {
     return false;
   }
 
@@ -75,10 +75,18 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
+  bool enableFabricRenderer() override {
+    return false;
+  }
+
   bool enableFabricRendererExclusively() override {
     return false;
   }
 
+  bool enableFixForViewCommandRace() override {
+    return false;
+  }
+
   bool enableGranularShadowTreeStateReconciliation() override {
     return false;
   }
@@ -87,6 +95,10 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
+  bool enableLayoutAnimationsOnAndroid() override {
+    return false;
+  }
+
   bool enableLayoutAnimationsOnIOS() override {
     return true;
   }
@@ -95,7 +107,11 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
-  bool enableMicrotasks() override {
+  bool enableNewBackgroundAndBorderDrawables() override {
+    return false;
+  }
+
+  bool enablePreciseSchedulingForPremountItemsOnAndroid() override {
     return false;
   }
 
@@ -123,30 +139,14 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
-  bool fetchImagesInViewPreallocation() override {
-    return false;
-  }
-
-  bool fixIncorrectScrollViewStateUpdateOnAndroid() override {
-    return false;
-  }
-
   bool fixMappingOfEventPrioritiesBetweenFabricAndReact() override {
     return false;
   }
 
-  bool fixMissedFabricStateUpdatesOnAndroid() override {
-    return false;
-  }
-
   bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid() override {
     return false;
   }
 
-  bool forceBatchingMountItemsOnAndroid() override {
-    return false;
-  }
-
   bool fuseboxEnabledDebug() override {
     return true;
   }
@@ -156,7 +156,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
   }
 
   bool initEagerTurboModulesOnNativeModulesQueueAndroid() override {
-    return false;
+    return true;
   }
 
   bool lazyAnimationCallbacks() override {
@@ -167,11 +167,11 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
-  bool setAndroidLayoutDirection() override {
+  bool traceTurboModulePromiseRejectionsOnAndroid() override {
     return false;
   }
 
-  bool traceTurboModulePromiseRejectionsOnAndroid() override {
+  bool useAlwaysAvailableJSErrorHandling() override {
     return false;
   }
 
@@ -180,21 +180,13 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
   }
 
   bool useImmediateExecutorInAndroidBridgeless() override {
-    return false;
-  }
-
-  bool useModernRuntimeScheduler() override {
-    return false;
+    return true;
   }
 
   bool useNativeViewConfigsInBridgelessMode() override {
     return false;
   }
 
-  bool useNewReactImageViewBackgroundDrawing() override {
-    return false;
-  }
-
   bool useOptimisedViewPreallocationOnAndroid() override {
     return false;
   }
@@ -207,15 +199,11 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
-  bool useRuntimeShadowNodeReferenceUpdateOnLayout() override {
-    return false;
-  }
-
-  bool useStateAlignmentMechanism() override {
+  bool useTurboModuleInterop() override {
     return false;
   }
 
-  bool useTurboModuleInterop() override {
+  bool useTurboModules() override {
     return false;
   }
 };

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.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<<4adf3f21c8c7e370aa59bc79937e91a2>>
+ * @generated SignedSource<<5b2b2aba574e77851ad214809ead9228>>
  */
 
 /**
@@ -14,7 +14,7 @@
  *   packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js.
  *
  * To regenerate this code, run the following script from the repo root:
- *   yarn featureflags-update
+ *   yarn featureflags --update
  */
 
 #pragma once
@@ -26,53 +26,50 @@ class ReactNativeFeatureFlagsProvider {
   virtual ~ReactNativeFeatureFlagsProvider() = default;
 
   virtual bool commonTestFlag() = 0;
-  virtual bool allowRecursiveCommitsWithSynchronousMountOnAndroid() = 0;
-  virtual bool batchRenderingUpdatesInEventLoop() = 0;
   virtual bool completeReactInstanceCreationOnBgThreadOnAndroid() = 0;
-  virtual bool destroyFabricSurfacesInReactInstanceManager() = 0;
+  virtual bool disableEventLoopOnBridgeless() = 0;
+  virtual bool disableMountItemReorderingAndroid() = 0;
   virtual bool enableAlignItemsBaselineOnFabricIOS() = 0;
-  virtual bool enableAndroidMixBlendModeProp() = 0;
-  virtual bool enableBackgroundStyleApplicator() = 0;
-  virtual bool enableCleanTextInputYogaNode() = 0;
+  virtual bool enableAndroidLineHeightCentering() = 0;
+  virtual bool enableBridgelessArchitecture() = 0;
+  virtual bool enableCppPropsIteratorSetter() = 0;
+  virtual bool enableDeletionOfUnmountedViews() = 0;
   virtual bool enableEagerRootViewAttachment() = 0;
   virtual bool enableEventEmitterRetentionDuringGesturesOnAndroid() = 0;
   virtual bool enableFabricLogs() = 0;
+  virtual bool enableFabricRenderer() = 0;
   virtual bool enableFabricRendererExclusively() = 0;
+  virtual bool enableFixForViewCommandRace() = 0;
   virtual bool enableGranularShadowTreeStateReconciliation() = 0;
   virtual bool enableIOSViewClipToPaddingBox() = 0;
+  virtual bool enableLayoutAnimationsOnAndroid() = 0;
   virtual bool enableLayoutAnimationsOnIOS() = 0;
   virtual bool enableLongTaskAPI() = 0;
-  virtual bool enableMicrotasks() = 0;
+  virtual bool enableNewBackgroundAndBorderDrawables() = 0;
+  virtual bool enablePreciseSchedulingForPremountItemsOnAndroid() = 0;
   virtual bool enablePropsUpdateReconciliationAndroid() = 0;
   virtual bool enableReportEventPaintTime() = 0;
   virtual bool enableSynchronousStateUpdates() = 0;
   virtual bool enableUIConsistency() = 0;
   virtual bool enableViewRecycling() = 0;
   virtual bool excludeYogaFromRawProps() = 0;
-  virtual bool fetchImagesInViewPreallocation() = 0;
-  virtual bool fixIncorrectScrollViewStateUpdateOnAndroid() = 0;
   virtual bool fixMappingOfEventPrioritiesBetweenFabricAndReact() = 0;
-  virtual bool fixMissedFabricStateUpdatesOnAndroid() = 0;
   virtual bool fixMountingCoordinatorReportedPendingTransactionsOnAndroid() = 0;
-  virtual bool forceBatchingMountItemsOnAndroid() = 0;
   virtual bool fuseboxEnabledDebug() = 0;
   virtual bool fuseboxEnabledRelease() = 0;
   virtual bool initEagerTurboModulesOnNativeModulesQueueAndroid() = 0;
   virtual bool lazyAnimationCallbacks() = 0;
   virtual bool loadVectorDrawablesOnImages() = 0;
-  virtual bool setAndroidLayoutDirection() = 0;
   virtual bool traceTurboModulePromiseRejectionsOnAndroid() = 0;
+  virtual bool useAlwaysAvailableJSErrorHandling() = 0;
   virtual bool useFabricInterop() = 0;
   virtual bool useImmediateExecutorInAndroidBridgeless() = 0;
-  virtual bool useModernRuntimeScheduler() = 0;
   virtual bool useNativeViewConfigsInBridgelessMode() = 0;
-  virtual bool useNewReactImageViewBackgroundDrawing() = 0;
   virtual bool useOptimisedViewPreallocationOnAndroid() = 0;
   virtual bool useOptimizedEventBatchingOnAndroid() = 0;
   virtual bool useRuntimeShadowNodeReferenceUpdate() = 0;
-  virtual bool useRuntimeShadowNodeReferenceUpdateOnLayout() = 0;
-  virtual bool useStateAlignmentMechanism() = 0;
   virtual bool useTurboModuleInterop() = 0;
+  virtual bool useTurboModules() = 0;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/featureflags/tests/ReactNativeFeatureFlagsTest.cpp

@@ -121,4 +121,27 @@ TEST_F(ReactNativeFeatureFlagsTest, allowsOverridingAgainAfterReset) {
   EXPECT_EQ(ReactNativeFeatureFlags::commonTestFlag(), true);
 }
 
+TEST_F(
+    ReactNativeFeatureFlagsTest,
+    allowsDangerouslyForcingOverridesWhenValuesHaveNotBeenAccessed) {
+  auto accessedFlags = ReactNativeFeatureFlags::dangerouslyForceOverride(
+      std::make_unique<ReactNativeFeatureFlagsTestOverrides>());
+
+  EXPECT_EQ(ReactNativeFeatureFlags::commonTestFlag(), true);
+  EXPECT_EQ(accessedFlags.has_value(), false);
+}
+
+TEST_F(
+    ReactNativeFeatureFlagsTest,
+    allowsDangerouslyForcingOverridesWhenValuesHaveBeenAccessed) {
+  EXPECT_EQ(ReactNativeFeatureFlags::commonTestFlag(), false);
+
+  auto accessedFlags = ReactNativeFeatureFlags::dangerouslyForceOverride(
+      std::make_unique<ReactNativeFeatureFlagsTestOverrides>());
+
+  EXPECT_EQ(ReactNativeFeatureFlags::commonTestFlag(), true);
+  EXPECT_EQ(accessedFlags.has_value(), true);
+  EXPECT_EQ(accessedFlags.value(), "commonTestFlag");
+}
+
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp

@@ -63,17 +63,15 @@ TurboCxxModule::TurboCxxModule(
       cxxMethods_(cxxModule->getMethods()),
       cxxModule_(std::move(cxxModule)) {}
 
-jsi::Value TurboCxxModule::get(
+jsi::Value TurboCxxModule::create(
     jsi::Runtime& runtime,
     const jsi::PropNameID& propName) {
   std::string propNameUtf8 = propName.utf8(runtime);
 
-  auto result = jsi::Value::undefined();
-
   if (propNameUtf8 == "getConstants") {
     // This is special cased because `getConstants()` is already a part of
     // CxxModule.
-    result = jsi::Function::createFromHostFunction(
+    return jsi::Function::createFromHostFunction(
         runtime,
         propName,
         0,
@@ -93,7 +91,7 @@ jsi::Value TurboCxxModule::get(
   } else {
     for (auto& method : cxxMethods_) {
       if (method.name == propNameUtf8) {
-        result = jsi::Function::createFromHostFunction(
+        return jsi::Function::createFromHostFunction(
             runtime,
             propName,
             0,
@@ -108,17 +106,7 @@ jsi::Value TurboCxxModule::get(
     }
   }
 
-  // If we have a JS wrapper, cache the result of this lookup
-  if (jsRepresentation_) {
-    auto jsRepresentation = jsRepresentation_->lock(runtime);
-    if (!jsRepresentation.isUndefined()) {
-      std::move(jsRepresentation)
-          .asObject(runtime)
-          .setProperty(runtime, propName, result);
-    }
-  }
-
-  return result;
+  return jsi::Value::undefined();
 }
 
 std::vector<jsi::PropNameID> TurboCxxModule::getPropertyNames(

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h

@@ -28,7 +28,7 @@ class JSI_EXPORT TurboCxxModule : public TurboModule {
       std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule,
       std::shared_ptr<CallInvoker> jsInvoker);
 
-  facebook::jsi::Value get(
+  facebook::jsi::Value create(
       facebook::jsi::Runtime& runtime,
       const facebook::jsi::PropNameID& propName) override;
 

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h

@@ -46,30 +46,30 @@ class TurboModuleBinding;
 /**
  * Base HostObject class for every module to be exposed to JS
  */
-class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
+class JSI_EXPORT TurboModule : public jsi::HostObject {
  public:
   TurboModule(std::string name, std::shared_ptr<CallInvoker> jsInvoker);
 
+  // DO NOT OVERRIDE - it will become final in a future release.
+  // This method provides automatic caching of properties on the TurboModule's
+  // JS representation. To customize lookup of properties, override `create`.
   // Note: keep this method declared inline to avoid conflicts
   // between RTTI and non-RTTI compilation units
-  facebook::jsi::Value get(
-      facebook::jsi::Runtime& runtime,
-      const facebook::jsi::PropNameID& propName) override {
-    {
-      auto prop = create(runtime, propName);
-      // If we have a JS wrapper, cache the result of this lookup
-      // We don't cache misses, to allow for methodMap_ to dynamically be
-      // extended
-      if (jsRepresentation_ && !prop.isUndefined()) {
-        jsRepresentation_->lock(runtime).asObject(runtime).setProperty(
-            runtime, propName, prop);
-      }
-      return prop;
+  jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& propName)
+      override {
+    auto prop = create(runtime, propName);
+    // If we have a JS wrapper, cache the result of this lookup
+    // We don't cache misses, to allow for methodMap_ to dynamically be
+    // extended
+    if (jsRepresentation_ && !prop.isUndefined()) {
+      jsRepresentation_->lock(runtime).asObject(runtime).setProperty(
+          runtime, propName, prop);
     }
+    return prop;
   }
 
-  virtual std::vector<facebook::jsi::PropNameID> getPropertyNames(
-      facebook::jsi::Runtime& runtime) override {
+  std::vector<jsi::PropNameID> getPropertyNames(
+      jsi::Runtime& runtime) override {
     std::vector<jsi::PropNameID> result;
     result.reserve(methodMap_.size());
     for (auto it = methodMap_.cbegin(); it != methodMap_.cend(); ++it) {
@@ -84,10 +84,10 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
 
   struct MethodMetadata {
     size_t argCount;
-    facebook::jsi::Value (*invoker)(
-        facebook::jsi::Runtime& rt,
+    jsi::Value (*invoker)(
+        jsi::Runtime& rt,
         TurboModule& turboModule,
-        const facebook::jsi::Value* args,
+        const jsi::Value* args,
         size_t count);
   };
   std::unordered_map<std::string, MethodMetadata> methodMap_;
@@ -141,13 +141,13 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
     } else if (auto eventEmitterIter = eventEmitterMap_.find(propNameUtf8);
                eventEmitterIter != eventEmitterMap_.end()) {
       return eventEmitterIter->second->get(runtime, jsInvoker_);
+    } else {
+      // Neither Method nor EventEmitter were found, let JS decide what to do
+      return jsi::Value::undefined();
     }
-    // Neither Method nor EventEmitter were not found, let JS decide what to do.
-    return facebook::jsi::Value::undefined();
   }
 
  private:
-  friend class TurboCxxModule;
   friend class TurboModuleBinding;
   std::unique_ptr<jsi::WeakObject> jsRepresentation_;
 };