react-native-windows 0.74.4 → 0.74.6

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

@@ -132,6 +132,12 @@ CompositionRootView::CompositionRootView(const winrt::Microsoft::UI::Composition
 #endif
 
 CompositionRootView::~CompositionRootView() noexcept {
+#ifdef USE_WINUI3
+  if (m_island && m_island.IsConnected()) {
+    m_island.AutomationProviderRequested(m_islandAutomationProviderRequestedToken);
+  }
+#endif
+
   if (m_uiDispatcher) {
     assert(m_uiDispatcher.HasThreadAccess());
     UninitRootView();
@@ -193,7 +199,7 @@ void CompositionRootView::RemoveRenderedVisual(
 
 bool CompositionRootView::TrySetFocus() noexcept {
 #ifdef USE_WINUI3
-  if (m_island) {
+  if (m_island && m_island.IsConnected()) {
     auto focusController = winrt::Microsoft::UI::Input::InputFocusController::GetForIsland(m_island);
     return focusController.TrySetFocus();
   }
@@ -247,6 +253,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;
 }
@@ -651,20 +661,29 @@ winrt::Microsoft::UI::Content::ContentIsland CompositionRootView::Island() noexc
             rootVisual));
     m_island = winrt::Microsoft::UI::Content::ContentIsland::Create(rootVisual);
 
-    m_island.AutomationProviderRequested(
-        [this](
+    // ContentIsland does not support weak_ref, so we cannot use auto_revoke for these events
+    m_islandAutomationProviderRequestedToken = m_island.AutomationProviderRequested(
+        [weakThis = get_weak()](
             winrt::Microsoft::UI::Content::ContentIsland const &,
             winrt::Microsoft::UI::Content::ContentIslandAutomationProviderRequestedEventArgs const &args) {
-          auto provider = GetUiaProvider();
-          auto pRootProvider =
-              static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
-                  provider.as<IRawElementProviderSimple>().get());
-          if (pRootProvider != nullptr) {
-            pRootProvider->SetIsland(m_island);
+          if (auto pThis = weakThis.get()) {
+            auto provider = pThis->GetUiaProvider();
+            auto pRootProvider =
+                static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
+                    provider.as<IRawElementProviderSimple>().get());
+            if (pRootProvider != nullptr) {
+              pRootProvider->SetIsland(pThis->m_island);
+            }
+            args.AutomationProvider(std::move(provider));
+            args.Handled(true);
           }
-          args.AutomationProvider(std::move(provider));
-          args.Handled(true);
         });
+
+    m_islandFrameworkClosedToken = m_island.FrameworkClosed([weakThis = get_weak()]() {
+      if (auto pThis = weakThis.get()) {
+        pThis->m_island = nullptr;
+      }
+    });
   }
   return m_island;
 }

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
@@ -119,6 +121,8 @@ struct CompositionRootView
 #ifdef USE_WINUI3
   winrt::Microsoft::UI::Composition::Compositor m_compositor{nullptr};
   winrt::Microsoft::UI::Content::ContentIsland m_island{nullptr};
+  winrt::event_token m_islandFrameworkClosedToken;
+  winrt::event_token m_islandAutomationProviderRequestedToken;
 #endif
 
   HWND m_hwnd{0};

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

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

@@ -121,6 +121,10 @@ winrt::Microsoft::ReactNative::Composition::Theme ComponentView::Theme() const n
   return theme()->get_strong().as<winrt::Microsoft::ReactNative::Composition::Theme>();
 }
 
+winrt::Microsoft::ReactNative::Composition::RootComponentView ComponentView::Root() noexcept {
+  return *rootComponentView();
+}
+
 winrt::Microsoft::UI::Composition::Compositor ComponentView::Compositor() const noexcept {
   return winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerCompositor(
       m_compContext);
@@ -134,7 +138,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) {
@@ -178,32 +183,38 @@ void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentView
   base_type::FinalizeUpdates(updateMask);
 }
 
-void ComponentView::onFocusLost() noexcept {
-  m_eventEmitter->onBlur();
-  showFocusVisual(false);
-  if (m_uiaProvider) {
-    winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
-        m_uiaProvider, UIA_HasKeyboardFocusPropertyId, true, false);
+void ComponentView::onLostFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  if (args.OriginalSource() == Tag()) {
+    m_eventEmitter->onBlur();
+    showFocusVisual(false);
+    if (m_uiaProvider) {
+      winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+          m_uiaProvider, UIA_HasKeyboardFocusPropertyId, true, false);
+    }
   }
-  base_type::onFocusLost();
+  base_type::onLostFocus(args);
 }
 
-void ComponentView::onFocusGained() noexcept {
-  m_eventEmitter->onFocus();
-  if (m_enableFocusVisual) {
-    showFocusVisual(true);
-  }
-  if (m_uiaProvider) {
-    auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
-    if (spProviderSimple != nullptr) {
-      winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
-          m_uiaProvider, UIA_HasKeyboardFocusPropertyId, false, true);
-      UiaRaiseAutomationEvent(spProviderSimple.get(), UIA_AutomationFocusChangedEventId);
+void ComponentView::onGotFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  if (args.OriginalSource() == Tag()) {
+    m_eventEmitter->onFocus();
+    if (m_enableFocusVisual) {
+      showFocusVisual(true);
+    }
+    if (m_uiaProvider) {
+      auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
+      if (spProviderSimple != nullptr) {
+        winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+            m_uiaProvider, UIA_HasKeyboardFocusPropertyId, false, true);
+        UiaRaiseAutomationEvent(spProviderSimple.get(), UIA_AutomationFocusChangedEventId);
+      }
     }
-  }
 
-  StartBringIntoView({});
-  base_type::onFocusGained();
+    StartBringIntoView({});
+  }
+  base_type::onGotFocus(args);
 }
 
 void ComponentView::StartBringIntoView(
@@ -233,13 +244,13 @@ void ComponentView::HandleCommand(
     const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
   if (commandName == L"focus") {
     if (auto root = rootComponentView()) {
-      root->SetFocusedComponent(*get_strong());
+      root->TrySetFocusedComponent(*get_strong());
     }
     return;
   }
   if (commandName == L"blur") {
     if (auto root = rootComponentView()) {
-      root->SetFocusedComponent(nullptr); // Todo store this component as previously focused element
+      root->TrySetFocusedComponent(nullptr); // Todo store this component as previously focused element
     }
     return;
   }
@@ -1455,6 +1466,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 +1475,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 +1523,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 +1538,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 +1549,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 +1588,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 +1654,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 +1729,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,14 +64,19 @@ 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;
   };
+
+  winrt::Microsoft::ReactNative::Composition::RootComponentView Root() noexcept;
+
   void Theme(const winrt::Microsoft::ReactNative::Composition::Theme &theme) noexcept;
   winrt::Microsoft::ReactNative::Composition::Theme Theme() const noexcept;
   void onThemeChanged() noexcept override;
-  void onFocusLost() noexcept override;
-  void onFocusGained() 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;
   bool CapturePointer(const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer) noexcept;
   void ReleasePointerCapture(const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer) noexcept;
 
@@ -186,6 +192,7 @@ struct ViewComponentView : public ViewComponentViewT<ViewComponentView, Componen
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void prepareForRecycle() noexcept override;
+  bool TryFocus() noexcept;
   bool focusable() const noexcept override;
   void OnKeyDown(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
@@ -195,7 +202,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 +214,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 +230,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,