react-native-windows 0.0.0-canary.591 → 0.0.0-canary.593

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

@@ -5,8 +5,6 @@
 #pragma once
 
 #include <Composition/CompositionSwitcher.interop.h>
-#include <guid/msoGuid.h>
-
 #include <winrt/Windows.UI.Composition.h>
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -548,7 +548,6 @@
       <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="Utils\AccessibilityUtils.cpp" />
-    <ClCompile Include="Utils\Helpers.cpp" />
     <ClCompile Include="Utils\LocalBundleReader.cpp" />
     <ClCompile Include="Utils\ResourceBrushUtils.cpp" />
     <ClCompile Include="Utils\UwpPreparedScriptStore.cpp" />

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

@@ -272,9 +272,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>

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/NativeUIManager.cpp

@@ -626,6 +626,15 @@ static void StyleYogaNode(
       YGValue result = YGValueOrDefault(value, YGValue{YGUndefined, YGUnitPoint} /*default*/, shadowNode, key);
 
       SetYogaUnitValueHelper(yogaNode, result, YGNodeStyleSetMaxHeight, YGNodeStyleSetMaxHeightPercent);
+    } else if (key == "rowGap") {
+      float result = NumberOrDefault(value, 0.0f /*default*/);
+      YGNodeStyleSetGap(yogaNode, YGGutterRow, result);
+    } else if (key == "columnGap") {
+      float result = NumberOrDefault(value, 0.0f /*default*/);
+      YGNodeStyleSetGap(yogaNode, YGGutterColumn, result);
+    } else if (key == "gap") {
+      float result = NumberOrDefault(value, 0.0f /*default*/);
+      YGNodeStyleSetGap(yogaNode, YGGutterAll, result);
     } else if (key == "margin") {
       YGValue result = YGValueOrDefault(value, YGValue{YGUndefined, YGUnitPoint} /*default*/, shadowNode, key);
 

package/Microsoft.ReactNative/ReactCoreInjection.cpp

@@ -80,6 +80,22 @@ ReactCoreInjection::PostToUIBatchingQueueProperty() noexcept {
   postFn(callback);
 }
 
+ReactPropertyId<winrt::hstring> PlatformNameOverrideProperty() noexcept {
+  static ReactPropertyId<winrt::hstring> prop{L"ReactNative.Injection", L"PlatformNameOverride"};
+  return prop;
+}
+
+/*static*/ void ReactCoreInjection::SetPlatformNameOverride(
+    IReactPropertyBag const &properties,
+    winrt::hstring const &platformName) noexcept {
+  ReactNative::ReactPropertyBag(properties).Set(PlatformNameOverrideProperty(), platformName);
+}
+/*static*/ std::string ReactCoreInjection::GetPlatformName(IReactPropertyBag const &properties) noexcept {
+  return winrt::to_string(ReactNative::ReactPropertyBag(properties)
+                              .Get(PlatformNameOverrideProperty())
+                              .value_or(winrt::to_hstring(STRING(RN_PLATFORM))));
+}
+
 ReactViewHost::ReactViewHost(
     const ReactNative::ReactNativeHost &host,
     Mso::React::IReactViewHost &viewHost,

package/Microsoft.ReactNative/ReactCoreInjection.h

@@ -46,6 +46,9 @@ struct ReactCoreInjection : ReactCoreInjectionT<ReactCoreInjection> {
   static void PostToUIBatchingQueue(
       ReactNative::IReactContext context,
       ReactNative::ReactDispatcherCallback callback) noexcept;
+
+  static void SetPlatformNameOverride(IReactPropertyBag const &properties, winrt::hstring const &platformName) noexcept;
+  static std::string GetPlatformName(IReactPropertyBag const &properties) noexcept;
 };
 
 struct ReactViewHost : public winrt::implements<ReactViewHost, IReactViewHost> {

package/Microsoft.ReactNative/ReactCoreInjection.idl

@@ -89,6 +89,9 @@ DOC_STRING("Settings per each IReactViewHost associated with an IReactHost insta
 
     DOC_STRING("Post something to the main UI dispatcher using the batching queue")
     static void PostToUIBatchingQueue(IReactContext context, ReactDispatcherCallback callback);
+
+    DOC_STRING("Override platform name. This will change the platform used when requesting bundles from metro. Default: \"windows\"")
+    static void SetPlatformNameOverride(IReactPropertyBag properties, String platformName);
   }
 
 

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -42,16 +42,24 @@
 #ifndef CORE_ABI
 #include "Modules/AccessibilityInfoModule.h"
 #include "Modules/AlertModule.h"
+#endif
+#if !defined(CORE_ABI) || defined(USE_FABRIC)
 #include "Modules/Animated/NativeAnimatedModule.h"
+#endif
+#ifndef CORE_ABI
 #include "Modules/AppStateModule.h"
 #include "Modules/AppThemeModuleUwp.h"
 #include "Modules/ClipboardModule.h"
 #endif
 #include "Modules/DevSettingsModule.h"
 #ifndef CORE_ABI
-#include <Modules/ImageViewManagerModule.h>
 #include "Modules/DeviceInfoModule.h"
 #include "Modules/I18nManagerModule.h"
+#endif
+#if !defined(CORE_ABI) || defined(USE_FABRIC)
+#include <Modules/ImageViewManagerModule.h>
+#endif
+#ifndef CORE_ABI
 #include "Modules/LinkingManagerModule.h"
 #include "Modules/LogBoxModule.h"
 #include "Modules/NativeUIManager.h"
@@ -78,6 +86,7 @@
 #include <tuple>
 #include "ChakraRuntimeHolder.h"
 
+#include <Utils/Helpers.h>
 #include "CrashManager.h"
 #include "JsiApi.h"
 #include "ReactCoreInjection.h"
@@ -355,6 +364,17 @@ void ReactInstanceWin::LoadModules(
   registerTurboModule(
       L"NativeAnimatedModule",
       winrt::Microsoft::ReactNative::MakeModuleProvider<::Microsoft::ReactNative::NativeAnimatedModule>());
+
+#elif defined(CORE_ABI) && defined(USE_FABRIC)
+  if (Microsoft::ReactNative::IsFabricEnabled(m_reactContext->Properties())) {
+    registerTurboModule(
+        L"ImageLoader",
+        winrt::Microsoft::ReactNative::MakeTurboModuleProvider<::Microsoft::ReactNative::ImageLoader>());
+
+    registerTurboModule(
+        L"NativeAnimatedModule",
+        winrt::Microsoft::ReactNative::MakeModuleProvider<::Microsoft::ReactNative::NativeAnimatedModule>());
+  }
 #endif
 
   registerTurboModule(
@@ -421,7 +441,9 @@ void ReactInstanceWin::Initialize() noexcept {
           devSettings->useWebDebugger = m_useWebDebugger;
           devSettings->useFastRefresh = m_isFastReloadEnabled;
           devSettings->bundleRootPath = BundleRootPath();
-
+          devSettings->platformName =
+              winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetPlatformName(
+                  strongThis->m_reactContext->Properties());
           devSettings->waitingForDebuggerCallback = GetWaitingForDebuggerCallback();
           devSettings->debuggerAttachCallback = GetDebuggerAttachCallback();
 
@@ -541,7 +563,8 @@ void ReactInstanceWin::Initialize() noexcept {
 
             if (UseDeveloperSupport() && State() != ReactInstanceState::HasError) {
               folly::dynamic params = folly::dynamic::array(
-                  STRING(RN_PLATFORM),
+                  winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetPlatformName(
+                      m_reactContext->Properties()),
                   DebugBundlePath(),
                   SourceBundleHost(),
                   SourceBundlePort(),

package/Microsoft.ReactNative/Utils/Helpers.cpp

@@ -3,12 +3,9 @@
 
 #include "pch.h"
 
-#include <Modules/NativeUIManager.h>
-#include <UI.Xaml.Media.h>
 #include <Utils/Helpers.h>
 #include <winrt/Windows.Foundation.Metadata.h>
 
-#include <Modules/PaperUIManagerModule.h>
 #include <appmodel.h>
 #include <processthreadsapi.h>
 
@@ -24,35 +21,6 @@ using namespace Windows::Foundation::Metadata;
 
 namespace Microsoft::ReactNative {
 
-// Not only react-native, native modules could set tag too for controls.
-// For example, to identify an clicked item, customer may add tag in
-// NavigationView since content for the two NavigationViewItem are empty.
-//
-// <NavigationView>
-//  <NavigationViewItem Icon="Accept" Tag="1" />
-//  <NavigationViewItem Icon="Accept" Tag="2" />
-// </NavigationView>
-// Instead of deduce view id directly from FrameworkElement.Tag, this do
-// additional check by uimanager.
-ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe) {
-  ReactId reactId{};
-  if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(context).lock()) {
-    if (auto peer = uiManager->reactPeerOrContainerFrom(fe)) {
-      reactId.isValid = true;
-      reactId.tag = Microsoft::ReactNative::GetTag(peer);
-    }
-  }
-  return reactId;
-};
-
-std::int32_t CountOpenPopups() {
-  // TODO: Use VisualTreeHelper::GetOpenPopupsFromXamlRoot when running against
-  // RS6
-  winrt::Windows::Foundation::Collections::IVectorView<xaml::Controls::Primitives::Popup> popups =
-      xaml::Media::VisualTreeHelper::GetOpenPopups(xaml::Window::Current());
-  return (int32_t)popups.Size();
-}
-
 template <uint16_t APIVersion>
 bool IsAPIContractVxAvailable() {
   static bool isAPIContractVxAvailableInitialized = false;

package/Microsoft.ReactNative/Utils/Helpers.h

@@ -12,19 +12,11 @@ namespace Microsoft::ReactNative {
 
 using namespace std;
 
-struct ReactId {
-  int64_t tag{0};
-  bool isValid{false};
-};
-
 template <typename T>
 inline T asEnum(winrt::Microsoft::ReactNative::JSValue const &obj) {
   return static_cast<T>(obj.AsInt64());
 }
 
-ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe);
-std::int32_t CountOpenPopups();
-
 bool IsRS3OrHigher();
 bool IsRS4OrHigher();
 bool IsRS5OrHigher();

package/Microsoft.ReactNative/Views/FlyoutViewManager.cpp

@@ -17,6 +17,7 @@
 #include <UI.Xaml.Media.h>
 #include <Utils/Helpers.h>
 #include <Utils/PropertyHandlerUtils.h>
+#include <XamlHelper.h>
 
 #ifdef USE_WINUI3
 namespace winrt::Microsoft::UI::Xaml::Controls::Primitives {
@@ -122,7 +123,7 @@ class FlyoutShadowNode : public ShadowNodeBase {
   winrt::Popup GetFlyoutParentPopup() const;
   winrt::FlyoutPresenter GetFlyoutPresenter() const;
   void OnShowFlyout();
-  void LogErrorAndClose(const string &error);
+  void LogErrorAndClose(const std::string &error);
   xaml::FrameworkElement m_targetElement = nullptr;
   winrt::Flyout m_flyout = nullptr;
   bool m_isLightDismissEnabled = true;

package/Microsoft.ReactNative/Views/KeyboardEventHandler.cpp

@@ -9,6 +9,7 @@
 #include "Utils/Helpers.h"
 #include "Utils/PropertyHandlerUtils.h"
 #include "Views/KeyboardEventHandler.h"
+#include "XamlHelper.h"
 
 #ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Input.h>

package/Microsoft.ReactNative/Views/PopupViewManager.cpp

@@ -16,6 +16,7 @@
 #include <UI.Xaml.Media.h>
 #include <Utils/Helpers.h>
 #include <Utils/ValueUtils.h>
+#include <XamlHelper.h>
 #include <winrt/Windows.UI.Core.h>
 
 namespace winrt {

package/Microsoft.ReactNative/Views/TextInputViewManager.cpp

@@ -718,9 +718,42 @@ void TextInputShadowNode::SetText(const winrt::Microsoft::ReactNative::JSValue &
         auto oldValue = textBox.Text();
         auto newValue = asHstring(text);
         if (oldValue != newValue) {
-          textBox.Text(newValue);
+          if (!textBox.IsReadOnly()) {
+            uint32_t diffStartIndex = 0;
+            uint32_t diffEndIndex = 0;
+            // Replacing the entire string with the new value resets the text history.
+            // Generally speaking, this is undesirable. To mitigate this issue, we can
+            // replace text using the XAML TextBox::SelectedText property, which retains
+            // undo / redo history. To do so, we use a simple algorithm that finds a
+            // single diff in the values:
+            // 1. Find first character that mismatches iterating forwards
+            while (diffStartIndex < oldValue.size() && diffStartIndex < newValue.size() &&
+                   oldValue[diffStartIndex] == newValue[diffStartIndex]) {
+              diffStartIndex++;
+            }
+            // 2. Find last character the mismatches beyond the first mismatch iterating backwards
+            while (diffEndIndex < oldValue.size() - diffStartIndex && diffEndIndex < newValue.size() - diffStartIndex &&
+                   oldValue[oldValue.size() - diffEndIndex - 1] == newValue[newValue.size() - diffEndIndex - 1]) {
+              diffEndIndex++;
+            }
+            // 3. Select the range between the start and end index in the "old value"
+            textBox.SelectionStart(diffStartIndex);
+            textBox.SelectionLength(oldValue.size() - diffStartIndex - diffEndIndex);
+            // 4. Replace the selected text with the range between start and end index in the "new value"
+            // Copies the substring view into a new winrt::hstring due to occasional crash
+            winrt::hstring replacementValue{
+                std::wstring_view{newValue}.substr(diffStartIndex, newValue.size() - diffStartIndex - diffEndIndex)};
+            textBox.SelectedText(replacementValue);
+          } else {
+            textBox.Text(newValue);
+          }
+
+          // Update selection based on the following algorithm:
+          // 1. If the new value is the same length as the old value, retain the selection state (start and length)
+          // 2. Else set the selection start to the end of the string
           if (oldValue.size() == newValue.size()) {
             textBox.SelectionStart(oldCursor);
+            textBox.SelectionLength(oldSelectionLength);
           } else {
             textBox.SelectionStart(newValue.size());
           }

package/Microsoft.ReactNative/XamlHelper.cpp

@@ -5,6 +5,9 @@
 #include "XamlHelper.h"
 #include "XamlHelper.g.cpp"
 
+#include <Modules/NativeUIManager.h>
+#include <Modules/PaperUIManagerModule.h>
+#include <UI.Xaml.Media.h>
 #include <Utils/ValueUtils.h>
 #include "DynamicWriter.h"
 #include "XamlView.h"
@@ -40,3 +43,36 @@ folly::dynamic XamlHelper::GetFollyDynamicFromValueProvider(JSValueArgWriter con
 }
 
 } // namespace winrt::Microsoft::ReactNative::implementation
+
+namespace Microsoft::ReactNative {
+
+// Not only react-native, native modules could set tag too for controls.
+// For example, to identify an clicked item, customer may add tag in
+// NavigationView since content for the two NavigationViewItem are empty.
+//
+// <NavigationView>
+//  <NavigationViewItem Icon="Accept" Tag="1" />
+//  <NavigationViewItem Icon="Accept" Tag="2" />
+// </NavigationView>
+// Instead of deduce view id directly from FrameworkElement.Tag, this do
+// additional check by uimanager.
+ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe) {
+  ReactId reactId{};
+  if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(context).lock()) {
+    if (auto peer = uiManager->reactPeerOrContainerFrom(fe)) {
+      reactId.isValid = true;
+      reactId.tag = Microsoft::ReactNative::GetTag(peer);
+    }
+  }
+  return reactId;
+};
+
+std::int32_t CountOpenPopups() {
+  // TODO: Use VisualTreeHelper::GetOpenPopupsFromXamlRoot when running against
+  // RS6
+  winrt::Windows::Foundation::Collections::IVectorView<xaml::Controls::Primitives::Popup> popups =
+      xaml::Media::VisualTreeHelper::GetOpenPopups(xaml::Window::Current());
+  return (int32_t)popups.Size();
+}
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/XamlHelper.h

@@ -5,6 +5,10 @@
 #include "XamlHelper.g.h"
 #include "Base/FollyIncludes.h"
 
+namespace Mso::React {
+struct IReactContext;
+} // namespace Mso::React
+
 namespace winrt::Microsoft::ReactNative::implementation {
 
 struct XamlHelper : XamlHelperT<XamlHelper> {
@@ -25,3 +29,26 @@ struct XamlHelper : XamlHelperT<XamlHelper> {
 namespace winrt::Microsoft::ReactNative::factory_implementation {
 struct XamlHelper : XamlHelperT<XamlHelper, implementation::XamlHelper> {};
 } // namespace winrt::Microsoft::ReactNative::factory_implementation
+
+namespace Microsoft::ReactNative {
+
+struct ReactId {
+  int64_t tag{0};
+  bool isValid{false};
+};
+
+// Not only react-native, native modules could set tag too for controls.
+// For example, to identify an clicked item, customer may add tag in
+// NavigationView since content for the two NavigationViewItem are empty.
+//
+// <NavigationView>
+//  <NavigationViewItem Icon="Accept" Tag="1" />
+//  <NavigationViewItem Icon="Accept" Tag="2" />
+// </NavigationView>
+// Instead of deduce view id directly from FrameworkElement.Tag, this do
+// additional check by uimanager.
+ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe);
+
+std::int32_t CountOpenPopups();
+
+} // namespace Microsoft::ReactNative

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.591</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.593</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/Shared/Composition/CompositionSwitcher.interop.h

@@ -10,6 +10,7 @@
 #include <d2d1_1.h>
 #include <d3d11.h>
 #include <d3d11_4.h>
+#include <guid/msoGuid.h>
 #include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Windows.Graphics.DirectX.Direct3D11.h>
 

package/Shared/Shared.vcxitems

@@ -163,6 +163,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)WebSocketJSExecutorFactory.h" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ReactRootViewTagGenerator.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ImageUtils.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\Helpers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp" />

package/Shared/Shared.vcxitems.filters

@@ -156,6 +156,7 @@
       <Filter>Source Files\Modules</Filter>
     </ClCompile>
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ImageUtils.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\Helpers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.591",
+  "version": "0.0.0-canary.593",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -78,7 +78,7 @@
     "prettier": "^2.4.1",
     "react": "18.2.0",
     "react-native": "0.0.0-20221120-2051-81e441ae8",
-    "react-native-platform-override": "^1.8.3",
+    "react-native-platform-override": "^1.8.4",
     "react-refresh": "^0.4.0",
     "typescript": "^4.4.4"
   },