react-native-windows 0.74.29 → 0.74.31

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();
 
@@ -214,6 +219,30 @@ ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept {
   }
 }
 
+void AddSelectionItemsToContainer(CompositionDynamicAutomationProvider *provider) noexcept {
+  winrt::com_ptr<IRawElementProviderSimple> selectionContainer;
+  provider->get_SelectionContainer(selectionContainer.put());
+  if (!selectionContainer)
+    return;
+  auto selectionContainerProvider = selectionContainer.as<CompositionDynamicAutomationProvider>();
+  auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
+  winrt::com_ptr<IRawElementProviderSimple> simpleProviderPtr;
+  simpleProviderPtr.copy_from(simpleProvider);
+  selectionContainerProvider->AddToSelectionItems(simpleProviderPtr);
+}
+
+void RemoveSelectionItemsFromContainer(CompositionDynamicAutomationProvider *provider) noexcept {
+  winrt::com_ptr<IRawElementProviderSimple> selectionContainer;
+  provider->get_SelectionContainer(selectionContainer.put());
+  if (!selectionContainer)
+    return;
+  auto selectionContainerProvider = selectionContainer.as<CompositionDynamicAutomationProvider>();
+  auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
+  winrt::com_ptr<IRawElementProviderSimple> simpleProviderPtr;
+  simpleProviderPtr.copy_from(simpleProvider);
+  selectionContainerProvider->RemoveFromSelectionItems(simpleProviderPtr);
+}
+
 ToggleState GetToggleState(const std::optional<facebook::react::AccessibilityState> &state) noexcept {
   if (state.has_value()) {
     if (state->checked == facebook::react::AccessibilityState::Checked) {

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

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Fabric/ComponentView.h>
+#include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
 #include <Fabric/ReactTaggedView.h>
 #include <UIAutomation.h>
 
@@ -31,11 +32,13 @@ 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;
 
+void AddSelectionItemsToContainer(CompositionDynamicAutomationProvider *provider) noexcept;
+
+void RemoveSelectionItemsFromContainer(CompositionDynamicAutomationProvider *provider) noexcept;
+
 ToggleState GetToggleState(const std::optional<facebook::react::AccessibilityState> &state) noexcept;
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -157,7 +157,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);
   });
 
@@ -177,15 +176,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,

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:

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -6,7 +6,6 @@
 
 #include <Fabric/AbiComponentDescriptor.h>
 #include <Fabric/AbiViewComponentDescriptor.h>
-#include <Fabric/Composition/Modal/WindowsModalHostViewComponentDescriptor.h>
 #include <Fabric/Composition/TextInput/WindowsTextInputComponentDescriptor.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/components/image/ImageComponentDescriptor.h>
@@ -37,7 +36,6 @@ WindowsComponentDescriptorRegistry::WindowsComponentDescriptorRegistry()
       facebook::react::ActivityIndicatorViewComponentDescriptor>());
   add(facebook::react::concreteComponentDescriptorProvider<facebook::react::DebuggingOverlayComponentDescriptor>());
   add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ImageComponentDescriptor>());
-  add(facebook::react::concreteComponentDescriptorProvider<facebook::react::WindowsModalHostViewComponentDescriptor>());
   add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ParagraphComponentDescriptor>());
   add(facebook::react::concreteComponentDescriptorProvider<facebook::react::RawTextComponentDescriptor>());
   add(facebook::react::concreteComponentDescriptorProvider<facebook::react::ScrollViewComponentDescriptor>());

package/Microsoft.ReactNative/IReactCompositionViewComponentBuilder.idl

@@ -21,6 +21,10 @@ namespace Microsoft.ReactNative.Composition
   [experimental]
   delegate void ComponentIslandComponentViewInitializer(ContentIslandComponentView view);
 
+  [webhosthidden]
+  [experimental]
+  delegate void PortalComponentViewInitializer(PortalComponentView view);
+
   [experimental]
   [webhosthidden]
   delegate Microsoft.UI.Composition.Visual CreateVisualDelegate(Microsoft.ReactNative.ComponentView view);
@@ -55,6 +59,7 @@ namespace Microsoft.ReactNative.Composition
   {
     void SetViewComponentViewInitializer(ViewComponentViewInitializer initializer);
     void SetContentIslandComponentViewInitializer(ComponentIslandComponentViewInitializer initializer);
+    void SetPortalComponentViewInitializer(PortalComponentViewInitializer initializer);
     void SetCreateVisualHandler(CreateVisualDelegate impl);
     void SetViewFeatures(ComponentViewFeatures viewFeatures);
     void SetUpdateLayoutMetricsHandler(UpdateLayoutMetricsDelegate impl);

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -586,6 +586,24 @@ std::unique_ptr<facebook::jsi::PreparedScriptStore> CreatePreparedScriptStore()
 }
 
 #ifdef USE_FABRIC
+
+typedef HRESULT(__stdcall *SetThreadDescriptionFn)(HANDLE, PCWSTR);
+void SetJSThreadDescription() noexcept {
+  // Office still supports Server 2016 so we need to use Run Time Dynamic Linking and cannot just use:
+  // ::SetThreadDescription(GetCurrentThread(), L"React-Native JavaScript Thread");
+
+  auto moduleHandle = GetModuleHandleW(L"kernelbase.dll");
+  // The description is just for developer experience, so we can skip it if kernelbase isn't already loaded
+  if (!moduleHandle)
+    return;
+
+  auto proc = GetProcAddress(moduleHandle, "SetThreadDescription");
+  if (!proc)
+    return;
+
+  reinterpret_cast<SetThreadDescriptionFn>(proc)(GetCurrentThread(), L"React-Native JavaScript Thread");
+}
+
 void ReactInstanceWin::InitializeBridgeless() noexcept {
   InitUIQueue();
 
@@ -634,7 +652,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
                 Mso::Copy(m_whenDestroyed)));
 
             m_jsMessageThread.Load()->runOnQueueSync([&]() {
-              ::SetThreadDescription(GetCurrentThread(), L"React-Native JavaScript Thread");
+              SetJSThreadDescription();
               auto timerRegistry =
                   ::Microsoft::ReactNative::TimerRegistry::CreateTimerRegistry(m_reactContext->Properties());
               auto timerRegistryRaw = timerRegistry.get();

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -15,6 +15,7 @@
 #include "ReactInstanceSettings.h"
 
 #ifdef USE_FABRIC
+#include <Fabric/Composition/Modal/WindowsModalHostViewComponentView.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
 #include <ReactPackageBuilder.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
@@ -115,6 +116,10 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 #endif
       m_instanceSettings.UseWebDebugger());
 
+#ifdef USE_FABRIC
+  winrt::Microsoft::ReactNative::Composition::implementation::RegisterWindowsModalHostNativeComponent(m_packageBuilder);
+#endif
+
   if (auto packageProviders = InstanceSettings().PackageProviders()) {
     for (auto const &packageProvider : packageProviders) {
       packageProvider.CreatePackage(m_packageBuilder);

package/Microsoft.ReactNative/ReactNativeIsland.idl

@@ -6,6 +6,8 @@ import "ReactCoreInjection.idl";
 import "ReactNativeHost.idl";
 import "Theme.idl";
 import "IReactViewComponentBuilder.idl";
+import "CompositionComponentView.idl";
+
 #include "NamespaceRedirect.h"
 #include "DocString.h"
 
@@ -83,7 +85,9 @@ namespace Microsoft.ReactNative
 
 #ifdef USE_WINUI3
     ReactNativeIsland(Microsoft.UI.Composition.Compositor compositor);
-    ReactNativeIsland(Microsoft.UI.Composition.Compositor compositor, Microsoft.ReactNative.IReactContext context, Microsoft.ReactNative.ComponentView componentView);
+
+    DOC_STRING("Used to create react portals, such as a native modal component.")
+    static ReactNativeIsland CreatePortal(Microsoft.ReactNative.Composition.PortalComponentView portal);
 #endif
 
     DOC_STRING(

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.29</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.31</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>29</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>31</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>c15cbb774b3faa73f63778955cc8a4085e39210e</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>ab27bdc176d1976cdc3e9182f83863a89417cf4f</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/AccessibilityPrimitives.h

@@ -0,0 +1,253 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <cinttypes>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace facebook::react {
+
+enum class AccessibilityTraits : uint32_t {
+  None = 0,
+  Button = (1 << 0),
+  Link = (1 << 1),
+  Image = (1 << 2),
+  Selected = (1 << 3),
+  PlaysSound = (1 << 4),
+  KeyboardKey = (1 << 5),
+  StaticText = (1 << 6),
+  SummaryElement = (1 << 7),
+  NotEnabled = (1 << 8),
+  UpdatesFrequently = (1 << 9),
+  SearchField = (1 << 10),
+  StartsMediaSession = (1 << 11),
+  Adjustable = (1 << 12),
+  AllowsDirectInteraction = (1 << 13),
+  CausesPageTurn = (1 << 14),
+  Header = (1 << 15),
+  Switch = (1 << 16),
+  TabBar = (1 << 17),
+};
+
+constexpr enum AccessibilityTraits operator|(
+    const enum AccessibilityTraits lhs,
+    const enum AccessibilityTraits rhs) {
+  return (enum AccessibilityTraits)((uint32_t)lhs | (uint32_t)rhs);
+}
+
+constexpr enum AccessibilityTraits operator&(
+    const enum AccessibilityTraits lhs,
+    const enum AccessibilityTraits rhs) {
+  return (enum AccessibilityTraits)((uint32_t)lhs & (uint32_t)rhs);
+}
+
+struct AccessibilityAction {
+  std::string name{""};
+  std::optional<std::string> label{};
+};
+
+inline static bool operator==(
+    const AccessibilityAction& lhs,
+    const AccessibilityAction& rhs) {
+  return lhs.name == rhs.name && lhs.label == rhs.label;
+}
+
+inline static bool operator!=(
+    const AccessibilityAction& lhs,
+    const AccessibilityAction& rhs) {
+  return !(rhs == lhs);
+}
+
+struct AccessibilityState {
+  bool disabled{false};
+  std::optional<bool> selected{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionItemProvider Implementation
+  bool busy{false};
+  std::optional<bool> expanded{std::nullopt};
+  std::optional<bool> readOnly{std::nullopt}; // [Windows] - Do not remove; required for Windows IRangeValueProvider and IValueProvider Implementation
+  std::optional<bool> multiselectable{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionProvider Implementation
+  std::optional<bool> required{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionProvider Implementation
+  enum { Unchecked, Checked, Mixed, None } checked{None};
+};
+
+constexpr bool operator==(
+    const AccessibilityState& lhs,
+    const AccessibilityState& rhs) {
+  return lhs.disabled == rhs.disabled && lhs.selected == rhs.selected &&
+      lhs.checked == rhs.checked && lhs.busy == rhs.busy &&
+      lhs.expanded == rhs.expanded;
+}
+
+constexpr bool operator!=(
+    const AccessibilityState& lhs,
+    const AccessibilityState& rhs) {
+  return !(rhs == lhs);
+}
+
+struct AccessibilityLabelledBy {
+  std::vector<std::string> value{};
+};
+
+inline static bool operator==(
+    const AccessibilityLabelledBy& lhs,
+    const AccessibilityLabelledBy& rhs) {
+  return lhs.value == rhs.value;
+}
+
+inline static bool operator!=(
+    const AccessibilityLabelledBy& lhs,
+    const AccessibilityLabelledBy& rhs) {
+  return !(lhs == rhs);
+}
+
+struct AccessibilityValue {
+  std::optional<int> min;
+  std::optional<int> max;
+  std::optional<int> now;
+  std::optional<std::string> text{};
+};
+
+constexpr bool operator==(
+    const AccessibilityValue& lhs,
+    const AccessibilityValue& rhs) {
+  return lhs.min == rhs.min && lhs.max == rhs.max && lhs.now == rhs.now &&
+      lhs.text == rhs.text;
+}
+
+constexpr bool operator!=(
+    const AccessibilityValue& lhs,
+    const AccessibilityValue& rhs) {
+  return !(rhs == lhs);
+}
+
+enum class ImportantForAccessibility : uint8_t {
+  Auto,
+  Yes,
+  No,
+  NoHideDescendants,
+};
+
+enum class AccessibilityLiveRegion : uint8_t {
+  None,
+  Polite,
+  Assertive,
+};
+
+enum class AccessibilityRole {
+  None,
+  Button,
+  Dropdownlist,
+  Togglebutton,
+  Link,
+  Search,
+  Image,
+  Keyboardkey,
+  Text,
+  Adjustable,
+  Imagebutton,
+  Header,
+  Summary,
+  Alert,
+  Checkbox,
+  Combobox,
+  Menu,
+  Menubar,
+  Menuitem,
+  Progressbar,
+  Radio,
+  Radiogroup,
+  Scrollbar,
+  Spinbutton,
+  Switch,
+  Tab,
+  Tabbar,
+  Tablist,
+  Timer,
+  List,
+  Toolbar,
+  Grid,
+  Pager,
+  Scrollview,
+  Horizontalscrollview,
+  Viewgroup,
+  Webview,
+  Drawerlayout,
+  Slidingdrawer,
+  Iconmenu,
+};
+
+enum class Role {
+  Alert,
+  Alertdialog,
+  Application,
+  Article,
+  Banner,
+  Button,
+  Cell,
+  Checkbox,
+  Columnheader,
+  Combobox,
+  Complementary,
+  Contentinfo,
+  Definition,
+  Dialog,
+  Directory,
+  Document,
+  Feed,
+  Figure,
+  Form,
+  Grid,
+  Group,
+  Heading,
+  Img,
+  Link,
+  List,
+  Listitem,
+  Log,
+  Main,
+  Marquee,
+  Math,
+  Menu,
+  Menubar,
+  Menuitem,
+  Meter,
+  Navigation,
+  None,
+  Note,
+  Option,
+  Presentation,
+  Progressbar,
+  Radio,
+  Radiogroup,
+  Region,
+  Row,
+  Rowgroup,
+  Rowheader,
+  Scrollbar,
+  Searchbox,
+  Separator,
+  Slider,
+  Spinbutton,
+  Status,
+  Summary,
+  Switch,
+  Tab,
+  Table,
+  Tablist,
+  Tabpanel,
+  Term,
+  Timer,
+  Toolbar,
+  Tooltip,
+  Tree,
+  Treegrid,
+  Treeitem,
+};
+
+} // namespace facebook::react