react-native-windows 0.81.4 → 0.81.6

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

@@ -6,7 +6,7 @@
 
 #include "ScrollViewComponentView.h"
 
-#include <UI.Xaml.Controls.h>
+#include <Fabric/ComponentView.h>
 #include <Utils/ValueUtils.h>
 
 #pragma warning(push)
@@ -20,6 +20,8 @@
 #include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
 #include <unicode.h>
+#include <functional>
+#include "ContentIslandComponentView.h"
 #include "JSValueReader.h"
 #include "RootComponentView.h"
 
@@ -885,6 +887,13 @@ void ScrollViewComponentView::updateContentVisualSize() noexcept {
 
 void ScrollViewComponentView::prepareForRecycle() noexcept {}
 
+void ScrollViewComponentView::updateChildrenClippingPath(
+    facebook::react::LayoutMetrics const & /*layoutMetrics*/,
+    const facebook::react::ViewProps & /*viewProps*/) noexcept {
+  // No-op: ScrollView mounts children into m_scrollVisual (not Visual()),
+  // and scroll visuals inherently clip their content.
+}
+
 /*
 ScrollViewComponentView::ScrollInteractionTrackerOwner::ScrollInteractionTrackerOwner(
     ScrollViewComponentView *outer)
@@ -1326,6 +1335,10 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
             m_allowNextScrollNoMatterWhat = false;
           }
         }
+
+        // Issue #15557: Notify listeners that scroll position has changed,
+        // so ContentIslandComponentView can update LocalToParentTransformMatrix
+        FireViewChanged();
       });
 
   m_scrollBeginDragRevoker = m_scrollVisual.ScrollBeginDrag(
@@ -1333,6 +1346,9 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
       [this](
           winrt::IInspectable const & /*sender*/,
           winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs const &args) {
+        // Issue #15557: Notify listeners that scroll position has changed
+        FireViewChanged();
+
         m_allowNextScrollNoMatterWhat = true; // Ensure next scroll event is recorded, regardless of throttle
         updateStateWithContentOffset();
         auto eventEmitter = GetEventEmitter();
@@ -1479,4 +1495,20 @@ void ScrollViewComponentView::updateShowsVerticalScrollIndicator(bool value) noe
 void ScrollViewComponentView::updateDecelerationRate(float value) noexcept {
   m_scrollVisual.SetDecelerationRate({value, value, value});
 }
+
+// Issue #15557: Notify listeners that scroll position has changed.
+// ContentIslandComponentView subscribes to this to update LocalToParentTransformMatrix.
+void ScrollViewComponentView::FireViewChanged() noexcept {
+  m_viewChangedEvent(*this, nullptr);
+}
+
+// Issue #15557: Event accessors for ViewChanged
+winrt::event_token ScrollViewComponentView::ViewChanged(
+    winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const &handler) noexcept {
+  return m_viewChangedEvent.add(handler);
+}
+
+void ScrollViewComponentView::ViewChanged(winrt::event_token const &token) noexcept {
+  m_viewChangedEvent.remove(token);
+}
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -118,6 +118,18 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   double getVerticalSize() noexcept;
   double getHorizontalSize() noexcept;
 
+  // Issue #15557: Event accessors for ViewChanged (used by ContentIslandComponentView for transform update)
+  winrt::event_token ViewChanged(
+      winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const &handler) noexcept;
+  void ViewChanged(winrt::event_token const &token) noexcept;
+
+ protected:
+  // ScrollView mounts children into m_scrollVisual (not Visual()), and scroll visuals
+  // inherently clip their content, so we skip the children container clipping logic.
+  void updateChildrenClippingPath(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::ViewProps &viewProps) noexcept override;
+
  private:
   void updateDecelerationRate(float value) noexcept;
   void updateContentVisualSize() noexcept;
@@ -129,6 +141,8 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   bool scrollRight(float delta, bool animate) noexcept;
   void updateBackgroundColor(const facebook::react::SharedColor &color) noexcept;
   void updateStateWithContentOffset() noexcept;
+  // Issue #15557: Notify listeners that scroll position has changed
+  void FireViewChanged() noexcept;
   facebook::react::ScrollViewEventEmitter::Metrics getScrollMetrics(
       facebook::react::SharedViewEventEmitter const &eventEmitter,
       winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs const &args) noexcept;
@@ -160,6 +174,9 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   bool m_allowNextScrollNoMatterWhat{false};
   std::chrono::steady_clock::time_point m_lastScrollEventTime{};
   std::shared_ptr<facebook::react::ScrollViewShadowNode::ConcreteState const> m_state;
+
+  // Issue #15557: Event for notifying listeners when scroll position changes
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>> m_viewChangedEvent;
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -186,6 +186,7 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
     auto pt = m_outer->getClientOffset();
     m_outer->m_caretVisual.Position({x - pt.x, y - pt.y});
+    m_outer->m_caretPosition = {x, y};
     return true;
   }
 
@@ -245,6 +246,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
   //@cmember Converts screen coordinates of a specified point to the client coordinates
   BOOL TxScreenToClient(LPPOINT lppt) override {
     winrt::Windows::Foundation::Point pt{static_cast<float>(lppt->x), static_cast<float>(lppt->y)};
+    pt.X -= m_outer->m_contentOffsetPx.x;
+    pt.Y -= m_outer->m_contentOffsetPx.y;
     auto localpt = m_outer->ScreenToLocal(pt);
     lppt->x = static_cast<LONG>(localpt.X);
     lppt->y = static_cast<LONG>(localpt.Y);
@@ -254,9 +257,14 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
   //@cmember Converts the client coordinates of a specified point to screen coordinates
   BOOL TxClientToScreen(LPPOINT lppt) override {
     winrt::Windows::Foundation::Point pt{static_cast<float>(lppt->x), static_cast<float>(lppt->y)};
+
+    if (!m_outer->m_parent) {
+      return false;
+    }
+
     auto screenpt = m_outer->LocalToScreen(pt);
-    lppt->x = static_cast<LONG>(screenpt.X);
-    lppt->y = static_cast<LONG>(screenpt.Y);
+    lppt->x = static_cast<LONG>(screenpt.X) + m_outer->m_contentOffsetPx.x;
+    lppt->y = static_cast<LONG>(screenpt.Y) + m_outer->m_contentOffsetPx.y;
     return true;
   }
 
@@ -275,20 +283,25 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
   //@cmember Retrieves the coordinates of a window's client area
   HRESULT TxGetClientRect(LPRECT prc) override {
     *prc = m_outer->getClientRect();
+
+    prc->top += m_outer->m_contentOffsetPx.y;
+    prc->bottom += m_outer->m_contentOffsetPx.y -
+        static_cast<LONG>(m_outer->m_layoutMetrics.contentInsets.bottom * m_outer->m_layoutMetrics.pointScaleFactor);
+    prc->left += m_outer->m_contentOffsetPx.x;
+    prc->right += m_outer->m_contentOffsetPx.x -
+        static_cast<LONG>(m_outer->m_layoutMetrics.contentInsets.right * m_outer->m_layoutMetrics.pointScaleFactor);
+
     return S_OK;
   }
 
   //@cmember Get the view rectangle relative to the inset
   HRESULT TxGetViewInset(LPRECT prc) override {
     // Inset is in HIMETRIC
-    constexpr float HmPerInchF = 2540.0f;
-    constexpr float PointsPerInch = 96.0f;
-    constexpr float dipToHm = HmPerInchF / PointsPerInch;
 
-    prc->left = static_cast<LONG>(m_outer->m_layoutMetrics.contentInsets.left * dipToHm);
-    prc->top = static_cast<LONG>(m_outer->m_layoutMetrics.contentInsets.top * dipToHm);
-    prc->bottom = static_cast<LONG>(m_outer->m_layoutMetrics.contentInsets.bottom * dipToHm);
-    prc->right = static_cast<LONG>(m_outer->m_layoutMetrics.contentInsets.right * dipToHm);
+    prc->left = 0;
+    prc->top = 0;
+    prc->bottom = 0;
+    prc->right = 0;
 
     return NOERROR;
   }
@@ -491,11 +504,6 @@ AutoCorrectOffCallback(LANGID langid, const WCHAR *pszBefore, WCHAR *pszAfter, L
 facebook::react::AttributedString WindowsTextInputComponentView::getAttributedString() const {
   // Use BaseTextShadowNode to get attributed string from children
 
-  auto childTextAttributes = facebook::react::TextAttributes::defaultTextAttributes();
-  childTextAttributes.fontSizeMultiplier = m_fontSizeMultiplier;
-
-  childTextAttributes.apply(windowsTextInputProps().textAttributes);
-
   auto attributedString = facebook::react::AttributedString{};
   // auto attachments = facebook::react::BaseTextShadowNode::Attachments{};
 
@@ -696,17 +704,10 @@ void WindowsTextInputComponentView::OnPointerPressed(
   }
 
   if (m_textServices && msg) {
-    if (msg == WM_RBUTTONUP && !windowsTextInputProps().contextMenuHidden) {
-      ShowContextMenu(position);
-      args.Handled(true);
-    } else if (msg == WM_RBUTTONUP && windowsTextInputProps().contextMenuHidden) {
-      args.Handled(true);
-    } else {
-      LRESULT lresult;
-      DrawBlock db(*this);
-      auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
-      args.Handled(hr != S_FALSE);
-    }
+    LRESULT lresult;
+    DrawBlock db(*this);
+    auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
+    args.Handled(hr != S_FALSE);
   }
 
   // Emits the OnPressIn event
@@ -768,10 +769,18 @@ void WindowsTextInputComponentView::OnPointerReleased(
   }
 
   if (m_textServices && msg) {
-    LRESULT lresult;
-    DrawBlock db(*this);
-    auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
-    args.Handled(hr != S_FALSE);
+    // Show context menu on right button release (standard Windows behavior)
+    if (msg == WM_RBUTTONUP && !windowsTextInputProps().contextMenuHidden) {
+      ShowContextMenu(LocalToScreen(position));
+      args.Handled(true);
+    } else if (msg == WM_RBUTTONUP) {
+      // Context menu is hidden - don't mark as handled, let app add custom behavior
+    } else {
+      LRESULT lresult;
+      DrawBlock db(*this);
+      auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
+      args.Handled(hr != S_FALSE);
+    }
   }
 
   // Emits the OnPressOut event
@@ -1112,6 +1121,9 @@ void WindowsTextInputComponentView::updateProps(
       !facebook::react::floatEquality(
           oldTextInputProps.textAttributes.letterSpacing, newTextInputProps.textAttributes.letterSpacing) ||
       oldTextInputProps.textAttributes.fontFamily != newTextInputProps.textAttributes.fontFamily ||
+      oldTextInputProps.textAttributes.fontStyle != newTextInputProps.textAttributes.fontStyle ||
+      oldTextInputProps.textAttributes.textDecorationLineType !=
+          newTextInputProps.textAttributes.textDecorationLineType ||
       !facebook::react::floatEquality(
           oldTextInputProps.textAttributes.maxFontSizeMultiplier,
           newTextInputProps.textAttributes.maxFontSizeMultiplier)) {
@@ -1127,6 +1139,7 @@ void WindowsTextInputComponentView::updateProps(
   }
 
   if (oldTextInputProps.multiline != newTextInputProps.multiline) {
+    m_recalculateContentVerticalOffset = true;
     m_multiline = newTextInputProps.multiline;
     m_propBitsMask |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
     if (newTextInputProps.multiline) {
@@ -1225,8 +1238,11 @@ void WindowsTextInputComponentView::updateState(
   if (m_mostRecentEventCount == m_state->getData().mostRecentEventCount) {
     m_comingFromState = true;
     auto &fragments = m_state->getData().attributedStringBox.getValue().getFragments();
-    UpdateText(fragments.size() ? fragments[0].string : "");
-
+    {
+      // DrawBlock defers DrawText() until after UpdateText completes
+      DrawBlock db(*this);
+      UpdateText(fragments.size() ? fragments[0].string : "");
+    }
     m_comingFromState = false;
   }
 }
@@ -1273,6 +1289,10 @@ void WindowsTextInputComponentView::updateLayoutMetrics(
   unsigned int newWidth = static_cast<unsigned int>(layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor);
   unsigned int newHeight = static_cast<unsigned int>(layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor);
 
+  if (newHeight != m_imgHeight || oldLayoutMetrics.pointScaleFactor != layoutMetrics.pointScaleFactor) {
+    m_recalculateContentVerticalOffset = true;
+  }
+
   if (newWidth != m_imgWidth || newHeight != m_imgHeight) {
     m_drawingSurface = nullptr; // Invalidate surface if we get a size change
   }
@@ -1375,7 +1395,7 @@ void WindowsTextInputComponentView::EmitOnScrollEvent() noexcept {
 }
 
 void WindowsTextInputComponentView::OnSelectionChanged(LONG start, LONG end) noexcept {
-  if (m_eventEmitter && !m_comingFromState /* && !m_comingFromJS ?? */) {
+  if (m_eventEmitter && !m_comingFromState && !m_comingFromJS) {
     auto emitter = std::static_pointer_cast<const facebook::react::WindowsTextInputEventEmitter>(m_eventEmitter);
     facebook::react::WindowsTextInputEventEmitter::OnSelectionChange onSelectionChangeArgs;
     onSelectionChangeArgs.selection.start = start;
@@ -1411,6 +1431,8 @@ void WindowsTextInputComponentView::FinalizeUpdates(
 
 void WindowsTextInputComponentView::UpdatePropertyBits() noexcept {
   if (m_propBitsMask != 0) {
+    if ((m_propBits & TXTBIT_CHARFORMATCHANGE) == TXTBIT_CHARFORMATCHANGE)
+      m_recalculateContentVerticalOffset = true;
     DrawBlock db(*this);
     winrt::check_hresult(m_textServices->OnTxPropertyBitsChange(m_propBitsMask, m_propBits));
     m_propBitsMask = 0;
@@ -1422,6 +1444,10 @@ void WindowsTextInputComponentView::InternalFinalize() noexcept {
   if (m_mounted) {
     UpdatePropertyBits();
 
+    if (m_recalculateContentVerticalOffset) {
+      calculateContentVerticalOffset();
+    }
+
     ensureDrawingSurface();
     if (m_needsRedraw) {
       DrawText();
@@ -1483,12 +1509,6 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
   //    m_crText = RemoveAlpha(fontDetails.FontColor);
   //  }
 
-  // set font face
-  // cfNew.dwMask |= CFM_FACE;
-  // NetUIWzCchCopy(cfNew.szFaceName, _countof(cfNew.szFaceName), fontDetails.FontName.c_str());
-  // cfNew.bPitchAndFamily = FF_DONTCARE;
-
-  // set font size -- 15 to convert twips to pt
   const auto &props = windowsTextInputProps();
   float fontSize =
       (std::isnan(props.textAttributes.fontSize) ? facebook::react::TextAttributes::defaultTextAttributes().fontSize
@@ -1499,8 +1519,8 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
   fontSize *=
       (maxFontSizeMultiplier >= 1.0f) ? std::min(maxFontSizeMultiplier, m_fontSizeMultiplier) : m_fontSizeMultiplier;
 
-  // TODO get fontSize from props.textAttributes, or defaultTextAttributes, or fragment?
   cfNew.dwMask |= CFM_SIZE;
+  // set font size -- 15 to convert twips to pt
   cfNew.yHeight = static_cast<LONG>(fontSize * 15);
 
   // set bold
@@ -1508,18 +1528,26 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
   cfNew.wWeight =
       props.textAttributes.fontWeight ? static_cast<WORD>(*props.textAttributes.fontWeight) : DWRITE_FONT_WEIGHT_NORMAL;
 
-  // set font style
-  // cfNew.dwMask |= (CFM_ITALIC | CFM_STRIKEOUT | CFM_UNDERLINE);
-  // int dFontStyle = fontDetails.FontStyle;
-  // if (dFontStyle & FS_Italic) {
-  //    cfNew.dwEffects |= CFE_ITALIC;
-  //  }
-  //  if (dFontStyle & FS_StrikeOut) {
-  // cfNew.dwEffects |= CFE_STRIKEOUT;
-  //}
-  // if (dFontStyle & FS_Underline) {
-  //    cfNew.dwEffects |= CFE_UNDERLINE;
-  //  }
+  // set font style (italic)
+  cfNew.dwMask |= CFM_ITALIC;
+  if (props.textAttributes.fontStyle == facebook::react::FontStyle::Italic ||
+      props.textAttributes.fontStyle == facebook::react::FontStyle::Oblique) {
+    cfNew.dwEffects |= CFE_ITALIC;
+  }
+
+  // set text decoration (underline and strikethrough)
+  cfNew.dwMask |= (CFM_UNDERLINE | CFM_STRIKEOUT);
+  if (props.textAttributes.textDecorationLineType.has_value()) {
+    auto decorationType = *props.textAttributes.textDecorationLineType;
+    if (decorationType == facebook::react::TextDecorationLineType::Underline ||
+        decorationType == facebook::react::TextDecorationLineType::UnderlineStrikethrough) {
+      cfNew.dwEffects |= CFE_UNDERLINE;
+    }
+    if (decorationType == facebook::react::TextDecorationLineType::Strikethrough ||
+        decorationType == facebook::react::TextDecorationLineType::UnderlineStrikethrough) {
+      cfNew.dwEffects |= CFE_STRIKEOUT;
+    }
+  }
 
   // set font family
   if (!props.textAttributes.fontFamily.empty()) {
@@ -1527,7 +1555,11 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
     std::wstring fontFamily =
         std::wstring(props.textAttributes.fontFamily.begin(), props.textAttributes.fontFamily.end());
     wcsncpy_s(cfNew.szFaceName, fontFamily.c_str(), LF_FACESIZE);
+  } else {
+    cfNew.dwMask |= CFM_FACE;
+    wcsncpy_s(cfNew.szFaceName, L"Segoe UI\0", LF_FACESIZE);
   }
+  cfNew.bPitchAndFamily = FF_DONTCARE;
 
   // set char offset
   cfNew.dwMask |= CFM_OFFSET;
@@ -1536,7 +1568,8 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
   // set letter spacing
   float letterSpacing = props.textAttributes.letterSpacing;
   if (!std::isnan(letterSpacing)) {
-    updateLetterSpacing(letterSpacing);
+    cfNew.dwMask |= CFM_SPACING;
+    cfNew.sSpacing = static_cast<SHORT>(letterSpacing * 20); // Convert to TWIPS
   }
 
   // set charset
@@ -1652,7 +1685,7 @@ winrt::com_ptr<::IDWriteTextLayout> WindowsTextInputComponentView::CreatePlaceho
   const auto &props = windowsTextInputProps();
   facebook::react::TextAttributes textAttributes = props.textAttributes;
   if (std::isnan(props.textAttributes.fontSize)) {
-    textAttributes.fontSize = 12.0f;
+    facebook::react::TextAttributes::defaultTextAttributes().fontSize;
   }
   textAttributes.fontSizeMultiplier = m_fontSizeMultiplier;
   fragment1.string = props.placeholder;
@@ -1669,6 +1702,26 @@ winrt::com_ptr<::IDWriteTextLayout> WindowsTextInputComponentView::CreatePlaceho
   return textLayout;
 }
 
+void WindowsTextInputComponentView::calculateContentVerticalOffset() noexcept {
+  m_recalculateContentVerticalOffset = false;
+
+  const auto &props = windowsTextInputProps();
+
+  m_contentOffsetPx = {
+      static_cast<LONG>(m_layoutMetrics.contentInsets.left * m_layoutMetrics.pointScaleFactor),
+      static_cast<LONG>(m_layoutMetrics.contentInsets.top * m_layoutMetrics.pointScaleFactor)};
+
+  if (props.multiline) {
+    // Align to the top for multiline
+    return;
+  }
+
+  auto [contentWidth, contentHeight] = GetContentSize();
+
+  m_contentOffsetPx.y += static_cast<LONG>(std::round(
+      ((m_layoutMetrics.getContentFrame().size.height - contentHeight) / 2) * m_layoutMetrics.pointScaleFactor));
+}
+
 void WindowsTextInputComponentView::DrawText() noexcept {
   m_needsRedraw = true;
   if (m_cDrawBlock || theme()->IsEmpty() || !m_textServices) {
@@ -1676,7 +1729,8 @@ void WindowsTextInputComponentView::DrawText() noexcept {
   }
 
   bool isZeroSized =
-      m_layoutMetrics.frame.size.width <= (m_layoutMetrics.contentInsets.left + m_layoutMetrics.contentInsets.right);
+      m_layoutMetrics.frame.size.width <= (m_layoutMetrics.contentInsets.left + m_layoutMetrics.contentInsets.right) ||
+      m_layoutMetrics.frame.size.height <= (m_layoutMetrics.contentInsets.top + m_layoutMetrics.contentInsets.bottom);
   if (!m_drawingSurface || isZeroSized)
     return;
 
@@ -1693,16 +1747,13 @@ void WindowsTextInputComponentView::DrawText() noexcept {
       assert(d2dDeviceContext->GetUnitMode() == D2D1_UNIT_MODE_DIPS);
 
       RECTL rc{
-          static_cast<LONG>(offset.x),
-          static_cast<LONG>(offset.y),
-          static_cast<LONG>(offset.x) + static_cast<LONG>(m_imgWidth),
-          static_cast<LONG>(offset.y) + static_cast<LONG>(m_imgHeight)};
+          offset.x + m_contentOffsetPx.x,
+          offset.y + m_contentOffsetPx.y,
+          offset.x + m_contentOffsetPx.x + static_cast<LONG>(m_imgWidth),
+          offset.y + m_contentOffsetPx.y + static_cast<LONG>(m_imgHeight)};
 
       RECT rcClient{
-          static_cast<LONG>(offset.x),
-          static_cast<LONG>(offset.y),
-          static_cast<LONG>(offset.x) + static_cast<LONG>(m_imgWidth),
-          static_cast<LONG>(offset.y) + static_cast<LONG>(m_imgHeight)};
+          offset.x, offset.y, offset.x + static_cast<LONG>(m_imgWidth), offset.y + static_cast<LONG>(m_imgHeight)};
 
       {
         m_cDrawBlock++; // Dont use AutoDrawBlock as we are already in draw, and dont need to draw again.
@@ -1757,8 +1808,8 @@ void WindowsTextInputComponentView::DrawText() noexcept {
         // draw text
         d2dDeviceContext->DrawTextLayout(
             D2D1::Point2F(
-                static_cast<FLOAT>((offset.x + m_layoutMetrics.contentInsets.left) / m_layoutMetrics.pointScaleFactor),
-                static_cast<FLOAT>((offset.y + m_layoutMetrics.contentInsets.top) / m_layoutMetrics.pointScaleFactor)),
+                static_cast<FLOAT>(offset.x + m_contentOffsetPx.x) / m_layoutMetrics.pointScaleFactor,
+                static_cast<FLOAT>(offset.y + m_contentOffsetPx.y) / m_layoutMetrics.pointScaleFactor),
             textLayout.get(),
             brush.get(),
             D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT);
@@ -1834,22 +1885,6 @@ void WindowsTextInputComponentView::autoCapitalizeOnUpdateProps(
   }
 }
 
-void WindowsTextInputComponentView::updateLetterSpacing(float letterSpacing) noexcept {
-  CHARFORMAT2W cf = {};
-  cf.cbSize = sizeof(CHARFORMAT2W);
-  cf.dwMask = CFM_SPACING;
-  cf.sSpacing = static_cast<SHORT>(letterSpacing * 20); // Convert to TWIPS
-
-  LRESULT res;
-
-  // Apply to all existing text like placeholder
-  winrt::check_hresult(m_textServices->TxSendMessage(EM_SETCHARFORMAT, SCF_ALL, reinterpret_cast<LPARAM>(&cf), &res));
-
-  // Apply to future text input
-  winrt::check_hresult(
-      m_textServices->TxSendMessage(EM_SETCHARFORMAT, SCF_SELECTION, reinterpret_cast<LPARAM>(&cf), &res));
-}
-
 void WindowsTextInputComponentView::updateAutoCorrect(bool enable) noexcept {
   LRESULT lresult;
   winrt::check_hresult(m_textServices->TxSendMessage(
@@ -1870,6 +1905,21 @@ void WindowsTextInputComponentView::updateSpellCheck(bool enable) noexcept {
       m_textServices->TxSendMessage(EM_SETLANGOPTIONS, IMF_SPELLCHECKING, enable ? newLangOptions : 0, &lresult));
 }
 
+void WindowsTextInputComponentView::OnContextMenuKey(
+    const winrt::Microsoft::ReactNative::Composition::Input::ContextMenuKeyEventArgs &args) noexcept {
+  // Handle context menu key event (SHIFT+F10 or Context Menu key)
+  if (!windowsTextInputProps().contextMenuHidden) {
+    // m_caretPosition is stored from TxSetCaretPos in RichEdit client rect space (physical pixels).
+    // LocalToScreen expects logical (DIP) coordinates, so divide by pointScaleFactor.
+    auto screenPt = LocalToScreen(winrt::Windows::Foundation::Point{
+        static_cast<float>(m_caretPosition.x) / m_layoutMetrics.pointScaleFactor,
+        static_cast<float>(m_caretPosition.y) / m_layoutMetrics.pointScaleFactor});
+    ShowContextMenu(screenPt);
+    args.Handled(true);
+  }
+  // If contextMenuHidden, don't mark as handled - let app handle it
+}
+
 void WindowsTextInputComponentView::ShowContextMenu(const winrt::Windows::Foundation::Point &position) noexcept {
   HMENU menu = CreatePopupMenu();
   if (!menu)
@@ -1889,13 +1939,16 @@ void WindowsTextInputComponentView::ShowContextMenu(const winrt::Windows::Founda
   AppendMenuW(menu, MF_STRING | (canPaste ? 0 : MF_GRAYED), 3, L"Paste");
   AppendMenuW(menu, MF_STRING | (!isEmpty && !isReadOnly ? 0 : MF_GRAYED), 4, L"Select All");
 
-  POINT cursorPos;
-  GetCursorPos(&cursorPos);
-
   HWND hwnd = GetActiveWindow();
 
   int cmd = TrackPopupMenu(
-      menu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_NONOTIFY, cursorPos.x, cursorPos.y, 0, hwnd, NULL);
+      menu,
+      TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_NONOTIFY,
+      static_cast<int>(position.X),
+      static_cast<int>(position.Y),
+      0,
+      hwnd,
+      NULL);
 
   if (cmd == 1) { // Cut
     m_textServices->TxSendMessage(WM_CUT, 0, 0, &res);

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

@@ -67,6 +67,8 @@ struct WindowsTextInputComponentView
   void OnKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
   void OnCharacterReceived(const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs
                                &args) noexcept override;
+  void OnContextMenuKey(
+      const winrt::Microsoft::ReactNative::Composition::Input::ContextMenuKeyEventArgs &args) noexcept override;
   void onMounted() noexcept override;
 
   std::optional<std::string> getAccessiblityValue() noexcept override;
@@ -115,10 +117,10 @@ struct WindowsTextInputComponentView
       const std::string &previousCapitalizationType,
       const std::string &newcapitalizationType) noexcept;
 
-  void updateLetterSpacing(float letterSpacing) noexcept;
   void updateAutoCorrect(bool value) noexcept;
   void updateSpellCheck(bool value) noexcept;
   void ShowContextMenu(const winrt::Windows::Foundation::Point &position) noexcept;
+  void calculateContentVerticalOffset() noexcept;
 
   winrt::Windows::UI::Composition::CompositionSurfaceBrush m_brush{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual m_caretVisual{nullptr};
@@ -143,9 +145,13 @@ struct WindowsTextInputComponentView
   bool m_hasFocus{false};
   bool m_clearTextOnSubmit{false};
   bool m_multiline{false};
+  LONG m_contentVerticalOffsetPx{0}; // Used to center single line text within the client rect
+  bool m_recalculateContentVerticalOffset{true};
+  POINT m_contentOffsetPx{0, 0};
   DWORD m_propBitsMask{0};
   DWORD m_propBits{0};
   HCURSOR m_hcursor{nullptr};
+  POINT m_caretPosition{0, 0};
   std::chrono::steady_clock::time_point m_lastClickTime{};
   std::vector<facebook::react::CompWindowsTextInputSubmitKeyEventsStruct> m_submitKeyEvents;
 };

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

@@ -5,6 +5,7 @@
 
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
+#include <react/renderer/attributedstring/PlaceholderAttributedString.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextShadowNode.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -185,6 +186,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(cons
   const auto &props = getConcreteProps();
 
   AttributedString attributedString;
+  attributedString.setBaseTextAttributes(props.textAttributes);
   //[windows
   if (!props.placeholder.empty()) {
     auto textAttributes = TextAttributes::defaultTextAttributes();
@@ -203,7 +205,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(cons
   }
   // windows]
 
-  return attributedString;
+  return ensurePlaceholderIfEmpty_DO_NOT_USE(attributedString);
 }
 
 #pragma mark - LayoutableShadowNode

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

@@ -96,7 +96,10 @@ void WindowsTextLayoutManager::GetTextLayout(
 
   winrt::com_ptr<IDWriteTextFormat> spTextFormat;
 
-  float fontSizeText = outerFragment.textAttributes.fontSize;
+  float fontSizeText =
+      (std::isnan(outerFragment.textAttributes.fontSize)
+           ? facebook::react::TextAttributes::defaultTextAttributes().fontSize
+           : outerFragment.textAttributes.fontSize);
   if (outerFragment.textAttributes.allowFontScaling.value_or(true) &&
       !std::isnan(outerFragment.textAttributes.fontSizeMultiplier)) {
     float maxFontSizeMultiplierText = cDefaultMaxFontSizeMultiplier;
@@ -287,7 +290,9 @@ void WindowsTextLayoutManager::GetTextLayout(
       maxFontSizeMultiplier =
           (!std::isnan(attributes.maxFontSizeMultiplier) ? attributes.maxFontSizeMultiplier
                                                          : cDefaultMaxFontSizeMultiplier);
-      float fontSize = attributes.fontSize;
+      float fontSize =
+          (std::isnan(attributes.fontSize) ? facebook::react::TextAttributes::defaultTextAttributes().fontSize
+                                           : attributes.fontSize);
       if (attributes.allowFontScaling.value_or(true) && (!std::isnan(attributes.fontSizeMultiplier))) {
         fontSize *= (maxFontSizeMultiplier >= 1.0f) ? std::min(maxFontSizeMultiplier, attributes.fontSizeMultiplier)
                                                     : attributes.fontSizeMultiplier;