From ce94d0641db2188ff74d4a94f7322b2b124ea13f Mon Sep 17 00:00:00 2001
From: Chrissi2812 <cf@pixel-kraft.de>
Date: Fri, 7 Dec 2018 10:52:48 +0100
Subject: [PATCH] added toggleCellMerge and changed example to use it If all
 selected cells are merged than the next call will split them.

---
 examples/Components/Routes/Table/index.vue    | 2 +-
 packages/tiptap-extensions/src/nodes/Table.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/examples/Components/Routes/Table/index.vue b/examples/Components/Routes/Table/index.vue
index a8e19691..6a4af9f6 100644
--- a/examples/Components/Routes/Table/index.vue
+++ b/examples/Components/Routes/Table/index.vue
@@ -173,7 +173,7 @@
 						</button>
 						<button
 							class="menubar__button"
-							@click="commands.mergeCells"
+							@click="commands.toggleCellMerge"
 						>
 							<icon name="combine_cells" />
 						</button>
diff --git a/packages/tiptap-extensions/src/nodes/Table.js b/packages/tiptap-extensions/src/nodes/Table.js
index 8da767b2..8ddd3cbc 100644
--- a/packages/tiptap-extensions/src/nodes/Table.js
+++ b/packages/tiptap-extensions/src/nodes/Table.js
@@ -47,6 +47,14 @@ export default class Table extends Node {
       addRowAfter: () => addRowAfter,
       deleteRow: () => deleteRow,
       deleteTable: () => deleteTable,
+      toggleCellMerge: () => (
+          (state, dispatch) => {
+            if (mergeCells(state, dispatch)) {
+              return
+            }
+            splitCell(state, dispatch)
+          }
+      ),
       mergeCells: () => mergeCells,
       splitCell: () => splitCell,
       toggleHeaderColumn: () => toggleHeaderColumn,