From d7d13179d63c3063046f8e6cc20a68a4eec88a44 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Fri, 8 Dec 2017 19:13:35 -0800
Subject: [PATCH] Remove slate-plain-serializer dependency

---
 app/components/Editor/Editor.js                           | 8 ++------
 .../components/Toolbar/components/FormattingToolbar.js    | 3 ++-
 package.json                                              | 1 -
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/components/Editor/Editor.js b/app/components/Editor/Editor.js
index 5edfd4d31..f7d09b5d1 100644
--- a/app/components/Editor/Editor.js
+++ b/app/components/Editor/Editor.js
@@ -5,7 +5,6 @@ import { observer } from 'mobx-react';
 import { Value, Change } from 'slate';
 import { Editor } from 'slate-react';
 import type { SlateNodeProps, Plugin } from './types';
-import Plain from 'slate-plain-serializer';
 import keydown from 'react-keydown';
 import getDataTransferFiles from 'utils/getDataTransferFiles';
 import Flex from 'shared/components/Flex';
@@ -52,11 +51,7 @@ class MarkdownEditor extends Component {
       onImageUploadStop: props.onImageUploadStop,
     });
 
-    if (props.text.trim().length) {
-      this.editorValue = Markdown.deserialize(props.text);
-    } else {
-      this.editorValue = Plain.deserialize('');
-    }
+    this.editorValue = Markdown.deserialize(props.text);
   }
 
   componentDidMount() {
@@ -77,6 +72,7 @@ class MarkdownEditor extends Component {
   onChange = (change: Change) => {
     if (this.editorValue !== change.value) {
       this.props.onChange(Markdown.serialize(change.value));
+      console.log('this.props.onChange', Markdown.serialize(change.value));
       this.editorValue = change.value;
     }
   };
diff --git a/app/components/Editor/components/Toolbar/components/FormattingToolbar.js b/app/components/Editor/components/Toolbar/components/FormattingToolbar.js
index 5c988fbf9..77fd7839a 100644
--- a/app/components/Editor/components/Toolbar/components/FormattingToolbar.js
+++ b/app/components/Editor/components/Toolbar/components/FormattingToolbar.js
@@ -28,7 +28,8 @@ class FormattingToolbar extends Component {
   };
 
   isBlock = (type: string) => {
-    return this.props.editor.value.startBlock.type === type;
+    const startBlock = this.props.editor.value.startBlock;
+    return startBlock && startBlock.type === type;
   };
 
   /**
diff --git a/package.json b/package.json
index cdbc5b00e..5ed7c4ee3 100644
--- a/package.json
+++ b/package.json
@@ -167,7 +167,6 @@
     "slate-edit-list": "^0.10.1",
     "slate-md-serializer": "^1.0.4",
     "slate-paste-linkify": "^0.5.0",
-    "slate-plain-serializer": "^0.4.12",
     "slate-prism": "^0.4.0",
     "slate-react": "^0.10.19",
     "slate-trailing-block": "^0.4.0",