react-native-windows 0.79.2 → 0.80.0-preview.1

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputShadowNode.cpp

@@ -25,10 +25,11 @@ Size WindowsTextInputShadowNode::measureContent(
     const LayoutContext &layoutContext,
     const LayoutConstraints &layoutConstraints) const {
   // Layout is called right after measure.
-  // Measure is marked as `const`, and `layout` is not; so State can be updated
-  // during layout, but not during `measure`. If State is out-of-date in layout,
-  // it's too late: measure will have already operated on old State. Thus, we
-  // use the same value here that we *will* use in layout to update the state.
+  // Measure is marked as `const`, and `layout` is not; so State can be
+  // updated during layout, but not during `measure`. If State is out-of-date
+  // in layout, it's too late: measure will have already operated on old
+  // State. Thus, we use the same value here that we *will* use in layout to
+  // update the state.
   AttributedString attributedString = getMostRecentAttributedString(layoutContext);
 
   if (attributedString.isEmpty()) {
@@ -88,9 +89,8 @@ LayoutConstraints WindowsTextInputShadowNode::getTextConstraints(const LayoutCon
 
 void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layoutContext) {
   ensureUnsealed();
-
-  auto reactTreeAttributedString = getAttributedString(layoutContext);
   const auto &stateData = getStateData();
+  auto reactTreeAttributedString = getAttributedString(layoutContext);
 
   // Tree is often out of sync with the value of the TextInput.
   // This is by design - don't change the value of the TextInput in the State,
@@ -124,6 +124,7 @@ void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layout
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
+
   setStateData(facebook::react::TextInputState{
       AttributedStringBox(newAttributedString), reactTreeAttributedString, {}, newEventCount});
 }
@@ -133,7 +134,6 @@ AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutCon
 
   auto childTextAttributes = TextAttributes::defaultTextAttributes();
   childTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-
   childTextAttributes.apply(getConcreteProps().textAttributes);
   // Don't propagate the background color of the TextInput onto the attributed
   // string. Android tries to render shadow of the background alongside the
@@ -151,6 +151,7 @@ AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutCon
     auto textAttributes = TextAttributes::defaultTextAttributes();
     textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
     textAttributes.apply(getConcreteProps().textAttributes);
+    textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
     auto fragment = AttributedString::Fragment{};
     fragment.string = getConcreteProps().text;
     fragment.textAttributes = textAttributes;
@@ -187,36 +188,18 @@ AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString(const
 // TODO T67606511: We will redefine the measurement of empty strings as part
 // of T67606511
 AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(const LayoutContext &layoutContext) const {
-  // Return placeholder text, since text and children are empty.
-  auto textAttributedString = AttributedString{};
-  auto fragment = AttributedString::Fragment{};
-  fragment.string = getConcreteProps().placeholder;
-
-  if (fragment.string.empty()) {
-    fragment.string = BaseTextShadowNode::getEmptyPlaceholder();
-  }
+  const auto &props = BaseShadowNode::getConcreteProps();
 
+  AttributedString attributedString;
+  auto placeholderString = !props.placeholder.empty() ? props.placeholder : BaseTextShadowNode::getEmptyPlaceholder();
   auto textAttributes = TextAttributes::defaultTextAttributes();
   textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-  textAttributes.apply(getConcreteProps().textAttributes);
-
-  // If there's no text, it's possible that this Fragment isn't actually
-  // appended to the AttributedString (see implementation of appendFragment)
-  fragment.textAttributes = textAttributes;
-  fragment.parentShadowView = ShadowView(*this);
-  textAttributedString.appendFragment(std::move(fragment));
-
-  return textAttributedString;
-  // TextLayoutContext textLayoutContext;
-  // textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
-  // auto textSize = textLayoutManager_
-  //                     ->measure(
-  //                         AttributedStringBox{attributedString},
-  //                         getConcreteProps().paragraphAttributes,
-  //                         textLayoutContext,
-  //                         textConstraints)
-  //                     .size;
-  // return layoutConstraints.clamp(textSize);
+  textAttributes.apply(props.textAttributes);
+  attributedString.appendFragment(
+      {.string = std::move(placeholderString),
+       .textAttributes = textAttributes,
+       .parentShadowView = ShadowView(*this)});
+  return attributedString;
 }
 
 #pragma mark - LayoutableShadowNode

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -465,6 +465,10 @@ void FabricUIManager::schedulerDidSetIsJSResponder(
     bool isJSResponder,
     bool blockNativeResponder) {}
 
+void FabricUIManager::schedulerShouldSynchronouslyUpdateViewOnUIThread(
+    facebook::react::Tag tag,
+    const folly::dynamic &props) {}
+
 void FabricUIManager::schedulerDidSendAccessibilityEvent(
     const facebook::react::ShadowView &shadowView,
     std::string const &eventType) {

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -99,6 +99,8 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
       facebook::react::ShadowView const &shadowView,
       bool isJSResponder,
       bool blockNativeResponder) override;
+  virtual void schedulerShouldSynchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic &props)
+      override;
   virtual void schedulerDidSendAccessibilityEvent(
       const facebook::react::ShadowView &shadowView,
       std::string const &eventType) override;

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewEventEmitter.cpp

@@ -64,4 +64,20 @@ void HostPlatformViewEventEmitter::onPressIn(GestureResponderEvent event) const
   });
 }
 
+void HostPlatformViewEventEmitter::onPressOut(GestureResponderEvent event) const {
+  dispatchEvent("pressOut", [event](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    auto nativeEvent = jsi::Object(runtime);
+    nativeEvent.setProperty(runtime, "target", static_cast<double>(event.target));
+    nativeEvent.setProperty(runtime, "pageX", event.pagePoint.x);
+    nativeEvent.setProperty(runtime, "pageY", event.pagePoint.y);
+    nativeEvent.setProperty(runtime, "locationX", event.offsetPoint.x);
+    nativeEvent.setProperty(runtime, "locationY", event.offsetPoint.y);
+    nativeEvent.setProperty(runtime, "timestamp", event.timestamp);
+    nativeEvent.setProperty(runtime, "identifier", event.identifier);
+    payload.setProperty(runtime, "nativeEvent", nativeEvent);
+    return payload;
+  });
+}
+
 } // namespace facebook::react

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewEventEmitter.h

@@ -39,6 +39,7 @@ class HostPlatformViewEventEmitter : public BaseViewEventEmitter {
 #pragma mark - Touch Events
 
   virtual void onPressIn(GestureResponderEvent event) const;
+  virtual void onPressOut(GestureResponderEvent event) const;
 };
 
 } // namespace facebook::react

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewProps.cpp

@@ -56,6 +56,14 @@ HostPlatformViewProps::HostPlatformViewProps(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
               ? sourceProps.accessibilityAccessKey
               : convertRawProp(context, rawProps, "accessibilityAccessKey", sourceProps.accessibilityAccessKey, {})),
+      accessibilityDescription(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter() ? sourceProps.accessibilityDescription
+                                                                  : convertRawProp(
+                                                                        context,
+                                                                        rawProps,
+                                                                        "accessibilityDescription",
+                                                                        sourceProps.accessibilityDescription,
+                                                                        {})),
       accessibilityLiveRegion(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter() ? sourceProps.accessibilityLiveRegion
                                                                   : convertRawProp(
@@ -104,6 +112,7 @@ void HostPlatformViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLevel);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityItemType);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityAccessKey);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityDescription);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLiveRegion);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyDownEvents);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyUpEvents);

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewProps.h

@@ -32,6 +32,7 @@ class HostPlatformViewProps : public BaseViewProps {
   std::optional<AccessibilityAnnotation> accessibilityAnnotation{};
   std::optional<std::string> accessibilityItemType{};
   std::optional<std::string> accessibilityAccessKey{};
+  std::optional<std::string> accessibilityDescription{};
 
   // std::optional<std::string> overflowAnchor{};
   std::optional<std::string> tooltip{};

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewTraitsInitializer.h

@@ -20,4 +20,8 @@ inline ShadowNodeTraits::Trait extraTraits() {
   return ShadowNodeTraits::Trait::None;
 }
 
+inline bool isKeyboardFocusable(const ViewProps &viewProps) {
+  return false;
+}
+
 } // namespace facebook::react::HostPlatformViewTraitsInitializer

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/WindowsTextLayoutManager.cpp

@@ -67,9 +67,7 @@ class AttachmentInlineObject : public winrt::implements<AttachmentInlineObject,
 };
 
 TextLayoutManager::TextLayoutManager(const ContextContainer::Shared &contextContainer)
-    : contextContainer_(contextContainer),
-      textMeasureCache_(kSimpleThreadSafeCacheSizeCap),
-      lineMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
+    : contextContainer_(contextContainer), textMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
 
 WindowsTextLayoutManager::WindowsTextLayoutManager(const ContextContainer::Shared &contextContainer)
     : TextLayoutManager(contextContainer) {}
@@ -160,7 +158,6 @@ void WindowsTextLayoutManager::GetTextLayout(
 
   // Get text with Object Replacement Characters for attachments
   auto str = GetTransformedText(attributedStringBox);
-
   winrt::check_hresult(Microsoft::ReactNative::DWriteFactory()->CreateTextLayout(
       str.c_str(), // The string to be laid out and formatted.
       static_cast<UINT32>(str.size()), // The length of the string.
@@ -170,6 +167,39 @@ void WindowsTextLayoutManager::GetTextLayout(
       spTextLayout.put() // The IDWriteTextLayout interface pointer.
       ));
 
+  // Apply max width constraint and ellipsis trimming to ensure consistency with rendering
+  DWRITE_TEXT_METRICS metrics;
+  winrt::check_hresult(spTextLayout->GetMetrics(&metrics));
+
+  if (metrics.width > size.width) {
+    spTextLayout->SetMaxWidth(size.width);
+  }
+
+  // Apply DWRITE_TRIMMING for ellipsizeMode
+  DWRITE_TRIMMING trimming = {};
+  winrt::com_ptr<IDWriteInlineObject> ellipsisSign;
+
+  switch (paragraphAttributes.ellipsizeMode) {
+    case facebook::react::EllipsizeMode::Tail:
+      trimming.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER;
+      break;
+    case facebook::react::EllipsizeMode::Clip:
+      trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE;
+      break;
+    default:
+      trimming.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER; // Default to tail behavior
+      break;
+  }
+
+  // Use DWriteFactory to create the ellipsis trimming sign
+  if (trimming.granularity != DWRITE_TRIMMING_GRANULARITY_NONE) {
+    auto dwriteFactory = Microsoft::ReactNative::DWriteFactory();
+    HRESULT hr = dwriteFactory->CreateEllipsisTrimmingSign(spTextLayout.get(), ellipsisSign.put());
+    if (SUCCEEDED(hr)) {
+      spTextLayout->SetTrimming(&trimming, ellipsisSign.get());
+    }
+  }
+
   // Calculate positions for attachments and set inline objects
   unsigned int position = 0;
   for (const auto &fragment : fragments) {
@@ -408,96 +438,6 @@ Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTra
   return Microsoft::ReactNative::TextTransform::Undefined;
 }
 
-LinesMeasurements TextLayoutManager::measureLines(
-    const AttributedStringBox &attributedStringBox,
-    const ParagraphAttributes &paragraphAttributes,
-    const Size &size) const {
-  LinesMeasurements lineMeasurements{};
-
-  winrt::com_ptr<IDWriteTextLayout> spTextLayout;
-  TextMeasurement::Attachments attachments;
-  WindowsTextLayoutManager::GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
-
-  if (spTextLayout) {
-    std::vector<DWRITE_LINE_METRICS> lineMetrics;
-    uint32_t actualLineCount;
-    spTextLayout->GetLineMetrics(nullptr, 0, &actualLineCount);
-    lineMetrics.resize(static_cast<size_t>(actualLineCount));
-    winrt::check_hresult(spTextLayout->GetLineMetrics(lineMetrics.data(), actualLineCount, &actualLineCount));
-    uint32_t startRange = 0;
-    const auto count = (paragraphAttributes.maximumNumberOfLines > 0)
-        ? std::min(static_cast<uint32_t>(paragraphAttributes.maximumNumberOfLines), actualLineCount)
-        : actualLineCount;
-    for (uint32_t i = 0; i < count; ++i) {
-      UINT32 actualHitTestCount = 0;
-      spTextLayout->HitTestTextRange(
-          startRange,
-          lineMetrics[i].length,
-          0, // x
-          0, // y
-          NULL,
-          0, // metrics count
-          &actualHitTestCount);
-
-      // Allocate enough room to return all hit-test metrics.
-      std::vector<DWRITE_HIT_TEST_METRICS> hitTestMetrics(actualHitTestCount);
-      spTextLayout->HitTestTextRange(
-          startRange,
-          lineMetrics[i].length,
-          0, // x
-          0, // y
-          &hitTestMetrics[0],
-          static_cast<UINT32>(hitTestMetrics.size()),
-          &actualHitTestCount);
-
-      float width = 0;
-      for (auto tm : hitTestMetrics) {
-        width += tm.width;
-      }
-
-      std::string str;
-      const auto &attributedString = attributedStringBox.getValue();
-      for (const auto &fragment : attributedString.getFragments()) {
-        str = str +
-            winrt::to_string(Microsoft::ReactNative::TransformableText::TransformText(
-                winrt::hstring{Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string)},
-                ConvertTextTransform(fragment.textAttributes.textTransform)));
-      }
-
-      lineMeasurements.emplace_back(LineMeasurement(
-          str.substr(startRange, lineMetrics[i].length),
-          {{hitTestMetrics[0].left, hitTestMetrics[0].top}, // origin
-           {width, lineMetrics[i].height}},
-          0.0f, // TODO descender
-          0.0f, // TODO: capHeight
-          0.0f, // TODO ascender
-          0.0f // TODO: xHeight
-          ));
-
-      startRange += lineMetrics[i].length;
-    }
-  }
-
-  return lineMeasurements;
-}
-
-Float TextLayoutManager::baseline(
-    const AttributedStringBox &attributedStringBox,
-    const ParagraphAttributes &paragraphAttributes,
-    const Size &size) const {
-  winrt::com_ptr<IDWriteTextLayout> spTextLayout;
-  TextMeasurement::Attachments attachments;
-  WindowsTextLayoutManager::GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
-  if (!spTextLayout) {
-    return 0;
-  }
-
-  DWRITE_TEXT_METRICS metrics;
-  winrt::check_hresult(spTextLayout->GetMetrics(&metrics));
-  return metrics.height *
-      0.8f; // https://learn.microsoft.com/en-us/windows/win32/api/dwrite/nf-dwrite-idwritetextformat-getlinespacing
-}
-
 winrt::hstring WindowsTextLayoutManager::GetTransformedText(const AttributedStringBox &attributedStringBox) {
   winrt::hstring result{};
   const auto &attributedString = attributedStringBox.getValue();

package/Microsoft.ReactNative/Modules/SampleTurboModule.cpp

@@ -118,4 +118,8 @@ void SampleTurboModule::promiseAssert(::React::ReactPromise<void> &&result) noex
   // TODO: Proper impl
 }
 
+void SampleTurboModule::getImageUrl(::React::ReactPromise<void> &&result) noexcept {
+  // TODO: Proper impl
+}
+
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Modules/SampleTurboModule.h

@@ -83,6 +83,9 @@ struct SampleTurboModule {
   REACT_METHOD(promiseAssert)
   void promiseAssert(::React::ReactPromise<void> &&result) noexcept;
 
+  REACT_METHOD(getImageUrl)
+  void getImageUrl(::React::ReactPromise<void> &&result) noexcept;
+
  private:
   winrt::Microsoft::ReactNative::ReactContext m_reactContext;
 };

package/Microsoft.ReactNative/TurboModulesProvider.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <ReactCommon/LongLivedObject.h>
 #include <TurboModuleRegistry.h>
+#include <react/bridging/LongLivedObject.h>
 #include "Base/FollyIncludes.h"
 #include "winrt/Microsoft.ReactNative.h"
 

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.h

@@ -5,7 +5,7 @@
 #ifndef MICROSOFT_REACTNATIVE_JSI_JSIAPI
 #define MICROSOFT_REACTNATIVE_JSI_JSIAPI
 
-#include "../ReactContext.h"
+#include <ReactContext.h>
 #include "JsiAbiApi.h"
 #include "ReactPromise.h"
 

package/Microsoft.ReactNative.Cxx/JSI/LongLivedJsiValue.h

@@ -4,8 +4,8 @@
 #ifndef MICROSOFT_REACTNATIVE_JSI_LONGLIVEDJSIVALUE_
 #define MICROSOFT_REACTNATIVE_JSI_LONGLIVEDJSIVALUE_
 
-#include <ReactCommon/LongLivedObject.h>
 #include <jsi/jsi.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace winrt::Microsoft::ReactNative {
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.79.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.80.0-preview.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>79</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>2</ReactNativeWindowsPatch>
+    <ReactNativeWindowsMinor>80</ReactNativeWindowsMinor>
+    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>d0969f9b6140257d3e22a5fb3d05302aca90d4e0</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>79b0da7bfd78f59a7de9a025ab750e11005766e6</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/React.Cpp.props

@@ -160,6 +160,10 @@
         $(ReactNativeDir)\ReactCommon\react\renderer\graphics\platform\cxx;
         $(ReactNativeDir)\ReactCommon\react\renderer\components\view\platform\cxx;
         $(ReactNativeDir)\ReactCommon\react\renderer\imagemanager\platform\cxx;
+        $(ReactNativeDir)\ReactCommon\react\renderer\components\text\platform\cxx;
+        $(ReactNativeDir)\ReactCommon\react\renderer\components\text\platform\cxx\react\renderer\components\text;
+        $(ReactNativeDir)\ReactCommon\react\renderer\textlayoutmanager\platform\cxx;
+        $(ReactNativeDir)\ReactCommon\react\utils\platform\cxx;
         %(AdditionalIncludeDirectories);
       </AdditionalIncludeDirectories>
     </ClCompile>

package/README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
   <a href="https://twitter.com/intent/follow?&screen_name=ReactNativeMSFT">
-    <img src="https://img.shields.io/twitter/follow/windowsui.svg?label=Follow ReactNativeMSFT on X" alt="Follow @windowsui" />
+    <img src="https://img.shields.io/twitter/follow/ReactNativeMSFT?style=for-the-badge&logo=X&labelColor=black&color=white" alt="Follow @ReactNativeMSFT" />
   </a>
 </p>
 
@@ -68,7 +68,7 @@ React Native has [great documentation](https://reactnative.dev/docs/getting-star
 ## 📢 Contributing
 See [Contributing guidelines](https://github.com/microsoft/react-native-windows/blob/main/CONTRIBUTING.md) for how to setup your fork of the repo and start a PR to contribute to React Native for Windows.
 
-Not sure where to start? The [good first issue](https://github.com/microsoft/react-native-windows/labels/good%20first%20issue) and [help wanted](https://github.com/microsoft/react-native-windows/labels/help%20wanted) labels are the best starting points.
+Not sure where to start? The [good first issue](https://github.com/microsoft/react-native-windows/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) and [help wanted](https://github.com/microsoft/react-native-windows/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22help%20wanted%22) labels are the best starting points.
 
 ## Code of Conduct
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

package/ReactCommon/ReactCommon.vcxproj

@@ -89,7 +89,7 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\instrumentation.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\jsi-inl.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\jsi.h" />
-    <CIInclude Include="$(ReactNativeDir)\ReactCommon\jsitooling\react\runtime\JSRuntimeFactory.h"/>
+    <CIInclude Include="$(ReactNativeDir)\ReactCommon\jsitooling\react\runtime\JSRuntimeFactory.h" />
     <ClInclude Include="..\stubs\sys\mman.h" />
     <ClInclude Include="..\stubs\sys\time.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\cxxreact\CxxModule.h" />
@@ -116,11 +116,12 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\RuntimeSamplingProfile.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\InstanceTracingProfile.h" />
-    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\EventLoopTaskReporter.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\EventLoopReporter.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\RuntimeSamplingProfileTraceEventSerializer.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\PerformanceTracer.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\ProfileTreeNode.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\TraceEventProfile.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\NetworkReporter.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGEnums.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGMacros.h" />
@@ -144,7 +145,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorFlags.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\EventLoopTaskReporter.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\EventLoopReporter.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\RuntimeSamplingProfileTraceEventSerializer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\PerformanceTracer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsitooling\react\runtime\JSRuntimeFactory.cpp"/>
@@ -182,6 +183,7 @@
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\performance\timeline\PerformanceEntryCircularBuffer.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\performance\timeline\PerformanceObserver.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\performance\timeline\PerformanceEntryKeyedBuffer.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\NetworkReporter.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\event\event.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -194,10 +196,12 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\bridging\Function.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\bridging\Base.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\bridging\Convert.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\renderer\runtimescheduler\RuntimeScheduler_Legacy.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\renderer\runtimescheduler\RuntimeScheduler_Modern.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\PropsParserContext.h" />
@@ -215,6 +219,7 @@
     <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" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\samples\ReactCommon\NativeSampleTurboCxxModuleSpecJSI.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\samples\ReactCommon\SampleTurboCxxModule.cpp" />
   </ItemGroup>
@@ -289,4 +294,4 @@
     <Copy DestinationFiles="@(NodeApiJsiFiles->'$(ReactNativeDir)\ReactCommon\jsi\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(NodeApiJsiFiles)" />
     <Copy DestinationFiles="@(TemporaryReactCommonPatchFiles->'$(ReactNativeDir)\ReactCommon\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(TemporaryReactCommonPatchFiles)" />
   </Target>
-</Project>
+</Project>

package/ReactCommon/ReactCommon.vcxproj.filters

@@ -156,6 +156,9 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp">
       <Filter>turbomodule\core</Filter>
     </ClCompile>
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.cpp">
+      <Filter>turbomodule\core</Filter>
+    </ClCompile>
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp">
       <Filter>turbomodule\core</Filter>
     </ClCompile>
@@ -308,6 +311,9 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.h">
       <Filter>turbomodule\core</Filter>
     </ClInclude>
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.h">
+      <Filter>turbomodule\core</Filter>
+    </ClInclude>
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.h">
       <Filter>turbomodule\core</Filter>
     </ClInclude>