react-native-windows 0.78.6 → 0.79.0-preview.1

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

@@ -24,14 +24,6 @@ void WindowsTextInputShadowNode::setTextLayoutManager(std::shared_ptr<const Text
 Size WindowsTextInputShadowNode::measureContent(
     const LayoutContext &layoutContext,
     const LayoutConstraints &layoutConstraints) const {
-  if (getStateData().cachedAttributedStringId != 0) {
-    facebook::react::ParagraphAttributes paragraphAttributes{};
-    paragraphAttributes.maximumNumberOfLines = getConcreteProps().multiline ? 0 : 1;
-    return textLayoutManager_
-        ->measureCachedSpannableById(getStateData().cachedAttributedStringId, paragraphAttributes, layoutConstraints)
-        .size;
-  }
-
   // 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,
@@ -98,17 +90,18 @@ void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layout
   ensureUnsealed();
 
   auto reactTreeAttributedString = getAttributedString(layoutContext);
-  const auto &state = getStateData();
+  const auto &stateData = getStateData();
 
   // 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,
   // and therefore in Java, unless the tree itself changes.
-  if (state.reactTreeAttributedString == reactTreeAttributedString) {
+  if (stateData.reactTreeAttributedString == reactTreeAttributedString) {
     return;
   }
 
   // If props event counter is less than what we already have in state, skip it
-  if (getConcreteProps().mostRecentEventCount < state.mostRecentEventCount) {
+  const auto &props = BaseShadowNode::getConcreteProps();
+  if (props.mostRecentEventCount < stateData.mostRecentEventCount) {
     return;
   }
 
@@ -121,7 +114,7 @@ void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layout
   defaultTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
   defaultTextAttributes.apply(getConcreteProps().textAttributes);
 
-  auto newEventCount = state.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
+  auto newEventCount = stateData.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
       ? 0
       : getConcreteProps().mostRecentEventCount;
   auto newAttributedString = getMostRecentAttributedString(layoutContext);

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

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <react/renderer/textlayoutmanager/WindowsTextLayoutManager.h>
+
 #include <react/components/rnwcore/EventEmitters.h>
 #include <unordered_map>
 #include "WindowsTextInputEventEmitter.h"
@@ -13,8 +15,6 @@
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/utils/ContextContainer.h>
 
-#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-
 namespace facebook::react {
 
 extern const char WindowsTextInputComponentName[];

package/Microsoft.ReactNative/Fabric/Composition/TooltipService.cpp

@@ -4,11 +4,12 @@
 
 #include "TooltipService.h"
 
+#include <react/renderer/textlayoutmanager/WindowsTextLayoutManager.h>
+
 #include <CompositionSwitcher.Experimental.interop.h>
 #include <Fabric/Composition/CompositionViewComponentView.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 #include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 #include "TextDrawing.h"
@@ -255,7 +256,7 @@ void TooltipTracker::ShowTooltip(const winrt::Microsoft::ReactNative::ComponentV
     layoutConstraints.minimumSize.height = 0;
     layoutConstraints.minimumSize.width = 0;
 
-    facebook::react::TextLayoutManager::GetTextLayout(
+    facebook::react::WindowsTextLayoutManager::GetTextLayout(
         tooltipData->attributedString, {} /*paragraphAttributes*/, layoutConstraints, tooltipData->textLayout);
 
     if (tooltipData->textLayout) {

package/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.h

@@ -23,16 +23,20 @@ HRESULT UiaGetBoundingRectangleHelper(::Microsoft::ReactNative::ReactTaggedView
 
 HRESULT UiaSetFocusHelper(::Microsoft::ReactNative::ReactTaggedView &view) noexcept;
 
-void UpdateUiaProperty(winrt::IInspectable provider, PROPERTYID propId, bool oldValue, bool newValue) noexcept;
+void UpdateUiaProperty(
+    winrt::Windows::Foundation::IInspectable provider,
+    PROPERTYID propId,
+    bool oldValue,
+    bool newValue) noexcept;
 
 void UpdateUiaProperty(
-    winrt::IInspectable provider,
+    winrt::Windows::Foundation::IInspectable provider,
     PROPERTYID propId,
     const std::string &oldValue,
     const std::string &newValue) noexcept;
 
 void UpdateUiaProperty(
-    winrt::IInspectable provider,
+    winrt::Windows::Foundation::IInspectable provider,
     PROPERTYID propId,
     const std::optional<std::string> &oldValue,
     const std::optional<std::string> &newValue) noexcept;

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -22,11 +22,13 @@
 #include <UI.Xaml.Controls.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #include <react/renderer/core/DynamicPropsUtilities.h>
 #include <react/renderer/core/EventBeat.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/scheduler/SchedulerToolbox.h>
+#include <react/renderer/textlayoutmanager/WindowsTextLayoutManager.h>
 #include <react/utils/ContextContainer.h>
 #include <winrt/Windows.Graphics.Display.h>
 #include <winrt/Windows.UI.Composition.Desktop.h>
@@ -74,7 +76,7 @@ void FabricUIManager::installFabricUIManager() noexcept {
   auto runtimeScheduler = SchedulerSettings::RuntimeSchedulerFromProperties(m_context.Properties());
 
   if (runtimeScheduler) {
-    contextContainer->insert("RuntimeScheduler", runtimeScheduler);
+    contextContainer->insert(facebook::react::RuntimeSchedulerKey, runtimeScheduler);
     runtimeExecutor = [runtimeScheduler](std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
       runtimeScheduler->scheduleWork(std::move(callback));
     };
@@ -82,6 +84,13 @@ void FabricUIManager::installFabricUIManager() noexcept {
     runtimeExecutor = SchedulerSettings::GetRuntimeExecutor(m_context.Properties());
   }
 
+  // Use an empty ContextContainer here, since using contextContainer would cause a ref cycle.  We are not currently
+  // using the ContextContainer within WindowsTextLayoutManager/TextLayoutManager anyway
+  contextContainer->insert(
+      facebook::react::TextLayoutManagerKey,
+      std::make_shared<facebook::react::WindowsTextLayoutManager>(
+          std::make_shared<facebook::react::ContextContainer>()));
+
   facebook::react::EventBeat::Factory asynchronousBeatFactory =
       [runtimeScheduler, context = m_context](std::shared_ptr<facebook::react::EventBeat::OwnerBox> const &ownerBox) {
         return std::make_unique<AsynchronousEventBeat>(ownerBox, context, runtimeScheduler);

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <react/renderer/textlayoutmanager/WindowsTextLayoutManager.h>
+
 #include <Fabric/Composition/ReactCompositionViewComponentBuilder.h>
 #include <ReactPropertyBag.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>

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

@@ -48,7 +48,7 @@ void HostPlatformViewEventEmitter::onMouseLeave(MouseEvent const &pointerEvent)
 
 #pragma mark - Touch Events
 
-void HostPlatformViewEventEmitter::onPressIn(PressEvent event) const {
+void HostPlatformViewEventEmitter::onPressIn(GestureResponderEvent event) const {
   dispatchEvent("pressIn", [event](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
     auto nativeEvent = jsi::Object(runtime);

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

@@ -9,7 +9,7 @@
 
 namespace facebook::react {
 
-struct PressEvent {
+struct GestureResponderEvent {
   Tag target;
   Point pagePoint;
   Point offsetPoint;
@@ -38,7 +38,7 @@ class HostPlatformViewEventEmitter : public BaseViewEventEmitter {
 
 #pragma mark - Touch Events
 
-  virtual void onPressIn(PressEvent event) const;
+  virtual void onPressIn(GestureResponderEvent event) const;
 };
 
 } // namespace facebook::react

package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/HostPlatformColor.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <CppWinRTIncludes.h>
 #include <d2d1_1.h>
 #include <react/renderer/graphics/ColorComponents.h>
 #include "PlatformColorUtils.h"

package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/PlatformColorUtils.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <CppWinRTIncludes.h>
+#include <winrt/Windows.UI.h>
 
 namespace facebook::react {
 

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/{TextLayoutManager.cpp → WindowsTextLayoutManager.cpp}

@@ -10,7 +10,7 @@
 #include <dwrite.h>
 #include <dwrite_1.h>
 #include <react/renderer/telemetry/TransactionTelemetry.h>
-#include "TextLayoutManager.h"
+#include "WindowsTextLayoutManager.h"
 
 #include <unicode.h>
 
@@ -66,7 +66,15 @@ class AttachmentInlineObject : public winrt::implements<AttachmentInlineObject,
   float m_height;
 };
 
-void TextLayoutManager::GetTextLayout(
+TextLayoutManager::TextLayoutManager(const ContextContainer::Shared &contextContainer)
+    : contextContainer_(contextContainer),
+      textMeasureCache_(kSimpleThreadSafeCacheSizeCap),
+      lineMeasureCache_(kSimpleThreadSafeCacheSizeCap) {}
+
+WindowsTextLayoutManager::WindowsTextLayoutManager(const ContextContainer::Shared &contextContainer)
+    : TextLayoutManager(contextContainer) {}
+
+void WindowsTextLayoutManager::GetTextLayout(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     Size size,
@@ -241,7 +249,7 @@ void TextLayoutManager::GetTextLayout(
   }
 }
 
-void TextLayoutManager::GetTextLayout(
+void WindowsTextLayoutManager::GetTextLayout(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     LayoutConstraints layoutConstraints,
@@ -264,7 +272,7 @@ void TextLayoutManager::GetTextLayout(
   }
 }
 
-void TextLayoutManager::GetTextLayoutByAdjustingFontSizeToFit(
+void WindowsTextLayoutManager::GetTextLayoutByAdjustingFontSizeToFit(
     AttributedStringBox attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     LayoutConstraints layoutConstraints,
@@ -333,11 +341,11 @@ TextMeasurement TextLayoutManager::measure(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     const TextLayoutContext &layoutContext,
-    LayoutConstraints layoutConstraints) const {
+    const LayoutConstraints &layoutConstraints) const {
   TextMeasurement measurement{};
   auto &attributedString = attributedStringBox.getValue();
 
-  measurement = m_measureCache.get(
+  measurement = textMeasureCache_.get(
       {attributedString, paragraphAttributes, layoutConstraints}, [&](TextMeasureCacheKey const &key) {
         auto telemetry = TransactionTelemetry::threadLocalTelemetry();
         if (telemetry) {
@@ -347,7 +355,7 @@ TextMeasurement TextLayoutManager::measure(
         winrt::com_ptr<IDWriteTextLayout> spTextLayout;
 
         TextMeasurement::Attachments attachments;
-        GetTextLayout(
+        WindowsTextLayoutManager::GetTextLayout(
             attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout, attachments);
 
         if (spTextLayout) {
@@ -381,18 +389,6 @@ TextMeasurement TextLayoutManager::measure(
   return measurement;
 }
 
-/**
- * Measures an AttributedString on the platform, as identified by some
- * opaque cache ID.
- */
-TextMeasurement TextLayoutManager::measureCachedSpannableById(
-    int64_t cacheId,
-    const ParagraphAttributes &paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
-  assert(false);
-  return {};
-}
-
 Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTransform> const &transform) {
   if (transform) {
     switch (transform.value()) {
@@ -415,12 +411,12 @@ Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTra
 LinesMeasurements TextLayoutManager::measureLines(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
-    Size size) const {
+    const Size &size) const {
   LinesMeasurements lineMeasurements{};
 
   winrt::com_ptr<IDWriteTextLayout> spTextLayout;
   TextMeasurement::Attachments attachments;
-  GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
+  WindowsTextLayoutManager::GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
 
   if (spTextLayout) {
     std::vector<DWRITE_LINE_METRICS> lineMetrics;
@@ -485,24 +481,13 @@ LinesMeasurements TextLayoutManager::measureLines(
   return lineMeasurements;
 }
 
-std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
+Float TextLayoutManager::baseline(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
-  return nullptr;
-}
-
-void *TextLayoutManager::getNativeTextLayoutManager() const {
-  return (void *)this;
-}
-
-Float TextLayoutManager::baseline(
-    AttributedStringBox attributedStringBox,
-    ParagraphAttributes paragraphAttributes,
-    Size size) const {
+    const Size &size) const {
   winrt::com_ptr<IDWriteTextLayout> spTextLayout;
   TextMeasurement::Attachments attachments;
-  GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
+  WindowsTextLayoutManager::GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
   if (!spTextLayout) {
     return 0;
   }
@@ -513,7 +498,7 @@ Float TextLayoutManager::baseline(
       0.8f; // https://learn.microsoft.com/en-us/windows/win32/api/dwrite/nf-dwrite-idwritetextformat-getlinespacing
 }
 
-winrt::hstring TextLayoutManager::GetTransformedText(const AttributedStringBox &attributedStringBox) {
+winrt::hstring WindowsTextLayoutManager::GetTransformedText(const AttributedStringBox &attributedStringBox) {
   winrt::hstring result{};
   const auto &attributedString = attributedStringBox.getValue();
 

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

@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#pragma warning(push)
+#pragma warning(disable : 5028) // 'Node': Alignment specified in prior declaration (1) not specified in definition
+#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
+#pragma warning(pop)
+
+#include <react/renderer/attributedstring/AttributedStringBox.h>
+#include <react/renderer/attributedstring/ParagraphAttributes.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
+#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
+#include <react/utils/ContextContainer.h>
+#include <memory>
+
+namespace facebook::react {
+
+class WindowsTextLayoutManager : public TextLayoutManager {
+ public:
+  WindowsTextLayoutManager(const ContextContainer::Shared &contextContainer);
+  virtual ~WindowsTextLayoutManager() = default;
+
+  /*
+   * Not copyable.
+   */
+  WindowsTextLayoutManager(const WindowsTextLayoutManager &) = delete;
+  WindowsTextLayoutManager &operator=(const WindowsTextLayoutManager &) = delete;
+
+  /*
+   * Not movable.
+   */
+  WindowsTextLayoutManager(WindowsTextLayoutManager &&) = delete;
+  WindowsTextLayoutManager &operator=(WindowsTextLayoutManager &&) = delete;
+
+  static void GetTextLayout(
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      Size size,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+      TextMeasurement::Attachments &attachments) noexcept;
+
+  static void GetTextLayout(
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      LayoutConstraints layoutConstraints,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
+
+  static void GetTextLayoutByAdjustingFontSizeToFit(
+      AttributedStringBox attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      LayoutConstraints layoutConstraints,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+      TextMeasurement::Attachments &attachments,
+      float minimumFontScale) noexcept;
+
+ private:
+  static winrt::hstring GetTransformedText(const AttributedStringBox &attributedStringBox);
+  static void GetTextLayout(
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      Size size,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
+};
+
+} // namespace facebook::react

package/Microsoft.ReactNative/IReactModuleBuilder.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "IReactModuleBuilder.h"
-#include <IReactContext.h>
 #include <strsafe.h>
 #include "DynamicWriter.h"
 #include "ReactHost/MsoUtils.h"
@@ -160,13 +159,6 @@ std::unique_ptr<CxxModule> ReactModuleBuilder::MakeCxxModule(
   for (auto &initializer : m_initializers) {
     initializer(m_reactContext);
   }
-  for (auto &initializer : m_jsiinitializers) {
-    initializer(
-        m_reactContext,
-        winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactContext>(m_reactContext)
-            ->GetInner()
-            .JsiRuntime());
-  }
   return std::make_unique<ABICxxModule>(
       nativeModule, Mso::Copy(name), Mso::Copy(m_constantProviders), Mso::Copy(m_methods));
 }

package/Microsoft.ReactNative/IReactPackageBuilderFabric.idl

@@ -14,14 +14,13 @@ namespace Microsoft.ReactNative
 
   [webhosthidden]
   [experimental]
-  DOC_STRING("Provides ability to register custom ViewComponents when running fabric.  Methods on this interface will eventually be moved onto @IReactPackageProvider once fabric ships.")
+  DOC_STRING("Provides ability to register custom ViewComponents when running fabric.")
   interface IReactPackageBuilderFabric
   {
     DOC_STRING("Registers a custom native view component.")
     void AddViewComponent(String componentName, ReactViewComponentProvider componentProvider);
 
-    DOC_STRING(
-      "Ability to load images using custom Uri protocol handlers. The provider should implement @Composition.IUriImageStreamProvider or @Composition.Experimental.IUriBrushProvider.")
+    DOC_STRING("Ability to load images using custom Uri protocol handlers.")
     void AddUriImageProvider(Microsoft.ReactNative.Composition.IUriImageProvider provider);
   };
 

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -16,7 +17,6 @@
     <CppWinRTNamespaceMergeDepth>
     </CppWinRTNamespaceMergeDepth>
     <CppWinRTLibs>true</CppWinRTLibs>
-    <BuildMSRNCxxModule>false</BuildMSRNCxxModule>
     <BuildMSRNCxxReactCommon>false</BuildMSRNCxxReactCommon>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -100,7 +100,6 @@
       <AdditionalIncludeDirectories>
         $(FmtDir)\include;
         $(ReactNativeWindowsDir)Microsoft.ReactNative;
-        $(ReactNativeWindowsDir)Microsoft.ReactNative\Fabric\platform;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\Pch;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\Views;
@@ -331,10 +330,6 @@
       <DependentUpon>QuirkSettings.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="ReactPointerEventArgs.h">
-      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
     <ClInclude Include="XamlUIService.h">
       <DependentUpon>XamlUIService.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -358,6 +353,10 @@
       <DependentUpon>ReactApplication.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="ReactHost\ViewManagerProvider.h" />
+    <ClInclude Include="ReactPointerEventArgs.h">
+      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
     <ClInclude Include="ReactRootView.h">
       <DependentUpon>ReactRootView.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -461,10 +460,6 @@
     <ClCompile Include="Modules\ImageViewManagerModule.cpp" />
     <ClCompile Include="Modules\LinkingManagerModule.cpp" />
     <ClCompile Include="Modules\LogBoxModule.cpp" />
-    <ClCompile Include="ReactPointerEventArgs.cpp">
-      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="Pch\pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -501,6 +496,10 @@
     <ClCompile Include="ReactApplication.cpp">
       <DependentUpon>ReactApplication.idl</DependentUpon>
     </ClCompile>
+    <ClCompile Include="ReactPointerEventArgs.cpp">
+      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="ReactRootView.cpp">
       <DependentUpon>ReactRootView.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -565,7 +564,6 @@
   <ItemGroup>
     <Midl Include="DesktopWindowMessage.idl" />
     <Midl Include="DocString.idl" />
-    <Midl Include="ReactPointerEventArgs.idl" />
     <Midl Include="XamlUIService.idl">
       <SubType>Designer</SubType>
     </Midl>
@@ -582,6 +580,7 @@
       <SubType>Designer</SubType>
     </Midl>
     <Midl Include="ReactApplication.idl" />
+    <Midl Include="ReactPointerEventArgs.idl" />
     <Midl Include="ReactRootView.idl">
       <SubType>Designer</SubType>
     </Midl>

package/Microsoft.ReactNative/ReactHost/ReactHost.cpp

@@ -284,10 +284,6 @@ bool ReactOptions::EnableDefaultCrashHandler() const noexcept {
 
 class ReactNativeWindowsFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults {
  public:
-  bool disableEventLoopOnBridgeless() override {
-    return Microsoft::React::GetRuntimeOptionBool("ReactFeatureFlag.enableEventLoopOnBridgeless");
-  }
-
   bool enableBridgelessArchitecture() override {
 #ifdef USE_FABRIC
     return true;

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -59,10 +59,10 @@
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
 #include <SchedulerSettings.h>
 #include <jserrorhandler/JsErrorHandler.h>
+#include <jsitooling/react/runtime/JSRuntimeFactory.h>
 #include <react/nativemodule/core/ReactCommon/TurboModuleBinding.h>
 #include <react/renderer/componentregistry/componentNameByReactViewName.h>
 #include <react/renderer/componentregistry/native/NativeComponentRegistryBinding.h>
-#include <react/runtime/JSRuntimeFactory.h>
 #include <react/runtime/PlatformTimerRegistry.h>
 #include <react/runtime/TimerManager.h>
 #include <react/threading/MessageQueueThreadImpl.h>

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/Bridging.h

@@ -11,11 +11,11 @@
 #include <react/bridging/Array.h>
 #include <react/bridging/Bool.h>
 #include <react/bridging/Class.h>
-// #include <react/bridging/Dynamic.h> // Line causes Error C1083 Cannot open include file: 'double-conversion/double-conversion.h' #11644
+// #include <react/bridging/Dynamic.h> // [Windows] Line causes Error C1083 Cannot open include file: 'double-conversion/double-conversion.h' #11644
 #include <react/bridging/Error.h>
-#include <react/bridging/EventEmitter.h> // [Windows #13391]
+#include <react/bridging/EventEmitter.h>
 #include <react/bridging/Function.h>
 #include <react/bridging/Number.h>
 #include <react/bridging/Object.h>
 #include <react/bridging/Promise.h>
-#include <react/bridging/Value.h> // [Windows #13391]
+#include <react/bridging/Value.h>

package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.props

@@ -12,4 +12,8 @@
    <!-- Fixes NuGet restore issues: -->
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.CSharp.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
+
+  <PropertyGroup>
+    <RnwExternalPropsLoaded>$(MSBuildThisFile)</RnwExternalPropsLoaded>
+  </PropertyGroup>
 </Project>

package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.targets

@@ -8,6 +8,10 @@
   Do not make any changes here unless it applies to ALL such projects.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Check that the correct props have already been imported. -->
+  <Target Name="EnsureRnwExternalPropsLoadedTarget" BeforeTargets="PrepareForBuild" Condition="'$(RnwExternalPropsLoaded)'!='Microsoft.ReactNative.Composition.Package.props'">
+    <Warning Text="Property `RnwExternalPropsLoaded` was incorrectly set to '$(RnwExternalPropsLoaded)'. Please ensure your project imports 'Microsoft.ReactNative.Composition.Package.props' before importing this prop sheet." />
+  </Target>
   
   <ItemGroup>
     <SDKReference Include="Microsoft.VCLibs.Desktop, Version=14.0" />

package/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props

@@ -5,18 +5,8 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Only include Microsoft.ReactNative.* NuGet packages that C++ (app and lib) projects need when using UseExperimentalNuget. -->
-  <Choose>
-    <When Condition="'$(RnwNewArch)' == 'true'">
-      <ItemGroup>
-        <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)-Fabric" />
-        <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)-Fabric" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-       <ItemGroup>
-        <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)" />
-        <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)" />
+    <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)" />
+  </ItemGroup>
 </Project>

package/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props

@@ -31,7 +31,7 @@
 
     <!-- New Architecture projects have higher version requirements. -->
     <TargetPlatformVersion Condition="'$(RnwNewArch)'=='true' And $([MSBuild]::VersionLessThan('$(TargetPlatformVersion)', '10.0.22621.0'))">10.0.22621.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion Condition="'$(RnwNewArch)'=='true' And $([MSBuild]::VersionLessThan('$(TargetPlatformMinVersion)', '10.0.17763.0'))">10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion Condition="'$(RnwNewArch)'=='true' And $([MSBuild]::VersionLessThan('$(TargetPlatformMinVersion)', '10.0.17763.0'))">10.0.18362.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <PropertyGroup>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.78.6</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.79.0-preview.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>78</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>6</ReactNativeWindowsPatch>
+    <ReactNativeWindowsMinor>79</ReactNativeWindowsMinor>
+    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>e74aaadf4cf0b3c12e7561e8ea3349fa9d6998a4</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>0dbeb12a208250e40ac14b05ef8e2420edc65567</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>