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

package/ReactCommon/cxxreact/JsArgumentHelpers.h

@@ -24,7 +24,7 @@ namespace facebook::xplat {
 
 class JsArgumentException : public std::logic_error {
  public:
-  JsArgumentException(const std::string& msg) : std::logic_error(msg) {}
+  JsArgumentException(const std::string &msg) : std::logic_error(msg) {}
 };
 
 // This extracts a single argument by calling the given method pointer on it.
@@ -34,15 +34,9 @@ class JsArgumentException : public std::logic_error {
 // overload accepts ref-qualified member functions.
 
 template <typename R, typename... T>
-R jsArg(
-    const folly::dynamic& arg,
-    R (folly::dynamic::*asFoo)() const,
-    const T&... desc);
+R jsArg(const folly::dynamic &arg, R (folly::dynamic::*asFoo)() const, const T &...desc);
 template <typename R, typename... T>
-R jsArg(
-    const folly::dynamic& arg,
-    R (folly::dynamic::*asFoo)() const&,
-    const T&... desc);
+R jsArg(const folly::dynamic &arg, R (folly::dynamic::*asFoo)() const &, const T &...desc);
 
 // This is like jsArg, but a operates on a dynamic representing an array of
 // arguments.  The argument n is used both to index the array and build the
@@ -50,15 +44,9 @@ R jsArg(
 // used by the type-specific methods following.
 
 template <typename R>
-R jsArgN(
-    const folly::dynamic& args,
-    size_t n,
-    R (folly::dynamic::*asFoo)() const);
+R jsArgN(const folly::dynamic &args, size_t n, R (folly::dynamic::*asFoo)() const);
 template <typename R>
-R jsArgN(
-    const folly::dynamic& args,
-    size_t n,
-    R (folly::dynamic::*asFoo)() const&);
+R jsArgN(const folly::dynamic &args, size_t n, R (folly::dynamic::*asFoo)() const &);
 
 namespace detail {
 
@@ -68,8 +56,7 @@ namespace detail {
 // only for types compatible with folly::dynamic.
 template <typename T>
 struct is_dynamic {
-  using type = typename std::
-      enable_if<std::is_assignable<folly::dynamic, T>::value, T>::type;
+  using type = typename std::enable_if<std::is_assignable<folly::dynamic, T>::value, T>::type;
 };
 
 } // end namespace detail
@@ -79,41 +66,45 @@ struct is_dynamic {
 // Extract the n'th arg from the given dynamic, as a dynamic.  Throws a
 // JsArgumentException if there is no n'th arg in the input.
 template <typename T>
-typename detail::is_dynamic<T>::type& jsArgAsDynamic(T&& args, size_t n);
+typename detail::is_dynamic<T>::type &jsArgAsDynamic(T &&args, size_t n);
 
 // Extract the n'th arg from the given dynamic, as a dynamic Array.  Throws a
 // JsArgumentException if there is no n'th arg in the input, or it is not an
 // Array.
 template <typename T>
-typename detail::is_dynamic<T>::type& jsArgAsArray(T&& args, size_t n);
+typename detail::is_dynamic<T>::type &jsArgAsArray(T &&args, size_t n);
 
 // Extract the n'th arg from the given dynamic, as a dynamic Object.  Throws a
 // JsArgumentException if there is no n'th arg in the input, or it is not an
 // Object.
 template <typename T>
-typename detail::is_dynamic<T>::type& jsArgAsObject(T&& args, size_t n);
+typename detail::is_dynamic<T>::type &jsArgAsObject(T &&args, size_t n);
 
 // Extract the n'th arg from the given dynamic, as a bool.  Throws a
 // JsArgumentException if this fails for some reason.
-inline bool jsArgAsBool(const folly::dynamic& args, size_t n) {
+inline bool jsArgAsBool(const folly::dynamic &args, size_t n)
+{
   return jsArgN(args, n, &folly::dynamic::asBool);
 }
 
 // Extract the n'th arg from the given dynamic, as an integer.  Throws a
 // JsArgumentException if this fails for some reason.
-inline int64_t jsArgAsInt(const folly::dynamic& args, size_t n) {
+inline int64_t jsArgAsInt(const folly::dynamic &args, size_t n)
+{
   return jsArgN(args, n, &folly::dynamic::asInt);
 }
 
 // Extract the n'th arg from the given dynamic, as a double.  Throws a
 // JsArgumentException if this fails for some reason.
-inline double jsArgAsDouble(const folly::dynamic& args, size_t n) {
+inline double jsArgAsDouble(const folly::dynamic &args, size_t n)
+{
   return jsArgN(args, n, &folly::dynamic::asDouble);
 }
 
 // Extract the n'th arg from the given dynamic, as a string.  Throws a
 // JsArgumentException if this fails for some reason.
-inline std::string jsArgAsString(const folly::dynamic& args, size_t n) {
+inline std::string jsArgAsString(const folly::dynamic &args, size_t n)
+{
   return jsArgN(args, n, &folly::dynamic::asString);
 }
 

package/ReactCommon/cxxreact/MessageQueueThread.h

@@ -14,10 +14,10 @@ namespace facebook::react {
 class MessageQueueThread {
  public:
   virtual ~MessageQueueThread() = default;
-  virtual void runOnQueue(std::function<void()>&&) = 0;
+  virtual void runOnQueue(std::function<void()> &&) = 0;
   // runOnQueueSync and quitSynchronous are dangerous.  They should only be
   // used for initialization and cleanup.
-  virtual void runOnQueueSync(std::function<void()>&&) = 0;
+  virtual void runOnQueueSync(std::function<void()> &&) = 0;
   // Once quitSynchronous() returns, no further work should run on the queue.
   virtual void quitSynchronous() = 0;
 };

package/ReactCommon/cxxreact/MethodCall.cpp

@@ -7,7 +7,7 @@
 
 #include "MethodCall.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <folly/json.h>
 #include <stdexcept>
@@ -88,4 +88,4 @@ std::vector<MethodCall> parseMethodCalls(folly::dynamic&& jsonData) {
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/MethodCall.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <map>
 #include <string>
@@ -17,24 +17,22 @@
 
 namespace facebook::react {
 
-struct [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] MethodCall {
+struct [[deprecated("This API will be removed along with the legacy architecture.")]] MethodCall {
   int moduleId;
   int methodId;
   folly::dynamic arguments;
   int callId;
 
-  MethodCall(int mod, int meth, folly::dynamic&& args, int cid)
-      : moduleId(mod),
-        methodId(meth),
-        arguments(std::move(args)),
-        callId(cid) {}
+  MethodCall(int mod, int meth, folly::dynamic &&args, int cid)
+      : moduleId(mod), methodId(meth), arguments(std::move(args)), callId(cid)
+  {
+  }
 };
 
 /// \throws std::invalid_argument
 [[deprecated("This API will be removed along with the legacy architecture.")]]
-std::vector<MethodCall> parseMethodCalls(folly::dynamic&& jsonData);
+std::vector<MethodCall> parseMethodCalls(folly::dynamic &&jsonData);
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/ModuleRegistry.cpp

@@ -7,7 +7,7 @@
 
 #include "ModuleRegistry.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <glog/logging.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
@@ -190,7 +190,7 @@ std::optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name) {
     // no constants or methods
     return std::nullopt;
   } else {
-    return ModuleConfig{index, std::move(config)};
+    return ModuleConfig{.index = index, .config = std::move(config)};
   }
 }
 
@@ -244,4 +244,4 @@ MethodCallResult ModuleRegistry::callSerializableNativeHook(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/ModuleRegistry.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <memory>
 #include <unordered_set>
@@ -25,14 +25,12 @@ namespace facebook::react {
 
 class NativeModule;
 
-struct [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] ModuleConfig {
+struct [[deprecated("This API will be removed along with the legacy architecture.")]] ModuleConfig {
   size_t index;
   folly::dynamic config;
 };
 
-class RN_EXPORT [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] ModuleRegistry {
+class RN_EXPORT [[deprecated("This API will be removed along with the legacy architecture.")]] ModuleRegistry {
  public:
   // not implemented:
   // onBatchComplete: see
@@ -41,31 +39,20 @@ class RN_EXPORT [[deprecated(
   // notifyCatalystInstanceInitialized: this is really only used by view-related
   // code notifyCatalystInstanceDestroy: use RAII instead
 
-  using ModuleNotFoundCallback = std::function<bool(const std::string& name)>;
+  using ModuleNotFoundCallback = std::function<bool(const std::string &name)>;
 
-  ModuleRegistry(
-      std::vector<std::unique_ptr<NativeModule>> modules,
-      ModuleNotFoundCallback callback = nullptr);
+  ModuleRegistry(std::vector<std::unique_ptr<NativeModule>> modules, ModuleNotFoundCallback callback = nullptr);
   void registerModules(std::vector<std::unique_ptr<NativeModule>> modules);
 
   std::vector<std::string> moduleNames();
 
-  std::optional<ModuleConfig> getConfig(const std::string& name);
+  std::optional<ModuleConfig> getConfig(const std::string &name);
 
-  void callNativeMethod(
-      unsigned int moduleId,
-      unsigned int methodId,
-      folly::dynamic&& params,
-      int callId);
-  MethodCallResult callSerializableNativeHook(
-      unsigned int moduleId,
-      unsigned int methodId,
-      folly::dynamic&& params);
+  void callNativeMethod(unsigned int moduleId, unsigned int methodId, folly::dynamic &&params, int callId);
+  MethodCallResult callSerializableNativeHook(unsigned int moduleId, unsigned int methodId, folly::dynamic &&params);
 
   std::string getModuleName(unsigned int moduleId);
-  std::string getModuleSyncMethodName(
-      unsigned int moduleId,
-      unsigned int methodId);
+  std::string getModuleSyncMethodName(unsigned int moduleId, unsigned int methodId);
 
  private:
   // This is always populated
@@ -93,4 +80,4 @@ class RN_EXPORT [[deprecated(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/MoveWrapper.h

@@ -78,37 +78,42 @@ class MoveWrapper {
   MoveWrapper() = default;
 
   /// Move a value in.
-  explicit MoveWrapper(T&& t) : value(std::move(t)) {}
+  explicit MoveWrapper(T &&t) : value(std::move(t)) {}
 
   /// copy is move
-  MoveWrapper(const MoveWrapper& other) : value(std::move(other.value)) {}
+  MoveWrapper(const MoveWrapper &other) : value(std::move(other.value)) {}
 
   /// move is also move
-  MoveWrapper(MoveWrapper&& other) noexcept : value(std::move(other.value)) {}
+  MoveWrapper(MoveWrapper &&other) noexcept : value(std::move(other.value)) {}
 
-  const T& operator*() const {
+  const T &operator*() const
+  {
     return value;
   }
-  T& operator*() {
+  T &operator*()
+  {
     return value;
   }
 
-  const T* operator->() const {
+  const T *operator->() const
+  {
     return &value;
   }
-  T* operator->() {
+  T *operator->()
+  {
     return &value;
   }
 
   /// move the value out (sugar for std::move(*moveWrapper))
-  T&& move() {
+  T &&move()
+  {
     return std::move(value);
   }
 
   // If you want these you're probably doing it wrong, though they'd be
   // easy enough to implement
-  MoveWrapper& operator=(const MoveWrapper&) = delete;
-  MoveWrapper& operator=(MoveWrapper&&) = delete;
+  MoveWrapper &operator=(const MoveWrapper &) = delete;
+  MoveWrapper &operator=(MoveWrapper &&) = delete;
 
  private:
   mutable T value;
@@ -118,7 +123,8 @@ class MoveWrapper {
 /// is already quite transparent in its intent, this will work for lvalues as
 /// if you had wrapped them in std::move.
 template <class T, class T0 = typename std::remove_reference<T>::type>
-MoveWrapper<T0> makeMoveWrapper(T&& t) {
+MoveWrapper<T0> makeMoveWrapper(T &&t)
+{
   return MoveWrapper<T0>(std::forward<T0>(t));
 }
 

package/ReactCommon/cxxreact/NativeModule.h

@@ -15,35 +15,29 @@
 
 namespace facebook::react {
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
-struct [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] MethodDescriptor {
+#ifndef RCT_REMOVE_LEGACY_ARCH
+struct [[deprecated("This API will be removed along with the legacy architecture.")]] MethodDescriptor {
   std::string name;
   // type is one of js MessageQueue.MethodTypes
   std::string type;
 
-  MethodDescriptor(std::string n, std::string t)
-      : name(std::move(n)), type(std::move(t)) {}
+  MethodDescriptor(std::string n, std::string t) : name(std::move(n)), type(std::move(t)) {}
 };
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 using MethodCallResult = std::optional<folly::dynamic>;
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
-class [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] NativeModule {
+#ifndef RCT_REMOVE_LEGACY_ARCH
+class [[deprecated("This API will be removed along with the legacy architecture.")]] NativeModule {
  public:
   virtual ~NativeModule() = default;
   virtual std::string getName() = 0;
   virtual std::string getSyncMethodName(unsigned int methodId) = 0;
   virtual std::vector<MethodDescriptor> getMethods() = 0;
   virtual folly::dynamic getConstants() = 0;
-  virtual void
-  invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) = 0;
-  virtual MethodCallResult callSerializableNativeHook(
-      unsigned int reactMethodId,
-      folly::dynamic&& args) = 0;
+  virtual void invoke(unsigned int reactMethodId, folly::dynamic &&params, int callId) = 0;
+  virtual MethodCallResult callSerializableNativeHook(unsigned int reactMethodId, folly::dynamic &&args) = 0;
 };
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 } // namespace facebook::react

package/ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -7,7 +7,7 @@
 
 #include "NativeToJsBridge.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <ReactCommon/CallInvoker.h>
 #include <folly/json.h>
@@ -38,8 +38,8 @@ namespace facebook::react {
 
 // This class manages calls from JS to native code.
 class [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] JsToNativeBridge
-    : public react::ExecutorDelegate {
+    "This API will be removed along with the legacy architecture.")]]
+JsToNativeBridge : public react::ExecutorDelegate {
  public:
   JsToNativeBridge(
       std::shared_ptr<ModuleRegistry> registry,
@@ -351,4 +351,4 @@ NativeToJsBridge::getInspectorTargetDelegate() {
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/NativeToJsBridge.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <atomic>
 #include <functional>
@@ -38,8 +38,7 @@ class RAMBundleRegistry;
 // Except for loadBundleSync(), all void methods will queue
 // work to run on the jsQueue passed to the ctor, and return
 // immediately.
-class [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] NativeToJsBridge {
+class [[deprecated("This API will be removed along with the legacy architecture.")]] NativeToJsBridge {
  public:
   friend class JsToNativeBridge;
 
@@ -47,7 +46,7 @@ class [[deprecated(
    * This must be called on the main JS thread.
    */
   NativeToJsBridge(
-      JSExecutorFactory* jsExecutorFactory,
+      JSExecutorFactory *jsExecutorFactory,
       std::shared_ptr<ModuleRegistry> registry,
       std::shared_ptr<MessageQueueThread> jsQueue,
       std::shared_ptr<InstanceCallback> callback);
@@ -57,15 +56,12 @@ class [[deprecated(
    * Executes a function with the module ID and method ID and any additional
    * arguments in JS.
    */
-  void callFunction(
-      std::string&& module,
-      std::string&& method,
-      folly::dynamic&& arguments);
+  void callFunction(std::string &&module, std::string &&method, folly::dynamic &&arguments);
 
   /**
    * Invokes a callback with the cbID, and optional additional arguments in JS.
    */
-  void invokeCallback(double callbackId, folly::dynamic&& arguments);
+  void invokeCallback(double callbackId, folly::dynamic &&arguments);
 
   /**
    * Sets global variables in the JS Context.
@@ -86,11 +82,9 @@ class [[deprecated(
       std::unique_ptr<const JSBigString> startupScript,
       std::string sourceURL);
 
-  void registerBundle(uint32_t bundleId, const std::string& bundlePath);
-  void setGlobalVariable(
-      std::string propName,
-      std::unique_ptr<const JSBigString> jsonValue);
-  void* getJavaScriptContext();
+  void registerBundle(uint32_t bundleId, const std::string &bundlePath);
+  void setGlobalVariable(std::string propName, std::unique_ptr<const JSBigString> jsonValue);
+  void *getJavaScriptContext();
   bool isInspectable();
   bool isBatchActive();
 
@@ -101,7 +95,7 @@ class [[deprecated(
    */
   void destroy();
 
-  void runOnExecutorQueue(std::function<void(JSExecutor*)>&& task) noexcept;
+  void runOnExecutorQueue(std::function<void(JSExecutor *)> &&task) noexcept;
 
   /**
    * NativeMethodCallInvoker is used by TurboModules to schedule work on the
@@ -110,7 +104,7 @@ class [[deprecated(
   std::shared_ptr<NativeMethodCallInvoker> getDecoratedNativeMethodCallInvoker(
       std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker) const;
 
-  jsinspector_modern::RuntimeTargetDelegate& getInspectorTargetDelegate();
+  jsinspector_modern::RuntimeTargetDelegate &getInspectorTargetDelegate();
 
  private:
   // This is used to avoid a race condition where a proxyCallback gets queued
@@ -139,4 +133,4 @@ class [[deprecated(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/RAMBundleRegistry.cpp

@@ -7,7 +7,7 @@
 
 #include "RAMBundleRegistry.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <folly/String.h>
 
@@ -70,8 +70,8 @@ JSModulesUnbundle::Module RAMBundleRegistry::getModule(
   }
 
   return {
-      "seg-" + std::to_string(bundleId) + '_' + module.name,
-      std::move(module.code),
+      .name = "seg-" + std::to_string(bundleId) + '_' + module.name,
+      .code = std::move(module.code),
   };
 }
 
@@ -81,4 +81,4 @@ JSModulesUnbundle* RAMBundleRegistry::getBundle(uint32_t bundleId) const {
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/RAMBundleRegistry.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <cstdint>
 #include <functional>
@@ -23,31 +23,28 @@
 
 namespace facebook::react {
 
-class RN_EXPORT [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] RAMBundleRegistry {
+class RN_EXPORT [[deprecated("This API will be removed along with the legacy architecture.")]] RAMBundleRegistry {
  public:
   constexpr static uint32_t MAIN_BUNDLE_ID = 0;
 
-  static std::unique_ptr<RAMBundleRegistry> singleBundleRegistry(
-      std::unique_ptr<JSModulesUnbundle> mainBundle);
+  static std::unique_ptr<RAMBundleRegistry> singleBundleRegistry(std::unique_ptr<JSModulesUnbundle> mainBundle);
   static std::unique_ptr<RAMBundleRegistry> multipleBundlesRegistry(
       std::unique_ptr<JSModulesUnbundle> mainBundle,
       std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory);
 
   explicit RAMBundleRegistry(
       std::unique_ptr<JSModulesUnbundle> mainBundle,
-      std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory =
-          nullptr);
+      std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory = nullptr);
 
-  RAMBundleRegistry(RAMBundleRegistry&&) = default;
-  RAMBundleRegistry& operator=(RAMBundleRegistry&&) = default;
+  RAMBundleRegistry(RAMBundleRegistry &&) = default;
+  RAMBundleRegistry &operator=(RAMBundleRegistry &&) = default;
 
   void registerBundle(uint32_t bundleId, std::string bundlePath);
   JSModulesUnbundle::Module getModule(uint32_t bundleId, uint32_t moduleId);
   virtual ~RAMBundleRegistry() = default;
 
  private:
-  JSModulesUnbundle* getBundle(uint32_t bundleId) const;
+  JSModulesUnbundle *getBundle(uint32_t bundleId) const;
 
   std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> m_factory;
   std::unordered_map<uint32_t, std::string> m_bundlePaths;
@@ -56,4 +53,4 @@ class RN_EXPORT [[deprecated(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -44,6 +44,7 @@ Pod::Spec.new do |s|
   s.dependency "React-logger", version
   s.dependency "React-debug", version
   s.dependency "React-timing", version
+  add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
 
   s.resource_bundles = {'React-cxxreact_privacy' => 'PrivacyInfo.xcprivacy'}
 

package/ReactCommon/cxxreact/ReactMarker.h

@@ -37,14 +37,11 @@ enum ReactMarkerId {
 };
 
 #ifdef __APPLE__
-using LogTaggedMarker =
-    std::function<void(const ReactMarkerId, const char* tag)>; // Bridge only
-using LogTaggedMarkerBridgeless =
-    std::function<void(const ReactMarkerId, const char* tag)>;
+using LogTaggedMarker = std::function<void(const ReactMarkerId, const char *tag)>; // Bridge only
+using LogTaggedMarkerBridgeless = std::function<void(const ReactMarkerId, const char *tag)>;
 #else
-typedef void (
-    *LogTaggedMarker)(const ReactMarkerId, const char* tag); // Bridge only
-typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char* tag);
+typedef void (*LogTaggedMarker)(const ReactMarkerId, const char *tag); // Bridge only
+typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char *tag);
 #endif
 
 #ifndef RN_EXPORT
@@ -57,26 +54,23 @@ extern RN_EXPORT std::shared_mutex logTaggedMarkerImplMutex;
 extern RN_EXPORT LogTaggedMarker logTaggedMarkerImpl;
 extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl;
 
-extern RN_EXPORT void logMarker(const ReactMarkerId markerId); // Bridge only
-extern RN_EXPORT void logTaggedMarker(
-    const ReactMarkerId markerId,
-    const char* tag); // Bridge only
-extern RN_EXPORT void logMarkerBridgeless(const ReactMarkerId markerId);
-extern RN_EXPORT void logTaggedMarkerBridgeless(
-    const ReactMarkerId markerId,
-    const char* tag);
+extern RN_EXPORT void logMarker(ReactMarkerId markerId); // Bridge only
+extern RN_EXPORT void logTaggedMarker(ReactMarkerId markerId,
+                                      const char *tag); // Bridge only
+extern RN_EXPORT void logMarkerBridgeless(ReactMarkerId markerId);
+extern RN_EXPORT void logTaggedMarkerBridgeless(ReactMarkerId markerId, const char *tag);
 
 struct ReactMarkerEvent {
   const ReactMarkerId markerId;
-  const char* tag;
+  const char *tag;
   double time;
 };
 
 class RN_EXPORT StartupLogger {
  public:
-  static StartupLogger& getInstance();
+  static StartupLogger &getInstance();
 
-  void logStartupEvent(const ReactMarkerId markerId, double markerTime);
+  void logStartupEvent(ReactMarkerId markerId, double markerTime);
   void reset();
   double getAppStartupStartTime();
   double getInitReactRuntimeStartTime();
@@ -87,8 +81,8 @@ class RN_EXPORT StartupLogger {
 
  private:
   StartupLogger() = default;
-  StartupLogger(const StartupLogger&) = delete;
-  StartupLogger& operator=(const StartupLogger&) = delete;
+  StartupLogger(const StartupLogger &) = delete;
+  StartupLogger &operator=(const StartupLogger &) = delete;
 
   double appStartupStartTime = std::nan("");
   double appStartupEndTime = std::nan("");
@@ -101,8 +95,6 @@ class RN_EXPORT StartupLogger {
 // When the marker got logged from the platform, it will notify here. This is
 // used to collect react markers that are logged in the platform instead of in
 // C++.
-extern RN_EXPORT void logMarkerDone(
-    const ReactMarkerId markerId,
-    double markerTime);
+extern RN_EXPORT void logMarkerDone(ReactMarkerId markerId, double markerTime);
 
 } // namespace facebook::react::ReactMarker