react-native-windows 0.66.5 → 0.67.0-preview.4

package/Libraries/Share/Share.js

@@ -51,7 +51,7 @@ class Share {
    *
    * #### iOS
    *
-   *  - `url` - an URL to share
+   *  - `url` - a URL to share
    *
    * At least one of URL and message is required.
    *

package/Libraries/StyleSheet/normalizeColor.js

@@ -10,7 +10,7 @@
 
 /* eslint no-bitwise: 0 */
 
-import normalizeColorBase from '@react-native/normalize-color/base';
+import _normalizeColor from '@react-native/normalize-color';
 
 import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
@@ -27,7 +27,7 @@ function normalizeColor(
   }
 
   if (typeof color === 'string' || typeof color === 'number') {
-    return normalizeColorBase(color);
+    return _normalizeColor(color);
   }
 }
 

package/Libraries/Text/Text.windows.js

@@ -170,6 +170,7 @@ const Text: React.AbstractComponent<
         {...restProps}
         {...eventHandlersForText}
         isHighlighted={isHighlighted}
+        isPressable={isPressable}
         numberOfLines={numberOfLines}
         selectionColor={selectionColor}
         style={style}

package/Libraries/Text/TextNativeComponent.windows.js

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import ReactNativeViewAttributes from '../Components/View/ReactNativeViewAttributes';
+import UIManager from '../ReactNative/UIManager';
+import {type HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import createReactNativeComponentClass from '../Renderer/shims/createReactNativeComponentClass';
+import {type ProcessedColorValue} from '../StyleSheet/processColor';
+import {type TextProps} from './TextProps';
+
+type NativeTextProps = $ReadOnly<{
+  ...TextProps,
+  isHighlighted?: ?boolean,
+  isPressable?: ?boolean, // [Windows]
+  selectionColor?: ?ProcessedColorValue,
+}>;
+
+export const NativeText: HostComponent<NativeTextProps> = (createReactNativeComponentClass(
+  'RCTText',
+  () => ({
+    // $FlowFixMe[incompatible-call]
+    validAttributes: {
+      ...ReactNativeViewAttributes.UIView,
+      isHighlighted: true,
+      isPressable: true, // [Windows]
+      numberOfLines: true,
+      ellipsizeMode: true,
+      allowFontScaling: true,
+      maxFontSizeMultiplier: true,
+      disabled: true,
+      selectable: true,
+      selectionColor: true,
+      adjustsFontSizeToFit: true,
+      minimumFontScale: true,
+      textBreakStrategy: true,
+      onTextLayout: true,
+      onInlineViewLayout: true,
+      dataDetectorType: true,
+      android_hyphenationFrequency: true,
+    },
+    directEventTypes: {
+      topTextLayout: {
+        registrationName: 'onTextLayout',
+      },
+      topInlineViewLayout: {
+        registrationName: 'onInlineViewLayout',
+      },
+    },
+    uiViewClassName: 'RCTText',
+  }),
+): any);
+
+export const NativeVirtualText: HostComponent<NativeTextProps> =
+  !global.RN$Bridgeless && !UIManager.hasViewManagerConfig('RCTVirtualText')
+    ? NativeText
+    : (createReactNativeComponentClass('RCTVirtualText', () => ({
+        // $FlowFixMe[incompatible-call]
+        validAttributes: {
+          ...ReactNativeViewAttributes.UIView,
+          isHighlighted: true,
+          isPressable: true, // [Windows]
+          maxFontSizeMultiplier: true,
+        },
+        uiViewClassName: 'RCTVirtualText',
+      })): any);

package/Libraries/Text/TextProps.js

@@ -66,13 +66,7 @@ export type TextProps = $ReadOnly<{|
    * Set hyphenation strategy on Android.
    *
    */
-  android_hyphenationFrequency?: ?(
-    | 'normal'
-    | 'none'
-    | 'full'
-    | 'high'
-    | 'balanced'
-  ),
+  android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
   children?: ?Node,
 
   /**

package/Libraries/TurboModule/TurboModuleRegistry.js

@@ -16,7 +16,7 @@ const turboModuleProxy = global.__turboModuleProxy;
 
 function requireModule<T: TurboModule>(name: string): ?T {
   // Bridgeless mode requires TurboModules
-  if (!global.RN$Bridgeless) {
+  if (global.RN$Bridgeless !== true) {
     // Backward compatibility layer during migration.
     const legacyModule = NativeModules[name];
     if (legacyModule != null) {

package/Libraries/Utilities/HMRClient.js

@@ -119,7 +119,7 @@ const HMRClient: HMRClientNativeInterface = {
         JSON.stringify({
           type: 'log',
           level,
-          mode: global.RN$Bridgeless ? 'NOBRIDGE' : 'BRIDGE',
+          mode: global.RN$Bridgeless === true ? 'NOBRIDGE' : 'BRIDGE',
           data: data.map(item =>
             typeof item === 'string'
               ? item

package/Microsoft.ReactNative/ABIViewManager.cpp

@@ -40,7 +40,8 @@ ABIViewManager::ABIViewManager(
       m_viewManagerWithCommands{viewManager.try_as<IViewManagerWithCommands>()},
       m_viewManagerWithExportedEventTypeConstants{viewManager.try_as<IViewManagerWithExportedEventTypeConstants>()},
       m_viewManagerRequiresNativeLayout{viewManager.try_as<IViewManagerRequiresNativeLayout>()},
-      m_viewManagerWithChildren{viewManager.try_as<IViewManagerWithChildren>()} {
+      m_viewManagerWithChildren{viewManager.try_as<IViewManagerWithChildren>()},
+      m_viewManagerWithPointerEvents{viewManager.try_as<IViewManagerWithPointerEvents>()} {
   if (m_viewManagerWithReactContext) {
     m_viewManagerWithReactContext.ReactContext(winrt::make<implementation::ReactContext>(Mso::Copy(reactContext)));
   }
@@ -215,6 +216,14 @@ YGMeasureFunc ABIViewManager::GetYogaCustomMeasureFunc() const {
   }
 }
 
+void ABIViewManager::OnPointerEvent(::Microsoft::ReactNative::ShadowNodeBase *node, const ReactPointerEventArgs &args) {
+  if (m_viewManagerWithPointerEvents) {
+    m_viewManagerWithPointerEvents.OnPointerEvent(node->GetView(), args);
+  }
+  // Call the base method to handle `pointerEvents` behavior
+  Super::OnPointerEvent(node, args);
+}
+
 ::Microsoft::ReactNative::ShadowNode *ABIViewManager::createShadow() const {
   return new ABIShadowNode(
       m_viewManagerRequiresNativeLayout && m_viewManagerRequiresNativeLayout.RequiresNativeLayout());

package/Microsoft.ReactNative/ABIViewManager.h

@@ -65,6 +65,8 @@ class ABIViewManager : public ::Microsoft::ReactNative::FrameworkElementViewMana
     return m_viewManagerRequiresNativeLayout != nullptr && m_viewManagerRequiresNativeLayout.RequiresNativeLayout();
   }
 
+  void OnPointerEvent(::Microsoft::ReactNative::ShadowNodeBase *node, const ReactPointerEventArgs &args) override;
+
  protected:
   xaml::DependencyObject CreateViewCore(int64_t, const winrt::Microsoft::ReactNative::JSValueObject &props) override;
 
@@ -77,6 +79,7 @@ class ABIViewManager : public ::Microsoft::ReactNative::FrameworkElementViewMana
   IViewManagerWithExportedEventTypeConstants m_viewManagerWithExportedEventTypeConstants;
   IViewManagerWithChildren m_viewManagerWithChildren;
   IViewManagerRequiresNativeLayout m_viewManagerRequiresNativeLayout;
+  IViewManagerWithPointerEvents m_viewManagerWithPointerEvents;
 
   winrt::Windows::Foundation::Collections::IMapView<winrt::hstring, ViewManagerPropertyType> m_nativeProps;
 };

package/Microsoft.ReactNative/Base/CoreNativeModules.cpp

@@ -11,7 +11,6 @@
 #include <Modules/AppearanceModule.h>
 #include <Modules/AsyncStorageModuleWin32.h>
 #include <Modules/ClipboardModule.h>
-#include <Modules/ImageViewManagerModule.h>
 #include <Modules/LinkingManagerModule.h>
 #include <Modules/NativeUIManager.h>
 #include <Modules/NetworkingModule.h>
@@ -63,11 +62,6 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
   modules.emplace_back(
       LinkingManagerModule::name, []() { return std::make_unique<LinkingManagerModule>(); }, batchingUIMessageQueue);
 
-  modules.emplace_back(
-      ImageViewManagerModule::name,
-      []() { return std::make_unique<ImageViewManagerModule>(); },
-      batchingUIMessageQueue);
-
   modules.emplace_back(
       AppThemeModule::Name,
       [appTheme = std::move(appTheme)]() mutable { return std::make_unique<AppThemeModule>(std::move(appTheme)); },

package/Microsoft.ReactNative/IReactDispatcher.cpp

@@ -5,6 +5,8 @@
 #include "IReactDispatcher.h"
 #include "ReactDispatcherHelper.g.cpp"
 
+#include <glog/logging.h>
+
 using namespace winrt;
 using namespace Windows::Foundation;
 
@@ -37,8 +39,21 @@ bool ReactDispatcher::HasThreadAccess() noexcept {
   return m_queue.HasThreadAccess();
 }
 
+ReactDispatcherCallback CreateLoggingCallback(ReactDispatcherCallback const &callback) {
+  return [callback]() {
+    try {
+      callback();
+    } catch (winrt::hresult_error const &error) {
+      std::stringstream errorCode;
+      errorCode << "0x" << std::hex << error.code();
+      LOG(ERROR) << "HRESULT " << errorCode.str() << ": " << winrt::to_string(error.message());
+      throw;
+    }
+  };
+}
+
 void ReactDispatcher::Post(ReactDispatcherCallback const &callback) noexcept {
-  return m_queue.Post([callback]() noexcept { callback(); });
+  return m_queue.Post([callback = CreateLoggingCallback(callback)]() noexcept { callback(); });
 }
 
 void ReactDispatcher::Post(Mso::DispatchTask &&task) const noexcept {

package/Microsoft.ReactNative/IViewManager.idl

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import "IViewManagerCore.idl";
+import "ReactPointerEventArgs.idl";
 
 #include "NamespaceRedirect.h"
 #include "DocString.h"
@@ -63,4 +64,28 @@ namespace Microsoft.ReactNative
   interface IViewManagerCreateWithProperties {
     Object CreateViewWithProperties(IJSValueReader propertyMapReader);
   };
+
+  [experimental]
+  [webhosthidden]
+  DOC_STRING(
+    "Experimental interface enabling view managers to release pointer capture "
+    "from the React root view and start handling pointer events itself."
+  )
+  interface IViewManagerWithPointerEvents {
+    DOC_STRING(
+      "When pointer events are received on the React root view, the top-level "
+      "pointer event handler invokes this callback for each React view "
+      "ancestor of the @Windows.UI.Xaml.RoutedEventArgs.OriginalSource "
+      "element with a view manager that implements "
+      "@IViewManagerWithPointerEvents to allow the view manager to modify "
+      "handling for the pointer event. This can be used to refine the target "
+      "view. E.g., setting the @ReactPointerEventArgs.Target property to null "
+      "will force the React root view to choose one of the view's ancestors "
+      "as the hit target. Alternatively, the view manager may also set the "
+      "@ReactPointerEventArgs.Target to any descendent of provided view to "
+      "enable hit testing on views that do not derive from "
+      "@Windows.UI.Xaml.UIElement."
+    )
+    void OnPointerEvent(Object view, ReactPointerEventArgs args);
+  };
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -26,6 +26,8 @@
   <Import Project="$(SolutionDir)\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
   <Import Project="$(SolutionDir)\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
+  <Import Project="$(ReactNativeWindowsDir)PropertySheets\Generated\PackageVersion.g.props" />
+  <Import Project="$(ReactNativeWindowsDir)PropertySheets\PackageVersionDefinitions.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -89,7 +91,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <RuntimeTypeInfo Condition="'$(UseFabric)' == 'true'">true</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(UseFabric)' == 'true' AND '$(Configuration)'=='Debug'">true</RuntimeTypeInfo>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
@@ -344,6 +346,16 @@
     <ClInclude Include="Views\SwitchViewManager.h" />
     <ClInclude Include="Views\TextInputViewManager.h" />
     <ClInclude Include="Views\TextViewManager.h" />
+    <ClInclude Include="Views\Text\TextHighlighterVisitor.h" />
+    <ClInclude Include="Views\Text\TextHitTestUtils.h" />
+    <ClInclude Include="Views\Text\TextHitTestVisitor.h" />
+    <ClInclude Include="Views\Text\TextParentVisitor.h" />
+    <ClInclude Include="Views\Text\TextPropertyChangedParentVisitor.h" />
+    <ClInclude Include="Views\Text\TextTransformParentVisitor.h" />
+    <ClInclude Include="Views\Text\TextTransformVisitor.h" />
+    <ClInclude Include="Views\Text\TextVisitorScope.h" />
+    <ClInclude Include="Views\Text\TextVisitor.h" />
+    <ClInclude Include="Views\Text\TextVisitors.h" />
     <ClInclude Include="Views\TouchEventHandler.h" />
     <ClInclude Include="Views\ViewControl.h" />
     <ClInclude Include="Views\ViewManager.h" />
@@ -381,6 +393,10 @@
       <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="XamlView.h" />
+    <ClInclude Include="ReactPointerEventArgs.h">
+      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup Condition="'$(UseFabric)' == 'true'">
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\config\ReactNativeConfig.cpp" />
@@ -567,6 +583,10 @@
     <ClCompile Include="Modules\TimingModule.cpp" />
     <ClCompile Include="Modules\PaperUIManagerModule.cpp" />
     <ClCompile Include="NativeModulesProvider.cpp" />
+    <ClCompile Include="ReactPointerEventArgs.cpp">
+      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="RedBoxErrorInfo.cpp" />
     <ClCompile Include="RedBoxErrorFrameInfo.cpp" />
     <ClCompile Include="TurboModulesProvider.cpp" />
@@ -646,6 +666,14 @@
     <ClCompile Include="Views\SwitchViewManager.cpp" />
     <ClCompile Include="Views\TextInputViewManager.cpp" />
     <ClCompile Include="Views\TextViewManager.cpp" />
+    <ClCompile Include="Views\Text\TextHighlighterVisitor.cpp" />
+    <ClCompile Include="Views\Text\TextHitTestUtils.cpp" />
+    <ClCompile Include="Views\Text\TextHitTestVisitor.cpp" />
+    <ClCompile Include="Views\Text\TextParentVisitor.cpp" />
+    <ClCompile Include="Views\Text\TextPropertyChangedParentVisitor.cpp" />
+    <ClCompile Include="Views\Text\TextTransformParentVisitor.cpp" />
+    <ClCompile Include="Views\Text\TextTransformVisitor.cpp" />
+    <ClCompile Include="Views\Text\TextVisitor.cpp" />
     <ClCompile Include="Views\TouchEventHandler.cpp" />
     <ClCompile Include="Views\ViewControl.cpp" />
     <ClCompile Include="Views\ViewManagerBase.cpp" />
@@ -732,6 +760,7 @@
       <SubType>Designer</SubType>
     </Midl>
     <Midl Include="XamlHelper.idl" />
+    <Midl Include="ReactPointerEventArgs.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -745,11 +774,11 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Version.rc">
-      <PreprocessorDefinitions Condition="'$(RNW_PKG_VERSION_STR)'!=''">
-        RNW_PKG_VERSION_STR=$(RNW_PKG_VERSION_STR);
-        RNW_PKG_VERSION_MAJOR=$(RNW_PKG_VERSION_MAJOR);
-        RNW_PKG_VERSION_MINOR=$(RNW_PKG_VERSION_MINOR);
-        RNW_PKG_VERSION_PATCH=$(RNW_PKG_VERSION_PATCH);
+      <PreprocessorDefinitions>
+        RNW_VERSION=$(ReactNativeWindowsVersion);
+        RNW_MAJOR=$(ReactNativeWindowsMajor);
+        RNW_MINOR=$(ReactNativeWindowsMinor);
+        RNW_PATCH=$(ReactNativeWindowsPatch);
         _UNICODE;
         UNICODE;
         %(PreprocessorDefinitions)

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -309,6 +309,31 @@
     <ClCompile Include="ReactHost\JSCallInvokerScheduler.cpp">
       <Filter>ReactHost</Filter>
     </ClCompile>
+    <ClCompile Include="Views\Text\TextHighlighterVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextHitTestUtils.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextHitTestVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextParentVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextPropertyChangedParentVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextTransformParentVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextTransformVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Views\Text\TextVisitor.cpp">
+      <Filter>Views\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="ReactPointerEventArgs.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ABICxxModule.h" />
@@ -672,6 +697,37 @@
     <ClInclude Include="Utils\ShadowNodeTypeUtils.h">
       <Filter>Utils</Filter>
     </ClInclude>
+    <ClInclude Include="Views\Text\TextHighlighterVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextHitTestVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextHitTestUtils.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextParentVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextPropertyChangedParentVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextTransformParentVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextTransformVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextVisitorScope.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextVisitor.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Text\TextVisitors.h">
+      <Filter>Views\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="ReactPointerEventArgs.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="IJSValueReader.idl" />
@@ -709,6 +765,7 @@
     <Midl Include="JsiApi.idl" />
     <Midl Include="DocString.idl" />
     <Midl Include="DesktopWindowMessage.idl" />
+    <Midl Include="ReactPointerEventArgs.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="microsoft.reactnative.def" />
@@ -755,6 +812,9 @@
     <Filter Include="JSI">
       <UniqueIdentifier>{24290499-e864-407e-89c0-473f2b8dbb6e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Views\Text">
+      <UniqueIdentifier>{8b871c42-6131-44c2-a73f-f1061780e97f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Version.rc" />

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.cpp

@@ -19,7 +19,7 @@ void AccessibilityInfo::Initialize(winrt::Microsoft::ReactNative::ReactContext c
   m_context = reactContext;
 }
 
-void AccessibilityInfo::isReduceMotionEnabled(std::function<void(React::JSValue const &)> const &onSuccess) noexcept {
+void AccessibilityInfo::isReduceMotionEnabled(std::function<void(bool)> const &onSuccess) noexcept {
   auto jsDispatcher = m_context.JSDispatcher();
   m_context.UIDispatcher().Post([weakThis = weak_from_this(), jsDispatcher, onSuccess] {
     if (auto strongThis = weakThis.lock()) {
@@ -30,8 +30,7 @@ void AccessibilityInfo::isReduceMotionEnabled(std::function<void(React::JSValue
   });
 }
 
-void AccessibilityInfo::isTouchExplorationEnabled(
-    std::function<void(React::JSValue const &)> const &onSuccess) noexcept {
+void AccessibilityInfo::isTouchExplorationEnabled(std::function<void(bool)> const &onSuccess) noexcept {
   onSuccess(UiaClientsAreListening());
 }
 
@@ -73,7 +72,7 @@ void AccessibilityInfo::announceForAccessibility(std::string announcement) noexc
 
 void AccessibilityInfo::getRecommendedTimeoutMillis(
     double mSec,
-    std::function<void(React::JSValue const &)> const &onSuccess) noexcept {
+    std::function<void(double)> const &onSuccess) noexcept {
   onSuccess(mSec);
 }
 

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.h

@@ -12,10 +12,10 @@ struct AccessibilityInfo : public std::enable_shared_from_this<AccessibilityInfo
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
   REACT_METHOD(isReduceMotionEnabled)
-  void isReduceMotionEnabled(std::function<void(React::JSValue const &)> const &onSuccess) noexcept;
+  void isReduceMotionEnabled(std::function<void(bool)> const &onSuccess) noexcept;
 
   REACT_METHOD(isTouchExplorationEnabled)
-  void isTouchExplorationEnabled(std::function<void(React::JSValue const &)> const &onSuccess) noexcept;
+  void isTouchExplorationEnabled(std::function<void(bool)> const &onSuccess) noexcept;
 
   REACT_METHOD(setAccessibilityFocus)
   void setAccessibilityFocus(double reactTag) noexcept;
@@ -24,7 +24,7 @@ struct AccessibilityInfo : public std::enable_shared_from_this<AccessibilityInfo
   void announceForAccessibility(std::string announcement) noexcept;
 
   REACT_METHOD(getRecommendedTimeoutMillis)
-  void getRecommendedTimeoutMillis(double mSec, std::function<void(React::JSValue const &)> const &onSuccess) noexcept;
+  void getRecommendedTimeoutMillis(double mSec, std::function<void(double)> const &onSuccess) noexcept;
 
  private:
   React::ReactContext m_context;

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -15,10 +15,13 @@
 
 namespace Microsoft::ReactNative {
 
-void Alert::showAlert(ShowAlertArgs const &args, std::function<void(std::string)> result) noexcept {
-  m_context.UIDispatcher().Post([weakThis = weak_from_this(), args, result] {
+void Alert::showAlert(
+    DialogOptions &&args,
+    std::function<void(std::string)> /*error*/,
+    std::function<void(std::string, int)> result) noexcept {
+  m_context.UIDispatcher().Post([weakThis = weak_from_this(), args = std::move(args), result]() mutable {
     if (auto strongThis = weakThis.lock()) {
-      strongThis->pendingAlerts.push({args, result});
+      strongThis->pendingAlerts.emplace(std::move(args), result);
       if (strongThis->pendingAlerts.size() == 1) {
         strongThis->ProcessPendingAlertRequests();
       }
@@ -29,22 +32,37 @@ void Alert::showAlert(ShowAlertArgs const &args, std::function<void(std::string)
 void Alert::ProcessPendingAlertRequests() noexcept {
   if (pendingAlerts.empty())
     return;
-  const auto &[args, result] = pendingAlerts.front();
+  const auto &pendingAlert = pendingAlerts.front();
+  const auto &args = pendingAlert.args;
+  const auto &result = pendingAlert.result;
   auto jsDispatcher = m_context.JSDispatcher();
 
   xaml::Controls::ContentDialog dialog{};
-  dialog.Title(winrt::box_value(Microsoft::Common::Unicode::Utf8ToUtf16(args.title)));
-  dialog.Content(winrt::box_value(Microsoft::Common::Unicode::Utf8ToUtf16(args.message)));
-  dialog.PrimaryButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonPositive));
-  dialog.SecondaryButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonNegative));
-  dialog.CloseButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonNeutral));
-  if (args.defaultButton >= 0 && args.defaultButton <= 3) {
-    dialog.DefaultButton(static_cast<xaml::Controls::ContentDialogButton>(args.defaultButton));
+  xaml::Controls::TextBlock titleTextBlock;
+  xaml::Controls::TextBlock messageTextBlock;
+  titleTextBlock.Text(Microsoft::Common::Unicode::Utf8ToUtf16(args.title.value_or(std::string{})));
+  titleTextBlock.IsTextSelectionEnabled(true);
+  titleTextBlock.MaxLines(2);
+  titleTextBlock.TextWrapping(xaml::TextWrapping::Wrap);
+  messageTextBlock.Text(Microsoft::Common::Unicode::Utf8ToUtf16(args.message.value_or(std::string{})));
+  messageTextBlock.IsTextSelectionEnabled(true);
+  messageTextBlock.TextWrapping(xaml::TextWrapping::Wrap);
+  dialog.Title(titleTextBlock);
+  dialog.Content(messageTextBlock);
+  dialog.PrimaryButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonPositive.value_or(std::string{})));
+  dialog.SecondaryButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonNegative.value_or(std::string{})));
+  dialog.CloseButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonNeutral.value_or(std::string{})));
+  int defaultButton = args.defaultButton.value_or(0);
+  if (defaultButton >= 0 && defaultButton <= 3) {
+    dialog.DefaultButton(static_cast<xaml::Controls::ContentDialogButton>(defaultButton));
   }
 
+  auto useXamlRootForThemeBugWorkaround = false;
+
   if (Is19H1OrHigher()) {
     // XamlRoot added in 19H1
     if (const auto xamlRoot = React::XamlUIService::GetXamlRoot(m_context.Properties().Handle())) {
+      useXamlRootForThemeBugWorkaround = true;
       dialog.XamlRoot(xamlRoot);
       auto rootChangedToken = xamlRoot.Changed([=](auto &&, auto &&) {
         const auto rootSize = xamlRoot.Size();
@@ -70,19 +88,35 @@ void Alert::ProcessPendingAlertRequests() noexcept {
     }
   }
 
+  // Workaround XAML bug with ContentDialog and dark theme:
+  // https://github.com/microsoft/microsoft-ui-xaml/issues/2331
+  dialog.Opened([useXamlRootForThemeBugWorkaround](winrt::IInspectable const &sender, auto &&) {
+    auto contentDialog = sender.as<xaml::Controls::ContentDialog>();
+    auto popups = xaml::Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(contentDialog.XamlRoot());
+
+    auto contentAsFrameworkElement = useXamlRootForThemeBugWorkaround
+        ? contentDialog.XamlRoot().Content().try_as<xaml::FrameworkElement>()
+        : xaml::Window::Current().Content().try_as<xaml::FrameworkElement>();
+    if (contentAsFrameworkElement) {
+      for (uint32_t i = 0; i < popups.Size(); i++) {
+        popups.GetAt(i).RequestedTheme(contentAsFrameworkElement.ActualTheme());
+      }
+    }
+  });
+
   auto asyncOp = dialog.ShowAsync();
   asyncOp.Completed(
       [jsDispatcher, result, this](
           const winrt::IAsyncOperation<xaml::Controls::ContentDialogResult> &asyncOp, winrt::AsyncStatus status) {
         switch (asyncOp.GetResults()) {
           case xaml::Controls::ContentDialogResult::Primary:
-            jsDispatcher.Post([result] { result("positive"); });
+            jsDispatcher.Post([result, this] { result(m_constants.buttonClicked, m_constants.buttonPositive); });
             break;
           case xaml::Controls::ContentDialogResult::Secondary:
-            jsDispatcher.Post([result] { result("negative"); });
+            jsDispatcher.Post([result, this] { result(m_constants.buttonClicked, m_constants.buttonNegative); });
             break;
           case xaml::Controls::ContentDialogResult::None:
-            jsDispatcher.Post([result] { result("neutral"); });
+            jsDispatcher.Post([result, this] { result(m_constants.buttonClicked, m_constants.buttonNeutral); });
             break;
           default:
             break;
@@ -92,8 +126,17 @@ void Alert::ProcessPendingAlertRequests() noexcept {
       });
 }
 
+Alert::Constants Alert::GetConstants() noexcept {
+  return m_constants;
+}
+
 void Alert::Initialize(React::ReactContext const &reactContext) noexcept {
   m_context = reactContext;
+  m_constants.buttonClicked = "buttonClicked";
+  m_constants.dismissed = "dismissed";
+  m_constants.buttonPositive = -1;
+  m_constants.buttonNegative = -2;
+  m_constants.buttonNeutral = -3;
 }
 
 } // namespace Microsoft::ReactNative