From 14c82ac94dfc593d5a306906049ba8ea8ee04101 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Tue, 29 Apr 2025 10:52:30 +0100 Subject: [PATCH] Merge pull request #25149 from overleaf/ae-disable-toggletabfocusmode Disable toggleTabFocusMode GitOrigin-RevId: 7f9f9a1a57e6656a3bd03c1986ae6e4d3be71f84 --- .../frontend/js/features/source-editor/extensions/keymaps.ts | 2 ++ .../js/features/source-editor/extensions/shortcuts.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/web/frontend/js/features/source-editor/extensions/keymaps.ts b/services/web/frontend/js/features/source-editor/extensions/keymaps.ts index 7dfaee8d02..e90cf04fd7 100644 --- a/services/web/frontend/js/features/source-editor/extensions/keymaps.ts +++ b/services/web/frontend/js/features/source-editor/extensions/keymaps.ts @@ -20,6 +20,8 @@ const ignoredDefaultMacKeybindings = new Set([ // We replace these with our custom visual-line versions 'Mod-Backspace', 'Mod-Delete', + // Disable toggleTabFocusMode as it conflicts with ” on a Swedish keyboard layout + 'Shift-Alt-m', ]) const filteredDefaultKeymap = defaultKeymap.filter( diff --git a/services/web/frontend/js/features/source-editor/extensions/shortcuts.ts b/services/web/frontend/js/features/source-editor/extensions/shortcuts.ts index e293f4bd6c..0430b39eea 100644 --- a/services/web/frontend/js/features/source-editor/extensions/shortcuts.ts +++ b/services/web/frontend/js/features/source-editor/extensions/shortcuts.ts @@ -46,11 +46,11 @@ export const shortcuts = Prec.high( keymap.of([ { key: 'Tab', - run: indentMore, + run: indentMore, // note: not using indentWithTab as the user may want to insert tab spaces within a line }, { key: 'Shift-Tab', - run: indentLess, + run: indentLess, // note: not using indentWithTab as the user may want to insert tab spaces within a line }, { key: 'Mod-y',