react-native-windows 0.83.0-preview.3 → 0.84.0-preview.10

package/Microsoft.ReactNative/Modules/Animated/AnimatedNode.cpp

@@ -22,19 +22,19 @@ int64_t AnimatedNode::Tag() {
 }
 
 void AnimatedNode::AddChild(const int64_t animatedNodeTag) {
-  m_children.push_back(animatedNodeTag);
+  m_children.insert(animatedNodeTag);
   GetChildNode(animatedNodeTag)->OnAttachToNode(m_tag);
 }
 
 void AnimatedNode::RemoveChild(const int64_t tag) {
   if (const auto childNode = GetChildNode(tag)) {
     childNode->OnDetachedFromNode(m_tag);
-    m_children.erase(std::find(m_children.begin(), m_children.end(), tag));
+    m_children.erase(tag);
   }
 }
 
 AnimatedNode *AnimatedNode::GetChildNode(int64_t tag) {
-  if (std::find(m_children.begin(), m_children.end(), tag) != m_children.end()) {
+  if (m_children.count(tag)) {
     if (const auto manager = m_manager.lock()) {
       return manager->GetAnimatedNode(tag);
     }

package/Microsoft.ReactNative/Modules/Animated/AnimatedNode.h

@@ -6,6 +6,7 @@
 #include <JSValue.h>
 #include <cstdint>
 #include <memory>
+#include <unordered_set>
 #include <vector>
 
 namespace Microsoft::ReactNative {
@@ -20,7 +21,7 @@ class AnimatedNode {
   void AddChild(int64_t animatedNode);
   void RemoveChild(int64_t animatedNode);
 
-  std::vector<int64_t> &Children() {
+  std::unordered_set<int64_t> &Children() {
     return m_children;
   }
 
@@ -37,7 +38,7 @@ class AnimatedNode {
   AnimatedNode *GetChildNode(int64_t tag);
   int64_t m_tag{0};
   const std::weak_ptr<NativeAnimatedNodeManager> m_manager;
-  std::vector<int64_t> m_children{};
+  std::unordered_set<int64_t> m_children{};
   bool m_useComposition{false};
 
   bool HasCompatibleAnimationDriver(int64_t tag);

package/Microsoft.ReactNative/Modules/Timing.h

@@ -9,6 +9,7 @@
 #include <ReactCoreInjection.h>
 #include <react/runtime/PlatformTimerRegistry.h>
 #include <react/runtime/TimerManager.h>
+#include <atomic>
 
 namespace Microsoft::ReactNative {
 
@@ -114,7 +115,7 @@ struct Timing : public std::enable_shared_from_this<Timing> {
   xaml::Media::CompositionTarget::Rendering_revoker m_rendering;
   winrt::Microsoft::ReactNative::ITimer m_dispatcherQueueTimer{nullptr};
   winrt::weak_ref<winrt::Microsoft::ReactNative::IReactDispatcher> m_uiDispatcher;
-  bool m_usingRendering{false};
+  std::atomic<bool> m_usingRendering{false};
   bool m_usePostForRendering{false};
 };
 

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -1,6 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#if _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // deprecated APIs
+#endif
+
 #include "ReactInstanceWin.h"
 
 #include <AppModelHelpers.h>
@@ -57,6 +62,7 @@
 #include <react/nativemodule/core/ReactCommon/TurboModuleBinding.h>
 #include <react/renderer/componentregistry/componentNameByReactViewName.h>
 #include <react/renderer/componentregistry/native/NativeComponentRegistryBinding.h>
+#include <react/runtime/JSRuntimeBindings.h>
 #include <react/runtime/PlatformTimerRegistry.h>
 #include <react/runtime/TimerManager.h>
 #include <react/threading/MessageQueueThreadImpl.h>

package/Microsoft.ReactNative/ViewProps.idl

@@ -30,6 +30,14 @@ namespace Microsoft.ReactNative {
     static void WriteValue(IJSValueWriter writer, Color color);
   };
 
+  [experimental]
+  enum Overflow
+  {
+    Visible,
+    Hidden,
+    Scroll,
+  };
+
   [webhosthidden]
   [experimental]
   DOC_STRING("Interface to implement custom view component properties.")
@@ -51,6 +59,7 @@ namespace Microsoft.ReactNative {
     Color BackgroundColor { get; };
     String TestId { get; };
     String AccessibilityLabel { get; };
+    Overflow Overflow { get; };
     
     // TODO add accessors to all the properties on ViewProps
   };

package/Microsoft.ReactNative.Cxx/ReactCommon/TurboModule.h

@@ -16,6 +16,11 @@
 #include <ReactCommon/CallInvoker.h>
 #include <react/bridging/EventEmitter.h>
 
+#if _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // deprecated APIs
+#endif
+
 namespace facebook::react {
 
 /**
@@ -38,7 +43,6 @@ enum TurboModuleMethodValueKind {
  */
 TurboModuleMethodValueKind getTurboModuleMethodValueKind(jsi::Runtime &rt, const jsi::Value *value);
 
-class TurboCxxModule;
 class TurboModuleBinding;
 
 /**
@@ -147,7 +151,13 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
 /**
  * An app/platform-specific provider function to get an instance of a module
  * given a name.
+ *
+ * @deprecated Use TurboModuleProviderFunctionTypeWithRuntime instead.
+ * Remove after React Native 0.84 is released.
  */
-using TurboModuleProviderFunctionType = std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
+using TurboModuleProviderFunctionType [[deprecated("Use TurboModuleProviderFunctionTypeWithRuntime instead")]] =
+    std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
+using TurboModuleProviderFunctionTypeWithRuntime =
+    std::function<std::shared_ptr<TurboModule>(jsi::Runtime &runtime, const std::string &name)>;
 
 } // namespace facebook::react

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.83.0-preview.3</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.84.0-preview.10</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>83</ReactNativeWindowsMinor>
+    <ReactNativeWindowsMinor>84</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>d23bf1e20c21916c5c28bf4d5c781aa58e3999f5</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>4dd0ce4b939c43b413fe690306c06342f7357737</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -6,7 +6,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2512.22001-bc3d0ed7</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2605.6002-2279da22 </HermesVersion>
     <HermesPackageName Condition="'$(HermesPackageName)' == ''">Microsoft.JavaScript.Hermes</HermesPackageName>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\$(HermesPackageName)\$(HermesVersion)</HermesPackage>

package/ReactCommon/ReactCommon.vcxproj

@@ -146,8 +146,11 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\RuntimeSamplingProfileTraceEventSerializer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\PerformanceTracer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\TraceEventSerializer.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\HostTracingProfileSerializer.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\TraceEventGenerator.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\ConsoleTimeStamp.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsitooling\react\runtime\JSRuntimeFactory.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsitooling\react\runtime\JSRuntimeBindings.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\fusebox\FuseboxTracer.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\reactperflogger\BridgeNativeModulePerfLogger.cpp" />
@@ -191,6 +194,9 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\NetworkHandler.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\BoundedRequestBuffer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\CdpNetwork.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\ConsoleTaskContext.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\ConsoleTask.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\ConsoleTaskOrchestrator.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\HttpUtils.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\event\event.cpp" />
     <ClCompile Include="pch.cpp">
@@ -227,7 +233,7 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\renderer\graphics\Rect.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\timing\primitives.h" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\DynamicPointerEvent.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp" />

package/ReactCommon/ReactCommon.vcxproj.filters

@@ -159,9 +159,6 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp">
       <Filter>turbomodule\core</Filter>
     </ClCompile>
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.cpp">
-      <Filter>turbomodule\core</Filter>
-    </ClCompile>
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp">
       <Filter>turbomodule\core</Filter>
     </ClCompile>

package/ReactCommon/TEMP_UntilReactCommonUpdate/cxxreact/JSIndexedRAMBundle.cpp

@@ -65,8 +65,8 @@ void JSIndexedRAMBundle::init() {
       "header size must exactly match the input file format");
 
   readBundle(reinterpret_cast<char*>(header), sizeof(header));
-  const size_t numTableEntries = folly::Endian::little(header[1]);
-  const size_t startupCodeSize = folly::Endian::little(header[2]);
+  size_t numTableEntries = folly::Endian::little(header[1]);
+  std::streamsize startupCodeSize = folly::Endian::little(header[2]);
 
   // allocate memory for meta data and lookup table.
   m_table = ModuleTable(numTableEntries);
@@ -76,9 +76,9 @@ void JSIndexedRAMBundle::init() {
   readBundle(reinterpret_cast<char*>(m_table.data.get()), m_table.byteLength());
 
   // read the startup code
-  m_startupCode = std::make_unique<JSBigBufferString>(startupCodeSize - 1);
+  m_startupCode = std::make_unique<JSBigBufferString>(static_cast<size_t>(startupCodeSize - 1)); //Windows #15782
 
-  readBundle(m_startupCode->data(), startupCodeSize - 1);
+  readBundle(m_startupCode->mutableData(), startupCodeSize - 1);
 }
 
 JSIndexedRAMBundle::Module JSIndexedRAMBundle::getModule(
@@ -114,7 +114,7 @@ std::string JSIndexedRAMBundle::getModuleCode(const uint32_t id) const {
   return ret;
 }
 
-void JSIndexedRAMBundle::readBundle(char* buffer, const std::streamsize bytes)
+void JSIndexedRAMBundle::readBundle(char* buffer, std::streamsize bytes)
     const {
   if (!m_bundle->read(buffer, bytes)) {
     if ((m_bundle->rdstate() & std::ios::eofbit) != 0) {

package/ReactCommon/TEMP_UntilReactCommonUpdate/cxxreact/ReactMarker.cpp

@@ -11,7 +11,6 @@
 #pragma warning(disable : 4996) // deprecated APIs
 #endif
 #include "ReactMarker.h"
-#include <cxxreact/JSExecutor.h>
 
 namespace facebook::react::ReactMarker {
 

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -173,8 +173,7 @@ void JSIExecutor::loadBundle(
     ReactMarker::logTaggedMarker(
         ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
   }
-  runtime_->evaluateJavaScript(
-      std::make_unique<BigStringBuffer>(std::move(script)), sourceURL);
+  runtime_->evaluateJavaScript(std::move(script), sourceURL);
   flush();
   if (hasLogger) {
     ReactMarker::logTaggedMarker(
@@ -217,7 +216,7 @@ void JSIExecutor::registerBundle(
           "Empty bundle registered with ID " + tag + " from " + bundlePath);
     }
     runtime_->evaluateJavaScript(
-        std::make_unique<BigStringBuffer>(std::move(script)),
+        std::move(script),
         JSExecutor::getSyntheticBundlePath(bundleId, bundlePath));
   }
   ReactMarker::logTaggedMarker(
@@ -582,46 +581,6 @@ void JSIExecutor::flush() {}
 
 #endif // RCT_REMOVE_LEGACY_ARCH
 
-void bindNativeLogger(Runtime& runtime, Logger logger) {
-  runtime.global().setProperty(
-      runtime,
-      "nativeLoggingHook",
-      Function::createFromHostFunction(
-          runtime,
-          PropNameID::forAscii(runtime, "nativeLoggingHook"),
-          2,
-          [logger = std::move(logger)](
-              jsi::Runtime& runtime,
-              const jsi::Value&,
-              const jsi::Value* args,
-              size_t count) {
-            if (count != 2) {
-              throw std::invalid_argument(
-                  "nativeLoggingHook takes 2 arguments");
-            }
-            logger(
-                args[0].asString(runtime).utf8(runtime),
-                static_cast<unsigned int>(args[1].asNumber()));
-            return Value::undefined();
-          }));
-}
-
-void bindNativePerformanceNow(Runtime& runtime) {
-  runtime.global().setProperty(
-      runtime,
-      "nativePerformanceNow",
-      Function::createFromHostFunction(
-          runtime,
-          PropNameID::forAscii(runtime, "nativePerformanceNow"),
-          0,
-          [](jsi::Runtime& runtime,
-             const jsi::Value&,
-             const jsi::Value* args,
-             size_t /*count*/) {
-            return HighResTimeStamp::now().toDOMHighResTimeStamp();
-          }));
-}
-
 } // namespace facebook::react
 
 #if _MSC_VER

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

@@ -16,6 +16,11 @@
 #include <ReactCommon/CallInvoker.h>
 #include <react/bridging/EventEmitter.h>
 
+#if _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // deprecated APIs
+#endif
+
 namespace facebook::react {
 
 /**
@@ -38,7 +43,6 @@ enum TurboModuleMethodValueKind {
  */
 TurboModuleMethodValueKind getTurboModuleMethodValueKind(jsi::Runtime &rt, const jsi::Value *value);
 
-class TurboCxxModule;
 class TurboModuleBinding;
 
 /**
@@ -147,7 +151,13 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
 /**
  * An app/platform-specific provider function to get an instance of a module
  * given a name.
+ *
+ * @deprecated Use TurboModuleProviderFunctionTypeWithRuntime instead.
+ * Remove after React Native 0.84 is released.
  */
-using TurboModuleProviderFunctionType = std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
+using TurboModuleProviderFunctionType [[deprecated("Use TurboModuleProviderFunctionTypeWithRuntime instead")]] =
+    std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
+using TurboModuleProviderFunctionTypeWithRuntime =
+    std::function<std::shared_ptr<TurboModule>(jsi::Runtime &runtime, const std::string &name)>;
 
 } // namespace facebook::react

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/attributedstring/TextAttributes.cpp

@@ -0,0 +1,291 @@
+/*
+ * 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.
+ */
+
+#include "TextAttributes.h"
+
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/core/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/utils/FloatComparison.h>
+#include <cmath>
+
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
+
+namespace facebook::react {
+
+void TextAttributes::apply(TextAttributes textAttributes) {
+  // Color
+  foregroundColor = textAttributes.foregroundColor
+      ? textAttributes.foregroundColor
+      : foregroundColor;
+  backgroundColor = textAttributes.backgroundColor
+      ? textAttributes.backgroundColor
+      : backgroundColor;
+  opacity =
+      !std::isnan(textAttributes.opacity) ? textAttributes.opacity : opacity;
+
+  // Font
+  fontFamily = !textAttributes.fontFamily.empty() ? textAttributes.fontFamily
+                                                  : fontFamily;
+  fontSize =
+      !std::isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
+  fontSizeMultiplier = !std::isnan(textAttributes.fontSizeMultiplier)
+      ? textAttributes.fontSizeMultiplier
+      : fontSizeMultiplier;
+  fontWeight = textAttributes.fontWeight.has_value() ? textAttributes.fontWeight
+                                                     : fontWeight;
+  fontStyle = textAttributes.fontStyle.has_value() ? textAttributes.fontStyle
+                                                   : fontStyle;
+  fontVariant = textAttributes.fontVariant.has_value()
+      ? textAttributes.fontVariant
+      : fontVariant;
+  allowFontScaling = textAttributes.allowFontScaling.has_value()
+      ? textAttributes.allowFontScaling
+      : allowFontScaling;
+  maxFontSizeMultiplier = !std::isnan(textAttributes.maxFontSizeMultiplier)
+      ? textAttributes.maxFontSizeMultiplier
+      : maxFontSizeMultiplier;
+  dynamicTypeRamp = textAttributes.dynamicTypeRamp.has_value()
+      ? textAttributes.dynamicTypeRamp
+      : dynamicTypeRamp;
+  letterSpacing = !std::isnan(textAttributes.letterSpacing)
+      ? textAttributes.letterSpacing
+      : letterSpacing;
+  textTransform = textAttributes.textTransform.has_value()
+      ? textAttributes.textTransform
+      : textTransform;
+
+  // Paragraph Styles
+  lineHeight = !std::isnan(textAttributes.lineHeight)
+      ? textAttributes.lineHeight
+      : lineHeight;
+  alignment = textAttributes.alignment.has_value() ? textAttributes.alignment
+                                                   : alignment;
+  baseWritingDirection = textAttributes.baseWritingDirection.has_value()
+      ? textAttributes.baseWritingDirection
+      : baseWritingDirection;
+  lineBreakStrategy = textAttributes.lineBreakStrategy.has_value()
+      ? textAttributes.lineBreakStrategy
+      : lineBreakStrategy;
+  lineBreakMode = textAttributes.lineBreakMode.has_value()
+      ? textAttributes.lineBreakMode
+      : lineBreakMode;
+
+  // Decoration
+  textDecorationColor = textAttributes.textDecorationColor
+      ? textAttributes.textDecorationColor
+      : textDecorationColor;
+  textDecorationLineType = textAttributes.textDecorationLineType.has_value()
+      ? textAttributes.textDecorationLineType
+      : textDecorationLineType;
+  textDecorationStyle = textAttributes.textDecorationStyle.has_value()
+      ? textAttributes.textDecorationStyle
+      : textDecorationStyle;
+
+  // Shadow
+  textShadowOffset = textAttributes.textShadowOffset.has_value()
+      ? textAttributes.textShadowOffset.value()
+      : textShadowOffset;
+  textShadowRadius = !std::isnan(textAttributes.textShadowRadius)
+      ? textAttributes.textShadowRadius
+      : textShadowRadius;
+  textShadowColor = textAttributes.textShadowColor
+      ? textAttributes.textShadowColor
+      : textShadowColor;
+
+  // Special
+  isHighlighted = textAttributes.isHighlighted.has_value()
+      ? textAttributes.isHighlighted
+      : isHighlighted;
+  // TextAttributes "inherits" the isPressable value from ancestors, so this
+  // only applies the current node's value for isPressable if it is truthy.
+  isPressable =
+      textAttributes.isPressable.has_value() && *textAttributes.isPressable
+      ? textAttributes.isPressable
+      : isPressable;
+  layoutDirection = textAttributes.layoutDirection.has_value()
+      ? textAttributes.layoutDirection
+      : layoutDirection;
+  accessibilityRole = textAttributes.accessibilityRole.has_value()
+      ? textAttributes.accessibilityRole
+      : accessibilityRole;
+  role = textAttributes.role.has_value() ? textAttributes.role : role;
+}
+
+#pragma mark - Operators
+
+bool TextAttributes::operator==(const TextAttributes& rhs) const {
+  return std::tie(
+             foregroundColor,
+             backgroundColor,
+             fontFamily,
+             fontWeight,
+             fontStyle,
+             fontVariant,
+             allowFontScaling,
+             dynamicTypeRamp,
+             alignment,
+             baseWritingDirection,
+             lineBreakStrategy,
+             textDecorationColor,
+             textDecorationLineType,
+             textDecorationStyle,
+             textShadowOffset,
+             textShadowColor,
+             isHighlighted,
+             isPressable,
+             layoutDirection,
+             accessibilityRole,
+             role,
+             textTransform) ==
+      std::tie(
+             rhs.foregroundColor,
+             rhs.backgroundColor,
+             rhs.fontFamily,
+             rhs.fontWeight,
+             rhs.fontStyle,
+             rhs.fontVariant,
+             rhs.allowFontScaling,
+             rhs.dynamicTypeRamp,
+             rhs.alignment,
+             rhs.baseWritingDirection,
+             rhs.lineBreakStrategy,
+             rhs.textDecorationColor,
+             rhs.textDecorationLineType,
+             rhs.textDecorationStyle,
+             rhs.textShadowOffset,
+             rhs.textShadowColor,
+             rhs.isHighlighted,
+             rhs.isPressable,
+             rhs.layoutDirection,
+             rhs.accessibilityRole,
+             rhs.role,
+             rhs.textTransform) &&
+      floatEquality(maxFontSizeMultiplier, rhs.maxFontSizeMultiplier) &&
+      floatEquality(opacity, rhs.opacity) &&
+      floatEquality(fontSize, rhs.fontSize) &&
+      floatEquality(fontSizeMultiplier, rhs.fontSizeMultiplier) &&
+      floatEquality(letterSpacing, rhs.letterSpacing) &&
+      floatEquality(lineHeight, rhs.lineHeight) &&
+      floatEquality(textShadowRadius, rhs.textShadowRadius);
+}
+
+TextAttributes TextAttributes::defaultTextAttributes() {
+  static auto textAttributes = [] {
+    auto defaultAttrs = TextAttributes{};
+    // Non-obvious (can be different among platforms) default text attributes.
+    defaultAttrs.foregroundColor = facebook::react::Color {  // [Windows] override default color to not be black
+        .m_color = {},
+        .m_platformColor = {"TextFillColorPrimary"},
+    };
+    defaultAttrs.backgroundColor = clearColor();
+    defaultAttrs.fontSize = 14.0;
+    defaultAttrs.fontSizeMultiplier = 1.0;
+    return defaultAttrs;
+  }();
+  return textAttributes;
+}
+
+#pragma mark - DebugStringConvertible
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
+  const auto& textAttributes = TextAttributes::defaultTextAttributes();
+  return {
+      // Color
+      debugStringConvertibleItem(
+          "backgroundColor", backgroundColor, textAttributes.backgroundColor),
+      debugStringConvertibleItem(
+          "foregroundColor", foregroundColor, textAttributes.foregroundColor),
+      debugStringConvertibleItem("opacity", opacity, textAttributes.opacity),
+
+      // Font
+      debugStringConvertibleItem(
+          "fontFamily", fontFamily, textAttributes.fontFamily),
+      debugStringConvertibleItem("fontSize", fontSize, textAttributes.fontSize),
+      debugStringConvertibleItem(
+          "fontSizeMultiplier",
+          fontSizeMultiplier,
+          textAttributes.fontSizeMultiplier),
+      debugStringConvertibleItem(
+          "fontWeight", fontWeight, textAttributes.fontWeight),
+      debugStringConvertibleItem(
+          "fontStyle", fontStyle, textAttributes.fontStyle),
+      debugStringConvertibleItem(
+          "fontVariant", fontVariant, textAttributes.fontVariant),
+      debugStringConvertibleItem(
+          "allowFontScaling",
+          allowFontScaling,
+          textAttributes.allowFontScaling),
+      debugStringConvertibleItem(
+          "maxFontSizeMultiplier",
+          maxFontSizeMultiplier,
+          textAttributes.maxFontSizeMultiplier),
+      debugStringConvertibleItem(
+          "dynamicTypeRamp", dynamicTypeRamp, textAttributes.dynamicTypeRamp),
+      debugStringConvertibleItem(
+          "letterSpacing", letterSpacing, textAttributes.letterSpacing),
+
+      // Paragraph Styles
+      debugStringConvertibleItem(
+          "lineHeight", lineHeight, textAttributes.lineHeight),
+      debugStringConvertibleItem(
+          "alignment", alignment, textAttributes.alignment),
+      debugStringConvertibleItem(
+          "writingDirection",
+          baseWritingDirection,
+          textAttributes.baseWritingDirection),
+      debugStringConvertibleItem(
+          "lineBreakStrategyIOS",
+          lineBreakStrategy,
+          textAttributes.lineBreakStrategy),
+      debugStringConvertibleItem(
+          "lineBreakModeIOS", lineBreakMode, textAttributes.lineBreakMode),
+
+      // Decoration
+      debugStringConvertibleItem(
+          "textDecorationColor",
+          textDecorationColor,
+          textAttributes.textDecorationColor),
+      debugStringConvertibleItem(
+          "textDecorationLineType",
+          textDecorationLineType,
+          textAttributes.textDecorationLineType),
+      debugStringConvertibleItem(
+          "textDecorationStyle",
+          textDecorationStyle,
+          textAttributes.textDecorationStyle),
+
+      // Shadow
+      debugStringConvertibleItem(
+          "textShadowOffset",
+          textShadowOffset,
+          textAttributes.textShadowOffset),
+      debugStringConvertibleItem(
+          "textShadowRadius",
+          textShadowRadius,
+          textAttributes.textShadowRadius),
+      debugStringConvertibleItem(
+          "textShadowColor", textShadowColor, textAttributes.textShadowColor),
+
+      // Special
+      debugStringConvertibleItem(
+          "isHighlighted", isHighlighted, textAttributes.isHighlighted),
+      debugStringConvertibleItem(
+          "isPressable", isPressable, textAttributes.isPressable),
+      debugStringConvertibleItem(
+          "layoutDirection", layoutDirection, textAttributes.layoutDirection),
+      debugStringConvertibleItem(
+          "accessibilityRole",
+          accessibilityRole,
+          textAttributes.accessibilityRole),
+      debugStringConvertibleItem("role", role, textAttributes.role),
+  };
+}
+#endif
+
+} // namespace facebook::react

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/EventDispatcher.cpp

@@ -11,7 +11,6 @@
 #pragma warning(disable : 4996) // deprecated APIs
 #endif
 #include "EventDispatcher.h"
-#include <cxxreact/JSExecutor.h>
 #include <react/renderer/core/StateUpdate.h>
 
 #include "EventQueue.h"

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/EventQueueProcessor.cpp

@@ -10,13 +10,11 @@
 #pragma warning(push)
 #pragma warning(disable : 4996) // deprecated APIs
 #endif
-#include <cxxreact/JSExecutor.h>
+#include "EventQueueProcessor.h"
 #include <logger/react_native_log.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include "EventEmitter.h"
 #include "EventLogger.h"
-#include "EventQueue.h"
-#include "ShadowNodeFamily.h"
 
 namespace facebook::react {