From e5d95d71e04888cdd14c2d629552557901bf3031 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 17 Jun 2026 18:08:39 -0700
Subject: [PATCH] polish accessibility

---
 .../ActionsViewModel.cpp                      |  5 --
 .../TerminalSettingsEditor/ActionsViewModel.h |  1 -
 .../ActionsViewModel.idl                      |  1 -
 .../TerminalSettingsEditor/EditAction.cpp     |  4 ++
 .../TerminalSettingsEditor/EditAction.xaml    | 54 ++++++++++---------
 5 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
index 10a16edf7c..32912178cd 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
@@ -295,11 +295,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return RS_(L"Actions_ShortcutAction/Text");
     }
 
-    winrt::hstring CommandViewModel::AdditionalArgumentsControlAutomationPropName() const
-    {
-        return RS_(L"Actions_Arguments/Text");
-    }
-
     void CommandViewModel::_RegisterKeyChordVMEvents(Editor::KeyChordViewModel kcVM)
     {
         const auto id = ID();
diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
index d945e45744..d7ff2cc2f0 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
@@ -94,7 +94,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // UIA text
         winrt::hstring ActionNameTextBoxAutomationPropName() const;
         winrt::hstring ShortcutActionComboBoxAutomationPropName() const;
-        winrt::hstring AdditionalArgumentsControlAutomationPropName() const;
 
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeRequested;
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeNamesRequested;
diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
index ab8e1befa5..de83b7d91c 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
@@ -76,7 +76,6 @@ namespace Microsoft.Terminal.Settings.Editor
         // UI side (edit command page, automation property names)
         String ActionNameTextBoxAutomationPropName { get; };
         String ShortcutActionComboBoxAutomationPropName { get; };
-        String AdditionalArgumentsControlAutomationPropName { get; };
     }
 
     runtimeclass ArgWrapper : Windows.UI.Xaml.Data.INotifyPropertyChanged
diff --git a/src/cascadia/TerminalSettingsEditor/EditAction.cpp b/src/cascadia/TerminalSettingsEditor/EditAction.cpp
index 24c922149f..67986e0491 100644
--- a/src/cascadia/TerminalSettingsEditor/EditAction.cpp
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.cpp
@@ -71,6 +71,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditAction::OnNavigatedTo(const NavigationEventArgs& e)
     {
+        Automation::AutomationProperties::SetName(KeyBindingsContainer(), RS_(L"EditAction_KeyBindings/Text"));
+        Automation::AutomationProperties::SetName(AdditionalCustomizationsContainer(), RS_(L"EditAction_AdditionalCustomizations/Text"));
+        Automation::AutomationProperties::SetName(NewKeyBinding(), RS_(L"EditAction_NewKeyBinding/Header"));
+
         const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
         _ViewModel = args.ViewModel().as<Editor::CommandViewModel>();
         _propagateWindowRootRevoker = _ViewModel.PropagateWindowRootRequested(
diff --git a/src/cascadia/TerminalSettingsEditor/EditAction.xaml b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
index efe1d66ec5..1984186967 100644
--- a/src/cascadia/TerminalSettingsEditor/EditAction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
@@ -472,34 +472,36 @@
                 </ItemsControl>
             </StackPanel>
 
-            <TextBlock x:Uid="EditAction_AdditionalCustomizations"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Additional customizations  -->
+            <StackPanel x:Name="AdditionalCustomizationsContainer">
+                <TextBlock x:Uid="EditAction_AdditionalCustomizations"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-            <!--  Action name  -->
-            <local:SettingsCard x:Name="ActionName"
-                                x:Uid="EditAction_ActionName"
-                                Margin="0,0,0,4">
-                <TextBox x:Name="CommandNameTextBox"
-                         MinWidth="248"
-                         AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
-                         PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
-                         Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
-            </local:SettingsCard>
+                <!--  Action name  -->
+                <local:SettingsCard x:Name="ActionName"
+                                    x:Uid="EditAction_ActionName"
+                                    Margin="0,0,0,4">
+                    <TextBox x:Name="CommandNameTextBox"
+                             MinWidth="248"
+                             AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
+                             PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
+                             Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
+                </local:SettingsCard>
 
-            <!--  Action argument controls  -->
-            <ItemsControl HorizontalAlignment="Stretch"
-                          HorizontalContentAlignment="Stretch"
-                          AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
-                          IsTabStop="False"
-                          ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
-                          ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel HorizontalAlignment="Stretch"
-                                    Spacing="4" />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-            </ItemsControl>
+                <!--  Action argument controls  -->
+                <ItemsControl HorizontalAlignment="Stretch"
+                              HorizontalContentAlignment="Stretch"
+                              IsTabStop="False"
+                              ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
+                              ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel HorizontalAlignment="Stretch"
+                                        Spacing="4" />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                </ItemsControl>
+            </StackPanel>
 
             <!--  Delete command button  -->
             <Button x:Name="DeleteCommand"