FocusNavigationDirection => NavigationDirection

And added page up/down.

samples/XamlTestApplicationPcl/TestScrollable.cs

@@ -81,7 +81,7 @@ namespace XamlTestApplication
             throw new NotImplementedException();
         }
 
-        public IControl GetControlInDirection(FocusNavigationDirection direction, IControl from)
+        public IControl GetControlInDirection(NavigationDirection direction, IControl from)
         {
             throw new NotImplementedException();
         }

src/Avalonia.Controls/Canvas.cs

@@ -136,7 +136,7 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement from)
         {
             // TODO: Implement this
             return null;

src/Avalonia.Controls/Presenters/ItemVirtualizer.cs

@@ -156,7 +156,7 @@ namespace Avalonia.Controls.Presenters
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        public virtual IControl GetControlInDirection(FocusNavigationDirection direction, IControl from)
+        public virtual IControl GetControlInDirection(NavigationDirection direction, IControl from)
         {
             return null;
         }

src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs

@@ -142,7 +142,7 @@ namespace Avalonia.Controls.Presenters
             InvalidateScroll();
         }
 
-        public override IControl GetControlInDirection(FocusNavigationDirection direction, IControl from)
+        public override IControl GetControlInDirection(NavigationDirection direction, IControl from)
         {
             var generator = Owner.ItemContainerGenerator;
             var panel = VirtualizingPanel;
@@ -159,10 +159,10 @@ namespace Avalonia.Controls.Presenters
             {
                 switch (direction)
                 {
-                    case FocusNavigationDirection.Up:
+                    case NavigationDirection.Up:
                         newItemIndex = itemIndex - 1;
                         break;
-                    case FocusNavigationDirection.Down:
+                    case NavigationDirection.Down:
                         newItemIndex = itemIndex + 1;
                         break;
                 }
@@ -171,10 +171,10 @@ namespace Avalonia.Controls.Presenters
             {
                 switch (direction)
                 {
-                    case FocusNavigationDirection.Left:
+                    case NavigationDirection.Left:
                         newItemIndex = itemIndex - 1;
                         break;
-                    case FocusNavigationDirection.Right:
+                    case NavigationDirection.Right:
                         newItemIndex = itemIndex + 1;
                         break;
                 }

src/Avalonia.Controls/Presenters/ItemsPresenter.cs

@@ -81,7 +81,7 @@ namespace Avalonia.Controls.Presenters
         }
 
         /// <inheritdoc/>
-        IControl ILogicalScrollable.GetControlInDirection(FocusNavigationDirection direction, IControl from)
+        IControl ILogicalScrollable.GetControlInDirection(NavigationDirection direction, IControl from)
         {
             return _virtualizer?.GetControlInDirection(direction, from);
         }

src/Avalonia.Controls/Primitives/ILogicalScrollable.cs

@@ -64,6 +64,6 @@ namespace Avalonia.Controls.Primitives
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IControl GetControlInDirection(FocusNavigationDirection direction, IControl from);
+        IControl GetControlInDirection(NavigationDirection direction, IControl from);
     }
 }

src/Avalonia.Controls/StackPanel.cs

@@ -72,7 +72,7 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement from)
         {
             var fromControl = from as IControl;
             return (fromControl != null) ? GetControlInDirection(direction, fromControl) : null;
@@ -84,35 +84,35 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        protected virtual IInputElement GetControlInDirection(FocusNavigationDirection direction, IControl from)
+        protected virtual IInputElement GetControlInDirection(NavigationDirection direction, IControl from)
         {
             var horiz = Orientation == Orientation.Horizontal;
             int index = Children.IndexOf((IControl)from);
 
             switch (direction)
             {
-                case FocusNavigationDirection.First:
+                case NavigationDirection.First:
                     index = 0;
                     break;
-                case FocusNavigationDirection.Last:
+                case NavigationDirection.Last:
                     index = Children.Count - 1;
                     break;
-                case FocusNavigationDirection.Next:
+                case NavigationDirection.Next:
                     ++index;
                     break;
-                case FocusNavigationDirection.Previous:
+                case NavigationDirection.Previous:
                     --index;
                     break;
-                case FocusNavigationDirection.Left:
+                case NavigationDirection.Left:
                     index = horiz ? index - 1 : -1;
                     break;
-                case FocusNavigationDirection.Right:
+                case NavigationDirection.Right:
                     index = horiz ? index + 1 : -1;
                     break;
-                case FocusNavigationDirection.Up:
+                case NavigationDirection.Up:
                     index = horiz ? -1 : index - 1;
                     break;
-                case FocusNavigationDirection.Down:
+                case NavigationDirection.Down:
                     index = horiz ? -1 : index + 1;
                     break;
             }

src/Avalonia.Controls/VirtualizingStackPanel.cs

@@ -111,7 +111,7 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override IInputElement GetControlInDirection(FocusNavigationDirection direction, IControl from)
+        protected override IInputElement GetControlInDirection(NavigationDirection direction, IControl from)
         {
             var logicalScrollable = Parent as ILogicalScrollable;
             var fromControl = from as IControl;

src/Avalonia.Controls/WrapPanel.cs

@@ -48,35 +48,35 @@ namespace Avalonia.Controls
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement from)
         {
             var horiz = Orientation == Orientation.Horizontal;
             int index = Children.IndexOf((IControl)from);
 
             switch (direction)
             {
-                case FocusNavigationDirection.First:
+                case NavigationDirection.First:
                     index = 0;
                     break;
-                case FocusNavigationDirection.Last:
+                case NavigationDirection.Last:
                     index = Children.Count - 1;
                     break;
-                case FocusNavigationDirection.Next:
+                case NavigationDirection.Next:
                     ++index;
                     break;
-                case FocusNavigationDirection.Previous:
+                case NavigationDirection.Previous:
                     --index;
                     break;
-                case FocusNavigationDirection.Left:
+                case NavigationDirection.Left:
                     index = horiz ? index - 1 : -1;
                     break;
-                case FocusNavigationDirection.Right:
+                case NavigationDirection.Right:
                     index = horiz ? index + 1 : -1;
                     break;
-                case FocusNavigationDirection.Up:
+                case NavigationDirection.Up:
                     index = horiz ? -1 : index - 1;
                     break;
-                case FocusNavigationDirection.Down:
+                case NavigationDirection.Down:
                     index = horiz ? -1 : index + 1;
                     break;
             }

src/Avalonia.Input/Avalonia.Input.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -79,7 +79,7 @@
     <Compile Include="IMainMenu.cs" />
     <Compile Include="IAccessKeyHandler.cs" />
     <Compile Include="FocusManager.cs" />
-    <Compile Include="FocusNavigationDirection.cs" />
+    <Compile Include="NavigationDirection.cs" />
     <Compile Include="ICloseable.cs" />
     <Compile Include="IFocusManager.cs" />
     <Compile Include="IFocusScope.cs" />

src/Avalonia.Input/IKeyboardNavigationHandler.cs

@@ -25,7 +25,7 @@ namespace Avalonia.Input
         /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
         void Move(
             IInputElement element, 
-            FocusNavigationDirection direction,
+            NavigationDirection direction,
             InputModifiers modifiers = InputModifiers.None);
     }
 }

src/Avalonia.Input/INavigableContainer.cs

@@ -14,6 +14,6 @@ namespace Avalonia.Input
         /// <param name="direction">The movement direction.</param>
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
-        IInputElement GetControl(FocusNavigationDirection direction, IInputElement from);
+        IInputElement GetControl(NavigationDirection direction, IInputElement from);
     }
 }

src/Avalonia.Input/KeyboardNavigationHandler.cs

@@ -48,11 +48,11 @@ namespace Avalonia.Input
         /// </returns>
         public static IInputElement GetNext(
             IInputElement element,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             Contract.Requires<ArgumentNullException>(element != null);
 
-            if (direction == FocusNavigationDirection.Next || direction == FocusNavigationDirection.Previous)
+            if (direction == NavigationDirection.Next || direction == NavigationDirection.Previous)
             {
                 return TabNavigation.GetNextInTabOrder(element, direction);
             }
@@ -70,7 +70,7 @@ namespace Avalonia.Input
         /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
         public void Move(
             IInputElement element, 
-            FocusNavigationDirection direction,
+            NavigationDirection direction,
             InputModifiers modifiers = InputModifiers.None)
         {
             Contract.Requires<ArgumentNullException>(element != null);
@@ -79,8 +79,8 @@ namespace Avalonia.Input
 
             if (next != null)
             {
-                var method = direction == FocusNavigationDirection.Next ||
-                             direction == FocusNavigationDirection.Previous ?
+                var method = direction == NavigationDirection.Next ||
+                             direction == NavigationDirection.Previous ?
                              NavigationMethod.Tab : NavigationMethod.Directional;
                 FocusManager.Instance.Focus(next, method, modifiers);
             }
@@ -97,25 +97,25 @@ namespace Avalonia.Input
 
             if (current != null)
             {
-                FocusNavigationDirection? direction = null;
+                NavigationDirection? direction = null;
 
                 switch (e.Key)
                 {
                     case Key.Tab:
                         direction = (e.Modifiers & InputModifiers.Shift) == 0 ?
-                            FocusNavigationDirection.Next : FocusNavigationDirection.Previous;
+                            NavigationDirection.Next : NavigationDirection.Previous;
                         break;
                     case Key.Up:
-                        direction = FocusNavigationDirection.Up;
+                        direction = NavigationDirection.Up;
                         break;
                     case Key.Down:
-                        direction = FocusNavigationDirection.Down;
+                        direction = NavigationDirection.Down;
                         break;
                     case Key.Left:
-                        direction = FocusNavigationDirection.Left;
+                        direction = NavigationDirection.Left;
                         break;
                     case Key.Right:
-                        direction = FocusNavigationDirection.Right;
+                        direction = NavigationDirection.Right;
                         break;
                 }
 

src/Avalonia.Input/Navigation/DirectionalNavigation.cs

@@ -24,12 +24,12 @@ namespace Avalonia.Input.Navigation
         /// </returns>
         public static IInputElement GetNext(
             IInputElement element,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             Contract.Requires<ArgumentNullException>(element != null);
             Contract.Requires<ArgumentException>(
-                direction != FocusNavigationDirection.Next &&
-                direction != FocusNavigationDirection.Previous);
+                direction != NavigationDirection.Next &&
+                direction != NavigationDirection.Previous);
 
             var container = element.GetVisualParent<IInputElement>();
 
@@ -63,12 +63,12 @@ namespace Avalonia.Input.Navigation
         /// </summary>
         /// <param name="direction">The direction.</param>
         /// <returns>True if the direction is forward.</returns>
-        private static bool IsForward(FocusNavigationDirection direction)
+        private static bool IsForward(NavigationDirection direction)
         {
-            return direction == FocusNavigationDirection.Next ||
-                   direction == FocusNavigationDirection.Last ||
-                   direction == FocusNavigationDirection.Right ||
-                   direction == FocusNavigationDirection.Down;
+            return direction == NavigationDirection.Next ||
+                   direction == NavigationDirection.Last ||
+                   direction == NavigationDirection.Right ||
+                   direction == NavigationDirection.Down;
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ namespace Avalonia.Input.Navigation
         /// <param name="container">The element.</param>
         /// <param name="direction">The direction to search.</param>
         /// <returns>The element or null if not found.##</returns>
-        private static IInputElement GetFocusableDescendent(IInputElement container, FocusNavigationDirection direction)
+        private static IInputElement GetFocusableDescendent(IInputElement container, NavigationDirection direction)
         {
             return IsForward(direction) ?
                 GetFocusableDescendents(container).FirstOrDefault() :
@@ -121,9 +121,9 @@ namespace Avalonia.Input.Navigation
         private static IInputElement GetNextInContainer(
             IInputElement element,
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
-            if (direction == FocusNavigationDirection.Down)
+            if (direction == NavigationDirection.Down)
             {
                 var descendent = GetFocusableDescendents(element).FirstOrDefault();
 
@@ -156,7 +156,7 @@ namespace Avalonia.Input.Navigation
                     element = null;
                 }
 
-                if (element != null && direction == FocusNavigationDirection.Up)
+                if (element != null && direction == NavigationDirection.Up)
                 {
                     var descendent = GetFocusableDescendents(element).LastOrDefault();
 
@@ -180,7 +180,7 @@ namespace Avalonia.Input.Navigation
         /// <returns>The first element, or null if there are no more elements.</returns>
         private static IInputElement GetFirstInNextContainer(
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             var parent = container.GetVisualParent<IInputElement>();
             var isForward = IsForward(direction);

src/Avalonia.Input/Navigation/TabNavigation.cs

@@ -24,12 +24,12 @@ namespace Avalonia.Input.Navigation
         /// </returns>
         public static IInputElement GetNextInTabOrder(
             IInputElement element,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             Contract.Requires<ArgumentNullException>(element != null);
             Contract.Requires<ArgumentException>(
-                direction == FocusNavigationDirection.Next ||
-                direction == FocusNavigationDirection.Previous);
+                direction == NavigationDirection.Next ||
+                direction == NavigationDirection.Previous);
 
             var container = element.GetVisualParent<IInputElement>();
 
@@ -63,9 +63,9 @@ namespace Avalonia.Input.Navigation
         /// <param name="container">The element.</param>
         /// <param name="direction">The direction to search.</param>
         /// <returns>The element or null if not found.##</returns>
-        private static IInputElement GetFocusableDescendent(IInputElement container, FocusNavigationDirection direction)
+        private static IInputElement GetFocusableDescendent(IInputElement container, NavigationDirection direction)
         {
-            return direction == FocusNavigationDirection.Next ?
+            return direction == NavigationDirection.Next ?
                 GetFocusableDescendents(container).FirstOrDefault() :
                 GetFocusableDescendents(container).LastOrDefault();
         }
@@ -128,9 +128,9 @@ namespace Avalonia.Input.Navigation
         private static IInputElement GetNextInContainer(
             IInputElement element,
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
-            if (direction == FocusNavigationDirection.Next)
+            if (direction == NavigationDirection.Next)
             {
                 var descendent = GetFocusableDescendents(element).FirstOrDefault();
 
@@ -165,7 +165,7 @@ namespace Avalonia.Input.Navigation
                     element = null;
                 }
 
-                if (element != null && direction == FocusNavigationDirection.Previous)
+                if (element != null && direction == NavigationDirection.Previous)
                 {
                     var descendent = GetFocusableDescendents(element).LastOrDefault();
 
@@ -189,14 +189,14 @@ namespace Avalonia.Input.Navigation
         /// <returns>The first element, or null if there are no more elements.</returns>
         private static IInputElement GetFirstInNextContainer(
             IInputElement container,
-            FocusNavigationDirection direction)
+            NavigationDirection direction)
         {
             var parent = container.GetVisualParent<IInputElement>();
             IInputElement next = null;
 
             if (parent != null)
             {
-                if (direction == FocusNavigationDirection.Previous && parent.CanFocus())
+                if (direction == NavigationDirection.Previous && parent.CanFocus())
                 {
                     return parent;
                 }
@@ -204,7 +204,7 @@ namespace Avalonia.Input.Navigation
                 var siblings = parent.GetVisualChildren()
                     .OfType<IInputElement>()
                     .Where(FocusExtensions.CanFocusDescendents);
-                var sibling = direction == FocusNavigationDirection.Next ? 
+                var sibling = direction == NavigationDirection.Next ? 
                     siblings.SkipWhile(x => x != container).Skip(1).FirstOrDefault() : 
                     siblings.TakeWhile(x => x != container).LastOrDefault();
 
@@ -216,7 +216,7 @@ namespace Avalonia.Input.Navigation
                     }
                     else
                     {
-                        next = direction == FocusNavigationDirection.Next ?
+                        next = direction == NavigationDirection.Next ?
                             GetFocusableDescendents(sibling).FirstOrDefault() :
                             GetFocusableDescendents(sibling).LastOrDefault();
                     }
@@ -229,7 +229,7 @@ namespace Avalonia.Input.Navigation
             }
             else
             {
-                next = direction == FocusNavigationDirection.Next ?
+                next = direction == NavigationDirection.Next ?
                     GetFocusableDescendents(container).FirstOrDefault() :
                     GetFocusableDescendents(container).LastOrDefault();
             }

src/Avalonia.Input/FocusNavigationDirection.cs → src/Avalonia.Input/NavigationDirection.cs

@@ -4,9 +4,9 @@
 namespace Avalonia.Input
 {
     /// <summary>
-    /// Describes how focus should be moved.
+    /// Describes how focus should be moved by directional or tab keys.
     /// </summary>
-    public enum FocusNavigationDirection
+    public enum NavigationDirection
     {
         /// <summary>
         /// Move the focus to the next control in the tab order.
@@ -47,5 +47,15 @@ namespace Avalonia.Input
         /// Move the focus down.
         /// </summary>
         Down,
+
+        /// <summary>
+        /// Move the focus up a page.
+        /// </summary>
+        PageUp,
+
+        /// <summary>
+        /// Move the focus down a page.
+        /// </summary>
+        PageDown,
     }
 }

tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs

@@ -384,7 +384,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[5];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Down,
+                    NavigationDirection.Down,
                     from);
 
                 Assert.Same(target.Panel.Children[6], result);
@@ -401,7 +401,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[9];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Down,
+                    NavigationDirection.Down,
                     from);
 
                 Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
@@ -419,7 +419,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[8];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Down,
+                    NavigationDirection.Down,
                     from);
 
                 Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
@@ -438,7 +438,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[1];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Up,
+                    NavigationDirection.Up,
                     from);
 
                 Assert.Equal(new Vector(0, 10), ((ILogicalScrollable)target).Offset);
@@ -459,7 +459,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[5];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Right,
+                    NavigationDirection.Right,
                     from);
 
                 Assert.Same(target.Panel.Children[6], result);
@@ -476,7 +476,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[9];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Right,
+                    NavigationDirection.Right,
                     from);
 
                 Assert.Equal(new Vector(1, 0), ((ILogicalScrollable)target).Offset);
@@ -494,7 +494,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[8];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Right,
+                    NavigationDirection.Right,
                     from);
 
                 Assert.Equal(new Vector(1, 0), ((ILogicalScrollable)target).Offset);
@@ -513,7 +513,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 var from = target.Panel.Children[1];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
-                    FocusNavigationDirection.Left,
+                    NavigationDirection.Left,
                     from);
 
                 Assert.Equal(new Vector(10, 0), ((ILogicalScrollable)target).Offset);

tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs

@@ -353,7 +353,7 @@ namespace Avalonia.Controls.UnitTests
                 return new Size(150, 150);
             }
 
-            public IControl GetControlInDirection(FocusNavigationDirection direction, IControl from)
+            public IControl GetControlInDirection(NavigationDirection direction, IControl from)
             {
                 throw new NotImplementedException();
             }

tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs

@@ -161,9 +161,9 @@ namespace Avalonia.Controls.UnitTests
                 scrollable.Setup(x => x.IsLogicalScrollEnabled).Returns(true);
 
                 ((ISetLogicalParent)target).SetParent(presenter.Object);
-                ((INavigableContainer)target).GetControl(FocusNavigationDirection.Next, from);
+                ((INavigableContainer)target).GetControl(NavigationDirection.Next, from);
 
-                scrollable.Verify(x => x.GetControlInDirection(FocusNavigationDirection.Next, from));
+                scrollable.Verify(x => x.GetControlInDirection(NavigationDirection.Next, from));
             }
         }
     }

tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Arrows.cs

@@ -44,7 +44,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -83,7 +83,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -113,7 +113,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -158,7 +158,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -177,7 +177,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(top, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -224,7 +224,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -262,7 +262,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -300,7 +300,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -339,7 +339,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Equal(next, result);
         }
@@ -378,7 +378,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Null(result);
         }
@@ -416,7 +416,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Down);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Down);
 
             Assert.Null(result);
         }
@@ -455,7 +455,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -494,7 +494,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -525,7 +525,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -570,7 +570,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -615,7 +615,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -635,7 +635,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(top, result);
         }
@@ -674,7 +674,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -713,7 +713,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -752,7 +752,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Equal(next, result);
         }
@@ -790,7 +790,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Null(result);
         }
@@ -813,7 +813,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Up);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Up);
 
             Assert.Null(result);
         }

tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs

@@ -42,7 +42,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -79,7 +79,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -123,7 +123,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -152,7 +152,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -195,7 +195,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -213,7 +213,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(top, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(top, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -256,7 +256,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -294,7 +294,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -332,7 +332,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -370,7 +370,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -408,7 +408,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Null(result);
         }
@@ -446,7 +446,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -486,7 +486,7 @@ namespace Avalonia.Input.UnitTests
 
             KeyboardNavigation.SetTabOnceActiveElement(container, next);
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -524,7 +524,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -564,7 +564,7 @@ namespace Avalonia.Input.UnitTests
 
             KeyboardNavigation.SetTabOnceActiveElement(container, next);
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Next);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Next);
 
             Assert.Equal(next, result);
         }
@@ -601,7 +601,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -638,7 +638,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -667,7 +667,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -710,7 +710,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -753,7 +753,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -772,7 +772,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(top, result);
         }
@@ -810,7 +810,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -848,7 +848,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -886,7 +886,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -924,7 +924,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Null(result);
         }
@@ -962,7 +962,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -1002,7 +1002,7 @@ namespace Avalonia.Input.UnitTests
 
             KeyboardNavigation.SetTabOnceActiveElement(container, next);
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -1040,7 +1040,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Equal(next, result);
         }
@@ -1063,7 +1063,7 @@ namespace Avalonia.Input.UnitTests
                 }
             };
 
-            var result = KeyboardNavigationHandler.GetNext(current, FocusNavigationDirection.Previous);
+            var result = KeyboardNavigationHandler.GetNext(current, NavigationDirection.Previous);
 
             Assert.Null(result);
         }