react-native-windows 0.74.4 → 0.74.6

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

@@ -164,7 +164,7 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Show the caret
   BOOL TxShowCaret(BOOL fShow) override {
-    m_outer->ShowCaret(m_outer->m_props->caretHidden ? false : fShow);
+    m_outer->ShowCaret(m_outer->windowsTextInputProps().caretHidden ? false : fShow);
     return true;
   }
 
@@ -224,7 +224,7 @@ 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()->SetFocusedComponent(view);
+    m_outer->rootComponentView()->TrySetFocusedComponent(view);
     // assert(false);
     // TODO focus
   }
@@ -304,14 +304,14 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
     switch (nIndex) {
       case COLOR_WINDOWTEXT:
-        if (m_outer->m_props->textAttributes.foregroundColor)
-          return (*m_outer->m_props->textAttributes.foregroundColor).AsColorRefNoAlpha();
+        if (m_outer->windowsTextInputProps().textAttributes.foregroundColor)
+          return (*m_outer->windowsTextInputProps().textAttributes.foregroundColor).AsColorRefNoAlpha();
         // cr = 0x000000FF;
         break;
 
       case COLOR_WINDOW:
-        if (m_outer->m_props->backgroundColor)
-          return (*m_outer->m_props->backgroundColor).AsColorRefNoAlpha();
+        if (m_outer->viewProps()->backgroundColor)
+          return (*m_outer->viewProps()->backgroundColor).AsColorRefNoAlpha();
         break;
         // case COLOR_HIGHLIGHT:
         // cr = RGB(0, 0, 255);
@@ -356,8 +356,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get the maximum length for the text
   HRESULT TxGetMaxLength(DWORD *plength) override {
-    auto length = m_outer->m_props->maxLength;
-    if (length > static_cast<decltype(m_outer->m_props->maxLength)>(std::numeric_limits<DWORD>::max())) {
+    auto length = m_outer->windowsTextInputProps().maxLength;
+    if (length > static_cast<decltype(m_outer->windowsTextInputProps().maxLength)>(std::numeric_limits<DWORD>::max())) {
       length = std::numeric_limits<DWORD>::max();
     }
     *plength = static_cast<DWORD>(length);
@@ -454,7 +454,7 @@ facebook::react::AttributedString WindowsTextInputComponentView::getAttributedSt
 
   auto childTextAttributes = facebook::react::TextAttributes::defaultTextAttributes();
 
-  childTextAttributes.apply(m_props->textAttributes);
+  childTextAttributes.apply(windowsTextInputProps().textAttributes);
 
   auto attributedString = facebook::react::AttributedString{};
   // auto attachments = facebook::react::BaseTextShadowNode::Attachments{};
@@ -465,7 +465,7 @@ facebook::react::AttributedString WindowsTextInputComponentView::getAttributedSt
   // if (!m_props->text.empty()) {
   if (!text.empty()) {
     auto textAttributes = facebook::react::TextAttributes::defaultTextAttributes();
-    textAttributes.apply(m_props->textAttributes);
+    textAttributes.apply(windowsTextInputProps().textAttributes);
     auto fragment = facebook::react::AttributedString::Fragment{};
     fragment.string = text;
     // fragment.string = m_props->text;
@@ -486,14 +486,12 @@ WindowsTextInputComponentView::WindowsTextInputComponentView(
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : Super(
+          WindowsTextInputComponentView::defaultProps(),
           compContext,
           tag,
           reactContext,
           ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
           false) {
-  static auto const defaultProps = std::make_shared<facebook::react::WindowsTextInputProps const>();
-  m_props = defaultProps;
-
   /*
   m_textChangedRevoker =
       m_element.TextChanged(winrt::auto_revoke, [this](auto sender, xaml::Controls::TextChangedEventArgs args) {
@@ -931,8 +929,9 @@ void WindowsTextInputComponentView::UnmountChildComponentView(
   base_type::UnmountChildComponentView(childComponentView, index);
 }
 
-void WindowsTextInputComponentView::onFocusLost() noexcept {
-  Super::onFocusLost();
+void WindowsTextInputComponentView::onLostFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  Super::onLostFocus(args);
   if (m_textServices) {
     LRESULT lresult;
     DrawBlock db(*this);
@@ -941,8 +940,9 @@ void WindowsTextInputComponentView::onFocusLost() noexcept {
   m_caretVisual.IsVisible(false);
 }
 
-void WindowsTextInputComponentView::onFocusGained() noexcept {
-  Super::onFocusGained();
+void WindowsTextInputComponentView::onGotFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  Super::onGotFocus(args);
   if (m_textServices) {
     LRESULT lresult;
     DrawBlock db(*this);
@@ -950,20 +950,16 @@ void WindowsTextInputComponentView::onFocusGained() noexcept {
   }
 }
 
-bool WindowsTextInputComponentView::focusable() const noexcept {
-  return m_props->focusable;
-}
-
 std::string WindowsTextInputComponentView::DefaultControlType() const noexcept {
   return "textinput";
 }
 
 std::string WindowsTextInputComponentView::DefaultAccessibleName() const noexcept {
-  return m_props->placeholder;
+  return windowsTextInputProps().placeholder;
 }
 
 std::string WindowsTextInputComponentView::DefaultHelpText() const noexcept {
-  return m_props->placeholder;
+  return windowsTextInputProps().placeholder;
 }
 
 void WindowsTextInputComponentView::updateCursorColor(
@@ -981,19 +977,13 @@ void WindowsTextInputComponentView::updateCursorColor(
 void WindowsTextInputComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldTextInputProps = *std::static_pointer_cast<const facebook::react::WindowsTextInputProps>(m_props);
+  const auto &oldTextInputProps =
+      *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;
 
-  ensureVisual();
-
-  if (oldTextInputProps.testId != newTextInputProps.testId) {
-    m_visual.Comment(winrt::to_hstring(newTextInputProps.testId));
-  }
-  // update BaseComponentView props
-  updateTransformProps(oldTextInputProps, newTextInputProps, m_visual);
   Super::updateProps(props, oldProps);
 
   if (!facebook::react::floatEquality(
@@ -1105,8 +1095,6 @@ void WindowsTextInputComponentView::updateProps(
   }
   */
 
-  m_props = std::static_pointer_cast<facebook::react::WindowsTextInputProps const>(props);
-
   if (propBitsMask != 0) {
     DrawBlock db(*this);
     winrt::check_hresult(m_textServices->OnTxPropertyBitsChange(propBitsMask, propBits));
@@ -1177,10 +1165,6 @@ void WindowsTextInputComponentView::updateLayoutMetrics(
     facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
   // Set Position & Size Properties
 
-  if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
-    OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
-  }
-
   if ((layoutMetrics.pointScaleFactor != m_layoutMetrics.pointScaleFactor)) {
     LRESULT res;
     winrt::check_hresult(m_textServices->TxSendMessage(
@@ -1202,10 +1186,6 @@ void WindowsTextInputComponentView::updateLayoutMetrics(
 
   m_imgWidth = newWidth;
   m_imgHeight = newHeight;
-
-  m_visual.Size(
-      {layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
-       layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
 }
 
 // When we are notified by RichEdit that the text changed, we need to notify JS
@@ -1282,13 +1262,16 @@ void WindowsTextInputComponentView::setAcccessiblityValue(std::string &&value) n
 }
 
 bool WindowsTextInputComponentView::getAcccessiblityIsReadOnly() noexcept {
-  return !m_props->editable;
+  return !windowsTextInputProps().editable;
 }
 
-void WindowsTextInputComponentView::prepareForRecycle() noexcept {}
+facebook::react::SharedViewProps WindowsTextInputComponentView::defaultProps() noexcept {
+  static auto const defaultProps = std::make_shared<facebook::react::WindowsTextInputProps const>();
+  return defaultProps;
+}
 
-facebook::react::SharedViewProps WindowsTextInputComponentView::viewProps() noexcept {
-  return m_props;
+const facebook::react::WindowsTextInputProps &WindowsTextInputComponentView::windowsTextInputProps() const noexcept {
+  return *std::static_pointer_cast<const facebook::react::WindowsTextInputProps>(viewProps());
 }
 
 void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
@@ -1311,17 +1294,18 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {
   // cfNew.bPitchAndFamily = FF_DONTCARE;
 
   // set font size -- 15 to convert twips to pt
-  float fontSize = m_props->textAttributes.fontSize;
+  const auto &props = windowsTextInputProps();
+  float fontSize = props.textAttributes.fontSize;
   if (std::isnan(fontSize))
     fontSize = facebook::react::TextAttributes::defaultTextAttributes().fontSize;
-  // TODO get fontSize from m_props->textAttributes, or defaultTextAttributes, or fragment?
+  // TODO get fontSize from props.textAttributes, or defaultTextAttributes, or fragment?
   cfNew.dwMask |= CFM_SIZE;
   cfNew.yHeight = static_cast<LONG>(fontSize * 15);
 
   // set bold
   cfNew.dwMask |= CFM_WEIGHT;
-  cfNew.wWeight = m_props->textAttributes.fontWeight ? static_cast<WORD>(*m_props->textAttributes.fontWeight)
-                                                     : DWRITE_FONT_WEIGHT_NORMAL;
+  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);
@@ -1392,7 +1376,7 @@ void WindowsTextInputComponentView::ensureDrawingSurface() noexcept {
     m_drawingSurface.HorizontalAlignmentRatio(0.f);
     m_drawingSurface.VerticalAlignmentRatio(0.f);
     m_drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
-    m_visual.Brush(m_drawingSurface);
+    Visual().as<Experimental::ISpriteVisual>().Brush(m_drawingSurface);
   }
 }
 
@@ -1406,11 +1390,12 @@ winrt::com_ptr<::IDWriteTextLayout> WindowsTextInputComponentView::CreatePlaceho
   winrt::com_ptr<::IDWriteTextLayout> textLayout = nullptr;
   facebook::react::AttributedString attributedString;
   facebook::react::AttributedString::Fragment fragment1;
-  facebook::react::TextAttributes textAttributes = m_props->textAttributes;
-  if (std::isnan(m_props->textAttributes.fontSize)) {
+  const auto &props = windowsTextInputProps();
+  facebook::react::TextAttributes textAttributes = props.textAttributes;
+  if (std::isnan(props.textAttributes.fontSize)) {
     textAttributes.fontSize = 12.0f;
   }
-  fragment1.string = m_props->placeholder;
+  fragment1.string = props.placeholder;
   fragment1.textAttributes = textAttributes;
   attributedString.appendFragment(fragment1);
 
@@ -1461,8 +1446,9 @@ void WindowsTextInputComponentView::DrawText() noexcept {
 
       winrt::check_hresult(m_textServices->OnTxInPlaceActivate(&rcClient));
 
-      if (facebook::react::isColorMeaningful(m_props->backgroundColor)) {
-        auto backgroundColor = theme()->D2DColor(*m_props->backgroundColor);
+      const auto &props = windowsTextInputProps();
+      if (facebook::react::isColorMeaningful(props.backgroundColor)) {
+        auto backgroundColor = theme()->D2DColor(*props.backgroundColor);
         winrt::com_ptr<ID2D1SolidColorBrush> backgroundBrush;
         winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(backgroundColor, backgroundBrush.put()));
         const D2D1_RECT_F fillRect = {
@@ -1478,11 +1464,11 @@ void WindowsTextInputComponentView::DrawText() noexcept {
       winrt::check_hresult(hrDraw);
 
       // draw placeholder text if needed
-      if (!m_props->placeholder.empty() && GetTextFromRichEdit().empty()) {
+      if (!props.placeholder.empty() && GetTextFromRichEdit().empty()) {
         // set brush color
         winrt::com_ptr<ID2D1SolidColorBrush> brush;
-        if (m_props->placeholderTextColor) {
-          auto color = theme()->D2DColor(*m_props->placeholderTextColor);
+        if (props.placeholderTextColor) {
+          auto color = theme()->D2DColor(*props.placeholderTextColor);
           winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(color, brush.put()));
         } else {
           winrt::check_hresult(
@@ -1507,65 +1493,29 @@ void WindowsTextInputComponentView::DrawText() noexcept {
   m_needsRedraw = false;
 }
 
-facebook::react::Tag WindowsTextInputComponentView::hitTest(
-    facebook::react::Point pt,
-    facebook::react::Point &localPt,
-    bool ignorePointerEvents) const noexcept {
-  facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
-
-  facebook::react::Tag targetTag;
-
-  /*
-    if ((m_props.pointerEvents == facebook::react::PointerEventsMode::Auto ||
-        m_props.pointerEvents == facebook::react::PointerEventsMode::BoxNone) && std::any_of(m_children.rbegin(),
-    m_children.rend(), [&targetTag, &ptLocal, &localPt](auto child) { targetTag = static_cast<const
-    ComponentView
-    *>(child)->hitTest(ptLocal, localPt); return targetTag != -1;
-        }))
-      return targetTag;
-      */
-
-  if ((ignorePointerEvents || m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
-       m_props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
-      ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
-      ptLocal.y <= m_layoutMetrics.frame.size.height) {
-    localPt = ptLocal;
-    return Tag();
-  }
-
-  return -1;
-}
-
-void WindowsTextInputComponentView::ensureVisual() noexcept {
-  if (!m_visual) {
-    HrEnsureRichEd20Loaded();
-    m_visual = m_compContext.CreateSpriteVisual();
-    m_textHost = winrt::make<CompTextHost>(this);
-    winrt::com_ptr<::IUnknown> spUnk;
-    winrt::check_hresult(g_pfnCreateTextServices(nullptr, m_textHost.get(), spUnk.put()));
-    spUnk.as(m_textServices);
-    OuterVisual().InsertAt(m_visual, 0);
-  }
+winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
+WindowsTextInputComponentView::createVisual() noexcept {
+  HrEnsureRichEd20Loaded();
+  auto visual = m_compContext.CreateSpriteVisual();
+  m_textHost = winrt::make<CompTextHost>(this);
+  winrt::com_ptr<::IUnknown> spUnk;
+  winrt::check_hresult(g_pfnCreateTextServices(nullptr, m_textHost.get(), spUnk.put()));
+  spUnk.as(m_textServices);
+
+  m_caretVisual = m_compContext.CreateCaretVisual();
+  visual.InsertAt(m_caretVisual.InnerVisual(), 0);
+  m_caretVisual.IsVisible(false);
 
-  if (!m_caretVisual) {
-    m_caretVisual = m_compContext.CreateCaretVisual();
-    m_visual.InsertAt(m_caretVisual.InnerVisual(), 0);
-    m_caretVisual.IsVisible(false);
-  }
+  return visual;
 }
 
 void WindowsTextInputComponentView::onThemeChanged() noexcept {
-  auto props = std::static_pointer_cast<const facebook::react::WindowsTextInputProps>(m_props);
-  updateCursorColor(props->cursorColor, props->textAttributes.foregroundColor);
+  const auto &props = windowsTextInputProps();
+  updateCursorColor(props.cursorColor, props.textAttributes.foregroundColor);
   DrawText();
   base_type::onThemeChanged();
 }
 
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual WindowsTextInputComponentView::Visual()
-    const noexcept {
-  return m_visual;
-}
-
 winrt::Microsoft::ReactNative::ComponentView WindowsTextInputComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,

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

@@ -20,10 +20,11 @@
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 struct CompTextHost;
 
-struct WindowsTextInputComponentView : WindowsTextInputComponentViewT<WindowsTextInputComponentView, ComponentView> {
+struct WindowsTextInputComponentView
+    : WindowsTextInputComponentViewT<WindowsTextInputComponentView, ViewComponentView> {
   friend CompTextHost;
 
-  using Super = WindowsTextInputComponentViewT<WindowsTextInputComponentView, ComponentView>;
+  using Super = WindowsTextInputComponentViewT<WindowsTextInputComponentView, ViewComponentView>;
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
@@ -43,19 +44,13 @@ struct WindowsTextInputComponentView : WindowsTextInputComponentViewT<WindowsTex
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
-  void prepareForRecycle() noexcept override;
-  facebook::react::SharedViewProps viewProps() 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;
-  facebook::react::Tag hitTest(
-      facebook::react::Point pt,
-      facebook::react::Point &localPt,
-      bool ignorePointerEvents = false) const noexcept override;
   void OnRenderingDeviceLost() noexcept override;
-  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual Visual() const noexcept override;
-  void onFocusLost() noexcept override;
-  void onFocusGained() noexcept override;
-  bool focusable() const 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;
   std::string DefaultControlType() const noexcept override;
   std::string DefaultAccessibleName() const noexcept override;
   std::string DefaultHelpText() const noexcept override;
@@ -87,6 +82,8 @@ struct WindowsTextInputComponentView : WindowsTextInputComponentViewT<WindowsTex
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept;
+
  private:
   struct DrawBlock {
     DrawBlock(WindowsTextInputComponentView &view);
@@ -95,7 +92,6 @@ struct WindowsTextInputComponentView : WindowsTextInputComponentViewT<WindowsTex
   };
 
   facebook::react::AttributedString getAttributedString() const;
-  void ensureVisual() noexcept;
   void ensureDrawingSurface() noexcept;
   void DrawText() noexcept;
   void ShowCaret(bool show) noexcept;
@@ -114,7 +110,6 @@ struct WindowsTextInputComponentView : WindowsTextInputComponentViewT<WindowsTex
       const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept;
 
   winrt::Windows::UI::Composition::CompositionSurfaceBrush m_brush{nullptr};
-  winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual m_visual{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual m_caretVisual{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush m_drawingSurface{nullptr};
 
@@ -125,7 +120,6 @@ struct WindowsTextInputComponentView : WindowsTextInputComponentViewT<WindowsTex
   winrt::com_ptr<ITextHost> m_textHost;
   winrt::com_ptr<ITextServices2> m_textServices;
   unsigned int m_imgWidth{0}, m_imgHeight{0};
-  std::shared_ptr<facebook::react::WindowsTextInputProps const> m_props;
   std::shared_ptr<facebook::react::WindowsTextInputShadowNode::ConcreteState const> m_state;
   RECT m_rcClient;
   int64_t m_mostRecentEventCount{0};

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

@@ -18,6 +18,7 @@ UnimplementedNativeViewComponentView::UnimplementedNativeViewComponentView(
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : base_type(
+          {}, // default ViewProps
           compContext,
           tag,
           reactContext,

package/Microsoft.ReactNative/FocusManager.idl

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import "ComponentView.idl";
+#include "DocString.h"
+
+namespace Microsoft.ReactNative.Composition
+{
+
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  runtimeclass FocusManager
+  {
+    DOC_STRING("Retrieves the first component that can receive focus based on the specified scope.")
+    static Microsoft.ReactNative.ComponentView FindFirstFocusableElement(Microsoft.ReactNative.ComponentView searchScope);
+
+    DOC_STRING("Retrieves the last component that can receive focus based on the specified scope.")
+    static Microsoft.ReactNative.ComponentView FindLastFocusableElement(Microsoft.ReactNative.ComponentView searchScope);
+  }
+
+} // namespace Microsoft.ReactNative.Composition

package/Microsoft.ReactNative/ViewProps.idl

@@ -45,13 +45,47 @@ namespace Microsoft.ReactNative {
   [webhosthidden]
   [experimental]
   DOC_STRING("Provides access to the properties on standard ViewProps.")
-  runtimeclass ViewProps
+  unsealed runtimeclass ViewProps
   {
     Single Opacity { get; };
-
     Color BackgroundColor { get; };
-
+    String TestId { get; };
+    String AccessibilityLabel { get; };
+    
     // TODO add accessors to all the properties on ViewProps
   };
 
+  [webhosthidden]
+  [experimental]
+  enum ImageSourceType
+  {
+    Invalid = 0,
+    Remote = 1,
+    Local = 2,
+  };
+
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  runtimeclass ImageSource
+  {
+    ImageSourceType Type { get; };
+    String Uri { get; };
+    String Bundle { get; };
+    Single Scale { get; };
+    Windows.Foundation.Size Size { get; };
+
+    static ImageSource ReadValue(IJSValueReader reader);
+  }
+
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  runtimeclass ImageProps : ViewProps
+  {
+    Windows.Foundation.Collections.IVectorView<ImageSource> Sources { get; };
+    // TODO add accessors to all the properties on ImageProps
+  }
+  
+
 } // namespace Microsoft. ReactNative

package/Microsoft.ReactNative.Cxx/JSValueComposition.h

@@ -17,6 +17,10 @@ inline void WriteValue(IJSValueWriter const &writer, const Color &value) noexcep
   winrt::Microsoft::ReactNative::Color::WriteValue(writer, value);
 }
 
+inline void ReadValue(IJSValueReader const &reader, ImageSource &value) noexcept {
+  value = winrt::Microsoft::ReactNative::ImageSource::ReadValue(reader);
+}
+
 } // namespace winrt::Microsoft::ReactNative
 
 #endif // MICROSOFT_REACTNATIVE_JSVALUECOMPOSITION

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.6</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>6</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>785c8734e6b203a669bd504846488c89ed5352aa</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>c93d7314ed1689c74689990641fbf3c1a54aa8cc</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Shared.vcxitems

@@ -84,6 +84,11 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\FocusManager.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\UriImageManager.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl</DependentUpon>
@@ -635,6 +640,7 @@
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ComponentView.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Composition.Input.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionComponentView.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.4",
+  "version": "0.74.6",
   "license": "MIT",
   "repository": {
     "type": "git",