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

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

@@ -5,116 +5,133 @@
 #pragma once
 
 #include <Fabric/ComponentView.h>
+#include <Microsoft.ReactNative.Cxx/ReactContext.h>
 #include <react/renderer/components/view/ViewEventEmitter.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include "CompositionHelpers.h"
 
-namespace Microsoft::ReactNative {
+#include "Composition.ComponentView.g.h"
+#include "Composition.CreateCompositionComponentViewArgs.g.h"
+#include "Composition.ViewComponentView.g.h"
 
-struct CompositionBaseComponentView;
+namespace Microsoft::ReactNative {
 struct CompContext;
+} // namespace Microsoft::ReactNative
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+struct CreateCompositionComponentViewArgs
+    : public CreateCompositionComponentViewArgsT<
+          CreateCompositionComponentViewArgs,
+          winrt::Microsoft::ReactNative::implementation::CreateComponentViewArgs> {
+  CreateCompositionComponentViewArgs(
+      const winrt::Microsoft::ReactNative::IReactContext &reactContext,
+      facebook::react::Tag tag,
+      const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compositionContext);
+
+  winrt::Microsoft::ReactNative::Composition::ICompositionContext CompositionContext() const noexcept;
+
+  ComponentViewFeatures Features() const noexcept;
+  void Features(ComponentViewFeatures value) noexcept;
+
+ private:
+  ComponentViewFeatures m_features{ComponentViewFeatures::Default};
+  winrt::Microsoft::ReactNative::Composition::ICompositionContext m_compositionContext;
+};
 
-struct CompositionBaseComponentView : public IComponentView,
-                                      public std::enable_shared_from_this<CompositionBaseComponentView> {
+struct ComponentView
+    : public ComponentViewT<ComponentView, winrt::Microsoft::ReactNative::implementation::ComponentView> {
   static constexpr size_t SpecialBorderLayerCount = 8;
 
-  CompositionBaseComponentView(
+  ComponentView(winrt::Microsoft::ReactNative::Composition::CreateCompositionComponentViewArgs const &args);
+  ComponentView(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-      facebook::react::Tag tag);
-
-  virtual winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept = 0;
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+      ComponentViewFeatures flags,
+      bool customControl);
+
+  virtual winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept {
+    return nullptr;
+  };
   // Visual that should be parented to this ComponentView's parent
   virtual winrt::Microsoft::ReactNative::Composition::IVisual OuterVisual() const noexcept;
   void updateEventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter) noexcept override;
   const facebook::react::SharedViewEventEmitter &GetEventEmitter() const noexcept;
-  void handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept override;
-  RootComponentView *rootComponentView() noexcept override;
-  const std::vector<IComponentView *> &children() const noexcept override;
-  void parent(IComponentView *parent) noexcept override;
-  IComponentView *parent() const noexcept override;
-  bool runOnChildren(bool forward, Mso::Functor<bool(IComponentView &)> &fn) noexcept override;
+  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;
+  };
+  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 onPointerEntered(
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
-  void onPointerExited(
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
-  void onPointerPressed(
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
-  void onPointerReleased(
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
-  void onPointerMoved(
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
-  void onPointerWheelChanged(
-      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
-
-  void onKeyDown(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
-  void onKeyUp(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
-  bool focusable() const noexcept override;
+  bool CapturePointer(const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer) noexcept;
+  void ReleasePointerCapture(const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer) noexcept;
+
   std::vector<facebook::react::ComponentDescriptorProvider> supplementalComponentDescriptorProviders() noexcept
       override;
   facebook::react::SharedViewEventEmitter eventEmitter() noexcept override;
   facebook::react::SharedViewEventEmitter eventEmitterAtPoint(facebook::react::Point pt) noexcept override;
-  facebook::react::Tag tag() const noexcept override;
-  int64_t sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept override;
+  facebook::react::Tag Tag() const noexcept override;
 
   RECT getClientRect() const noexcept override;
+  facebook::react::Point getClientOffset() const 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 indexOffsetForBorder(uint32_t &index) const noexcept;
-  void updateBorderProps(
-      const facebook::react::ViewProps &oldViewProps,
-      const facebook::react::ViewProps &newViewProps) noexcept;
   void updateShadowProps(
       const facebook::react::ViewProps &oldViewProps,
-      const facebook::react::ViewProps &newViewProps,
-      winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual) noexcept;
+      const facebook::react::ViewProps &newViewProps) noexcept;
+  void applyShadowProps(const facebook::react::ViewProps &viewProps) noexcept;
   void updateTransformProps(
       const facebook::react::ViewProps &oldViewProps,
       const facebook::react::ViewProps &newViewProps,
-      winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual) noexcept;
+      winrt::Microsoft::ReactNative::Composition::IVisual m_visual) noexcept;
   void updateAccessibilityProps(
       const facebook::react::ViewProps &oldView,
       const facebook::react::ViewProps &newViewProps) noexcept;
-  void updateBorderLayoutMetrics(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      const facebook::react::ViewProps &viewProps) noexcept;
 
   virtual void OnRenderingDeviceLost() noexcept;
 
-  void StartBringIntoView(BringIntoViewOptions &&args) noexcept override;
+  void StartBringIntoView(winrt::Microsoft::ReactNative::implementation::BringIntoViewOptions &&args) noexcept override;
 
   comp::CompositionPropertySet EnsureCenterPointPropertySet() noexcept;
   void EnsureTransformMatrixFacade() noexcept;
 
   winrt::IInspectable EnsureUiaProvider() noexcept override;
+  std::optional<std::string> getAcccessiblityValue() noexcept override;
+  void setAcccessiblityValue(std::string &&value) noexcept override;
+  bool getAcccessiblityIsReadOnly() noexcept override;
+  virtual winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept;
 
   virtual std::string DefaultControlType() const noexcept;
   virtual std::string DefaultAccessibleName() const noexcept;
   virtual std::string DefaultHelpText() const noexcept;
 
+  winrt::Microsoft::ReactNative::Composition::ICompositionContext CompositionContext() const noexcept;
+
+  // Publicaly overridable APIs
+  void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
+  virtual void OnThemeChanged() noexcept;
+
  protected:
-  std::array<winrt::Microsoft::ReactNative::Composition::ISpriteVisual, SpecialBorderLayerCount>
-  FindSpecialBorderLayers() const noexcept;
-  bool TryUpdateSpecialBorderLayers(
-      std::array<winrt::Microsoft::ReactNative::Composition::ISpriteVisual, SpecialBorderLayerCount> &spBorderVisuals,
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      const facebook::react::ViewProps &viewProps) noexcept;
-  void UpdateSpecialBorderLayers(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      const facebook::react::ViewProps &viewProps) noexcept;
-  void UpdateCenterPropertySet() noexcept;
+  bool anyHitTestHelper(
+      facebook::react::Tag &targetTag,
+      facebook::react::Point &ptContent,
+      facebook::react::Point &localPt) const noexcept;
 
   winrt::IInspectable m_uiaProvider{nullptr};
   winrt::Microsoft::ReactNative::Composition::ICompositionContext m_compContext;
   comp::CompositionPropertySet m_centerPropSet{nullptr};
-  const facebook::react::Tag m_tag;
   facebook::react::SharedViewEventEmitter m_eventEmitter;
-  std::vector<IComponentView *> m_children;
-  IComponentView *m_parent{nullptr};
   facebook::react::LayoutMetrics m_layoutMetrics;
   bool m_needsBorderUpdate{false};
   bool m_hasTransformMatrixFacade{false};
@@ -122,55 +139,92 @@ struct CompositionBaseComponentView : public IComponentView,
   uint8_t m_numBorderVisuals{0};
 
  private:
+  void updateBorderProps(
+      const facebook::react::ViewProps &oldViewProps,
+      const facebook::react::ViewProps &newViewProps) noexcept;
+  void updateBorderLayoutMetrics(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::ViewProps &viewProps) noexcept;
+  void finalizeBorderUpdates(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::ViewProps &viewProps) noexcept;
+  bool TryUpdateSpecialBorderLayers(
+      winrt::Microsoft::ReactNative::Composition::implementation::Theme *theme,
+      std::array<winrt::Microsoft::ReactNative::Composition::ISpriteVisual, SpecialBorderLayerCount> &spBorderVisuals,
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::ViewProps &viewProps) noexcept;
+  std::array<winrt::Microsoft::ReactNative::Composition::ISpriteVisual, SpecialBorderLayerCount>
+  FindSpecialBorderLayers() const noexcept;
+  void UpdateCenterPropertySet() noexcept;
+
+  ComponentViewFeatures m_flags;
   void showFocusVisual(bool show) noexcept;
   winrt::Microsoft::ReactNative::Composition::IFocusVisual m_focusVisual{nullptr};
   winrt::Microsoft::ReactNative::Composition::IVisual m_outerVisual{nullptr};
 };
 
-struct CompositionViewComponentView : public CompositionBaseComponentView {
-  using Super = CompositionBaseComponentView;
-
-  [[nodiscard]] static std::shared_ptr<CompositionViewComponentView> Create(
+struct ViewComponentView : public ViewComponentViewT<ViewComponentView, ComponentView> {
+  ViewComponentView(winrt::Microsoft::ReactNative::Composition::CreateCompositionComponentViewArgs const &args);
+  [[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 MountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
+  void UnmountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
   void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) noexcept
       override;
-  void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
-      override;
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
-  void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
   bool focusable() const noexcept override;
-  void onKeyDown(
+  void OnKeyDown(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
-  void onKeyUp(
+  void OnKeyUp(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
   std::string DefaultControlType() const noexcept override;
 
-  facebook::react::Props::Shared props() noexcept override;
+  facebook::react::SharedViewProps viewProps() noexcept override;
+  winrt::Microsoft::ReactNative::ViewProps ViewProps() noexcept;
 
   facebook::react::Tag hitTest(
       facebook::react::Point pt,
       facebook::react::Point &localPt,
       bool ignorePointerEvents = false) const noexcept override;
-
+  const winrt::Microsoft::ReactNative::IComponentProps userProps(
+      facebook::react::Props::Shared const &props) noexcept override;
   winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept override;
+  void ensureVisual() noexcept;
 
- protected:
-  CompositionViewComponentView(
+  ViewComponentView(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-      facebook::react::Tag tag);
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+      ComponentViewFeatures flags,
+      bool customComponent);
+
+  // Publicaly overridable APIs
+  virtual winrt::Microsoft::ReactNative::Composition::IVisual CreateVisual() noexcept;
+  virtual void UpdateLayoutMetrics(const LayoutMetrics &metrics, const LayoutMetrics &oldMetrics) noexcept;
 
  private:
   facebook::react::SharedViewProps m_props;
-  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual{nullptr};
+  winrt::Microsoft::ReactNative::Composition::IVisual m_visual{nullptr};
 };
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation
+
+namespace winrt::Microsoft::ReactNative::Composition::factory_implementation {
+
+struct ComponentView : ComponentViewT<ComponentView, implementation::ComponentView> {};
+
+struct ViewComponentView : ViewComponentViewT<ViewComponentView, implementation::ViewComponentView> {};
+
+} // namespace winrt::Microsoft::ReactNative::Composition::factory_implementation

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

@@ -0,0 +1,113 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "DebuggingOverlayComponentView.h"
+
+#include <JSValueComposition.h>
+#include <JSValueReader.h>
+#include "RootComponentView.h"
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+DebuggingOverlayComponentView::DebuggingOverlayComponentView(
+    const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext)
+    : base_type(
+          compContext,
+          tag,
+          reactContext,
+          ComponentViewFeatures::Default &
+              ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
+                ComponentViewFeatures::NativeBorder),
+          false) {}
+
+void DebuggingOverlayComponentView::MountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+    uint32_t index) noexcept {
+  assert(false);
+  base_type::MountChildComponentView(childComponentView, index);
+}
+
+void DebuggingOverlayComponentView::UnmountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+    uint32_t index) noexcept {
+  assert(false);
+  base_type::UnmountChildComponentView(childComponentView, index);
+}
+
+winrt::Microsoft::ReactNative::ComponentView DebuggingOverlayComponentView::Create(
+    const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
+  return winrt::make<DebuggingOverlayComponentView>(compContext, tag, reactContext);
+}
+
+REACT_STRUCT(ElementRectangle)
+struct ElementRectangle {
+  REACT_FIELD(x)
+  float x;
+  REACT_FIELD(y)
+  float y;
+  REACT_FIELD(width)
+  float width;
+  REACT_FIELD(height)
+  float height;
+};
+
+REACT_STRUCT(TraceUpdate)
+struct TraceUpdate {
+  REACT_FIELD(id)
+  double id;
+  REACT_FIELD(rectangle)
+  ElementRectangle rectangle;
+  REACT_FIELD(color)
+  winrt::Microsoft::ReactNative::Color color{nullptr};
+};
+
+void DebuggingOverlayComponentView::HandleCommand(
+    winrt::hstring commandName,
+    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+  if (commandName == L"highlightTraceUpdates") {
+    std::vector<TraceUpdate> updates;
+    winrt::Microsoft::ReactNative::ReadArgs(args, updates);
+    // TODO should create visuals that get removed after 2 seconds
+    return;
+  }
+  if (commandName == L"highlightElements") {
+    std::vector<ElementRectangle> elements;
+    winrt::Microsoft::ReactNative::ReadArgs(args, elements);
+
+    if (auto root = rootComponentView()) {
+      auto rootVisual = root->OuterVisual();
+      auto brush = m_compContext.CreateColorBrush({204, 200, 230, 255});
+      for (auto &element : elements) {
+        auto overlayVisual = m_compContext.CreateSpriteVisual();
+        overlayVisual.Size({element.width, element.height});
+        overlayVisual.Offset({element.x, element.y, 0.0f});
+        overlayVisual.Brush(brush);
+
+        rootVisual.InsertAt(overlayVisual, root->overlayIndex() + m_activeOverlays);
+        ++m_activeOverlays;
+      }
+    }
+    return;
+  }
+  if (commandName == L"clearElementsHighlights") {
+    if (auto root = rootComponentView()) {
+      auto rootVisual = root->OuterVisual();
+
+      while (m_activeOverlays != 0) {
+        auto visual = rootVisual.GetAt(root->overlayIndex() + m_activeOverlays);
+        rootVisual.Remove(visual);
+        --m_activeOverlays;
+      }
+    }
+    return;
+  }
+
+  base_type::HandleCommand(commandName, args);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -0,0 +1,39 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "CompositionViewComponentView.h"
+
+#include "Composition.DebuggingOverlayComponentView.g.h"
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+struct DebuggingOverlayComponentView
+    : DebuggingOverlayComponentViewT<DebuggingOverlayComponentView, 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;
+
+  void MountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
+  void UnmountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
+
+  DebuggingOverlayComponentView(
+      const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+
+  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
+      override;
+
+ private:
+  uint32_t m_activeOverlays{0};
+};
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation