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

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

@@ -5,7 +5,9 @@
 #pragma once
 
 #include "SwitchComponentView.h"
+#include "Composition/AutoDraw.h"
 #include "CompositionDynamicAutomationProvider.h"
+#include "RootComponentView.h"
 
 namespace Microsoft::ReactNative {
 
@@ -55,6 +57,9 @@ void SwitchComponentView::updateProps(
     m_drawingSurface = nullptr;
   }
 
+  // update BaseComponentView props
+  updateShadowProps(oldViewProps, newViewProps, m_visual);
+  updateTransformProps(oldViewProps, newViewProps, m_visual);
   updateBorderProps(oldViewProps, newViewProps);
   m_props = std::static_pointer_cast<facebook::react::ViewProps const>(props);
 }
@@ -84,19 +89,18 @@ void SwitchComponentView::updateLayoutMetrics(
 
 void SwitchComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {
   ensureDrawingSurface();
+
+  if (m_needsBorderUpdate) {
+    m_needsBorderUpdate = false;
+    UpdateSpecialBorderLayers(m_layoutMetrics, *m_props);
+  }
 }
 
 void SwitchComponentView::Draw() noexcept {
-  // Begin our update of the surface pixels. If this is our first update, we are required
-  // to specify the entire surface, which nullptr is shorthand for (but, as it works out,
-  // any time we make an update we touch the entire surface, so we always pass nullptr).
-  winrt::com_ptr<ID2D1DeviceContext> d2dDeviceContext;
   POINT offset;
 
-  winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop> drawingSurfaceInterop;
-  m_drawingSurface.as(drawingSurfaceInterop);
-
-  if (CheckForDeviceRemoved(drawingSurfaceInterop->BeginDraw(d2dDeviceContext.put(), &offset))) {
+  ::Microsoft::ReactNative::Composition::AutoDrawDrawingSurface autoDraw(m_drawingSurface, &offset);
+  if (auto d2dDeviceContext = autoDraw.GetRenderTarget()) {
     const auto switchProps = std::static_pointer_cast<const facebook::react::SwitchProps>(m_props);
 
     d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
@@ -124,13 +128,6 @@ void SwitchComponentView::Draw() noexcept {
         offsetX + trackMarginX + trackWidth,
         offsetY + trackMarginY + trackHeight);
 
-    // switchProps->value = false
-    float thumbX = trackRect.left + thumbMargin + thumbRadius;
-
-    if (switchProps->value) {
-      thumbX = trackRect.right - thumbMargin - thumbRadius;
-    }
-
     winrt::com_ptr<ID2D1SolidColorBrush> defaultBrush;
 
     D2D1_COLOR_F defaultColor =
@@ -138,12 +135,11 @@ void SwitchComponentView::Draw() noexcept {
 
     winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(defaultColor, defaultBrush.put()));
 
-    winrt::com_ptr<ID2D1SolidColorBrush> thumbBrush;
+    winrt::Windows::UI::Color thumbColor;
     if (!switchProps->disabled && switchProps->thumbTintColor) {
-      winrt::check_hresult(
-          d2dDeviceContext->CreateSolidColorBrush(switchProps->thumbTintColor.AsD2DColor(), thumbBrush.put()));
+      thumbColor = switchProps->thumbTintColor.AsWindowsColor();
     } else {
-      thumbBrush = defaultBrush;
+      thumbColor = winrt::Windows::UI::Colors::Gray();
     }
 
     const auto dpi = m_layoutMetrics.pointScaleFactor * 96.0f;
@@ -169,17 +165,21 @@ void SwitchComponentView::Draw() noexcept {
       d2dDeviceContext->FillRoundedRectangle(track, trackBrush.get());
     }
 
-    // switch thumb
-    D2D1_POINT_2F thumbCenter = D2D1 ::Point2F(thumbX, (trackRect.top + trackRect.bottom) / 2);
-    D2D1_ELLIPSE thumb = D2D1::Ellipse(thumbCenter, thumbRadius, thumbRadius);
-    d2dDeviceContext->FillEllipse(thumb, thumbBrush.get());
+    // switch thumb - made with composition
+    float thumbX = (trackMarginX + thumbMargin) * m_layoutMetrics.pointScaleFactor;
+    float thumbY = (trackMarginY + thumbMargin) * m_layoutMetrics.pointScaleFactor;
+
+    if (switchProps->value) {
+      thumbX = (trackMarginX + trackWidth - thumbRadius - thumbRadius - thumbMargin) * m_layoutMetrics.pointScaleFactor;
+    }
+
+    m_thumbVisual.Size(
+        {thumbRadius * m_layoutMetrics.pointScaleFactor, thumbRadius * m_layoutMetrics.pointScaleFactor});
+    m_thumbVisual.Position({thumbX, thumbY});
+    m_thumbVisual.Color(thumbColor);
 
     // Restore old dpi setting
     d2dDeviceContext->SetDpi(oldDpiX, oldDpiY);
-
-    // Our update is done. EndDraw never indicates rendering device removed, so any
-    // failure here is unexpected and, therefore, fatal.
-    winrt::check_hresult(drawingSurfaceInterop->EndDraw());
   }
 }
 
@@ -194,6 +194,11 @@ void SwitchComponentView::ensureVisual() noexcept {
     m_visual = m_compContext.CreateSpriteVisual();
     OuterVisual().InsertAt(m_visual, 0);
   }
+
+  if (!m_thumbVisual) {
+    m_thumbVisual = m_compContext.CreateSwitchThumbVisual();
+    m_visual.InsertAt(m_thumbVisual.InnerVisual(), 0);
+  }
 }
 
 void SwitchComponentView::ensureDrawingSurface() noexcept {
@@ -201,24 +206,24 @@ void SwitchComponentView::ensureDrawingSurface() noexcept {
     winrt::Windows::Foundation::Size surfaceSize = {
         m_layoutMetrics.frame.size.width * m_layoutMetrics.pointScaleFactor,
         m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor};
-    m_drawingSurface = m_compContext.CreateDrawingSurface(
+    m_drawingSurface = m_compContext.CreateDrawingSurfaceBrush(
         surfaceSize,
         winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
         winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
 
     Draw();
 
-    auto surfaceBrush = m_compContext.CreateSurfaceBrush(m_drawingSurface);
-
-    m_visual.Brush(surfaceBrush);
+    m_visual.Brush(m_drawingSurface);
   }
 }
 
-facebook::react::Tag SwitchComponentView::hitTest(facebook::react::Point pt, facebook::react::Point &localPt)
-    const noexcept {
+facebook::react::Tag SwitchComponentView::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 ((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) {
@@ -233,30 +238,53 @@ winrt::Microsoft::ReactNative::Composition::IVisual SwitchComponentView::Visual(
   return m_visual;
 }
 
-int64_t SwitchComponentView::sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept {
-  switch (msg) {
-    case WM_LBUTTONDOWN:
-    case WM_POINTERDOWN: {
-      const auto switchProps = std::static_pointer_cast<const facebook::react::SwitchProps>(m_props);
+void SwitchComponentView::onPointerPressed(
+    const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
+  const auto switchProps = std::static_pointer_cast<const facebook::react::SwitchProps>(m_props);
 
-      if (!switchProps->disabled && m_eventEmitter) {
-        auto switchEventEmitter = std::static_pointer_cast<facebook::react::SwitchEventEmitter const>(m_eventEmitter);
-
-        facebook::react::SwitchEventEmitter::OnChange args;
-        args.value = !(switchProps->value);
-        args.target = tag();
+  if (!switchProps->disabled) {
+    if (auto root = rootComponentView()) {
+      root->TrySetFocusedComponent(*this);
+    }
+    if (toggle()) {
+      args.Handled(true);
+    }
+  }
+}
 
-        switchEventEmitter->onChange(args);
-      }
-      break;
+void SwitchComponentView::onKeyUp(
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
+  if (args.Key() == winrt::Windows::System::VirtualKey::Space) {
+    if (toggle()) {
+      args.Handled(true);
     }
   }
+  Super::onKeyUp(source, args);
+}
+
+bool SwitchComponentView::toggle() noexcept {
+  const auto switchProps = std::static_pointer_cast<const facebook::react::SwitchProps>(m_props);
+
+  if (switchProps->disabled || !m_eventEmitter)
+    return false;
+
+  auto switchEventEmitter = std::static_pointer_cast<facebook::react::SwitchEventEmitter const>(m_eventEmitter);
 
-  return 0;
+  facebook::react::SwitchEventEmitter::OnChange args;
+  args.value = !(switchProps->value);
+  args.target = tag();
+
+  switchEventEmitter->onChange(args);
+  return true;
 }
 
 bool SwitchComponentView::focusable() const noexcept {
   return m_props->focusable;
 }
 
-} // namespace Microsoft::ReactNative
+std::string SwitchComponentView::DefaultControlType() const noexcept {
+  return "switch";
+}
+
+} // namespace Microsoft::ReactNative

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

@@ -37,10 +37,16 @@ struct SwitchComponentView : CompositionBaseComponentView {
   void prepareForRecycle() noexcept override;
   facebook::react::Props::Shared props() noexcept override;
   bool focusable() const noexcept override;
+  void onKeyUp(
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
+  void onPointerPressed(
+      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) 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;
-  int64_t sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept override;
+  std::string DefaultControlType() const noexcept override;
 
  private:
   SwitchComponentView(
@@ -51,12 +57,14 @@ struct SwitchComponentView : CompositionBaseComponentView {
   void ensureVisual() noexcept;
   void Draw() noexcept;
   void ensureDrawingSurface() noexcept;
+  bool toggle() noexcept;
 
   facebook::react::Size m_contentSize;
-  winrt::Microsoft::ReactNative::Composition::SpriteVisual m_visual{nullptr};
+  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual{nullptr};
   winrt::Microsoft::ReactNative::ReactContext m_context;
   facebook::react::SharedViewProps m_props;
-  winrt::Microsoft::ReactNative::Composition::ICompositionDrawingSurface m_drawingSurface;
+  winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush m_drawingSurface;
+  winrt::Microsoft::ReactNative::Composition::ISwitchThumbVisual m_thumbVisual;
 };
 
 } // namespace Microsoft::ReactNative

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

@@ -5,21 +5,22 @@
 
 #include "WindowsTextInputShadowNode.h"
 
-#include <yoga/CompactValue.h>
 #include <yoga/YGEnums.h>
 #include <yoga/YGValue.h>
+#include <yoga/style/CompactValue.h>
+
+#include <unordered_map>
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Descriptor for <WindowsTextInput> component.
  */
 class WindowsTextInputComponentDescriptor final : public ConcreteComponentDescriptor<WindowsTextInputShadowNode> {
  public:
-  WindowsTextInputComponentDescriptor(ComponentDescriptorParameters const &parameters)
+  WindowsTextInputComponentDescriptor(const ComponentDescriptorParameters &parameters)
       : ConcreteComponentDescriptor<WindowsTextInputShadowNode>(parameters) {
     // Every single `WindowsTextInputShadowNode` will have a reference to
     // a shared `TextLayoutManager`.
@@ -28,7 +29,7 @@ class WindowsTextInputComponentDescriptor final : public ConcreteComponentDescri
 
   /*
     virtual State::Shared createInitialState(
-        ShadowNodeFragment const &fragment,
+        facebook::react::Props::Shared const &props,
         ShadowNodeFamily::Shared const &family) const override {
       int surfaceId = family->getSurfaceId();
 
@@ -63,44 +64,42 @@ class WindowsTextInputComponentDescriptor final : public ConcreteComponentDescri
         env->DeleteLocalRef(defaultTextInputPaddingArray);
       }
 
-      return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
-          std::make_shared<AndroidTextInputState const>(AndroidTextInputState(
-              0,
-              {},
-              {},
-              {},
-              {},
-              {},
-              ((YGValue)theme[YGEdgeStart]).value,
-              ((YGValue)theme[YGEdgeEnd]).value,
-              ((YGValue)theme[YGEdgeTop]).value,
-              ((YGValue)theme[YGEdgeBottom]).value)),
-          family);
-    }
+    return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
+        std::make_shared<const AndroidTextInputState>(AndroidTextInputState(
+            0,
+            {},
+            {},
+            {},
+            ((YGValue)theme[YGEdgeStart]).value,
+            ((YGValue)theme[YGEdgeEnd]).value,
+            ((YGValue)theme[YGEdgeTop]).value,
+            ((YGValue)theme[YGEdgeBottom]).value)),
+        family);
+  }
   */
 
  protected:
-  void adopt(ShadowNode::Unshared const &shadowNode) const override {
-    auto textInputShadowNode = std::static_pointer_cast<WindowsTextInputShadowNode>(shadowNode);
+  void adopt(ShadowNode &shadowNode) const override {
+    auto &textInputShadowNode = static_cast<WindowsTextInputShadowNode &>(shadowNode);
 
     // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content
     // and communicate text rendering metrics to mounting layer.
-    textInputShadowNode->setTextLayoutManager(m_textLayoutManager);
+    textInputShadowNode.setTextLayoutManager(m_textLayoutManager);
 
-    textInputShadowNode->setContextContainer(const_cast<ContextContainer *>(getContextContainer().get()));
+    textInputShadowNode.setContextContainer(const_cast<ContextContainer *>(getContextContainer().get()));
 
     /*
         int surfaceId = textInputShadowNode->getSurfaceId();
         if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
             surfaceIdToThemePaddingMap_.end()) {
-          YGStyle::Edges theme = surfaceIdToThemePaddingMap_[surfaceId];
+          yoga::Style::Edges theme = surfaceIdToThemePaddingMap_[surfaceId];
 
           // Override padding
           // Node is still unsealed during adoption, before layout is complete
           // TODO: T62959168 account for RTL and paddingLeft when setting default
           // paddingStart, and vice-versa with paddingRight/paddingEnd.
           // For now this assumes no RTL.
-          YGStyle::Edges result =
+          yoga::Style::Edges result =
               textInputShadowNode->getConcreteProps().yogaStyle.padding();
           bool changedPadding = false;
           if (!textInputShadowNode->getConcreteProps().hasPadding &&
@@ -164,7 +163,7 @@ class WindowsTextInputComponentDescriptor final : public ConcreteComponentDescri
         textInputShadowNode->dirtyLayout();
 
         */
-    textInputShadowNode->enableMeasurement();
+    textInputShadowNode.enableMeasurement();
 
     ConcreteComponentDescriptor::adopt(shadowNode);
   }
@@ -173,5 +172,4 @@ class WindowsTextInputComponentDescriptor final : public ConcreteComponentDescri
   SharedTextLayoutManager m_textLayoutManager;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react