Provide global setting to use ATS for nextTab and prevTab

doc/cascadia/profiles.schema.json

@@ -63,7 +63,7 @@
         "setTabColor",
         "splitPane",
         "switchToTab",
-        "tabSwitcher",
+        "tabSearch",
         "toggleAlwaysOnTop",
         "toggleFocusMode",
         "toggleFullscreen",
@@ -423,22 +423,6 @@
       ],
       "required": [ "index" ]
     },
-    "TabSwitcherAction": {
-      "description": "Arguments corresponding to a Tab Switcher Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "tabSwitcher" },
-            "anchorKey": {
-              "$ref": "#/definitions/AnchorKey",
-              "default": null,
-              "description": "If provided, the tab switcher will stay open as long as the anchor key is held down. The anchor key should be part of the keybinding that opens the switcher."
-            }
-          }
-        }
-      ]
-    },
     "Keybinding": {
       "additionalProperties": false,
       "properties": {
@@ -460,7 +444,6 @@
               { "$ref": "#/definitions/WtAction" },
               { "$ref": "#/definitions/CloseOtherTabsAction" },
               { "$ref": "#/definitions/CloseTabsAfterAction" },
-              { "$ref": "#/definitions/TabSwitcherAction" },
               { "type": "null" }
             ]
         },
@@ -631,6 +614,11 @@
           "default": true,
           "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"
+        },
+        "useTabSwitcher": {
+          "default": true,
+          "description": "When set to \"true\", the \"nextTab\" and \"prevTab\" commands will use the tab switcher UI.",
+          "type": "boolean"
         }
       },
       "required": [

src/cascadia/TerminalApp/ActionAndArgs.cpp

@@ -37,9 +37,8 @@ static constexpr std::string_view SendInputKey{ "sendInput" };
 static constexpr std::string_view SetColorSchemeKey{ "setColorScheme" };
 static constexpr std::string_view SetTabColorKey{ "setTabColor" };
 static constexpr std::string_view SplitPaneKey{ "splitPane" };
-static constexpr std::string_view SwitchtoTabKey{ "switchToTab" };
 static constexpr std::string_view SwitchToTabKey{ "switchToTab" };
-static constexpr std::string_view TabSwitcherKey{ "tabSwitcher" };
+static constexpr std::string_view TabSearchKey{ "tabSearch" };
 static constexpr std::string_view ToggleAlwaysOnTopKey{ "toggleAlwaysOnTop" };
 static constexpr std::string_view ToggleCommandPaletteKey{ "commandPalette" };
 static constexpr std::string_view ToggleFocusModeKey{ "toggleFocusMode" };
@@ -96,7 +95,7 @@ namespace winrt::TerminalApp::implementation
         { SetTabColorKey, ShortcutAction::SetTabColor },
         { SplitPaneKey, ShortcutAction::SplitPane },
         { SwitchToTabKey, ShortcutAction::SwitchToTab },
-        { TabSwitcherKey, ShortcutAction::ToggleTabSwitcher },
+        { TabSearchKey, ShortcutAction::TabSearch },
         { ToggleAlwaysOnTopKey, ShortcutAction::ToggleAlwaysOnTop },
         { ToggleCommandPaletteKey, ShortcutAction::ToggleCommandPalette },
         { ToggleFocusModeKey, ShortcutAction::ToggleFocusMode },
@@ -130,7 +129,6 @@ namespace winrt::TerminalApp::implementation
         { ShortcutAction::SetTabColor, SetTabColorArgs::FromJson },
         { ShortcutAction::SplitPane, SplitPaneArgs::FromJson },
         { ShortcutAction::SwitchToTab, SwitchToTabArgs::FromJson },
-        { ShortcutAction::ToggleTabSwitcher, ToggleTabSwitcherArgs::FromJson },
 
         { ShortcutAction::Invalid, nullptr },
     };
@@ -280,6 +278,7 @@ namespace winrt::TerminalApp::implementation
                 { ShortcutAction::SetTabColor, RS_(L"ResetTabColorCommandKey") },
                 { ShortcutAction::SplitPane, RS_(L"SplitPaneCommandKey") },
                 { ShortcutAction::SwitchToTab, RS_(L"SwitchToTabCommandKey") },
+                { ShortcutAction::TabSearch, RS_(L"TabSearchCommandKey") },
                 { ShortcutAction::ToggleAlwaysOnTop, RS_(L"ToggleAlwaysOnTopCommandKey") },
                 { ShortcutAction::ToggleCommandPalette, RS_(L"ToggleCommandPaletteCommandKey") },
                 { ShortcutAction::ToggleFocusMode, RS_(L"ToggleFocusModeCommandKey") },

src/cascadia/TerminalApp/ActionArgs.cpp

@@ -20,7 +20,6 @@
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 #include "ExecuteCommandlineArgs.g.cpp"
-#include "ToggleTabSwitcherArgs.g.h"
 
 #include "Utils.h"
 
@@ -355,22 +354,4 @@ namespace winrt::TerminalApp::implementation
                         _Index)
         };
     }
-
-    winrt::hstring ToggleTabSwitcherArgs::GenerateName() const
-    {
-        // If there's an anchor key set, don't generate a name so that
-        // it won't show up in the command palette. Only an unanchored
-        // tab switcher should be able to be toggled from the palette.
-        // TODO: GH#7179 - once this goes in, make sure to hide the
-        // anchor mode command that was given a name in settings.
-        if (_AnchorKey != Windows::System::VirtualKey::None)
-        {
-            return L"";
-        }
-        else
-        {
-            return RS_(L"ToggleTabSwitcherCommandKey");
-        }
-    }
-
 }

src/cascadia/TerminalApp/ActionArgs.h

@@ -22,7 +22,6 @@
 #include "ExecuteCommandlineArgs.g.h"
 #include "CloseOtherTabsArgs.g.h"
 #include "CloseTabsAfterArgs.g.h"
-#include "ToggleTabSwitcherArgs.g.h"
 
 #include "../../cascadia/inc/cppwinrt_utils.h"
 #include "Utils.h"
@@ -548,34 +547,6 @@ namespace winrt::TerminalApp::implementation
             return { *args, {} };
         }
     };
-
-    struct ToggleTabSwitcherArgs : public ToggleTabSwitcherArgsT<ToggleTabSwitcherArgs>
-    {
-        ToggleTabSwitcherArgs() = default;
-        GETSET_PROPERTY(Windows::System::VirtualKey, AnchorKey, Windows::System::VirtualKey::None);
-
-        static constexpr std::string_view AnchorJsonKey{ "anchorKey" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<ToggleTabSwitcherArgs>();
-            if (otherAsUs)
-            {
-                return otherAsUs->_AnchorKey == _AnchorKey;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<ToggleTabSwitcherArgs>();
-            JsonUtils::GetValueForKey(json, AnchorJsonKey, args->_AnchorKey);
-            return { *args, {} };
-        }
-    };
 }
 
 namespace winrt::TerminalApp::factory_implementation

src/cascadia/TerminalApp/ActionArgs.idl

@@ -141,9 +141,4 @@ namespace TerminalApp
     {
         UInt32 Index { get; };
     };
-
-    [default_interface] runtimeclass ToggleTabSwitcherArgs : IActionArgs
-    {
-        Windows.System.VirtualKey AnchorKey { get; };
-    };
 }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -456,27 +456,15 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void TerminalPage::_HandleToggleTabSwitcher(const IInspectable& /*sender*/,
-                                                const TerminalApp::ActionEventArgs& args)
+    void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
+                                            const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::ToggleTabSwitcherArgs>())
-        {
-            auto anchorKey = realArgs.AnchorKey();
+        auto opt = _GetFocusedTabIndex();
+        uint32_t startIdx = opt.value_or(0);
 
-            auto opt = _GetFocusedTabIndex();
-            uint32_t startIdx = opt ? *opt : 0;
+        CommandPalette().EnableTabSwitcherMode(true, startIdx);
+        CommandPalette().Visibility(Visibility::Visible);
 
-            if (anchorKey != VirtualKey::None)
-            {
-                // TODO: GH#7178 - delta should also have the option of being -1, in the case when
-                // a user decides to open the tab switcher going to the prev tab.
-                int delta = 1;
-                startIdx = (startIdx + _tabs.Size() + delta) % _tabs.Size();
-            }
-
-            CommandPalette().EnableTabSwitcherMode(anchorKey, startIdx);
-            CommandPalette().Visibility(Visibility::Visible);
-        }
         args.Handled(true);
     }
 }

src/cascadia/TerminalApp/AppLogic.cpp

@@ -938,6 +938,13 @@ namespace winrt::TerminalApp::implementation
                 if (auto focusedElement{ focusedObject.try_as<Windows::UI::Xaml::FrameworkElement>() })
                 {
                     focusedObject = focusedElement.Parent();
+
+                    // Parent() seems to return null when the focusedElement is created from an ItemTemplate.
+                    // Use the VisualTreeHelper's GetParent as a fallback.
+                    if (!focusedObject)
+                    {
+                        focusedObject = winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetParent(focusedElement);
+                    }
                 }
                 else
                 {