react-native-windows 0.74.4 → 0.74.5

package/Libraries/Components/TextInput/TextInput.windows.js

@@ -1346,9 +1346,13 @@ function InternalTextInput(props: Props): React.Node {
               );
             }
           },
-          // TODO: Fix this returning true on null === null, when no input is focused
           isFocused(): boolean {
-            return TextInputState.currentlyFocusedInput() === inputRef.current;
+            const currentlyFocusedInput =
+              TextInputState.currentlyFocusedInput();
+            return (
+              currentlyFocusedInput !== null &&
+              currentlyFocusedInput === inputRef.current
+            );
           },
           getNativeRef(): ?React.ElementRef<HostComponent<mixed>> {
             return inputRef.current;

package/Libraries/Components/View/View.windows.js

@@ -175,6 +175,9 @@ const View: React.AbstractComponent<
     // [Windows
     // $FlowFixMe - children typing
     const childrenWithImportantForAccessibility = children => {
+      if (children == null) {
+        return children;
+      }
       const updatedChildren = React.Children.map(children, child => {
         if (React.isValidElement(child)) {
           // $FlowFixMe[incompatible-use]

package/Microsoft.ReactNative/CompositionComponentView.idl

@@ -26,6 +26,15 @@ namespace Microsoft.ReactNative.Composition
     Default       = 0x00000007, // ShadowProps | NativeBorder | Background
   };
 
+  namespace Experimental {
+    [webhosthidden]
+    [experimental]
+    interface IInternalCreateComponentViewArgs
+    {
+      ICompositionContext CompositionContext { get; };
+    }
+  }
+
   [experimental]
   [webhosthidden]
   runtimeclass CreateCompositionComponentViewArgs : Microsoft.ReactNative.CreateComponentViewArgs {
@@ -72,7 +81,7 @@ namespace Microsoft.ReactNative.Composition
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass SwitchComponentView : ComponentView {
+  unsealed runtimeclass SwitchComponentView : ViewComponentView {
   };
 
   [experimental]
@@ -90,31 +99,32 @@ namespace Microsoft.ReactNative.Composition
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ActivityIndicatorComponentView : ComponentView {
+  unsealed runtimeclass ActivityIndicatorComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass WindowsModalHostComponentView : ComponentView {
+  unsealed runtimeclass WindowsModalHostComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ImageComponentView : ComponentView {
+  unsealed runtimeclass ImageComponentView : ViewComponentView {
+    Microsoft.ReactNative.ImageProps ViewProps { get; };
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ParagraphComponentView : ComponentView {
+  unsealed runtimeclass ParagraphComponentView : ViewComponentView {
   };
 
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass ScrollViewComponentView : ComponentView {
+  unsealed runtimeclass ScrollViewComponentView : ViewComponentView {
   };
 
   [experimental]
@@ -126,7 +136,7 @@ namespace Microsoft.ReactNative.Composition
   [experimental]
   [webhosthidden]
   [default_interface]
-  unsealed runtimeclass WindowsTextInputComponentView : ComponentView {
+  unsealed runtimeclass WindowsTextInputComponentView : ViewComponentView {
   };
   
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/CompositionRootView.idl

@@ -99,6 +99,7 @@ namespace Microsoft.ReactNative
     Microsoft.ReactNative.Composition.ICustomResourceLoader Resources;
 
     Microsoft.ReactNative.Composition.Theme Theme { get; };
+    Int64 RootTag { get; };
 
 #ifdef USE_WINUI3
     Microsoft.UI.Content.ContentIsland Island { get; };

package/Microsoft.ReactNative/CompositionUIService.idl

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import "ReactInstanceSettings.idl";
+import "ComponentView.idl";
 
 #include "DocString.h"
 
@@ -22,5 +23,8 @@ namespace Microsoft.ReactNative.Composition
       "Gets the Compositor used by this ReactNative instance.")
     static Microsoft.UI.Composition.Compositor GetCompositor(Microsoft.ReactNative.IReactPropertyBag properties);
 
+    DOC_STRING("Gets the ComponentView from a react tag.")
+    static Microsoft.ReactNative.ComponentView ComponentFromReactTag(Microsoft.ReactNative.IReactContext context, Int64 reactTag);
+
   }
 } // namespace Microsoft.ReactNative.Composition

package/Microsoft.ReactNative/Fabric/AbiViewComponentDescriptor.cpp

@@ -99,7 +99,8 @@ facebook::react::Props::Shared AbiViewComponentDescriptor::cloneProps(
   // 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 viewProps = winrt::make<winrt::Microsoft::ReactNative::implementation::UserViewProps>(shadowNodeProps);
+  auto viewProps =
+      winrt::make<winrt::Microsoft::ReactNative::implementation::ViewProps>(shadowNodeProps, false /*holdRef*/);
   auto userProps =
       winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
           ->CreateProps(viewProps);

package/Microsoft.ReactNative/Fabric/AbiViewProps.cpp

@@ -7,10 +7,12 @@
 
 #include <Fabric/Composition/Theme.h>
 #include <JSValueReader.h>
+#include <react/renderer/components/image/ImageProps.h>
+#include <winrt/Microsoft.ReactNative.h>
+#include <winrt/Windows.Foundation.h>
 
-#if __has_include("Color.g.cpp")
 #include "Color.g.cpp"
-#endif
+#include "ImageSource.g.cpp"
 
 namespace Microsoft::ReactNative {
 
@@ -21,24 +23,24 @@ AbiViewProps::AbiViewProps(
     : facebook::react::ViewProps(context, sourceProps, rawProps) {}
 
 AbiViewProps::~AbiViewProps() {
-  if (m_userProps) {
-    winrt::get_self<winrt::Microsoft::ReactNative::implementation::UserViewProps>(m_userProps)->Disconnect();
+  if (m_innerProps) {
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ViewProps>(m_innerProps)->Disconnect();
   }
 }
 
 void AbiViewProps::SetUserProps(
-    winrt::Microsoft::ReactNative::IComponentProps componentProps,
-    winrt::Microsoft::ReactNative::ViewProps userProps) noexcept {
-  m_componentProps = componentProps;
+    winrt::Microsoft::ReactNative::IComponentProps userProps,
+    winrt::Microsoft::ReactNative::ViewProps innerProps) noexcept {
   m_userProps = userProps;
+  m_innerProps = innerProps;
 }
 
 winrt::Microsoft::ReactNative::IComponentProps AbiViewProps::UserProps() const noexcept {
-  return m_componentProps;
+  return m_userProps;
 }
 
 winrt::Microsoft::ReactNative::ViewProps AbiViewProps::ViewProps() const noexcept {
-  return m_userProps;
+  return m_innerProps;
 }
 
 } // namespace Microsoft::ReactNative
@@ -124,29 +126,114 @@ winrt::Microsoft::ReactNative::Color Color::White() noexcept {
   return winrt::make<Color>(facebook::react::whiteColor());
 }
 
-UserViewProps::UserViewProps(std::shared_ptr<::Microsoft::ReactNative::AbiViewProps const> viewProps) noexcept
-    : m_viewProps(viewProps.get()) {}
+ImageSource::ImageSource(const facebook::react::ImageSource &imageSource) : m_imageSource(imageSource) {}
+
+ImageSourceType ImageSource::Type() noexcept {
+  static_assert(
+      winrt::Microsoft::ReactNative::ImageSourceType::Invalid ==
+      static_cast<winrt::Microsoft::ReactNative::ImageSourceType>(facebook::react::ImageSource::Type::Invalid));
+  static_assert(
+      winrt::Microsoft::ReactNative::ImageSourceType::Remote ==
+      static_cast<winrt::Microsoft::ReactNative::ImageSourceType>(facebook::react::ImageSource::Type::Remote));
+  static_assert(
+      winrt::Microsoft::ReactNative::ImageSourceType::Local ==
+      static_cast<winrt::Microsoft::ReactNative::ImageSourceType>(facebook::react::ImageSource::Type::Local));
+  return static_cast<winrt::Microsoft::ReactNative::ImageSourceType>(m_imageSource.type);
+}
+
+winrt::hstring ImageSource::Uri() noexcept {
+  return winrt::to_hstring(m_imageSource.uri);
+}
 
-void UserViewProps::Disconnect() noexcept {
+winrt::hstring ImageSource::Bundle() noexcept {
+  return winrt::to_hstring(m_imageSource.bundle);
+}
+
+float ImageSource::Scale() noexcept {
+  return m_imageSource.scale;
+}
+
+winrt::Windows::Foundation::Size ImageSource::Size() noexcept {
+  return {m_imageSource.size.width, m_imageSource.size.height};
+}
+
+winrt::Microsoft::ReactNative::ImageSource ImageSource::ReadValue(
+    const winrt::Microsoft::ReactNative::IJSValueReader &reader) noexcept {
+  facebook::react::ImageSource imageSource;
+  switch (reader.ValueType()) {
+    case JSValueType::String: {
+      imageSource.type = facebook::react::ImageSource::Type::Remote;
+      imageSource.uri = winrt::to_string(reader.GetString());
+      break;
+    }
+    case JSValueType::Object: {
+      imageSource.type = facebook::react::ImageSource::Type::Remote;
+
+      winrt::hstring propertyName;
+      while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
+        if (propertyName == L"__packager_asset") {
+          imageSource.type = facebook::react::ImageSource::Type::Local;
+        } else if (propertyName == L"width") {
+          imageSource.size.width = static_cast<float>(reader.GetDouble());
+        } else if (propertyName == L"height") {
+          imageSource.size.height = static_cast<float>(reader.GetDouble());
+        } else if (propertyName == L"scale") {
+          imageSource.scale = static_cast<float>(reader.GetDouble());
+        } else if (propertyName == L"uri") {
+          imageSource.uri = winrt::to_string(reader.GetString());
+        } else if (propertyName == L"url") {
+          imageSource.uri = winrt::to_string(reader.GetString());
+        } else if (propertyName == L"bundle") {
+          imageSource.bundle = winrt::to_string(reader.GetString());
+          imageSource.type = facebook::react::ImageSource::Type::Local;
+        }
+      }
+      break;
+    }
+    default: {
+      imageSource.type = facebook::react::ImageSource::Type::Invalid;
+      break;
+    }
+  }
+  return winrt::make<ImageSource>(imageSource);
+}
+
+ViewProps::ViewProps(facebook::react::SharedViewProps props, bool holdRef) noexcept
+    : m_props(holdRef ? props : nullptr), m_viewProps(static_cast<const facebook::react::ViewProps *>(props.get())) {}
+
+void ViewProps::Disconnect() noexcept {
   m_viewProps = nullptr;
 }
 
-float UserViewProps::Opacity() noexcept {
+float ViewProps::Opacity() noexcept {
   return m_viewProps ? m_viewProps->opacity : 1.0f;
 }
 
-winrt::Microsoft::ReactNative::Color UserViewProps::BackgroundColor() noexcept {
+winrt::Microsoft::ReactNative::Color ViewProps::BackgroundColor() noexcept {
   return winrt::make<Color>(m_viewProps ? m_viewProps->backgroundColor : facebook::react::clearColor());
 }
 
-ViewProps::ViewProps(facebook::react::SharedViewProps props) noexcept : m_props(props) {}
+winrt::hstring ViewProps::TestId() noexcept {
+  return m_viewProps ? winrt::to_hstring(m_viewProps->testId) : winrt::hstring{};
+}
 
-float ViewProps::Opacity() noexcept {
-  return m_props->opacity;
+winrt::hstring ViewProps::AccessibilityLabel() noexcept {
+  return m_viewProps ? winrt::to_hstring(m_viewProps->accessibilityLabel) : winrt::hstring{};
 }
 
-winrt::Microsoft::ReactNative::Color ViewProps::BackgroundColor() noexcept {
-  return winrt::make<Color>(m_props->backgroundColor);
+ImageProps::ImageProps(facebook::react::SharedViewProps props) noexcept : Super(props) {}
+
+winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::ReactNative::ImageSource>
+ImageProps::Sources() noexcept {
+  winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::ReactNative::ImageSource> sources{
+      winrt::single_threaded_vector<winrt::Microsoft::ReactNative::ImageSource>()};
+  const auto imageProps = std::static_pointer_cast<const facebook::react::ImageProps>(m_props);
+
+  for (const auto &source : imageProps->sources) {
+    sources.Append(winrt::make<ImageSource>(source));
+  }
+
+  return sources.GetView();
 }
 
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/AbiViewProps.h

@@ -4,9 +4,12 @@
 #pragma once
 
 #include "Color.g.h"
+#include "ImageProps.g.h"
+#include "ImageSource.g.h"
 #include "ViewProps.g.h"
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/imagemanager/primitives.h>
 #include "winrt/Microsoft.ReactNative.Composition.Experimental.h"
 #include "winrt/Microsoft.ReactNative.h"
 
@@ -22,14 +25,14 @@ class AbiViewProps final : public facebook::react::ViewProps {
   ~AbiViewProps();
 
   void SetUserProps(
-      winrt::Microsoft::ReactNative::IComponentProps componentProps,
-      winrt::Microsoft::ReactNative::ViewProps userProps) noexcept;
+      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_componentProps{nullptr};
-  winrt::Microsoft::ReactNative::ViewProps m_userProps{nullptr};
+  winrt::Microsoft::ReactNative::IComponentProps m_userProps{nullptr};
+  winrt::Microsoft::ReactNative::ViewProps m_innerProps{nullptr};
 };
 
 } // namespace Microsoft::ReactNative
@@ -60,27 +63,55 @@ struct Color : ColorT<Color, Composition::Experimental::IInternalColor> {
   facebook::react::SharedColor m_color;
 };
 
-struct UserViewProps : ViewPropsT<UserViewProps> {
-  UserViewProps(std::shared_ptr<::Microsoft::ReactNative::AbiViewProps const> viewProps) noexcept;
+struct ImageSource : ImageSourceT<ImageSource> {
+  ImageSource(const facebook::react::ImageSource &imageSource);
 
-  float Opacity() noexcept;
-  winrt::Microsoft::ReactNative::Color BackgroundColor() noexcept;
+  ImageSourceType Type() noexcept;
+  winrt::hstring Uri() noexcept;
+  winrt::hstring Bundle() noexcept;
+  float Scale() noexcept;
+  winrt::Windows::Foundation::Size Size() noexcept;
 
-  void Disconnect() noexcept;
+  static winrt::Microsoft::ReactNative::ImageSource ReadValue(
+      const winrt::Microsoft::ReactNative::IJSValueReader &reader) noexcept;
+
+  static void WriteValue(
+      const winrt::Microsoft::ReactNative::IJSValueWriter &writer,
+      const winrt::Microsoft::ReactNative::ImageSource &value) noexcept;
 
  private:
-  // Use a raw pointer here to avoid a ref cycle with AbiViewProps.  ~AbiViewProps will clear this pointer
-  ::Microsoft::ReactNative::AbiViewProps const *m_viewProps{nullptr};
+  const facebook::react::ImageSource m_imageSource;
 };
 
+/**
+ * When providing a external ViewProps object on a normal ComponentView, ViewProps will hold a reference to the internal
+ * facebook::react::ViewProps object since the ComponentView could release the object at any time. However, when
+ * providing a ViewProps object on a custom ComponentView that has a custom app provided props, the AbiViewProps object
+ * will already be holding a reference to this object, so we only hold onto a weak reference.
+ */
 struct ViewProps : ViewPropsT<ViewProps> {
-  ViewProps(facebook::react::SharedViewProps props) noexcept;
+  ViewProps(facebook::react::SharedViewProps props, bool holdRef = true) noexcept;
+
+  // Notification when the owning AbiViewProps is going away.
+  void Disconnect() noexcept;
 
   float Opacity() noexcept;
   winrt::Microsoft::ReactNative::Color BackgroundColor() noexcept;
+  winrt::hstring TestId() noexcept;
+  winrt::hstring AccessibilityLabel() noexcept;
 
- private:
+ protected:
   facebook::react::SharedViewProps m_props;
+
+  // Use a raw pointer here to avoid a ref cycle with AbiViewProps.  ~AbiViewProps will clear this pointer
+  facebook::react::ViewProps const *m_viewProps{nullptr};
+};
+
+struct ImageProps : ImagePropsT<ImageProps, ViewProps> {
+  using Super = ImagePropsT<ImageProps, ViewProps>;
+  ImageProps(facebook::react::SharedViewProps props) noexcept;
+
+  winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::ReactNative::ImageSource> Sources() noexcept;
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation
@@ -88,5 +119,6 @@ struct ViewProps : ViewPropsT<ViewProps> {
 namespace winrt::Microsoft::ReactNative::factory_implementation {
 
 struct Color : ColorT<Color, implementation::Color> {};
+struct ImageSource : ImageSourceT<ImageSource, implementation::ImageSource> {};
 
 } // namespace winrt::Microsoft::ReactNative::factory_implementation

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

@@ -24,9 +24,13 @@ ActivityIndicatorComponentView::ActivityIndicatorComponentView(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
-    : Super(compContext, tag, reactContext, ComponentViewFeatures::Default, false) {
-  m_props = std::make_shared<facebook::react::ActivityIndicatorViewProps const>();
-}
+    : Super(
+          ActivityIndicatorComponentView::defaultProps(),
+          compContext,
+          tag,
+          reactContext,
+          ComponentViewFeatures::Default,
+          false) {}
 
 void ActivityIndicatorComponentView::MountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
@@ -53,14 +57,11 @@ void ActivityIndicatorComponentView::updateProgressColor(const facebook::react::
 void ActivityIndicatorComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto oldViewProps = std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(m_props);
+  const auto oldViewProps =
+      std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(oldProps ? oldProps : viewProps());
   const auto newViewProps = std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(props);
 
-  ensureVisual();
-
-  if (newViewProps->testId != oldViewProps->testId) {
-    m_visual.Comment(winrt::to_hstring(newViewProps->testId));
-  }
+  Super::updateProps(props, oldProps);
 
   // update color if needed
   if (!oldProps || newViewProps->color != oldViewProps->color) {
@@ -70,10 +71,6 @@ void ActivityIndicatorComponentView::updateProps(
   if (newViewProps->animating != oldViewProps->animating) {
     m_ActivityIndicatorVisual.IsVisible(newViewProps->animating);
   }
-
-  Super::updateProps(props, oldProps);
-
-  m_props = std::static_pointer_cast<facebook::react::ViewProps const>(props);
 }
 
 void ActivityIndicatorComponentView::FinalizeUpdates(
@@ -81,8 +78,7 @@ void ActivityIndicatorComponentView::FinalizeUpdates(
   static constexpr float radiusSmall = 10.0f;
   static constexpr float radiusLarge = 18.0f;
 
-  if (std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(m_props)->size ==
-      facebook::react::ActivityIndicatorViewSize::Small) {
+  if (activityIndicatorViewProps().size == facebook::react::ActivityIndicatorViewSize::Small) {
     m_ActivityIndicatorVisual.Size(radiusSmall * m_layoutMetrics.pointScaleFactor);
   } else {
     m_ActivityIndicatorVisual.Size(radiusLarge * m_layoutMetrics.pointScaleFactor);
@@ -96,67 +92,35 @@ void ActivityIndicatorComponentView::updateState(
 void ActivityIndicatorComponentView::updateLayoutMetrics(
     facebook::react::LayoutMetrics const &layoutMetrics,
     facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
-  // Set Position & Size Properties
-  ensureVisual();
-
-  if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
-    OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
-  }
-
   Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
-  m_visual.Size(
-      {layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
-       layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
 }
 
-void ActivityIndicatorComponentView::prepareForRecycle() noexcept {}
+winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
+ActivityIndicatorComponentView::createVisual() noexcept {
+  auto visual = m_compContext.CreateSpriteVisual();
+  m_ActivityIndicatorVisual = m_compContext.CreateActivityVisual();
 
-facebook::react::SharedViewProps ActivityIndicatorComponentView::viewProps() noexcept {
-  return m_props;
-}
-
-void ActivityIndicatorComponentView::ensureVisual() noexcept {
-  if (!m_visual) {
-    m_visual = m_compContext.CreateSpriteVisual();
-    m_ActivityIndicatorVisual = m_compContext.CreateActivityVisual();
-
-    OuterVisual().InsertAt(m_ActivityIndicatorVisual, 0);
-    OuterVisual().InsertAt(m_visual, 0);
-  }
-}
-
-facebook::react::Tag ActivityIndicatorComponentView::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};
-
-  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;
-}
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ActivityIndicatorComponentView::Visual()
-    const noexcept {
-  return m_visual;
+  OuterVisual().InsertAt(m_ActivityIndicatorVisual, 0);
+  return visual;
 }
 
 void ActivityIndicatorComponentView::onThemeChanged() noexcept {
-  updateProgressColor(std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(m_props)->color);
+  updateProgressColor(activityIndicatorViewProps().color);
   Super::onThemeChanged();
 }
 
-bool ActivityIndicatorComponentView::focusable() const noexcept {
-  return false;
-}
-
 std::string ActivityIndicatorComponentView::DefaultControlType() const noexcept {
   return "progressbar";
 }
 
+facebook::react::SharedViewProps ActivityIndicatorComponentView::defaultProps() noexcept {
+  static auto const defaultProps = std::make_shared<facebook::react::ActivityIndicatorViewProps const>();
+  return defaultProps;
+}
+
+const facebook::react::ActivityIndicatorViewProps &ActivityIndicatorComponentView::activityIndicatorViewProps()
+    const noexcept {
+  return *std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(viewProps());
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -13,8 +13,9 @@
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct ActivityIndicatorComponentView : ActivityIndicatorComponentViewT<ActivityIndicatorComponentView, ComponentView> {
-  using Super = ActivityIndicatorComponentViewT<ActivityIndicatorComponentView, ComponentView>;
+struct ActivityIndicatorComponentView
+    : ActivityIndicatorComponentViewT<ActivityIndicatorComponentView, ViewComponentView> {
+  using Super = ActivityIndicatorComponentViewT<ActivityIndicatorComponentView, ViewComponentView>;
 
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -35,14 +36,8 @@ struct ActivityIndicatorComponentView : ActivityIndicatorComponentViewT<Activity
       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;
-  bool focusable() const 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;
   virtual std::string DefaultControlType() const noexcept;
 
   ActivityIndicatorComponentView(
@@ -50,14 +45,15 @@ struct ActivityIndicatorComponentView : ActivityIndicatorComponentViewT<Activity
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
+  static facebook::react::SharedViewProps defaultProps() noexcept;
+  const facebook::react::ActivityIndicatorViewProps &activityIndicatorViewProps() const noexcept;
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept override;
+
  private:
-  void ensureVisual() noexcept;
   void updateVisualSize() noexcept;
   void updateProgressColor(const facebook::react::SharedColor &color) noexcept;
 
-  winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual m_visual{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual m_ActivityIndicatorVisual{nullptr};
-  facebook::react::SharedViewProps m_props;
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -247,6 +247,10 @@ void CompositionRootView::ScaleFactor(float value) noexcept {
   }
 }
 
+int64_t CompositionRootView::RootTag() const noexcept {
+  return m_rootTag;
+}
+
 winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader CompositionRootView::Resources() noexcept {
   return m_resources;
 }

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

@@ -88,6 +88,8 @@ struct CompositionRootView
 
   winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *GetComponentView() noexcept;
 
+  int64_t RootTag() const noexcept;
+
   IInspectable GetUiaProvider() noexcept;
 
   // When driving the rootview without an island

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

@@ -96,6 +96,10 @@ int64_t CompositionRootView::GetTag() const noexcept {
   return 0;
 }
 
+int64_t CompositionRootView::RootTag() const noexcept {
+  return 0;
+}
+
 void CompositionRootView::SetTag(int64_t) noexcept {}
 
 void CompositionRootView::SetWindow(uint64_t) noexcept {}

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

@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "CompositionUIService.h"
 #include "Composition.CompositionUIService.g.cpp"
+#include <Fabric/FabricUIManagerModule.h>
 #include <QuirkSettings.h>
 
 #include <ReactPropertyBag.h>
@@ -39,4 +40,15 @@ Experimental::ICompositionContext CompositionUIService::GetCompositionContext(
   return ReactPropertyBag(properties).Get(CompositionContextPropertyId());
 }
 
+winrt::Microsoft::ReactNative::ComponentView CompositionUIService::ComponentFromReactTag(
+    const winrt::Microsoft::ReactNative::IReactContext &context,
+    int64_t reactTag) noexcept {
+  if (std::shared_ptr<::Microsoft::ReactNative::FabricUIManager> fabricuiManager =
+          ::Microsoft::ReactNative::FabricUIManager::FromProperties(ReactPropertyBag(context.Properties()))) {
+    return fabricuiManager->GetViewRegistry().findComponentViewWithTag(static_cast<facebook::react::Tag>(reactTag));
+  }
+
+  return nullptr;
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -16,6 +16,10 @@ struct CompositionUIService : CompositionUIServiceT<CompositionUIService> {
   static winrt::Microsoft::UI::Composition::Compositor GetCompositor(const IReactPropertyBag &properties) noexcept;
 
   static Experimental::ICompositionContext GetCompositionContext(const IReactPropertyBag &properties) noexcept;
+
+  static winrt::Microsoft::ReactNative::ComponentView ComponentFromReactTag(
+      const winrt::Microsoft::ReactNative::IReactContext &context,
+      int64_t reactTag) noexcept;
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation