Fix focus routing for mouse clicks and ClearContents in ScrollablePanel

- HandleClickFocus: use deep leaf (via _lastDeepFocusedControl) as
  FocusService target instead of the container, matching SwitchFocus
  behaviour. Previously, SetFocus(container) cleared the leaf child's
  HasFocus, causing it to ignore key events after a mouse click.

- ScrollablePanelControl.ClearContents: remove the SetFocus(false) call
  that fired when _hasFocus && !CanReceiveFocus (after children cleared).
  The panel now retains _hasFocus=true so focus is restored automatically
  when new controls are added.

- ScrollablePanelControl.AddControl: auto-focus the first focusable
  control added while the panel has focus but no focused child. Restores
  key routing after ClearContents without losing the panel's focus.

- HasActiveInteractiveContent: add a second fallback that checks
  _lastDeepFocusedControl.HasFocus when the container's HasFocus was
  cleared by FocusService.SetFocus(leaf) in NotifyControlGainedFocus.

Author: nickprotop

SharpConsoleUI/Controls/ScrollablePanelControl.cs

@@ -1000,6 +1000,18 @@ public void AddControl(IWindowControl control)
 		{
 			_children.Add(control);
 			control.Container = this;
+			// If the panel has focus but no focused child yet, focus the new control
+			// if it's focusable. Restores focus routing after ClearContents.
+			if (_hasFocus && _focusedChild == null &&
+				control.Visible &&
+				control is IFocusableControl fc && fc.CanReceiveFocus)
+			{
+				_focusedChild = control as IInteractiveControl;
+				if (control is IDirectionalFocusControl dfc)
+					dfc.SetFocusWithDirection(true, false);
+				else
+					fc.SetFocus(true, FocusReason.Programmatic);
+			}
 			Invalidate(true);
 		}
 
@@ -1052,9 +1064,6 @@ public void ClearContents()
 			}
 			_children.Clear();
 
-			if (_hasFocus && !CanReceiveFocus)
-				SetFocus(false, FocusReason.Programmatic);
-
 			Invalidate(true);
 		}
 

SharpConsoleUI/Window.cs

@@ -1813,6 +1813,7 @@ public void NotifyControlGainedFocus(IInteractiveControl control,
 			// is NOT in _interactiveContents, so isTopLevel would be false, but the leaf still needs tracking.
 			bool isIntermediateContainer = actualFocusedControl is Controls.IFocusTrackingContainer;
 			bool hasValidLeaf = _lastDeepFocusedControl is Controls.IFocusableControl leafFc && leafFc.HasFocus;
+			var prevDeep = _lastDeepFocusedControl;
 			if (!isIntermediateContainer)
 			{
 				// True leaf (ListControl, ButtonControl, etc.) — always prefer it

SharpConsoleUI/Windows/WindowEventDispatcher.cs

@@ -351,7 +351,13 @@ private void HandleClickFocus(IWindowControl? clickedControl)
 				if (newFocusTarget is IInteractiveControl interactive)
 				{
 					_window._lastFocusedControl = interactive;
-					_window.FocusService?.SetFocus(_window, interactive, FocusChangeReason.Mouse);
+					// Prefer the deep leaf tracked by NCGF (same pattern as SwitchFocus).
+					// SetFocus(container) would clear the leaf child's HasFocus, causing
+					// it to ignore key events even though it's the actual focused control.
+					var leafForFocus = (_window._lastDeepFocusedControl is Controls.IFocusableControl leafFc && leafFc.HasFocus)
+						? _window._lastDeepFocusedControl
+						: interactive;
+					_window.FocusService?.SetFocus(_window, leafForFocus, FocusChangeReason.Mouse);
 				}
 			}
 			else
@@ -625,6 +631,15 @@ public bool HasActiveInteractiveContent(out IInteractiveControl? interactiveCont
 				interactiveContent = _window._lastFocusedControl;
 			}
 
+			// Fallback: container's HasFocus was cleared by FocusService.SetFocus(leaf) in NCGF,
+			// but the leaf itself still has focus. Use _lastFocusedControl as the routing target.
+			if (interactiveContent == null &&
+				_window._lastFocusedControl != null && _window._lastFocusedControl.IsEnabled &&
+				_window._lastDeepFocusedControl is Controls.IFocusableControl deepFc && deepFc.HasFocus)
+			{
+				interactiveContent = _window._lastFocusedControl;
+			}
+
 			return interactiveContent != null;
 		}