react-native-windows 0.73.10 → 0.74.0-preview.1

package/Microsoft.ReactNative/Utils/ThemeUtils.h

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <winrt/Windows.UI.h>
+
+namespace Microsoft::ReactNative {
+
+bool IsColorLight(const winrt::Windows::UI::Color &clr) noexcept;
+bool IsInHighContrastWin32() noexcept;
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Utils/ValueUtils.cpp

@@ -337,11 +337,6 @@ REACTWINDOWS_API_(bool) IsValidColorValue(const winrt::Microsoft::ReactNative::J
       v.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64;
 }
 
-REACTWINDOWS_API_(winrt::TimeSpan) TimeSpanFromMs(double ms) {
-  std::chrono::milliseconds dur((int64_t)ms);
-  return dur;
-}
-
 bool IsValidOptionalColorValue(const winrt::Microsoft::ReactNative::JSValue &v) {
   return v.Type() == winrt::Microsoft::ReactNative::JSValueType::Null || IsValidColorValue(v);
 }

package/Microsoft.ReactNative/Utils/ValueUtils.h

@@ -54,9 +54,6 @@ REACTWINDOWS_API_(bool) IsValidColorValue(const folly::dynamic &d);
 REACTWINDOWS_API_(bool)
 IsValidColorValue(const winrt::Microsoft::ReactNative::JSValue &v);
 
-REACTWINDOWS_API_(winrt::Windows::Foundation::TimeSpan)
-TimeSpanFromMs(double ms);
-
 winrt::Windows::UI::Color ColorFromNumber(DWORD argb) noexcept;
 
 bool IsValidOptionalColorValue(const winrt::Microsoft::ReactNative::JSValue &v);

package/Microsoft.ReactNative/ViewProps.idl

@@ -3,8 +3,23 @@
 
 #include "DocString.h"
 import "IJSValueReader.idl";
+import "IJSValueWriter.idl";
+import "Theme.idl";
 
 namespace Microsoft.ReactNative {
+
+  [webhosthidden]
+  [experimental]
+  runtimeclass Color {
+    Windows.UI.Color AsWindowsColor(Microsoft.ReactNative.Composition.Theme theme);
+    Microsoft.ReactNative.Composition.IBrush AsBrush(Microsoft.ReactNative.Composition.Theme theme);
+
+    static Color Black();
+    static Color Transparent();
+    static Color ReadValue(IJSValueReader reader);
+    static void WriteValue(IJSValueWriter writer, Color color);
+  };
+
   [webhosthidden]
   [experimental]
   DOC_STRING("Interface to implement custom view component properties.")
@@ -24,6 +39,8 @@ namespace Microsoft.ReactNative {
   {
     Single Opacity { get; };
 
+    Color BackgroundColor { get; };
+
     // TODO add accessors to all the properties on ViewProps
   };
 

package/Microsoft.ReactNative/Views/ActivityIndicatorViewManager.cpp

@@ -23,6 +23,7 @@ void ActivityIndicatorViewManager::GetNativeProps(const winrt::Microsoft::ReactN
 
   winrt::Microsoft::ReactNative::WriteProperty(writer, L"animating", L"boolean");
   winrt::Microsoft::ReactNative::WriteProperty(writer, L"color", L"Color");
+  winrt::Microsoft::ReactNative::WriteProperty(writer, L"size", L"string");
 }
 
 ShadowNode *Microsoft::ReactNative::ActivityIndicatorViewManager::createShadow() const {

package/Microsoft.ReactNative/Views/DebuggingOverlayViewManager.cpp

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+
+#include <UI.Xaml.Controls.h>
+
+#include <Views/DebuggingOverlayViewManager.h>
+
+#include <JSValueWriter.h>
+
+namespace Microsoft::ReactNative {
+
+namespace DebuggingOverlayCommands {
+constexpr const char *Draw = "draw";
+}; // namespace DebuggingOverlayCommands
+
+DebuggingOverlayViewManager::DebuggingOverlayViewManager(const Mso::React::IReactContext &context) : Super(context) {}
+
+const wchar_t *DebuggingOverlayViewManager::GetName() const {
+  return L"DebuggingOverlay";
+}
+
+void DebuggingOverlayViewManager::GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const {
+  Super::GetNativeProps(writer);
+}
+
+void DebuggingOverlayViewManager::GetCommands(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const {
+  // Upstream JS will dispatch the string directly instead of ever actually calling this, but providing a real
+  // implementation is simple enough in case anything changes.
+  writer.WritePropertyName(winrt::to_hstring(DebuggingOverlayCommands::Draw));
+  writer.WriteString(winrt::to_hstring(DebuggingOverlayCommands::Draw));
+}
+
+XamlView DebuggingOverlayViewManager::CreateViewCore(
+    int64_t /*tag*/,
+    const winrt::Microsoft::ReactNative::JSValueObject &) {
+  return xaml::Controls::Canvas();
+}
+
+void DebuggingOverlayViewManager::DispatchCommand(
+    const XamlView &viewToUpdate,
+    const std::string &commandId,
+    winrt::Microsoft::ReactNative::JSValueArray &&commandArgs) {
+  if (commandId == DebuggingOverlayCommands::Draw) {
+    // The current spec has a Draw command -- but this will be replaced with some different commands in
+    // https://github.com/facebook/react-native/pull/42119
+    // There is little point in attempting to implement these commands until then.
+    return;
+  }
+  Super::DispatchCommand(viewToUpdate, commandId, std::move(commandArgs));
+}
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/DebuggingOverlayViewManager.h

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "FrameworkElementViewManager.h"
+
+namespace Microsoft::ReactNative {
+
+struct ShadowNodeBase;
+
+class REACTWINDOWS_EXPORT DebuggingOverlayViewManager : public FrameworkElementViewManager {
+  using Super = FrameworkElementViewManager;
+
+ public:
+  DebuggingOverlayViewManager(const Mso::React::IReactContext &context);
+
+  const wchar_t *GetName() const override;
+  void GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const override;
+  void GetCommands(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const override;
+  XamlView DebuggingOverlayViewManager::CreateViewCore(
+      int64_t /*tag*/,
+      const winrt::Microsoft::ReactNative::JSValueObject &) override;
+  void DispatchCommand(
+      const XamlView &viewToUpdate,
+      const std::string &commandId,
+      winrt::Microsoft::ReactNative::JSValueArray &&commandArgs) override;
+};
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/DevMenu.cpp

@@ -124,12 +124,6 @@ struct InAppXamlDevMenu : public IDevMenu, public std::enable_shared_from_this<I
   void Show() noexcept override {
     winrt::Microsoft::ReactNative::DevMenuControl devMenu{};
 
-    devMenu.RemoteDebugText().Text(
-        Mso::React::ReactOptions::UseWebDebugger(m_context->Properties()) ? L"Disable Remote JS Debugging"
-                                                                          : L"Enable Remote JS Debugging");
-    devMenu.RemoteDebugDesc().Text(
-        L"When enabled runs the JS remotely in VSCode or Chrome based on what you attach to the packager.  This means that the JS may run with a different JS engine than it runs in on in the real application, in addition synchronous native module calls, and JSI native modules will not work.");
-
     devMenu.FastRefreshText().Text(FastRefreshLabel(m_context));
     if (Mso::React::ReactOptions::JsiEngine(m_context->Properties()) == Mso::React::JSIEngine::Hermes) {
       devMenu.SamplingProfilerText().Text(HermesProfilerLabel(m_context));
@@ -146,7 +140,7 @@ struct InAppXamlDevMenu : public IDevMenu, public std::enable_shared_from_this<I
       auto lastTraceFilePath = Microsoft::ReactNative::HermesSamplingProfiler::GetLastTraceFilePath();
       if (!lastTraceFilePath.empty()) {
         os << std::endl
-           << "Samples from last invocation are stored at " << lastTraceFilePath.c_str()
+           << "Samples from last invocation are stored at " << winrt::to_string(lastTraceFilePath)
            << "  (path copied to clipboard).";
         os << std::endl << "Navigate to \"edge:\\tracing\" and load the trace file.";
       }
@@ -169,18 +163,6 @@ struct InAppXamlDevMenu : public IDevMenu, public std::enable_shared_from_this<I
           }
         });
 
-    m_remoteDebugJSRevoker = devMenu.RemoteDebug().Click(
-        winrt::auto_revoke,
-        [wkThis = weak_from_this()](auto const & /*sender*/, xaml::RoutedEventArgs const & /*args*/) noexcept {
-          if (auto strongThis = wkThis.lock()) {
-            strongThis->Hide();
-            Mso::React::ReactOptions::SetUseWebDebugger(
-                strongThis->m_context->Properties(),
-                !Mso::React::ReactOptions::UseWebDebugger(strongThis->m_context->Properties()));
-            DevSettings::Reload(React::ReactPropertyBag(strongThis->m_context->Properties()));
-          }
-        });
-
     m_directDebuggingRevoker = devMenu.DirectDebug().Click(
         winrt::auto_revoke,
         [wkThis = weak_from_this()](auto const & /*sender*/, xaml::RoutedEventArgs const & /*args*/) noexcept {
@@ -301,7 +283,6 @@ struct InAppXamlDevMenu : public IDevMenu, public std::enable_shared_from_this<I
  private:
   const Mso::CntPtr<Mso::React::IReactContext> m_context;
   xaml::Controls::Flyout m_flyout{nullptr};
-  xaml::Controls::Button::Click_revoker m_remoteDebugJSRevoker{};
   xaml::Controls::Button::Click_revoker m_cancelRevoker{};
   xaml::Controls::Button::Click_revoker m_toggleInspectorRevoker{};
   xaml::Controls::Button::Click_revoker m_configBundlerRevoker{};

package/Microsoft.ReactNative/Views/DynamicAutomationPeer.cpp

@@ -44,6 +44,154 @@ winrt::hstring DynamicAutomationPeer::GetNameCore() const {
 }
 
 winrt::AutomationControlType DynamicAutomationPeer::GetAutomationControlTypeCore() const {
+  const auto automationControlType = GetAutomationControlTypeFromAriaRole();
+  return automationControlType ? automationControlType.value() : GetAutomationControlTypeFromAccessibilityRole();
+}
+
+std::optional<winrt::AutomationControlType> DynamicAutomationPeer::GetAutomationControlTypeFromAriaRole() const {
+  const auto ariaRole = GetAriaRole();
+  // Sourced from: https://www.w3.org/TR/core-aam-1.2
+  // Remaining unmapped roles are:
+  // - "none"
+  // - "presentation"
+  switch (ariaRole) {
+    case winrt::Microsoft::ReactNative::AriaRole::Alert:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::AlertDialog:
+      return winrt::AutomationControlType::Pane;
+    case winrt::Microsoft::ReactNative::AriaRole::Application:
+      return winrt::AutomationControlType::Pane;
+    case winrt::Microsoft::ReactNative::AriaRole::Article:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Banner:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Button:
+      return winrt::AutomationControlType::Button;
+    case winrt::Microsoft::ReactNative::AriaRole::Cell:
+      return winrt::AutomationControlType::DataItem;
+    case winrt::Microsoft::ReactNative::AriaRole::CheckBox:
+      return winrt::AutomationControlType::CheckBox;
+    case winrt::Microsoft::ReactNative::AriaRole::ColumnHeader:
+      return winrt::AutomationControlType::DataItem;
+    case winrt::Microsoft::ReactNative::AriaRole::ComboBox:
+      return winrt::AutomationControlType::ComboBox;
+    case winrt::Microsoft::ReactNative::AriaRole::Complementary:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::ContentInfo:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Definition:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Dialog:
+      return winrt::AutomationControlType::Pane;
+    case winrt::Microsoft::ReactNative::AriaRole::Directory:
+      return winrt::AutomationControlType::List;
+    case winrt::Microsoft::ReactNative::AriaRole::Document:
+      return winrt::AutomationControlType::Document;
+    case winrt::Microsoft::ReactNative::AriaRole::Feed:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Figure:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Form:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Grid:
+      return winrt::AutomationControlType::DataGrid;
+    case winrt::Microsoft::ReactNative::AriaRole::Group:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Heading:
+      return winrt::AutomationControlType::Text;
+    case winrt::Microsoft::ReactNative::AriaRole::Img:
+      return winrt::AutomationControlType::Image;
+    case winrt::Microsoft::ReactNative::AriaRole::Link:
+      return winrt::AutomationControlType::Hyperlink;
+    case winrt::Microsoft::ReactNative::AriaRole::List:
+      return winrt::AutomationControlType::List;
+    case winrt::Microsoft::ReactNative::AriaRole::ListItem:
+      return winrt::AutomationControlType::ListItem;
+    case winrt::Microsoft::ReactNative::AriaRole::Log:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Main:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Marquee:
+      return winrt::AutomationControlType::Text;
+    case winrt::Microsoft::ReactNative::AriaRole::Math:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Menu:
+      return winrt::AutomationControlType::Menu;
+    case winrt::Microsoft::ReactNative::AriaRole::MenuBar:
+      return winrt::AutomationControlType::MenuBar;
+    case winrt::Microsoft::ReactNative::AriaRole::MenuItem:
+      return winrt::AutomationControlType::MenuItem;
+    case winrt::Microsoft::ReactNative::AriaRole::Meter:
+      return winrt::AutomationControlType::ProgressBar;
+    case winrt::Microsoft::ReactNative::AriaRole::Navigation:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Note:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Option:
+      return winrt::AutomationControlType::ListItem;
+    case winrt::Microsoft::ReactNative::AriaRole::ProgressBar:
+      return winrt::AutomationControlType::ProgressBar;
+    case winrt::Microsoft::ReactNative::AriaRole::Radio:
+      return winrt::AutomationControlType::RadioButton;
+    case winrt::Microsoft::ReactNative::AriaRole::RadioGroup:
+      return winrt::AutomationControlType::List;
+    case winrt::Microsoft::ReactNative::AriaRole::Region:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Row:
+      return winrt::AutomationControlType::DataItem;
+    case winrt::Microsoft::ReactNative::AriaRole::RowGroup:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::RowHeader:
+      return winrt::AutomationControlType::HeaderItem;
+    case winrt::Microsoft::ReactNative::AriaRole::ScrollBar:
+      return winrt::AutomationControlType::ScrollBar;
+    case winrt::Microsoft::ReactNative::AriaRole::SearchBox:
+      return winrt::AutomationControlType::Edit;
+    case winrt::Microsoft::ReactNative::AriaRole::Separator:
+      if (auto const &viewControl = Owner().try_as<winrt::Microsoft::ReactNative::ViewControl>()) {
+        if (viewControl.IsTabStop()) {
+          return winrt::AutomationControlType::Thumb;
+        }
+      }
+      return winrt::AutomationControlType::Separator;
+    case winrt::Microsoft::ReactNative::AriaRole::Slider:
+      return winrt::AutomationControlType::Slider;
+    case winrt::Microsoft::ReactNative::AriaRole::SpinButton:
+      return winrt::AutomationControlType::Spinner;
+    case winrt::Microsoft::ReactNative::AriaRole::Status:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::Switch:
+      return winrt::AutomationControlType::Button;
+    case winrt::Microsoft::ReactNative::AriaRole::Tab:
+      return winrt::AutomationControlType::TabItem;
+    case winrt::Microsoft::ReactNative::AriaRole::Table:
+      return winrt::AutomationControlType::DataGrid;
+    case winrt::Microsoft::ReactNative::AriaRole::TabList:
+      return winrt::AutomationControlType::Tab;
+    case winrt::Microsoft::ReactNative::AriaRole::TabPanel:
+      return winrt::AutomationControlType::Pane;
+    case winrt::Microsoft::ReactNative::AriaRole::Term:
+      return winrt::AutomationControlType::Text;
+    case winrt::Microsoft::ReactNative::AriaRole::Timer:
+      return winrt::AutomationControlType::Group;
+    case winrt::Microsoft::ReactNative::AriaRole::ToolBar:
+      return winrt::AutomationControlType::ToolBar;
+    case winrt::Microsoft::ReactNative::AriaRole::ToolTip:
+      return winrt::AutomationControlType::ToolTip;
+    case winrt::Microsoft::ReactNative::AriaRole::Tree:
+      return winrt::AutomationControlType::Tree;
+    case winrt::Microsoft::ReactNative::AriaRole::TreeGrid:
+      return winrt::AutomationControlType::DataGrid;
+    case winrt::Microsoft::ReactNative::AriaRole::TreeItem:
+      return winrt::AutomationControlType::TreeItem;
+    case winrt::Microsoft::ReactNative::AriaRole::None:
+    case winrt::Microsoft::ReactNative::AriaRole::Presentation:
+    default:
+      return std::nullopt;
+  }
+}
+
+winrt::AutomationControlType DynamicAutomationPeer::GetAutomationControlTypeFromAccessibilityRole() const {
   auto accessibilityRole = GetAccessibilityRole();
 
   switch (accessibilityRole) {
@@ -342,6 +490,15 @@ winrt::Microsoft::ReactNative::AccessibilityRoles DynamicAutomationPeer::GetAcce
   return winrt::Microsoft::ReactNative::AccessibilityRoles::None;
 }
 
+winrt::Microsoft::ReactNative::AriaRole DynamicAutomationPeer::GetAriaRole() const {
+  try {
+    return DynamicAutomationProperties::GetAriaRole(Owner());
+  } catch (...) {
+  }
+
+  return winrt::Microsoft::ReactNative::AriaRole::Unknown;
+}
+
 bool DynamicAutomationPeer::HasAccessibilityState(winrt::Microsoft::ReactNative::AccessibilityStates state) const {
   try {
     auto const &owner = Owner();

package/Microsoft.ReactNative/Views/DynamicAutomationPeer.h

@@ -72,6 +72,11 @@ struct DynamicAutomationPeer : DynamicAutomationPeerT<DynamicAutomationPeer> {
  private:
   winrt::hstring GetContentName() const;
   winrt::Microsoft::ReactNative::AccessibilityRoles GetAccessibilityRole() const;
+  winrt::Microsoft::ReactNative::AriaRole GetAriaRole() const;
+
+  std::optional<xaml::Automation::Peers::AutomationControlType> GetAutomationControlTypeFromAriaRole() const;
+  xaml::Automation::Peers::AutomationControlType GetAutomationControlTypeFromAccessibilityRole() const;
+
   bool HasAccessibilityState(winrt::Microsoft::ReactNative::AccessibilityStates state) const;
   bool HasAccessibilityValue(winrt::Microsoft::ReactNative::AccessibilityValue value) const;
   double GetAccessibilityValueRange(winrt::Microsoft::ReactNative::AccessibilityValue value) const;

package/Microsoft.ReactNative/Views/DynamicAutomationProperties.cpp

@@ -48,6 +48,26 @@ winrt::Microsoft::ReactNative::AccessibilityRoles DynamicAutomationProperties::G
       element.GetValue(AccessibilityRoleProperty()));
 }
 
+xaml::DependencyProperty DynamicAutomationProperties::AriaRoleProperty() {
+  static xaml::DependencyProperty s_ariaRoleProperty = xaml::DependencyProperty::RegisterAttached(
+      L"AriaRole",
+      winrt::xaml_typename<winrt::Microsoft::ReactNative::AriaRole>(),
+      dynamicAutomationTypeName,
+      winrt::PropertyMetadata(winrt::box_value(winrt::Microsoft::ReactNative::AriaRole::Unknown)));
+
+  return s_ariaRoleProperty;
+}
+
+void DynamicAutomationProperties::SetAriaRole(
+    xaml::UIElement const &element,
+    winrt::Microsoft::ReactNative::AriaRole const &value) {
+  element.SetValue(AriaRoleProperty(), winrt::box_value<Microsoft::ReactNative::AriaRole>(value));
+}
+
+winrt::Microsoft::ReactNative::AriaRole DynamicAutomationProperties::GetAriaRole(xaml::UIElement const &element) {
+  return winrt::unbox_value<winrt::Microsoft::ReactNative::AriaRole>(element.GetValue(AriaRoleProperty()));
+}
+
 xaml::DependencyProperty DynamicAutomationProperties::AccessibilityStateSelectedProperty() {
   static xaml::DependencyProperty s_AccessibilityStateSelectedProperty = xaml::DependencyProperty::RegisterAttached(
       L"AccessibilityStateSelected",

package/Microsoft.ReactNative/Views/DynamicAutomationProperties.h

@@ -26,6 +26,10 @@ struct DynamicAutomationProperties : DynamicAutomationPropertiesT<DynamicAutomat
       winrt::Microsoft::ReactNative::AccessibilityRoles const &value);
   static AccessibilityRoles GetAccessibilityRole(xaml::UIElement const &element);
 
+  static xaml::DependencyProperty AriaRoleProperty();
+  static void SetAriaRole(xaml::UIElement const &element, winrt::Microsoft::ReactNative::AriaRole const &value);
+  static AriaRole GetAriaRole(xaml::UIElement const &element);
+
   static xaml::DependencyProperty AccessibilityStateSelectedProperty();
   static void SetAccessibilityStateSelected(xaml::UIElement const &element, bool value);
   static bool GetAccessibilityStateSelected(xaml::UIElement const &element);

package/Microsoft.ReactNative/Views/FlyoutViewManager.cpp

@@ -114,10 +114,6 @@ class FlyoutShadowNode : public ShadowNodeBase {
   winrt::Flyout GetFlyout();
   void AdjustDefaultFlyoutStyle(float maxWidth, float maxHeight);
 
-  bool IsWindowed() override {
-    return true;
-  }
-
  private:
   void SetTargetFrameworkElement();
   winrt::Popup GetFlyoutParentPopup() const;
@@ -152,7 +148,7 @@ FlyoutShadowNode::~FlyoutShadowNode() {
 
 void FlyoutShadowNode::AddView(ShadowNode &child, int64_t /*index*/) {
   auto childView = static_cast<ShadowNodeBase &>(child).GetView();
-  m_touchEventHandler->AddTouchHandlers(childView);
+  m_touchEventHandler->AddTouchHandlers(childView, GetRootView());
   m_previewKeyboardEventHandlerOnRoot->hook(childView);
 
   if (m_flyout != nullptr) {

package/Microsoft.ReactNative/Views/FrameworkElementViewManager.cpp

@@ -126,6 +126,7 @@ void FrameworkElementViewManager::GetNativeProps(const winrt::Microsoft::ReactNa
 
   winrt::Microsoft::ReactNative::WriteProperty(writer, L"accessible", L"boolean");
   winrt::Microsoft::ReactNative::WriteProperty(writer, L"accessibilityRole", L"string");
+  winrt::Microsoft::ReactNative::WriteProperty(writer, L"role", L"string");
   writer.WritePropertyName(L"accessibilityState");
   GetAccessibilityStateProps(writer);
   winrt::Microsoft::ReactNative::WriteProperty(writer, L"accessibilityHint", L"string");
@@ -433,6 +434,142 @@ bool FrameworkElementViewManager::UpdateProperty(
       } else if (propertyValue.IsNull()) {
         element.ClearValue(DynamicAutomationProperties::AccessibilityRoleProperty());
       }
+    } else if (propertyName == "role") {
+      if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::String) {
+        const std::string &role = propertyValue.AsString();
+        if (role == "alert")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Alert);
+        else if (role == "alertdialog")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::AlertDialog);
+        else if (role == "application")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Application);
+        else if (role == "article")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Article);
+        else if (role == "banner")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Banner);
+        else if (role == "button")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Button);
+        else if (role == "cell")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Cell);
+        else if (role == "checkbox")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::CheckBox);
+        else if (role == "columnheader")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ColumnHeader);
+        else if (role == "combobox")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ComboBox);
+        else if (role == "complementary")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Complementary);
+        else if (role == "contentinfo")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ContentInfo);
+        else if (role == "definition")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Definition);
+        else if (role == "dialog")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Dialog);
+        else if (role == "directory")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Directory);
+        else if (role == "document")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Document);
+        else if (role == "feed")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Feed);
+        else if (role == "figure")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Figure);
+        else if (role == "form")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Form);
+        else if (role == "grid")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Grid);
+        else if (role == "group")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Group);
+        else if (role == "heading")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Heading);
+        else if (role == "img")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Img);
+        else if (role == "link")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Link);
+        else if (role == "list")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::List);
+        else if (role == "listitem")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ListItem);
+        else if (role == "log")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Log);
+        else if (role == "main")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Main);
+        else if (role == "marquee")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Marquee);
+        else if (role == "math")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Math);
+        else if (role == "menu")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Menu);
+        else if (role == "menubar")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::MenuBar);
+        else if (role == "menuitem")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::MenuItem);
+        else if (role == "meter")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Meter);
+        else if (role == "navigation")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Navigation);
+        else if (role == "none")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::None);
+        else if (role == "note")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Note);
+        else if (role == "option")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Option);
+        else if (role == "presentation")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Presentation);
+        else if (role == "progressbar")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ProgressBar);
+        else if (role == "radio")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Radio);
+        else if (role == "radiogroup")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::RadioGroup);
+        else if (role == "region")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Region);
+        else if (role == "row")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Row);
+        else if (role == "rowgroup")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::RowGroup);
+        else if (role == "rowheader")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::RowHeader);
+        else if (role == "scrollbar")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ScrollBar);
+        else if (role == "searchbox")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::SearchBox);
+        else if (role == "separator")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Separator);
+        else if (role == "slider")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Slider);
+        else if (role == "spinbutton")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::SpinButton);
+        else if (role == "status")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Status);
+        else if (role == "summary")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Summary);
+        else if (role == "switch")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Switch);
+        else if (role == "tab")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Tab);
+        else if (role == "tablist")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::TabList);
+        else if (role == "tabpanel")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::TabPanel);
+        else if (role == "term")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Term);
+        else if (role == "timer")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Timer);
+        else if (role == "toolbar")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ToolBar);
+        else if (role == "tooltip")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::ToolTip);
+        else if (role == "tree")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Tree);
+        else if (role == "treegrid")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::TreeGrid);
+        else if (role == "treeitem")
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::TreeItem);
+        else
+          DynamicAutomationProperties::SetAriaRole(element, winrt::Microsoft::ReactNative::AriaRole::Unknown);
+      } else if (propertyValue.IsNull()) {
+        element.ClearValue(DynamicAutomationProperties::AriaRoleProperty());
+      }
     } else if (propertyName == "accessibilityState") {
       if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Object) {
         for (const auto &pair : propertyValue.AsObject()) {

package/Microsoft.ReactNative/Views/ICompositionRootView.h

@@ -12,7 +12,6 @@
 namespace Microsoft::ReactNative {
 
 struct ICompositionRootView : public facebook::react::IReactRootView {
-  virtual winrt::Microsoft::ReactNative::Composition::IVisual GetVisual() const noexcept = 0;
   virtual float ScaleFactor() noexcept = 0;
 };
 

package/Microsoft.ReactNative/Views/Image/ImageViewManager.cpp

@@ -185,11 +185,6 @@ void ImageViewManager::EmitImageEvent(
 
 void ImageViewManager::setSource(winrt::Grid grid, const winrt::Microsoft::ReactNative::JSValue &data) {
   auto sources{json_type_traits<std::vector<ReactImageSource>>::parseJson(data)};
-  sources[0].bundleRootPath = GetReactContext().SettingsSnapshot().BundleRootPath();
-
-  if (sources[0].packagerAsset && sources[0].uri.find("file://") == 0) {
-    sources[0].uri.replace(0, 7, sources[0].bundleRootPath);
-  }
 
   auto reactImage{grid.as<ReactImage>()};
 

package/Microsoft.ReactNative/Views/PopupViewManager.cpp

@@ -44,10 +44,6 @@ class PopupShadowNode : public ShadowNodeBase {
   void UpdateTabStops();
   void UpdateLayout();
 
-  bool IsWindowed() override {
-    return true;
-  }
-
  private:
   bool m_autoFocus{true};
   double m_verticalOffset{0};
@@ -132,7 +128,7 @@ void PopupShadowNode::AddView(ShadowNode &child, int64_t index) {
 
   control.Content(childView);
 
-  m_touchEventHandler->AddTouchHandlers(childView);
+  m_touchEventHandler->AddTouchHandlers(childView, GetRootView());
   m_previewKeyboardEventHandlerOnRoot->hook(childView);
 }