react-native-windows 0.77.0 → 0.78.0-preview.1

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

@@ -9,6 +9,7 @@
 #include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
 #include <Fabric/Composition/UiaHelpers.h>
 #include <Utils/ValueUtils.h>
+#include <react/renderer/components/textinput/TextInputState.h>
 #include <tom.h>
 #include <unicode.h>
 #include <winrt/Microsoft.UI.Input.h>
@@ -18,7 +19,6 @@
 #include "../RootComponentView.h"
 #include "JSValueReader.h"
 #include "WindowsTextInputShadowNode.h"
-#include "WindowsTextInputState.h"
 #include "guid/msoGuid.h"
 
 #include <unicode.h>
@@ -1070,7 +1070,7 @@ void WindowsTextInputComponentView::updateState(
 
   if (m_mostRecentEventCount == m_state->getData().mostRecentEventCount) {
     m_comingFromState = true;
-    auto &fragments = m_state->getData().attributedString.getFragments();
+    auto &fragments = m_state->getData().attributedStringBox.getValue().getFragments();
     UpdateText(fragments.size() ? fragments[0].string : "");
 
     m_comingFromState = false;
@@ -1133,7 +1133,7 @@ void WindowsTextInputComponentView::OnTextUpdated() noexcept {
   // auto newAttributedString = getAttributedString();
   // if (data.attributedString == newAttributedString)
   //    return;
-  data.attributedString = getAttributedString();
+  data.attributedStringBox = facebook::react::AttributedStringBox(getAttributedString());
   data.mostRecentEventCount = m_nativeEventCount;
 
   m_state->updateState(std::move(data));
@@ -1525,4 +1525,4 @@ void WindowsTextInputComponentView::autoCapitalizeOnUpdateProps(
   }
 }
 
-} // namespace winrt::Microsoft::ReactNative::Composition::implementation
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -3,7 +3,7 @@
 
 #include "WindowsTextInputShadowNode.h"
 
-#include <react/debug/react_native_assert.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextShadowNode.h>
@@ -12,39 +12,42 @@
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 
-#include <utility>
-
 namespace facebook::react {
 
 extern const char WindowsTextInputComponentName[] = "WindowsTextInput";
 
-void WindowsTextInputShadowNode::setContextContainer(ContextContainer *contextContainer) {
+void WindowsTextInputShadowNode::setTextLayoutManager(std::shared_ptr<const TextLayoutManager> textLayoutManager) {
   ensureUnsealed();
-  m_contextContainer = contextContainer;
+  textLayoutManager_ = std::move(textLayoutManager);
 }
 
-AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutContext &layoutContext) const {
-  // Use BaseTextShadowNode to get attributed string from children
-
-  auto childTextAttributes = TextAttributes::defaultTextAttributes();
-  childTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
+Size WindowsTextInputShadowNode::measureContent(
+    const LayoutContext &layoutContext,
+    const LayoutConstraints &layoutConstraints) const {
+  if (getStateData().cachedAttributedStringId != 0) {
+    return textLayoutManager_
+        ->measureCachedSpannableById(
+            getStateData().cachedAttributedStringId,
+            {}, // TODO getConcreteProps().paragraphAttributes
+            layoutConstraints)
+        .size;
+  }
 
-  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;
+  // 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);
 
-  auto attributedString = AttributedString{};
-  auto attachments = BaseTextShadowNode::Attachments{};
-  BaseTextShadowNode::buildAttributedString(childTextAttributes, *this, attributedString, attachments);
-  attributedString.setBaseTextAttributes(childTextAttributes);
+  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.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
     textAttributes.apply(getConcreteProps().textAttributes);
     auto fragment = AttributedString::Fragment{};
     fragment.string = getConcreteProps().text;
@@ -57,56 +60,40 @@ AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutCon
     attributedString.prependFragment(std::move(fragment));
   }
 
-  return attributedString;
-}
-
-// For measurement purposes, we want to make sure that there's at least a
-// single character in the string so that the measured height is greater
-// than zero. Otherwise, empty TextInputs with no placeholder don't
-// display at all.
-// TODO T67606511: We will redefine the measurement of empty strings as part
-// of T67606511
-AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(const LayoutContext &layoutContext) const {
-  // Return placeholder text, since text and children are empty.
-  auto textAttributedString = AttributedString{};
-  auto fragment = AttributedString::Fragment{};
-  fragment.string = getConcreteProps().placeholder;
-
-  if (fragment.string.empty()) {
-    fragment.string = BaseTextShadowNode::getEmptyPlaceholder();
-  }
-
-  auto textAttributes = TextAttributes::defaultTextAttributes();
-  textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-  textAttributes.apply(getConcreteProps().textAttributes);
-
-  // If there's no text, it's possible that this Fragment isn't actually
-  // appended to the AttributedString (see implementation of appendFragment)
-  fragment.textAttributes = textAttributes;
-  fragment.parentShadowView = ShadowView(*this);
-  textAttributedString.appendFragment(std::move(fragment));
-
-  return textAttributedString;
+  TextLayoutContext textLayoutContext;
+  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
+  return textLayoutManager_
+      ->measure(
+          AttributedStringBox{attributedString},
+          {}, // TODO getConcreteProps().paragraphAttributes,
+          textLayoutContext,
+          layoutConstraints)
+      .size;
 }
 
-void WindowsTextInputShadowNode::setTextLayoutManager(SharedTextLayoutManager textLayoutManager) {
-  ensureUnsealed();
-  m_textLayoutManager = std::move(textLayoutManager);
+void WindowsTextInputShadowNode::layout(LayoutContext layoutContext) {
+  updateStateIfNeeded(layoutContext);
+  ConcreteViewShadowNode::layout(layoutContext);
 }
 
-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.attributedString : reactTreeAttributedString);
+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) {
@@ -146,60 +133,101 @@ void WindowsTextInputShadowNode::updateStateIfNeeded(const LayoutContext &layout
   // 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(facebook::react::WindowsTextInputState{
-      newEventCount,
-      newAttributedString,
-      reactTreeAttributedString,
-      {},
-      state.defaultThemePaddingStart,
-      state.defaultThemePaddingEnd,
-      state.defaultThemePaddingTop,
-      state.defaultThemePaddingBottom});
+  setStateData(facebook::react::TextInputState{
+      AttributedStringBox(newAttributedString), reactTreeAttributedString, {}, newEventCount});
 }
 
-#pragma mark - LayoutableShadowNode
+AttributedString WindowsTextInputShadowNode::getAttributedString(const LayoutContext &layoutContext) const {
+  // Use BaseTextShadowNode to get attributed string from children
 
-Size WindowsTextInputShadowNode::measureContent(
-    const LayoutContext &layoutContext,
-    const LayoutConstraints &layoutConstraints) const {
-  if (getStateData().cachedAttributedStringId != 0) {
-    return m_textLayoutManager
-        ->measureCachedSpannableById(
-            getStateData().cachedAttributedStringId,
-            {}, // TODO getConcreteProps().paragraphAttributes
-            layoutConstraints)
-        .size;
-  }
+  auto childTextAttributes = TextAttributes::defaultTextAttributes();
+  childTextAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
 
-  // 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);
+  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;
 
-  if (attributedString.isEmpty()) {
-    attributedString = getPlaceholderAttributedString(layoutContext);
-  }
+  auto attributedString = AttributedString{};
+  auto attachments = BaseTextShadowNode::Attachments{};
+  BaseTextShadowNode::buildAttributedString(childTextAttributes, *this, attributedString, attachments);
+  attributedString.setBaseTextAttributes(childTextAttributes);
 
-  if (attributedString.isEmpty() && getStateData().mostRecentEventCount != 0) {
-    return {0, 0};
+  // 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);
+    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;
-  return m_textLayoutManager
-      ->measure(
-          AttributedStringBox{attributedString},
-          {}, // TODO getConcreteProps().paragraphAttributes,
-          textLayoutContext,
-          layoutConstraints)
-      .size;
+  return attributedString;
 }
 
-void WindowsTextInputShadowNode::layout(LayoutContext layoutContext) {
-  updateStateIfNeeded(layoutContext);
-  ConcreteViewShadowNode::layout(layoutContext);
+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);
+}
+
+// For measurement purposes, we want to make sure that there's at least a
+// single character in the string so that the measured height is greater
+// than zero. Otherwise, empty TextInputs with no placeholder don't
+// display at all.
+// TODO T67606511: We will redefine the measurement of empty strings as part
+// of T67606511
+AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(const LayoutContext &layoutContext) const {
+  // Return placeholder text, since text and children are empty.
+  auto textAttributedString = AttributedString{};
+  auto fragment = AttributedString::Fragment{};
+  fragment.string = getConcreteProps().placeholder;
+
+  if (fragment.string.empty()) {
+    fragment.string = BaseTextShadowNode::getEmptyPlaceholder();
+  }
+
+  auto textAttributes = TextAttributes::defaultTextAttributes();
+  textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
+  textAttributes.apply(getConcreteProps().textAttributes);
+
+  // If there's no text, it's possible that this Fragment isn't actually
+  // appended to the AttributedString (see implementation of appendFragment)
+  fragment.textAttributes = textAttributes;
+  fragment.parentShadowView = ShadowView(*this);
+  textAttributedString.appendFragment(std::move(fragment));
+
+  return textAttributedString;
+  // TextLayoutContext textLayoutContext;
+  // textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
+  // auto textSize = textLayoutManager_
+  //                     ->measure(
+  //                         AttributedStringBox{attributedString},
+  //                         getConcreteProps().paragraphAttributes,
+  //                         textLayoutContext,
+  //                         textConstraints)
+  //                     .size;
+  // return layoutConstraints.clamp(textSize);
 }
 
+#pragma mark - LayoutableShadowNode
+
 } // namespace facebook::react

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

@@ -7,12 +7,12 @@
 #include <unordered_map>
 #include "WindowsTextInputEventEmitter.h"
 #include "WindowsTextInputProps.h"
-#include "WindowsTextInputState.h"
 
+#include <react/renderer/attributedstring/AttributedString.h>
+#include <react/renderer/components/textinput/TextInputState.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/utils/ContextContainer.h>
 
-#include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
 namespace facebook::react {
@@ -26,58 +26,58 @@ class WindowsTextInputShadowNode final : public ConcreteViewShadowNode<
                                              WindowsTextInputComponentName,
                                              WindowsTextInputProps,
                                              WindowsTextInputEventEmitter,
-                                             WindowsTextInputState> {
+                                             TextInputState> {
  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;
   }
 
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-  void setContextContainer(ContextContainer *contextContainer);
-
-  /*
-   * Returns a `AttributedString` which represents text content of the node.
-   */
-  AttributedString getAttributedString(const LayoutContext &layoutContext) const;
-  AttributedString getPlaceholderAttributedString(const LayoutContext &layoutContext) const;
-
   /*
    * Associates a shared TextLayoutManager with the node.
-   * `ParagraphShadowNode` uses the manager to measure text content
-   * and construct `ParagraphState` objects.
+   * `TextInputShadowNode` uses the manager to measure text content
+   * and construct `TextInputState` objects.
    */
-  void setTextLayoutManager(SharedTextLayoutManager textLayoutManager);
+  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;
 
- private:
-  ContextContainer *m_contextContainer{};
+  // Float baseline(const LayoutContext& layoutContext, Size size) const override;
 
-  /**
-   * Get the most up-to-date attributed string for measurement and State.
+  std::shared_ptr<const TextLayoutManager> textLayoutManager_;
+
+  /*
+   * Determines the constraints to use while measure the underlying text
    */
-  AttributedString getMostRecentAttributedString(const LayoutContext &layoutContext) const;
+  LayoutConstraints getTextConstraints(const LayoutConstraints &layoutConstraints) const;
 
+ private:
   /*
    * Creates a `State` object (with `AttributedText` and
    * `TextLayoutManager`) if needed.
    */
   void updateStateIfNeeded(const LayoutContext &layoutContext);
 
-  SharedTextLayoutManager m_textLayoutManager;
-
   /*
-   * Cached attributed string that represents the content of the subtree started
-   * from the node.
+   * Returns a `AttributedString` which represents text content of the node.
    */
-  mutable std::optional<AttributedString> m_cachedAttributedString{};
+  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/Theme.cpp

@@ -124,7 +124,7 @@ bool Theme::TryGetPlatformColor(const std::string &platformColor, winrt::Windows
 
 #ifndef CORE_ABI
   // If XAML is loaded, look in application resources
-  if (xaml::TryGetCurrentApplication()) {
+  if (xaml::TryGetCurrentUwpXamlApplication()) {
     const auto appResources{xaml::Application::Current().Resources()};
     const auto boxedResourceName{winrt::box_value(winrt::to_hstring(platformColor))};
     if (appResources.HasKey(boxedResourceName)) {

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

@@ -42,44 +42,59 @@ HRESULT UiaNavigateHelper(
       }
     } break;
 
-    case NavigateDirection_LastChild:
-      __fallthrough;
-
+    case NavigateDirection_LastChild: {
+      auto children = view.Children();
+      if (children.Size() != 0) {
+        uint32_t index = children.Size() - 1;
+        do {
+          auto child = children.GetAt(index).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
+          if (uiaProvider = child->EnsureUiaProvider()) {
+            break;
+          }
+        } while (index-- != 0);
+      }
+    } break;
     case NavigateDirection_FirstChild: {
       auto children = view.Children();
-      auto index = direction == NavigateDirection_FirstChild ? 0 : children.Size() - 1;
-      if (!children.Size() == 0) {
-        uiaProvider = children.GetAt(index)
-                          .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
-                          ->EnsureUiaProvider();
+      if (children.Size() != 0) {
+        uint32_t index = 0;
+        do {
+          auto child = children.GetAt(index).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
+          if (uiaProvider = child->EnsureUiaProvider()) {
+            break;
+          }
+        } while (++index != children.Size());
       }
     } break;
-
     case NavigateDirection_NextSibling: {
-      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
       if (parentCV != nullptr) {
         auto children = parentCV->Children();
         auto it = std::find(children.begin(), children.end(), view);
-        if (++it != children.end()) {
-          uiaProvider = (*it)
-                            .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
-                            ->EnsureUiaProvider();
+
+        while (++it != children.end()) {
+          auto nextchild = (*it).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
+          if (uiaProvider = nextchild->EnsureUiaProvider()) {
+            break;
+          }
         }
       }
     } break;
 
     case NavigateDirection_PreviousSibling: {
-      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+      auto parentCV = view.Parent().as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
       if (parentCV != nullptr) {
         auto children = parentCV->Children();
-        for (auto i = children.Size() - 1; i > 0; i--) {
-          auto child = children.GetAt(i);
-          if (child == view) {
-            uiaProvider = children.GetAt(i - 1)
-                              .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
-                              ->EnsureUiaProvider();
-            break;
-          }
+        auto it = std::find(children.begin(), children.end(), view);
+
+        if (it != children.begin()) {
+          do {
+            it--;
+            auto prevchild = (*it).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
+            if (uiaProvider = prevchild->EnsureUiaProvider()) {
+              break;
+            }
+          } while (it != children.begin());
         }
       }
     } break;
@@ -174,16 +189,6 @@ long GetLiveSetting(const std::string &liveRegion) noexcept {
   return LiveSetting::Off;
 }
 
-std::string extractAccessibilityValue(const facebook::react::AccessibilityValue &value) noexcept {
-  if (value.now.has_value()) {
-    return std::to_string(value.now.value());
-  } else if (value.text.has_value()) {
-    return value.text.value();
-  } else {
-    return "";
-  }
-}
-
 void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept {
   auto strongView = view.view();
 

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

@@ -32,8 +32,6 @@ void UpdateUiaProperty(
 
 long GetLiveSetting(const std::string &liveRegion) noexcept;
 
-std::string extractAccessibilityValue(const facebook::react::AccessibilityValue &value) noexcept;
-
 void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept;
 
 ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept;

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -13,7 +13,6 @@
 #include <Fabric/Composition/ReactNativeIsland.h>
 #include <Fabric/Composition/RootComponentView.h>
 #include <Fabric/FabricUIManagerModule.h>
-#include <Fabric/ReactNativeConfigProperties.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
 #include <IReactContext.h>
 #include <IReactRootView.h>
@@ -61,9 +60,6 @@ FabricUIManager::~FabricUIManager() {
 }
 
 void FabricUIManager::installFabricUIManager() noexcept {
-  std::shared_ptr<const facebook::react::ReactNativeConfig> config =
-      std::make_shared<const ReactNativeConfigProperties>(m_context.Properties());
-
   std::lock_guard<std::mutex> schedulerLock(m_schedulerMutex);
 
   facebook::react::ContextContainer::Shared contextContainer = std::make_shared<facebook::react::ContextContainer>();
@@ -89,8 +85,6 @@ void FabricUIManager::installFabricUIManager() noexcept {
         return std::make_unique<AsynchronousEventBeat>(ownerBox, context, runtimeScheduler);
       };
 
-  contextContainer->insert("ReactNativeConfig", config);
-
   toolbox.contextContainer = contextContainer;
   toolbox.componentRegistryFactory = [](facebook::react::EventDispatcher::Weak const &eventDispatcher,
                                         facebook::react::ContextContainer::Shared const &contextContainer)
@@ -134,7 +128,6 @@ void FabricUIManager::startSurface(
 
     auto root = rootComponentViewDescriptor.view
                     .as<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>();
-    root->theme(winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(rootView.Theme()));
     root->start(rootView);
   });
 
@@ -154,15 +147,11 @@ void FabricUIManager::startSurface(
 void FabricUIManager::stopSurface(facebook::react::SurfaceId surfaceId) noexcept {
   m_surfaceManager->stopSurface(surfaceId);
   auto &rootDescriptor = m_registry.componentViewDescriptorWithTag(surfaceId);
+  rootDescriptor.view.as<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>()->stop();
   m_registry.enqueueComponentViewWithComponentHandle(
       facebook::react::RootShadowNode::Handle(), surfaceId, rootDescriptor);
 }
 
-winrt::Microsoft::ReactNative::ReactNativeIsland FabricUIManager::GetReactNativeIsland(
-    facebook::react::SurfaceId surfaceId) const noexcept {
-  return m_surfaceRegistry.at(surfaceId).wkRootView.get();
-}
-
 facebook::react::Size FabricUIManager::measureSurface(
     facebook::react::SurfaceId surfaceId,
     const facebook::react::LayoutConstraints &layoutConstraints,
@@ -230,9 +219,9 @@ void FabricUIManager::RCTPerformMountInstructions(
       case facebook::react::ShadowViewMutation::Insert: {
         auto &oldChildShadowView = mutation.oldChildShadowView;
         auto &newChildShadowView = mutation.newChildShadowView;
-        auto &parentShadowView = mutation.parentShadowView;
+        auto &parentTag = mutation.parentTag;
         auto &newChildViewDescriptor = m_registry.componentViewDescriptorWithTag(newChildShadowView.tag);
-        auto parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentShadowView.tag);
+        auto parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentTag);
         auto newChildComponentView =
             winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(newChildViewDescriptor.view);
 
@@ -249,9 +238,9 @@ void FabricUIManager::RCTPerformMountInstructions(
 
       case facebook::react::ShadowViewMutation::Remove: {
         auto &oldChildShadowView = mutation.oldChildShadowView;
-        auto &parentShadowView = mutation.parentShadowView;
+        auto &parentTag = mutation.parentTag;
         auto &oldChildViewDescriptor = m_registry.componentViewDescriptorWithTag(oldChildShadowView.tag);
-        auto &parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentShadowView.tag);
+        auto &parentViewDescriptor = m_registry.componentViewDescriptorWithTag(parentTag);
         winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(parentViewDescriptor.view)
             ->UnmountChildComponentView(oldChildViewDescriptor.view, mutation.index);
         break;

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -49,9 +49,6 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
 
   const IComponentViewRegistry &GetViewRegistry() const noexcept;
 
-  winrt::Microsoft::ReactNative::ReactNativeIsland GetReactNativeIsland(
-      facebook::react::SurfaceId surfaceId) const noexcept;
-
   static winrt::Microsoft::ReactNative::ReactNotificationId<facebook::react::SurfaceId> NotifyMountedId() noexcept;
 
  private: