react-native-windows 0.81.37 → 0.81.40

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

@@ -5,6 +5,8 @@
 #pragma once
 
 #include "Composition.WindowsTextInputComponentView.g.h"
+#include <ComponentView.Experimental.interop.h>
+#include <Fabric/AbiTextInputShadowNode.h>
 #include <ReactContext.h>
 #include <Windows.Graphics.DirectX.Direct3D11.interop.h>
 #include <richedit.h>
@@ -22,10 +24,16 @@ namespace winrt::Microsoft::ReactNative::Composition::implementation {
 struct CompTextHost;
 
 struct WindowsTextInputComponentView
-    : WindowsTextInputComponentViewT<WindowsTextInputComponentView, ViewComponentView> {
+    : public WindowsTextInputComponentViewT<
+          WindowsTextInputComponentView,
+          ViewComponentView,
+          ::Microsoft::ReactNative::Composition::Experimental::ITextInputComponentInterop> {
   friend CompTextHost;
 
-  using Super = WindowsTextInputComponentViewT<WindowsTextInputComponentView, ViewComponentView>;
+  using Super = WindowsTextInputComponentViewT<
+      WindowsTextInputComponentView,
+      ViewComponentView,
+      ::Microsoft::ReactNative::Composition::Experimental::ITextInputComponentInterop>;
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
@@ -71,6 +79,9 @@ struct WindowsTextInputComponentView
   void OnContextMenuKey(
       const winrt::Microsoft::ReactNative::Composition::Input::ContextMenuKeyEventArgs &args) noexcept override;
   void onMounted() noexcept override;
+  const winrt::Microsoft::ReactNative::IComponentProps userProps(
+      facebook::react::Props::Shared const &props) noexcept override;
+  winrt::Microsoft::ReactNative::ViewProps ViewPropsInner() noexcept override;
 
   std::optional<std::string> getAccessiblityValue() noexcept override;
   void setAcccessiblityValue(std::string &&value) noexcept override;
@@ -80,13 +91,18 @@ struct WindowsTextInputComponentView
   WindowsTextInputComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
-      winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+      winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder *builder = nullptr);
   ~WindowsTextInputComponentView();
 
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept;
 
   std::pair<facebook::react::Cursor, HCURSOR> cursor() const noexcept override;
 
+  HRESULT GetTextDocument(ITextDocument2 **) noexcept;
+  HRESULT GetTextServices(ITextServices2 **textServices) noexcept;
+  HRESULT GetTextHost(ITextHost **textHost) noexcept;
+
  private:
   struct DrawBlock {
     DrawBlock(WindowsTextInputComponentView &view);
@@ -100,8 +116,9 @@ struct WindowsTextInputComponentView
   void ShowCaret(bool show) noexcept;
   winrt::com_ptr<::IDWriteTextLayout> CreatePlaceholderLayout();
   void UpdateCharFormat() noexcept;
+  CHARFORMAT2W GetCharFormat(const facebook::react::TextAttributes &textAttributes) noexcept;
   void UpdateParaFormat() noexcept;
-  void UpdateText(const std::string &str) noexcept;
+  void UpdateText(const facebook::react::AttributedString &attributedString) noexcept;
   void OnTextUpdated() noexcept;
   void EmitOnScrollEvent() noexcept;
   void OnSelectionChanged(LONG start, LONG end) noexcept;
@@ -124,6 +141,8 @@ struct WindowsTextInputComponentView
   void ShowContextMenu(const winrt::Windows::Foundation::Point &position) noexcept;
   void calculateContentVerticalOffset() noexcept;
 
+  void ensureTextHost() noexcept;
+
   winrt::Windows::UI::Composition::CompositionSurfaceBrush m_brush{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual m_caretVisual{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush m_drawingSurface{nullptr};
@@ -136,6 +155,7 @@ struct WindowsTextInputComponentView
   winrt::com_ptr<ITextServices2> m_textServices;
   unsigned int m_imgWidth{0}, m_imgHeight{0};
   std::shared_ptr<facebook::react::WindowsTextInputShadowNode::ConcreteState const> m_state;
+  std::shared_ptr<::Microsoft::ReactNative::AbiTextInputShadowNode::ConcreteState const> m_abistate;
   float m_fontSizeMultiplier{1.0};
   int64_t m_mostRecentEventCount{0};
   int m_nativeEventCount{0};

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

@@ -85,7 +85,7 @@ static inline void fromRawValue(
   }
 }
 
-class WindowsTextInputProps final : public ViewProps, public BaseTextProps {
+class WindowsTextInputProps : public ViewProps, public BaseTextProps {
  public:
   WindowsTextInputProps() = default;
   WindowsTextInputProps(

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

@@ -1,213 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "WindowsTextInputShadowNode.h"
-
-#include <react/featureflags/ReactNativeFeatureFlags.h>
-#include <react/renderer/attributedstring/AttributedStringBox.h>
-#include <react/renderer/attributedstring/PlaceholderAttributedString.h>
-#include <react/renderer/attributedstring/TextAttributes.h>
-#include <react/renderer/components/text/BaseTextShadowNode.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/core/LayoutContext.h>
-#include <react/renderer/core/conversions.h>
-#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
-
 namespace facebook::react {
 
 extern const char WindowsTextInputComponentName[] = "WindowsTextInput";
 
-void WindowsTextInputShadowNode::setTextLayoutManager(std::shared_ptr<const TextLayoutManager> textLayoutManager) {
-  ensureUnsealed();
-  textLayoutManager_ = std::move(textLayoutManager);
-}
-
-Size WindowsTextInputShadowNode::measureContent(
-    const LayoutContext &layoutContext,
-    const LayoutConstraints &layoutConstraints) const {
-  // Layout is called right after measure.
-  // Measure is marked as `const`, and `layout` is not; so State can be
-  // updated during layout, but not during `measure`. If State is out-of-date
-  // in layout, it's too late: measure will have already operated on old
-  // State. Thus, we use the same value here that we *will* use in layout to
-  // update the state.
-  AttributedString attributedString = getMostRecentAttributedString(layoutContext);
-
-  if (attributedString.isEmpty()) {
-    attributedString = getPlaceholderAttributedString(layoutContext);
-  }
-
-  // BaseTextShadowNode only gets children. We must detect and prepend text
-  // value attributes manually.
-  if (!getConcreteProps().text.empty()) {
-    auto textAttributes = TextAttributes::defaultTextAttributes();
-    textAttributes.apply(getConcreteProps().textAttributes);
-    auto fragment = AttributedString::Fragment{};
-    fragment.string = getConcreteProps().text;
-    fragment.textAttributes = textAttributes;
-    // If the TextInput opacity is 0 < n < 1, the opacity of the TextInput and
-    // text value's background will stack. This is a hack/workaround to prevent
-    // that effect.
-    fragment.textAttributes.backgroundColor = clearColor();
-    fragment.parentShadowView = ShadowView(*this);
-    attributedString.prependFragment(std::move(fragment));
-  }
-
-  TextLayoutContext textLayoutContext;
-  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
-
-  facebook::react::ParagraphAttributes paragraphAttributes{};
-  paragraphAttributes.maximumNumberOfLines = getConcreteProps().multiline ? 0 : 1;
-  return textLayoutManager_
-      ->measure(AttributedStringBox{attributedString}, paragraphAttributes, textLayoutContext, layoutConstraints)
-      .size;
-}
-
-void WindowsTextInputShadowNode::layout(LayoutContext layoutContext) {
-  updateStateIfNeeded(layoutContext);
-  ConcreteViewShadowNode::layout(layoutContext);
-}
-
-LayoutConstraints WindowsTextInputShadowNode::getTextConstraints(const LayoutConstraints &layoutConstraints) const {
-  if (getConcreteProps().multiline) {
-    return layoutConstraints;
-  } else {
-    // A single line TextInput acts as a horizontal scroller of infinitely
-    // expandable text, so we want to measure the text as if it is allowed to
-    // infinitely expand horizontally, and later clamp to the constraints of the
-    // input.
-    return LayoutConstraints{
-        .minimumSize = layoutConstraints.minimumSize,
-        .maximumSize =
-            Size{
-                .width = std::numeric_limits<Float>::infinity(),
-                .height = layoutConstraints.maximumSize.height,
-            },
-        .layoutDirection = layoutConstraints.layoutDirection,
-    };
-  }
-}
-
-void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layoutContext) {
-  ensureUnsealed();
-  const auto &stateData = getStateData();
-  auto reactTreeAttributedString = getAttributedString(layoutContext);
-
-  // 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,
-  // and therefore in Java, unless the tree itself changes.
-  if (stateData.reactTreeAttributedString == reactTreeAttributedString) {
-    return;
-  }
-
-  // If props event counter is less than what we already have in state, skip it
-  const auto &props = BaseShadowNode::getConcreteProps();
-  if (props.mostRecentEventCount < stateData.mostRecentEventCount) {
-    return;
-  }
-
-  // Store default TextAttributes in state.
-  // In the case where the TextInput is completely empty (no value, no
-  // defaultValue, no placeholder, no children) there are therefore no fragments
-  // in the AttributedString, and when State is updated, it needs some way to
-  // reconstruct a Fragment with default TextAttributes.
-  auto defaultTextAttributes = TextAttributes::defaultTextAttributes();
-  defaultTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-  defaultTextAttributes.apply(getConcreteProps().textAttributes);
-
-  auto newEventCount = stateData.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
-      ? 0
-      : getConcreteProps().mostRecentEventCount;
-  auto newAttributedString = getMostRecentAttributedString(layoutContext);
-
-  // Even if we're here and updating state, it may be only to update the layout
-  // manager If that is the case, make sure we don't update text: pass in the
-  // 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{AttributedStringBox(newAttributedString), reactTreeAttributedString, {}, newEventCount});
-}
-
-AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutContext &layoutContext) const {
-  // Use BaseTextShadowNode to get attributed string from children
-
-  auto childTextAttributes = TextAttributes::defaultTextAttributes();
-  childTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-  childTextAttributes.apply(getConcreteProps().textAttributes);
-  // Don't propagate the background color of the TextInput onto the attributed
-  // string. Android tries to render shadow of the background alongside the
-  // shadow of the text which results in weird artifacts.
-  childTextAttributes.backgroundColor = HostPlatformColor::UndefinedColor;
-
-  auto attributedString = AttributedString{};
-  auto attachments = BaseTextShadowNode::Attachments{};
-  BaseTextShadowNode::buildAttributedString(childTextAttributes, *this, attributedString, attachments);
-  attributedString.setBaseTextAttributes(childTextAttributes);
-
-  // BaseTextShadowNode only gets children. We must detect and prepend text
-  // value attributes manually.
-  if (!getConcreteProps().text.empty()) {
-    auto textAttributes = TextAttributes::defaultTextAttributes();
-    textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-    textAttributes.apply(getConcreteProps().textAttributes);
-    textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-    auto fragment = AttributedString::Fragment{};
-    fragment.string = getConcreteProps().text;
-    fragment.textAttributes = textAttributes;
-    // If the TextInput opacity is 0 < n < 1, the opacity of the TextInput and
-    // text value's background will stack. This is a hack/workaround to prevent
-    // that effect.
-    fragment.textAttributes.backgroundColor = clearColor();
-    fragment.parentShadowView = ShadowView(*this);
-    attributedString.prependFragment(std::move(fragment));
-  }
-
-  return attributedString;
-}
-
-AttributedString WindowsTextInputShadowNode::getMostRecentAttributedString(const LayoutContext &layoutContext) const {
-  const auto &state = getStateData();
-
-  auto reactTreeAttributedString = getAttributedString(layoutContext);
-
-  // Sometimes the treeAttributedString will only differ from the state
-  // not by inherent properties (string or prop attributes), but by the frame of
-  // the parent which has changed Thus, we can't directly compare the entire
-  // AttributedString
-  bool treeAttributedStringChanged =
-      !state.reactTreeAttributedString.compareTextAttributesWithoutFrame(reactTreeAttributedString);
-
-  return (!treeAttributedStringChanged ? state.attributedStringBox.getValue() : reactTreeAttributedString);
-}
-
-AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(const LayoutContext &layoutContext) const {
-  const auto &props = getConcreteProps();
-
-  AttributedString attributedString;
-  attributedString.setBaseTextAttributes(props.textAttributes);
-  //[windows
-  if (!props.placeholder.empty()) {
-    auto textAttributes = TextAttributes::defaultTextAttributes();
-    textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-    textAttributes.apply(props.textAttributes);
-
-    /*
-     * These props are applied to `View`, therefore they must not be a part of
-     * base text attributes.
-     */
-    textAttributes.backgroundColor = clearColor();
-    textAttributes.opacity = 1;
-
-    attributedString.appendFragment(
-        {.string = props.placeholder, .textAttributes = textAttributes, .parentShadowView = ShadowView(*this)});
-  }
-  // windows]
-
-  return ensurePlaceholderIfEmpty_DO_NOT_USE(attributedString);
-}
-
-#pragma mark - LayoutableShadowNode
-
 } // namespace facebook::react

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

@@ -3,84 +3,41 @@
 
 #pragma once
 
-#include <react/renderer/textlayoutmanager/WindowsTextLayoutManager.h>
+#include "ConcreteTextInputShadowNode.h"
 #include "WindowsTextInputEventEmitter.h"
 #include "WindowsTextInputProps.h"
 #include "WindowsTextInputState.h"
 
-#include <react/components/rnwcore/EventEmitters.h>
-#include <unordered_map>
-
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/AttributedString.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/utils/ContextContainer.h>
+#include <react/renderer/attributedstring/AttributedStringBox.h>
+#include <react/renderer/core/conversions.h>
 
 namespace facebook::react {
 
 extern const char WindowsTextInputComponentName[];
 
-/*
- * `ShadowNode` for <WindowsTextInput> component.
- */
-class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
+class WindowsTextInputShadowNode final : public ConcreteTextInputShadowNode<
                                              WindowsTextInputComponentName,
-                                             WindowsTextInputProps,
-                                             WindowsTextInputEventEmitter,
-                                             WindowsTextInputState> {
+                                             facebook::react::WindowsTextInputProps,
+                                             facebook::react::WindowsTextInputEventEmitter,
+                                             facebook::react::WindowsTextInputState> {
  public:
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  static ShadowNodeTraits BaseTraits() {
-    auto traits = ConcreteViewShadowNode::BaseTraits();
-    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
-    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
-    traits.set(ShadowNodeTraits::Trait::BaselineYogaNode);
-    return traits;
-  }
-
-  /*
-   * Associates a shared TextLayoutManager with the node.
-   * `TextInputShadowNode` uses the manager to measure text content
-   * and construct `TextInputState` objects.
-   */
-  void setTextLayoutManager(std::shared_ptr<const TextLayoutManager> textLayoutManager);
-
-#pragma mark - LayoutableShadowNode
- protected:
-  Size measureContent(const LayoutContext &layoutContext, const LayoutConstraints &layoutConstraints) const override;
-
-  void layout(LayoutContext layoutContext) override;
-
-  Float baseline(const LayoutContext &layoutContext, Size size) const override {
-    // Calculate baseline as 80% of the text height
-    return size.height * 0.8f;
+  using Super = ConcreteTextInputShadowNode<
+      WindowsTextInputComponentName,
+      facebook::react::WindowsTextInputProps,
+      facebook::react::WindowsTextInputEventEmitter,
+      facebook::react::WindowsTextInputState>;
+  using Super::Super;
+
+  void updateTextInputState(
+      facebook::react::AttributedStringBox attributedStringBox,
+      facebook::react::AttributedString &reactTreeAttributedString,
+      facebook::react::ParagraphAttributes paragraphAttributes,
+      int64_t mostRecentEventCount) override {
+    Super::setStateData(facebook::react::WindowsTextInputState{
+        attributedStringBox, reactTreeAttributedString, paragraphAttributes, mostRecentEventCount});
   }
-
-  std::shared_ptr<const TextLayoutManager> textLayoutManager_;
-
-  /*
-   * Determines the constraints to use while measure the underlying text
-   */
-  LayoutConstraints getTextConstraints(const LayoutConstraints &layoutConstraints) const;
-
- private:
-  /*
-   * Creates a `State` object (with `AttributedText` and
-   * `TextLayoutManager`) if needed.
-   */
-  void updateStateIfNeeded(const LayoutContext &layoutContext);
-
-  /*
-   * Returns a `AttributedString` which represents text content of the node.
-   */
-  AttributedString getAttributedString(const LayoutContext &layoutContext) const;
-
-  /**
-   * Get the most up-to-date attributed string for measurement and State.
-   */
-  AttributedString getMostRecentAttributedString(const LayoutContext &layoutContext) const;
-
-  AttributedString getPlaceholderAttributedString(const LayoutContext &layoutContext) const;
 };
 
 } // namespace facebook::react

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

@@ -11,6 +11,7 @@
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
+#include <Fabric/AbiState.h>
 #include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h> // [windows]
@@ -20,7 +21,7 @@ namespace facebook::react {
 /*
  * State for <TextInput> component.
  */
-class WindowsTextInputState final {
+class WindowsTextInputState {
  public:
   WindowsTextInputState() = default;
 

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -5,7 +5,6 @@
 #include "WindowsComponentDescriptorRegistry.h"
 
 #include <Fabric/AbiComponentDescriptor.h>
-#include <Fabric/AbiViewComponentDescriptor.h>
 #include <Fabric/Composition/TextInput/WindowsTextInputComponentDescriptor.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/components/image/ImageComponentDescriptor.h>

package/Microsoft.ReactNative/IReactCompositionViewComponentBuilder.idl

@@ -25,6 +25,10 @@ namespace Microsoft.ReactNative.Composition
   [experimental]
   delegate void PortalComponentViewInitializer(PortalComponentView view);
 
+  [webhosthidden]
+  [experimental]
+  delegate void TextInputComponentViewInitializer(WindowsTextInputComponentView view);
+
   [experimental]
   [webhosthidden]
   delegate Microsoft.UI.Composition.Visual CreateVisualDelegate(Microsoft.ReactNative.ComponentView view);
@@ -69,6 +73,7 @@ namespace Microsoft.ReactNative.Composition
     void SetViewComponentViewInitializer(ViewComponentViewInitializer initializer);
     void SetContentIslandComponentViewInitializer(ComponentIslandComponentViewInitializer initializer);
     void SetPortalComponentViewInitializer(PortalComponentViewInitializer initializer);
+    void SetTextInputComponentViewInitializer(TextInputComponentViewInitializer initializer);
     void SetCreateVisualHandler(CreateVisualDelegate impl);
     void SetViewFeatures(ComponentViewFeatures viewFeatures);
     void SetUpdateLayoutMetricsHandler(UpdateLayoutMetricsDelegate impl);

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -97,7 +97,6 @@
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalOptions>%(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
-      <AdditionalOptions Condition="'$(PlatformToolsetVersion)' != '' And $(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <AdditionalIncludeDirectories>
         $(ExternalDir)fmt\include;
         $(ReactNativeWindowsDir)Microsoft.ReactNative;

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -149,6 +149,35 @@ struct LoadedCallbackGuard {
   Mso::CntPtr<ReactInstanceWin> m_reactInstance;
 };
 
+//=============================================================================================
+// InitTaskGuard fails the load if an initialization task is destroyed without running.
+// It reports the failure in the native queue. ReactHost's load action stays pending until then,
+// so ReactHost cannot be released while the instance reports the error to it.
+//=============================================================================================
+
+struct InitTaskGuard {
+  InitTaskGuard(ReactInstanceWin &reactInstance) noexcept : m_reactInstance{&reactInstance} {}
+
+  InitTaskGuard(const InitTaskGuard &other) = delete;
+  InitTaskGuard &operator=(const InitTaskGuard &other) = delete;
+
+  void Dismiss() noexcept {
+    m_reactInstance = nullptr;
+  }
+
+  ~InitTaskGuard() noexcept {
+    if (auto reactInstance = std::move(m_reactInstance)) {
+      Mso::DispatchQueue queue = reactInstance->Queue();
+      queue.InvokeElsePost([instance = std::move(reactInstance)]() noexcept {
+        instance->OnReactInstanceLoaded(Mso::CancellationErrorProvider().MakeErrorCode(true));
+      });
+    }
+  }
+
+ private:
+  Mso::CntPtr<ReactInstanceWin> m_reactInstance;
+};
+
 struct BridgeUIBatchInstanceCallback final : public facebook::react::InstanceCallback {
   BridgeUIBatchInstanceCallback(Mso::WeakPtr<ReactInstanceWin> wkInstance) : m_wkInstance(wkInstance) {}
   virtual ~BridgeUIBatchInstanceCallback() = default;
@@ -624,13 +653,21 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
   winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager::Install(
       ReactPropertyBag(m_reactContext->Properties()), m_options.UriImageManager);
 
-  m_uiQueue->Post([this, weakThis = Mso::WeakPtr{this}]() noexcept {
+  // The app's UI queue, or the native queue, can destroy an initialization task without running it.
+  // Office, for example, cancels its UI queue when it starts to shut down. The load would then never
+  // complete, and ReactHost would never unload the instance, so the host could never close.
+  // The guard fails the load in that case. The native task dismisses it; the tasks that load the
+  // bundle carry their own guards.
+  auto loadGuard = std::make_shared<InitTaskGuard>(*this);
+  m_uiQueue->Post([this, weakThis = Mso::WeakPtr{this}, loadGuard]() noexcept {
     // Objects that must be created on the UI thread
     if (auto strongThis = weakThis.GetStrongPtr()) {
       InitUIDependentCalls();
 
-      strongThis->Queue().Post([this, weakThis]() noexcept {
+      strongThis->Queue().Post([this, weakThis, loadGuard]() noexcept {
+        loadGuard->Dismiss();
         if (auto strongThis = weakThis.GetStrongPtr()) {
+          m_isNativeInitStarted = true;
           auto devSettings = strongThis->CreateDevSettings();
 
           try {
@@ -797,12 +834,16 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
       ReactPropertyBag(m_reactContext->Properties()), m_options.UriImageManager);
 #endif
 
-  m_uiQueue->Post([this, weakThis = Mso::WeakPtr{this}]() noexcept {
+  // See InitializeBridgeless for why the initialization tasks carry an InitTaskGuard.
+  auto loadGuard = std::make_shared<InitTaskGuard>(*this);
+  m_uiQueue->Post([this, weakThis = Mso::WeakPtr{this}, loadGuard]() noexcept {
     // Objects that must be created on the UI thread
     if (auto strongThis = weakThis.GetStrongPtr()) {
       InitUIDependentCalls();
-      strongThis->Queue().Post([this, weakThis]() noexcept {
+      strongThis->Queue().Post([this, weakThis, loadGuard]() noexcept {
+        loadGuard->Dismiss();
         if (auto strongThis = weakThis.GetStrongPtr()) {
+          m_isNativeInitStarted = true;
           auto devSettings = strongThis->CreateDevSettings();
 
           auto getBoolProperty = [properties = ReactPropertyBag{m_options.Properties}](
@@ -1075,7 +1116,9 @@ Mso::Future<void> ReactInstanceWin::Destroy() noexcept {
   AbandonJSCallQueue();
 
   // Make sure that the instance is not destroyed yet
+  bool completesOnJSQueue = false;
   if (auto instance = m_instance.Exchange(nullptr)) {
+    completesOnJSQueue = true;
     {
       // Release the JSI runtime
       std::scoped_lock lock{m_mutex};
@@ -1084,13 +1127,19 @@ Mso::Future<void> ReactInstanceWin::Destroy() noexcept {
     }
     // Release the message queues before the ui manager and instance.
     m_nativeMessageThread.Exchange(nullptr);
-    m_jsMessageThread.Exchange(nullptr);
+    auto jsMessageThread = m_jsMessageThread.Exchange(nullptr);
+    if (!m_isNativeInitStarted && jsMessageThread) {
+      // A queue dropped the initialization task, so the bridge was never created. Destroying the bridge is
+      // what quits the JS queue and completes m_whenDestroyed, so quit the queue here instead.
+      jsMessageThread->quitSynchronous();
+    }
     m_instanceWrapper.Exchange(nullptr);
     m_jsDispatchQueue.Exchange(nullptr);
   }
 
 #ifdef USE_FABRIC
   if (m_bridgelessReactInstance) {
+    completesOnJSQueue = true;
     if (auto jsMessageThread = m_jsMessageThread.Exchange(nullptr)) {
       jsMessageThread->runOnQueueSync([&]() noexcept {
         // Unregister from inspector BEFORE shutting down JS thread
@@ -1119,6 +1168,12 @@ Mso::Future<void> ReactInstanceWin::Destroy() noexcept {
   }
 #endif
 
+  if (!completesOnJSQueue) {
+    // Initialization never created the instance that runs on the JS queue, for example because a queue
+    // dropped its initialization task. No JS queue work item will complete m_whenDestroyed.
+    m_whenDestroyed.TrySetValue();
+  }
+
   return m_whenDestroyedResult;
 }
 

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -149,6 +149,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   void OnDebuggerAttach() noexcept;
 
   friend struct LoadedCallbackGuard;
+  friend struct InitTaskGuard;
   void OnReactInstanceLoaded(const Mso::ErrorCode &errorCode) noexcept;
 
   void DrainJSCallQueue() noexcept;
@@ -182,6 +183,8 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   std::atomic<bool> m_isLoaded{false};
   std::atomic<bool> m_isDestroyed{false};
   std::atomic<bool> m_isRekaInitialized{false};
+  // Set on the native queue when the initialization task that runs there starts.
+  std::atomic<bool> m_isNativeInitStarted{false};
 
  private: // fields controlled by mutex
   mutable std::mutex m_mutex;

package/Microsoft.ReactNative/ViewProps.idl

@@ -98,5 +98,16 @@ namespace Microsoft.ReactNative {
     // TODO add accessors to all the properties on ImageProps
   }
   
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  runtimeclass TextInputProps : ViewProps
+  {
+    String Placeholder { get; };
+    Boolean SecureTextEntry { get; };
+    // TODO add accessors to all the properties on TextInputProps
+  }
+  
+  
 
 } // namespace Microsoft. ReactNative

package/Microsoft.ReactNative/Views/ViewViewManager.cpp

@@ -201,14 +201,14 @@ class ViewShadowNode : public ShadowNodeBase {
     auto contentControl = winrt::make<winrt::Microsoft::ReactNative::implementation::ViewControl>();
 
     m_contentControlGotFocusRevoker = contentControl.GotFocus(winrt::auto_revoke, [=](auto &&, auto &&args) {
-      if (args.OriginalSource().try_as<xaml::UIElement>() == contentControl.as<xaml::UIElement>()) {
+      if (args.OriginalSource().template try_as<xaml::UIElement>() == contentControl.as<xaml::UIElement>()) {
         auto tag = m_tag;
         DispatchEvent("topFocus", std::move(folly::dynamic::object("target", tag)));
       }
     });
 
     m_contentControlLostFocusRevoker = contentControl.LostFocus(winrt::auto_revoke, [=](auto &&, auto &&args) {
-      if (args.OriginalSource().try_as<xaml::UIElement>() == contentControl.as<xaml::UIElement>()) {
+      if (args.OriginalSource().template try_as<xaml::UIElement>() == contentControl.as<xaml::UIElement>()) {
         auto tag = m_tag;
         DispatchEvent("topBlur", std::move(folly::dynamic::object("target", tag)));
       }