react-native-tvos 0.78.0-0rc4 → 0.79.0-0

package/ReactCommon/react/utils/React-utils.podspec

@@ -52,11 +52,7 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "glog"
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
+  depend_on_js_engine(s)
 
   add_dependency(s, "React-debug")
 end

package/ReactCommon/react/utils/TemplateStringLiteral.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <algorithm>
+#include <array>
+#include <string_view>
+
+namespace facebook::react {
+
+/**
+ * Helper to allow passing string literals as template parameters.
+ * https://ctrpeach.io/posts/cpp20-string-literal-template-parameters/
+ */
+template <size_t N>
+struct TemplateStringLiteral {
+  /* implicit */ constexpr TemplateStringLiteral(const char (&str)[N]) {
+    std::copy_n(str, N, value.data());
+  }
+
+  constexpr operator std::string_view() const {
+    return {value.begin(), value.end() - 1};
+  }
+
+  // Not private, since structural types required for template parameters cannot
+  // have non-punlic data members.
+  std::array<char, N> value{};
+};
+
+} // namespace facebook::react

package/ReactCommon/react/utils/fnv1a.h

@@ -11,6 +11,8 @@
 #include <functional>
 #include <string_view>
 
+#include <react/utils/toLower.h>
+
 namespace facebook::react {
 
 /**
@@ -41,10 +43,7 @@ constexpr uint32_t fnv1a(std::string_view string) noexcept {
 constexpr uint32_t fnv1aLowercase(std::string_view string) {
   struct LowerCaseTransform {
     constexpr char operator()(char c) const {
-      if (c >= 'A' && c <= 'Z') {
-        return c + static_cast<char>('a' - 'A');
-      }
-      return c;
+      return toLower(c);
     }
   };
 

package/ReactCommon/react/utils/iequals.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <string_view>
+
+#include <react/utils/toLower.h>
+
+namespace facebook::react {
+
+/**
+ * constexpr check for case insensitive equality of two strings.
+ */
+constexpr bool iequals(std::string_view a, std::string_view b) {
+  if (a.size() != b.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < a.size(); i++) {
+    if (toLower(a[i]) != toLower(b[i])) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+} // namespace facebook::react

package/ReactCommon/react/utils/toLower.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook::react {
+
+/**
+ * constexpr version of tolower
+ */
+constexpr char toLower(char c) {
+  if (c >= 'A' && c <= 'Z') {
+    return static_cast<char>(c + 32);
+  }
+  return c;
+}
+
+} // namespace facebook::react

package/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoLogger.cpp

@@ -7,15 +7,19 @@
 
 #include "ReactPerfettoLogger.h"
 
-#ifdef WITH_PERFETTO
+#if defined(WITH_PERFETTO)
 #include "ReactPerfetto.h"
+#elif defined(WITH_FBSYSTRACE)
+#include <fbsystrace.h>
 #endif
 
+#include <chrono>
+
 namespace facebook::react {
 
-#ifdef WITH_PERFETTO
 namespace {
 
+#if defined(WITH_PERFETTO)
 const std::string PERFETTO_DEFAULT_TRACK_NAME = "# Web Performance";
 const std::string PERFETTO_TRACK_NAME_PREFIX = "# Web Performance: ";
 
@@ -25,16 +29,32 @@ std::string toPerfettoTrackName(
       ? PERFETTO_TRACK_NAME_PREFIX + std::string(trackName.value())
       : PERFETTO_DEFAULT_TRACK_NAME;
 }
+#elif defined(WITH_FBSYSTRACE)
+int64_t getDeltaNanos(double jsTime) {
+  auto now = std::chrono::steady_clock::now().time_since_epoch();
+  return static_cast<int64_t>(jsTime * 1.e6) -
+      std::chrono::duration_cast<std::chrono::nanoseconds>(now).count();
+}
+#endif
 
 } // namespace
+
+/* static */ bool ReactPerfettoLogger::isTracing() {
+#if defined(WITH_PERFETTO)
+  return TRACE_EVENT_CATEGORY_ENABLED("react-native");
+#elif defined(WITH_FBSYSTRACE)
+  return fbsystrace_is_tracing(TRACE_TAG_REACT_APPS);
+#else
+  return false;
 #endif
+}
 
 /* static */ void ReactPerfettoLogger::measure(
     const std::string_view& eventName,
     double startTime,
     double endTime,
     const std::optional<std::string_view>& trackName) {
-#ifdef WITH_PERFETTO
+#if defined(WITH_PERFETTO)
   if (TRACE_EVENT_CATEGORY_ENABLED("react-native")) {
     auto track = getPerfettoWebPerfTrackAsync(toPerfettoTrackName(trackName));
     TRACE_EVENT_BEGIN(
@@ -45,6 +65,13 @@ std::string toPerfettoTrackName(
     TRACE_EVENT_END(
         "react-native", track, performanceNowToPerfettoTraceTime(endTime));
   }
+#elif defined(WITH_FBSYSTRACE)
+  static int cookie = 0;
+  fbsystrace_begin_async_section_with_timedelta(
+      TRACE_TAG_REACT_APPS, eventName.data(), cookie, getDeltaNanos(startTime));
+  fbsystrace_end_async_section_with_timedelta(
+      TRACE_TAG_REACT_APPS, eventName.data(), cookie, getDeltaNanos(endTime));
+  cookie++;
 #endif
 }
 
@@ -52,7 +79,7 @@ std::string toPerfettoTrackName(
     const std::string_view& eventName,
     double startTime,
     const std::optional<std::string_view>& trackName) {
-#ifdef WITH_PERFETTO
+#if defined(WITH_PERFETTO)
   if (TRACE_EVENT_CATEGORY_ENABLED("react-native")) {
     TRACE_EVENT_INSTANT(
         "react-native",

package/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoLogger.h

@@ -20,6 +20,8 @@ namespace facebook::react {
  */
 class ReactPerfettoLogger {
  public:
+  static bool isTracing();
+
   static void mark(
       const std::string_view& eventName,
       double startTime,

package/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h

@@ -14,6 +14,17 @@
 
 namespace facebook::react {
 
+// We can't define this as type std::mutex because it gives error: declaration
+// requires a global destructor.
+inline std::mutex* mainThreadMutex = nullptr;
+
+inline std::mutex& getMainThreadMutex() {
+  if (mainThreadMutex == nullptr) {
+    mainThreadMutex = new std::mutex();
+  }
+  return *mainThreadMutex;
+}
+
 /*
  * Takes a function and calls it with a reference to a Runtime. The function
  * will be called when it is safe to do so (i.e. it ensures non-concurrent
@@ -31,6 +42,16 @@ using RuntimeExecutor =
  * Use this method when the caller needs to *be blocked* by executing the
  * `callback` and requires that the callback will be executed on the same
  * thread.
+ * Example order of events (when not a sync call in runtimeExecutor callback):
+ * - [UI thread] Lock all mutexes at start
+ * - [UI thread] mutex1.lock before callback
+ * - [JS thread] Set runtimePtr in runtimeExecutor callback
+ * - [JS thread] mutex1.unlock in runtimeExecutor callback
+ * - [UI thread] Call callback
+ * - [JS thread] mutex2.lock in runtimeExecutor callback
+ * - [UI thread] mutex2.unlock after callback
+ * - [UI thread] mutex3.lock after callback
+ * - [JS thread] mutex3.unlock in runtimeExecutor callback
  */
 inline static void executeSynchronouslyOnSameThread_CAN_DEADLOCK(
     const RuntimeExecutor& runtimeExecutor,
@@ -42,6 +63,7 @@ inline static void executeSynchronouslyOnSameThread_CAN_DEADLOCK(
   std::mutex mutex2;
   std::mutex mutex3;
 
+  std::lock_guard<std::mutex> lock(getMainThreadMutex());
   mutex1.lock();
   mutex2.lock();
   mutex3.lock();

package/cli.js

@@ -23,6 +23,15 @@ const deprecated = () => {
   );
 };
 
+function findCommunityCli(startDir = process.cwd()) {
+  // With isolated node_modules (eg pnpm), we won't be able to find
+  // `@react-native-community/cli` starting from the `react-native` directory.
+  // Instead, we should use the project root, which we assume to be the cwd.
+  const options = {paths: [startDir]};
+  const rncli = require.resolve('@react-native-community/cli', options);
+  return require(rncli);
+}
+
 function isMissingCliDependency(error) {
   return (
     error.code === 'MODULE_NOT_FOUND' &&
@@ -217,7 +226,7 @@ async function main() {
   }
 
   try {
-    return require('@react-native-community/cli').run(name);
+    return findCommunityCli().run(name);
   } catch (e) {
     if (isMissingCliDependency(e)) {
       warnWithExplicitDependency();
@@ -231,7 +240,7 @@ if (require.main === module) {
   main();
 } else {
   try {
-    cli = require('@react-native-community/cli');
+    cli = findCommunityCli();
   } catch (e) {
     // We silence @react-native-community/cli missing as it is no
     // longer a dependency

package/flow/jest.js

@@ -268,7 +268,7 @@ type EnzymeMatchersType = {
   toIncludeText(text: string): void,
   toMatchElement(
     element: React.MixedElement,
-    options?: {|ignoreProps?: boolean, verbose?: boolean|},
+    options?: {ignoreProps?: boolean, verbose?: boolean},
   ): void,
   toMatchSelector(selector: string): void,
   // 7.x
@@ -302,7 +302,7 @@ type DomTestingLibraryType = {
   toHaveStyle(css: string | {[name: string]: any, ...}): void,
   toHaveTextContent(
     text: string | RegExp,
-    options?: {|normalizeWhitespace: boolean|},
+    options?: {normalizeWhitespace: boolean},
   ): void,
   toHaveValue(value?: string | string[] | number): void,
 
@@ -607,14 +607,14 @@ type SnapshotDiffType = {
    */
   toMatchDiffSnapshot(
     valueB: any,
-    options?: {|
+    options?: {
       expand?: boolean,
       colors?: boolean,
       contextLines?: number,
       stablePatchmarks?: boolean,
       aAnnotation?: string,
       bAnnotation?: string,
-    |},
+    },
     testName?: string,
   ): void,
   ...
@@ -994,10 +994,10 @@ type JestObjectType = {
 
 type JestSpyType = {calls: JestCallsType, ...};
 
-type JestDoneFn = {|
+type JestDoneFn = {
   (error?: Error): void,
   fail: (error: Error) => void,
-|};
+};
 
 /** Runs this function after every test inside this context */
 declare function afterEach(
@@ -1070,7 +1070,7 @@ declare var it: {
    * @param {Function} Test
    * @param {number} Timeout for the test, in milliseconds.
    */
-  only: {|
+  only: {
     (
       name: JestTestName,
       fn?: (done: JestDoneFn) => ?Promise<mixed>,
@@ -1083,7 +1083,7 @@ declare var it: {
       fn?: (...args: Array<any>) => ?Promise<mixed>,
       timeout?: number,
     ) => void,
-  |},
+  },
   /**
    * Skip running this test
    *
@@ -1091,7 +1091,7 @@ declare var it: {
    * @param {Function} Test
    * @param {number} Timeout for the test, in milliseconds.
    */
-  skip: {|
+  skip: {
     (
       name: JestTestName,
       fn?: (done: JestDoneFn) => ?Promise<mixed>,
@@ -1104,7 +1104,7 @@ declare var it: {
       fn?: (...args: Array<any>) => ?Promise<mixed>,
       timeout?: number,
     ) => void,
-  |},
+  },
   /**
    * Highlight planned tests in the summary output
    *
@@ -1188,7 +1188,7 @@ type JestPrettyFormatRefs = Array<any>;
 type JestPrettyFormatPrint = any => string;
 type JestPrettyFormatStringOrNull = string | null;
 
-type JestPrettyFormatOptions = {|
+type JestPrettyFormatOptions = {
   callToJSON: boolean,
   edgeSpacing: string,
   escapeRegex: boolean,
@@ -1199,14 +1199,14 @@ type JestPrettyFormatOptions = {|
   plugins: JestPrettyFormatPlugins,
   printFunctionName: boolean,
   spacing: string,
-  theme: {|
+  theme: {
     comment: string,
     content: string,
     prop: string,
     tag: string,
     value: string,
-  |},
-|};
+  },
+};
 
 type JestPrettyFormatPlugin = {
   print: (

package/gradle/libs.versions.toml

@@ -6,9 +6,9 @@ compileSdk = "35"
 buildTools = "35.0.0"
 ndkVersion = "27.1.12297006"
 # Dependencies versions
-agp = "8.8.0"
+agp = "8.8.2"
 androidx-annotation = "1.6.0"
-androidx-appcompat = "1.6.1"
+androidx-appcompat = "1.7.0"
 androidx-autofill = "1.1.0"
 androidx-swiperefreshlayout = "1.1.0"
 androidx-test = "1.5.0"