Commit 3e47d80 1 parent d59110a commit 3e47d80 Copy full SHA for 3e47d80
File tree 2 files changed +6
-4
lines changed
vnext/Microsoft.ReactNative/Utils
2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -30,9 +30,9 @@ struct CustomAppBarButton : xaml::Controls::AppBarButtonT<CustomAppBarButton> {
30
30
}
31
31
};
32
32
33
- void FixProofingMenuCrashForXamlIsland (xaml::Controls::TextCommandBarFlyout const &flyout) {
33
+ void FixProofingMenuCrashForXamlIsland (xaml::Controls::Primitives::FlyoutBase const &flyout) {
34
34
flyout.Opening ([](winrt::IInspectable const &sender, auto &&) {
35
- const auto &flyout = sender.as <xaml ::Controls::TextCommandBarFlyout>();
35
+ const auto &flyout = sender.as <winrt::Microsoft::UI::Xaml ::Controls::TextCommandBarFlyout>();
36
36
if (const auto &textBox = flyout.Target ().try_as <xaml::Controls::TextBox>()) {
37
37
const auto &commands = flyout.SecondaryCommands ();
38
38
for (uint32_t i = 0 ; i < commands.Size (); ++i) {
Original file line number Diff line number Diff line change 8
8
#include < UI.Xaml.Controls.Primitives.h>
9
9
#include < UI.Xaml.Controls.h>
10
10
11
+ #include < winrt/Microsoft.UI.Xaml.Controls.h>
12
+
11
13
namespace Microsoft ::ReactNative {
12
14
13
- void FixProofingMenuCrashForXamlIsland (xaml::Controls::TextCommandBarFlyout const &flyout);
15
+ void FixProofingMenuCrashForXamlIsland (xaml::Controls::Primitives::FlyoutBase const &flyout);
14
16
15
17
template <typename T>
16
18
inline void EnsureUniqueTextFlyoutForXamlIsland (T const &textView) {
@@ -19,7 +21,7 @@ inline void EnsureUniqueTextFlyoutForXamlIsland(T const &textView) {
19
21
// to show the flyout on other windows cause the first window to get focus.
20
22
// https://github.com/microsoft/microsoft-ui-xaml/issues/5341
21
23
if (IsXamlIsland ()) {
22
- xaml ::Controls::TextCommandBarFlyout flyout;
24
+ winrt::Microsoft::UI::Xaml ::Controls::TextCommandBarFlyout flyout;
23
25
flyout.Placement (xaml::Controls::Primitives::FlyoutPlacementMode::BottomEdgeAlignedLeft);
24
26
25
27
// This works around a XAML Islands bug where the Proofing sub-menu for
You can’t perform that action at this time.
0 commit comments