Fix tab navigation for editor and focus editor when the focused element is deleted

miroiu · miroiu · commit d043d35f9a4f · 2025-06-13T23:14:11.000+03:00
diff --git a/Examples/Nodify.Shared/Controls/EditableTextBlock.cs b/Examples/Nodify.Shared/Controls/EditableTextBlock.cs
@@ -99,6 +99,13 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
+            if (TextBox != null)
+            {
+                TextBox.LostFocus -= OnLostFocus;
+                TextBox.LostKeyboardFocus -= OnLostFocus;
+                TextBox.IsVisibleChanged -= OnTextBoxVisiblityChanged;
+            }
+
             TextBox = GetTemplateChild(ElementTextBox) as TextBox;
 
             if (TextBox != null)
@@ -163,7 +170,7 @@ protected override void OnKeyDown(KeyEventArgs e)
                 IsEditing = false;
             }
 
-            if(e.Key == Key.Enter && IsFocused && !IsEditing)
+            if (e.Key == Key.Enter && IsFocused && !IsEditing)
             {
                 IsEditing = true;
             }
diff --git a/Nodify/Connections/ConnectionContainer.cs b/Nodify/Connections/ConnectionContainer.cs
@@ -3,6 +3,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace Nodify
 {
@@ -88,11 +89,25 @@ static ConnectionContainer()
             FocusVisualStyleProperty.OverrideMetadata(typeof(ConnectionContainer), new FrameworkPropertyMetadata(new Style()));
         }
 
-        internal ConnectionContainer(ConnectionsMultiSelector selector)
+        public ConnectionContainer(ConnectionsMultiSelector selector)
         {
             Selector = selector;
         }
 
+        protected override void OnVisualParentChanged(DependencyObject oldParent)
+        {
+            if (VisualTreeHelper.GetParent(this) == null && IsKeyboardFocusWithin)
+            {
+                base.OnVisualParentChanged(oldParent);
+
+                Selector.Editor?.Focus();
+            }
+            else
+            {
+                base.OnVisualParentChanged(oldParent);
+            }
+        }
+
         protected override void OnIsKeyboardFocusedChanged(DependencyPropertyChangedEventArgs e)
         {
             if (Connection is BaseConnection baseConnection)
diff --git a/Nodify/Connections/ConnectionsMultiSelector.cs b/Nodify/Connections/ConnectionsMultiSelector.cs
@@ -84,7 +84,7 @@ static ConnectionsMultiSelector()
 
             KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(ConnectionsMultiSelector), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
             KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(typeof(ConnectionsMultiSelector), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
-            FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(ConnectionsMultiSelector), new FrameworkPropertyMetadata(BoxValue.True));
+            //FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(ConnectionsMultiSelector), new FrameworkPropertyMetadata(BoxValue.True));
         }
 
         public ConnectionsMultiSelector()
@@ -95,6 +95,7 @@ public ConnectionsMultiSelector()
         #region Keyboard Navigation
 
         KeyboardNavigationLayerId IKeyboardNavigationLayer.Id { get; } = KeyboardNavigationLayerId.Connections;
+        object? IKeyboardNavigationLayer.LastFocusedElement => _focusNavigator.LastFocusedElement;
 
         private readonly StatefulFocusNavigator<ConnectionContainer> _focusNavigator;
 
@@ -103,6 +104,11 @@ bool IKeyboardNavigationLayer.TryMoveFocus(TraversalRequest request)
             return _focusNavigator.TryMoveFocus(request, TryFindContainerToFocus);
         }
 
+        bool IKeyboardNavigationLayer.TryRestoreFocus()
+        {
+            return _focusNavigator.TryRestoreFocus();
+        }
+
         private bool TryFindContainerToFocus(TraversalRequest request, out ConnectionContainer? containerToFocus)
         {
             containerToFocus = null;
diff --git a/Nodify/Containers/ItemContainer.cs b/Nodify/Containers/ItemContainer.cs
@@ -276,6 +276,8 @@ static ItemContainer()
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(typeof(ItemContainer)));
             FocusableProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(BoxValue.True));
 
+            KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(BoxValue.True));
+            //KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(KeyboardNavigationMode.Contained));
             //KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(KeyboardNavigationMode.Local));
             //KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(KeyboardNavigationMode.Contained));
             //FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(ItemContainer), new FrameworkPropertyMetadata(BoxValue.True));
@@ -293,6 +295,20 @@ public ItemContainer(NodifyEditor editor)
             InputProcessor.AddSharedHandlers(this);
         }
 
+        protected override void OnVisualParentChanged(DependencyObject oldParent)
+        {
+            if (VisualTreeHelper.GetParent(this) == null && IsKeyboardFocusWithin)
+            {
+                base.OnVisualParentChanged(oldParent);
+
+                Editor.Focus();
+            }
+            else
+            {
+                base.OnVisualParentChanged(oldParent);
+            }
+        }
+
         /// <inheritdoc />
         protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
         {
diff --git a/Nodify/Editor/NodifyEditor.KeyboardNavigation.cs b/Nodify/Editor/NodifyEditor.KeyboardNavigation.cs
@@ -11,6 +11,16 @@ namespace Nodify
 {
     public partial class NodifyEditor : IKeyboardNavigationLayer, IKeyboardNavigationLayerGroup
     {
+        /// <summary>
+        /// Gets or sets the default viewport edge offset applied when bringing an item into view as a result of keyboard focus. 
+        /// </summary>
+        public static double BringIntoViewEdgeOffset { get; set; } = 32d;
+
+        /// <summary>
+        /// Automatically focus first container on navigation layer change or editor focus.
+        /// </summary>
+        public static bool AutoFocusFirstElement { get; set; } = true;
+
         private readonly List<IKeyboardNavigationLayer> _navigationLayers = new List<IKeyboardNavigationLayer>();
         private IKeyboardNavigationLayer? _activeKeyboardNavigationLayer;
         private IKeyboardNavigationLayer KeyboardNavigationLayer => this;
@@ -19,6 +29,7 @@ public partial class NodifyEditor : IKeyboardNavigationLayer, IKeyboardNavigatio
         IKeyboardNavigationLayer? IKeyboardNavigationLayerGroup.ActiveLayer => _activeKeyboardNavigationLayer;
 
         KeyboardNavigationLayerId IKeyboardNavigationLayer.Id => KeyboardNavigationLayerId.Nodes;
+        object? IKeyboardNavigationLayer.LastFocusedElement => _focusNavigator.LastFocusedElement;
 
         int IReadOnlyCollection<IKeyboardNavigationLayer>.Count => _navigationLayers.Count;
 
@@ -33,6 +44,11 @@ bool IKeyboardNavigationLayer.TryMoveFocus(TraversalRequest request)
             return _focusNavigator.TryMoveFocus(request, TryFindContainerToFocus);
         }
 
+        bool IKeyboardNavigationLayer.TryRestoreFocus()
+        {
+            return _focusNavigator.TryRestoreFocus();
+        }
+
         private bool TryFindContainerToFocus(TraversalRequest request, out ItemContainer? containerToFocus)
         {
             containerToFocus = null;
@@ -79,10 +95,38 @@ void IKeyboardNavigationLayer.OnDeactivate()
         {
         }
 
+        protected override void OnGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
+        {
+            bool isKeyboardInitiated = InputManager.Current.MostRecentInputDevice is KeyboardDevice;
+            var activeKbdLayer = KeyboardNavigationLayerGroup.ActiveLayer;
+
+            if (isKeyboardInitiated && activeKbdLayer != null)
+            {
+                bool isFocusComingFromOutside = e.OldFocus is null || e.OldFocus is DependencyObject dpo && !IsAncestorOf(dpo);
+
+                if (isFocusComingFromOutside && activeKbdLayer.TryRestoreFocus())
+                {
+                    e.Handled = true;
+                }
+                else if (activeKbdLayer.LastFocusedElement is null && e.NewFocus == this && AutoFocusFirstElement)
+                {
+                    e.Handled = activeKbdLayer.TryMoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+                }
+            }
+        }
+
         #endregion
 
         #region Layer Management
 
+        protected virtual void OnKeyboardNavigationLayerActivated(KeyboardNavigationLayerId layerId)
+        {
+            if (AutoFocusFirstElement && !KeyboardNavigationLayerGroup.ActiveLayer!.TryRestoreFocus())
+            {
+                KeyboardNavigationLayerGroup.ActiveLayer.TryMoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+            }
+        }
+
         bool IKeyboardNavigationLayerGroup.RegisterLayer(IKeyboardNavigationLayer layer)
         {
             if (_navigationLayers.Any(l => l.Id == layer.Id))
@@ -120,6 +164,7 @@ bool IKeyboardNavigationLayerGroup.ActivateLayer(KeyboardNavigationLayerId layer
                 _activeKeyboardNavigationLayer?.OnDeactivate();
                 _activeKeyboardNavigationLayer = layer;
                 _activeKeyboardNavigationLayer.OnActivate();
+                OnKeyboardNavigationLayerActivated(layer.Id);
                 Debug.WriteLine($"Activated {_activeKeyboardNavigationLayer.GetType().Name} as a keyboard navigation layer in {GetType().Name}");
                 ActiveLayerChanged?.Invoke(layerId);
                 return true;
diff --git a/Nodify/Editor/NodifyEditor.cs b/Nodify/Editor/NodifyEditor.cs
@@ -502,11 +502,6 @@ public ICommand? RemoveConnectionCommand
         /// </summary>
         public static double FitToScreenExtentMargin { get; set; } = 30;
 
-        /// <summary>
-        /// Gets or sets the default viewport edge offset applied when bringing an item into view as a result of keyboard focus. 
-        /// </summary>
-        public static double BringIntoViewEdgeOffset { get; set; } = 32d;
-
         /// <summary>
         /// Gets or sets the maximum distance, in pixels, that the mouse can move before suppressing certain mouse actions. 
         /// This is useful for suppressing actions like showing a <see cref="ContextMenu"/> if the mouse has moved significantly.
@@ -557,9 +552,10 @@ static NodifyEditor()
             DefaultStyleKeyProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(typeof(NodifyEditor)));
             FocusableProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(BoxValue.True));
 
-            KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
+            KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
+            KeyboardNavigation.ControlTabNavigationProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
             KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
-            FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(BoxValue.True));
+            //FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(NodifyEditor), new FrameworkPropertyMetadata(BoxValue.True));
 
             EditorCommands.RegisterCommandBindings<NodifyEditor>();
         }
@@ -583,8 +579,8 @@ public NodifyEditor()
 
             InputProcessor.AddSharedHandlers(this);
 
-            Unloaded += OnEditorUnloaded; 
-            
+            Unloaded += OnEditorUnloaded;
+
             _focusNavigator = new StatefulFocusNavigator<ItemContainer>(target => BringIntoView(target.Element.Bounds, BringIntoViewEdgeOffset));
         }
 
diff --git a/Nodify/Editor/States/KeyboardNavigation.cs b/Nodify/Editor/States/KeyboardNavigation.cs
@@ -13,7 +13,6 @@ public KeyboardNavigation(NodifyEditor element) : base(element)
             {
             }
 
-            // TODO: If focus is within, do not allow escaping focus trap unless the escape gesture is performed. (some keys like Space or System Keys could try to escape)
             protected override void OnKeyDown(KeyEventArgs e)
             {
                 double cellSize = Element.GridCellSize;
@@ -71,6 +70,7 @@ protected override void OnKeyUp(KeyEventArgs e)
                         e.Handled = true;
                     }
                     // TODO: How to get the selected connections count without a hard reference to the connections multi selector?
+                    // This currently assumes we have a binding to the SelectedConnectionsProperty dependency property
                     else if (Element.SelectedConnections?.Count > 0 && ActiveKeyboardNavigationLayer?.Id == KeyboardNavigationLayerId.Connections)
                     {
                         Element.UnselectAllConnections();
@@ -94,7 +94,6 @@ private bool CanDragSelection()
                 return ActiveKeyboardNavigationLayer?.Id == KeyboardNavigationLayerId.Nodes && Element.SelectedContainersCount > 0;
             }
 
-            // TODO: Allow for extensibility because connections can be custom
             private static bool IsEditorControl(object originalSource)
             {
                 return originalSource is NodifyEditor || originalSource is ItemContainer || originalSource is Connector || originalSource is ConnectionContainer;
diff --git a/Nodify/Interactivity/KeyboardNavigation/DirectionalFocusNavigator.cs b/Nodify/Interactivity/KeyboardNavigation/DirectionalFocusNavigator.cs
@@ -64,9 +64,9 @@ public DirectionalFocusNavigator(IEnumerable<IKeyboardFocusTarget<TElement>> ava
             return best;
         }
 
-        private static IKeyboardFocusTarget<TElement>[] FindCandidatesLinearly(IKeyboardFocusTarget<TElement> currentContainer, TraversalRequest request)
+        private IKeyboardFocusTarget<TElement>[] FindCandidatesLinearly(IKeyboardFocusTarget<TElement> currentContainer, TraversalRequest request)
         {
-            var nextTarget = new LinearFocusNavigator<TElement>().FindNextFocusTarget(currentContainer, request);
+            var nextTarget = new LinearFocusNavigator<TElement>(_availableTargets).FindNextFocusTarget(currentContainer, request);
             return nextTarget is null ? Array.Empty<IKeyboardFocusTarget<TElement>>() : new[] { nextTarget };
         }
     }
diff --git a/Nodify/Interactivity/KeyboardNavigation/IKeyboardNavigationLayer.cs b/Nodify/Interactivity/KeyboardNavigation/IKeyboardNavigationLayer.cs
@@ -32,8 +32,10 @@ public interface IKeyboardNavigationLayerGroup : IReadOnlyCollection<IKeyboardNa
     public interface IKeyboardNavigationLayer
     {
         KeyboardNavigationLayerId Id { get; }
+        object? LastFocusedElement { get; }
 
         bool TryMoveFocus(TraversalRequest request);
+        bool TryRestoreFocus();
 
         void OnActivate();
         void OnDeactivate();
diff --git a/Nodify/Interactivity/KeyboardNavigation/StatefulFocusNavigator.cs b/Nodify/Interactivity/KeyboardNavigation/StatefulFocusNavigator.cs
@@ -16,6 +16,8 @@ internal class StatefulFocusNavigator<TElement>
 
         private readonly Action<IKeyboardFocusTarget<TElement>> _onFocus;
 
+        public TElement? LastFocusedElement => _lastFocusedContainer.TryGetTarget(out var target) ? target : null;
+
         public StatefulFocusNavigator(Action<IKeyboardFocusTarget<TElement>> onFocus)
         {
             _onFocus = onFocus;
@@ -56,6 +58,7 @@ public bool TryRestoreFocus()
             if (_lastFocusedContainer.TryGetTarget(out var lastTarget) && lastTarget!.Focus())
             {
                 _onFocus.Invoke(lastTarget);
+                return true;
             }
 
             return false;
diff --git a/Nodify/Nodes/Node.cs b/Nodify/Nodes/Node.cs
@@ -173,7 +173,7 @@ static Node()
             FocusableProperty.OverrideMetadata(typeof(Node), new FrameworkPropertyMetadata(BoxValue.True));
 
             KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(Node), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
-            FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(Node), new FrameworkPropertyMetadata(BoxValue.True));
+            //FocusManager.IsFocusScopeProperty.OverrideMetadata(typeof(Node), new FrameworkPropertyMetadata(BoxValue.True));
         }
 
         public Node()
diff --git a/Nodify/Themes/Styles/ItemContainer.xaml b/Nodify/Themes/Styles/ItemContainer.xaml
@@ -34,8 +34,6 @@
                 Value="Orange" />
         <Setter Property="HighlightBrush"
                 Value="{StaticResource ItemContainer.HighlightBrush}" />
-        <Setter Property="KeyboardNavigation.IsTabStop"
-                Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:ItemContainer}">
diff --git a/Nodify/Themes/Styles/NodifyEditor.xaml b/Nodify/Themes/Styles/NodifyEditor.xaml
@@ -12,7 +12,8 @@
     </DataTemplate>
 
     <DataTemplate x:Key="PendingConnectionTemplate">
-        <local:PendingConnection IsTabStop="False" />
+        <local:PendingConnection IsTabStop="False"
+                                 IsHitTestVisible="False" />
     </DataTemplate>
 
     <Style x:Key="SelectionRectangleStyle"
@@ -50,8 +51,6 @@
                 Value="White" />
         <Setter Property="Background"
                 Value="#1E1E1E" />
-        <Setter Property="IsTabStop"
-                Value="False" />
         <Setter Property="EnableRealtimeSelection"
                 Value="True" />
         <Setter Property="DisplayConnectionsOnTop"
@@ -128,10 +127,10 @@
                             </Rectangle>
 
                             <Rectangle Style="{TemplateBinding PushedAreaStyle}"
-                                    RenderTransform="{Binding ViewportTransform, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource UnscaleTransformConverter}}"
-                                    Canvas.Top="{Binding PushedArea.Y, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Canvas.Left="{Binding PushedArea.X, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Visibility="{TemplateBinding IsPushingItems, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                       RenderTransform="{Binding ViewportTransform, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource UnscaleTransformConverter}}"
+                                       Canvas.Top="{Binding PushedArea.Y, RelativeSource={RelativeSource TemplatedParent}}"
+                                       Canvas.Left="{Binding PushedArea.X, RelativeSource={RelativeSource TemplatedParent}}"
+                                       Visibility="{TemplateBinding IsPushingItems, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <Rectangle.Width>
                                     <MultiBinding Converter="{StaticResource ScaleDoubleConverter}">
                                         <Binding Path="PushedArea.Width"

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,13 @@ public override void OnApplyTemplate()`
`99`	`99`	`{`
`100`	`100`	`base.OnApplyTemplate();`
`101`	`101`
	`102`	`+ if (TextBox != null)`
	`103`	`+ {`
	`104`	`+ TextBox.LostFocus -= OnLostFocus;`
	`105`	`+ TextBox.LostKeyboardFocus -= OnLostFocus;`
	`106`	`+ TextBox.IsVisibleChanged -= OnTextBoxVisiblityChanged;`
	`107`	`+ }`
	`108`	`+`
`102`	`109`	`TextBox = GetTemplateChild(ElementTextBox) as TextBox;`
`103`	`110`
`104`	`111`	`if (TextBox != null)`
`@@ -163,7 +170,7 @@ protected override void OnKeyDown(KeyEventArgs e)`
`163`	`170`	`IsEditing = false;`
`164`	`171`	`}`
`165`	`172`
`166`		`- if(e.Key == Key.Enter && IsFocused && !IsEditing)`
	`173`	`+ if (e.Key == Key.Enter && IsFocused && !IsEditing)`
`167`	`174`	`{`
`168`	`175`	`IsEditing = true;`
`169`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public KeyboardNavigation(NodifyEditor element) : base(element)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- // TODO: If focus is within, do not allow escaping focus trap unless the escape gesture is performed. (some keys like Space or System Keys could try to escape)`
`17`	`16`	`protected override void OnKeyDown(KeyEventArgs e)`
`18`	`17`	`{`
`19`	`18`	`double cellSize = Element.GridCellSize;`
`@@ -71,6 +70,7 @@ protected override void OnKeyUp(KeyEventArgs e)`
`71`	`70`	`e.Handled = true;`
`72`	`71`	`}`
`73`	`72`	`// TODO: How to get the selected connections count without a hard reference to the connections multi selector?`
	`73`	`+ // This currently assumes we have a binding to the SelectedConnectionsProperty dependency property`
`74`	`74`	`else if (Element.SelectedConnections?.Count > 0 && ActiveKeyboardNavigationLayer?.Id == KeyboardNavigationLayerId.Connections)`
`75`	`75`	`{`
`76`	`76`	`Element.UnselectAllConnections();`
`@@ -94,7 +94,6 @@ private bool CanDragSelection()`
`94`	`94`	`return ActiveKeyboardNavigationLayer?.Id == KeyboardNavigationLayerId.Nodes && Element.SelectedContainersCount > 0;`
`95`	`95`	`}`
`96`	`96`
`97`		`- // TODO: Allow for extensibility because connections can be custom`
`98`	`97`	`private static bool IsEditorControl(object originalSource)`
`99`	`98`	`{`
`100`	`99`	`return originalSource is NodifyEditor \|\| originalSource is ItemContainer \|\| originalSource is Connector \|\| originalSource is ConnectionContainer;`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ public DirectionalFocusNavigator(IEnumerable<IKeyboardFocusTarget<TElement>> ava`
`64`	`64`	`return best;`
`65`	`65`	`}`
`66`	`66`
`67`		`- private static IKeyboardFocusTarget<TElement>[] FindCandidatesLinearly(IKeyboardFocusTarget<TElement> currentContainer, TraversalRequest request)`
	`67`	`+ private IKeyboardFocusTarget<TElement>[] FindCandidatesLinearly(IKeyboardFocusTarget<TElement> currentContainer, TraversalRequest request)`
`68`	`68`	`{`
`69`		`- var nextTarget = new LinearFocusNavigator<TElement>().FindNextFocusTarget(currentContainer, request);`
	`69`	`+ var nextTarget = new LinearFocusNavigator<TElement>(_availableTargets).FindNextFocusTarget(currentContainer, request);`
`70`	`70`	`return nextTarget is null ? Array.Empty<IKeyboardFocusTarget<TElement>>() : new[] { nextTarget };`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,10 @@ public interface IKeyboardNavigationLayerGroup : IReadOnlyCollection<IKeyboardNa`
`32`	`32`	`public interface IKeyboardNavigationLayer`
`33`	`33`	`{`
`34`	`34`	`KeyboardNavigationLayerId Id { get; }`
	`35`	`+ object? LastFocusedElement { get; }`
`35`	`36`
`36`	`37`	`bool TryMoveFocus(TraversalRequest request);`
	`38`	`+ bool TryRestoreFocus();`
`37`	`39`
`38`	`40`	`void OnActivate();`
`39`	`41`	`void OnDeactivate();`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ internal class StatefulFocusNavigator<TElement>`
`16`	`16`
`17`	`17`	`private readonly Action<IKeyboardFocusTarget<TElement>> _onFocus;`
`18`	`18`
	`19`	`+ public TElement? LastFocusedElement => _lastFocusedContainer.TryGetTarget(out var target) ? target : null;`
	`20`	`+`
`19`	`21`	`public StatefulFocusNavigator(Action<IKeyboardFocusTarget<TElement>> onFocus)`
`20`	`22`	`{`
`21`	`23`	`_onFocus = onFocus;`
`@@ -56,6 +58,7 @@ public bool TryRestoreFocus()`
`56`	`58`	`if (_lastFocusedContainer.TryGetTarget(out var lastTarget) && lastTarget!.Focus())`
`57`	`59`	`{`
`58`	`60`	`_onFocus.Invoke(lastTarget);`
	`61`	`+ return true;`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`return false;`