Update strikethrough shortcut from Google Docs

springload · Oct 17, 2017 · 8e88c3b · 8e88c3b
1 parent 13b5004
commit 8e88c3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -23,7 +23,7 @@ We support keyboard shortcuts inspired by the ones used in [Google Docs](https:/
 | Italicize | `Ctrl + I` | `⌘ + I` |
 | Underline | `Ctrl + U` | `⌘ + U` |
 | Monospace (code) | `Ctrl + J` | `⌘ + J` |
-| Strikethrough | `Alt + Shift + 5` | `Option + Shift + 5` |
+| Strikethrough | `Ctrl + Shift + X` | `⌘ + Shift + X` |
 | **Paragraph formatting (if enabled)** |||
 | Increase list indentation | `Tab` | `Tab` |
 | Decrease list indentation | `Shift + Tab` | `Shift + Tab` |

diff --git a/lib/api/behavior.js b/lib/api/behavior.js
@@ -104,10 +104,10 @@ export default {
                         return null;
                     case KEY_CODES.U:
                         return null;
-                    case KEY_CODES[5]:
+                    case KEY_CODES.X:
                         return isEnabledInline.STRIKETHROUGH &&
-                            e.shiftKey &&
-                            e.altKey
+                            hasCommandModifier(e) &&
+                            e.shiftKey
                             ? INLINE_STYLE.STRIKETHROUGH
                             : null;
                     case KEY_CODES[7]:

diff --git a/lib/api/behavior.test.js b/lib/api/behavior.test.js
@@ -123,36 +123,6 @@ describe('behavior', () => {
             ).toBeNull();
         });
 
-        it('has overlapping shortcuts', () => {
-            expect(
-                behavior.getKeyBindingFn(
-                    [{ type: 'header-five' }],
-                    [{ type: 'STRIKETHROUGH' }],
-                    [],
-                )({
-                    keyCode: KEY_CODES[5],
-                    metaKey: false,
-                    altKey: true,
-                    shiftKey: true,
-                    ctrlKey: false,
-                }),
-            ).toBe('STRIKETHROUGH');
-
-            expect(
-                behavior.getKeyBindingFn(
-                    [{ type: 'header-five' }],
-                    [{ type: 'STRIKETHROUGH' }],
-                    [],
-                )({
-                    keyCode: KEY_CODES[5],
-                    metaKey: false,
-                    altKey: true,
-                    shiftKey: false,
-                    ctrlKey: true,
-                }),
-            ).toBe('header-five');
-        });
-
         describe('styles', () => {
             it('disables default style key bindings', () => {
                 expect(

diff --git a/lib/api/constants.js b/lib/api/constants.js
@@ -118,6 +118,7 @@ export const KEY_CODES = {
     U: 85,
     J: 74,
     I: 73,
+    X: 88,
     0: 48,
     1: 49,
     2: 50,
@@ -174,8 +175,8 @@ export const KEYBOARD_SHORTCUTS = {
         macOS: '⌘+U',
     },
     [INLINE_STYLE.STRIKETHROUGH]: {
-        other: 'Alt+Shift+5',
-        macOS: 'Option+Shift+5',
+        other: 'Ctrl+Shift+X',
+        macOS: '⌘+Shift+X',
     },
 
     [ENTITY_TYPE.LINK]: { other: 'Ctrl+K', macOS: '⌘+K' },