react-native-windows 0.74.4 → 0.74.5

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;
   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/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.5</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>5</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>785c8734e6b203a669bd504846488c89ed5352aa</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>481f89da064d5a33f4b5b79088dc760bd49f6dd2</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

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