react-native-windows 0.74.4 → 0.74.5

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

@@ -18,4 +18,10 @@ winrt::Microsoft::UI::Composition::Compositor CompositionUIService::GetComposito
   return nullptr;
 }
 
+winrt::Microsoft::ReactNative::ComponentView CompositionUIService::ComponentFromReactTag(
+    const winrt::Microsoft::ReactNative::IReactContext &,
+    int64_t) noexcept {
+  return nullptr;
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -134,7 +134,8 @@ winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext Co
 void ComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldViewProps = *viewProps();
+  const auto &oldViewProps =
+      oldProps ? (*std::static_pointer_cast<const facebook::react::ViewProps>(oldProps)) : (*viewProps());
   const auto &newViewProps = *std::static_pointer_cast<const facebook::react::ViewProps>(props);
 
   if ((m_flags & ComponentViewFeatures::Background) == ComponentViewFeatures::Background) {
@@ -1455,6 +1456,7 @@ std::string ComponentView::DefaultHelpText() const noexcept {
 ViewComponentView::ViewComponentView(
     const winrt::Microsoft::ReactNative::Composition::CreateCompositionComponentViewArgs &args)
     : ViewComponentView(
+          ViewComponentView::defaultProps(),
           winrt::get_self<
               winrt::Microsoft::ReactNative::Composition::implementation::CreateCompositionComponentViewArgs>(args)
               ->CompositionContext(),
@@ -1463,16 +1465,20 @@ ViewComponentView::ViewComponentView(
           args.Features(),
           true) {}
 
+facebook::react::SharedViewProps ViewComponentView::defaultProps() noexcept {
+  static auto const defaultViewProps = std::make_shared<facebook::react::ViewProps const>();
+  return defaultViewProps;
+}
+
 ViewComponentView::ViewComponentView(
+    const facebook::react::SharedViewProps &defaultProps,
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext,
     ComponentViewFeatures flags,
     bool customComponent)
-    : base_type(compContext, tag, reactContext, flags, customComponent) {
-  static auto const defaultProps = std::make_shared<facebook::react::ViewProps const>();
-  m_props = defaultProps;
-}
+    : base_type(compContext, tag, reactContext, flags, customComponent),
+      m_props(defaultProps ? defaultProps : ViewComponentView::defaultProps()) {}
 
 winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ViewComponentView::createVisual() noexcept {
   return m_compContext.CreateSpriteVisual();
@@ -1507,7 +1513,8 @@ winrt::Microsoft::ReactNative::ComponentView ViewComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
-  return winrt::make<ViewComponentView>(compContext, tag, reactContext, ComponentViewFeatures::Default, false);
+  return winrt::make<ViewComponentView>(
+      ViewComponentView::defaultProps(), compContext, tag, reactContext, ComponentViewFeatures::Default, false);
 }
 
 void ViewComponentView::MountChildComponentView(
@@ -1521,7 +1528,7 @@ void ViewComponentView::MountChildComponentView(
   // TODO if we get mixed children of composition and non-composition ComponentViews the indexes will get mixed up
   // We could offset the index based on non-composition children in m_children
   if (auto compositionChild = childComponentView.try_as<ComponentView>()) {
-    m_visual.InsertAt(compositionChild->OuterVisual(), index);
+    Visual().InsertAt(compositionChild->OuterVisual(), index);
   }
 }
 
@@ -1532,27 +1539,27 @@ void ViewComponentView::UnmountChildComponentView(
 
   indexOffsetForBorder(index);
   if (auto compositionChild = childComponentView.try_as<ComponentView>()) {
-    m_visual.Remove(compositionChild->OuterVisual());
+    Visual().Remove(compositionChild->OuterVisual());
   }
 }
 
 void ViewComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldViewProps = *std::static_pointer_cast<const facebook::react::ViewProps>(m_props);
+  const auto &oldViewProps = *std::static_pointer_cast<const facebook::react::ViewProps>(oldProps ? oldProps : m_props);
   const auto &newViewProps = *std::static_pointer_cast<const facebook::react::ViewProps>(props);
 
   ensureVisual();
   if (oldViewProps.opacity != newViewProps.opacity) {
-    m_visual.Opacity(newViewProps.opacity);
+    Visual().Opacity(newViewProps.opacity);
   }
   if (oldViewProps.testId != newViewProps.testId) {
-    m_visual.Comment(winrt::to_hstring(newViewProps.testId));
+    Visual().Comment(winrt::to_hstring(newViewProps.testId));
   }
 
   // update BaseComponentView props
   updateAccessibilityProps(oldViewProps, newViewProps);
-  updateTransformProps(oldViewProps, newViewProps, m_visual);
+  updateTransformProps(oldViewProps, newViewProps, Visual());
   base_type::updateProps(props, oldProps);
 
   m_props = std::static_pointer_cast<facebook::react::ViewProps const>(props);
@@ -1571,7 +1578,7 @@ facebook::react::Tag ViewComponentView::hitTest(
     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;
+  facebook::react::Tag targetTag = -1;
 
   if ((ignorePointerEvents || m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
        m_props->pointerEvents == facebook::react::PointerEventsMode::BoxNone) &&
@@ -1637,7 +1644,7 @@ void ViewComponentView::OnKeyDown(
       (source.GetKeyState(winrt::Windows::System::VirtualKey::RightWindows) !=
        winrt::Windows::UI::Core::CoreVirtualKeyStates::None);
 
-  if (args.OriginalSource() == Tag()) {
+  if (args.OriginalSource() == Tag() && !args.Handled()) {
     facebook::react::KeyEvent event;
     event.shiftKey = fShift;
     event.ctrlKey = fCtrl;
@@ -1712,16 +1719,20 @@ void ViewComponentView::updateLayoutMetrics(
 }
 
 void ViewComponentView::UpdateLayoutMetrics(const LayoutMetrics &metrics, const LayoutMetrics &oldMetrics) noexcept {
-  m_visual.Size({metrics.Frame.Width * metrics.PointScaleFactor, metrics.Frame.Height * metrics.PointScaleFactor});
+  Visual().Size({metrics.Frame.Width * metrics.PointScaleFactor, metrics.Frame.Height * metrics.PointScaleFactor});
 }
 
 void ViewComponentView::prepareForRecycle() noexcept {}
 
-facebook::react::SharedViewProps ViewComponentView::viewProps() noexcept {
+const facebook::react::SharedViewProps &ViewComponentView::viewProps() const noexcept {
   return m_props;
 }
 
 winrt::Microsoft::ReactNative::ViewProps ViewComponentView::ViewProps() noexcept {
+  return ViewPropsInner();
+}
+
+winrt::Microsoft::ReactNative::ViewProps ViewComponentView::ViewPropsInner() noexcept {
   // If we have AbiViewProps, then we dont need to new up a props wrapper
   if (m_customComponent) {
     const auto &abiViewProps = *std::static_pointer_cast<const ::Microsoft::ReactNative::AbiViewProps>(m_props);

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

@@ -23,7 +23,8 @@ namespace winrt::Microsoft::ReactNative::Composition::implementation {
 struct CreateCompositionComponentViewArgs
     : public CreateCompositionComponentViewArgsT<
           CreateCompositionComponentViewArgs,
-          winrt::Microsoft::ReactNative::implementation::CreateComponentViewArgs> {
+          winrt::Microsoft::ReactNative::implementation::CreateComponentViewArgs,
+          winrt::Microsoft::ReactNative::Composition::Experimental::IInternalCreateComponentViewArgs> {
   CreateCompositionComponentViewArgs(
       const winrt::Microsoft::ReactNative::IReactContext &reactContext,
       facebook::react::Tag tag,
@@ -63,8 +64,10 @@ struct ComponentView
   void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
       override;
   facebook::react::Props::Shared props() noexcept override;
-  virtual facebook::react::SharedViewProps viewProps() noexcept {
-    return nullptr;
+  virtual const facebook::react::SharedViewProps &viewProps() const noexcept {
+    static facebook::react::SharedViewProps emptyProps;
+    assert(false);
+    return emptyProps;
   };
   void Theme(const winrt::Microsoft::ReactNative::Composition::Theme &theme) noexcept;
   winrt::Microsoft::ReactNative::Composition::Theme Theme() const noexcept;
@@ -195,7 +198,7 @@ struct ViewComponentView : public ViewComponentViewT<ViewComponentView, Componen
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
   std::string DefaultControlType() const noexcept override;
 
-  facebook::react::SharedViewProps viewProps() noexcept override;
+  const facebook::react::SharedViewProps &viewProps() const noexcept override;
   winrt::Microsoft::ReactNative::ViewProps ViewProps() noexcept;
 
   facebook::react::Tag hitTest(
@@ -207,7 +210,10 @@ struct ViewComponentView : public ViewComponentViewT<ViewComponentView, Componen
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual Visual() const noexcept override;
   void ensureVisual() noexcept;
 
+  static facebook::react::SharedViewProps defaultProps() noexcept;
+
   ViewComponentView(
+      const facebook::react::SharedViewProps &defaultProps,
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext,
@@ -220,6 +226,9 @@ struct ViewComponentView : public ViewComponentViewT<ViewComponentView, Componen
   virtual winrt::Microsoft::UI::Composition::Visual CreateVisual() noexcept;
   virtual void UpdateLayoutMetrics(const LayoutMetrics &metrics, const LayoutMetrics &oldMetrics) noexcept;
 
+ protected:
+  virtual winrt::Microsoft::ReactNative::ViewProps ViewPropsInner() noexcept;
+
  private:
   facebook::react::SharedViewProps m_props;
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_visual{nullptr};

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

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

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

@@ -14,6 +14,7 @@
 #include <react/renderer/components/image/ImageEventEmitter.h>
 
 #include <AutoDraw.h>
+#include <Fabric/AbiViewProps.h>
 #include <Fabric/FabricUIManagerModule.h>
 #include <Utils/ImageUtils.h>
 #include <shcore.h>
@@ -48,19 +49,22 @@ void ImageComponentView::WindowsImageResponseObserver::didReceiveFailure() const
   m_image->didReceiveFailureFromObserver();
 }
 
+facebook::react::SharedViewProps ImageComponentView::defaultProps() noexcept {
+  static auto const defaultProps = std::make_shared<facebook::react::ImageProps const>();
+  return defaultProps;
+}
+
 ImageComponentView::ImageComponentView(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : Super(
+          ImageComponentView::defaultProps(),
           compContext,
           tag,
           reactContext,
           ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
-          false) {
-  static auto const defaultProps = std::make_shared<facebook::react::ImageProps const>();
-  m_props = defaultProps;
-}
+          false) {}
 
 void ImageComponentView::MountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
@@ -111,32 +115,24 @@ void ImageComponentView::didReceiveFailureFromObserver() noexcept {
   }
 }
 
+const facebook::react::ImageProps &ImageComponentView::imageProps() const noexcept {
+  return *std::static_pointer_cast<const facebook::react::ImageProps>(viewProps());
+}
+
 void ImageComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldImageProps = *std::static_pointer_cast<const facebook::react::ImageProps>(m_props);
+  const auto &oldImageProps =
+      *std::static_pointer_cast<const facebook::react::ImageProps>(oldProps ? oldProps : viewProps());
   const auto &newImageProps = *std::static_pointer_cast<const facebook::react::ImageProps>(props);
 
-  ensureVisual();
-
-  // update BaseComponentView props
-  updateTransformProps(oldImageProps, newImageProps, m_visual);
-  Super::updateProps(props, oldProps);
-
   if (oldImageProps.backgroundColor != newImageProps.backgroundColor ||
       oldImageProps.blurRadius != newImageProps.blurRadius || oldImageProps.tintColor != newImageProps.tintColor ||
       oldImageProps.resizeMode != newImageProps.resizeMode) {
     m_drawingSurface = nullptr; // TODO don't need to recreate the surface just to redraw...
   }
 
-  if (oldImageProps.opacity != newImageProps.opacity) {
-    m_visual.Opacity(newImageProps.opacity);
-  }
-  if (oldImageProps.testId != newImageProps.testId) {
-    m_visual.Comment(winrt::to_hstring(newImageProps.testId));
-  }
-
-  m_props = std::static_pointer_cast<facebook::react::ImageProps const>(props);
+  Super::updateProps(props, oldProps);
 }
 
 void ImageComponentView::updateState(
@@ -182,19 +178,22 @@ void ImageComponentView::setStateAndResubscribeImageResponseObserver(
   }
 }
 
-void ImageComponentView::updateLayoutMetrics(
-    facebook::react::LayoutMetrics const &layoutMetrics,
-    facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
-  // Set Position & Size Properties
+winrt::Microsoft::ReactNative::ImageProps ImageComponentView::ImageProps() noexcept {
+  // We do not currently support custom ImageComponentView's
+  // If we did we would need to create a AbiImageProps and possibly return them here
+  assert(!m_customComponent);
+  return winrt::make<winrt::Microsoft::ReactNative::implementation::ImageProps>(viewProps());
+}
 
-  if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
-    OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
-  }
+winrt::Microsoft::ReactNative::ImageProps ImageComponentView::ViewProps() noexcept {
+  return ViewPropsInner().as<winrt::Microsoft::ReactNative::ImageProps>();
+}
 
-  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
-  m_visual.Size(
-      {layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
-       layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
+winrt::Microsoft::ReactNative::ViewProps ImageComponentView::ViewPropsInner() noexcept {
+  // We do not currently support custom ImageComponentView's
+  // If we did we would need to create a AbiImageProps and possibly return them here
+  assert(!m_customComponent);
+  return winrt::make<winrt::Microsoft::ReactNative::implementation::ImageProps>(viewProps());
 }
 
 void ImageComponentView::OnRenderingDeviceLost() noexcept {
@@ -203,7 +202,7 @@ void ImageComponentView::OnRenderingDeviceLost() noexcept {
 }
 
 bool ImageComponentView::themeEffectsImage() const noexcept {
-  return m_props->backgroundColor || isColorMeaningful(m_props->tintColor);
+  return viewProps()->backgroundColor || isColorMeaningful(imageProps().tintColor);
 }
 
 void ImageComponentView::onThemeChanged() noexcept {
@@ -218,7 +217,7 @@ void ImageComponentView::ensureDrawingSurface() noexcept {
   assert(m_reactContext.UIDispatcher().HasThreadAccess());
 
   if (!m_imageResponseImage) {
-    m_visual.Brush(nullptr);
+    Visual().as<Experimental::ISpriteVisual>().Brush(nullptr);
     return;
   }
 
@@ -230,18 +229,18 @@ void ImageComponentView::ensureDrawingSurface() noexcept {
   if (!m_drawingSurface && m_imageResponseImage->m_wicbmp) {
     winrt::Windows::Foundation::Size drawingSurfaceSize{static_cast<float>(width), static_cast<float>(height)};
 
-    const auto imageProps = std::static_pointer_cast<const facebook::react::ImageProps>(m_props);
+    const auto &imgProps = imageProps();
     const auto frame{m_layoutMetrics.getContentFrame().size};
 
-    if (imageProps->resizeMode == facebook::react::ImageResizeMode::Repeat) {
+    if (imgProps.resizeMode == facebook::react::ImageResizeMode::Repeat) {
       drawingSurfaceSize = {
           frame.width * m_layoutMetrics.pointScaleFactor, frame.height * m_layoutMetrics.pointScaleFactor};
-    } else if (imageProps->blurRadius > 0) {
+    } else if (imgProps.blurRadius > 0) {
       // https://learn.microsoft.com/en-us/windows/win32/direct2d/gaussian-blur#output-bitmap
       // The following equation that can be used to compute the output bitmap:
       // Output bitmap growth (X and Y) = (StandardDeviation(DIPs)*3 + StandardDeviation(DIPs)*3)*((User DPI)/96)
       // Where StandardDeviation(DIPs)*3 is equivalent to the blur radius.
-      const auto bmpGrowth{imageProps->blurRadius * 2 * m_layoutMetrics.pointScaleFactor};
+      const auto bmpGrowth{imgProps.blurRadius * 2 * m_layoutMetrics.pointScaleFactor};
       drawingSurfaceSize = {drawingSurfaceSize.Width + bmpGrowth, drawingSurfaceSize.Height + bmpGrowth};
     }
 
@@ -252,7 +251,7 @@ void ImageComponentView::ensureDrawingSurface() noexcept {
 
     DrawImage();
 
-    switch (imageProps->resizeMode) {
+    switch (imgProps.resizeMode) {
       case facebook::react::ImageResizeMode::Stretch:
         m_drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::Fill);
         break;
@@ -281,9 +280,10 @@ void ImageComponentView::ensureDrawingSurface() noexcept {
         assert(false);
     }
 
-    m_visual.Brush(m_drawingSurface);
+    Visual().as<Experimental::ISpriteVisual>().Brush(m_drawingSurface);
   } else if (m_imageResponseImage->m_brushFactory) {
-    m_visual.Brush(m_imageResponseImage->m_brushFactory(m_reactContext.Handle(), m_compContext));
+    Visual().as<Experimental::ISpriteVisual>().Brush(
+        m_imageResponseImage->m_brushFactory(m_reactContext.Handle(), m_compContext));
   }
 }
 
@@ -310,15 +310,15 @@ void ImageComponentView::DrawImage() noexcept {
         d2dDeviceContext->CreateBitmapFromWicBitmap(m_imageResponseImage->m_wicbmp.get(), nullptr, bitmap.put()));
 
     d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
-    if (m_props->backgroundColor) {
-      d2dDeviceContext->Clear(theme()->D2DColor(*m_props->backgroundColor));
+    if (viewProps()->backgroundColor) {
+      d2dDeviceContext->Clear(theme()->D2DColor(*viewProps()->backgroundColor));
     }
 
-    const auto imageProps = std::static_pointer_cast<const facebook::react::ImageProps>(m_props);
+    const auto &imgProps = imageProps();
 
     bool useEffects{
-        imageProps->blurRadius > 0 || isColorMeaningful(imageProps->tintColor) ||
-        imageProps->resizeMode == facebook::react::ImageResizeMode::Repeat};
+        imgProps.blurRadius > 0 || isColorMeaningful(imgProps.tintColor) ||
+        imgProps.resizeMode == facebook::react::ImageResizeMode::Repeat};
 
     if (useEffects) {
       winrt::com_ptr<ID2D1Effect> bitmapEffects;
@@ -326,23 +326,22 @@ void ImageComponentView::DrawImage() noexcept {
       winrt::check_hresult(
           bitmapEffects->SetValue(D2D1_BITMAPSOURCE_PROP_WIC_BITMAP_SOURCE, m_imageResponseImage->m_wicbmp.get()));
 
-      if (imageProps->blurRadius > 0) {
+      if (imgProps.blurRadius > 0) {
         winrt::com_ptr<ID2D1Effect> gaussianBlurEffect;
         winrt::check_hresult(d2dDeviceContext->CreateEffect(CLSID_D2D1GaussianBlur, gaussianBlurEffect.put()));
         // https://learn.microsoft.com/en-us/windows/win32/direct2d/gaussian-blur#effect-properties
         // You can compute the blur radius of the kernel by multiplying the standard deviation by 3 (radius multiplier).
         constexpr float radiusMultiplier = 3;
         winrt::check_hresult(gaussianBlurEffect->SetValue(
-            D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION, (imageProps->blurRadius) / radiusMultiplier));
+            D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION, (imgProps.blurRadius) / radiusMultiplier));
         gaussianBlurEffect->SetInputEffect(0, bitmapEffects.get());
         bitmapEffects.copy_from(gaussianBlurEffect.get());
       }
 
-      if (isColorMeaningful(imageProps->tintColor)) {
+      if (isColorMeaningful(imgProps.tintColor)) {
         winrt::com_ptr<ID2D1Effect> tintColorEffect;
         winrt::check_hresult(d2dDeviceContext->CreateEffect(CLSID_D2D1Flood, tintColorEffect.put()));
-        winrt::check_hresult(
-            tintColorEffect->SetValue(D2D1_FLOOD_PROP_COLOR, theme()->D2DColor(*imageProps->tintColor)));
+        winrt::check_hresult(tintColorEffect->SetValue(D2D1_FLOOD_PROP_COLOR, theme()->D2DColor(*imgProps.tintColor)));
 
         winrt::com_ptr<ID2D1Effect> compositeEffect;
         winrt::check_hresult(d2dDeviceContext->CreateEffect(CLSID_D2D1Composite, compositeEffect.put()));
@@ -353,7 +352,7 @@ void ImageComponentView::DrawImage() noexcept {
         bitmapEffects.copy_from(compositeEffect.get());
       }
 
-      if (imageProps->resizeMode == facebook::react::ImageResizeMode::Repeat) {
+      if (imgProps.resizeMode == facebook::react::ImageResizeMode::Repeat) {
         winrt::com_ptr<ID2D1Effect> borderEffect;
         winrt::check_hresult(d2dDeviceContext->CreateEffect(CLSID_D2D1Border, borderEffect.put()));
         winrt::check_hresult(borderEffect->SetValue(D2D1_BORDER_PROP_EDGE_MODE_X, D2D1_BORDER_EDGE_MODE_WRAP));
@@ -386,51 +385,6 @@ void ImageComponentView::DrawImage() noexcept {
   }
 }
 
-void ImageComponentView::prepareForRecycle() noexcept {}
-
-facebook::react::SharedViewProps ImageComponentView::viewProps() noexcept {
-  return m_props;
-}
-
-facebook::react::Tag ImageComponentView::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 ((ignorePointerEvents || m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
-       m_props->pointerEvents == facebook::react::PointerEventsMode::BoxNone) &&
-      anyHitTestHelper(targetTag, ptLocal, localPt))
-    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 ImageComponentView::ensureVisual() noexcept {
-  if (!m_visual) {
-    m_visual = m_compContext.CreateSpriteVisual();
-    OuterVisual().InsertAt(m_visual, 0);
-  }
-}
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ImageComponentView::Visual() const noexcept {
-  return m_visual;
-}
-
-bool ImageComponentView::focusable() const noexcept {
-  return m_props->focusable;
-}
-
 std::string ImageComponentView::DefaultControlType() const noexcept {
   return "image";
 }

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

@@ -29,8 +29,8 @@ namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
 struct WindowsImageResponseObserver;
 
-struct ImageComponentView : ImageComponentViewT<ImageComponentView, ComponentView> {
-  using Super = ImageComponentViewT<ImageComponentView, ComponentView>;
+struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponentView> {
+  using Super = ImageComponentViewT<ImageComponentView, ViewComponentView>;
 
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -47,25 +47,25 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ComponentVie
       override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
       override;
-  void updateLayoutMetrics(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
-  void prepareForRecycle() noexcept override;
-  facebook::react::SharedViewProps viewProps() noexcept override;
   void OnRenderingDeviceLost() noexcept override;
   void onThemeChanged() noexcept override;
 
-  facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
-      const noexcept override;
-  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual Visual() const noexcept override;
-  bool focusable() const noexcept override;
   virtual std::string DefaultControlType() const noexcept;
+  static facebook::react::SharedViewProps defaultProps() noexcept;
 
   ImageComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
+  const facebook::react::ImageProps &imageProps() const noexcept;
+  // TODO try to change to ViewProps
+  winrt::Microsoft::ReactNative::ImageProps ImageProps() noexcept;
+  winrt::Microsoft::ReactNative::ImageProps ViewProps() noexcept;
+
+ protected:
+  winrt::Microsoft::ReactNative::ViewProps ViewPropsInner() noexcept override;
+
  private:
   struct WindowsImageResponseObserver : facebook::react::ImageResponseObserver {
    public:
@@ -78,7 +78,6 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ComponentVie
     winrt::com_ptr<ImageComponentView> m_image;
   };
 
-  void ensureVisual() noexcept;
   void ensureDrawingSurface() noexcept;
   void DrawImage() noexcept;
 
@@ -90,9 +89,6 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ComponentVie
       facebook::react::ImageShadowNode::ConcreteState::Shared const &state) noexcept;
   bool themeEffectsImage() const noexcept;
 
-  std::shared_ptr<const facebook::react::ImageProps> m_props;
-
-  winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual m_visual{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush m_drawingSurface;
   std::shared_ptr<ImageResponseImage> m_imageResponseImage;
   std::shared_ptr<WindowsImageResponseObserver> m_imageResponseObserver;

package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp

@@ -23,14 +23,13 @@ WindowsModalHostComponentView::WindowsModalHostComponentView(
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : Super(
+          WindowsModalHostComponentView::defaultProps(),
           compContext,
           tag,
           reactContext,
           ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
           false) {
-  m_props = std::make_shared<facebook::react::ModalHostViewProps const>();
   m_context = reactContext; // save context
-  m_visual = compContext.CreateSpriteVisual();
 }
 
 winrt::Microsoft::ReactNative::ComponentView WindowsModalHostComponentView::Create(
@@ -201,7 +200,8 @@ void WindowsModalHostComponentView::HandleCommand(
 void WindowsModalHostComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldModalProps = *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(m_props);
+  const auto &oldModalProps =
+      *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(oldProps ? oldProps : viewProps());
   const auto &newModalProps = *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(props);
 
   // currently Modal only gets Destroyed by closing the window
@@ -210,20 +210,15 @@ void WindowsModalHostComponentView::updateProps(
     ShowOnUIThread();
   }
 
-  // update BaseComponentView props
-  updateTransformProps(oldModalProps, newModalProps, m_visual);
-  Super::updateProps(props, oldProps);
-  m_props = std::static_pointer_cast<facebook::react::ModalHostViewProps const>(props);
+  base_type::updateProps(props, oldProps);
 }
 
 void WindowsModalHostComponentView::updateLayoutMetrics(
     facebook::react::LayoutMetrics const &layoutMetrics,
     facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
-  if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
-    OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
-  }
+  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 
-  // Temparary placeholder for Modal, draws on main hwnd
+  // Temporary placeholder for Modal, draws on main hwnd
   if (m_layoutMetrics.frame.size != layoutMetrics.frame.size ||
       m_layoutMetrics.pointScaleFactor != layoutMetrics.pointScaleFactor || m_layoutMetrics.frame.size.width == 0) {
     // Always make visual a min size, so that even if its laid out at zero size, its clear an unimplemented view was
@@ -241,9 +236,9 @@ void WindowsModalHostComponentView::updateLayoutMetrics(
     drawingSurface.HorizontalAlignmentRatio(0.f);
     drawingSurface.VerticalAlignmentRatio(0.f);
     drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
-    m_visual.Brush(drawingSurface);
-    m_visual.Size(surfaceSize);
-    m_visual.Offset({
+    Visual().as<Experimental::ISpriteVisual>().Brush(drawingSurface);
+    Visual().Size(surfaceSize);
+    Visual().Offset({
         layoutMetrics.frame.origin.x * layoutMetrics.pointScaleFactor,
         layoutMetrics.frame.origin.y * layoutMetrics.pointScaleFactor,
         0.0f,
@@ -290,28 +285,18 @@ void WindowsModalHostComponentView::updateLayoutMetrics(
       }
     }
   }
-
-  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 }
 
 void WindowsModalHostComponentView::updateState(
     facebook::react::State::Shared const &state,
     facebook::react::State::Shared const &oldState) noexcept {}
 
-void WindowsModalHostComponentView::prepareForRecycle() noexcept {}
-
-facebook::react::SharedViewProps WindowsModalHostComponentView::viewProps() noexcept {
-  return m_props;
-}
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual WindowsModalHostComponentView::Visual()
-    const noexcept {
-  return m_visual;
+facebook::react::SharedViewProps WindowsModalHostComponentView::defaultProps() noexcept {
+  static auto const defaultProps = std::make_shared<facebook::react::ModalHostViewProps const>();
+  return defaultProps;
 }
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual WindowsModalHostComponentView::OuterVisual()
-    const noexcept {
-  return m_visual;
+const facebook::react::ModalHostViewProps &WindowsModalHostComponentView::modalHostViewProps() const noexcept {
+  return *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(viewProps());
 }
 
 facebook::react::Tag WindowsModalHostComponentView::hitTest(
@@ -320,8 +305,8 @@ facebook::react::Tag WindowsModalHostComponentView::hitTest(
     bool ignorePointerEvents) const noexcept {
   facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
 
-  if ((ignorePointerEvents || m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
-       m_props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
+  if ((ignorePointerEvents || viewProps()->pointerEvents == facebook::react::PointerEventsMode::Auto ||
+       viewProps()->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;