react-native-windows 0.84.0-preview.9 → 0.85.0-preview.1

package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp

@@ -7,6 +7,7 @@
 
 #include "../../../codegen/react/components/rnwcore/ModalHostView.g.h"
 #include <ComponentView.Experimental.interop.h>
+#include <dwmapi.h>
 #include <winrt/Microsoft.UI.Content.h>
 #include <winrt/Microsoft.UI.Input.h>
 #include <winrt/Microsoft.UI.Windowing.h>
@@ -112,6 +113,12 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
       m_rnWindow.AppWindow().Title(titleValue);
     }
 
+    if (m_rnWindow &&
+        (newViewProps.hideTitleBar != oldViewProps.hideTitleBar ||
+         newViewProps.hideBorder != oldViewProps.hideBorder)) {
+      UpdateTitleBarAndBorder();
+    }
+
     ::Microsoft::ReactNativeSpecs::BaseModalHostView<ModalHostView>::UpdateProps(view, newProps, oldProps);
   }
 
@@ -258,6 +265,61 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     }
   }
 
+  void UpdateTitleBarAndBorder() noexcept {
+    if (!m_rnWindow) {
+      return;
+    }
+
+    auto overlappedPresenter = winrt::Microsoft::UI::Windowing::OverlappedPresenter::Create();
+
+    // Configure presenter for modal behavior
+    overlappedPresenter.IsModal(true);
+
+    // modal should only have close button
+    overlappedPresenter.IsMinimizable(false);
+    overlappedPresenter.IsMaximizable(false);
+
+    // Apply the presenter to the window
+    m_rnWindow.AppWindow().SetPresenter(overlappedPresenter);
+
+    // We only hide the borders if the titlebar is also hidden.
+    const bool hideBorders = m_localProps->hideTitleBar.value_or(false) && m_localProps->hideBorder.value_or(false);
+
+    auto titleBar = m_rnWindow.AppWindow().TitleBar();
+    titleBar.ResetToDefault();
+    overlappedPresenter.IsResizable(false);
+
+    overlappedPresenter.SetBorderAndTitleBar(!hideBorders, !m_localProps->hideTitleBar.value_or(false));
+
+    auto hwnd = GetWindowFromWindowId(m_rnWindow.AppWindow().Id());
+
+    if (hideBorders) {
+      const DWMNCRENDERINGPOLICY ncPolicy = DWMNCRP_DISABLED;
+      ::DwmSetWindowAttribute(hwnd, DWMWA_NCRENDERING_POLICY, &ncPolicy, sizeof(ncPolicy));
+
+      const DWM_WINDOW_CORNER_PREFERENCE cornerPref = DWMWCP_DEFAULT;
+      ::DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, &cornerPref, sizeof(cornerPref));
+
+      const COLORREF zeroColor = 0;
+      ::DwmSetWindowAttribute(hwnd, DWMWA_BORDER_COLOR, &zeroColor, sizeof(zeroColor));
+      ::DwmSetWindowAttribute(hwnd, DWMWA_CAPTION_COLOR, &zeroColor, sizeof(zeroColor));
+      ::DwmSetWindowAttribute(hwnd, DWMWA_TEXT_COLOR, &zeroColor, sizeof(zeroColor));
+    } else {
+      const DWMNCRENDERINGPOLICY ncPolicy = DWMNCRP_USEWINDOWSTYLE;
+      ::DwmSetWindowAttribute(hwnd, DWMWA_NCRENDERING_POLICY, &ncPolicy, sizeof(ncPolicy));
+
+      const DWM_WINDOW_CORNER_PREFERENCE cornerPref = DWMWCP_DEFAULT;
+      ::DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, &cornerPref, sizeof(cornerPref));
+
+      const COLORREF zeroColor = DWMWA_COLOR_DEFAULT;
+      ::DwmSetWindowAttribute(hwnd, DWMWA_BORDER_COLOR, &zeroColor, sizeof(zeroColor));
+      ::DwmSetWindowAttribute(hwnd, DWMWA_CAPTION_COLOR, &zeroColor, sizeof(zeroColor));
+      ::DwmSetWindowAttribute(hwnd, DWMWA_TEXT_COLOR, &zeroColor, sizeof(zeroColor));
+
+      titleBar.IconShowOptions(winrt::Microsoft::UI::Windowing::IconShowOptions::HideIconAndSystemMenu);
+    }
+  }
+
   // creates a new modal window
   void EnsureModalCreated(const winrt::Microsoft::ReactNative::ComponentView &view) {
     if (m_popUp) {
@@ -282,22 +344,8 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     m_rnWindow = winrt::Microsoft::ReactNative::ReactNativeWindow::CreateFromContentSiteBridgeAndIsland(
         m_popUp, winrt::Microsoft::ReactNative::ReactNativeIsland::CreatePortal(portal));
     m_rnWindow.ResizePolicy(winrt::Microsoft::ReactNative::ContentSizePolicy::None);
-    auto overlappedPresenter = winrt::Microsoft::UI::Windowing::OverlappedPresenter::Create();
-
-    // Configure presenter for modal behavior
-    overlappedPresenter.IsModal(true);
-    overlappedPresenter.SetBorderAndTitleBar(true, true);
-
-    // modal should only have close button
-    overlappedPresenter.IsMinimizable(false);
-    overlappedPresenter.IsMaximizable(false);
-
-    // Apply the presenter to the window
-    m_rnWindow.AppWindow().SetPresenter(overlappedPresenter);
 
-    // Hide the title bar icon
-    m_rnWindow.AppWindow().TitleBar().IconShowOptions(
-        winrt::Microsoft::UI::Windowing::IconShowOptions::HideIconAndSystemMenu);
+    UpdateTitleBarAndBorder();
 
     // Set initial title using the stored local props
     if (m_localProps && m_localProps->title.has_value()) {

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

@@ -153,11 +153,12 @@ facebook::react::SharedViewEventEmitter ParagraphComponentView::eventEmitterAtPo
       uint32_t textPosition = metrics.textPosition;
 
       for (auto fragment : m_attributedStringBox.getValue().getFragments()) {
-        if (textPosition < fragment.string.length()) {
+        uint32_t utf16Length = static_cast<uint32_t>(::Microsoft::Common::Unicode::Utf8ToUtf16Length(fragment.string));
+        if (textPosition < utf16Length) {
           return std::static_pointer_cast<const facebook::react::ViewEventEmitter>(
               fragment.parentShadowView.eventEmitter);
         }
-        textPosition -= static_cast<uint32_t>(fragment.string.length());
+        textPosition -= utf16Length;
       }
     }
   }
@@ -210,10 +211,11 @@ bool ParagraphComponentView::IsTextSelectableAtPoint(facebook::react::Point pt)
 
       // Finds which fragment contains this text position
       for (auto fragment : m_attributedStringBox.getValue().getFragments()) {
-        if (textPosition < fragment.string.length()) {
+        uint32_t utf16Length = static_cast<uint32_t>(::Microsoft::Common::Unicode::Utf8ToUtf16Length(fragment.string));
+        if (textPosition < utf16Length) {
           return true;
         }
-        textPosition -= static_cast<uint32_t>(fragment.string.length());
+        textPosition -= utf16Length;
       }
     }
   }
@@ -338,7 +340,9 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
             break;
         }
       }
-      winrt::check_hresult(m_textLayout->SetTextAlignment(alignment));
+
+      if (alignment != m_textLayout->GetTextAlignment())
+        winrt::check_hresult(m_textLayout->SetTextAlignment(alignment));
     }
 
     requireNewBrush = true;

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

@@ -23,6 +23,7 @@
 #include <functional>
 #include "ContentIslandComponentView.h"
 #include "JSValueReader.h"
+#include "ReactNativeIsland.h"
 #include "RootComponentView.h"
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
@@ -849,13 +850,27 @@ void ScrollViewComponentView::updateStateWithContentOffset() noexcept {
     return;
   }
 
-  auto scrollPosition = m_scrollVisual.ScrollPosition();
-  m_verticalScrollbarComponent->ContentOffset(scrollPosition);
-  m_horizontalScrollbarComponent->ContentOffset(scrollPosition);
-
-  m_state->updateState([scrollPosition](const facebook::react::ScrollViewShadowNode::ConcreteState::Data &data) {
+  // Issue #16047: m_scrollVisual.ScrollPosition() returns the InteractionTracker
+  // position in PHYSICAL pixels (the visual is sized as
+  // layoutMetrics.frame.size.* * pointScaleFactor — see updateLayoutMetrics /
+  // updateContentVisualSize) but ScrollViewShadowNode state's contentOffset is
+  // in DIPs. Without the conversion, JS UIManager.measure() over-subtracts by
+  // pointScaleFactor on non-100% display scales, leaving Pressables inside a
+  // scrolled ScrollView with stale page-space bounds that don't contain the
+  // touch — Pressability fires LEAVE_PRESS_RECT inside pressIn and suppresses
+  // press. The JS-event-emitter paths in this file (see lines using
+  // args.Position() / pointScaleFactor) already do this division.
+  auto rawScrollPosition = m_scrollVisual.ScrollPosition();
+  const float pointScaleFactor = m_layoutMetrics.pointScaleFactor > 0.0f ? m_layoutMetrics.pointScaleFactor : 1.0f;
+  facebook::react::Point contentOffsetDips{
+      rawScrollPosition.x / pointScaleFactor, rawScrollPosition.y / pointScaleFactor};
+
+  m_verticalScrollbarComponent->ContentOffset(rawScrollPosition);
+  m_horizontalScrollbarComponent->ContentOffset(rawScrollPosition);
+
+  m_state->updateState([contentOffsetDips](const facebook::react::ScrollViewShadowNode::ConcreteState::Data &data) {
     auto newData = data;
-    newData.contentOffset = {scrollPosition.x, scrollPosition.y};
+    newData.contentOffset = contentOffsetDips;
     return std::make_shared<facebook::react::ScrollViewShadowNode::ConcreteState::Data const>(newData);
   });
 }
@@ -1389,6 +1404,13 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
       [this](
           winrt::IInspectable const & /*sender*/,
           winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs const &args) {
+        // Issue #16047: push the FINAL settled scroll position into Fabric's
+        // shadow tree before notifying JS. The per-frame ScrollPositionChanged
+        // updates can drop the last inertia delta, leaving contentOffset stale
+        // and JS UIManager.measure() returning pre-settle-relative bounds.
+        // ScrollEndDrag / ScrollBeginDrag already call this; momentum-end was
+        // the missing completion path.
+        updateStateWithContentOffset();
         auto eventEmitter = GetEventEmitter();
         if (eventEmitter) {
           auto scrollMetrics = getScrollMetrics(eventEmitter, args);

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

@@ -66,7 +66,7 @@ void RenderText(
   unsigned int position = 0;
   unsigned int length = 0;
   for (auto fragment : attributedString.getFragments()) {
-    length = static_cast<UINT32>(fragment.string.length());
+    length = static_cast<UINT32>(::Microsoft::Common::Unicode::Utf8ToUtf16Length(fragment.string));
     DWRITE_TEXT_RANGE range = {position, length};
     if (fragment.textAttributes.foregroundColor &&
             (fragment.textAttributes.foregroundColor != textAttributes.foregroundColor) ||

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

@@ -1329,7 +1329,7 @@ void WindowsTextInputComponentView::updateLayoutMetrics(
     facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
   // Set Position & Size Properties
 
-  if ((layoutMetrics.pointScaleFactor != m_layoutMetrics.pointScaleFactor)) {
+  if (m_textServices && layoutMetrics.pointScaleFactor > 0) {
     LRESULT res;
     winrt::check_hresult(m_textServices->TxSendMessage(
         (WM_USER + 328), // EM_SETDPI

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

@@ -7,7 +7,7 @@
 
 #include "WindowsTextInputState.h"
 
-#include <react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h> // [windows]
+#include <react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h> // [windows]
 
 namespace facebook::react {
 

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

@@ -169,12 +169,22 @@ TooltipTracker::TooltipTracker(
   view.PointerEntered({this, &TooltipTracker::OnPointerEntered});
   view.PointerExited({this, &TooltipTracker::OnPointerExited});
   view.PointerMoved({this, &TooltipTracker::OnPointerMoved});
+  view.GotFocus({this, &TooltipTracker::OnGotFocus});
+  view.LostFocus({this, &TooltipTracker::OnLostFocus});
   view.Unmounted({this, &TooltipTracker::OnUnmounted});
 }
 
 TooltipTracker::~TooltipTracker() {
   DestroyTimer();
   DestroyTooltip();
+  m_outer->NotifyDismiss(this);
+}
+
+void TooltipTracker::DismissForExternalRequest() noexcept {
+  // Service is already updating its active slot; do not call back into it.
+  m_focusTooltip = false;
+  DestroyTimer();
+  DestroyTooltip();
 }
 
 facebook::react::Tag TooltipTracker::Tag() const noexcept {
@@ -192,6 +202,9 @@ void TooltipTracker::OnPointerEntered(
   auto pp = args.GetCurrentPoint(-1);
   m_pos = pp.Position();
 
+  // Claim the single tooltip slot, dismissing any other tracker's pending or visible tooltip.
+  m_outer->NotifyShow(this);
+
   m_timer = winrt::Microsoft::ReactNative::Timer::Create(m_properties.Handle());
   m_timer.Interval(std::chrono::milliseconds(toolTipTimeToShowMs));
   m_timer.Tick({this, &TooltipTracker::OnTick});
@@ -225,6 +238,56 @@ void TooltipTracker::OnPointerExited(
     return;
   DestroyTimer();
   DestroyTooltip();
+  m_outer->NotifyDismiss(this);
+}
+
+void TooltipTracker::OnGotFocus(
+    const winrt::Windows::Foundation::IInspectable & /*sender*/,
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs & /*args*/) noexcept {
+  // Skip if a mouse-driven tooltip or its dwell timer is already in flight on this view.
+  if (m_hwndTip || m_timer) {
+    return;
+  }
+
+  auto view = m_view.view();
+  if (!view) {
+    return;
+  }
+
+  auto viewCompView = view.try_as<winrt::Microsoft::ReactNative::Composition::ViewComponentView>();
+  if (!viewCompView) {
+    return;
+  }
+  auto selfView =
+      winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>(viewCompView);
+  RECT rc = selfView->getClientRect();
+  auto scaleFactor = view.LayoutMetrics().PointScaleFactor;
+  if (scaleFactor <= 0) {
+    return;
+  }
+
+  // Anchor in DIPs at the horizontal center of the view's top edge; ShowTooltip re-applies scaleFactor.
+  m_pos = {static_cast<float>(rc.left + rc.right) / 2.0f / scaleFactor, static_cast<float>(rc.top) / scaleFactor};
+
+  m_focusTooltip = true;
+  // Claim the single tooltip slot, dismissing any other tracker's pending or visible tooltip.
+  m_outer->NotifyShow(this);
+  m_timer = winrt::Microsoft::ReactNative::Timer::Create(m_properties.Handle());
+  m_timer.Interval(std::chrono::milliseconds(toolTipTimeToShowMs));
+  m_timer.Tick({this, &TooltipTracker::OnTick});
+  m_timer.Start();
+}
+
+void TooltipTracker::OnLostFocus(
+    const winrt::Windows::Foundation::IInspectable & /*sender*/,
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs & /*args*/) noexcept {
+  if (!m_focusTooltip) {
+    return;
+  }
+  m_focusTooltip = false;
+  DestroyTimer();
+  DestroyTooltip();
+  m_outer->NotifyDismiss(this);
 }
 
 void TooltipTracker::OnUnmounted(
@@ -232,6 +295,7 @@ void TooltipTracker::OnUnmounted(
     const winrt::Microsoft::ReactNative::ComponentView &) noexcept {
   DestroyTimer();
   DestroyTooltip();
+  m_outer->NotifyDismiss(this);
 }
 
 void TooltipTracker::ShowTooltip(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
@@ -326,6 +390,22 @@ void TooltipService::StopTracking(const winrt::Microsoft::ReactNative::Component
   }
 }
 
+void TooltipService::NotifyShow(TooltipTracker *tracker) noexcept {
+  if (m_activeTracker == tracker) {
+    return;
+  }
+  if (m_activeTracker) {
+    m_activeTracker->DismissForExternalRequest();
+  }
+  m_activeTracker = tracker;
+}
+
+void TooltipService::NotifyDismiss(TooltipTracker *tracker) noexcept {
+  if (m_activeTracker == tracker) {
+    m_activeTracker = nullptr;
+  }
+}
+
 static const ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<std::shared_ptr<TooltipService>>>
     &TooltipServicePropertyId() noexcept {
   static const ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<std::shared_ptr<TooltipService>>> prop{

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

@@ -27,6 +27,12 @@ struct TooltipTracker {
   void OnPointerExited(
       const winrt::Windows::Foundation::IInspectable &sender,
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
+  void OnGotFocus(
+      const winrt::Windows::Foundation::IInspectable &sender,
+      const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept;
+  void OnLostFocus(
+      const winrt::Windows::Foundation::IInspectable &sender,
+      const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept;
   void OnTick(
       const winrt::Windows::Foundation::IInspectable &,
       const winrt::Windows::Foundation::IInspectable &) noexcept;
@@ -36,6 +42,10 @@ struct TooltipTracker {
 
   facebook::react::Tag Tag() const noexcept;
 
+  // Cancel pending dwell timer and close any visible tooltip popup; used by the service when another tracker takes
+  // over.
+  void DismissForExternalRequest() noexcept;
+
  private:
   void ShowTooltip(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
   void DestroyTimer() noexcept;
@@ -46,6 +56,7 @@ struct TooltipTracker {
   ::Microsoft::ReactNative::ReactTaggedView m_view;
   winrt::Microsoft::ReactNative::ITimer m_timer;
   HWND m_hwndTip{nullptr};
+  bool m_focusTooltip{false};
   winrt::Microsoft::ReactNative::ReactPropertyBag m_properties;
 };
 
@@ -54,12 +65,18 @@ struct TooltipService {
   void StartTracking(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
   void StopTracking(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
 
+  // Enforce "only one tooltip visible at a time": dismisses the previously active tracker, if any.
+  void NotifyShow(TooltipTracker *tracker) noexcept;
+  // Clears the active-tracker slot if it still points at `tracker`.
+  void NotifyDismiss(TooltipTracker *tracker) noexcept;
+
   static std::shared_ptr<TooltipService> GetCurrent(
       const winrt::Microsoft::ReactNative::ReactPropertyBag &properties) noexcept;
 
  private:
   std::vector<std::shared_ptr<TooltipTracker>> m_enteredTrackers;
   std::vector<std::shared_ptr<TooltipTracker>> m_trackers;
+  TooltipTracker *m_activeTracker{nullptr};
   winrt::Microsoft::ReactNative::ReactPropertyBag m_properties;
 };
 

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -24,6 +24,7 @@
 #include <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #include <react/renderer/core/DynamicPropsUtilities.h>
 #include <react/renderer/core/EventBeat.h>
+#include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/scheduler/SchedulerToolbox.h>
@@ -404,6 +405,16 @@ void FabricUIManager::schedulerShouldRenderTransactions(
   }
 }
 
+void FabricUIManager::schedulerShouldMergeReactRevision(facebook::react::SurfaceId surfaceId) {
+  m_context.UIDispatcher().Post([surfaceId, self = shared_from_this()]() {
+    std::lock_guard lock(self->m_schedulerMutex);
+    if (self->m_scheduler) {
+      self->m_scheduler->getUIManager()->getShadowTreeRegistry().visit(
+          surfaceId, [](const facebook::react::ShadowTree &shadowTree) { shadowTree.mergeReactRevision(); });
+    }
+  });
+}
+
 void FabricUIManager::schedulerDidRequestPreliminaryViewAllocation(const facebook::react::ShadowNode &shadowView) {
   // iOS does not do this optimization, but Android does.  It maybe that android's allocations are more expensive due to
   // the Java boundary.

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -90,6 +90,7 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
       const std::shared_ptr<const facebook::react::MountingCoordinator> &mountingCoordinator) override;
   virtual void schedulerShouldRenderTransactions(
       const std::shared_ptr<const facebook::react::MountingCoordinator> &mountingCoordinator) override;
+  virtual void schedulerShouldMergeReactRevision(facebook::react::SurfaceId surfaceId) override;
   virtual void schedulerDidRequestPreliminaryViewAllocation(const facebook::react::ShadowNode &shadowView) override;
   virtual void schedulerDidDispatchCommand(
       facebook::react::ShadowView const &shadowView,

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

@@ -99,6 +99,9 @@ inline ColorComponents colorComponentsFromHostPlatformColor(Color color) {
 
 // windows
 inline bool hostPlatformColorIsColorMeaningful(Color color) noexcept {
+  if (color.m_platformColor.size())
+    return true;
+
   auto windowsColor = color.AsWindowsColor();
   return windowsColor.A > 0;
 }

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

@@ -4,9 +4,6 @@
 #include "PlatformColorUtils.h"
 #include <Utils/ThemeUtils.h>
 #include <Utils/ValueUtils.h>
-#ifndef CORE_ABI
-#include <XamlUtils.h>
-#endif // CORE_ABI
 #include <react/renderer/graphics/Color.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 #include "HostPlatformColor.h"

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

@@ -196,12 +196,7 @@ void WindowsTextLayoutManager::GetTextLayout(
       ));
 
   // 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);
-  }
+  spTextLayout->SetMaxWidth(size.width);
 
   // Apply DWRITE_TRIMMING for ellipsizeMode
   DWRITE_TRIMMING trimming = {};
@@ -267,7 +262,7 @@ void WindowsTextLayoutManager::GetTextLayout(
       attachments.push_back(attachment);
       position += 1;
     } else {
-      unsigned int length = static_cast<UINT32>(fragment.string.length());
+      unsigned int length = static_cast<UINT32>(Microsoft::Common::Unicode::Utf8ToUtf16Length(fragment.string));
       DWRITE_TEXT_RANGE range = {position, length};
       TextAttributes attributes = fragment.textAttributes;
       DWRITE_FONT_STYLE fragmentStyle = DWRITE_FONT_STYLE_NORMAL;
@@ -396,7 +391,7 @@ void WindowsTextLayoutManager::GetTextLayoutByAdjustingFontSizeToFit(
   }
 }
 
-// measure entire text (inluding attachments)
+// measure entire text (including attachments)
 TextMeasurement TextLayoutManager::measure(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,

package/Microsoft.ReactNative/IReactPackageBuilder.idl

@@ -21,5 +21,11 @@ namespace Microsoft.ReactNative
     DOC_STRING("Adds a custom native module. See @ReactModuleProvider. This will register the"
     "module as a TurboModule.")
     void AddTurboModule(String moduleName, ReactModuleProvider moduleProvider);
+
+    DOC_STRING("Adds a custom native module. See @ReactModuleProvider. This will register the"
+    "module as a TurboModule.  This module will be created and have init called as soon as the"
+    "instance is created, event before the module is accessed from JavaScript.")
+    void AddEagerInitTurboModule(String moduleName, ReactModuleProvider moduleProvider);
+
   }
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -10,7 +10,7 @@
     <ProjectName>Microsoft.ReactNative</ProjectName>
     <RootNamespace>Microsoft.ReactNative</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>18.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
@@ -96,9 +96,10 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>/await %(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
+      <AdditionalOptions Condition="$(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <AdditionalIncludeDirectories>
-        $(FmtDir)\include;
+        $(ExternalDir)fmt\include;
         $(ReactNativeWindowsDir)Microsoft.ReactNative;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\Pch;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost;
@@ -304,8 +305,6 @@
     <ClInclude Include="Utils\StandardControlResourceKeyNames.h" />
     <ClInclude Include="Utils\TextTransform.h" />
     <ClInclude Include="Utils\TransformableText.h" />
-    <ClInclude Include="Utils\UwpPreparedScriptStore.h" />
-    <ClInclude Include="Utils\UwpScriptStore.h" />
     <ClInclude Include="Utils\IcuUtils.h" />
     <ClInclude Include="Utils\ValueUtils.h" />
     <ClInclude Include="Utils\XamlIslandUtils.h" />
@@ -319,74 +318,22 @@
       <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="RedBox.h" />
-    <ClInclude Include="ReactSupport.h" />
     <ClInclude Include="TestHook.h" />
     <ClInclude Include="QuirkSettings.h">
       <DependentUpon>QuirkSettings.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="XamlUIService.h">
-      <DependentUpon>XamlUIService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CxxReactUWP\JSBigString.cpp" />
-    <ClCompile Include="Modules\AccessibilityInfoModule.cpp" />
-    <ClCompile Include="Modules\AlertModule.cpp" />
-    <ClCompile Include="Modules\Animated\AdditionAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\AnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\AnimatedPlatformConfig.cpp" />
-    <ClCompile Include="Modules\Animated\AnimationDriver.cpp" />
-    <ClCompile Include="Modules\Animated\CalculatedAnimationDriver.cpp" />
-    <ClCompile Include="Modules\Animated\DecayAnimationDriver.cpp" />
-    <ClCompile Include="Modules\Animated\DiffClampAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\DivisionAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\EventAnimationDriver.cpp" />
-    <ClCompile Include="Modules\Animated\FrameAnimationDriver.cpp" />
-    <ClCompile Include="Modules\Animated\InterpolationAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\ModulusAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\MultiplicationAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\NativeAnimatedModule.cpp" />
-    <ClCompile Include="Modules\Animated\NativeAnimatedNodeManager.cpp" />
-    <ClCompile Include="Modules\Animated\PropsAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\SpringAnimationDriver.cpp" />
-    <ClCompile Include="Modules\Animated\StyleAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\SubtractionAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\TrackingAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\TransformAnimatedNode.cpp" />
-    <ClCompile Include="Modules\Animated\ValueAnimatedNode.cpp" />
-    <ClCompile Include="Modules\AppearanceModule.cpp" />
-    <ClCompile Include="Modules\AppStateModule.cpp" />
-    <ClCompile Include="Modules\AppThemeModuleUwp.cpp" />
-    <ClCompile Include="Modules\ClipboardModule.cpp" />
-    <ClCompile Include="Modules\CreateModules.cpp" />
-    <ClCompile Include="Modules\DeviceInfoModule.cpp" />
-    <ClCompile Include="Modules\I18nManagerModule.cpp" />
-    <ClCompile Include="Modules\ImageViewManagerModule.cpp" />
-    <ClCompile Include="Modules\LinkingManagerModule.cpp" />
-    <ClCompile Include="Modules\LogBoxModule.cpp" />
     <ClCompile Include="Pch\pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-    <ClCompile Include="Utils\KeyboardUtils.cpp" />
     <ClCompile Include="Utils\LocalBundleReader.cpp" />
-    <ClCompile Include="Utils\UwpPreparedScriptStore.cpp" />
-    <ClCompile Include="Utils\UwpScriptStore.cpp" />
     <ClCompile Include="Utils\ValueUtils.cpp" />
-    <ClCompile Include="ReactSupport.cpp" />
-    <ClCompile Include="XamlUIService.cpp">
-      <DependentUpon>XamlUIService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Midl Include="DesktopWindowMessage.idl" />
     <Midl Include="DocString.idl" />
-    <Midl Include="XamlUIService.idl">
-      <SubType>Designer</SubType>
-    </Midl>
   </ItemGroup>
   <ItemGroup>
     <None Include="microsoft.reactnative.def" />
@@ -411,16 +358,10 @@
       </PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="$(ReactNativeWindowsDir)Folly\Folly.natvis" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Folly\Folly.vcxproj">
-      <Project>{a990658c-ce31-4bcc-976f-0fc6b1af693d}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\ReactCommon\ReactCommon.vcxproj">
       <Project>{a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd}</Project>
     </ProjectReference>