react-native-windows 0.73.11 → 0.74.0-preview.2

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

@@ -15,93 +15,44 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
   ReactCompositionViewComponentBuilder() noexcept;
 
  public: // IReactViewComponentBuilder
+  void SetCreateComponentView(ComponentViewFactory impl) noexcept;
   void SetCreateProps(ViewPropsFactory impl) noexcept;
 
- public: // Composition::IReactCompositionViewComponentBuilder
-  // (ICompositionContext) => Handle
-  void SetCreateView(CompositionComponentFactory impl) noexcept;
-  // (Object handle, String commandName, Microsoft.ReactNative.IJSValueReader args) => bool
-  void SetCommandHandler(CommandHandler commandHandler) noexcept;
-  // (Object handle, Microsoft.ReactNative.IComponentProps props) => void
-  void SetPropsUpdater(PropsUpdater impl) noexcept;
-  // (Object handle, LayoutMetrics metrics) => void
-  void SetLayoutMetricsUpdater(LayoutMetricsUpdater impl) noexcept;
-  // (Object handle) => void
-  void SetUpdateFinalizer(UpdateFinalizer impl) noexcept;
-  // (Object handle) => IVisual
-  void SetVisualCreator(VisualCreator impl) noexcept;
-  // (Object handle, UInt32 Msg, UInt64 WParam, Int64 LParam) => Int64
-  void SetMessageHandler(MessageHandler impl) noexcept;
+  // (Object handle, Microsoft.ReactNative.IComponentState state) => void
+  // void SetStateUpdater(StateUpdater impl) noexcept;
 
-  void SetKeyDownHandler(KeyHandler impl) noexcept;
-  void SetKeyUpHandler(KeyHandler impl) noexcept;
+  void SetCreateShadowNode(ViewShadowNodeFactory impl) noexcept;
+  void SetShadowNodeCloner(ViewShadowNodeCloner impl) noexcept;
+  void SetInitialStateDataFactory(InitialStateDataFactory impl) noexcept;
+  void SetMeasureContentHandler(MeasureContentHandler impl) noexcept;
+  void SetLayoutHandler(LayoutHandler impl) noexcept;
 
-  void SetPointerEnteredHandler(PointerHandler impl) noexcept;
-  void SetPointerExitedHandler(PointerHandler impl) noexcept;
-  void SetPointerReleasedHandler(PointerHandler impl) noexcept;
-  void SetPointerPressedHandler(PointerHandler impl) noexcept;
-  void SetPointerMovedHandler(PointerHandler impl) noexcept;
-  void SetPointerWheelChangedHandler(PointerHandler impl) noexcept;
+ public: // Composition::IReactCompositionViewComponentBuilder
+  void SetCreateViewComponentView(CompositionViewComponentViewFactory impl) noexcept;
 
  public:
   IComponentProps CreateProps(ViewProps props) noexcept;
+  void CreateShadowNode(ShadowNode shadowNode) noexcept;
+  void CloneShadowNode(ShadowNode shadowNode, ShadowNode sourceShadowNode) noexcept;
+  winrt::Windows::Foundation::IInspectable InitialStateData(
+      winrt::Microsoft::ReactNative::IComponentProps props) noexcept;
+  MeasureContentHandler MeasureContentHandler() const noexcept;
+  LayoutHandler LayoutHandler() const noexcept;
+  bool IsViewComponent() const noexcept;
 
-  winrt::Windows::Foundation::IInspectable CreateView(IReactContext reactContext, ICompositionContext context) noexcept;
-  bool HandleCommand(
-      winrt::Windows::Foundation::IInspectable handle,
-      winrt::hstring commandName,
-      IJSValueReader args) noexcept;
-  void UpdateProps(winrt::Windows::Foundation::IInspectable handle, IComponentProps props) noexcept;
-  void UpdateLayoutMetrics(winrt::Windows::Foundation::IInspectable handle, LayoutMetrics metrics) noexcept;
-  void FinalizeUpdates(winrt::Windows::Foundation::IInspectable handle) noexcept;
-  IVisual CreateVisual(winrt::Windows::Foundation::IInspectable handle) noexcept;
-  int64_t
-  SendMessage(winrt::Windows::Foundation::IInspectable handle, uint32_t Msg, uint64_t WParam, int64_t LParam) noexcept;
-  void OnKeyDown(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
-  void OnKeyUp(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
-  void OnPointerEntered(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
-  void OnPointerExited(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
-  void OnPointerPressed(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
-  void OnPointerReleased(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
-  void OnPointerMoved(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
-  void OnPointerWheelChanged(
-      winrt::Windows::Foundation::IInspectable handle,
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
+  winrt::Microsoft::ReactNative::ComponentView
+  CreateView(const IReactContext &reactContext, facebook::react::Tag tag, const ICompositionContext &context) noexcept;
 
  private:
   ViewPropsFactory m_propsFactory;
-
-  CompositionComponentFactory m_createView;
-  CommandHandler m_commandHandler;
-  PropsUpdater m_propsUpdater;
-  LayoutMetricsUpdater m_layoutMetricsUpdater;
-  UpdateFinalizer m_finalizer;
-  VisualCreator m_visualCreator;
-  MessageHandler m_messageHandler;
-  KeyHandler m_keyUp;
-  KeyHandler m_keyDown;
-  PointerHandler m_pointerEntered;
-  PointerHandler m_pointerExited;
-  PointerHandler m_pointerReleased;
-  PointerHandler m_pointerPressed;
-  PointerHandler m_pointerMoved;
-  PointerHandler m_pointerWheelChanged;
+  ViewShadowNodeFactory m_shadowNodeFactory;
+  ViewShadowNodeCloner m_shadowNodeCloner;
+  InitialStateDataFactory m_initialStateDataFactory;
+  winrt::Microsoft::ReactNative::MeasureContentHandler m_measureContent;
+  winrt::Microsoft::ReactNative::LayoutHandler m_layoutHandler;
+
+  ComponentViewFactory m_createComponentView{nullptr};
+  CompositionViewComponentViewFactory m_createView{nullptr};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition

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

@@ -9,53 +9,70 @@
 #include <Fabric/FabricUIManagerModule.h>
 #include "CompositionRootAutomationProvider.h"
 #include "CompositionRootView.h"
+#include "Theme.h"
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
 RootComponentView::RootComponentView(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
-    : Super(compContext, tag), m_context(reactContext) {}
+    : base_type(
+          compContext,
+          tag,
+          reactContext,
+          ComponentViewFeatures::Default &
+              ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
+                ComponentViewFeatures::NativeBorder),
+          false) {}
+
+RootComponentView::~RootComponentView() {
+  if (auto rootView = m_wkRootView.get()) {
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)->RemoveRenderedVisual(
+        OuterVisual());
+  }
+}
 
-std::shared_ptr<RootComponentView> RootComponentView::Create(
+winrt::Microsoft::ReactNative::ComponentView RootComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
-  return std::shared_ptr<RootComponentView>(new RootComponentView(compContext, tag, reactContext));
+  return winrt::make<RootComponentView>(compContext, tag, reactContext);
 }
 
 RootComponentView *RootComponentView::rootComponentView() noexcept {
   return this;
 }
 
-IComponentView *RootComponentView::GetFocusedComponent() noexcept {
+winrt::Microsoft::ReactNative::ComponentView &RootComponentView::GetFocusedComponent() noexcept {
   return m_focusedComponent;
 }
-void RootComponentView::SetFocusedComponent(IComponentView *value) noexcept {
+void RootComponentView::SetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &value) noexcept {
   if (m_focusedComponent == value)
     return;
 
   if (m_focusedComponent) {
-    m_focusedComponent->onFocusLost();
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_focusedComponent)->onFocusLost();
   }
 
   if (value)
-    value->onFocusGained();
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(value)->onFocusGained();
 
   m_focusedComponent = value;
 }
 
-IComponentView *NavigateFocusHelper(IComponentView &view, winrt::Microsoft::ReactNative::FocusNavigationReason reason) {
+winrt::Microsoft::ReactNative::implementation::ComponentView *NavigateFocusHelper(
+    winrt::Microsoft::ReactNative::implementation::ComponentView &view,
+    winrt::Microsoft::ReactNative::FocusNavigationReason reason) {
   if (reason == winrt::Microsoft::ReactNative::FocusNavigationReason::First) {
     if (view.focusable()) {
       return &view;
     }
   }
-  IComponentView *toFocus = nullptr;
+  winrt::Microsoft::ReactNative::implementation::ComponentView *toFocus = nullptr;
 
-  Mso::Functor<bool(::Microsoft::ReactNative::IComponentView & v)> fn =
-      [reason, &toFocus](::Microsoft::ReactNative::IComponentView &v) noexcept
+  Mso::Functor<bool(::winrt::Microsoft::ReactNative::implementation::ComponentView & v)> fn =
+      [reason, &toFocus](::winrt::Microsoft::ReactNative::implementation::ComponentView &v) noexcept
       -> bool { return (toFocus = NavigateFocusHelper(v, reason)); };
 
   if (view.runOnChildren(reason == winrt::Microsoft::ReactNative::FocusNavigationReason::First, fn)) {
@@ -79,14 +96,18 @@ bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::Focus
 
   auto view = NavigateFocusHelper(*this, request.Reason());
   if (view) {
-    SetFocusedComponent(view);
+    winrt::Microsoft::ReactNative::ComponentView component{nullptr};
+    winrt::check_hresult(view->QueryInterface(
+        winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(component)));
+    SetFocusedComponent(component);
   }
   return view != nullptr;
 }
 
-bool RootComponentView::TrySetFocusedComponent(IComponentView &view) noexcept {
-  if (view.focusable()) {
-    view.rootComponentView()->SetFocusedComponent(&view);
+bool RootComponentView::TrySetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+  auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view);
+  if (selfView->focusable()) {
+    selfView->rootComponentView()->SetFocusedComponent(view);
     return true;
   }
   return false;
@@ -99,26 +120,50 @@ bool RootComponentView::TryMoveFocus(bool next) noexcept {
              : winrt::Microsoft::ReactNative::FocusNavigationReason::Last));
   }
 
-  Mso::Functor<bool(IComponentView &)> fn = [currentlyFocused = m_focusedComponent](IComponentView &view) noexcept {
-    if (&view == currentlyFocused)
-      return false;
+  Mso::Functor<bool(const winrt::Microsoft::ReactNative::ComponentView &)> fn =
+      [currentlyFocused = m_focusedComponent](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+        if (view == currentlyFocused)
+          return false;
 
-    return view.rootComponentView()->TrySetFocusedComponent(view);
-  };
+        return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)
+            ->rootComponentView()
+            ->TrySetFocusedComponent(view);
+      };
 
-  return walkTree(*m_focusedComponent, next, fn);
+  return winrt::Microsoft::ReactNative::implementation::walkTree(m_focusedComponent, next, fn);
 }
 
-winrt::IInspectable RootComponentView::EnsureUiaProvider() noexcept {
-  if (m_uiaProvider == nullptr) {
-    m_uiaProvider =
-        winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider>(getPtr());
+HRESULT RootComponentView::GetFragmentRoot(IRawElementProviderFragmentRoot **pRetVal) noexcept {
+  if (pRetVal == nullptr)
+    return E_POINTER;
+
+  *pRetVal = nullptr;
+
+  auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_reactContext.Properties());
+  if (uiManager == nullptr)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  auto rootView = uiManager->GetCompositionRootView(Tag());
+  if (!rootView) {
+    return UIA_E_ELEMENTNOTAVAILABLE;
   }
-  return m_uiaProvider;
+
+  auto spFragmentRoot = rootView.GetUiaProvider().as<IRawElementProviderFragmentRoot>();
+  if (spFragmentRoot) {
+    *pRetVal = spFragmentRoot.detach();
+  }
+
+  return S_OK;
+}
+
+uint32_t RootComponentView::overlayIndex() noexcept {
+  return 1;
 }
 
-std::shared_ptr<RootComponentView> RootComponentView::getPtr() {
-  return std::static_pointer_cast<RootComponentView>(shared_from_this());
+void RootComponentView::start(const winrt::Microsoft::ReactNative::CompositionRootView &rootView) noexcept {
+  winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)->AddRenderedVisual(
+      OuterVisual());
+  m_wkRootView = rootView;
 }
 
 winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixels) noexcept {
@@ -129,7 +174,7 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel
   facebook::react::Point localPt;
   auto tag = hitTest(ptDips, localPt, true);
 
-  auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties());
+  auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_reactContext.Properties());
   if (uiManager == nullptr)
     return nullptr;
 
@@ -137,7 +182,11 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel
   if (view == nullptr)
     return nullptr;
 
-  return view->EnsureUiaProvider();
+  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider();
+}
+
+winrt::Microsoft::ReactNative::implementation::ClipState RootComponentView::getClipState() noexcept {
+  return winrt::Microsoft::ReactNative::implementation::ClipState::NoClip;
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -8,24 +8,26 @@
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 
 #include "CompositionViewComponentView.h"
+#include "Theme.h"
 
+#include "Composition.RootComponentView.g.h"
 #include <react/components/rnwcore/ShadowNodes.h>
 
-namespace Microsoft::ReactNative {
+struct IRawElementProviderFragmentRoot;
 
-struct RootComponentView : CompositionViewComponentView {
-  using Super = CompositionViewComponentView;
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-  [[nodiscard]] static std::shared_ptr<RootComponentView> Create(
+struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentView> {
+  using Super = RootComponentViewT<RootComponentView, ViewComponentView>;
+
+  [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
-  std::shared_ptr<RootComponentView> getPtr();
-
-  ::Microsoft::ReactNative::IComponentView *GetFocusedComponent() noexcept;
-  void SetFocusedComponent(::Microsoft::ReactNative::IComponentView *value) noexcept;
-  bool TrySetFocusedComponent(::Microsoft::ReactNative::IComponentView &view) noexcept;
+  winrt::Microsoft::ReactNative::ComponentView &GetFocusedComponent() noexcept;
+  void SetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &value) noexcept;
+  bool TrySetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
 
   bool NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
 
@@ -33,17 +35,28 @@ struct RootComponentView : CompositionViewComponentView {
 
   RootComponentView *rootComponentView() noexcept override;
 
-  winrt::IInspectable EnsureUiaProvider() noexcept override;
+  // Index that visuals can be inserted into OuterVisual for debugging UI
+  uint32_t overlayIndex() noexcept;
+  void start(const winrt::Microsoft::ReactNative::CompositionRootView &rootView) noexcept;
+
+  HRESULT GetFragmentRoot(IRawElementProviderFragmentRoot **pRetVal) noexcept;
+  winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept override;
 
   winrt::IInspectable UiaProviderFromPoint(const POINT &ptPixels) noexcept;
 
- private:
   RootComponentView(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
-  ::Microsoft::ReactNative::IComponentView *m_focusedComponent = nullptr;
-  winrt::Microsoft::ReactNative::ReactContext m_context;
+
+  virtual ~RootComponentView();
+
+ private:
+  // should this be a ReactTaggedView? - It shouldn't actually matter since if the view is going away it should always
+  // be clearing its focus But being a reactTaggedView might make it easier to identify cases where that isn't
+  // happening.
+  winrt::Microsoft::ReactNative::ComponentView m_focusedComponent{nullptr};
+  winrt::weak_ref<winrt::Microsoft::ReactNative::CompositionRootView> m_wkRootView{nullptr};
 };
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation