react-native-windows 0.70.7 → 0.71.0-preview.1

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

@@ -0,0 +1,99 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <ReactContext.h>
+#include <Windows.Graphics.DirectX.Direct3D11.interop.h>
+#include <richedit.h>
+#include <textserv.h>
+#include <windows.ui.composition.interop.h>
+#include <winrt/Windows.UI.Composition.h>
+#include "../ComponentView.h"
+#include "../CompositionHelpers.h"
+#include "../CompositionViewComponentView.h"
+#include "WindowsTextInputProps.h"
+#include "WindowsTextInputShadowNode.h"
+
+namespace Microsoft::ReactNative {
+
+struct CompTextHost;
+
+struct WindowsTextInputComponentView : CompositionBaseComponentView {
+  friend CompTextHost;
+
+  using Super = CompositionBaseComponentView;
+  WindowsTextInputComponentView(
+      const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+
+  std::vector<facebook::react::ComponentDescriptorProvider> supplementalComponentDescriptorProviders() noexcept
+      override;
+  void mountChildComponentView(const IComponentView &childComponentView, uint32_t index) noexcept override;
+  void unmountChildComponentView(const IComponentView &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;
+  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;
+  void parent(IComponentView *parent) noexcept override;
+  void OnRenderingDeviceLost() noexcept override;
+  winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept override;
+  void onFocusLost() noexcept override;
+  void onFocusGained() noexcept override;
+  facebook::react::SharedTouchEventEmitter touchEventEmitter() noexcept override;
+
+ private:
+  struct DrawBlock {
+    DrawBlock(WindowsTextInputComponentView &view);
+    ~DrawBlock();
+    WindowsTextInputComponentView &m_view;
+  };
+
+  facebook::react::AttributedString getAttributedString() const;
+  void ensureVisual() noexcept;
+  void ensureDrawingSurface() noexcept;
+  void DrawText() noexcept;
+  void ShowCaret(bool show) noexcept;
+  void UpdateCharFormat() noexcept;
+  void UpdateParaFormat() noexcept;
+  void UpdateText(const std::string &str) noexcept;
+  void OnTextUpdated() noexcept;
+  void OnSelectionChanged(LONG start, LONG end) noexcept;
+  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::ICaretVisual m_caretVisual{nullptr};
+  winrt::Microsoft::ReactNative::ReactContext m_context;
+  winrt::Microsoft::ReactNative::Composition::ICompositionDrawingSurface m_drawingSurface{nullptr};
+
+  // Used by ITextHost impl
+  CHARFORMAT2W m_cf;
+  PARAFORMAT2 m_pf;
+
+  winrt::com_ptr<ITextHost> m_textHost;
+  winrt::com_ptr<ITextServices2> m_textServices;
+  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;
+  int m_mostRecentEventCount{0};
+  int m_nativeEventCount{0};
+  bool m_comingFromJS{false};
+  bool m_comingFromState{false};
+  int m_cDrawBlock{0};
+  bool m_needsRedraw{false};
+  bool m_drawing{false};
+};
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputProps.cpp

@@ -7,25 +7,6 @@
 
 namespace facebook::react {
 
-static bool
-hasValue(const RawProps &rawProps, bool defaultValue, const char *name, const char *prefix, const char *suffix) {
-  auto rawValue = rawProps.at(name, prefix, suffix);
-
-  // No change to prop - use default
-  if (rawValue == nullptr) {
-    return defaultValue;
-  }
-
-  // Value passed from JS
-  if (rawValue->hasValue()) {
-    return true;
-  }
-
-  // Null/undefined passed in, indicating that we should use the default
-  // platform value - thereby resetting this
-  return false;
-}
-
 WindowsTextInputProps::WindowsTextInputProps(
     const PropsParserContext &context,
     const WindowsTextInputProps &sourceProps,
@@ -65,17 +46,6 @@ WindowsTextInputProps::WindowsTextInputProps(
       autoCapitalize(convertRawProp(context, rawProps, "autoCapitalize", sourceProps.autoCapitalize, {})),
       clearTextOnSubmit(convertRawProp(context, rawProps, "clearTextOnSubmit", sourceProps.clearTextOnSubmit, {false})),
       submitKeyEvents(convertRawProp(context, rawProps, "submitKeyEvents", sourceProps.submitKeyEvents, {})),
-      autoFocus(convertRawProp(context, rawProps, "autoFocus", sourceProps.autoFocus, {false})),
-      // See AndroidTextInputComponentDescriptor for usage
-      // TODO T63008435: can these, and this feature, be removed entirely?
-      hasPadding(hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
-      hasPaddingHorizontal(hasValue(rawProps, sourceProps.hasPaddingHorizontal, "Horizontal", "padding", "")),
-      hasPaddingVertical(hasValue(rawProps, sourceProps.hasPaddingVertical, "Vertical", "padding", "")),
-      hasPaddingLeft(hasValue(rawProps, sourceProps.hasPaddingLeft, "Left", "padding", "")),
-      hasPaddingTop(hasValue(rawProps, sourceProps.hasPaddingTop, "Top", "padding", "")),
-      hasPaddingRight(hasValue(rawProps, sourceProps.hasPaddingRight, "Right", "padding", "")),
-      hasPaddingBottom(hasValue(rawProps, sourceProps.hasPaddingBottom, "Bottom", "padding", "")),
-      hasPaddingStart(hasValue(rawProps, sourceProps.hasPaddingStart, "Start", "padding", "")),
-      hasPaddingEnd(hasValue(rawProps, sourceProps.hasPaddingEnd, "End", "padding", "")) {}
+      autoFocus(convertRawProp(context, rawProps, "autoFocus", sourceProps.autoFocus, {false})) {}
 
 } // namespace facebook::react

package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputProps.h

@@ -9,13 +9,13 @@
 
 namespace facebook::react {
 
-struct WindowsTextInputSelectionStruct {
+struct CompWindowsTextInputSelectionStruct {
   int start;
   int end;
 };
 
 static inline void
-fromRawValue(const PropsParserContext &context, const RawValue &value, WindowsTextInputSelectionStruct &result) {
+fromRawValue(const PropsParserContext &context, const RawValue &value, CompWindowsTextInputSelectionStruct &result) {
   auto map = (butter::map<std::string, RawValue>)value;
 
   auto tmp_start = map.find("start");
@@ -28,11 +28,11 @@ fromRawValue(const PropsParserContext &context, const RawValue &value, WindowsTe
   }
 }
 
-static inline std::string toString(const WindowsTextInputSelectionStruct &value) {
-  return "[Object WindowsTextInputSelectionStruct]";
+static inline std::string toString(const CompWindowsTextInputSelectionStruct &value) {
+  return "[Object CompWindowsTextInputSelectionStruct]";
 }
 
-struct WindowsTextInputSubmitKeyEventsStruct {
+struct CompWindowsTextInputSubmitKeyEventsStruct {
   bool altKey;
   bool ctrlKey;
   bool metaKey;
@@ -40,8 +40,10 @@ struct WindowsTextInputSubmitKeyEventsStruct {
   std::string code;
 };
 
-static inline void
-fromRawValue(const PropsParserContext &context, const RawValue &value, WindowsTextInputSubmitKeyEventsStruct &result) {
+static inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    CompWindowsTextInputSubmitKeyEventsStruct &result) {
   auto map = (butter::map<std::string, RawValue>)value;
 
   auto tmp_altKey = map.find("altKey");
@@ -66,17 +68,17 @@ fromRawValue(const PropsParserContext &context, const RawValue &value, WindowsTe
   }
 }
 
-static inline std::string toString(const WindowsTextInputSubmitKeyEventsStruct &value) {
-  return "[Object WindowsTextInputSubmitKeyEventsStruct]";
+static inline std::string toString(const CompWindowsTextInputSubmitKeyEventsStruct &value) {
+  return "[Object CompWindowsTextInputSubmitKeyEventsStruct]";
 }
 
 static inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,
-    std::vector<WindowsTextInputSubmitKeyEventsStruct> &result) {
+    std::vector<CompWindowsTextInputSubmitKeyEventsStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
-    WindowsTextInputSubmitKeyEventsStruct newItem;
+    CompWindowsTextInputSubmitKeyEventsStruct newItem;
     fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
@@ -98,7 +100,7 @@ class WindowsTextInputProps final : public ViewProps, public BaseTextProps {
   std::string placeholder{};
   SharedColor placeholderTextColor{};
   bool scrollEnabled{true};
-  WindowsTextInputSelectionStruct selection{};
+  CompWindowsTextInputSelectionStruct selection{};
   SharedColor selectionColor{};
   bool selectTextOnFocus{false};
   bool spellCheck{false};
@@ -110,23 +112,8 @@ class WindowsTextInputProps final : public ViewProps, public BaseTextProps {
   bool caretHidden{false};
   std::string autoCapitalize{};
   bool clearTextOnSubmit{false};
-  std::vector<WindowsTextInputSubmitKeyEventsStruct> submitKeyEvents{};
+  std::vector<CompWindowsTextInputSubmitKeyEventsStruct> submitKeyEvents{};
   bool autoFocus{false};
-
-  /**
-   * Auxiliary information to detect if these props are set or not.
-   * See AndroidTextInputComponentDescriptor for usage.
-   * TODO T63008435: can these, and this feature, be removed entirely?
-   */
-  const bool hasPadding{};
-  const bool hasPaddingHorizontal{};
-  const bool hasPaddingVertical{};
-  const bool hasPaddingLeft{};
-  const bool hasPaddingTop{};
-  const bool hasPaddingRight{};
-  const bool hasPaddingBottom{};
-  const bool hasPaddingStart{};
-  const bool hasPaddingEnd{};
 };
 
 } // namespace facebook::react

package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputShadowNode.cpp

@@ -13,19 +13,20 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char WindowsTextInputComponentName[] = "WindowsTextInput";
 
 void WindowsTextInputShadowNode::setContextContainer(ContextContainer *contextContainer) {
   ensureUnsealed();
-  contextContainer_ = contextContainer;
+  m_contextContainer = contextContainer;
 }
 
 AttributedString WindowsTextInputShadowNode::getAttributedString() const {
   // Use BaseTextShadowNode to get attributed string from children
+
   auto childTextAttributes = TextAttributes::defaultTextAttributes();
+
   childTextAttributes.apply(getConcreteProps().textAttributes);
 
   auto attributedString = AttributedString{};
@@ -81,7 +82,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString() co
 
 void WindowsTextInputShadowNode::setTextLayoutManager(SharedTextLayoutManager textLayoutManager) {
   ensureUnsealed();
-  textLayoutManager_ = std::move(textLayoutManager);
+  m_textLayoutManager = std::move(textLayoutManager);
 }
 
 AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString() const {
@@ -123,10 +124,12 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
   // in the AttributedString, and when State is updated, it needs some way to
   // reconstruct a Fragment with default TextAttributes.
   auto defaultTextAttributes = TextAttributes::defaultTextAttributes();
+
   defaultTextAttributes.apply(getConcreteProps().textAttributes);
 
-  auto newEventCount =
-      (state.reactTreeAttributedString == reactTreeAttributedString ? 0 : getConcreteProps().mostRecentEventCount);
+  auto newEventCount = state.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
+      ? 0
+      : getConcreteProps().mostRecentEventCount;
   auto newAttributedString = getMostRecentAttributedString();
 
   // Even if we're here and updating state, it may be only to update the layout
@@ -134,11 +137,11 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
-  setStateData(WindowsTextInputState{
+  setStateData(facebook::react::WindowsTextInputState{
       newEventCount,
       newAttributedString,
       reactTreeAttributedString,
-      {}, // [Windows] getConcreteProps().paragraphAttributes,
+      {}, // TODO getConcreteProps().paragraphAttributes,
       defaultTextAttributes,
       ShadowView(*this),
       state.defaultThemePaddingStart,
@@ -150,13 +153,13 @@ void WindowsTextInputShadowNode::updateStateIfNeeded() {
 #pragma mark - LayoutableShadowNode
 
 Size WindowsTextInputShadowNode::measureContent(
-    LayoutContext const &layoutContext,
+    LayoutContext const & /*layoutContext*/,
     LayoutConstraints const &layoutConstraints) const {
   if (getStateData().cachedAttributedStringId != 0) {
-    return textLayoutManager_
+    return m_textLayoutManager
         ->measureCachedSpannableById(
             getStateData().cachedAttributedStringId,
-            {}, // [Windows] getConcreteProps().paragraphAttributes,
+            {}, // TODO getConcreteProps().paragraphAttributes
             layoutConstraints)
         .size;
   }
@@ -176,7 +179,7 @@ Size WindowsTextInputShadowNode::measureContent(
     return {0, 0};
   }
 
-  return textLayoutManager_
+  return m_textLayoutManager
       ->measure(
           AttributedStringBox{attributedString},
           {}, // TODO getConcreteProps().paragraphAttributes,
@@ -189,5 +192,4 @@ void WindowsTextInputShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputShadowNode.h

@@ -59,7 +59,7 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
   void layout(LayoutContext layoutContext) override;
 
  private:
-  ContextContainer *contextContainer_{};
+  ContextContainer *m_contextContainer{};
 
   /**
    * Get the most up-to-date attributed string for measurement and State.
@@ -72,13 +72,13 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
    */
   void updateStateIfNeeded();
 
-  SharedTextLayoutManager textLayoutManager_;
+  SharedTextLayoutManager m_textLayoutManager;
 
   /*
    * Cached attributed string that represents the content of the subtree started
    * from the node.
    */
-  mutable std::optional<AttributedString> cachedAttributedString_{};
+  mutable std::optional<AttributedString> m_cachedAttributedString{};
 };
 
 } // namespace react

package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputState.cpp

@@ -1,19 +1,20 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 #include "WindowsTextInputState.h"
 
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 WindowsTextInputState::WindowsTextInputState(
     int64_t mostRecentEventCount,
@@ -70,7 +71,23 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   }
   return newState;
 }
+
+MapBuffer AndroidTextInputState::getMapBuffer() const {
+  auto builder = MapBufferBuilder();
+  // See comment in getDynamic block.
+  if (cachedAttributedStringId == 0) {
+    builder.putInt(TX_STATE_KEY_MOST_RECENT_EVENT_COUNT, mostRecentEventCount);
+
+    auto attStringMapBuffer = toMapBuffer(attributedString);
+    builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
+    auto paMapBuffer = toMapBuffer(paragraphAttributes);
+    builder.putMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES, paMapBuffer);
+
+    builder.putInt(TX_STATE_KEY_HASH, attStringMapBuffer.getInt(AS_KEY_HASH));
+  }
+  return builder.build();
+}
+
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputState.h

@@ -5,23 +5,17 @@
 
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-
-#ifdef ANDROID
-#include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#endif
+#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * State for <WindowsTextInput> component.
  */
 class WindowsTextInputState final {
  public:
-  int64_t mostRecentEventCount{0};
+  int mostRecentEventCount{0};
 
   /**
    * Stores an opaque cache ID used on the Java side to refer to a specific
@@ -88,12 +82,7 @@ class WindowsTextInputState final {
   WindowsTextInputState() = default;
   WindowsTextInputState(WindowsTextInputState const &previousState, folly::dynamic const &data);
   folly::dynamic getDynamic() const;
-  /* [Windows
-  MapBuffer getMapBuffer() const {
-    return MapBufferBuilder::EMPTY();
-  };
-     Windows] */
+  MapBuffer getMapBuffer() const;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react