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

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

@@ -6,34 +6,44 @@
 
 #include "ParagraphComponentView.h"
 
+#include <AutoDraw.h>
 #include <Utils/ValueUtils.h>
 #include <react/renderer/components/text/ParagraphShadowNode.h>
 #include <react/renderer/components/text/ParagraphState.h>
 #include <unicode.h>
 #include <winrt/Microsoft.ReactNative.Composition.h>
-#include "Composition/AutoDraw.h"
 #include "CompositionDynamicAutomationProvider.h"
 #include "CompositionHelpers.h"
+#include "TextDrawing.h"
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
 ParagraphComponentView::ParagraphComponentView(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-    facebook::react::Tag tag)
-    : Super(compContext, tag) {
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext)
+    : Super(
+          compContext,
+          tag,
+          reactContext,
+          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
+          false) {
   static auto const defaultProps = std::make_shared<facebook::react::ParagraphProps const>();
   m_props = defaultProps;
 }
 
-void ParagraphComponentView::mountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept {
-  // auto v = static_cast<ParagraphComponentView &>(childComponentView);
+void ParagraphComponentView::MountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+    uint32_t index) noexcept {
   assert(false);
-  // m_element.Children().InsertAt(index, v.Element());
+  base_type::MountChildComponentView(childComponentView, index);
 }
 
-void ParagraphComponentView::unmountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept {
+void ParagraphComponentView::UnmountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+    uint32_t index) noexcept {
   assert(false);
-  // m_element.Children().RemoveAt(index);
+  base_type::UnmountChildComponentView(childComponentView, index);
 }
 
 void ParagraphComponentView::updateProps(
@@ -50,6 +60,9 @@ void ParagraphComponentView::updateProps(
   if (oldViewProps.textAttributes.opacity != newViewProps.textAttributes.opacity) {
     m_requireRedraw = true;
   }
+  if (oldViewProps.testId != newViewProps.testId) {
+    m_visual.Comment(winrt::to_hstring(newViewProps.testId));
+  }
 
   if (oldViewProps.textAttributes.alignment != newViewProps.textAttributes.alignment) {
     updateTextAlignment(newViewProps.textAttributes.alignment);
@@ -57,9 +70,8 @@ void ParagraphComponentView::updateProps(
 
   // update BaseComponentView props
   updateAccessibilityProps(oldViewProps, newViewProps);
-  updateShadowProps(oldViewProps, newViewProps, m_visual);
   updateTransformProps(oldViewProps, newViewProps, m_visual);
-  updateBorderProps(oldViewProps, newViewProps);
+  Super::updateProps(props, oldProps);
 
   m_props = std::static_pointer_cast<facebook::react::ParagraphProps const>(props);
 }
@@ -87,20 +99,20 @@ void ParagraphComponentView::updateLayoutMetrics(
     OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
   }
 
-  updateBorderLayoutMetrics(layoutMetrics, *m_props);
-  m_layoutMetrics = layoutMetrics;
-
-  UpdateCenterPropertySet();
+  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
   m_visual.Size(
       {layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
        layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
 }
-void ParagraphComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {
+void ParagraphComponentView::FinalizeUpdates(
+    winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   ensureVisual();
   updateVisualBrush();
+  Super::FinalizeUpdates(updateMask);
 }
 void ParagraphComponentView::prepareForRecycle() noexcept {}
-facebook::react::Props::Shared ParagraphComponentView::props() noexcept {
+
+facebook::react::SharedViewProps ParagraphComponentView::viewProps() noexcept {
   return m_props;
 }
 
@@ -116,7 +128,7 @@ facebook::react::Tag ParagraphComponentView::hitTest(
     if ((m_props.pointerEvents == facebook::react::PointerEventsMode::Auto ||
         m_props.pointerEvents == facebook::react::PointerEventsMode::BoxNone) && std::any_of(m_children.rbegin(),
     m_children.rend(), [&targetTag, &ptLocal, &localPt](auto child) { targetTag = static_cast<const
-    CompositionBaseComponentView
+    ComponentView
     *>(child)->hitTest(ptLocal, localPt); return targetTag != -1;
         }))
       return targetTag;
@@ -127,7 +139,7 @@ facebook::react::Tag ParagraphComponentView::hitTest(
       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 Tag();
   }
 
   return -1;
@@ -283,9 +295,14 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
   }
 }
 
+void ParagraphComponentView::onThemeChanged() noexcept {
+  DrawText();
+  Super::onThemeChanged();
+}
+
 // Renders the text into our composition surface
 void ParagraphComponentView::DrawText() noexcept {
-  if (!m_drawingSurface)
+  if (!m_drawingSurface || theme()->IsEmpty())
     return;
 
   if (m_layoutMetrics.frame.size.width == 0 || m_layoutMetrics.frame.size.height == 0) {
@@ -298,175 +315,24 @@ void ParagraphComponentView::DrawText() noexcept {
     ::Microsoft::ReactNative::Composition::AutoDrawDrawingSurface autoDraw(m_drawingSurface, &offset);
     if (auto d2dDeviceContext = autoDraw.GetRenderTarget()) {
       d2dDeviceContext->Clear(
-          m_props->backgroundColor ? m_props->backgroundColor.AsD2DColor() : D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
-      assert(d2dDeviceContext->GetUnitMode() == D2D1_UNIT_MODE_DIPS);
-      const auto dpi = m_layoutMetrics.pointScaleFactor * 96.0f;
-      float oldDpiX, oldDpiY;
-      d2dDeviceContext->GetDpi(&oldDpiX, &oldDpiY);
-      d2dDeviceContext->SetDpi(dpi, dpi);
-
-      float offsetX = static_cast<float>(offset.x / m_layoutMetrics.pointScaleFactor);
-      float offsetY = static_cast<float>(offset.y / m_layoutMetrics.pointScaleFactor);
+          m_props->backgroundColor ? theme()->D2DColor(*m_props->backgroundColor)
+                                   : D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
 
       const auto &paragraphProps = *std::static_pointer_cast<const facebook::react::ParagraphProps>(m_props);
 
-      // Create a solid color brush for the text. A more sophisticated application might want
-      // to cache and reuse a brush across all text elements instead, taking care to recreate
-      // it in the event of device removed.
-      winrt::com_ptr<ID2D1SolidColorBrush> brush;
-      if (paragraphProps.textAttributes.foregroundColor) {
-        auto color = paragraphProps.textAttributes.foregroundColor.AsD2DColor();
-        winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(color, brush.put()));
-      } else {
-        winrt::check_hresult(
-            d2dDeviceContext->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::Black, 1.0f), brush.put()));
-      }
-
-      if (paragraphProps.textAttributes.textDecorationLineType) {
-        DWRITE_TEXT_RANGE range = {0, std::numeric_limits<uint32_t>::max()};
-        if (*(paragraphProps.textAttributes.textDecorationLineType) ==
-                facebook::react::TextDecorationLineType::Underline ||
-            *(paragraphProps.textAttributes.textDecorationLineType) ==
-                facebook::react::TextDecorationLineType::UnderlineStrikethrough) {
-          m_textLayout->SetUnderline(true, range);
-        } else {
-          m_textLayout->SetUnderline(false, range);
-        }
-      }
-
-      if (paragraphProps.textAttributes.textDecorationLineType) {
-        DWRITE_TEXT_RANGE range = {0, std::numeric_limits<uint32_t>::max()};
-        if (*(paragraphProps.textAttributes.textDecorationLineType) ==
-                facebook::react::TextDecorationLineType::Strikethrough ||
-            *(paragraphProps.textAttributes.textDecorationLineType) ==
-                facebook::react::TextDecorationLineType::UnderlineStrikethrough) {
-          m_textLayout->SetStrikethrough(true, range);
-        } else {
-          m_textLayout->SetStrikethrough(false, range);
-        }
-      }
+      RenderText(
+          *d2dDeviceContext,
+          *m_textLayout,
+          m_attributedStringBox.getValue(),
+          paragraphProps.textAttributes,
+          {static_cast<float>(offset.x) + m_layoutMetrics.contentInsets.left,
+           static_cast<float>(offset.y) + m_layoutMetrics.contentInsets.top},
+          m_layoutMetrics.pointScaleFactor,
+          *theme());
 
       if (!isnan(paragraphProps.opacity)) {
         m_visual.Opacity(paragraphProps.opacity);
       }
-
-      // Create color effects for individual text fragments.
-      unsigned int position = 0;
-      unsigned int length = 0;
-      for (auto fragment : m_attributedStringBox.getValue().getFragments()) {
-        length = static_cast<UINT32>(fragment.string.length());
-        DWRITE_TEXT_RANGE range = {position, length};
-        if (fragment.textAttributes.foregroundColor &&
-                (fragment.textAttributes.foregroundColor != paragraphProps.textAttributes.foregroundColor) ||
-            !isnan(fragment.textAttributes.opacity)) {
-          winrt::com_ptr<ID2D1SolidColorBrush> fragmentBrush;
-          if (fragment.textAttributes.foregroundColor) {
-            auto color = fragment.textAttributes.foregroundColor.AsD2DColor();
-            winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(color, fragmentBrush.put()));
-          } else {
-            winrt::check_hresult(
-                d2dDeviceContext->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::Black, 1.0f), fragmentBrush.put()));
-          }
-
-          if (fragment.textAttributes.textDecorationLineType) {
-            if (*(fragment.textAttributes.textDecorationLineType) ==
-                    facebook::react::TextDecorationLineType::Underline ||
-                *(fragment.textAttributes.textDecorationLineType) ==
-                    facebook::react::TextDecorationLineType::UnderlineStrikethrough) {
-              m_textLayout->SetUnderline(true, range);
-            } else {
-              m_textLayout->SetUnderline(false, range);
-            }
-          }
-
-          if (fragment.textAttributes.textDecorationLineType) {
-            if (*(fragment.textAttributes.textDecorationLineType) ==
-                    facebook::react::TextDecorationLineType::Strikethrough ||
-                *(fragment.textAttributes.textDecorationLineType) ==
-                    facebook::react::TextDecorationLineType::UnderlineStrikethrough) {
-              m_textLayout->SetStrikethrough(true, range);
-            } else {
-              m_textLayout->SetStrikethrough(false, range);
-            }
-          }
-
-          if (!isnan(fragment.textAttributes.opacity)) {
-            fragmentBrush->SetOpacity(fragment.textAttributes.opacity);
-          }
-          m_textLayout->SetDrawingEffect(fragmentBrush.get(), range);
-
-          // DWrite doesn't handle background highlight colors, so we manually draw the background color for ranges
-          if (facebook::react::isColorMeaningful(fragment.textAttributes.backgroundColor)) {
-            UINT32 actualHitTestCount = 0;
-            if (range.length > 0) {
-              m_textLayout->HitTestTextRange(
-                  range.startPosition,
-                  range.length,
-                  0, // x
-                  0, // y
-                  NULL,
-                  0, // metrics count
-                  &actualHitTestCount);
-            }
-
-            // Allocate enough room to return all hit-test metrics.
-            std::vector<DWRITE_HIT_TEST_METRICS> hitTestMetrics(actualHitTestCount);
-            if (range.length > 0) {
-              m_textLayout->HitTestTextRange(
-                  range.startPosition,
-                  range.length,
-                  0, // x
-                  0, // y
-                  &hitTestMetrics[0],
-                  static_cast<UINT32>(hitTestMetrics.size()),
-                  &actualHitTestCount);
-            }
-
-            // Draw the selection ranges behind the text.
-            if (actualHitTestCount > 0) {
-              // Note that an ideal layout will return fractional values,
-              // so you may see slivers between the selection ranges due
-              // to the per-primitive anti-aliasing of the edges unless
-              // it is disabled (better for performance anyway).
-              auto oldAliasMode = d2dDeviceContext->GetAntialiasMode();
-              d2dDeviceContext->SetAntialiasMode(D2D1_ANTIALIAS_MODE_ALIASED);
-
-              winrt::com_ptr<ID2D1SolidColorBrush> textHighlightBrush;
-              winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(
-                  fragment.textAttributes.backgroundColor.AsD2DColor(), textHighlightBrush.put()));
-
-              for (size_t i = 0; i < actualHitTestCount; ++i) {
-                const DWRITE_HIT_TEST_METRICS &htm = hitTestMetrics[i];
-
-                const D2D1_RECT_F rect = {
-                    std::round(htm.left + offsetX),
-                    std::round(htm.top + offsetY),
-                    std::round(htm.left + htm.width + offsetX),
-                    std::round(htm.top + htm.height + offsetY)};
-
-                d2dDeviceContext->FillRectangle(rect, textHighlightBrush.get());
-              }
-              d2dDeviceContext->SetAntialiasMode(oldAliasMode);
-            }
-          }
-        }
-
-        position += length;
-      }
-
-      // Draw the line of text at the specified offset, which corresponds to the top-left
-      // corner of our drawing surface. Notice we don't call BeginDraw on the D2D device
-      // context; this has already been done for us by the composition API.
-      d2dDeviceContext->DrawTextLayout(
-          D2D1::Point2F(
-              static_cast<FLOAT>((offset.x + m_layoutMetrics.contentInsets.left) / m_layoutMetrics.pointScaleFactor),
-              static_cast<FLOAT>((offset.y + m_layoutMetrics.contentInsets.top) / m_layoutMetrics.pointScaleFactor)),
-          m_textLayout.get(),
-          brush.get(),
-          D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT);
-
-      // restore dpi to old state
-      d2dDeviceContext->SetDpi(oldDpiX, oldDpiY);
     }
     m_requireRedraw = false;
   }
@@ -484,10 +350,11 @@ winrt::Microsoft::ReactNative::Composition::IVisual ParagraphComponentView::Visu
   return m_visual;
 }
 
-std::shared_ptr<ParagraphComponentView> ParagraphComponentView::Create(
+winrt::Microsoft::ReactNative::ComponentView ParagraphComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-    facebook::react::Tag tag) noexcept {
-  return std::shared_ptr<ParagraphComponentView>(new ParagraphComponentView(compContext, tag));
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
+  return winrt::make<ParagraphComponentView>(compContext, tag, reactContext);
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Composition.ParagraphComponentView.g.h"
 #include <Fabric/ComponentView.h>
 #include <d2d1_1.h>
 #include <dwrite.h>
@@ -14,17 +15,22 @@
 #include "CompositionHelpers.h"
 #include "CompositionViewComponentView.h"
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct ParagraphComponentView : CompositionBaseComponentView {
-  using Super = CompositionBaseComponentView;
+struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView, ComponentView> {
+  using Super = ParagraphComponentViewT<ParagraphComponentView, ComponentView>;
 
-  [[nodiscard]] static std::shared_ptr<ParagraphComponentView> Create(
+  [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-      facebook::react::Tag tag) noexcept;
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
-  void mountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept override;
-  void unmountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept override;
+  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 updateEventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter) noexcept override;
@@ -33,23 +39,25 @@ struct ParagraphComponentView : CompositionBaseComponentView {
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
-  void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
+  void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::Props::Shared props() noexcept override;
+  facebook::react::SharedViewProps viewProps() noexcept override;
   facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
       const noexcept override;
   void OnRenderingDeviceLost() noexcept override;
+  void onThemeChanged() noexcept override;
   facebook::react::SharedViewEventEmitter eventEmitterAtPoint(facebook::react::Point pt) noexcept override;
 
   winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept override;
   virtual std::string DefaultControlType() const noexcept override;
   virtual std::string DefaultAccessibleName() const noexcept override;
 
- private:
   ParagraphComponentView(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
-      facebook::react::Tag tag);
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
+ private:
   void ensureVisual() noexcept;
   void updateVisualBrush() noexcept;
   void DrawText() noexcept;
@@ -65,4 +73,4 @@ struct ParagraphComponentView : CompositionBaseComponentView {
   winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush m_drawingSurface;
 };
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "ReactCompositionViewComponentBuilder.h"
+#include <Fabric/Composition/CompositionViewComponentView.h>
 #include <strsafe.h>
 #include "DynamicWriter.h"
 #include "ReactHost/MsoUtils.h"
@@ -23,183 +24,91 @@ IComponentProps ReactCompositionViewComponentBuilder::CreateProps(ViewProps prop
   return m_propsFactory(props);
 }
 
-void ReactCompositionViewComponentBuilder::SetCreateView(CompositionComponentFactory impl) noexcept {
-  m_createView = impl;
-}
-// (Object handle, String commandName, Microsoft.ReactNative.IJSValueReader args) => bool
-void ReactCompositionViewComponentBuilder::SetCommandHandler(Composition::CommandHandler commandHandler) noexcept {
-  m_commandHandler = commandHandler;
-}
-// (Object handle, Microsoft.ReactNative.IComponentProps props) => void
-void ReactCompositionViewComponentBuilder::SetPropsUpdater(PropsUpdater impl) noexcept {
-  m_propsUpdater = impl;
-}
-// (Object handle, LayoutMetrics metrics) => void
-void ReactCompositionViewComponentBuilder::SetLayoutMetricsUpdater(LayoutMetricsUpdater impl) noexcept {
-  m_layoutMetricsUpdater = impl;
-}
-// (Object handle) => void
-void ReactCompositionViewComponentBuilder::SetUpdateFinalizer(UpdateFinalizer impl) noexcept {
-  m_finalizer = impl;
-}
-// (Object handle) => IVisual
-void ReactCompositionViewComponentBuilder::SetVisualCreator(Composition::VisualCreator impl) noexcept {
-  m_visualCreator = impl;
-}
-// (Object handle, UInt32 Msg, UInt64 WParam, Int64 LParam) => Int64
-void ReactCompositionViewComponentBuilder::SetMessageHandler(MessageHandler impl) noexcept {
-  m_messageHandler = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetKeyDownHandler(KeyHandler impl) noexcept {
-  m_keyDown = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetKeyUpHandler(KeyHandler impl) noexcept {
-  m_keyUp = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetPointerEnteredHandler(PointerHandler impl) noexcept {
-  m_pointerEntered = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetPointerExitedHandler(PointerHandler impl) noexcept {
-  m_pointerExited = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetPointerReleasedHandler(PointerHandler impl) noexcept {
-  m_pointerReleased = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetPointerPressedHandler(PointerHandler impl) noexcept {
-  m_pointerPressed = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetPointerMovedHandler(PointerHandler impl) noexcept {
-  m_pointerMoved = impl;
-}
-
-void ReactCompositionViewComponentBuilder::SetPointerWheelChangedHandler(PointerHandler impl) noexcept {
-  m_pointerWheelChanged = impl;
-}
-
-winrt::Windows::Foundation::IInspectable ReactCompositionViewComponentBuilder::CreateView(
-    IReactContext reactContext,
-    ICompositionContext context) noexcept {
-  return m_createView(reactContext, context);
-}
-
-bool ReactCompositionViewComponentBuilder::HandleCommand(
-    winrt::Windows::Foundation::IInspectable handle,
-    winrt::hstring commandName,
-    IJSValueReader args) noexcept {
-  if (!m_commandHandler) {
-    return false;
+void ReactCompositionViewComponentBuilder::CreateShadowNode(ShadowNode shadowNode) noexcept {
+  if (m_shadowNodeFactory) {
+    return m_shadowNodeFactory(shadowNode);
   }
-  return m_commandHandler(handle, commandName, args);
 }
 
-void ReactCompositionViewComponentBuilder::UpdateProps(
-    winrt::Windows::Foundation::IInspectable handle,
-    IComponentProps props) noexcept {
-  if (m_propsUpdater) {
-    m_propsUpdater(handle, props);
+void ReactCompositionViewComponentBuilder::CloneShadowNode(
+    ShadowNode shadowNode,
+    ShadowNode sourceShadowNode) noexcept {
+  if (m_shadowNodeCloner) {
+    m_shadowNodeCloner(shadowNode, sourceShadowNode);
   }
 }
 
-void ReactCompositionViewComponentBuilder::UpdateLayoutMetrics(
-    winrt::Windows::Foundation::IInspectable handle,
-    Composition::LayoutMetrics metrics) noexcept {
-  if (m_layoutMetricsUpdater) {
-    m_layoutMetricsUpdater(handle, metrics);
-  }
+MeasureContentHandler ReactCompositionViewComponentBuilder::MeasureContentHandler() const noexcept {
+  return m_measureContent;
 }
 
-void ReactCompositionViewComponentBuilder::FinalizeUpdates(winrt::Windows::Foundation::IInspectable handle) noexcept {
-  if (m_finalizer) {
-    m_finalizer(handle);
-  }
+LayoutHandler ReactCompositionViewComponentBuilder::LayoutHandler() const noexcept {
+  return m_layoutHandler;
 }
 
-IVisual ReactCompositionViewComponentBuilder::CreateVisual(winrt::Windows::Foundation::IInspectable handle) noexcept {
-  return m_visualCreator(handle);
+void ReactCompositionViewComponentBuilder::SetCreateComponentView(ComponentViewFactory impl) noexcept {
+  m_createComponentView = impl;
+  assert(!m_createView); // Only SetCreateComponentView OR SetCreateViewComponentView should be called
 }
 
-int64_t ReactCompositionViewComponentBuilder::SendMessage(
-    winrt::Windows::Foundation::IInspectable handle,
-    uint32_t msg,
-    uint64_t wparam,
-    int64_t lparam) noexcept {
-  if (!m_messageHandler) {
-    return 0;
-  }
-  return m_messageHandler(handle, msg, wparam, lparam);
+void ReactCompositionViewComponentBuilder::SetCreateViewComponentView(
+    CompositionViewComponentViewFactory impl) noexcept {
+  m_createView = impl;
+  assert(!m_createComponentView); // Only SetCreateComponentView OR SetCreateViewComponentView should be called
 }
-
-void ReactCompositionViewComponentBuilder::OnKeyDown(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
-  if (m_keyDown) {
-    m_keyDown(handle, source, args);
-  }
+// (Object handle, Microsoft.ReactNative.IComponentState state) => void
+// void ReactCompositionViewComponentBuilder::SetStateUpdater(StateUpdater impl) noexcept {
+//  m_stateUpdater = impl;
+// }
+// () => Object
+void ReactCompositionViewComponentBuilder::SetCreateShadowNode(ViewShadowNodeFactory impl) noexcept {
+  m_shadowNodeFactory = impl;
 }
-
-void ReactCompositionViewComponentBuilder::OnKeyUp(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
-  if (m_keyUp) {
-    m_keyUp(handle, source, args);
-  }
+// (Object handle) => Object
+void ReactCompositionViewComponentBuilder::SetShadowNodeCloner(ViewShadowNodeCloner impl) noexcept {
+  m_shadowNodeCloner = impl;
 }
-
-void ReactCompositionViewComponentBuilder::OnPointerEntered(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
-  if (m_pointerEntered) {
-    m_pointerEntered(handle, args);
-  }
+// (ShadowNode shadowNode, LayoutContext layoutContext, LayoutConstraints layoutConstraints) -> Size
+void ReactCompositionViewComponentBuilder::SetMeasureContentHandler(
+    winrt::Microsoft::ReactNative::MeasureContentHandler impl) noexcept {
+  m_measureContent = impl;
 }
 
-void ReactCompositionViewComponentBuilder::OnPointerExited(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
-  if (m_pointerExited) {
-    m_pointerExited(handle, args);
-  }
+void ReactCompositionViewComponentBuilder::SetInitialStateDataFactory(InitialStateDataFactory impl) noexcept {
+  m_initialStateDataFactory = impl;
 }
 
-void ReactCompositionViewComponentBuilder::OnPointerPressed(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
-  if (m_pointerPressed) {
-    m_pointerPressed(handle, args);
+winrt::Windows::Foundation::IInspectable ReactCompositionViewComponentBuilder::InitialStateData(
+    winrt::Microsoft::ReactNative::IComponentProps props) noexcept {
+  if (m_initialStateDataFactory) {
+    return m_initialStateDataFactory(props);
   }
+
+  return nullptr;
 }
 
-void ReactCompositionViewComponentBuilder::OnPointerReleased(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
-  if (m_pointerReleased) {
-    m_pointerReleased(handle, args);
-  }
+// (ShadowNode shadowNode, LayoutContext layoutContext) => void
+void ReactCompositionViewComponentBuilder::SetLayoutHandler(
+    winrt::Microsoft::ReactNative::LayoutHandler impl) noexcept {
+  m_layoutHandler = impl;
 }
 
-void ReactCompositionViewComponentBuilder::OnPointerMoved(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
-  if (m_pointerMoved) {
-    m_pointerMoved(handle, args);
+winrt::Microsoft::ReactNative::ComponentView ReactCompositionViewComponentBuilder::CreateView(
+    const IReactContext &reactContext,
+    int32_t tag,
+    const ICompositionContext &context) noexcept {
+  if (m_createView) {
+    auto args = winrt::make<implementation::CreateCompositionComponentViewArgs>(reactContext, tag, context);
+    return m_createView(args);
+  } else {
+    assert(m_createComponentView);
+    auto args = winrt::make<winrt::Microsoft::ReactNative::implementation::CreateComponentViewArgs>(reactContext, tag);
+    return m_createComponentView(args);
   }
 }
 
-void ReactCompositionViewComponentBuilder::OnPointerWheelChanged(
-    winrt::Windows::Foundation::IInspectable handle,
-    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
-  if (m_pointerWheelChanged) {
-    m_pointerWheelChanged(handle, args);
-  }
+bool ReactCompositionViewComponentBuilder::IsViewComponent() const noexcept {
+  return m_createView != nullptr;
 }
 
 } // namespace winrt::Microsoft::ReactNative::Composition