react-native-windows 0.81.37 → 0.81.40

package/Microsoft.ReactNative/Fabric/AbiComponentDescriptor.cpp

@@ -47,7 +47,9 @@ std::shared_ptr<facebook::react::ShadowNode> AbiComponentDescriptor::createShado
     facebook::react::ShadowNodeFamily::Shared const &family) const {
   auto shadowNode = std::make_shared<ShadowNodeT>(fragment, family, getTraits());
 
-  shadowNode->Proxy(winrt::make<winrt::Microsoft::ReactNative::implementation::ShadowNode>(shadowNode));
+  shadowNode->Proxy(
+      winrt::make<winrt::Microsoft::ReactNative::implementation::ShadowNode<::Microsoft::ReactNative::AbiStateData>>(
+          shadowNode));
   winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
       ->CreateShadowNode(shadowNode->Proxy());
 
@@ -60,7 +62,9 @@ std::shared_ptr<facebook::react::ShadowNode> AbiComponentDescriptor::cloneShadow
     const facebook::react::ShadowNodeFragment &fragment) const {
   auto shadowNode = std::make_shared<ShadowNodeT>(sourceShadowNode, fragment);
 
-  shadowNode->Proxy(winrt::make<winrt::Microsoft::ReactNative::implementation::ShadowNode>(shadowNode));
+  shadowNode->Proxy(
+      winrt::make<winrt::Microsoft::ReactNative::implementation::ShadowNode<::Microsoft::ReactNative::AbiStateData>>(
+          shadowNode));
   winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
       ->CloneShadowNode(shadowNode->Proxy(), static_cast<const ShadowNodeT &>(sourceShadowNode).Proxy());
 

package/Microsoft.ReactNative/Fabric/AbiShadowNode.cpp

@@ -6,7 +6,6 @@
 #include <Fabric/Composition/ReactCompositionViewComponentBuilder.h>
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/conversions.h>
-
 #include <utility>
 
 namespace winrt::Microsoft::ReactNative::implementation {
@@ -27,52 +26,6 @@ winrt::Microsoft::ReactNative::IComponentProps AbiProps::UserProps() const noexc
   return m_componentProps;
 }
 
-ShadowNode::ShadowNode(std::shared_ptr<const facebook::react::ShadowNode> shadowNode) noexcept
-    : m_shadowNode(shadowNode) {}
-
-void ShadowNode::EnsureUnsealed() noexcept {
-  if (auto shadowNode = m_shadowNode.lock()) {
-    shadowNode->ensureUnsealed();
-  }
-}
-
-winrt::Windows::Foundation::IInspectable ShadowNode::Tag() const noexcept {
-  return m_tag;
-}
-
-void ShadowNode::Tag(winrt::Windows::Foundation::IInspectable tag) noexcept {
-  m_tag = tag;
-}
-
-winrt::Windows::Foundation::IInspectable ShadowNode::StateData() const noexcept {
-  if (auto shadowNode = m_shadowNode.lock()) {
-    auto state = shadowNode->getState();
-    react_native_assert(state && "State must not be `nullptr`.");
-    auto abiStateData =
-        static_cast<const facebook::react::ConcreteState<::Microsoft::ReactNative::AbiStateData> *>(state.get())
-            ->getData();
-    return abiStateData.userdata;
-  }
-  return nullptr;
-}
-
-void ShadowNode::StateData(winrt::Windows::Foundation::IInspectable tag) noexcept {
-  if (auto shadowNode = m_shadowNode.lock()) {
-    shadowNode->ensureUnsealed();
-
-    auto &state = const_cast<facebook::react::State::Shared &>(shadowNode->getState());
-    state = std::make_shared<const facebook::react::ConcreteState<::Microsoft::ReactNative::AbiStateData>>(
-        std::make_shared<const ::Microsoft::ReactNative::AbiStateData>(tag), *state);
-  }
-}
-
-winrt::Microsoft::ReactNative::EventEmitter ShadowNode::EventEmitter() const noexcept {
-  if (auto shadowNode = m_shadowNode.lock()) {
-    return winrt::make<winrt::Microsoft::ReactNative::implementation::EventEmitter>(shadowNode->getEventEmitter());
-  }
-  return nullptr;
-}
-
 } // namespace winrt::Microsoft::ReactNative::implementation
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Fabric/AbiShadowNode.h

@@ -33,17 +33,49 @@ class AbiProps final : public facebook::react::Props {
   winrt::Microsoft::ReactNative::IComponentProps m_componentProps{nullptr};
 };
 
-struct ShadowNode : ShadowNodeT<ShadowNode> {
-  ShadowNode(std::shared_ptr<const facebook::react::ShadowNode> shadowNode) noexcept;
+template <typename TStateData>
+struct ShadowNode : ShadowNodeT<ShadowNode<TStateData>> {
+  ShadowNode(std::shared_ptr<const facebook::react::ShadowNode> shadowNode) noexcept : m_shadowNode(shadowNode) {}
+
+  void EnsureUnsealed() noexcept {
+    if (auto shadowNode = m_shadowNode.lock()) {
+      shadowNode->ensureUnsealed();
+    }
+  }
 
-  void EnsureUnsealed() noexcept;
-  winrt::Windows::Foundation::IInspectable Tag() const noexcept;
-  void Tag(winrt::Windows::Foundation::IInspectable tag) noexcept;
+  winrt::Windows::Foundation::IInspectable Tag() const noexcept {
+    return m_tag;
+  }
+  void Tag(winrt::Windows::Foundation::IInspectable tag) noexcept {
+    m_tag = tag;
+  }
 
-  winrt::Windows::Foundation::IInspectable StateData() const noexcept;
-  void StateData(winrt::Windows::Foundation::IInspectable tag) noexcept;
+  winrt::Windows::Foundation::IInspectable StateData() const noexcept {
+    if (auto shadowNode = m_shadowNode.lock()) {
+      auto state = shadowNode->getState();
+      auto abiStateData = static_cast<const facebook::react::ConcreteState<TStateData> *>(state.get())->getData();
+      return abiStateData.userdata;
+    }
+    return nullptr;
+  }
 
-  winrt::Microsoft::ReactNative::EventEmitter EventEmitter() const noexcept;
+  void StateData(winrt::Windows::Foundation::IInspectable tag) noexcept {
+    if (auto shadowNode = m_shadowNode.lock()) {
+      shadowNode->ensureUnsealed();
+      auto &state = const_cast<facebook::react::State::Shared &>(shadowNode->getState());
+      auto data = static_cast<const facebook::react::ConcreteState<TStateData> *>(state.get())->getData();
+      data.userdata = tag;
+      state = std::make_shared<const facebook::react::ConcreteState<TStateData>>(
+          std::make_shared<const TStateData>(std::move(data)), *state);
+    }
+  }
+
+  winrt::Microsoft::ReactNative::EventEmitter EventEmitter() const noexcept {
+    if (auto shadowNode = m_shadowNode.lock()) {
+      return winrt::make<winrt::Microsoft::ReactNative::implementation::EventEmitter>(shadowNode->getEventEmitter());
+    }
+    return nullptr;
+  }
 
  protected:
   std::weak_ptr<const facebook::react::ShadowNode> m_shadowNode;

package/Microsoft.ReactNative/Fabric/AbiState.h

@@ -11,22 +11,40 @@
 
 namespace Microsoft::ReactNative {
 
-class AbiStateData final {
+class AbiStateData {
  public:
   AbiStateData() = default;
   AbiStateData(winrt::Windows::Foundation::IInspectable data) : userdata(data) {}
   winrt::Windows::Foundation::IInspectable userdata;
 };
 
-struct AbiComponentState : winrt::implements<AbiComponentState, winrt::Microsoft::ReactNative::IComponentState> {
-  AbiComponentState(facebook::react::State::Shared const &state);
-
-  winrt::Windows::Foundation::IInspectable Data() noexcept;
-  void UpdateState(const winrt::Windows::Foundation::IInspectable &data) noexcept;
-  void UpdateStateWithMutation(const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept;
+template <typename TStateData /* = ::Microsoft::ReactNative::AbiStateData */>
+struct AbiComponentState
+    : winrt::implements<AbiComponentState<TStateData>, winrt::Microsoft::ReactNative::IComponentState> {
+  AbiComponentState(facebook::react::State::Shared const &state) {
+    m_state = std::static_pointer_cast<facebook::react::ConcreteState<TStateData> const>(state);
+  }
+
+  winrt::Windows::Foundation::IInspectable Data() noexcept {
+    return m_state->getData().userdata;
+  }
+  void UpdateState(const winrt::Windows::Foundation::IInspectable &data) noexcept {
+    m_state->updateState([data](const TStateData &oldData) {
+      auto newData = oldData;
+      newData.userdata = data;
+      return std::make_shared<TStateData const>(std::move(newData));
+    });
+  }
+  void UpdateStateWithMutation(const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept {
+    m_state->updateState([mutation](const TStateData &oldData) {
+      auto newData = oldData;
+      newData.userdata = mutation(oldData.userdata);
+      return std::make_shared<TStateData const>(std::move(newData));
+    });
+  }
 
  private:
-  std::shared_ptr<facebook::react::ConcreteState<AbiStateData> const> m_state;
+  std::shared_ptr<facebook::react::ConcreteState<TStateData> const> m_state;
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/AbiTextInputProps.h

@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "TextInputProps.g.h"
+
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/imagemanager/primitives.h>
+#include "Composition/TextInput/WindowsTextInputProps.h"
+#include "winrt/Microsoft.ReactNative.Composition.Experimental.h"
+#include "winrt/Microsoft.ReactNative.h"
+
+namespace Microsoft::ReactNative {
+
+class AbiTextInputProps final : public facebook::react::WindowsTextInputProps {
+ public:
+  AbiTextInputProps() = default;
+  AbiTextInputProps(
+      const facebook::react::PropsParserContext &context,
+      const AbiTextInputProps &sourceProps,
+      const facebook::react::RawProps &rawProps);
+  ~AbiTextInputProps();
+
+  void SetUserProps(
+      winrt::Microsoft::ReactNative::IComponentProps userProps,
+      winrt::Microsoft::ReactNative::ViewProps innerProps) noexcept;
+  winrt::Microsoft::ReactNative::IComponentProps UserProps() const noexcept;
+  winrt::Microsoft::ReactNative::ViewProps ViewProps() const noexcept;
+
+ private:
+  winrt::Microsoft::ReactNative::IComponentProps m_userProps{nullptr};
+  winrt::Microsoft::ReactNative::ViewProps m_innerProps{nullptr};
+};
+
+} // namespace Microsoft::ReactNative
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+struct TextInputProps : TextInputPropsT<TextInputProps, ViewProps> {
+  using Super = TextInputPropsT<TextInputProps, ViewProps>;
+  TextInputProps(facebook::react::SharedViewProps props, bool holdRef = true) noexcept;
+
+  winrt::hstring Placeholder() noexcept;
+  bool SecureTextEntry() noexcept;
+
+ protected:
+  const facebook::react::WindowsTextInputProps &windowsTextInputProps() const noexcept;
+};
+
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/AbiTextInputShadowNode.cpp

@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "AbiTextInputShadowNode.h"
+
+#include "AbiTextInputProps.h"
+
+namespace Microsoft::ReactNative {
+
+extern const char AbiTextInputComponentName[] = "AbiTextInput";
+
+facebook::react::Size AbiTextInputShadowNode::measureContent(
+    const facebook::react::LayoutContext &layoutContext,
+    const facebook::react::LayoutConstraints &layoutConstraints) const {
+  return Super::measureContent(layoutContext, layoutConstraints);
+}
+
+void AbiTextInputShadowNode::layout(facebook::react::LayoutContext layoutContext) {
+  Super::layout(layoutContext);
+}
+
+void AbiTextInputShadowNode::OnClone(const facebook::react::ShadowNode &sourceShadowNode) noexcept {
+  auto const &source = static_cast<AbiTextInputShadowNode const &>(sourceShadowNode);
+  m_proxy = source.m_proxy;
+  m_builder = source.m_builder;
+}
+
+void AbiTextInputShadowNode::Builder(winrt::Microsoft::ReactNative::IReactViewComponentBuilder builder) noexcept {
+  m_builder = builder;
+}
+
+winrt::Microsoft::ReactNative::IReactViewComponentBuilder AbiTextInputShadowNode::Builder() const noexcept {
+  return m_builder;
+}
+
+void AbiTextInputShadowNode::Proxy(winrt::Microsoft::ReactNative::ShadowNode proxy) noexcept {
+  m_proxy = proxy;
+}
+
+winrt::Microsoft::ReactNative::ShadowNode AbiTextInputShadowNode::Proxy() const noexcept {
+  return m_proxy;
+}
+
+AbiTextInputProps::AbiTextInputProps(
+    const facebook::react::PropsParserContext &context,
+    const AbiTextInputProps &sourceProps,
+    const facebook::react::RawProps &rawProps)
+    : facebook::react::WindowsTextInputProps(context, sourceProps, rawProps) {}
+
+AbiTextInputProps::~AbiTextInputProps() {
+  if (m_innerProps) {
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ViewProps>(m_innerProps)->Disconnect();
+  }
+}
+
+void AbiTextInputProps::SetUserProps(
+    winrt::Microsoft::ReactNative::IComponentProps userProps,
+    winrt::Microsoft::ReactNative::ViewProps innerProps) noexcept {
+  m_userProps = userProps;
+  m_innerProps = innerProps;
+}
+
+winrt::Microsoft::ReactNative::IComponentProps AbiTextInputProps::UserProps() const noexcept {
+  return m_userProps;
+}
+
+winrt::Microsoft::ReactNative::ViewProps AbiTextInputProps::ViewProps() const noexcept {
+  return m_innerProps;
+}
+
+} // namespace Microsoft::ReactNative
+
+namespace winrt::Microsoft::ReactNative::implementation {
+TextInputProps::TextInputProps(facebook::react::SharedViewProps props, bool holdRef) noexcept : Super(props, holdRef) {}
+
+const facebook::react::WindowsTextInputProps &TextInputProps::windowsTextInputProps() const noexcept {
+  return static_cast<const facebook::react::WindowsTextInputProps &>(*m_viewProps);
+}
+
+winrt::hstring TextInputProps::Placeholder() noexcept {
+  return m_viewProps ? winrt::to_hstring(windowsTextInputProps().placeholder) : winrt::hstring();
+}
+
+bool TextInputProps::SecureTextEntry() noexcept {
+  return m_viewProps ? windowsTextInputProps().secureTextEntry : false;
+}
+
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/AbiTextInputShadowNode.h

@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "LayoutContext.g.h"
+#include "ShadowNode.g.h"
+#include "YogaLayoutableShadowNode.g.h"
+#include <react/components/rnwcore/EventEmitters.h>
+#include <unordered_map>
+#include "AbiShadowNode.h"
+#include "AbiState.h"
+#include "AbiTextInputProps.h"
+
+#include <react/renderer/core/LayoutContext.h>
+#include "Composition/TextInput/AbiTextInputState.h"
+#include "Composition/TextInput/WindowsTextInputShadowNode.h"
+
+namespace Microsoft::ReactNative {
+
+extern const char AbiTextInputComponentName[];
+
+class AbiTextInputShadowNode final : public facebook::react::ConcreteTextInputShadowNode<
+                                         AbiTextInputComponentName,
+                                         AbiTextInputProps,
+                                         facebook::react::WindowsTextInputEventEmitter,
+                                         Microsoft::ReactNative::AbiTextInputStateData> {
+ public:
+  using Super = facebook::react::ConcreteTextInputShadowNode<
+      AbiTextInputComponentName,
+      AbiTextInputProps,
+      facebook::react::WindowsTextInputEventEmitter,
+      Microsoft::ReactNative::AbiTextInputStateData>;
+  using Super::Super;
+
+  facebook::react::Size measureContent(
+      const facebook::react::LayoutContext &layoutContext,
+      const facebook::react::LayoutConstraints &layoutConstraints) const override;
+  void layout(facebook::react::LayoutContext layoutContext) override;
+
+  void OnClone(const facebook::react::ShadowNode &sourceShadowNode) noexcept;
+  void Builder(winrt::Microsoft::ReactNative::IReactViewComponentBuilder builder) noexcept;
+  winrt::Microsoft::ReactNative::IReactViewComponentBuilder Builder() const noexcept;
+  void Proxy(winrt::Microsoft::ReactNative::ShadowNode handle) noexcept;
+  winrt::Microsoft::ReactNative::ShadowNode Proxy() const noexcept;
+
+  void updateTextInputState(
+      facebook::react::AttributedStringBox attributedStringBox,
+      facebook::react::AttributedString &reactTreeAttributedString,
+      facebook::react::ParagraphAttributes paragraphAttributes,
+      int64_t mostRecentEventCount) override {
+    Super::setStateData(AbiTextInputStateData{
+        attributedStringBox,
+        reactTreeAttributedString,
+        paragraphAttributes,
+        mostRecentEventCount,
+        getStateData().userdata});
+  }
+
+ private:
+  winrt::Microsoft::ReactNative::ShadowNode m_proxy{nullptr};
+  winrt::Microsoft::ReactNative::IReactViewComponentBuilder m_builder{nullptr};
+};
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/AbiViewComponentDescriptor.h

@@ -9,15 +9,20 @@
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include "AbiPortalShadowNode.h"
+#include "AbiTextInputShadowNode.h"
 #include "AbiViewProps.h"
 #include "AbiViewShadowNode.h"
+#include "Composition/TextInput/WindowsTextInputComponentDescriptor.h"
 #include "DynamicReader.h"
 #include "winrt/Microsoft.ReactNative.h"
 
 namespace Microsoft::ReactNative {
 
-template <typename ShadowNodeT>
-class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDescriptor {
+template <
+    typename ShadowNodeT,
+    typename AbiPropT = winrt::Microsoft::ReactNative::implementation::ViewProps,
+    typename BaseT = facebook::react::ComponentDescriptor>
+class ConcreteAbiViewComponentDescriptor : public BaseT {
  protected:
   using SharedShadowNodeT = std::shared_ptr<const ShadowNodeT>;
 
@@ -31,14 +36,16 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
   using ConcreteStateData = typename ShadowNodeT::ConcreteState::Data;
 
   ConcreteAbiViewComponentDescriptor(facebook::react::ComponentDescriptorParameters const &parameters)
-      : ComponentDescriptor(parameters) {
+      : BaseT(parameters) {
     auto flavor = std::static_pointer_cast<std::string const>(this->flavor_);
     m_builder = WindowsComponentDescriptorRegistry::FromProperties(
                     parameters.contextContainer->at<winrt::Microsoft::ReactNative::ReactContext>("MSRN.ReactContext")
                         .Properties())
                     ->GetDescriptor(flavor);
 
-    rawPropsParser_.prepare<ConcreteProps>();
+    if constexpr (std::is_same<BaseT, facebook::react::ComponentDescriptor>::value) {
+      BaseT::rawPropsParser_.template prepare<ConcreteProps>();
+    }
   }
   facebook::react::ComponentHandle getComponentHandle() const override {
     return reinterpret_cast<facebook::react::ComponentHandle>(getComponentName());
@@ -62,7 +69,9 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
       const facebook::react::ShadowNodeFragment &fragment,
       facebook::react::ShadowNodeFamily::Shared const &family) const override {
     auto shadowNode = std::make_shared<ShadowNodeT>(fragment, family, getTraits());
-    shadowNode->Proxy(winrt::make<winrt::Microsoft::ReactNative::implementation::YogaLayoutableShadowNode>(shadowNode));
+    shadowNode->Proxy(
+        winrt::make<winrt::Microsoft::ReactNative::implementation::YogaLayoutableShadowNode<ConcreteStateData>>(
+            shadowNode));
     winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
         ->CreateShadowNode(shadowNode->Proxy());
 
@@ -74,7 +83,9 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
       const facebook::react::ShadowNode &sourceShadowNode,
       const facebook::react::ShadowNodeFragment &fragment) const override {
     auto shadowNode = std::make_shared<ShadowNodeT>(sourceShadowNode, fragment);
-    shadowNode->Proxy(winrt::make<winrt::Microsoft::ReactNative::implementation::YogaLayoutableShadowNode>(shadowNode));
+    shadowNode->Proxy(
+        winrt::make<winrt::Microsoft::ReactNative::implementation::YogaLayoutableShadowNode<ConcreteStateData>>(
+            shadowNode));
     winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
         ->CloneShadowNode(shadowNode->Proxy(), static_cast<const ShadowNodeT &>(sourceShadowNode).Proxy());
 
@@ -107,17 +118,18 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
       ShadowNodeT::filterRawProps(rawProps);
     }
 
-    rawProps.parse(rawPropsParser_);
+    rawProps.parse(BaseT::rawPropsParser_);
 
     // Call old-style constructor
     // auto shadowNodeProps = std::make_shared<ShadowNodeT::Props>(context, rawProps, props);
-    auto shadowNodeProps = std::make_shared<AbiViewProps>(
-        context, props ? static_cast<AbiViewProps const &>(*props) : *ShadowNodeT::defaultSharedProps(), rawProps);
+    auto shadowNodeProps = std::make_shared<ConcreteProps>(
+        context, props ? static_cast<ConcreteProps const &>(*props) : *ShadowNodeT::defaultSharedProps(), rawProps);
     auto viewProps =
-        winrt::make<winrt::Microsoft::ReactNative::implementation::ViewProps>(shadowNodeProps, false /*holdRef*/);
+
+        winrt::make<AbiPropT>(shadowNodeProps, false /*holdRef*/);
     auto userProps =
         winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
-            ->CreateProps(viewProps, props ? static_cast<AbiViewProps const &>(*props).UserProps() : nullptr);
+            ->CreateProps(viewProps, props ? static_cast<ConcreteProps const &>(*props).UserProps() : nullptr);
     shadowNodeProps->SetUserProps(userProps, viewProps);
 
     const auto &dynamic = static_cast<folly::dynamic>(rawProps);
@@ -141,7 +153,7 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
 
     return std::make_shared<ConcreteState>(
         std::make_shared<ConcreteStateData const>(
-            ConcreteAbiViewComponentDescriptor<ShadowNodeT>::initialStateData(props, family, *this)),
+            ConcreteAbiViewComponentDescriptor<ShadowNodeT, AbiPropT, BaseT>::initialStateData(props, family, *this)),
         family);
   }
 
@@ -162,9 +174,10 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
   facebook::react::ShadowNodeFamily::Shared createFamily(
       facebook::react::ShadowNodeFamilyFragment const &fragment) const override {
     auto eventEmitter = std::make_shared<const ConcreteEventEmitter>(
-        std::make_shared<facebook::react::EventTarget>(fragment.instanceHandle, fragment.surfaceId), eventDispatcher_);
+        std::make_shared<facebook::react::EventTarget>(fragment.instanceHandle, fragment.surfaceId),
+        BaseT::eventDispatcher_);
     return std::make_shared<facebook::react::ShadowNodeFamily>(
-        fragment, std::move(eventEmitter), eventDispatcher_, *this);
+        fragment, std::move(eventEmitter), BaseT::eventDispatcher_, *this);
   }
 
  protected:
@@ -183,7 +196,7 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
   virtual void adopt(facebook::react::ShadowNode &shadowNode) const {
     react_native_assert(shadowNode.getComponentHandle() == getComponentHandle());
 
-    auto &abiViewShadowNode = static_cast<AbiViewShadowNode &>(shadowNode);
+    auto &abiViewShadowNode = static_cast<ShadowNodeT &>(shadowNode);
 
     abiViewShadowNode.Builder(m_builder);
 
@@ -192,6 +205,10 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
       abiViewShadowNode.dirtyLayout();
       abiViewShadowNode.enableMeasurement();
     }
+
+    if constexpr (!(std::is_same<BaseT, facebook::react::ComponentDescriptor>::value)) {
+      BaseT::adopt(shadowNode);
+    }
   }
 
  private:
@@ -199,9 +216,11 @@ class ConcreteAbiViewComponentDescriptor : public facebook::react::ComponentDesc
       const facebook::react::Props::Shared &props,
       const facebook::react::ShadowNodeFamily::Shared & /*family*/,
       const facebook::react::ComponentDescriptor &componentDescriptor) noexcept {
-    return {winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(
-                static_cast<const ConcreteAbiViewComponentDescriptor<ShadowNodeT> &>(componentDescriptor).m_builder)
-                ->InitialStateData(std::static_pointer_cast<AbiViewProps const>(props)->UserProps())};
+    return {
+        winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(
+            static_cast<const ConcreteAbiViewComponentDescriptor<ShadowNodeT, AbiPropT, BaseT> &>(componentDescriptor)
+                .m_builder)
+            ->InitialStateData(std::static_pointer_cast<const ConcreteProps>(props)->UserProps())};
     return {};
   }
 
@@ -220,4 +239,19 @@ class AbiPortalComponentDescriptor : public ConcreteAbiViewComponentDescriptor<A
       : ConcreteAbiViewComponentDescriptor<AbiPortalShadowNode>(parameters) {}
 };
 
+class AbiWindowsTextInputComponentDescriptor
+    : public ConcreteAbiViewComponentDescriptor<
+          AbiTextInputShadowNode,
+          winrt::Microsoft::ReactNative::implementation::TextInputProps,
+          facebook::react::ConcreteWindowsTextInputComponentDescriptor<AbiTextInputShadowNode>> {
+  using Super = ConcreteAbiViewComponentDescriptor<
+      AbiTextInputShadowNode,
+      winrt::Microsoft::ReactNative::implementation::TextInputProps,
+      facebook::react::ConcreteWindowsTextInputComponentDescriptor<AbiTextInputShadowNode>>;
+
+ public:
+  AbiWindowsTextInputComponentDescriptor(facebook::react::ComponentDescriptorParameters const &parameters)
+      : Super(parameters) {}
+};
+
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/AbiViewShadowNode.cpp

@@ -11,24 +11,6 @@
 
 #include <utility>
 
-namespace winrt::Microsoft::ReactNative::implementation {
-
-YogaLayoutableShadowNode::YogaLayoutableShadowNode(
-    std::shared_ptr<const facebook::react::ShadowNode> shadowNode) noexcept
-    : base_type(shadowNode) {}
-
-void YogaLayoutableShadowNode::Layout(winrt::Microsoft::ReactNative::LayoutContext layoutContext) noexcept {
-  if (auto shadowNode = m_shadowNode.lock()) {
-    std::const_pointer_cast<facebook::react::YogaLayoutableShadowNode>(
-        std::dynamic_pointer_cast<const facebook::react::YogaLayoutableShadowNode>(shadowNode))
-        ->facebook::react::YogaLayoutableShadowNode::layout(
-            winrt::get_self<winrt::Microsoft::ReactNative::implementation::LayoutContext>(layoutContext)
-                ->m_layoutContext);
-  }
-}
-
-} // namespace winrt::Microsoft::ReactNative::implementation
-
 namespace Microsoft::ReactNative {
 
 extern const char AbiViewComponentName[] = "AbiView";

package/Microsoft.ReactNative/Fabric/AbiViewShadowNode.h

@@ -48,10 +48,22 @@ struct LayoutContext : LayoutContextT<LayoutContext> {
   facebook::react::LayoutContext m_layoutContext;
 };
 
-struct YogaLayoutableShadowNode : YogaLayoutableShadowNodeT<YogaLayoutableShadowNode, implementation::ShadowNode> {
-  YogaLayoutableShadowNode(std::shared_ptr<const facebook::react::ShadowNode> shadowNode) noexcept;
-
-  void Layout(winrt::Microsoft::ReactNative::LayoutContext layoutContext) noexcept;
+template <typename TStateData /* = ::Microsoft::ReactNative::AbiStateData */>
+struct YogaLayoutableShadowNode
+    : YogaLayoutableShadowNodeT<YogaLayoutableShadowNode<TStateData>, implementation::ShadowNode<TStateData>> {
+  using Super = YogaLayoutableShadowNodeT<YogaLayoutableShadowNode<TStateData>, implementation::ShadowNode<TStateData>>;
+  YogaLayoutableShadowNode(std::shared_ptr<const facebook::react::ShadowNode> shadowNode) noexcept
+      : Super(shadowNode) {}
+
+  void Layout(winrt::Microsoft::ReactNative::LayoutContext layoutContext) noexcept {
+    if (auto shadowNode = Super::m_shadowNode.lock()) {
+      std::const_pointer_cast<facebook::react::YogaLayoutableShadowNode>(
+          std::dynamic_pointer_cast<const facebook::react::YogaLayoutableShadowNode>(shadowNode))
+          ->facebook::react::YogaLayoutableShadowNode::layout(
+              winrt::get_self<winrt::Microsoft::ReactNative::implementation::LayoutContext>(layoutContext)
+                  ->m_layoutContext);
+    }
+  }
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/ComponentView.cpp

@@ -168,7 +168,8 @@ void ComponentView::updateState(
     facebook::react::State::Shared const &oldState) noexcept {
   // Avoid new-ing up a new AbiComponentState on every state change if we are not a custom component
   if (m_builder && m_builder->UpdateStateHandler()) {
-    m_builder->UpdateStateHandler()(*this, winrt::make<::Microsoft::ReactNative::AbiComponentState>(state));
+    m_builder->UpdateStateHandler()(
+        *this, winrt::make<::Microsoft::ReactNative::AbiComponentState<::Microsoft::ReactNative::AbiStateData>>(state));
   }
 }
 

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

@@ -84,8 +84,7 @@ ComponentViewDescriptor const &ComponentViewRegistry::dequeueComponentViewWithCo
   } else {
     auto descriptor =
         WindowsComponentDescriptorRegistry::FromProperties(m_context.Properties())->GetDescriptor(componentHandle);
-    view = winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(
-               descriptor.as<winrt::Microsoft::ReactNative::Composition::IReactCompositionViewComponentBuilder>())
+    view = winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(descriptor)
                ->CreateView(m_context.Handle(), tag, compContext);
   }
 

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

@@ -1816,7 +1816,7 @@ struct CompActivityVisual : winrt::implements<
     auto innerBrush = TTypeRedirects::CompositionContextHelper::InnerBrush(brush);
     if (brush) {
       _themeProperties.InsertVector4(
-          L"Foreground", ColorAsVector4(innerBrush.as<TTypeRedirects::CompositionColorBrush>().Color()));
+          L"Foreground", ColorAsVector4(innerBrush.template as<TTypeRedirects::CompositionColorBrush>().Color()));
     } else {
       _themeProperties.InsertVector4(L"Foreground", ColorAsVector4({0, 0, 0, 0}));
     }

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

@@ -1044,9 +1044,10 @@ void CompositionEventHandler::UpdateActiveTouch(
   activeTouch.touch.screenPoint.y = ptScaled.y;
   activeTouch.touch.offsetPoint.x = ptLocal.x;
   activeTouch.touch.offsetPoint.y = ptLocal.y;
+  // Restamp on every update; PanResponder ignores moves whose timestamp hasn't advanced.
+  static const auto s_timestampOrigin = std::chrono::steady_clock::now();
   activeTouch.touch.timestamp = static_cast<facebook::react::Float>(
-      std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
-          .count());
+      std::chrono::duration<double>(std::chrono::steady_clock::now() - s_timestampOrigin).count());
   activeTouch.touch.force = 0;
   // activeTouch.touch.isBarrelButton = false;
   // activeTouch.touch.shiftKey = false;