Merge branch 'main' into feature/vue-node-views

packages/extension-blockquote/src/index.ts

@@ -57,7 +57,7 @@ const Blockquote = Node.create({
 
   addKeyboardShortcuts() {
     return {
-      'Shift-Mod-9': () => this.editor.commands.toggleBlockquote(),
+      'Mod-Shift-b': () => this.editor.commands.toggleBlockquote(),
     }
   },
 

packages/extension-bullet-list/src/index.ts

@@ -43,7 +43,7 @@ const BulletList = Node.create({
 
   addKeyboardShortcuts() {
     return {
-      'Shift-Control-8': () => this.editor.commands.toggleBulletList(),
+      'Mod-Shift-8': () => this.editor.commands.toggleBulletList(),
     }
   },
 

packages/extension-code-block/src/index.ts

@@ -91,7 +91,7 @@ const CodeBlock = Node.create({
 
   addKeyboardShortcuts() {
     return {
-      'Mod-Shift-c': () => this.editor.commands.toggleCodeBlock(),
+      'Mod-Alt-c': () => this.editor.commands.toggleCodeBlock(),
     }
   },
 

packages/extension-code/src/index.ts

@@ -58,7 +58,7 @@ const Code = Mark.create({
 
   addKeyboardShortcuts() {
     return {
-      'Mod-`': () => this.editor.commands.toggleCode(),
+      'Mod-e': () => this.editor.commands.toggleCode(),
     }
   },
 

packages/extension-highlight/src/index.ts

@@ -81,7 +81,7 @@ const Highlight = Mark.create({
 
   addKeyboardShortcuts() {
     return {
-      'Mod-e': () => this.editor.commands.toggleHighlight(),
+      'Mod-Shift-h': () => this.editor.commands.toggleHighlight(),
     }
   },
 

packages/extension-ordered-list/src/index.ts

@@ -62,7 +62,7 @@ const OrderedList = Node.create({
 
   addKeyboardShortcuts() {
     return {
-      'Shift-Control-9': () => this.editor.commands.toggleOrderedList(),
+      'Mod-Shift-7': () => this.editor.commands.toggleOrderedList(),
     }
   },
 

packages/extension-strike/src/index.ts

@@ -67,7 +67,7 @@ const Strike = Mark.create({
 
   addKeyboardShortcuts() {
     return {
-      'Mod-d': () => this.editor.commands.toggleStrike(),
+      'Mod-Shift-x': () => this.editor.commands.toggleStrike(),
     }
   },
 

packages/extension-task-list/src/index.ts

@@ -40,6 +40,12 @@ const TaskList = Node.create({
       },
     }
   },
+
+  addKeyboardShortcuts() {
+    return {
+      'Mod-Shift-l': () => this.editor.commands.toggleTaskList(),
+    }
+  },
 })
 
 export default TaskList

packages/extension-text-align/src/index.ts

@@ -61,10 +61,10 @@ const TextAlign = Extension.create({
       Enter: () => this.editor.commands.splitBlock({
         withAttributes: true,
       }),
-      'Ctrl-Shift-l': () => this.editor.commands.setTextAlign('left'),
-      'Ctrl-Shift-e': () => this.editor.commands.setTextAlign('center'),
-      'Ctrl-Shift-r': () => this.editor.commands.setTextAlign('right'),
-      'Ctrl-Shift-j': () => this.editor.commands.setTextAlign('justify'),
+      'Mod-Shift-l': () => this.editor.commands.setTextAlign('left'),
+      'Mod-Shift-e': () => this.editor.commands.setTextAlign('center'),
+      'Mod-Shift-r': () => this.editor.commands.setTextAlign('right'),
+      'Mod-Shift-j': () => this.editor.commands.setTextAlign('justify'),
     }
   },
 })