react-native-windows 0.75.4 → 0.76.0-preview.2

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

@@ -56,14 +56,14 @@ void SwitchComponentView::UnmountChildComponentView(
   base_type::UnmountChildComponentView(childComponentView, index);
 }
 
-void SwitchComponentView::HandleCommand(
-    winrt::hstring commandName,
-    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+void SwitchComponentView::HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept {
+  Super::HandleCommand(args);
+  if (args.Handled())
+    return;
+  auto commandName = args.CommandName();
   if (commandName == L"setValue") {
     // TODO - Current implementation always aligns with JS value
     // This will be needed when we move to using WinUI controls
-  } else {
-    Super::HandleCommand(commandName, args);
   }
 }
 
@@ -261,7 +261,7 @@ void SwitchComponentView::OnPointerPressed(
     m_supressAnimationForNextFrame = true;
 
     if (auto root = rootComponentView()) {
-      root->TrySetFocusedComponent(*get_strong());
+      root->TrySetFocusedComponent(*get_strong(), winrt::Microsoft::ReactNative::FocusNavigationDirection::None);
     }
 
     updateVisuals();

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

@@ -27,8 +27,7 @@ struct SwitchComponentView : SwitchComponentViewT<SwitchComponentView, ViewCompo
   void UnmountChildComponentView(
       const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
       uint32_t index) noexcept override;
-  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
-      override;
+  void HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept override;
   void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) noexcept
       override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept

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

@@ -176,9 +176,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
       return false;
     }
 
-    m_outer->m_caretVisual.Position(
-        {x - (m_outer->m_layoutMetrics.frame.origin.x * m_outer->m_layoutMetrics.pointScaleFactor),
-         y - (m_outer->m_layoutMetrics.frame.origin.y * m_outer->m_layoutMetrics.pointScaleFactor)});
+    auto pt = m_outer->getClientOffset();
+    m_outer->m_caretVisual.Position({x - pt.x, y - pt.y});
     return true;
   }
 
@@ -225,7 +224,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
     winrt::Microsoft::ReactNative::ComponentView view{nullptr};
     winrt::check_hresult(
         m_outer->QueryInterface(winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(view)));
-    m_outer->rootComponentView()->TrySetFocusedComponent(view);
+    m_outer->rootComponentView()->TrySetFocusedComponent(
+        view, winrt::Microsoft::ReactNative::FocusNavigationDirection::None);
     // assert(false);
     // TODO focus
   }
@@ -261,7 +261,7 @@ 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->m_rcClient;
+    *prc = m_outer->getClientRect();
     return S_OK;
   }
 
@@ -454,6 +454,7 @@ facebook::react::AttributedString WindowsTextInputComponentView::getAttributedSt
   // Use BaseTextShadowNode to get attributed string from children
 
   auto childTextAttributes = facebook::react::TextAttributes::defaultTextAttributes();
+  childTextAttributes.fontSizeMultiplier = m_fontSizeMultiplier;
 
   childTextAttributes.apply(windowsTextInputProps().textAttributes);
 
@@ -463,9 +464,9 @@ facebook::react::AttributedString WindowsTextInputComponentView::getAttributedSt
   // BaseTextShadowNode only gets children. We must detect and prepend text
   // value attributes manually.
   auto text = GetTextFromRichEdit();
-  // if (!m_props->text.empty()) {
   if (!text.empty()) {
     auto textAttributes = facebook::react::TextAttributes::defaultTextAttributes();
+    textAttributes.fontSizeMultiplier = m_fontSizeMultiplier;
     textAttributes.apply(windowsTextInputProps().textAttributes);
     auto fragment = facebook::react::AttributedString::Fragment{};
     fragment.string = text;
@@ -491,66 +492,41 @@ WindowsTextInputComponentView::WindowsTextInputComponentView(
           compContext,
           tag,
           reactContext,
-          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background) {
-  /*
-  m_textChangedRevoker =
-      m_element.TextChanged(winrt::auto_revoke, [this](auto sender, xaml::Controls::TextChangedEventArgs args) {
-        auto data = m_state->getData();
-        data.attributedString = getAttributedString();
-        data.mostRecentEventCount = m_nativeEventCount;
-        m_state->updateState(std::move(data));
-
-        if (m_eventEmitter && !m_comingFromJS) {
-          auto emitter = std::static_pointer_cast<const facebook::react::WindowsTextInputEventEmitter>(m_eventEmitter);
-          facebook::react::WindowsTextInputEventEmitter::OnChange onChangeArgs;
-          onChangeArgs.text = winrt::to_string(m_element.Text());
-          onChangeArgs.eventCount = ++m_nativeEventCount;
-          emitter->onChange(onChangeArgs);
-        }
-      });
-
-  m_SelectionChangedRevoker = m_element.SelectionChanged(winrt::auto_revoke, [this](auto sender, auto args) {
-    if (m_eventEmitter) {
-      auto emitter = std::static_pointer_cast<const facebook::react::WindowsTextInputEventEmitter>(m_eventEmitter);
-      facebook::react::WindowsTextInputEventEmitter::OnSelectionChange onSelectionChangeArgs;
-      onSelectionChangeArgs.selection.start = m_element.SelectionStart();
-      onSelectionChangeArgs.selection.end = m_element.SelectionStart() + m_element.SelectionLength();
-      emitter->onSelectionChange(onSelectionChangeArgs);
-    }
-  });
-  */
-}
+          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background) {}
 
 void WindowsTextInputComponentView::HandleCommand(
-    winrt::hstring commandName,
-    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+    const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept {
+  Super::HandleCommand(args);
+  if (args.Handled())
+    return;
+
+  auto commandName = args.CommandName();
   if (commandName == L"setTextAndSelection") {
     int eventCount, begin, end;
-    winrt::hstring text;
+    std::optional<winrt::hstring> text;
 
-    winrt::Microsoft::ReactNative::ReadArgs(args, eventCount, text, begin, end);
+    winrt::Microsoft::ReactNative::ReadArgs(args.CommandArgs(), eventCount, text, begin, end);
     if (eventCount >= m_nativeEventCount) {
       m_comingFromJS = true;
-      UpdateText(winrt::to_string(text));
-
-      SELCHANGE sc;
-      memset(&sc, 0, sizeof(sc));
-      sc.chrg.cpMin = static_cast<LONG>(begin);
-      sc.chrg.cpMax = static_cast<LONG>(end);
-      sc.seltyp = (begin == end) ? SEL_EMPTY : SEL_TEXT;
-
-      LRESULT res;
-      /*
-      winrt::check_hresult(m_textServices->TxSendMessage(
-          EM_SELCHANGE, 0 , reinterpret_cast<WPARAM>(&sc), &res));
-          */
-      winrt::check_hresult(
-          m_textServices->TxSendMessage(EM_SETSEL, static_cast<WPARAM>(begin), static_cast<LPARAM>(end), &res));
+      {
+        if (text.has_value()) {
+          DrawBlock db(*this);
+          UpdateText(winrt::to_string(text.value()));
+        }
+
+        SELCHANGE sc;
+        memset(&sc, 0, sizeof(sc));
+        sc.chrg.cpMin = static_cast<LONG>(begin);
+        sc.chrg.cpMax = static_cast<LONG>(end);
+        sc.seltyp = (begin == end) ? SEL_EMPTY : SEL_TEXT;
+
+        LRESULT res;
+        winrt::check_hresult(
+            m_textServices->TxSendMessage(EM_SETSEL, static_cast<WPARAM>(begin), static_cast<LPARAM>(end), &res));
+      }
 
       m_comingFromJS = false;
     }
-  } else {
-    Super::HandleCommand(commandName, args);
   }
 }
 
@@ -986,37 +962,35 @@ void WindowsTextInputComponentView::updateProps(
       *std::static_pointer_cast<const facebook::react::WindowsTextInputProps>(oldProps ? oldProps : viewProps());
   const auto &newTextInputProps = *std::static_pointer_cast<const facebook::react::WindowsTextInputProps>(props);
 
-  DWORD propBitsMask = 0;
-  DWORD propBits = 0;
-
   Super::updateProps(props, oldProps);
 
   if (!facebook::react::floatEquality(
           oldTextInputProps.textAttributes.fontSize, newTextInputProps.textAttributes.fontSize) ||
+      (oldTextInputProps.textAttributes.allowFontScaling != newTextInputProps.textAttributes.allowFontScaling) ||
       oldTextInputProps.textAttributes.fontWeight != newTextInputProps.textAttributes.fontWeight) {
-    propBitsMask |= TXTBIT_CHARFORMATCHANGE;
-    propBits |= TXTBIT_CHARFORMATCHANGE;
+    m_propBitsMask |= TXTBIT_CHARFORMATCHANGE;
+    m_propBits |= TXTBIT_CHARFORMATCHANGE;
   }
 
   if (oldTextInputProps.secureTextEntry != newTextInputProps.secureTextEntry) {
-    propBitsMask |= TXTBIT_USEPASSWORD;
+    m_propBitsMask |= TXTBIT_USEPASSWORD;
     if (newTextInputProps.secureTextEntry) {
-      propBits |= TXTBIT_USEPASSWORD;
+      m_propBits |= TXTBIT_USEPASSWORD;
     }
   }
 
   if (oldTextInputProps.multiline != newTextInputProps.multiline) {
     m_multiline = newTextInputProps.multiline;
-    propBitsMask |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
+    m_propBitsMask |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
     if (newTextInputProps.multiline) {
-      propBits |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
+      m_propBits |= TXTBIT_MULTILINE | TXTBIT_WORDWRAP;
     }
   }
 
   if (oldTextInputProps.editable != newTextInputProps.editable) {
-    propBitsMask |= TXTBIT_READONLY;
+    m_propBitsMask |= TXTBIT_READONLY;
     if (!newTextInputProps.editable) {
-      propBits |= TXTBIT_READONLY;
+      m_propBits |= TXTBIT_READONLY;
     }
   }
 
@@ -1048,62 +1022,7 @@ void WindowsTextInputComponentView::updateProps(
     m_submitKeyEvents.clear();
   }
 
-  /*
-  if (oldTextInputProps.textAttributes.foregroundColor != newTextInputProps.textAttributes.foregroundColor) {
-    if (newTextInputProps.textAttributes.foregroundColor)
-      m_element.Foreground(newTextInputProps.textAttributes.foregroundColor.AsWindowsBrush());
-    else
-      m_element.ClearValue(::xaml::Controls::TextBlock::ForegroundProperty());
-  }
-
-  if (oldTextInputProps.textAttributes.fontStyle != newTextInputProps.textAttributes.fontStyle) {
-    switch (newTextInputProps.textAttributes.fontStyle.value_or(facebook::react::FontStyle::Normal)) {
-      case facebook::react::FontStyle::Italic:
-        m_element.FontStyle(winrt::Windows::UI::Text::FontStyle::Italic);
-        break;
-      case facebook::react::FontStyle::Normal:
-        m_element.FontStyle(winrt::Windows::UI::Text::FontStyle::Normal);
-        break;
-      case facebook::react::FontStyle::Oblique:
-        m_element.FontStyle(winrt::Windows::UI::Text::FontStyle::Oblique);
-        break;
-      default:
-        assert(false);
-    }
-  }
-
-  if (oldTextInputProps.textAttributes.fontFamily != newTextInputProps.textAttributes.fontFamily) {
-    if (newTextInputProps.textAttributes.fontFamily.empty())
-      m_element.FontFamily(xaml::Media::FontFamily(L"Segoe UI"));
-    else
-      m_element.FontFamily(xaml::Media::FontFamily(
-          Microsoft::Common::Unicode::Utf8ToUtf16(newTextInputProps.textAttributes.fontFamily)));
-  }
-
-  if (oldTextInputProps.allowFontScaling != newTextInputProps.allowFontScaling) {
-    m_element.IsTextScaleFactorEnabled(newTextInputProps.allowFontScaling);
-  }
-
-  if (oldTextInputProps.selection.start != newTextInputProps.selection.start ||
-      oldTextInputProps.selection.end != newTextInputProps.selection.end) {
-    m_element.Select(
-        newTextInputProps.selection.start, newTextInputProps.selection.end - newTextInputProps.selection.start);
-  }
-
-  if (oldTextInputProps.autoCapitalize != newTextInputProps.autoCapitalize) {
-    if (newTextInputProps.autoCapitalize == "characters") {
-      m_element.CharacterCasing(xaml::Controls::CharacterCasing::Upper);
-    } else { // anything else turns off autoCap (should be "None" but
-             // we don't support "words"/"sentences" yet)
-      m_element.CharacterCasing(xaml::Controls::CharacterCasing::Normal);
-    }
-  }
-  */
-
-  if (propBitsMask != 0) {
-    DrawBlock db(*this);
-    winrt::check_hresult(m_textServices->OnTxPropertyBitsChange(propBitsMask, propBits));
-  }
+  UpdatePropertyBits();
 }
 
 void WindowsTextInputComponentView::updateState(
@@ -1113,7 +1032,6 @@ void WindowsTextInputComponentView::updateState(
 
   if (!m_state) {
     assert(false && "State is `null` for <TextInput> component.");
-    // m_element.Text(L"");
     return;
   }
 
@@ -1121,14 +1039,19 @@ void WindowsTextInputComponentView::updateState(
     m_mostRecentEventCount = m_state->getData().mostRecentEventCount;
   }
 
+  if (auto root = rootComponentView()) {
+    auto fontSizeMultiplier = root->FontSizeMultiplier();
+    if (fontSizeMultiplier != m_fontSizeMultiplier) {
+      fontSizeMultiplier = m_fontSizeMultiplier;
+      m_propBitsMask |= TXTBIT_CHARFORMATCHANGE;
+      m_propBits |= TXTBIT_CHARFORMATCHANGE;
+    }
+  }
+
   if (m_mostRecentEventCount == m_state->getData().mostRecentEventCount) {
     m_comingFromState = true;
-    // Only handle single/empty fragments right now -- ignore the other fragments
-
-    UpdateText(
-        m_state->getData().attributedString.getFragments().size()
-            ? m_state->getData().attributedString.getFragments()[0].string
-            : "");
+    auto &fragments = m_state->getData().attributedString.getFragments();
+    UpdateText(fragments.size() ? fragments[0].string : "");
 
     m_comingFromState = false;
   }
@@ -1243,13 +1166,42 @@ std::string WindowsTextInputComponentView::GetTextFromRichEdit() const noexcept
 void WindowsTextInputComponentView::FinalizeUpdates(
     winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   Super::FinalizeUpdates(updateMask);
-  ensureDrawingSurface();
-  if (m_needsRedraw) {
-    DrawText();
+  InternalFinalize();
+}
+
+void WindowsTextInputComponentView::UpdatePropertyBits() noexcept {
+  if (m_propBitsMask != 0) {
+    DrawBlock db(*this);
+    winrt::check_hresult(m_textServices->OnTxPropertyBitsChange(m_propBitsMask, m_propBits));
+    m_propBitsMask = 0;
+    m_propBits = 0;
   }
 }
 
-std::optional<std::string> WindowsTextInputComponentView::getAcccessiblityValue() noexcept {
+void WindowsTextInputComponentView::InternalFinalize() noexcept {
+  if (m_mounted) {
+    UpdatePropertyBits();
+
+    ensureDrawingSurface();
+    if (m_needsRedraw) {
+      DrawText();
+    }
+  }
+}
+
+void WindowsTextInputComponentView::onMounted() noexcept {
+  Super::onMounted();
+
+  auto fontSizeMultiplier = rootComponentView()->FontSizeMultiplier();
+  if (m_fontSizeMultiplier != fontSizeMultiplier) {
+    m_fontSizeMultiplier = fontSizeMultiplier;
+    m_propBitsMask |= TXTBIT_CHARFORMATCHANGE;
+    m_propBits |= TXTBIT_CHARFORMATCHANGE;
+  }
+  InternalFinalize();
+}
+
+std::optional<std::string> WindowsTextInputComponentView::getAccessiblityValue() noexcept {
   return GetTextFromRichEdit();
 }
 
@@ -1291,9 +1243,9 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
 
   // set font size -- 15 to convert twips to pt
   const auto &props = windowsTextInputProps();
-  float fontSize = props.textAttributes.fontSize;
-  if (std::isnan(fontSize))
-    fontSize = facebook::react::TextAttributes::defaultTextAttributes().fontSize;
+  float fontSize = m_fontSizeMultiplier *
+      (std::isnan(props.textAttributes.fontSize) ? facebook::react::TextAttributes::defaultTextAttributes().fontSize
+                                                 : props.textAttributes.fontSize);
   // TODO get fontSize from props.textAttributes, or defaultTextAttributes, or fragment?
   cfNew.dwMask |= CFM_SIZE;
   cfNew.yHeight = static_cast<LONG>(fontSize * 15);
@@ -1360,8 +1312,8 @@ void WindowsTextInputComponentView::ensureDrawingSurface() noexcept {
         winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
         winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
 
-    m_rcClient = getClientRect();
-    winrt::check_hresult(m_textServices->OnTxInPlaceActivate(&m_rcClient));
+    auto rc = getClientRect();
+    winrt::check_hresult(m_textServices->OnTxInPlaceActivate(&rc));
 
     LRESULT lresult;
     winrt::check_hresult(
@@ -1391,6 +1343,7 @@ winrt::com_ptr<::IDWriteTextLayout> WindowsTextInputComponentView::CreatePlaceho
   if (std::isnan(props.textAttributes.fontSize)) {
     textAttributes.fontSize = 12.0f;
   }
+  textAttributes.fontSizeMultiplier = m_fontSizeMultiplier;
   fragment1.string = props.placeholder;
   fragment1.textAttributes = textAttributes;
   attributedString.appendFragment(fragment1);
@@ -1440,7 +1393,11 @@ void WindowsTextInputComponentView::DrawText() noexcept {
           static_cast<LONG>(offset.x) + static_cast<LONG>(m_imgWidth),
           static_cast<LONG>(offset.y) + static_cast<LONG>(m_imgHeight)};
 
-      winrt::check_hresult(m_textServices->OnTxInPlaceActivate(&rcClient));
+      {
+        m_cDrawBlock++; // Dont use AutoDrawBlock as we are already in draw, and dont need to draw again.
+        winrt::check_hresult(m_textServices->OnTxInPlaceActivate(&rcClient));
+        m_cDrawBlock--;
+      }
 
       const auto &props = windowsTextInputProps();
       if (facebook::react::isColorMeaningful(props.backgroundColor)) {

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

@@ -46,8 +46,7 @@ struct WindowsTextInputComponentView
   void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
   static facebook::react::SharedViewProps defaultProps() noexcept;
   const facebook::react::WindowsTextInputProps &windowsTextInputProps() const noexcept;
-  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
-      override;
+  void HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept override;
   void OnRenderingDeviceLost() noexcept override;
   void onLostFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
   void onGotFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
@@ -66,8 +65,9 @@ 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 onMounted() noexcept override;
 
-  std::optional<std::string> getAcccessiblityValue() noexcept override;
+  std::optional<std::string> getAccessiblityValue() noexcept override;
   void setAcccessiblityValue(std::string &&value) noexcept override;
   bool getAcccessiblityIsReadOnly() noexcept override;
 
@@ -101,6 +101,8 @@ struct WindowsTextInputComponentView
       const facebook::react::SharedColor &foregroundColor) noexcept;
   bool ShouldSubmit(
       const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept;
+  void InternalFinalize() noexcept;
+  void UpdatePropertyBits() noexcept;
 
   winrt::Windows::UI::Composition::CompositionSurfaceBrush m_brush{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual m_caretVisual{nullptr};
@@ -114,7 +116,7 @@ struct WindowsTextInputComponentView
   winrt::com_ptr<ITextServices2> m_textServices;
   unsigned int m_imgWidth{0}, m_imgHeight{0};
   std::shared_ptr<facebook::react::WindowsTextInputShadowNode::ConcreteState const> m_state;
-  RECT m_rcClient;
+  float m_fontSizeMultiplier{1.0};
   int64_t m_mostRecentEventCount{0};
   int m_nativeEventCount{0};
   bool m_comingFromJS{false};
@@ -124,6 +126,8 @@ struct WindowsTextInputComponentView
   bool m_drawing{false};
   bool m_clearTextOnSubmit{false};
   bool m_multiline{false};
+  DWORD m_propBitsMask{0};
+  DWORD m_propBits{0};
   std::vector<facebook::react::CompWindowsTextInputSubmitKeyEventsStruct> m_submitKeyEvents;
 };
 

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

@@ -23,12 +23,17 @@ void WindowsTextInputShadowNode::setContextContainer(ContextContainer *contextCo
   m_contextContainer = contextContainer;
 }
 
-AttributedString WindowsTextInputShadowNode::getAttributedString() const {
+AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutContext &layoutContext) const {
   // Use BaseTextShadowNode to get attributed string from children
 
   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
+  // shadow of the text which results in weird artifacts.
+  childTextAttributes.backgroundColor = HostPlatformColor::UndefinedColor;
 
   auto attributedString = AttributedString{};
   auto attachments = BaseTextShadowNode::Attachments{};
@@ -38,6 +43,7 @@ AttributedString WindowsTextInputShadowNode::getAttributedString() const {
   // value attributes manually.
   if (!getConcreteProps().text.empty()) {
     auto textAttributes = TextAttributes::defaultTextAttributes();
+    textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
     textAttributes.apply(getConcreteProps().textAttributes);
     auto fragment = AttributedString::Fragment{};
     fragment.string = getConcreteProps().text;
@@ -59,7 +65,7 @@ AttributedString WindowsTextInputShadowNode::getAttributedString() const {
 // display at all.
 // TODO T67606511: We will redefine the measurement of empty strings as part
 // of T67606511
-AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString() const {
+AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(const LayoutContext &layoutContext) const {
   // Return placeholder text, since text and children are empty.
   auto textAttributedString = AttributedString{};
   auto fragment = AttributedString::Fragment{};
@@ -70,6 +76,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString() co
   }
 
   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
@@ -86,10 +93,10 @@ void WindowsTextInputShadowNode::setTextLayoutManager(SharedTextLayoutManager te
   m_textLayoutManager = std::move(textLayoutManager);
 }
 
-AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString() const {
+AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString(const LayoutContext &layoutContext) const {
   const auto &state = getStateData();
 
-  auto reactTreeAttributedString = getAttributedString();
+  auto reactTreeAttributedString = getAttributedString(layoutContext);
 
   // Sometimes the treeAttributedString will only differ from the state
   // not by inherent properties (string or prop attributes), but by the frame of
@@ -101,10 +108,10 @@ AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString() con
   return (!treeAttributedStringChanged ? state.attributedString : reactTreeAttributedString);
 }
 
-void WindowsTextInputShadowNode::updateStateIfNeeded() {
+void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layoutContext) {
   ensureUnsealed();
 
-  auto reactTreeAttributedString = getAttributedString();
+  auto reactTreeAttributedString = getAttributedString(layoutContext);
   const auto &state = getStateData();
 
   // Tree is often out of sync with the value of the TextInput.
@@ -125,13 +132,13 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
   // in the AttributedString, and when State is updated, it needs some way to
   // reconstruct a Fragment with default TextAttributes.
   auto defaultTextAttributes = TextAttributes::defaultTextAttributes();
-
+  defaultTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
   defaultTextAttributes.apply(getConcreteProps().textAttributes);
 
   auto newEventCount = state.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
       ? 0
       : getConcreteProps().mostRecentEventCount;
-  auto newAttributedString = getMostRecentAttributedString();
+  auto newAttributedString = getMostRecentAttributedString(layoutContext);
 
   // Even if we're here and updating state, it may be only to update the layout
   // manager If that is the case, make sure we don't update text: pass in the
@@ -168,10 +175,10 @@ Size WindowsTextInputShadowNode::measureContent(
   // 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();
+  AttributedString attributedString = getMostRecentAttributedString(layoutContext);
 
   if (attributedString.isEmpty()) {
-    attributedString = getPlaceholderAttributedString();
+    attributedString = getPlaceholderAttributedString(layoutContext);
   }
 
   if (attributedString.isEmpty() && getStateData().mostRecentEventCount != 0) {
@@ -190,7 +197,7 @@ Size WindowsTextInputShadowNode::measureContent(
 }
 
 void WindowsTextInputShadowNode::layout(LayoutContext layoutContext) {
-  updateStateIfNeeded();
+  updateStateIfNeeded(layoutContext);
   ConcreteViewShadowNode::layout(layoutContext);
 }
 

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

@@ -31,6 +31,7 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::BaselineYogaNode);
     return traits;
   }
 
@@ -41,8 +42,8 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
   /*
    * Returns a `AttributedString` which represents text content of the node.
    */
-  AttributedString getAttributedString() const;
-  AttributedString getPlaceholderAttributedString() const;
+  AttributedString getAttributedString(const LayoutContext &layoutContext) const;
+  AttributedString getPlaceholderAttributedString(const LayoutContext &layoutContext) const;
 
   /*
    * Associates a shared TextLayoutManager with the node.
@@ -62,13 +63,13 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
   /**
    * Get the most up-to-date attributed string for measurement and State.
    */
-  AttributedString getMostRecentAttributedString() const;
+  AttributedString getMostRecentAttributedString(const LayoutContext &layoutContext) const;
 
   /*
    * Creates a `State` object (with `AttributedText` and
    * `TextLayoutManager`) if needed.
    */
-  void updateStateIfNeeded();
+  void updateStateIfNeeded(const LayoutContext &layoutContext);
 
   SharedTextLayoutManager m_textLayoutManager;
 

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

@@ -31,17 +31,4 @@ WindowsTextInputState::WindowsTextInputState(
       defaultThemePaddingTop(defaultThemePaddingTop),
       defaultThemePaddingBottom(defaultThemePaddingBottom) {}
 
-WindowsTextInputState::WindowsTextInputState(const WindowsTextInputState &previousState, const folly::dynamic &data)
-    : mostRecentEventCount(data.getDefault("mostRecentEventCount", previousState.mostRecentEventCount).getInt()),
-      cachedAttributedStringId(data.getDefault("opaqueCacheId", previousState.cachedAttributedStringId).getInt()),
-      attributedString(previousState.attributedString),
-      reactTreeAttributedString(previousState.reactTreeAttributedString),
-      paragraphAttributes(previousState.paragraphAttributes),
-      defaultThemePaddingStart(
-          data.getDefault("themePaddingStart", previousState.defaultThemePaddingStart).getDouble()),
-      defaultThemePaddingEnd(data.getDefault("themePaddingEnd", previousState.defaultThemePaddingEnd).getDouble()),
-      defaultThemePaddingTop(data.getDefault("themePaddingTop", previousState.defaultThemePaddingTop).getDouble()),
-      defaultThemePaddingBottom(
-          data.getDefault("themePaddingBottom", previousState.defaultThemePaddingBottom).getDouble()){};
-
 } // namespace facebook::react

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

@@ -66,9 +66,6 @@ class WindowsTextInputState final {
       double defaultThemePaddingBottom);
 
   WindowsTextInputState() = default;
-  WindowsTextInputState(const WindowsTextInputState &previousState, const folly::dynamic &data);
-  folly::dynamic getDynamic() const;
-  MapBuffer getMapBuffer() const;
 };
 
 } // namespace facebook::react