[KBM] Reuse Text action for Expand trigger instead of separate ReplaceWith case

When Text Expand trigger is selected, select the existing "Insert text"
ComboBoxItem, override its label/icon to "Replace with", and disable the
ComboBox. This avoids dynamic ComboBox item replacement that broke the
SwitchPresenter binding.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Yu Leng (from Dev Box)

src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UnifiedMappingControl.xaml

@@ -230,10 +230,10 @@
                         <TextBlock x:Uid="ActionType_KeyOrShortcut_Text" />
                     </StackPanel>
                 </ComboBoxItem>
-                <ComboBoxItem x:Uid="ActionType_Text" Tag="Text">
+                <ComboBoxItem x:Name="ActionTypeTextItem" x:Uid="ActionType_Text" Tag="Text">
                     <StackPanel Orientation="Horizontal" Spacing="8">
-                        <FontIcon FontSize="14" Glyph="&#xE8D2;" />
-                        <TextBlock x:Uid="ActionType_Text_Text" />
+                        <FontIcon x:Name="ActionTypeTextIcon" FontSize="14" Glyph="&#xE8D2;" />
+                        <TextBlock x:Name="ActionTypeTextLabel" x:Uid="ActionType_Text_Text" />
                     </StackPanel>
                 </ComboBoxItem>
                 <ComboBoxItem x:Uid="ActionType_OpenUrl" Tag="OpenUrl">
@@ -409,20 +409,7 @@
                         </ComboBox>
                     </StackPanel>
                 </tkcontrols:Case>
-                <!--  Replace With Action (for Expand trigger)  -->
-                <tkcontrols:Case Value="ReplaceWith">
-                    <TextBox
-                        x:Name="ExpandedTextBox"
-                        x:Uid="ExpandedTextBox"
-                        MinHeight="120"
-                        MaxHeight="240"
-                        AcceptsReturn="True"
-                        Background="{ThemeResource TextControlBackgroundFocused}"
-                        BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
-                        GotFocus="ExpandedTextBox_GotFocus"
-                        TextChanged="ExpandedTextBox_TextChanged"
-                        TextWrapping="Wrap" />
-                </tkcontrols:Case>
+                <!--  Replace With uses the Text case above with label override  -->
                 <!--  Mouse Click Action (Placeholder)  -->
                 <tkcontrols:Case Value="MouseClick">
                     <TextBlock

src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UnifiedMappingControl.xaml.cs

@@ -44,14 +44,14 @@ public sealed partial class UnifiedMappingControl : UserControl, IDisposable, IK
         private bool _urlPathDirty;
         private bool _programPathDirty;
         private bool _expandAbbreviationDirty;
-        private bool _expandedTextDirty;
 
         // Expand trigger key tracking
         private string _expandTriggerKey = "Space";
         private bool _isCapturingExpandTriggerKey;
 
-        // Saved action type items for restoring when switching away from Expand trigger
-        private List<object>? _savedActionTypeItems;
+        // Saved label/icon for restoring "Text" action item after Expand mode
+        private string? _savedTextLabel;
+        private string? _savedTextIconGlyph;
 
         public bool AllowChords { get; set; } = true;
 
@@ -134,6 +134,12 @@ public ActionType CurrentActionType
         {
             get
             {
+                // When in Expand trigger mode, the action is always ReplaceWith
+                if (CurrentTriggerType == TriggerType.Expand)
+                {
+                    return ActionType.ReplaceWith;
+                }
+
                 if (ActionTypeComboBox?.SelectedItem is ComboBoxItem item)
                 {
                     return item.Tag?.ToString() switch
@@ -142,7 +148,6 @@ public ActionType CurrentActionType
                         "OpenUrl" => ActionType.OpenUrl,
                         "OpenApp" => ActionType.OpenApp,
                         "MouseClick" => ActionType.MouseClick,
-                        "ReplaceWith" => ActionType.ReplaceWith,
                         _ => ActionType.KeyOrShortcut,
                     };
                 }
@@ -611,7 +616,7 @@ public bool IsInputComplete()
             if (CurrentTriggerType == TriggerType.Expand)
             {
                 return !string.IsNullOrWhiteSpace(ExpandAbbreviationBox?.Text)
-                    && !string.IsNullOrWhiteSpace(ExpandedTextBox?.Text);
+                    && !string.IsNullOrWhiteSpace(TextContentBox?.Text);
             }
 
             // Trigger keys are always required for other trigger types
@@ -872,7 +877,7 @@ private void UpdateInlineValidation()
                         return;
                     }
 
-                    if (ExpandedTextBox != null && _expandedTextDirty && string.IsNullOrWhiteSpace(ExpandedTextBox.Text))
+                    if (TextContentBox != null && _textContentDirty && string.IsNullOrWhiteSpace(TextContentBox.Text))
                     {
                         ShowValidationErrorFromType(ValidationErrorType.EmptyExpandedText);
                         return;
@@ -901,7 +906,6 @@ public void Reset()
             _urlPathDirty = false;
             _programPathDirty = false;
             _expandAbbreviationDirty = false;
-            _expandedTextDirty = false;
 
             // Reset expand state
             _expandTriggerKey = "Space";
@@ -912,10 +916,7 @@ public void Reset()
                 ExpandAbbreviationBox.Text = string.Empty;
             }
 
-            if (ExpandedTextBox != null)
-            {
-                ExpandedTextBox.Text = string.Empty;
-            }
+            // TextContentBox is shared with expand mode; cleared below with other action fields
 
             if (ExpandTriggerKeyVisual != null)
             {
@@ -1139,18 +1140,6 @@ private void ExpandTriggerKeyToggleBtn_Unchecked(object sender, RoutedEventArgs
             }
         }
 
-        private void ExpandedTextBox_GotFocus(object sender, RoutedEventArgs e)
-        {
-            CleanupKeyboardHook();
-            UncheckAllToggleButtons();
-        }
-
-        private void ExpandedTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            _expandedTextDirty = true;
-            RaiseValidationStateChanged();
-        }
-
         private void HideAppSpecific()
         {
             if (AppSpecificCheckBox != null)
@@ -1174,71 +1163,51 @@ private void ShowAppSpecific()
 
         private void SwitchActionTypeToReplaceWith()
         {
-            if (ActionTypeComboBox == null)
+            if (ActionTypeComboBox == null || ActionTypeTextItem == null)
             {
                 return;
             }
 
-            // Save current items if not already saved
-            if (_savedActionTypeItems == null)
-            {
-                _savedActionTypeItems = new List<object>();
-                foreach (var actionItem in ActionTypeComboBox.Items)
-                {
-                    _savedActionTypeItems.Add(actionItem);
-                }
-            }
-
-            // Replace with single "Replace with" item
-            ActionTypeComboBox.Items.Clear();
+            // Select the "Text" action item and override its label to "Replace with"
+            ActionTypeComboBox.SelectedItem = ActionTypeTextItem;
+            ActionTypeComboBox.IsEnabled = false;
 
             var resourceLoader = new ResourceLoader();
-            var replaceWithItem = new ComboBoxItem
+            if (ActionTypeTextLabel != null)
             {
-                Tag = "ReplaceWith",
-                Content = new StackPanel
-                {
-                    Orientation = Microsoft.UI.Xaml.Controls.Orientation.Horizontal,
-                    Spacing = 8,
-                    Children =
-                    {
-                        new FontIcon { Glyph = "\uE8C8", FontSize = 14 },
-                        new TextBlock { Text = resourceLoader.GetString("ActionType_ReplaceWith_Text/Text") },
-                    },
-                },
-            };
-
-            ActionTypeComboBox.Items.Add(replaceWithItem);
-            ActionTypeComboBox.SelectedIndex = 0;
-            ActionTypeComboBox.IsEnabled = false;
+                _savedTextLabel = ActionTypeTextLabel.Text;
+                ActionTypeTextLabel.Text = resourceLoader.GetString("ActionType_ReplaceWith_Text/Text");
+            }
 
-            // Manually update SwitchPresenter since programmatic ComboBox item changes
-            // may not reliably trigger the SelectedItem.Tag binding update in WinUI.
-            ActionSwitchPresenter.Value = "ReplaceWith";
+            if (ActionTypeTextIcon != null)
+            {
+                _savedTextIconGlyph = ActionTypeTextIcon.Glyph;
+                ActionTypeTextIcon.Glyph = "\uE8C8";
+            }
         }
 
         private void RestoreNormalActionTypes()
         {
-            if (ActionTypeComboBox == null || _savedActionTypeItems == null)
+            if (ActionTypeComboBox == null)
             {
                 return;
             }
 
-            ActionTypeComboBox.Items.Clear();
-            foreach (var actionItem in _savedActionTypeItems)
+            // Restore original label and icon on the "Text" action item
+            if (ActionTypeTextLabel != null && _savedTextLabel != null)
             {
-                ActionTypeComboBox.Items.Add(actionItem);
+                ActionTypeTextLabel.Text = _savedTextLabel;
+                _savedTextLabel = null;
             }
 
-            _savedActionTypeItems = null;
-            ActionTypeComboBox.SelectedIndex = 0;
-            ActionTypeComboBox.IsEnabled = true;
-
-            // Manually sync SwitchPresenter with the restored first item's Tag.
-            if (ActionTypeComboBox.SelectedItem is ComboBoxItem selectedItem && selectedItem.Tag is string tag)
+            if (ActionTypeTextIcon != null && _savedTextIconGlyph != null)
             {
-                ActionSwitchPresenter.Value = tag;
+                ActionTypeTextIcon.Glyph = _savedTextIconGlyph;
+                _savedTextIconGlyph = null;
             }
+
+            ActionTypeComboBox.SelectedIndex = 0;
+            ActionTypeComboBox.IsEnabled = true;
         }
 
         #endregion
@@ -1249,7 +1218,7 @@ private void RestoreNormalActionTypes()
 
         public string GetExpandTriggerKey() => _expandTriggerKey;
 
-        public string GetExpandedText() => ExpandedTextBox?.Text ?? string.Empty;
+        public string GetExpandedText() => TextContentBox?.Text ?? string.Empty;
 
         #endregion
 
@@ -1274,9 +1243,9 @@ public void SetExpandTriggerKey(string triggerKey)
 
         public void SetExpandedText(string text)
         {
-            if (ExpandedTextBox != null)
+            if (TextContentBox != null)
             {
-                ExpandedTextBox.Text = text;
+                TextContentBox.Text = text;
             }
         }