From 4d7658f183beb1715596f43e2de8cbd96edf0467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 28 Mar 2020 23:54:49 +0100
Subject: [PATCH] refactoring

---
 packages/tiptap-core/src/ExtensionManager.ts |  4 ++--
 packages/tiptap-core/src/Node.ts             | 21 +++-----------------
 packages/tiptap-extension-document/index.ts  |  6 ++++--
 packages/tiptap-extension-paragraph/index.ts | 14 +++++++------
 packages/tiptap-extension-text/index.ts      |  6 ++++--
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/packages/tiptap-core/src/ExtensionManager.ts b/packages/tiptap-core/src/ExtensionManager.ts
index 29c541f0..a721809e 100644
--- a/packages/tiptap-core/src/ExtensionManager.ts
+++ b/packages/tiptap-core/src/ExtensionManager.ts
@@ -27,14 +27,14 @@ export default class ExtensionManager {
   get nodes(): any {
     return collect(this.extensions)
       .where('type', 'node')
-      .mapWithKeys((extension: any) => [extension.name, extension.schema])
+      .mapWithKeys((extension: any) => [extension.name, extension.schema()])
       .all()
   }
 
   get marks(): any {
     return collect(this.extensions)
       .where('type', 'mark')
-      .mapWithKeys((extension: any) => [extension.name, extension.schema])
+      .mapWithKeys((extension: any) => [extension.name, extension.schema()])
       .all()
   }
 
diff --git a/packages/tiptap-core/src/Node.ts b/packages/tiptap-core/src/Node.ts
index 01c16a99..5743819e 100644
--- a/packages/tiptap-core/src/Node.ts
+++ b/packages/tiptap-core/src/Node.ts
@@ -10,23 +10,8 @@ export default abstract class Node extends Extension {
 
   public topNode = false
 
-  // get type() {
-  //   return 'node'
-  // }
-
-  // get view(): any {
-  //   return null
-  // }
-
-  // get schema(): any {
-  //   return null
-  // }
-
-  public abstract schema: any
-  // public abstract plugins?: any
-
-  // command() {
-  //   return () => {}
-  // }
+  schema(): any {
+    return null
+  }
 
 }
diff --git a/packages/tiptap-extension-document/index.ts b/packages/tiptap-extension-document/index.ts
index cfa056d0..1cc132f8 100644
--- a/packages/tiptap-extension-document/index.ts
+++ b/packages/tiptap-extension-document/index.ts
@@ -6,8 +6,10 @@ export default class Document extends Node {
 
   topNode = true
 
-  schema = {
-    content: 'block+',
+  schema() {
+    return {
+      content: 'block+',
+    }
   }
 
 }
\ No newline at end of file
diff --git a/packages/tiptap-extension-paragraph/index.ts b/packages/tiptap-extension-paragraph/index.ts
index 57dc99ee..9fcfb68d 100644
--- a/packages/tiptap-extension-paragraph/index.ts
+++ b/packages/tiptap-extension-paragraph/index.ts
@@ -4,12 +4,14 @@ export default class Paragraph extends Node {
 
   name = 'paragraph'
 
-  schema = {
-    content: 'inline*',
-    group: 'block',
-    draggable: false,
-    parseDOM: [{ tag: 'p' }],
-    toDOM: () => ['p', 0],
+  schema() {
+    return {
+      content: 'inline*',
+      group: 'block',
+      draggable: false,
+      parseDOM: [{ tag: 'p' }],
+      toDOM: () => ['p', 0],
+    }
   }
 
 }
\ No newline at end of file
diff --git a/packages/tiptap-extension-text/index.ts b/packages/tiptap-extension-text/index.ts
index 48e1face..3a69aebc 100644
--- a/packages/tiptap-extension-text/index.ts
+++ b/packages/tiptap-extension-text/index.ts
@@ -4,8 +4,10 @@ export default class Text extends Node {
 
   name = 'text'
 
-  schema = {
-    group: 'inline',
+  schema() {
+    return {
+      group: 'inline',
+    }
   }
 
 }
\ No newline at end of file