Xaml Islands Fixes for FocusManager.GetFocusedElement and ContentDialog's XamlRoot.

azchohfi · azchohfi · commit 1070cee1ce0b · 2020-06-16T10:57:09.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs b/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs
@@ -106,7 +106,16 @@ private void ClearContent()
 
         private void UpdateTimer_Tick(object sender, object e)
         {
-            var focusedControl = FocusManager.GetFocusedElement() as FrameworkElement;
+            FrameworkElement focusedControl;
+
+            if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && XamlRoot != null)
+            {
+                focusedControl = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
+            }
+            else
+            {
+                focusedControl = FocusManager.GetFocusedElement() as FrameworkElement;
+            }
 
             if (focusedControl == null)
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Linq;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
@@ -16,7 +15,18 @@ public sealed partial class Shell
     {
         internal void StartSearch(string startingText = null)
         {
-            if (FocusManager.GetFocusedElement() == SearchBox.FindDescendant<TextBox>())
+            object focusedElement;
+
+            if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && XamlRoot != null)
+            {
+                focusedElement = FocusManager.GetFocusedElement(XamlRoot);
+            }
+            else
+            {
+                focusedElement = FocusManager.GetFocusedElement();
+            }
+
+            if (focusedElement == SearchBox.FindDescendant<TextBox>())
             {
                 return;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ApiInformationHelper.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ApiInformationHelper.cs
@@ -20,5 +20,7 @@ internal class ApiInformationHelper
 
         public static bool IsFallCreatorsUpdateOrAbove => (bool)(_isFallCreatorsUpdateOrAbove ??
             (_isFallCreatorsUpdateOrAbove = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5)));
+
+        public static bool IsXamlRootAvailable { get; } = ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/QuickReturnHeaderBehavior.cs
@@ -258,7 +258,15 @@ private void ScrollViewer_GotFocus(object sender, RoutedEventArgs e)
         {
             var scroller = (ScrollViewer)sender;
 
-            var focusedElement = FocusManager.GetFocusedElement();
+            object focusedElement;
+            if (ApiInformationHelper.IsXamlRootAvailable && scroller.XamlRoot != null)
+            {
+                focusedElement = FocusManager.GetFocusedElement(scroller.XamlRoot);
+            }
+            else
+            {
+                focusedElement = FocusManager.GetFocusedElement();
+            }
 
             if (focusedElement is UIElement element)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors/StickyHeaderBehavior.cs
@@ -236,7 +236,15 @@ private void ScrollViewer_GotFocus(object sender, RoutedEventArgs e)
         {
             var scroller = (ScrollViewer)sender;
 
-            var focusedElement = FocusManager.GetFocusedElement();
+            object focusedElement;
+            if (ApiInformationHelper.IsXamlRootAvailable && scroller.XamlRoot != null)
+            {
+                focusedElement = FocusManager.GetFocusedElement(scroller.XamlRoot);
+            }
+            else
+            {
+                focusedElement = FocusManager.GetFocusedElement();
+            }
 
             if (focusedElement is UIElement element)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -5730,7 +5730,7 @@ private void DataGrid_LostFocus(object sender, RoutedEventArgs e)
 
                 // Walk up the visual tree of the newly focused element
                 // to determine if focus is still within DataGrid.
-                object focusedObject = FocusManager.GetFocusedElement();
+                object focusedObject = GetFocusedElement();
                 DependencyObject focusedDependencyObject = focusedObject as DependencyObject;
 
                 while (focusedDependencyObject != null)
@@ -5796,6 +5796,18 @@ private void DataGrid_LostFocus(object sender, RoutedEventArgs e)
             }
         }
 
+        private object GetFocusedElement()
+        {
+            if (TypeHelper.IsXamlRootAvailable && XamlRoot != null)
+            {
+                return FocusManager.GetFocusedElement(XamlRoot);
+            }
+            else
+            {
+                return FocusManager.GetFocusedElement();
+            }
+        }
+
         private void DataGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
         {
             if (e.Pointer.PointerDeviceType != PointerDeviceType.Touch)
@@ -6001,7 +6013,7 @@ private bool EndCellEdit(DataGridEditAction editAction, bool exitEditingMode, bo
 
                 // TODO: Figure out if we should restore a cached this.IsTabStop.
                 this.IsTabStop = true;
-                if (keepFocus && editingElement.ContainsFocusedElement())
+                if (keepFocus && editingElement.ContainsFocusedElement(this))
                 {
                     this.Focus(FocusState.Programmatic);
                 }
@@ -6240,7 +6252,7 @@ private void FlushCurrentCellChanged()
                 _previousAutomationFocusCoordinates = new DataGridCellCoordinates(this.CurrentCellCoordinates);
 
                 // If the DataGrid itself has focus, we want to move automation focus to the new current element
-                object focusedObject = FocusManager.GetFocusedElement();
+                object focusedObject = GetFocusedElement();
                 if (focusedObject == this && AutomationPeer.ListenerExists(AutomationEvents.AutomationFocusChanged))
                 {
                     peer.RaiseAutomationFocusChangedEvent(this.CurrentSlot, this.CurrentColumnIndex);
@@ -6295,7 +6307,7 @@ private bool FocusEditingCell(bool setFocus)
             DataGridCell dataGridCell = this.EditingRow.Cells[_editingColumnIndex];
             if (setFocus)
             {
-                if (dataGridCell.ContainsFocusedElement())
+                if (dataGridCell.ContainsFocusedElement(this))
                 {
                     success = true;
                 }
@@ -7058,7 +7070,7 @@ private bool ProcessEnterKey(bool shift, bool ctrl)
                 }
 
                 // If Enter was used by a TextBox, we shouldn't handle the key
-                TextBox focusedTextBox = FocusManager.GetFocusedElement() as TextBox;
+                TextBox focusedTextBox = GetFocusedElement() as TextBox;
                 if (focusedTextBox != null && focusedTextBox.AcceptsReturn)
                 {
                     return false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/Extensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/Extensions.cs
@@ -68,10 +68,23 @@ internal static bool ContainsChild(this DependencyObject element, DependencyObje
         /// the currently focused element, which is updated synchronously.
         /// </summary>
         /// <param name="element">Parent DependencyObject</param>
+        /// <param name="uiElement">Parent UIElement. Used to query the element's XamlRoot.</param>
         /// <returns>True if the currently focused element is within the visual tree of the parent</returns>
-        internal static bool ContainsFocusedElement(this DependencyObject element)
+        internal static bool ContainsFocusedElement(this DependencyObject element, UIElement uiElement)
         {
-            return (element == null) ? false : element.ContainsChild(FocusManager.GetFocusedElement() as DependencyObject);
+            return (element == null) ? false : element.ContainsChild(GetFocusedElement(uiElement) as DependencyObject);
+        }
+
+        private static object GetFocusedElement(UIElement uiElement)
+        {
+            if (TypeHelper.IsXamlRootAvailable && uiElement.XamlRoot != null)
+            {
+                return FocusManager.GetFocusedElement(uiElement.XamlRoot);
+            }
+            else
+            {
+                return FocusManager.GetFocusedElement();
+            }
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
@@ -257,7 +257,17 @@ private static void OnCarouselPropertyChanged(DependencyObject d, DependencyProp
 
         private void FocusContainerFromIndex(int index)
         {
-            var oldElem = FocusManager.GetFocusedElement() as ContentControl;
+            ContentControl oldElem;
+
+            if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
+            {
+                oldElem = FocusManager.GetFocusedElement(XamlRoot) as ContentControl;
+            }
+            else
+            {
+                oldElem = FocusManager.GetFocusedElement() as ContentControl;
+            }
+
             var newElem = ContainerFromIndex(index) as ContentControl;
 
             if (oldElem == newElem)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
@@ -119,7 +119,15 @@ private void CoreWindow_KeyDown(CoreWindow sender, KeyEventArgs args)
 
         private void Menu_LostFocus(object sender, RoutedEventArgs e)
         {
-            var menuItem = FocusManager.GetFocusedElement() as MenuItem;
+            MenuItem menuItem;
+            if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
+            {
+                menuItem = FocusManager.GetFocusedElement(XamlRoot) as MenuItem;
+            }
+            else
+            {
+                menuItem = FocusManager.GetFocusedElement() as MenuItem;
+            }
 
             if (AllowTooltip)
             {
@@ -145,7 +153,14 @@ private void Dispatcher_AcceleratorKeyActivated(CoreDispatcher sender, Accelerat
                 return;
             }
 
-            _lastFocusElement = FocusManager.GetFocusedElement() as Control;
+            if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
+            {
+                _lastFocusElement = FocusManager.GetFocusedElement(XamlRoot) as Control;
+            }
+            else
+            {
+                _lastFocusElement = FocusManager.GetFocusedElement() as Control;
+            }
 
             if (args.KeyStatus.ScanCode != AltScanCode)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs
@@ -30,7 +30,15 @@ public partial class Menu
 
         private static bool NavigateUsingKeyboard(KeyEventArgs args, Menu menu, Orientation orientation)
         {
-            var element = FocusManager.GetFocusedElement();
+            object element;
+            if (ControlHelpers.IsXamlRootAvailable && menu.XamlRoot != null)
+            {
+                element = FocusManager.GetFocusedElement(menu.XamlRoot);
+            }
+            else
+            {
+                element = FocusManager.GetFocusedElement();
+            }
 
             if (element is MenuFlyoutPresenter &&
                 ((args.VirtualKey == VirtualKey.Down) ||
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
@@ -538,7 +538,7 @@ private void OrbitView_KeyDown(object sender, KeyRoutedEventArgs e)
             if (e.Key == Windows.System.VirtualKey.Left)
             {
                 e.Handled = true;
-                if (FocusManager.GetFocusedElement() is ContentControl currentEllement)
+                if (GetFocusedElement() is ContentControl currentEllement)
                 {
                     var index = ItemsPanelRoot.Children.IndexOf(currentEllement);
                     var nextIndex = (index + 1) % Items.Count;
@@ -549,7 +549,7 @@ private void OrbitView_KeyDown(object sender, KeyRoutedEventArgs e)
             else if (e.Key == Windows.System.VirtualKey.Right)
             {
                 e.Handled = true;
-                if (FocusManager.GetFocusedElement() is ContentControl currentEllement)
+                if (GetFocusedElement() is ContentControl currentEllement)
                 {
                     var index = ItemsPanelRoot.Children.IndexOf(currentEllement);
                     var nextIndex = index > 0 ? index - 1 : Items.Count - 1;
@@ -559,6 +559,18 @@ private void OrbitView_KeyDown(object sender, KeyRoutedEventArgs e)
             }
         }
 
+        private object GetFocusedElement()
+        {
+            if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
+            {
+                return FocusManager.GetFocusedElement(XamlRoot);
+            }
+            else
+            {
+                return FocusManager.GetFocusedElement();
+            }
+        }
+
         private void OnItemClicked(OrbitViewItem item)
         {
             if (IsItemClickEnabled)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
@@ -87,13 +87,20 @@ public async void OpenLinkCreator(ToolbarButton button)
             selection.GetText(Windows.UI.Text.TextGetOptions.FormatRtf, out string labeltext);
             labelBox.Document.SetText(Windows.UI.Text.TextSetOptions.FormatRtf, labeltext);
 
-            var result = await new ContentDialog
+            var contentDialog = new ContentDialog
             {
                 Title = StringExtensions.GetLocalized("TextToolbarStrings_CreateLinkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                 Content = contentPanel,
                 PrimaryButtonText = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
                 SecondaryButtonText = StringExtensions.GetLocalized("TextToolbarStrings_CancelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
-            }.ShowAsync();
+            };
+
+            if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
+            {
+                contentDialog.XamlRoot = button.XamlRoot;
+            }
+
+            var result = await contentDialog.ShowAsync();
 
             if (result == ContentDialogResult.Primary)
             {
@@ -107,7 +114,7 @@ public async void OpenLinkCreator(ToolbarButton button)
 
                 if (string.IsNullOrWhiteSpace(linkText))
                 {
-                    ShowContentDialog(warningLabel, linkInvalidLabel, okLabel);
+                    ShowContentDialog(warningLabel, linkInvalidLabel, okLabel, button);
                     return;
                 }
 
@@ -116,7 +123,7 @@ public async void OpenLinkCreator(ToolbarButton button)
                     var wellFormed = Uri.IsWellFormedUriString(linkText, relativeBox?.IsChecked == true ? UriKind.RelativeOrAbsolute : UriKind.Absolute);
                     if (!wellFormed)
                     {
-                        ShowContentDialog(warningLabel, linkInvalidLabel, okLabel);
+                        ShowContentDialog(warningLabel, linkInvalidLabel, okLabel, button);
                         return;
                     }
                 }
@@ -125,20 +132,21 @@ public async void OpenLinkCreator(ToolbarButton button)
             }
         }
 
-        /// <summary>
-        /// Opens a <see cref="ContentDialog"/> to notify the user about empty and whitespace inputs.
-        /// </summary>
-        /// <param name="title">The <see cref="string"/> </param>
-        /// <param name="content">The <see cref="string"/> of the ContentDialog</param>
-        /// <param name="primaryButtonText">The <see cref="string"/> content of the primary button</param>
-        private async void ShowContentDialog(string title, string content, string primaryButtonText)
+        private async void ShowContentDialog(string title, string content, string primaryButtonText, ToolbarButton button)
         {
-            await new ContentDialog
+            var contentDialog = new ContentDialog
             {
                 Title = title,
                 Content = content,
                 PrimaryButtonText = primaryButtonText
-            }.ShowAsync();
+            };
+
+            if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
+            {
+                contentDialog.XamlRoot = button.XamlRoot;
+            }
+
+            await contentDialog.ShowAsync();
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs
@@ -33,7 +33,7 @@ private enum MoveDirection
         private bool MoveFocusAndSelection(MoveDirection direction)
         {
             bool retVal = false;
-            var currentContainerItem = FocusManager.GetFocusedElement() as TokenizingTextBoxItem;
+            var currentContainerItem = GetCurrentContainerItem();
 
             if (currentContainerItem != null)
             {
@@ -123,6 +123,18 @@ private bool MoveFocusAndSelection(MoveDirection direction)
             return retVal;
         }
 
+        private TokenizingTextBoxItem GetCurrentContainerItem()
+        {
+            if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
+            {
+                return FocusManager.GetFocusedElement(XamlRoot) as TokenizingTextBoxItem;
+            }
+            else
+            {
+                return FocusManager.GetFocusedElement() as TokenizingTextBoxItem;
+            }
+        }
+
         internal void SelectAllTokensAndText()
         {
             _ = Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
@@ -245,7 +257,7 @@ private async void TokenizingTextBoxItem_ClearClicked(TokenizingTextBoxItem send
         /// <returns>async task</returns>
         internal async Task RemoveAllSelectedTokens()
         {
-            var currentContainerItem = FocusManager.GetFocusedElement() as TokenizingTextBoxItem;
+            var currentContainerItem = GetCurrentContainerItem();
 
             while (SelectedItems.Count > 0)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TextToolbar.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TextToolbar.cs
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TokenizingTextBox.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_TokenizingTextBox.cs

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,7 @@ internal class ApiInformationHelper`
`20`	`20`
`21`	`21`	`public static bool IsFallCreatorsUpdateOrAbove => (bool)(_isFallCreatorsUpdateOrAbove ??`
`22`	`22`	`(_isFallCreatorsUpdateOrAbove = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5)));`
	`23`	`+`
	`24`	`+ public static bool IsXamlRootAvailable { get; } = ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5730,7 +5730,7 @@ private void DataGrid_LostFocus(object sender, RoutedEventArgs e)`
`5730`	`5730`
`5731`	`5731`	`// Walk up the visual tree of the newly focused element`
`5732`	`5732`	`// to determine if focus is still within DataGrid.`
`5733`		`- object focusedObject = FocusManager.GetFocusedElement();`
	`5733`	`+ object focusedObject = GetFocusedElement();`
`5734`	`5734`	`DependencyObject focusedDependencyObject = focusedObject as DependencyObject;`
`5735`	`5735`
`5736`	`5736`	`while (focusedDependencyObject != null)`
`@@ -5796,6 +5796,18 @@ private void DataGrid_LostFocus(object sender, RoutedEventArgs e)`
`5796`	`5796`	`}`
`5797`	`5797`	`}`
`5798`	`5798`
	`5799`	`+ private object GetFocusedElement()`
	`5800`	`+ {`
	`5801`	`+ if (TypeHelper.IsXamlRootAvailable && XamlRoot != null)`
	`5802`	`+ {`
	`5803`	`+ return FocusManager.GetFocusedElement(XamlRoot);`
	`5804`	`+ }`
	`5805`	`+ else`
	`5806`	`+ {`
	`5807`	`+ return FocusManager.GetFocusedElement();`
	`5808`	`+ }`
	`5809`	`+ }`
	`5810`	`+`
`5799`	`5811`	`private void DataGrid_PointerEntered(object sender, PointerRoutedEventArgs e)`
`5800`	`5812`	`{`
`5801`	`5813`	`if (e.Pointer.PointerDeviceType != PointerDeviceType.Touch)`
`@@ -6001,7 +6013,7 @@ private bool EndCellEdit(DataGridEditAction editAction, bool exitEditingMode, bo`
`6001`	`6013`
`6002`	`6014`	`// TODO: Figure out if we should restore a cached this.IsTabStop.`
`6003`	`6015`	`this.IsTabStop = true;`
`6004`		`- if (keepFocus && editingElement.ContainsFocusedElement())`
	`6016`	`+ if (keepFocus && editingElement.ContainsFocusedElement(this))`
`6005`	`6017`	`{`
`6006`	`6018`	`this.Focus(FocusState.Programmatic);`
`6007`	`6019`	`}`
`@@ -6240,7 +6252,7 @@ private void FlushCurrentCellChanged()`
`6240`	`6252`	`_previousAutomationFocusCoordinates = new DataGridCellCoordinates(this.CurrentCellCoordinates);`
`6241`	`6253`
`6242`	`6254`	`// If the DataGrid itself has focus, we want to move automation focus to the new current element`
`6243`		`- object focusedObject = FocusManager.GetFocusedElement();`
	`6255`	`+ object focusedObject = GetFocusedElement();`
`6244`	`6256`	`if (focusedObject == this && AutomationPeer.ListenerExists(AutomationEvents.AutomationFocusChanged))`
`6245`	`6257`	`{`
`6246`	`6258`	`peer.RaiseAutomationFocusChangedEvent(this.CurrentSlot, this.CurrentColumnIndex);`
`@@ -6295,7 +6307,7 @@ private bool FocusEditingCell(bool setFocus)`
`6295`	`6307`	`DataGridCell dataGridCell = this.EditingRow.Cells[_editingColumnIndex];`
`6296`	`6308`	`if (setFocus)`
`6297`	`6309`	`{`
`6298`		`- if (dataGridCell.ContainsFocusedElement())`
	`6310`	`+ if (dataGridCell.ContainsFocusedElement(this))`
`6299`	`6311`	`{`
`6300`	`6312`	`success = true;`
`6301`	`6313`	`}`
`@@ -7058,7 +7070,7 @@ private bool ProcessEnterKey(bool shift, bool ctrl)`
`7058`	`7070`	`}`
`7059`	`7071`
`7060`	`7072`	`// If Enter was used by a TextBox, we shouldn't handle the key`
`7061`		`- TextBox focusedTextBox = FocusManager.GetFocusedElement() as TextBox;`
	`7073`	`+ TextBox focusedTextBox = GetFocusedElement() as TextBox;`
`7062`	`7074`	`if (focusedTextBox != null && focusedTextBox.AcceptsReturn)`
`7063`	`7075`	`{`
`7064`	`7076`	`return false;`