winUI2 CBF

Author: lyahdav

vnext/Microsoft.ReactNative/Utils/XamlIslandUtils.cpp

@@ -30,9 +30,13 @@ struct CustomAppBarButton : xaml::Controls::AppBarButtonT<CustomAppBarButton> {
   }
 };
 
-void FixProofingMenuCrashForXamlIsland(xaml::Controls::TextCommandBarFlyout const &flyout) {
+void FixProofingMenuCrashForXamlIsland(xaml::Controls::Primitives::FlyoutBase const &flyout) {
   flyout.Opening([](winrt::IInspectable const &sender, auto &&) {
+#ifdef USE_WINUI2_CBF
+    const auto &flyout = sender.as<winrt::Microsoft::UI::Xaml::Controls::TextCommandBarFlyout>();
+#else
     const auto &flyout = sender.as<xaml::Controls::TextCommandBarFlyout>();
+#endif
     if (const auto &textBox = flyout.Target().try_as<xaml::Controls::TextBox>()) {
       const auto &commands = flyout.SecondaryCommands();
       for (uint32_t i = 0; i < commands.Size(); ++i) {

vnext/Microsoft.ReactNative/Utils/XamlIslandUtils.h

@@ -7,10 +7,14 @@
 
 #include <UI.Xaml.Controls.Primitives.h>
 #include <UI.Xaml.Controls.h>
+#define USE_WINUI2_CBF
+#ifdef USE_WINUI2_CBF
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#endif
 
 namespace Microsoft::ReactNative {
 
-void FixProofingMenuCrashForXamlIsland(xaml::Controls::TextCommandBarFlyout const &flyout);
+void FixProofingMenuCrashForXamlIsland(xaml::Controls::Primitives::FlyoutBase const &flyout);
 
 template <typename T>
 inline void EnsureUniqueTextFlyoutForXamlIsland(T const &textView) {
@@ -19,7 +23,12 @@ inline void EnsureUniqueTextFlyoutForXamlIsland(T const &textView) {
   // to show the flyout on other windows cause the first window to get focus.
   // https://github.com/microsoft/microsoft-ui-xaml/issues/5341
   if (IsXamlIsland()) {
+#ifdef USE_WINUI2_CBF
+    winrt::Microsoft::UI::Xaml::Controls::TextCommandBarFlyout flyout;
+#else
     xaml::Controls::TextCommandBarFlyout flyout;
+#endif
+
     flyout.Placement(xaml::Controls::Primitives::FlyoutPlacementMode::BottomEdgeAlignedLeft);
 
     // This works around a XAML Islands bug where the Proofing sub-menu for