react-native-tvos 0.81.3-0 → 0.82.0-0

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.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<<d1862a9ce3cfeda5d140941fcd3b25bc>>
+ * @generated SignedSource<<f7ca771b393e043210e73462e835fd24>>
  */
 
 /**
@@ -38,16 +38,18 @@ class NativeReactNativeFeatureFlags
 
   bool commonTestFlagWithoutNativeImplementation(jsi::Runtime& runtime);
 
-  bool animatedShouldSignalBatch(jsi::Runtime& runtime);
+  bool cdpInteractionMetricsEnabled(jsi::Runtime& runtime);
 
   bool cxxNativeAnimatedEnabled(jsi::Runtime& runtime);
 
   bool cxxNativeAnimatedRemoveJsSync(jsi::Runtime& runtime);
 
-  bool disableMainQueueSyncDispatchIOS(jsi::Runtime& runtime);
+  bool disableFabricCommitInCXXAnimated(jsi::Runtime& runtime);
 
   bool disableMountItemReorderingAndroid(jsi::Runtime& runtime);
 
+  bool disableOldAndroidAttachmentMetricsWorkarounds(jsi::Runtime& runtime);
+
   bool disableTextLayoutManagerCacheAndroid(jsi::Runtime& runtime);
 
   bool enableAccessibilityOrder(jsi::Runtime& runtime);
@@ -66,20 +68,24 @@ class NativeReactNativeFeatureFlags
 
   bool enableDoubleMeasurementFixAndroid(jsi::Runtime& runtime);
 
+  bool enableEagerMainQueueModulesOnIOS(jsi::Runtime& runtime);
+
   bool enableEagerRootViewAttachment(jsi::Runtime& runtime);
 
   bool enableFabricLogs(jsi::Runtime& runtime);
 
   bool enableFabricRenderer(jsi::Runtime& runtime);
 
-  bool enableFixForParentTagDuringReparenting(jsi::Runtime& runtime);
-
   bool enableFontScaleChangesUpdatingLayout(jsi::Runtime& runtime);
 
   bool enableIOSTextBaselineOffsetPerLine(jsi::Runtime& runtime);
 
   bool enableIOSViewClipToPaddingBox(jsi::Runtime& runtime);
 
+  bool enableImagePrefetchingAndroid(jsi::Runtime& runtime);
+
+  bool enableImmediateUpdateModeForContentOffsetChanges(jsi::Runtime& runtime);
+
   bool enableInteropViewManagerClassLookUpOptimizationIOS(jsi::Runtime& runtime);
 
   bool enableLayoutAnimationsOnAndroid(jsi::Runtime& runtime);
@@ -88,8 +94,6 @@ class NativeReactNativeFeatureFlags
 
   bool enableMainQueueCoordinatorOnIOS(jsi::Runtime& runtime);
 
-  bool enableMainQueueModulesOnIOS(jsi::Runtime& runtime);
-
   bool enableModuleArgumentNSNullConversionIOS(jsi::Runtime& runtime);
 
   bool enableNativeCSSParsing(jsi::Runtime& runtime);
@@ -104,12 +108,12 @@ class NativeReactNativeFeatureFlags
 
   bool enableResourceTimingAPI(jsi::Runtime& runtime);
 
-  bool enableSynchronousStateUpdates(jsi::Runtime& runtime);
-
   bool enableViewCulling(jsi::Runtime& runtime);
 
   bool enableViewRecycling(jsi::Runtime& runtime);
 
+  bool enableViewRecyclingForScrollView(jsi::Runtime& runtime);
+
   bool enableViewRecyclingForText(jsi::Runtime& runtime);
 
   bool enableViewRecyclingForView(jsi::Runtime& runtime);
@@ -120,6 +124,8 @@ class NativeReactNativeFeatureFlags
 
   bool enableVirtualViewWindowFocusDetection(jsi::Runtime& runtime);
 
+  bool enableWebPerformanceAPIsByDefault(jsi::Runtime& runtime);
+
   bool fixMappingOfEventPrioritiesBetweenFabricAndReact(jsi::Runtime& runtime);
 
   bool fuseboxEnabledRelease(jsi::Runtime& runtime);
@@ -128,10 +134,20 @@ class NativeReactNativeFeatureFlags
 
   bool hideOffscreenVirtualViewsOnIOS(jsi::Runtime& runtime);
 
+  bool perfMonitorV2Enabled(jsi::Runtime& runtime);
+
   double preparedTextCacheSize(jsi::Runtime& runtime);
 
   bool preventShadowTreeCommitExhaustion(jsi::Runtime& runtime);
 
+  bool releaseImageDataWhenConsumed(jsi::Runtime& runtime);
+
+  bool shouldPressibilityUseW3CPointerEventsForHover(jsi::Runtime& runtime);
+
+  bool skipActivityIdentityAssertionOnHostPause(jsi::Runtime& runtime);
+
+  bool sweepActiveTouchOnChildNativeGesturesAndroid(jsi::Runtime& runtime);
+
   bool traceTurboModulePromiseRejectionsOnAndroid(jsi::Runtime& runtime);
 
   bool updateRuntimeShadowNodeReferencesOnCommit(jsi::Runtime& runtime);
@@ -156,6 +172,8 @@ class NativeReactNativeFeatureFlags
 
   bool useTurboModules(jsi::Runtime& runtime);
 
+  double virtualViewHysteresisRatio(jsi::Runtime& runtime);
+
   double virtualViewPrerenderRatio(jsi::Runtime& runtime);
 };
 

package/ReactCommon/react/nativemodule/idlecallbacks/NativeIdleCallbacks.cpp

@@ -28,7 +28,7 @@ namespace {
 
 class IdleTaskRef : public jsi::NativeState {
  public:
-  IdleTaskRef(std::shared_ptr<Task> task) : task(std::move(task)) {}
+  explicit IdleTaskRef(std::shared_ptr<Task> task) : task(std::move(task)) {}
 
   std::shared_ptr<Task> task;
 };

package/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.cpp

@@ -49,21 +49,6 @@ NativeIntersectionObserver::NativeIntersectionObserver(
     std::shared_ptr<CallInvoker> jsInvoker)
     : NativeIntersectionObserverCxxSpec(std::move(jsInvoker)) {}
 
-void NativeIntersectionObserver::observe(
-    jsi::Runtime& runtime,
-    NativeIntersectionObserverObserveOptions options) {
-  observeV2(runtime, std::move(options));
-}
-
-void NativeIntersectionObserver::unobserve(
-    jsi::Runtime& runtime,
-    IntersectionObserverObserverId intersectionObserverId,
-    std::shared_ptr<const ShadowNode> targetShadowNode) {
-  auto token =
-      tokenFromShadowNodeFamily(runtime, targetShadowNode->getFamilyShared());
-  unobserveV2(runtime, intersectionObserverId, std::move(token));
-}
-
 jsi::Object NativeIntersectionObserver::observeV2(
     jsi::Runtime& runtime,
     NativeIntersectionObserverObserveOptions options) {

package/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.h

@@ -64,19 +64,6 @@ class NativeIntersectionObserver
  public:
   NativeIntersectionObserver(std::shared_ptr<CallInvoker> jsInvoker);
 
-  // TODO(T223605846): Remove legacy observe method
-  [[deprecated("Please use observeV2")]]
-  void observe(
-      jsi::Runtime& runtime,
-      NativeIntersectionObserverObserveOptions options);
-
-  // TODO(T223605846): Remove legacy unobserve method
-  [[deprecated("Please use unobserveV2")]]
-  void unobserve(
-      jsi::Runtime& runtime,
-      IntersectionObserverObserverId intersectionObserverId,
-      std::shared_ptr<const ShadowNode> targetShadowNode);
-
   jsi::Object observeV2(
       jsi::Runtime& runtime,
       NativeIntersectionObserverObserveOptions options);

package/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp

@@ -35,7 +35,7 @@ NativeMutationObserver::NativeMutationObserver(
 
 void NativeMutationObserver::observe(
     jsi::Runtime& runtime,
-    NativeMutationObserverObserveOptions options) {
+    const NativeMutationObserverObserveOptions& options) {
   auto mutationObserverId = options.mutationObserverId;
   auto subtree = options.subtree;
   auto shadowNode = options.targetShadowNode;
@@ -46,7 +46,7 @@ void NativeMutationObserver::observe(
 }
 
 void NativeMutationObserver::unobserveAll(
-    jsi::Runtime& runtime,
+    jsi::Runtime& /*runtime*/,
     MutationObserverId mutationObserverId) {
   mutationObserverManager_.unobserveAll(mutationObserverId);
 }

package/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.h

@@ -51,7 +51,7 @@ class NativeMutationObserver
 
   void observe(
       jsi::Runtime& runtime,
-      NativeMutationObserverObserveOptions options);
+      const NativeMutationObserverObserveOptions& options);
 
   void unobserveAll(
       jsi::Runtime& runtime,

package/ReactCommon/react/nativemodule/samples/ReactCommon/README.md

@@ -0,0 +1,2 @@
+Refer to packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h for a concrete example.
+See: https://reactnative.dev/docs/the-new-architecture/pure-cxx-modules

package/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp

@@ -332,45 +332,67 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(
     const JavaTurboModule::InitParams& params)
     : JavaTurboModule(params) {
   methodMap_["getConstants"] = MethodMetadata{
-      0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
-  methodMap_["voidFunc"] =
-      MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
-  methodMap_["getBool"] =
-      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
-  methodMap_["getEnum"] =
-      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getEnum};
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+  methodMap_["voidFunc"] = MethodMetadata{
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+  methodMap_["getBool"] = MethodMetadata{
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
+  methodMap_["getEnum"] = MethodMetadata{
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getEnum};
   methodMap_["getNumber"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
   methodMap_["getString"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
-  methodMap_["getArray"] =
-      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
+  methodMap_["getArray"] = MethodMetadata{
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
   methodMap_["getObject"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
   methodMap_["getUnsafeObject"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getUnsafeObject};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getUnsafeObject};
   methodMap_["getRootTag"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
-  methodMap_["getValue"] =
-      MethodMetadata{3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
+  methodMap_["getValue"] = MethodMetadata{
+      .argCount = 3,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
   methodMap_["getValueWithCallback"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
+      .argCount = 1,
+      .invoker =
+          __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
   methodMap_["getValueWithPromise"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+      .argCount = 1,
+      .invoker =
+          __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
   methodMap_["voidFuncThrows"] = MethodMetadata{
-      0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncThrows};
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncThrows};
   methodMap_["getObjectThrows"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectThrows};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectThrows};
   methodMap_["promiseThrows"] = MethodMetadata{
-      0, __hostFunction_NativeSampleTurboModuleSpecJSI_promiseThrows};
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_promiseThrows};
   methodMap_["voidFuncAssert"] = MethodMetadata{
-      0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncAssert};
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncAssert};
   methodMap_["getObjectAssert"] = MethodMetadata{
-      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectAssert};
+      .argCount = 1,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectAssert};
   methodMap_["promiseAssert"] = MethodMetadata{
-      0, __hostFunction_NativeSampleTurboModuleSpecJSI_promiseAssert};
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_promiseAssert};
   methodMap_["getImageUrl"] = MethodMetadata{
-      0, __hostFunction_NativeSampleTurboModuleSpecJSI_getImageUrl};
+      .argCount = 0,
+      .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getImageUrl};
   eventEmitterMap_["onPress"] =
       std::make_shared<AsyncEventEmitter<folly::dynamic>>();
   eventEmitterMap_["onClick"] =

package/ReactCommon/react/nativemodule/samples/platform/android/SampleLegacyModule.kt

@@ -202,7 +202,8 @@ public class SampleLegacyModule(private val context: ReactApplicationContext) :
     log(
         "getValue",
         mapOf("1-numberArg" to numberArg, "2-stringArg" to stringArg, "3-mapArg" to mapArg),
-        map)
+        map,
+    )
     return map
   }
 
@@ -234,7 +235,10 @@ public class SampleLegacyModule(private val context: ReactApplicationContext) :
   public fun getValueWithPromise(error: Boolean, promise: Promise?) {
     if (error) {
       promise?.reject(
-          "code 1", "intentional promise rejection", Throwable("promise intentionally rejected"))
+          "code 1",
+          "intentional promise rejection",
+          Throwable("promise intentionally rejected"),
+      )
     } else {
       promise?.resolve("result")
     }

package/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.kt

@@ -179,7 +179,10 @@ public class SampleTurboModule(private val context: ReactApplicationContext) :
   override fun getValueWithPromise(error: Boolean, promise: Promise) {
     if (error) {
       promise?.reject(
-          "code 1", "intentional promise rejection", Throwable("promise intentionally rejected"))
+          "code 1",
+          "intentional promise rejection",
+          Throwable("promise intentionally rejected"),
+      )
     } else {
       promise?.resolve("result")
     }
@@ -238,7 +241,8 @@ public class SampleTurboModule(private val context: ReactApplicationContext) :
                 } else {
                   promise.resolve(null)
                 }
-              })
+              },
+          )
           .launch("image/*")
     } else {
       promise.reject("error", "Unable to obtain an image uri without current activity")

package/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTNativeSampleTurboModuleSpec.mm

@@ -203,27 +203,44 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getCon
 NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
     : ObjCTurboModule(params)
 {
-  methodMap_["voidFunc"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
-  methodMap_["getBool"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
-  methodMap_["getEnum"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getEnum};
-  methodMap_["getNumber"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
-  methodMap_["getString"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
-  methodMap_["getArray"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
-  methodMap_["getObject"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
-  methodMap_["getUnsafeObject"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getUnsafeObject};
-  methodMap_["getRootTag"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
-  methodMap_["getValue"] = MethodMetadata{3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+  methodMap_["voidFunc"] =
+      MethodMetadata{.argCount = 0, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+  methodMap_["getBool"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
+  methodMap_["getEnum"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getEnum};
+  methodMap_["getNumber"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
+  methodMap_["getString"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
+  methodMap_["getArray"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
+  methodMap_["getObject"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
+  methodMap_["getUnsafeObject"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getUnsafeObject};
+  methodMap_["getRootTag"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
+  methodMap_["getValue"] =
+      MethodMetadata{.argCount = 3, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
   methodMap_["getValueWithCallback"] =
-      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
   methodMap_["getValueWithPromise"] =
-      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
-  methodMap_["voidFuncThrows"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncThrows};
-  methodMap_["getObjectThrows"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectThrows};
-  methodMap_["promiseThrows"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_promiseThrows};
-  methodMap_["voidFuncAssert"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncAssert};
-  methodMap_["getObjectAssert"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectAssert};
-  methodMap_["promiseAssert"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_promiseAssert};
-  methodMap_["getConstants"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+  methodMap_["voidFuncThrows"] =
+      MethodMetadata{.argCount = 0, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncThrows};
+  methodMap_["getObjectThrows"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectThrows};
+  methodMap_["promiseThrows"] =
+      MethodMetadata{.argCount = 0, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_promiseThrows};
+  methodMap_["voidFuncAssert"] =
+      MethodMetadata{.argCount = 0, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncAssert};
+  methodMap_["getObjectAssert"] =
+      MethodMetadata{.argCount = 1, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectAssert};
+  methodMap_["promiseAssert"] =
+      MethodMetadata{.argCount = 0, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_promiseAssert};
+  methodMap_["getConstants"] =
+      MethodMetadata{.argCount = 0, .invoker = __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
   eventEmitterMap_["onPress"] = std::make_shared<AsyncEventEmitter<id>>();
   eventEmitterMap_["onClick"] = std::make_shared<AsyncEventEmitter<id>>();
   eventEmitterMap_["onChange"] = std::make_shared<AsyncEventEmitter<id>>();

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

@@ -7,15 +7,15 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
-
 file(GLOB react_nativemodule_webperformance_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_nativemodule_webperformance OBJECT ${react_nativemodule_webperformance_SRC})
 
 target_include_directories(react_nativemodule_webperformance PUBLIC ${REACT_COMMON_DIR})
 
 target_link_libraries(react_nativemodule_webperformance
+        react_performance_timeline
         react_codegen_rncore
         react_cxxreact
 )
 target_compile_reactnative_options(react_nativemodule_webperformance PRIVATE)
-target_compile_options(react_nativemodule_webperformance PRIVATE -Wpedantic)
+target_compile_options(react_nativemodule_webperformance PRIVATE -Wpedantic -Wno-deprecated-declarations)

package/ReactCommon/react/nativemodule/webperformance/NativePerformance.cpp

@@ -13,6 +13,7 @@
 
 #include <cxxreact/JSExecutor.h>
 #include <cxxreact/ReactMarker.h>
+#include <jsi/JSIDynamic.h>
 #include <jsi/instrumentation.h>
 #include <react/performance/timeline/PerformanceEntryReporter.h>
 #include <react/performance/timeline/PerformanceObserver.h>
@@ -111,67 +112,62 @@ std::shared_ptr<PerformanceObserver> tryGetObserver(
   return observerWrapper ? observerWrapper->observer : nullptr;
 }
 
+PerformanceEntryReporter::UserTimingDetailProvider getDetailProviderFromEntry(
+    jsi::Runtime& rt,
+    jsi::Value& entry) {
+  return [&rt, &entry]() -> folly::dynamic {
+    try {
+      auto detail = entry.asObject(rt).getProperty(rt, "detail");
+      return jsi::dynamicFromValue(rt, detail);
+    } catch (jsi::JSIException&) {
+      return nullptr;
+    }
+  };
+}
+
 } // namespace
 
 NativePerformance::NativePerformance(std::shared_ptr<CallInvoker> jsInvoker)
     : NativePerformanceCxxSpec(std::move(jsInvoker)) {}
 
 HighResTimeStamp NativePerformance::now(jsi::Runtime& /*rt*/) {
+  // This is not spec-compliant, as this is the duration from system boot to
+  // now, instead of from app startup to now.
+  // This should be carefully changed eventually.
   return HighResTimeStamp::now();
 }
 
-HighResTimeStamp NativePerformance::markWithResult(
-    jsi::Runtime& rt,
-    std::string name,
-    std::optional<HighResTimeStamp> startTime) {
-  auto entry =
-      PerformanceEntryReporter::getInstance()->reportMark(name, startTime);
-  return entry.startTime;
+HighResDuration NativePerformance::timeOrigin(jsi::Runtime& /*rt*/) {
+  // This is not spec-compliant, as this is an approximation from Unix epoch to
+  // system boot, instead of a precise duration from Unix epoch to app startup.
+  return HighResTimeStamp::unsafeOriginFromUnixTimeStamp();
 }
 
-std::tuple<HighResTimeStamp, HighResDuration>
-NativePerformance::measureWithResult(
-    jsi::Runtime& runtime,
-    std::string name,
+void NativePerformance::reportMark(
+    jsi::Runtime& rt,
+    const std::string& name,
     HighResTimeStamp startTime,
-    HighResTimeStamp endTime,
-    std::optional<HighResDuration> duration,
-    std::optional<std::string> startMark,
-    std::optional<std::string> endMark) {
-  auto reporter = PerformanceEntryReporter::getInstance();
-
-  HighResTimeStamp startTimeValue = startTime;
-  // If the start time mark name is specified, it takes precedence over the
-  // startTime parameter, which can be set to 0 by default from JavaScript.
-  if (startMark) {
-    if (auto startMarkBufferedTime = reporter->getMarkTime(*startMark)) {
-      startTimeValue = *startMarkBufferedTime;
-    } else {
-      throw jsi::JSError(
-          runtime, "The mark '" + *startMark + "' does not exist.");
-    }
-  }
+    jsi::Value entry) {
+  PerformanceEntryReporter::getInstance()->reportMark(
+      name, startTime, getDetailProviderFromEntry(rt, entry));
+}
 
-  HighResTimeStamp endTimeValue = endTime;
-  // If the end time mark name is specified, it takes precedence over the
-  // startTime parameter, which can be set to 0 by default from JavaScript.
-  if (endMark) {
-    if (auto endMarkBufferedTime = reporter->getMarkTime(*endMark)) {
-      endTimeValue = *endMarkBufferedTime;
-    } else {
-      throw jsi::JSError(
-          runtime, "The mark '" + *endMark + "' does not exist.");
-    }
-  } else if (duration) {
-    endTimeValue = startTimeValue + *duration;
-  } else if (endTimeValue < startTimeValue) {
-    // The end time is not specified, take the current time, according to the
-    // standard
-    endTimeValue = reporter->getCurrentTimeStamp();
-  }
+void NativePerformance::reportMeasure(
+    jsi::Runtime& rt,
+    const std::string& name,
+    HighResTimeStamp startTime,
+    HighResDuration duration,
+    jsi::Value entry) {
+  PerformanceEntryReporter::getInstance()->reportMeasure(
+      name, startTime, duration, getDetailProviderFromEntry(rt, entry));
+}
 
-  auto entry = reporter->reportMeasure(name, startTime, endTime);
-  return std::tuple{entry.startTime, entry.duration};
+std::optional<double> NativePerformance::getMarkTime(
+    jsi::Runtime& /*rt*/,
+    const std::string& name) {
+  auto markTime = PerformanceEntryReporter::getInstance()->getMarkTime(name);
+  return markTime ? std::optional{(*markTime).toDOMHighResTimeStamp()}
+                  : std::nullopt;
 }
 
 void NativePerformance::clearMarks(
@@ -213,7 +209,7 @@ std::vector<NativePerformanceEntry> NativePerformance::getEntries(
 
 std::vector<NativePerformanceEntry> NativePerformance::getEntriesByName(
     jsi::Runtime& /*rt*/,
-    std::string entryName,
+    const std::string& entryName,
     std::optional<PerformanceEntryType> entryType) {
   std::vector<PerformanceEntry> entries;
 
@@ -266,7 +262,7 @@ std::unordered_map<std::string, double> NativePerformance::getSimpleMemoryInfo(
 }
 
 std::unordered_map<std::string, double>
-NativePerformance::getReactNativeStartupTiming(jsi::Runtime& rt) {
+NativePerformance::getReactNativeStartupTiming(jsi::Runtime& /*rt*/) {
   std::unordered_map<std::string, double> result;
 
   ReactMarker::StartupLogger& startupLogger =
@@ -287,15 +283,6 @@ NativePerformance::getReactNativeStartupTiming(jsi::Runtime& rt) {
         startupLogger.getRunJSBundleStartTime();
   }
 
-  if (!std::isnan(startupLogger.getRunJSBundleEndTime())) {
-    result["executeJavaScriptBundleEntryPointEnd"] =
-        startupLogger.getRunJSBundleEndTime();
-  }
-
-  if (!std::isnan(startupLogger.getInitReactRuntimeEndTime())) {
-    result["initializeRuntimeEnd"] = startupLogger.getInitReactRuntimeEndTime();
-  }
-
   if (!std::isnan(startupLogger.getAppStartupEndTime())) {
     result["endTime"] = startupLogger.getAppStartupEndTime();
   }
@@ -406,4 +393,10 @@ NativePerformance::getSupportedPerformanceEntryTypes(jsi::Runtime& /*rt*/) {
   return {supportedEntryTypes.begin(), supportedEntryTypes.end()};
 }
 
+#pragma mark - Testing
+
+void NativePerformance::clearEventCountsForTesting(jsi::Runtime& /*rt*/) {
+  PerformanceEntryReporter::getInstance()->clearEventCounts();
+}
+
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/webperformance/NativePerformance.h

@@ -88,23 +88,25 @@ class NativePerformance : public NativePerformanceCxxSpec<NativePerformance> {
   // https://www.w3.org/TR/hr-time-3/#now-method
   HighResTimeStamp now(jsi::Runtime& rt);
 
+  // https://www.w3.org/TR/hr-time-3/#timeorigin-attribute
+  HighResDuration timeOrigin(jsi::Runtime& rt);
+
 #pragma mark - User Timing Level 3 functions (https://w3c.github.io/user-timing/)
 
-  // https://w3c.github.io/user-timing/#mark-method
-  HighResTimeStamp markWithResult(
+  void reportMark(
       jsi::Runtime& rt,
-      std::string name,
-      std::optional<HighResTimeStamp> startTime);
+      const std::string& name,
+      HighResTimeStamp time,
+      jsi::Value entry);
 
-  // https://w3c.github.io/user-timing/#measure-method
-  std::tuple<HighResTimeStamp, HighResDuration> measureWithResult(
+  void reportMeasure(
       jsi::Runtime& rt,
-      std::string name,
+      const std::string& name,
       HighResTimeStamp startTime,
-      HighResTimeStamp endTime,
-      std::optional<HighResDuration> duration,
-      std::optional<std::string> startMark,
-      std::optional<std::string> endMark);
+      HighResDuration duration,
+      jsi::Value entry);
+
+  std::optional<double> getMarkTime(jsi::Runtime& rt, const std::string& name);
 
   // https://w3c.github.io/user-timing/#clearmarks-method
   void clearMarks(
@@ -129,7 +131,7 @@ class NativePerformance : public NativePerformanceCxxSpec<NativePerformance> {
   // https://www.w3.org/TR/performance-timeline/#getentriesbyname-method
   std::vector<NativePerformanceEntry> getEntriesByName(
       jsi::Runtime& rt,
-      std::string entryName,
+      const std::string& entryName,
       std::optional<PerformanceEntryType> entryType = std::nullopt);
 
 #pragma mark - Performance Observer (https://w3c.github.io/performance-timeline/#the-performanceobserver-interface)
@@ -184,6 +186,10 @@ class NativePerformance : public NativePerformanceCxxSpec<NativePerformance> {
   // tracking.
   std::unordered_map<std::string, double> getReactNativeStartupTiming(
       jsi::Runtime& rt);
+
+#pragma mark - Testing
+
+  void clearEventCountsForTesting(jsi::Runtime& rt);
 };
 
 } // namespace facebook::react