From 0f15b14ca4980f8a8dd00b6e628085fc431962fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 14 Nov 2018 10:22:42 +0100
Subject: [PATCH] refactoring

---
 examples/Components/Routes/Links/index.vue    |  4 ++--
 .../src/Components/EditorFloatingMenu.js      |  2 +-
 .../tiptap/src/Components/EditorMenuBar.js    |  2 +-
 .../tiptap/src/Components/EditorMenuBubble.js |  2 +-
 packages/tiptap/src/utils/Editor.js           | 21 ++++++++-----------
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/examples/Components/Routes/Links/index.vue b/examples/Components/Routes/Links/index.vue
index 73dcc9d7..942dc2e2 100644
--- a/examples/Components/Routes/Links/index.vue
+++ b/examples/Components/Routes/Links/index.vue
@@ -2,7 +2,7 @@
   <div class="editor">
     <editor-menu-bubble class="menububble" :editor="editor">
       <div
-        slot-scope="{ commands, isActive, markAttrs, menu }"
+        slot-scope="{ commands, isActive, getMarkAttrs, menu }"
         class="menububble"
         :class="{ 'is-active': menu.isActive }"
         :style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`"
@@ -18,7 +18,7 @@
         <template v-else>
           <button
             class="menububble__button"
-            @click="showLinkMenu(markAttrs('link'))"
+            @click="showLinkMenu(getMarkAttrs('link'))"
             :class="{ 'is-active': isActive.link() }"
           >
             <span>Add Link</span>
diff --git a/packages/tiptap/src/Components/EditorFloatingMenu.js b/packages/tiptap/src/Components/EditorFloatingMenu.js
index 7bcb970d..c2a99daf 100644
--- a/packages/tiptap/src/Components/EditorFloatingMenu.js
+++ b/packages/tiptap/src/Components/EditorFloatingMenu.js
@@ -43,7 +43,7 @@ export default {
       focus: this.editor.focus,
       commands: this.editor.commands,
       isActive: this.editor.isActive,
-      markAttrs: this.editor.markAttrs.bind(this.editor),
+      getMarkAttrs: this.editor.getMarkAttrs.bind(this.editor),
       menu: this.menu,
     })
   },
diff --git a/packages/tiptap/src/Components/EditorMenuBar.js b/packages/tiptap/src/Components/EditorMenuBar.js
index 6e0894d3..3e6e47a3 100644
--- a/packages/tiptap/src/Components/EditorMenuBar.js
+++ b/packages/tiptap/src/Components/EditorMenuBar.js
@@ -15,7 +15,7 @@ export default {
       focus: this.editor.focus,
       commands: this.editor.commands,
       isActive: this.editor.isActive,
-      markAttrs: this.editor.markAttrs.bind(this.editor),
+      getMarkAttrs: this.editor.getMarkAttrs.bind(this.editor),
     })
   },
 }
diff --git a/packages/tiptap/src/Components/EditorMenuBubble.js b/packages/tiptap/src/Components/EditorMenuBubble.js
index c68fa8f5..851b508f 100644
--- a/packages/tiptap/src/Components/EditorMenuBubble.js
+++ b/packages/tiptap/src/Components/EditorMenuBubble.js
@@ -43,7 +43,7 @@ export default {
       focus: this.editor.focus,
       commands: this.editor.commands,
       isActive: this.editor.isActive,
-      markAttrs: this.editor.markAttrs.bind(this.editor),
+      getMarkAttrs: this.editor.getMarkAttrs.bind(this.editor),
       menu: this.menu,
     })
   },
diff --git a/packages/tiptap/src/utils/Editor.js b/packages/tiptap/src/utils/Editor.js
index 19bea79c..a26e8c75 100644
--- a/packages/tiptap/src/utils/Editor.js
+++ b/packages/tiptap/src/utils/Editor.js
@@ -280,23 +280,20 @@ export default class Editor {
     }
   }
 
-  markAttrs(type = null) {
+  getMarkAttrs(type = null) {
     return this.activeMarkAttrs[type]
   }
 
   get isActive() {
-    const types = {
-      ...this.activeMarks,
-      ...this.activeNodes,
-    }
-
-    Object
-      .entries(types)
-      .forEach(([name, value]) => {
-        types[name] = (attrs = {}) => value(attrs)
+    return Object
+      .entries({
+        ...this.activeMarks,
+        ...this.activeNodes,
       })
-
-    return types
+      .reduce((types, [name, value]) => ({
+        ...types,
+        [name]: (attrs = {}) => value(attrs),
+      }), {})
   }
 
   destroy() {