[KBM] Fix Text Expand enable/disable toggle not working

EnableShortcut, DisableShortcut, and HandleShortcutDelete did not
recognize ExpandMapping, falling through to incorrect single-key or
multi-key branches. Add explicit ExpandMapping handling that calls
AddExpandMapping/DeleteExpandMapping on the engine config.

Also add DeleteExpandMapping C++ interop (matches by abbreviation +
app name).

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

Author: Yu Leng (from Dev Box)

src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.cpp

@@ -696,6 +696,32 @@ bool GetShortcutRemapByType(void* config, int operationType, int index, Shortcut
         return true;
     }
 
+    bool DeleteExpandMapping(void* config, const wchar_t* abbreviation, const wchar_t* targetApp)
+    {
+        auto mappingConfig = static_cast<MappingConfiguration*>(config);
+        if (!abbreviation)
+        {
+            return false;
+        }
+
+        std::wstring abbrev = abbreviation;
+        std::wstring app = targetApp ? targetApp : L"";
+
+        auto& mappings = mappingConfig->expandMappings;
+        auto it = std::remove_if(mappings.begin(), mappings.end(), [&](const ExpandMapping& m) {
+            return _wcsicmp(m.abbreviation.c_str(), abbrev.c_str()) == 0 &&
+                   _wcsicmp(m.appName.c_str(), app.c_str()) == 0;
+        });
+
+        if (it != mappings.end())
+        {
+            mappings.erase(it, mappings.end());
+            return true;
+        }
+
+        return false;
+    }
+
     // Function to delete a shortcut remapping
     bool DeleteShortcutRemap(void* config, const wchar_t* originalKeys, const wchar_t* targetApp)
     {

src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.h

@@ -80,6 +80,7 @@ extern "C"
     __declspec(dllexport) bool AreShortcutsEqual(const wchar_t* lShort, const wchar_t* rShort);
 
     __declspec(dllexport) bool AddExpandMapping(void* config, const wchar_t* abbreviation, int triggerKey, const wchar_t* expandedText, const wchar_t* targetApp);
+    __declspec(dllexport) bool DeleteExpandMapping(void* config, const wchar_t* abbreviation, const wchar_t* targetApp);
 
     __declspec(dllexport) bool DeleteSingleKeyRemap(void* config, int originalKey);
     __declspec(dllexport) bool DeleteSingleKeyToTextRemap(void* config, int originalKey);

src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardManagerInterop.cs

@@ -94,6 +94,13 @@ internal static extern bool AddExpandMapping(
             [MarshalAs(UnmanagedType.LPWStr)] string expandedText,
             [MarshalAs(UnmanagedType.LPWStr)] string targetApp);
 
+        [DllImport(DllName, CallingConvention = Convention, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool DeleteExpandMapping(
+            IntPtr config,
+            [MarshalAs(UnmanagedType.LPWStr)] string abbreviation,
+            [MarshalAs(UnmanagedType.LPWStr)] string targetApp);
+
         // Delete Mapping Functions
         [DllImport(DllName, CallingConvention = Convention)]
         [return: MarshalAs(UnmanagedType.Bool)]

src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardMappingService.cs

@@ -243,6 +243,11 @@ public bool AddExpandMapping(string abbreviation, int triggerKey, string expande
             return KeyboardManagerInterop.AddExpandMapping(_configHandle, abbreviation, triggerKey, expandedText, targetApp);
         }
 
+        public bool DeleteExpandMapping(string abbreviation, string targetApp)
+        {
+            return KeyboardManagerInterop.DeleteExpandMapping(_configHandle, abbreviation, targetApp);
+        }
+
         public bool SaveSettings()
         {
             return KeyboardManagerInterop.SaveMappingSettings(_configHandle);

src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/MainPage.xaml.cs

@@ -691,6 +691,19 @@ private void HandleRemappingDelete(Remapping remapping)
 
         private void HandleShortcutDelete(IToggleableShortcut shortcut)
         {
+            if (shortcut is ExpandMapping)
+            {
+                ShortcutKeyMapping skm = SettingsManager.EditorSettings.ShortcutSettingsDictionary[shortcut.Id].Shortcut;
+                if (shortcut.IsActive)
+                {
+                    _mappingService!.DeleteExpandMapping(skm.OriginalKeys, skm.TargetApp);
+                    _mappingService.SaveSettings();
+                }
+
+                SettingsManager.RemoveShortcutKeyMappingFromSettings(shortcut.Id);
+                return;
+            }
+
             bool deleted = shortcut.Shortcut.Count == 1
                 ? DeleteSingleKeyToTextMapping(shortcut.Shortcut[0]) // Remapping has its own handler, single key will always be text mapping
                 : DeleteMultiKeyShortcut(shortcut);
@@ -747,14 +760,34 @@ private void EnableShortcut(IToggleableShortcut shortcut)
                 return;
             }
 
+            if (shortcut is ExpandMapping expandMapping)
+            {
+                ShortcutKeyMapping skm = SettingsManager.EditorSettings.ShortcutSettingsDictionary[shortcut.Id].Shortcut;
+                int triggerKeyVk = KeyboardManagerInterop.GetKeyCodeFromName(skm.TargetKeys);
+                if (triggerKeyVk == 0)
+                {
+                    triggerKeyVk = 0x20;
+                }
+
+                bool saved = _mappingService!.AddExpandMapping(skm.OriginalKeys, triggerKeyVk, skm.TargetText, skm.TargetApp);
+                if (saved)
+                {
+                    shortcut.IsActive = true;
+                    SettingsManager.ToggleShortcutKeyMappingActiveState(shortcut.Id);
+                    _mappingService.SaveSettings();
+                }
+
+                return;
+            }
+
             ShortcutKeyMapping shortcutKeyMapping = SettingsManager.EditorSettings.ShortcutSettingsDictionary[shortcut.Id].Shortcut;
-            bool saved = shortcut.Shortcut.Count == 1
+            bool saved2 = shortcut.Shortcut.Count == 1
                 ? _mappingService!.AddSingleKeyToTextMapping(_mappingService.GetKeyCodeFromName(shortcut.Shortcut[0]), shortcutKeyMapping.TargetText)
                 : shortcutKeyMapping.OperationType == ShortcutOperationType.RemapText
                     ? _mappingService!.AddShortcutMapping(shortcutKeyMapping.OriginalKeys, shortcutKeyMapping.TargetText, operationType: ShortcutOperationType.RemapText)
                     : _mappingService!.AddShortcutMapping(shortcutKeyMapping);
 
-            if (saved)
+            if (saved2)
             {
                 shortcut.IsActive = true;
                 SettingsManager.ToggleShortcutKeyMappingActiveState(shortcut.Id);
@@ -772,11 +805,25 @@ private void DisableShortcut(IToggleableShortcut shortcut)
                 return;
             }
 
-            bool deleted = shortcut.Shortcut.Count == 1
+            if (shortcut is ExpandMapping expandMapping)
+            {
+                ShortcutKeyMapping skm = SettingsManager.EditorSettings.ShortcutSettingsDictionary[shortcut.Id].Shortcut;
+                bool deleted = _mappingService!.DeleteExpandMapping(skm.OriginalKeys, skm.TargetApp);
+                if (deleted)
+                {
+                    shortcut.IsActive = false;
+                    SettingsManager.ToggleShortcutKeyMappingActiveState(shortcut.Id);
+                    _mappingService.SaveSettings();
+                }
+
+                return;
+            }
+
+            bool deleted2 = shortcut.Shortcut.Count == 1
                 ? DeleteSingleKeyToTextMapping(shortcut.Shortcut[0])
                 : DeleteMultiKeyMapping(shortcut.Shortcut, shortcut.AppName);
 
-            if (deleted)
+            if (deleted2)
             {
                 shortcut.IsActive = false;
                 SettingsManager.ToggleShortcutKeyMappingActiveState(shortcut.Id);