react-native-windows 0.71.10 → 0.72.0-preview.2

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -111,6 +111,7 @@
         $(ReactNativeWindowsDir)Shared;
         $(ReactNativeWindowsDir)Shared\tracing;
         $(ReactNativeWindowsDir)include\Shared;
+        $(ReactNativeDir)\ReactCommon\react\renderer\graphics\platform\cxx;
         $(YogaDir);
         $(GeneratedFilesDir);
         %(AdditionalIncludeDirectories)
@@ -143,7 +144,6 @@
         api-ms-win-core-windowserrorreporting-l1-1-0.dll;
         ext-ms-win-uiacore-l1-1-1.dll;
         chakra.dll;
-        winsqlite3.dll;
         %(DelayLoadDLLs)
       </DelayLoadDLLs>
       <SubSystem>Console</SubSystem>
@@ -318,6 +318,7 @@
     </ClInclude>
     <ClInclude Include="Utils\AccessibilityUtils.h" />
     <ClInclude Include="Utils\Helpers.h" />
+    <ClInclude Include="Utils\KeyboardUtils.h" />
     <ClInclude Include="Utils\LocalBundleReader.h" />
     <ClInclude Include="Utils\PropertyHandlerUtils.h" />
     <ClInclude Include="Utils\PropertyUtils.h" />
@@ -435,35 +436,7 @@
       <DependentUpon>DevMenuControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="DynamicReader.cpp">
-      <DependentUpon>IJSValueReader.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="DynamicWriter.cpp">
-      <DependentUpon>IJSValueWriter.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="JSDispatcherWriter.cpp">
-      <DependentUpon>IJSValueWriter.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="GlyphViewManager.cpp" />
-    <ClCompile Include="IReactDispatcher.cpp">
-      <DependentUpon>IReactDispatcher.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="IReactModuleBuilder.cpp">
-      <DependentUpon>IReactModuleBuilder.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="IReactNotificationService.cpp">
-      <DependentUpon>IReactNotificationService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="JsiApi.cpp">
-      <DependentUpon>JsiApi.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="JsiReader.cpp">
-      <DependentUpon>IJSValueReader.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="JsiWriter.cpp">
-      <DependentUpon>IJSValueWriter.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Modules\AccessibilityInfoModule.cpp" />
     <ClCompile Include="Modules\AlertModule.cpp" />
     <ClCompile Include="Modules\Animated\AdditionAnimatedNode.cpp" />
@@ -494,7 +467,6 @@
     <ClCompile Include="Modules\ClipboardModule.cpp" />
     <ClCompile Include="Modules\CreateModules.cpp" />
     <ClCompile Include="Modules\DeviceInfoModule.cpp" />
-    <ClCompile Include="Modules\DevSettingsModule.cpp" />
     <ClCompile Include="Modules\I18nManagerModule.cpp" />
     <ClCompile Include="Modules\ImageViewManagerModule.cpp" />
     <ClCompile Include="Modules\LinkingManagerModule.cpp" />
@@ -502,14 +474,10 @@
     <ClCompile Include="Modules\NativeUIManager.cpp" />
     <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" />
     <ClCompile Include="Pch\pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -517,38 +485,8 @@
       <DependentUpon>ReactApplication.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-    <ClCompile Include="IReactContext.cpp">
-      <DependentUpon>IReactContext.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="ReactHost\AsyncActionQueue.cpp" />
-    <ClCompile Include="ReactHost\JSBundle.cpp" />
-    <ClCompile Include="ReactHost\JSBundle_Win32.cpp" />
-    <ClCompile Include="ReactHost\JSCallInvokerScheduler.cpp" />
-    <ClCompile Include="ReactHost\MsoUtils.cpp" />
-    <ClCompile Include="ReactHost\MsoReactContext.cpp" />
-    <ClCompile Include="ReactHost\ReactErrorProvider.cpp" />
-    <ClCompile Include="ReactHost\ReactHost.cpp" />
-    <ClCompile Include="ReactHost\ReactInstanceWin.cpp" />
-    <ClCompile Include="ReactHost\CrashManager.cpp" />
-    <ClCompile Include="ReactCoreInjection.cpp">
-      <DependentUpon>ReactCoreInjection.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="ReactInstanceSettings.cpp">
-      <DependentUpon>ReactInstanceSettings.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="RedBoxHandler.cpp">
-      <DependentUpon>RedBoxHandler.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="ReactNativeHost.cpp">
-      <DependentUpon>ReactNativeHost.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="Utils\AccessibilityUtils.cpp" />
-    <ClCompile Include="Utils\Helpers.cpp" />
+    <ClCompile Include="Utils\KeyboardUtils.cpp" />
     <ClCompile Include="Utils\LocalBundleReader.cpp" />
     <ClCompile Include="Utils\ResourceBrushUtils.cpp" />
     <ClCompile Include="Utils\UwpPreparedScriptStore.cpp" />
@@ -558,7 +496,6 @@
     <ClCompile Include="Views\ActivityIndicatorViewManager.cpp" />
     <ClCompile Include="Views\ConfigureBundlerDlg.cpp" />
     <ClCompile Include="Views\ControlViewManager.cpp" />
-    <ClCompile Include="Views\DevMenu.cpp" />
     <ClCompile Include="Views\DynamicAutomationPeer.cpp" />
     <ClCompile Include="Views\DynamicAutomationProperties.cpp" />
     <ClCompile Include="Views\DynamicValueProvider.cpp" />
@@ -612,24 +549,12 @@
       <DependentUpon>XamlUIService.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="ReactPackageBuilder.cpp">
-      <DependentUpon>IReactPackageBuilder.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="IReactPropertyBag.cpp">
-      <DependentUpon>IReactPropertyBag.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="ReactRootView.cpp">
       <DependentUpon>ReactRootView.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="RedBox.cpp" />
     <ClCompile Include="ReactSupport.cpp" />
     <ClCompile Include="TestHook.cpp" />
-    <ClCompile Include="QuirkSettings.cpp">
-      <DependentUpon>QuirkSettings.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="ViewManagersProvider.cpp" />
     <ClCompile Include="XamlHelper.cpp">
       <DependentUpon>XamlHelper.idl</DependentUpon>
@@ -637,11 +562,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="CompositionHwndHost.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="CompositionContext.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="CompositionSwitcher.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="CompositionUIService.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="CompositionRootView.idl" />
     <Midl Include="CoreAppPage.idl">
       <DependentUpon>CoreAppPage.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -652,34 +572,9 @@
       <SubType>Code</SubType>
     </Midl>
     <Midl Include="DocString.idl" />
-    <Midl Include="IReactNonAbiValue.idl" />
-    <Midl Include="IJSValueReader.idl" />
-    <Midl Include="IJSValueWriter.idl" />
-    <Midl Include="IReactDispatcher.idl" />
-    <Midl Include="IReactNotificationService.idl" />
-    <Midl Include="IReactPropertyBag.idl" />
-    <Midl Include="IReactModuleBuilder.idl" />
-    <Midl Include="IReactPackageBuilder.idl" />
-    <Midl Include="IReactPackageProvider.idl" />
     <Midl Include="IViewManager.idl" />
     <Midl Include="IViewManagerCore.idl" />
-    <Midl Include="JsiApi.idl" />
     <Midl Include="ReactApplication.idl" />
-    <Midl Include="IReactContext.idl">
-      <SubType>Designer</SubType>
-    </Midl>
-    <Midl Include="ReactCoreInjection.idl">
-      <SubType>Designer</SubType>
-    </Midl>
-    <Midl Include="ReactInstanceSettings.idl">
-      <SubType>Designer</SubType>
-    </Midl>
-    <Midl Include="RedBoxHandler.idl">
-      <SubType>Designer</SubType>
-    </Midl>
-    <Midl Include="ReactNativeHost.idl">
-      <SubType>Designer</SubType>
-    </Midl>
     <Midl Include="Views\cppwinrt\AccessibilityAction.idl" />
     <Midl Include="Views\cppwinrt\Effects.idl" />
     <Midl Include="Views\cppwinrt\DynamicAutomationPeer.idl" />
@@ -693,9 +588,6 @@
     <Midl Include="ReactRootView.idl">
       <SubType>Designer</SubType>
     </Midl>
-    <Midl Include="QuirkSettings.idl">
-      <SubType>Designer</SubType>
-    </Midl>
     <Midl Include="XamlHelper.idl" />
     <Midl Include="ReactPointerEventArgs.idl" />
   </ItemGroup>
@@ -750,6 +642,7 @@
     <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
+    <PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(EnableSourceLink)' == 'true'">
@@ -760,13 +653,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="'$(UseV8)' == 'true'">
-      <ItemGroup>
-        <PackageReference Include="ReactNative.V8Jsi.Windows.UWP" Version="$(V8Version)" />
-      </ItemGroup>
-    </When>
-  </Choose>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\FastBuild.targets" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\FixupRoslynCscWarnings.targets" />

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

@@ -188,9 +188,6 @@
     <ClCompile Include="Views\ControlViewManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
-    <ClCompile Include="Views\DevMenu.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <ClCompile Include="Views\DynamicAutomationPeer.cpp">
       <Filter>Views</Filter>
     </ClCompile>
@@ -272,9 +269,6 @@
     <ClCompile Include="Utils\AccessibilityUtils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="Utils\Helpers.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="Utils\LocalBundleReader.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -837,4 +831,4 @@
     <Page Include="DevMenuControl.xaml" />
     <Page Include="CoreAppPage.xaml" />
   </ItemGroup>
-</Project>
+</Project>

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.cpp

@@ -38,7 +38,7 @@ void AccessibilityInfo::setAccessibilityFocus(double /*reactTag*/) noexcept {
   // no-op - This appears to be unused in RN
 }
 
-void AccessibilityInfo::announceForAccessibility(std::string announcement) noexcept {
+void AccessibilityInfo::announceForAccessibility(std::wstring announcement) noexcept {
   m_context.UIDispatcher().Post([context = m_context, announcement = std::move(announcement)] {
     // Windows requires a specific element to announce from. Unfortunately the react-native API does not provide a tag
     // So we need to find something to raise the notification event from.
@@ -61,7 +61,7 @@ void AccessibilityInfo::announceForAccessibility(std::string announcement) noexc
       return;
     }
 
-    winrt::hstring hstr{Microsoft::Common::Unicode::Utf8ToUtf16(announcement)};
+    winrt::hstring hstr{announcement};
     peer.RaiseNotificationEvent(
         xaml::Automation::Peers::AutomationNotificationKind::Other,
         xaml::Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.h

@@ -24,7 +24,7 @@ struct AccessibilityInfo : public std::enable_shared_from_this<AccessibilityInfo
   void setAccessibilityFocus(double reactTag) noexcept;
 
   REACT_METHOD(announceForAccessibility)
-  void announceForAccessibility(std::string announcement) noexcept;
+  void announceForAccessibility(std::wstring announcement) noexcept;
 
   REACT_METHOD(getRecommendedTimeoutMillis)
   void getRecommendedTimeoutMillis(double mSec, std::function<void(double)> const &onSuccess) noexcept;

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -10,9 +10,16 @@
 #include <UI.Xaml.Media.h>
 #include <UI.Xaml.Shapes.h>
 #include <Utils/ValueUtils.h>
+#include <XamlUtils.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 #include "Utils/Helpers.h"
 
+#ifdef USE_FABRIC
+#include <ReactCoreInjection.h>
+#include <Shobjidl.h>
+#include <winrt/Windows.UI.Popups.h>
+#endif
+
 namespace Microsoft::ReactNative {
 
 void Alert::showAlert(
@@ -29,9 +36,7 @@ void Alert::showAlert(
   });
 }
 
-void Alert::ProcessPendingAlertRequests() noexcept {
-  if (pendingAlerts.empty())
-    return;
+void Alert::ProcessPendingAlertRequestsXaml() noexcept {
   const auto &pendingAlert = pendingAlerts.front();
   const auto &args = pendingAlert.args;
   const auto &result = pendingAlert.result;
@@ -61,7 +66,17 @@ void Alert::ProcessPendingAlertRequests() noexcept {
 
   if (Is19H1OrHigher()) {
     // XamlRoot added in 19H1
-    if (const auto xamlRoot = React::XamlUIService::GetXamlRoot(m_context.Properties().Handle())) {
+    const auto xamlUIService = React::XamlUIService::FromContext(m_context.Handle());
+    xaml::XamlRoot xamlRoot = nullptr;
+    if (args.rootTag) {
+      if (const auto element = xamlUIService.ElementFromReactTag(args.rootTag.value()).try_as<xaml::UIElement>()) {
+        xamlRoot = element.XamlRoot();
+      }
+    }
+    if (!xamlRoot) {
+      xamlRoot = React::XamlUIService::GetXamlRoot(m_context.Properties().Handle());
+    }
+    if (xamlRoot) {
       useXamlRootForThemeBugWorkaround = true;
       dialog.XamlRoot(xamlRoot);
       auto rootChangedToken = xamlRoot.Changed([=](auto &&, auto &&) {
@@ -88,6 +103,13 @@ void Alert::ProcessPendingAlertRequests() noexcept {
       });
 
       dialog.Closed([=](auto &&, auto &&) { xamlRoot.Changed(rootChangedToken); });
+    } else if (IsXamlIsland()) {
+      // We cannot show a ContentDialog in a XAML Island unless it is assigned a
+      // XamlRoot instance. In such cases, we just treat the alert as dismissed.
+      jsDispatcher.Post([result, this] { result(m_constants.dismissed, m_constants.buttonNeutral); });
+      pendingAlerts.pop();
+      ProcessPendingAlertRequests();
+      return;
     }
   }
 
@@ -132,6 +154,80 @@ void Alert::ProcessPendingAlertRequests() noexcept {
       });
 }
 
+#ifdef USE_FABRIC
+void Alert::ProcessPendingAlertRequestsMessageDialog() noexcept {
+  const auto &pendingAlert = pendingAlerts.front();
+  const auto &args = pendingAlert.args;
+  const auto &result = pendingAlert.result;
+  auto jsDispatcher = m_context.JSDispatcher();
+
+  auto cancelable = args.cancelable.value_or(true);
+  auto messageDialog = winrt::Windows::UI::Popups::MessageDialog(
+      winrt::to_hstring(args.message.value_or(std::string{})), winrt::to_hstring(args.title.value_or(std::string{})));
+
+  if (args.buttonPositive) {
+    auto uicommand = winrt::Windows::UI::Popups::UICommand(winrt::to_hstring(args.buttonPositive.value()));
+    uicommand.Id(winrt::box_value(m_constants.buttonPositive));
+    messageDialog.Commands().Append(uicommand);
+    if (args.defaultButton.value_or(0) == m_constants.buttonPositive) {
+      messageDialog.DefaultCommandIndex(messageDialog.Commands().Size() - 1);
+    }
+  }
+  if (args.buttonNegative) {
+    auto uicommand = winrt::Windows::UI::Popups::UICommand(winrt::to_hstring(args.buttonNegative.value()));
+    uicommand.Id(winrt::box_value(m_constants.buttonNegative));
+    messageDialog.Commands().Append(uicommand);
+    if (args.defaultButton.value_or(0) == m_constants.buttonNegative) {
+      messageDialog.DefaultCommandIndex(messageDialog.Commands().Size() - 1);
+    }
+  }
+  if (args.buttonNeutral) {
+    auto uicommand = winrt::Windows::UI::Popups::UICommand(winrt::to_hstring(args.buttonNeutral.value()));
+    uicommand.Id(winrt::box_value(m_constants.buttonNeutral));
+    messageDialog.Commands().Append(uicommand);
+    if (args.defaultButton.value_or(0) == m_constants.buttonNeutral) {
+      messageDialog.DefaultCommandIndex(messageDialog.Commands().Size() - 1);
+    }
+  }
+
+  if (!args.cancelable.value_or(true)) {
+    messageDialog.CancelCommandIndex(0xffffffff /* -1 doesn't allow cancelation of message dialog */);
+  }
+
+  auto hwnd = winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetTopLevelWindowId(
+      m_context.Properties().Handle());
+  if (hwnd) {
+    auto initializeWithWindow{messageDialog.as<::IInitializeWithWindow>()};
+    initializeWithWindow->Initialize(reinterpret_cast<HWND>(hwnd));
+  }
+
+  auto asyncOp = messageDialog.ShowAsync();
+  asyncOp.Completed(
+      [jsDispatcher, result, this](
+          const winrt::IAsyncOperation<winrt::Windows::UI::Popups::IUICommand> &asyncOp, winrt::AsyncStatus status) {
+        auto uicommand = asyncOp.GetResults();
+        jsDispatcher.Post(
+            [id = uicommand.Id(), result, this] { result(m_constants.buttonClicked, winrt::unbox_value<int>(id)); });
+        pendingAlerts.pop();
+        ProcessPendingAlertRequests();
+      });
+}
+#endif
+
+void Alert::ProcessPendingAlertRequests() noexcept {
+  if (pendingAlerts.empty())
+    return;
+
+  if (xaml::TryGetCurrentApplication()) {
+    ProcessPendingAlertRequestsXaml();
+  }
+#ifdef USE_FABRIC
+  else {
+    // If we dont have xaml loaded, fallback to using MessageDialog
+    ProcessPendingAlertRequestsMessageDialog();
+  }
+#endif
+}
 Alert::Constants Alert::GetConstants() noexcept {
   return m_constants;
 }

package/Microsoft.ReactNative/Modules/AlertModule.h

@@ -44,6 +44,10 @@ struct Alert : public std::enable_shared_from_this<Alert> {
   std::queue<AlertRequest> pendingAlerts{};
 
   void ProcessPendingAlertRequests() noexcept;
+  void ProcessPendingAlertRequestsXaml() noexcept;
+#ifdef USE_FABRIC
+  void ProcessPendingAlertRequestsMessageDialog() noexcept;
+#endif
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedModule.cpp

@@ -10,6 +10,15 @@
 
 namespace Microsoft::ReactNative {
 
+NativeAnimatedModule::NativeAnimatedModule() {}
+
+NativeAnimatedModule::~NativeAnimatedModule() {
+  // To make sure that we destroy active animation operations on UI thread.
+  if (m_context && !m_context.UIDispatcher().HasThreadAccess()) {
+    m_context.UIDispatcher().Post([nodesManager = std::move(m_nodesManager)]() mutable { nodesManager = nullptr; });
+  }
+}
+
 void NativeAnimatedModule::Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
   m_context = reactContext;
   m_nodesManager = std::make_shared<NativeAnimatedNodeManager>(reactContext);

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedModule.h

@@ -58,6 +58,8 @@ REACT_MODULE(NativeAnimatedModule)
 struct NativeAnimatedModule : std::enable_shared_from_this<NativeAnimatedModule> {
   // Commented out due to missing implementation of updateAnimatedNodeConfig
   // using ModuleSpec = ReactNativeSpecs::AnimatedModuleSpec;
+  NativeAnimatedModule();
+  ~NativeAnimatedModule();
 
   REACT_INIT(Initialize)
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp

@@ -18,12 +18,11 @@
 #include "FrameAnimationDriver.h"
 #include "SpringAnimationDriver.h"
 
+#include <ReactCoreInjection.h>
 #include "AnimatedNodeType.h"
 #include "AnimationType.h"
 #include "FacadeType.h"
 
-#include <Modules/NativeUIManager.h>
-#include <Modules/PaperUIManagerModule.h>
 #include <Windows.Foundation.h>
 #include <queue>
 
@@ -51,9 +50,13 @@ comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
         compositionContext);
   }
 #endif
+#ifndef CORE_ABI
   // TODO: Islands - need to get the XamlView associated with this animation in order to
   // use the compositor Microsoft::ReactNative::GetCompositor(xamlView)
   return Microsoft::ReactNative::GetCompositor();
+#else
+  return nullptr;
+#endif
 }
 
 void NativeAnimatedNodeManager::CreateAnimatedNode(
@@ -460,9 +463,8 @@ void NativeAnimatedNodeManager::AddDelayedPropsNode(
 #endif
   m_delayedPropsNodes.push_back(propsNodeTag);
   if (m_delayedPropsNodes.size() <= 1) {
-    if (const auto uiManger = Microsoft::ReactNative::GetNativeUIManager(context).lock()) {
-      uiManger->AddBatchCompletedCallback([this]() { ProcessDelayedPropsNodes(); });
-    }
+    winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::PostToUIBatchingQueue(
+        m_context.Handle(), [this]() { ProcessDelayedPropsNodes(); });
   }
 }
 

package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp

@@ -3,8 +3,11 @@
 
 #include "pch.h"
 
+#ifndef CORE_ABI
 #include <Modules/NativeUIManager.h>
 #include <Modules/PaperUIManagerModule.h>
+#endif
+
 #include <Utils/Helpers.h>
 #include <Views/ShadowNodeBase.h>
 #include <Views/XamlFeatures.h>
@@ -318,16 +321,19 @@ void PropsAnimatedNode::MakeAnimation(int64_t valueNodeTag, FacadeType facadeTyp
 }
 
 Microsoft::ReactNative::ShadowNodeBase *PropsAnimatedNode::GetShadowNodeBase() {
+#ifndef CORE_ABI
   if (const auto uiManager = Microsoft::ReactNative::GetNativeUIManager(m_context).lock()) {
     if (const auto nativeUIManagerHost = uiManager->getHost()) {
       return static_cast<Microsoft::ReactNative::ShadowNodeBase *>(
           nativeUIManagerHost->FindShadowNodeForTag(m_connectedViewTag));
     }
   }
+#endif
   return nullptr;
 }
 
 xaml::UIElement PropsAnimatedNode::GetUIElement() {
+#ifndef CORE_ABI
   if (IsRS5OrHigher()) {
     if (const auto shadowNodeBase = GetShadowNodeBase()) {
       if (const auto shadowNodeView = shadowNodeBase->GetView()) {
@@ -335,15 +341,18 @@ xaml::UIElement PropsAnimatedNode::GetUIElement() {
       }
     }
   }
+#endif
   return nullptr;
 }
 
 void PropsAnimatedNode::CommitProps() {
+#ifndef CORE_ABI
   if (const auto node = GetShadowNodeBase()) {
     if (!node->m_zombie) {
       node->updateProperties(m_props);
     }
   }
+#endif
 }
 
 PropsAnimatedNode::AnimationView PropsAnimatedNode::GetAnimationView() {
@@ -355,7 +364,8 @@ PropsAnimatedNode::AnimationView PropsAnimatedNode::GetAnimationView() {
       return {nullptr, std::static_pointer_cast<CompositionBaseComponentView>(componentView)};
     }
   }
-#endif
+#endif // USE_FABRIC
+#ifndef CORE_ABI
   if (IsRS5OrHigher()) {
     if (const auto shadowNodeBase = GetShadowNodeBase()) {
       if (const auto shadowNodeView = shadowNodeBase->GetView()) {
@@ -367,6 +377,7 @@ PropsAnimatedNode::AnimationView PropsAnimatedNode::GetAnimationView() {
       }
     }
   }
+#endif // CORE_ABI
 
 #ifdef USE_FABRIC
   return {nullptr, nullptr};
@@ -404,13 +415,16 @@ void PropsAnimatedNode::StartAnimation(
 }
 
 comp::CompositionPropertySet PropsAnimatedNode::EnsureCenterPointPropertySet(const AnimationView &view) noexcept {
+#ifndef CORE_ABI
   if (view.m_element) {
     return GetShadowNodeBase()->EnsureTransformPS();
+  }
+#endif
 #ifdef USE_FABRIC
-  } else if (view.m_componentView) {
+  if (view.m_componentView) {
     return view.m_componentView->EnsureCenterPointPropertySet();
-#endif
   }
+#endif
   return nullptr;
 }
 

package/Microsoft.ReactNative/Modules/Animated/ValueAnimatedNode.h

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
+#include <CppWinRTIncludes.h>
 #include <JSValue.h>
 #include <UI.Composition.h>
 #include <unordered_set>

package/Microsoft.ReactNative/Modules/AppearanceModule.cpp

@@ -75,6 +75,10 @@ void Appearance::InitOnUIThread(const Mso::React::IReactContext &context) noexce
   pb.Set(AppearanceCurrentThemePropertyId(), theme);
 }
 
+void Appearance::setColorScheme(std::string style) noexcept {
+  // no-op
+}
+
 std::optional<std::string> Appearance::getColorScheme() noexcept {
   return ToString(*(m_context.Properties().Get(AppearanceCurrentThemePropertyId())));
 }

package/Microsoft.ReactNative/Modules/AppearanceModule.h

@@ -18,6 +18,9 @@ struct Appearance : std::enable_shared_from_this<Appearance> {
   REACT_INIT(Initialize)
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
+  REACT_METHOD(setColorScheme)
+  void setColorScheme(std::string style) noexcept;
+
   REACT_SYNC_METHOD(getColorScheme)
   std::optional<std::string> getColorScheme() noexcept;
 

package/Microsoft.ReactNative/Modules/ClipboardModule.cpp

@@ -15,7 +15,7 @@ void Clipboard::Initialize(winrt::Microsoft::ReactNative::ReactContext const &re
   m_reactContext = reactContext;
 }
 
-void Clipboard::getString(React::ReactPromise<React::JSValue> result) noexcept {
+void Clipboard::getString(React::ReactPromise<std::string> result) noexcept {
   auto jsDispatcher = m_reactContext.JSDispatcher();
   m_reactContext.UIDispatcher().Post([jsDispatcher, result] {
     auto data = DataTransfer::Clipboard::GetContent();
@@ -27,7 +27,7 @@ void Clipboard::getString(React::ReactPromise<React::JSValue> result) noexcept {
         case AsyncStatus::Completed: {
           auto text = std::wstring(asyncOp.GetResults());
           jsDispatcher.Post(
-              [result, text] { result.Resolve(React::JSValue{Microsoft::Common::Unicode::Utf16ToUtf8(text)}); });
+              [result, text] { result.Resolve(std::string{Microsoft::Common::Unicode::Utf16ToUtf8(text)}); });
           break;
         }
         case AsyncStatus::Canceled: {
@@ -48,10 +48,10 @@ void Clipboard::getString(React::ReactPromise<React::JSValue> result) noexcept {
   );
 }
 
-void Clipboard::setString(std::string content) noexcept {
+void Clipboard::setString(std::wstring content) noexcept {
   m_reactContext.UIDispatcher().Post([=] {
     DataTransfer::DataPackage data;
-    data.SetText(Microsoft::Common::Unicode::Utf8ToUtf16(content));
+    data.SetText(content);
     DataTransfer::Clipboard::SetContent(data);
   });
 }

package/Microsoft.ReactNative/Modules/ClipboardModule.h

@@ -15,10 +15,10 @@ struct Clipboard {
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
   REACT_METHOD(getString)
-  void getString(React::ReactPromise<React::JSValue> result) noexcept;
+  void getString(React::ReactPromise<std::string> result) noexcept;
 
   REACT_METHOD(setString)
-  void setString(std::string content) noexcept;
+  void setString(std::wstring content) noexcept;
 
   winrt::Microsoft::ReactNative::ReactContext m_reactContext;
 };