react-native-windows 0.72.13 → 0.73.0-preview.1

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h

@@ -43,12 +43,31 @@ struct WindowsTextInputComponentView : CompositionBaseComponentView {
   facebook::react::Props::Shared props() noexcept override;
   void handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept override;
   int64_t sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept override;
-  facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt) const noexcept override;
+  facebook::react::Tag hitTest(
+      facebook::react::Point pt,
+      facebook::react::Point &localPt,
+      bool ignorePointerEvents = false) const noexcept override;
   void OnRenderingDeviceLost() noexcept override;
   winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept override;
   void onFocusLost() noexcept override;
   void onFocusGained() noexcept override;
   bool focusable() const noexcept override;
+  std::string DefaultControlType() const noexcept override;
+  std::string DefaultAccessibleName() const noexcept override;
+  std::string DefaultHelpText() const 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 onKeyDown(
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
+  void onKeyUp(
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
 
  private:
   WindowsTextInputComponentView(
@@ -67,6 +86,7 @@ struct WindowsTextInputComponentView : CompositionBaseComponentView {
   void ensureDrawingSurface() noexcept;
   void DrawText() noexcept;
   void ShowCaret(bool show) noexcept;
+  winrt::com_ptr<::IDWriteTextLayout> CreatePlaceholderLayout();
   void UpdateCharFormat() noexcept;
   void UpdateParaFormat() noexcept;
   void UpdateText(const std::string &str) noexcept;
@@ -75,10 +95,10 @@ struct WindowsTextInputComponentView : CompositionBaseComponentView {
   std::string GetTextFromRichEdit() const noexcept;
 
   winrt::Windows::UI::Composition::CompositionSurfaceBrush m_brush{nullptr};
-  winrt::Microsoft::ReactNative::Composition::SpriteVisual m_visual{nullptr};
+  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual{nullptr};
   winrt::Microsoft::ReactNative::Composition::ICaretVisual m_caretVisual{nullptr};
   winrt::Microsoft::ReactNative::ReactContext m_context;
-  winrt::Microsoft::ReactNative::Composition::ICompositionDrawingSurface m_drawingSurface{nullptr};
+  winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush m_drawingSurface{nullptr};
 
   // Used by ITextHost impl
   CHARFORMAT2W m_cf;
@@ -89,6 +109,7 @@ struct WindowsTextInputComponentView : CompositionBaseComponentView {
   unsigned int m_imgWidth{0}, m_imgHeight{0};
   std::shared_ptr<facebook::react::WindowsTextInputProps const> m_props;
   std::shared_ptr<facebook::react::WindowsTextInputShadowNode::ConcreteState const> m_state;
+  RECT m_rcClient;
   int m_mostRecentEventCount{0};
   int m_nativeEventCount{0};
   bool m_comingFromJS{false};

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputProps.cpp

@@ -32,6 +32,7 @@ WindowsTextInputProps::WindowsTextInputProps(
       placeholderTextColor(
           convertRawProp(context, rawProps, "placeholderTextColor", sourceProps.placeholderTextColor, {})),
       scrollEnabled(convertRawProp(context, rawProps, "scrollEnabled", sourceProps.scrollEnabled, {true})),
+      cursorColor(convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
       selection(convertRawProp(context, rawProps, "selection", sourceProps.selection, {})),
       selectionColor(convertRawProp(context, rawProps, "selectionColor", sourceProps.selectionColor, {})),
       selectTextOnFocus(convertRawProp(context, rawProps, "selectTextOnFocus", sourceProps.selectTextOnFocus, {false})),

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputProps.h

@@ -16,7 +16,7 @@ struct CompWindowsTextInputSelectionStruct {
 
 static inline void
 fromRawValue(const PropsParserContext &context, const RawValue &value, CompWindowsTextInputSelectionStruct &result) {
-  auto map = (butter::map<std::string, RawValue>)value;
+  auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto tmp_start = map.find("start");
   if (tmp_start != map.end()) {
@@ -44,7 +44,7 @@ static inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,
     CompWindowsTextInputSubmitKeyEventsStruct &result) {
-  auto map = (butter::map<std::string, RawValue>)value;
+  auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto tmp_altKey = map.find("altKey");
   if (tmp_altKey != map.end()) {
@@ -103,6 +103,7 @@ class WindowsTextInputProps final : public ViewProps, public BaseTextProps {
   std::string placeholder{};
   SharedColor placeholderTextColor{};
   bool scrollEnabled{true};
+  SharedColor cursorColor{};
   CompWindowsTextInputSelectionStruct selection{};
   SharedColor selectionColor{};
   bool selectTextOnFocus{false};

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputShadowNode.cpp

@@ -86,7 +86,7 @@ void WindowsTextInputShadowNode::setTextLayoutManager(SharedTextLayoutManager te
 }
 
 AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString() const {
-  auto const &state = getStateData();
+  const auto &state = getStateData();
 
   auto reactTreeAttributedString = getAttributedString();
 
@@ -104,7 +104,7 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
   ensureUnsealed();
 
   auto reactTreeAttributedString = getAttributedString();
-  auto const &state = getStateData();
+  const auto &state = getStateData();
 
   // Tree is often out of sync with the value of the TextInput.
   // This is by design - don't change the value of the TextInput in the State,
@@ -141,9 +141,7 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
       newEventCount,
       newAttributedString,
       reactTreeAttributedString,
-      {}, // TODO getConcreteProps().paragraphAttributes,
-      defaultTextAttributes,
-      ShadowView(*this),
+      {},
       state.defaultThemePaddingStart,
       state.defaultThemePaddingEnd,
       state.defaultThemePaddingTop,
@@ -153,8 +151,8 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
 #pragma mark - LayoutableShadowNode
 
 Size WindowsTextInputShadowNode::measureContent(
-    LayoutContext const & /*layoutContext*/,
-    LayoutConstraints const &layoutConstraints) const {
+    const LayoutContext & /*layoutContext*/,
+    const LayoutConstraints &layoutConstraints) const {
   if (getStateData().cachedAttributedStringId != 0) {
     return m_textLayoutManager
         ->measureCachedSpannableById(

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputShadowNode.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <butter/map.h>
 #include <react/renderer/components/rnwcore/EventEmitters.h>
+#include <unordered_map>
 #include "WindowsTextInputEventEmitter.h"
 #include "WindowsTextInputProps.h"
 #include "WindowsTextInputState.h"
@@ -15,8 +15,7 @@
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char WindowsTextInputComponentName[];
 
@@ -55,7 +54,7 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
 
 #pragma mark - LayoutableShadowNode
 
-  Size measureContent(LayoutContext const &layoutContext, LayoutConstraints const &layoutConstraints) const override;
+  Size measureContent(const LayoutContext &layoutContext, const LayoutConstraints &layoutConstraints) const override;
   void layout(LayoutContext layoutContext) override;
 
  private:
@@ -81,5 +80,4 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
   mutable std::optional<AttributedString> m_cachedAttributedString{};
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputState.cpp

@@ -21,8 +21,6 @@ WindowsTextInputState::WindowsTextInputState(
     AttributedString attributedString,
     AttributedString reactTreeAttributedString,
     ParagraphAttributes paragraphAttributes,
-    TextAttributes defaultTextAttributes,
-    ShadowView defaultParentShadowView,
     float defaultThemePaddingStart,
     float defaultThemePaddingEnd,
     float defaultThemePaddingTop,
@@ -31,21 +29,17 @@ WindowsTextInputState::WindowsTextInputState(
       attributedString(std::move(attributedString)),
       reactTreeAttributedString(std::move(reactTreeAttributedString)),
       paragraphAttributes(std::move(paragraphAttributes)),
-      defaultTextAttributes(std::move(defaultTextAttributes)),
-      defaultParentShadowView(std::move(defaultParentShadowView)),
       defaultThemePaddingStart(defaultThemePaddingStart),
       defaultThemePaddingEnd(defaultThemePaddingEnd),
       defaultThemePaddingTop(defaultThemePaddingTop),
       defaultThemePaddingBottom(defaultThemePaddingBottom) {}
 
-WindowsTextInputState::WindowsTextInputState(WindowsTextInputState const &previousState, folly::dynamic const &data)
+WindowsTextInputState::WindowsTextInputState(const WindowsTextInputState &previousState, const folly::dynamic &data)
     : mostRecentEventCount(data.getDefault("mostRecentEventCount", previousState.mostRecentEventCount).getInt()),
       cachedAttributedStringId(data.getDefault("opaqueCacheId", previousState.cachedAttributedStringId).getInt()),
       attributedString(previousState.attributedString),
       reactTreeAttributedString(previousState.reactTreeAttributedString),
       paragraphAttributes(previousState.paragraphAttributes),
-      defaultTextAttributes(previousState.defaultTextAttributes),
-      defaultParentShadowView(previousState.defaultParentShadowView),
       defaultThemePaddingStart(
           data.getDefault("themePaddingStart", previousState.defaultThemePaddingStart).getDouble()),
       defaultThemePaddingEnd(data.getDefault("themePaddingEnd", previousState.defaultThemePaddingEnd).getDouble()),

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputState.h

@@ -44,20 +44,6 @@ class WindowsTextInputState final {
    */
   ParagraphAttributes paragraphAttributes{};
 
-  /**
-   * Default TextAttributes used if we need to construct a new Fragment.
-   * Only used if text is inserted into an AttributedString with no existing
-   * Fragments.
-   */
-  TextAttributes defaultTextAttributes;
-
-  /**
-   * Default parent ShadowView used if we need to construct a new Fragment.
-   * Only used if text is inserted into an AttributedString with no existing
-   * Fragments.
-   */
-  ShadowView defaultParentShadowView;
-
   /**
    * Communicates Android theme padding back to the ShadowNode / Component
    * Descriptor for layout.
@@ -72,15 +58,13 @@ class WindowsTextInputState final {
       AttributedString attributedString,
       AttributedString reactTreeAttributedString,
       ParagraphAttributes paragraphAttributes,
-      TextAttributes defaultTextAttributes,
-      ShadowView defaultParentShadowView,
       float defaultThemePaddingStart,
       float defaultThemePaddingEnd,
       float defaultThemePaddingTop,
       float defaultThemePaddingBottom);
 
   WindowsTextInputState() = default;
-  WindowsTextInputState(WindowsTextInputState const &previousState, folly::dynamic const &data);
+  WindowsTextInputState(const WindowsTextInputState &previousState, const folly::dynamic &data);
   folly::dynamic getDynamic() const;
   MapBuffer getMapBuffer() const;
 };

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

@@ -1,7 +1,10 @@
 #include "pch.h"
 #include "UiaHelpers.h"
 #include <Fabric/Composition/CompositionViewComponentView.h>
+#include <atlcomcli.h>
 #include <inspectable.h>
+#include "CompositionRootAutomationProvider.h"
+#include "RootComponentView.h"
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
@@ -61,12 +64,80 @@ HRESULT UiaNavigateHelper(
     } break;
   }
 
-  if (uiaProvider != nullptr) {
-    winrt::com_ptr<IRawElementProviderFragment> spFragment;
-    uiaProvider.as(spFragment);
+  auto spFragment = uiaProvider.try_as<IRawElementProviderFragment>();
+  if (spFragment != nullptr) {
     retVal = spFragment.detach();
   }
+
   return S_OK;
 }
 
+HRESULT UiaGetBoundingRectangleHelper(::Microsoft::ReactNative::ReactTaggedView &view, UiaRect &rect) noexcept {
+  auto strongView = view.view();
+
+  if (strongView == nullptr) {
+    return UIA_E_ELEMENTNOTAVAILABLE;
+  }
+
+  auto clientRect = strongView->getClientRect();
+
+  rect.left = clientRect.left;
+  rect.top = clientRect.top;
+  rect.width = clientRect.right - clientRect.left;
+  rect.height = clientRect.bottom - clientRect.top;
+
+  return S_OK;
+}
+
+HRESULT UiaSetFocusHelper(::Microsoft::ReactNative::ReactTaggedView &view) noexcept {
+  auto strongView = view.view();
+
+  if (!strongView)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  auto rootCV = strongView->rootComponentView();
+  if (rootCV == nullptr)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  return rootCV->TrySetFocusedComponent(*strongView) ? S_OK : E_FAIL;
+}
+
+bool WasUiaPropertyAdvised(winrt::com_ptr<IRawElementProviderSimple> &providerSimple, PROPERTYID propId) noexcept {
+  auto spFragment = providerSimple.try_as<IRawElementProviderFragment>();
+  if (spFragment == nullptr)
+    return false;
+
+  winrt::com_ptr<IRawElementProviderFragmentRoot> spFragmentRoot;
+  spFragment->get_FragmentRoot(spFragmentRoot.put());
+  if (spFragmentRoot == nullptr)
+    return false;
+
+  auto rootProvider = static_cast<CompositionRootAutomationProvider *>(spFragmentRoot.get());
+
+  return rootProvider->WasPropertyAdvised(propId);
+}
+
+void UpdateUiaProperty(winrt::IInspectable provider, PROPERTYID propId, bool oldValue, bool newValue) noexcept {
+  auto spProviderSimple = provider.try_as<IRawElementProviderSimple>();
+
+  if (spProviderSimple == nullptr || oldValue == newValue || !WasUiaPropertyAdvised(spProviderSimple, propId))
+    return;
+
+  UiaRaiseAutomationPropertyChangedEvent(spProviderSimple.get(), propId, CComVariant(oldValue), CComVariant(newValue));
+}
+
+void UpdateUiaProperty(
+    winrt::IInspectable provider,
+    PROPERTYID propId,
+    const std::string &oldValue,
+    const std::string &newValue) noexcept {
+  auto spProviderSimple = provider.try_as<IRawElementProviderSimple>();
+
+  if (spProviderSimple == nullptr || oldValue == newValue || !WasUiaPropertyAdvised(spProviderSimple, propId))
+    return;
+
+  UiaRaiseAutomationPropertyChangedEvent(
+      spProviderSimple.get(), propId, CComVariant(oldValue.c_str()), CComVariant(newValue.c_str()));
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -13,4 +13,16 @@ UiaNavigateHelper(
     NavigateDirection direction,
     IRawElementProviderFragment *&retVal) noexcept;
 
+HRESULT UiaGetBoundingRectangleHelper(::Microsoft::ReactNative::ReactTaggedView &view, UiaRect &rect) noexcept;
+
+HRESULT UiaSetFocusHelper(::Microsoft::ReactNative::ReactTaggedView &view) noexcept;
+
+void UpdateUiaProperty(winrt::IInspectable provider, PROPERTYID propId, bool oldValue, bool newValue) noexcept;
+
+void UpdateUiaProperty(
+    winrt::IInspectable provider,
+    PROPERTYID propId,
+    const std::string &oldValue,
+    const std::string &newValue) noexcept;
+
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -7,6 +7,7 @@
 #include "UnimplementedNativeViewComponentView.h"
 
 #include <Fabric/DWriteHelpers.h>
+#include "Composition/AutoDraw.h"
 #include "CompositionDynamicAutomationProvider.h"
 #include "Unicode.h"
 
@@ -30,15 +31,11 @@ std::shared_ptr<UnimplementedNativeViewComponentView> UnimplementedNativeViewCom
 
 void UnimplementedNativeViewComponentView::mountChildComponentView(
     IComponentView &childComponentView,
-    uint32_t index) noexcept {
-  assert(false);
-}
+    uint32_t index) noexcept {}
 
 void UnimplementedNativeViewComponentView::unmountChildComponentView(
     IComponentView &childComponentView,
-    uint32_t index) noexcept {
-  assert(false);
-}
+    uint32_t index) noexcept {}
 
 void UnimplementedNativeViewComponentView::updateProps(
     facebook::react::Props::Shared const &props,
@@ -62,16 +59,15 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
 
     winrt::Windows::Foundation::Size surfaceSize = {
         width * m_layoutMetrics.pointScaleFactor, height * m_layoutMetrics.pointScaleFactor};
-    auto drawingSurface = m_compContext.CreateDrawingSurface(
+    auto drawingSurface = m_compContext.CreateDrawingSurfaceBrush(
         surfaceSize,
         winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
         winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
 
-    auto surfaceBrush = m_compContext.CreateSurfaceBrush(drawingSurface);
-    surfaceBrush.HorizontalAlignmentRatio(0.f);
-    surfaceBrush.VerticalAlignmentRatio(0.f);
-    surfaceBrush.Stretch(winrt::Microsoft::ReactNative::Composition::CompositionStretch::None);
-    m_visual.Brush(surfaceBrush);
+    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({
         layoutMetrics.frame.origin.x * layoutMetrics.pointScaleFactor,
@@ -79,52 +75,49 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
         0.0f,
     });
 
-    winrt::com_ptr<ID2D1DeviceContext> d2dDeviceContext;
     POINT offset;
-
-    winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop> drawingSurfaceInterop;
-    drawingSurface.as(drawingSurfaceInterop);
-
-    if (CheckForDeviceRemoved(drawingSurfaceInterop->BeginDraw(d2dDeviceContext.put(), &offset))) {
-      d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::Red, 0.3f));
-      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);
-
-      winrt::com_ptr<IDWriteTextFormat> spTextFormat;
-      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,
-          DWRITE_FONT_STYLE_NORMAL,
-          DWRITE_FONT_STRETCH_NORMAL,
-          12,
-          L"",
-          spTextFormat.put()));
-
-      winrt::com_ptr<ID2D1SolidColorBrush> textBrush;
-      winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), textBrush.put()));
-
-      const D2D1_RECT_F rect = {
-          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);
-      d2dDeviceContext->DrawText(
-          label.c_str(),
-          static_cast<UINT32>(label.length()),
-          spTextFormat.get(),
-          rect,
-          textBrush.get(),
-          D2D1_DRAW_TEXT_OPTIONS_NONE,
-          DWRITE_MEASURING_MODE_NATURAL);
-
-      winrt::check_hresult(drawingSurfaceInterop->EndDraw());
+    {
+      ::Microsoft::ReactNative::Composition::AutoDrawDrawingSurface autoDraw(drawingSurface, &offset);
+      if (auto d2dDeviceContext = autoDraw.GetRenderTarget()) {
+        d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::Red, 0.3f));
+        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);
+
+        winrt::com_ptr<IDWriteTextFormat> spTextFormat;
+        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,
+            DWRITE_FONT_STYLE_NORMAL,
+            DWRITE_FONT_STRETCH_NORMAL,
+            12,
+            L"",
+            spTextFormat.put()));
+
+        winrt::com_ptr<ID2D1SolidColorBrush> textBrush;
+        winrt::check_hresult(
+            d2dDeviceContext->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), textBrush.put()));
+
+        const D2D1_RECT_F rect = {
+            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);
+        d2dDeviceContext->DrawText(
+            label.c_str(),
+            static_cast<UINT32>(label.length()),
+            spTextFormat.get(),
+            rect,
+            textBrush.get(),
+            D2D1_DRAW_TEXT_OPTIONS_NONE,
+            DWRITE_MEASURING_MODE_NATURAL);
+      }
     }
   }
   m_layoutMetrics = layoutMetrics;
@@ -151,10 +144,11 @@ winrt::Microsoft::ReactNative::Composition::IVisual UnimplementedNativeViewCompo
 
 facebook::react::Tag UnimplementedNativeViewComponentView::hitTest(
     facebook::react::Point pt,
-    facebook::react::Point &localPt) const noexcept {
+    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 ((m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
+  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) {

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

@@ -34,7 +34,8 @@ struct UnimplementedNativeViewComponentView : CompositionBaseComponentView {
   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) const 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;
 
@@ -43,7 +44,7 @@ struct UnimplementedNativeViewComponentView : CompositionBaseComponentView {
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
       facebook::react::Tag tag);
   std::shared_ptr<facebook::react::UnimplementedNativeViewProps const> m_props;
-  winrt::Microsoft::ReactNative::Composition::SpriteVisual m_visual{nullptr};
+  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual{nullptr};
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -18,12 +18,12 @@
 #include <UI.Xaml.Controls.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/DynamicPropsUtilities.h>
 #include <react/renderer/core/EventBeat.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/scheduler/SchedulerToolbox.h>
 #include <react/utils/ContextContainer.h>
+#include <react/utils/CoreFeatures.h>
 #include <runtimeexecutor/ReactCommon/RuntimeExecutor.h>
 #include <winrt/Windows.Graphics.Display.h>
 #include <winrt/Windows.UI.Composition.Desktop.h>
@@ -183,8 +183,8 @@ void FabricUIManager::startSurface(
 
   facebook::react::LayoutContext context;
   facebook::react::LayoutConstraints constraints;
-  context.pointScaleFactor = static_cast<float>(CompositionRootView->ScaleFactor());
-  context.fontSizeMultiplier = static_cast<float>(CompositionRootView->ScaleFactor());
+  context.pointScaleFactor = CompositionRootView->ScaleFactor();
+  context.fontSizeMultiplier = CompositionRootView->ScaleFactor();
   constraints.minimumSize.height = static_cast<float>(CompositionRootView->GetActualHeight());
   constraints.minimumSize.width = static_cast<float>(CompositionRootView->GetActualWidth());
   constraints.maximumSize.height = static_cast<float>(CompositionRootView->GetActualHeight());
@@ -347,7 +347,8 @@ void FabricUIManager::initiateTransaction(facebook::react::MountingCoordinator::
   } while (m_followUpTransactionRequired);
 }
 
-void FabricUIManager::schedulerDidFinishTransaction(facebook::react::MountingCoordinator::Shared mountingCoordinator) {
+void FabricUIManager::schedulerDidFinishTransaction(
+    const facebook::react::MountingCoordinator::Shared &mountingCoordinator) {
   // Should cache this locally
 
   if (m_context.UIDispatcher().HasThreadAccess()) {

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -75,7 +75,8 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   std::unordered_map<facebook::react::SurfaceId, SurfaceInfo> m_surfaceRegistry;
 
   // Inherited via SchedulerDelegate
-  virtual void schedulerDidFinishTransaction(facebook::react::MountingCoordinator::Shared mountingCoordinator) override;
+  virtual void schedulerDidFinishTransaction(
+      const facebook::react::MountingCoordinator::Shared &mountingCoordinator) override;
   virtual void schedulerDidRequestPreliminaryViewAllocation(
       facebook::react::SurfaceId surfaceId,
       const facebook::react::ShadowNode &shadowView) override;

package/Microsoft.ReactNative/Fabric/ImageRequest.cpp

@@ -37,4 +37,4 @@ const std::shared_ptr<const ImageResponseObserverCoordinator> &ImageRequest::get
   return coordinator_;
 }
 
-} // namespace facebook::react
+} // namespace facebook::react

package/Microsoft.ReactNative/Fabric/ReactTaggedView.h

@@ -12,7 +12,7 @@ namespace Microsoft::ReactNative {
  * Lightweight wrapper class around a ComponentView with a react tag which registers a
  * constant react tag at initialization time for a stable hash and provides the
  * underlying view to a caller if that underlying view's react tag has not
- * changed from the one provided at initalization time (i.e. recycled).
+ * changed from the one provided at initialization time (i.e. recycled).
  */
 struct ReactTaggedView {
   ReactTaggedView(const std::shared_ptr<IComponentView> &componentView)

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -31,10 +31,9 @@ WindowsComponentDescriptorRegistryProperty() noexcept {
 
 WindowsComponentDescriptorRegistry::WindowsComponentDescriptorRegistry()
     : m_componentDescriptorRegistry(std::make_shared<facebook::react::ComponentDescriptorProviderRegistry>()) {
-  /*
-m_componentDescriptorRegistry->add(facebook::react::concreteComponentDescriptorProvider<
-                                   facebook::react::ActivityIndicatorViewComponentDescriptor>());
-                                   */
+  m_componentDescriptorRegistry->add(facebook::react::concreteComponentDescriptorProvider<
+                                     facebook::react::ActivityIndicatorViewComponentDescriptor>());
+
   m_componentDescriptorRegistry->add(
       facebook::react::concreteComponentDescriptorProvider<facebook::react::ImageComponentDescriptor>());
   m_componentDescriptorRegistry->add(

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformTouch.h

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <react/renderer/components/view/BaseTouch.h>
+
+namespace facebook::react {
+using HostPlatformTouch = BaseTouch;
+} // namespace facebook::react