From 023c16a4f57f8ae58fe24745df577cdb6ae0f2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 21 Apr 2020 23:48:50 +0200
Subject: [PATCH] some fixes

---
 packages/core/src/commands/clearContent.ts    | 2 +-
 packages/core/src/commands/focus.ts           | 2 +-
 packages/core/src/commands/insertHTML.ts      | 2 +-
 packages/core/src/commands/insertText.ts      | 2 +-
 packages/core/src/commands/setContent.ts      | 2 +-
 packages/core/src/commands/toggleBlockType.ts | 5 ++---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/commands/clearContent.ts b/packages/core/src/commands/clearContent.ts
index 59abd230..5a38fe8e 100644
--- a/packages/core/src/commands/clearContent.ts
+++ b/packages/core/src/commands/clearContent.ts
@@ -9,7 +9,7 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor, emitUpdate = false): ClearContent => emitUpdate => {
+export default (next: Function, editor: Editor): ClearContent => (emitUpdate = false) => {
   editor.setContent('', emitUpdate)
   next()
 }
diff --git a/packages/core/src/commands/focus.ts b/packages/core/src/commands/focus.ts
index af93f1ea..01312b4a 100644
--- a/packages/core/src/commands/focus.ts
+++ b/packages/core/src/commands/focus.ts
@@ -45,7 +45,7 @@ function resolveSelection(editor: Editor, position: Position = null): ResolvedSe
   }
 }
 
-export default (next: Function, editor: Editor, position: Position = null): Focus => async () => {
+export default (next: Function, editor: Editor): Focus => async (position = null) => {
   const { view, state } = editor
 
   if ((view.hasFocus() && position === null)) {
diff --git a/packages/core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
index 3597a052..a09a33ef 100644
--- a/packages/core/src/commands/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -10,7 +10,7 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor, value: string): InsertHTML => () => {
+export default (next: Function, editor: Editor): InsertHTML => value => {
   const { view, state } = editor
   const { selection } = state
   const element = elementFromString(value)
diff --git a/packages/core/src/commands/insertText.ts b/packages/core/src/commands/insertText.ts
index 2715c1bf..4877ca2d 100644
--- a/packages/core/src/commands/insertText.ts
+++ b/packages/core/src/commands/insertText.ts
@@ -8,7 +8,7 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor, value: string): InsertText => () => {
+export default (next: Function, editor: Editor): InsertText => value => {
   const { view, state } = editor
   const transaction = state.tr.insertText(value)
 
diff --git a/packages/core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts
index 4daf4260..f2e9d541 100644
--- a/packages/core/src/commands/setContent.ts
+++ b/packages/core/src/commands/setContent.ts
@@ -13,7 +13,7 @@ declare module '../Editor' {
   }
 }
 
-export default (next: Function, editor: Editor): SetContent => (content, emitUpdate, parseOptions) => {
+export default (next: Function, editor: Editor): SetContent => (content, emitUpdate = false, parseOptions = {}) => {
   if (content === null) {
     next()
     return
diff --git a/packages/core/src/commands/toggleBlockType.ts b/packages/core/src/commands/toggleBlockType.ts
index fb794580..35277d6a 100644
--- a/packages/core/src/commands/toggleBlockType.ts
+++ b/packages/core/src/commands/toggleBlockType.ts
@@ -21,10 +21,9 @@ export default (next: Function, editor: Editor): ToggleBlockType => (type, toggl
 
   if (isActive) {
     setBlockType(toggleType)(view.state, view.dispatch)
-    next()
-    return
+  } else {
+    setBlockType(type, attrs)(view.state, view.dispatch)
   }
 
-  setBlockType(type, attrs)(view.state, view.dispatch)
   next()
 }