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

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

@@ -0,0 +1,85 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "Theme.h"
+
+#include "Composition.Theme.g.cpp"
+#include "winrt/Microsoft.ReactNative.Composition.h"
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+Theme::Theme(
+    const winrt::Microsoft::ReactNative::ReactContext &,
+    const winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader &) noexcept {}
+
+void Theme::ClearCacheAndRaiseChangedEvent() noexcept {}
+
+Theme::Theme() noexcept {}
+
+bool Theme::TryGetPlatformColor(winrt::hstring, winrt::Windows::UI::Color &) noexcept {
+  return false;
+}
+
+bool Theme::TryGetPlatformColor(const std::string &, winrt::Windows::UI::Color &) noexcept {
+  return false;
+}
+
+winrt::Windows::UI::Color Theme::Color(const facebook::react::Color &) noexcept {
+  return {};
+}
+
+winrt::Windows::UI::Color Theme::PlatformColor(const std::string &) noexcept {
+  return {};
+}
+
+winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(winrt::hstring) noexcept {
+  return nullptr;
+}
+
+winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(const std::string &) noexcept {
+  return nullptr;
+}
+
+winrt::Microsoft::ReactNative::Composition::IBrush Theme::Brush(const facebook::react::Color &) noexcept {
+  return nullptr;
+}
+
+D2D1::ColorF Theme::D2DColor(const facebook::react::Color &) noexcept {
+  return D2D1::ColorF::Blue;
+}
+
+D2D1::ColorF Theme::D2DPlatformColor(const std::string &) noexcept {
+  return D2D1::ColorF::Blue;
+}
+
+bool Theme::IsEmpty() const noexcept {
+  return false;
+}
+
+winrt::event_token Theme::ThemeChanged(
+    winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const &) noexcept {
+  return {};
+}
+void Theme::ThemeChanged(winrt::event_token const &) noexcept {}
+
+winrt::Microsoft::ReactNative::Composition::Theme Theme::EmptyTheme() noexcept {
+  return nullptr;
+}
+
+/*static*/ winrt::Microsoft::ReactNative::Composition::Theme Theme::GetDefaultTheme(
+    const winrt::Microsoft::ReactNative::IReactContext &) noexcept {
+  return nullptr;
+}
+
+/*static*/ void Theme::SetDefaultTheme(
+    const winrt::Microsoft::ReactNative::ReactInstanceSettings &,
+    const winrt::Microsoft::ReactNative::Composition::Theme &) noexcept {}
+
+/*static*/ IReactPropertyName Theme::ThemeChangedEventName() noexcept {
+  return nullptr;
+}
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -9,23 +9,36 @@
 namespace winrt::Microsoft::ReactNative::implementation {
 
 HRESULT UiaNavigateHelper(
-    ::Microsoft::ReactNative::ReactTaggedView &view,
+    const winrt::Microsoft::ReactNative::ComponentView &view,
     NavigateDirection direction,
     IRawElementProviderFragment *&retVal) noexcept {
   retVal = nullptr;
 
-  auto spComponentView = view.view();
-
-  if (!spComponentView)
+  if (!view)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
   winrt::IInspectable uiaProvider{nullptr};
 
   switch (direction) {
     case NavigateDirection_Parent: {
-      auto pParentCV = static_cast<::Microsoft::ReactNative::CompositionBaseComponentView *>(spComponentView->parent());
-      if (pParentCV != nullptr) {
-        uiaProvider = pParentCV->EnsureUiaProvider();
+      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+      if (parentCV != nullptr) {
+        uiaProvider = parentCV->EnsureUiaProvider();
+      } else {
+        if (auto root = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)
+                            ->rootComponentView()) {
+          winrt::com_ptr<IRawElementProviderFragmentRoot> spFragmentRoot;
+          auto hr = root->GetFragmentRoot(spFragmentRoot.put());
+          if (FAILED(hr)) {
+            return hr;
+          }
+
+          auto spFragment = spFragmentRoot.try_as<IRawElementProviderFragment>();
+          if (spFragment != nullptr) {
+            retVal = spFragment.detach();
+            return S_OK;
+          }
+        }
       }
     } break;
 
@@ -33,32 +46,39 @@ HRESULT UiaNavigateHelper(
       __fallthrough;
 
     case NavigateDirection_FirstChild: {
-      auto children = spComponentView->children();
-      auto index = direction == NavigateDirection_FirstChild ? 0 : children.size() - 1;
-      if (!children.empty()) {
-        uiaProvider =
-            static_cast<::Microsoft::ReactNative::CompositionBaseComponentView *>(children[index])->EnsureUiaProvider();
+      auto children = view.Children();
+      auto index = direction == NavigateDirection_FirstChild ? 0 : children.Size() - 1;
+      if (!children.Size() == 0) {
+        uiaProvider = children.GetAt(index)
+                          .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
+                          ->EnsureUiaProvider();
       }
     } break;
 
     case NavigateDirection_NextSibling: {
-      auto pParentCV = static_cast<::Microsoft::ReactNative::CompositionBaseComponentView *>(spComponentView->parent());
-      if (pParentCV != nullptr) {
-        auto children = pParentCV->children();
-        auto it = std::find(children.begin(), children.end(), spComponentView.get());
+      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+      if (parentCV != nullptr) {
+        auto children = parentCV->Children();
+        auto it = std::find(children.begin(), children.end(), view);
         if (++it != children.end()) {
-          uiaProvider = static_cast<::Microsoft::ReactNative::CompositionBaseComponentView *>(*it)->EnsureUiaProvider();
+          uiaProvider = (*it)
+                            .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
+                            ->EnsureUiaProvider();
         }
       }
     } break;
 
     case NavigateDirection_PreviousSibling: {
-      auto pParentCV = static_cast<::Microsoft::ReactNative::CompositionBaseComponentView *>(spComponentView->parent());
-      if (pParentCV != nullptr) {
-        auto children = pParentCV->children();
-        auto it = std::find(children.rbegin(), children.rend(), spComponentView.get());
-        if (++it != children.rend()) {
-          uiaProvider = static_cast<::Microsoft::ReactNative::CompositionBaseComponentView *>(*it)->EnsureUiaProvider();
+      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+      if (parentCV != nullptr) {
+        auto children = parentCV->Children();
+        for (auto it = children.end(); it != children.begin(); --it) {
+          if (*it == view) {
+            uiaProvider = (*it)
+                              .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
+                              ->EnsureUiaProvider();
+            break;
+          }
         }
       }
     } break;
@@ -79,7 +99,8 @@ HRESULT UiaGetBoundingRectangleHelper(::Microsoft::ReactNative::ReactTaggedView
     return UIA_E_ELEMENTNOTAVAILABLE;
   }
 
-  auto clientRect = strongView->getClientRect();
+  auto clientRect =
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->getClientRect();
 
   rect.left = clientRect.left;
   rect.top = clientRect.top;
@@ -95,11 +116,12 @@ HRESULT UiaSetFocusHelper(::Microsoft::ReactNative::ReactTaggedView &view) noexc
   if (!strongView)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  auto rootCV = strongView->rootComponentView();
+  auto rootCV =
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->rootComponentView();
   if (rootCV == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  return rootCV->TrySetFocusedComponent(*strongView) ? S_OK : E_FAIL;
+  return rootCV->TrySetFocusedComponent(strongView) ? S_OK : E_FAIL;
 }
 
 bool WasUiaPropertyAdvised(winrt::com_ptr<IRawElementProviderSimple> &providerSimple, PROPERTYID propId) noexcept {

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

@@ -4,12 +4,16 @@
 #include <Fabric/ReactTaggedView.h>
 #include <UIAutomation.h>
 
+namespace Microsoft::ReactNative {
+struct winrt::Microsoft::ReactNative::implementation::ComponentView;
+}
+
 namespace winrt::Microsoft::ReactNative::implementation {
 
-// Returns an AddRef'd neighbor of the provided IComponentView in the direction given
+// Returns an AddRef'd neighbor of the provided ComponentView in the direction given
 HRESULT
 UiaNavigateHelper(
-    ::Microsoft::ReactNative::ReactTaggedView &view,
+    const winrt::Microsoft::ReactNative::ComponentView &view,
     NavigateDirection direction,
     IRawElementProviderFragment *&retVal) noexcept;
 

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

@@ -6,41 +6,40 @@
 
 #include "UnimplementedNativeViewComponentView.h"
 
+#include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
-#include "Composition/AutoDraw.h"
 #include "CompositionDynamicAutomationProvider.h"
 #include "Unicode.h"
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
 UnimplementedNativeViewComponentView::UnimplementedNativeViewComponentView(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-    facebook::react::Tag tag)
-    : Super(compContext, tag) {
-  static auto const defaultProps = std::make_shared<facebook::react::UnimplementedNativeViewProps const>();
-  m_props = defaultProps;
-  m_visual = compContext.CreateSpriteVisual();
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext)
+    : base_type(
+          compContext,
+          tag,
+          reactContext,
+          ComponentViewFeatures::Default &
+              ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
+                ComponentViewFeatures::NativeBorder),
+          false) {
+  m_labelVisual = compContext.CreateSpriteVisual();
+  OuterVisual().InsertAt(m_labelVisual, 1);
 }
 
-std::shared_ptr<UnimplementedNativeViewComponentView> UnimplementedNativeViewComponentView::Create(
+winrt::Microsoft::ReactNative::ComponentView UnimplementedNativeViewComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-    facebook::react::Tag tag) noexcept {
-  return std::shared_ptr<UnimplementedNativeViewComponentView>(
-      new UnimplementedNativeViewComponentView(compContext, tag));
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
+  return winrt::make<UnimplementedNativeViewComponentView>(compContext, tag, reactContext);
 }
 
-void UnimplementedNativeViewComponentView::mountChildComponentView(
-    IComponentView &childComponentView,
-    uint32_t index) noexcept {}
-
-void UnimplementedNativeViewComponentView::unmountChildComponentView(
-    IComponentView &childComponentView,
-    uint32_t index) noexcept {}
-
-void UnimplementedNativeViewComponentView::updateProps(
-    facebook::react::Props::Shared const &props,
-    facebook::react::Props::Shared const &oldProps) noexcept {
-  m_props = std::static_pointer_cast<facebook::react::UnimplementedNativeViewProps const>(props);
+void UnimplementedNativeViewComponentView::HandleCommand(
+    winrt::hstring commandName,
+    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+  // Do not call base to avoid unknown command asserts
 }
 
 void UnimplementedNativeViewComponentView::updateLayoutMetrics(
@@ -67,9 +66,9 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
     drawingSurface.HorizontalAlignmentRatio(0.f);
     drawingSurface.VerticalAlignmentRatio(0.f);
     drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::CompositionStretch::None);
-    m_visual.Brush(drawingSurface);
-    m_visual.Size(surfaceSize);
-    m_visual.Offset({
+    m_labelVisual.Brush(drawingSurface);
+    m_labelVisual.Size(surfaceSize);
+    m_labelVisual.Offset({
         layoutMetrics.frame.origin.x * layoutMetrics.pointScaleFactor,
         layoutMetrics.frame.origin.y * layoutMetrics.pointScaleFactor,
         0.0f,
@@ -90,7 +89,7 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
         float offsetY = static_cast<float>(offset.y / m_layoutMetrics.pointScaleFactor);
 
         winrt::com_ptr<IDWriteTextFormat> spTextFormat;
-        winrt::check_hresult(Microsoft::ReactNative::DWriteFactory()->CreateTextFormat(
+        winrt::check_hresult(::Microsoft::ReactNative::DWriteFactory()->CreateTextFormat(
             L"Segoe UI",
             nullptr, // Font collection (nullptr sets it to use the system font collection).
             DWRITE_FONT_WEIGHT_REGULAR,
@@ -108,7 +107,8 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
             static_cast<float>(offset.x), static_cast<float>(offset.y), width + offset.x, height + offset.y};
         // const D2D1_RECT_F rect = {0.f, 0.f, width, height};
 
-        auto label = Microsoft::Common::Unicode::Utf8ToUtf16(std::string("Unimplemented component: ") + m_props->name);
+        auto props = std::static_pointer_cast<facebook::react::UnimplementedNativeViewProps const>(viewProps());
+        auto label = ::Microsoft::Common::Unicode::Utf8ToUtf16(std::string("Unimplemented component: ") + props->name);
         d2dDeviceContext->DrawText(
             label.c_str(),
             static_cast<UINT32>(label.length()),
@@ -120,43 +120,8 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
       }
     }
   }
-  m_layoutMetrics = layoutMetrics;
-}
-
-void UnimplementedNativeViewComponentView::updateState(
-    facebook::react::State::Shared const &state,
-    facebook::react::State::Shared const &oldState) noexcept {}
-
-void UnimplementedNativeViewComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
-
-void UnimplementedNativeViewComponentView::prepareForRecycle() noexcept {}
-facebook::react::Props::Shared UnimplementedNativeViewComponentView::props() noexcept {
-  return m_props;
-}
-
-winrt::Microsoft::ReactNative::Composition::IVisual UnimplementedNativeViewComponentView::Visual() const noexcept {
-  return m_visual;
-}
-
-winrt::Microsoft::ReactNative::Composition::IVisual UnimplementedNativeViewComponentView::OuterVisual() const noexcept {
-  return m_visual;
-}
-
-facebook::react::Tag UnimplementedNativeViewComponentView::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;
+  base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -7,44 +7,35 @@
 #include <Fabric/ComponentView.h>
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 
+#include "Composition.UnimplementedNativeViewComponentView.g.h"
 #include "CompositionViewComponentView.h"
 
 #include <react/components/rnwcore/ShadowNodes.h>
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct UnimplementedNativeViewComponentView : CompositionBaseComponentView {
-  using Super = CompositionBaseComponentView;
-
-  [[nodiscard]] static std::shared_ptr<UnimplementedNativeViewComponentView> Create(
+struct UnimplementedNativeViewComponentView
+    : public UnimplementedNativeViewComponentViewT<UnimplementedNativeViewComponentView, ViewComponentView> {
+  [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-      facebook::react::Tag tag) noexcept;
-
-  void mountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept override;
-  void unmountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept override;
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
-  void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
-      override;
-
-  void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) noexcept
-      override;
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
-  void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
-  void prepareForRecycle() noexcept override;
-  facebook::react::Props::Shared props() noexcept override;
-  facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
-      const noexcept override;
-  winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept override;
-  winrt::Microsoft::ReactNative::Composition::IVisual OuterVisual() const noexcept override;
 
- private:
+  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
+      override;
+
   UnimplementedNativeViewComponentView(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-      facebook::react::Tag tag);
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+
+ private:
   std::shared_ptr<facebook::react::UnimplementedNativeViewProps const> m_props;
-  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual{nullptr};
+  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_labelVisual{nullptr};
 };
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation