Cleans up/Refactors View.Subviews (#3962)

* Subview clean up * New Add/Remove event pattern * Using Logging * cleanup * Subview -> SubView * Test code cleanup. Killed many warnings. * Fix tznind feedback * Refactored AllViewTest helpers * Moved keyboard tests to parallel * Moved mouse tests to parallel * Moved view tests to parallel * Test code cleanup. Killed many warnings. * dupe test * Some mouse tests can't run in parallel because MouseGrabView * Made SpinnerView more testable * Moved more tests * SubViews to IReadOnlyCollection<View> * SubViews to IReadOnlyCollection<View> 2 * scrollbar tests * shortcut tests * Use InternalSubViews vs. _subviews * Nuked View.IsAdded. Added View.SuperViewChanged. * API doc updats * Unit Test tweak * Unit Test tweak
2026-01-01 16:59:35 +01:00 · 2025-03-08 15:42:17 -07:00
parent 85cf6619ed
commit acb5979e6c
226 changed files with 7235 additions and 7188 deletions
--- a/Tests/UnitTestsParallelizable/View/Navigation/RestoreFocusTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/RestoreFocusTests.cs
@@ -0,0 +1,174 @@
+using UnitTests;
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.ViewTests;
+
+public class RestoreFocusTests () : TestsAllViews
+{
+    [Fact]
+    public void RestoreFocus_Restores ()
+    {
+        var view = new View
+        {
+            Id = "view",
+            CanFocus = true
+        };
+
+        var subView = new View
+        {
+            Id = "subView",
+            CanFocus = true
+        };
+
+        var subViewSubView1 = new View
+        {
+            Id = "subViewSubView1",
+            CanFocus = true
+        };
+
+        var subViewSubView2 = new View
+        {
+            Id = "subViewSubView2",
+            CanFocus = true
+        };
+
+        var subViewSubView3 = new View
+        {
+            Id = "subViewSubView3",
+            CanFocus = true
+        };
+        subView.Add (subViewSubView1, subViewSubView2, subViewSubView3);
+
+        view.Add (subView);
+
+        view.SetFocus ();
+        Assert.True (view.HasFocus);
+        Assert.True (subView.HasFocus);
+        Assert.Equal (subView, view.Focused);
+        Assert.True (subViewSubView1.HasFocus);
+        Assert.Equal (subViewSubView1, subView.Focused);
+
+        view.HasFocus = false;
+        Assert.False (view.HasFocus);
+        Assert.False (subView.HasFocus);
+        Assert.False (subViewSubView1.HasFocus);
+        Assert.False (subViewSubView2.HasFocus);
+        Assert.False (subViewSubView3.HasFocus);
+
+        view.RestoreFocus ();
+        Assert.True (view.HasFocus);
+        Assert.True (subView.HasFocus);
+        Assert.Equal (subView, view.Focused);
+        Assert.Equal (subViewSubView1, subView.Focused);
+        Assert.True (subViewSubView1.HasFocus);
+        Assert.False (subViewSubView2.HasFocus);
+        Assert.False (subViewSubView3.HasFocus);
+
+        subViewSubView2.SetFocus ();
+        Assert.True (view.HasFocus);
+        Assert.True (subView.HasFocus);
+        Assert.False (subViewSubView1.HasFocus);
+        Assert.True (subViewSubView2.HasFocus);
+        Assert.False (subViewSubView3.HasFocus);
+
+        view.HasFocus = false;
+        Assert.False (view.HasFocus);
+        Assert.False (subView.HasFocus);
+        Assert.False (subViewSubView1.HasFocus);
+        Assert.False (subViewSubView2.HasFocus);
+        Assert.False (subViewSubView3.HasFocus);
+
+        view.RestoreFocus ();
+        Assert.True (subView.HasFocus);
+        Assert.Equal (subView, view.Focused);
+        Assert.True (subViewSubView2.HasFocus);
+        Assert.Equal (subViewSubView2, subView.Focused);
+        Assert.False (subViewSubView1.HasFocus);
+        Assert.False (subViewSubView3.HasFocus);
+    }
+
+    [Fact]
+    public void RestoreFocus_Across_TabGroup ()
+    {
+        var top = new View
+        {
+            Id = "top",
+            CanFocus = true,
+            TabStop = TabBehavior.TabGroup
+        };
+
+        var tabGroup1 = new View
+        {
+            Id = "tabGroup1",
+            CanFocus = true,
+            TabStop = TabBehavior.TabGroup
+        };
+
+        var tabGroup1SubView1 = new View
+        {
+            Id = "tabGroup1SubView1",
+            CanFocus = true,
+            TabStop = TabBehavior.TabStop
+        };
+
+        var tabGroup1SubView2 = new View
+        {
+            Id = "tabGroup1SubView2",
+            CanFocus = true,
+            TabStop = TabBehavior.TabStop
+        };
+        tabGroup1.Add (tabGroup1SubView1, tabGroup1SubView2);
+
+        var tabGroup2 = new View
+        {
+            Id = "tabGroup2",
+            CanFocus = true,
+            TabStop = TabBehavior.TabGroup
+        };
+
+        var tabGroup2SubView1 = new View
+        {
+            Id = "tabGroup2SubView1",
+            CanFocus = true,
+            TabStop = TabBehavior.TabStop
+        };
+
+        var tabGroup2SubView2 = new View
+        {
+            Id = "tabGroup2SubView2",
+            CanFocus = true,
+            TabStop = TabBehavior.TabStop
+        };
+        tabGroup2.Add (tabGroup2SubView1, tabGroup2SubView2);
+
+        top.Add (tabGroup1, tabGroup2);
+
+        top.SetFocus ();
+        Assert.True (top.HasFocus);
+        Assert.Equal (tabGroup1, top.Focused);
+        Assert.Equal (tabGroup1SubView1, tabGroup1.Focused);
+
+        top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabGroup);
+        Assert.True (top.HasFocus);
+        Assert.Equal (tabGroup2, top.Focused);
+        Assert.Equal (tabGroup2SubView1, tabGroup2.Focused);
+
+        top.HasFocus = false;
+        Assert.False (top.HasFocus);
+
+        top.RestoreFocus ();
+        Assert.True (top.HasFocus);
+        Assert.Equal (tabGroup2, top.Focused);
+        Assert.Equal (tabGroup2SubView1, tabGroup2.Focused);
+
+        top.HasFocus = false;
+        Assert.False (top.HasFocus);
+
+        top.RestoreFocus ();
+        Assert.True (top.HasFocus);
+        Assert.Equal (tabGroup2, top.Focused);
+        Assert.Equal (tabGroup2SubView1, tabGroup2.Focused);
+
+
+    }
+}