From f9f7d3430493c0469ad9cf653206ac8b4428a31c Mon Sep 17 00:00:00 2001
From: Blake Embrey <hello@blakeembrey.com>
Date: Tue, 31 Oct 2017 08:32:36 -0700
Subject: [PATCH] Avoid rendering an empty placeholder by default (#1356)

---
 packages/slate-react/src/plugins/after.js                        | 1 +
 .../test/rendering/fixtures/empty-block-with-inline.js           | 1 -
 packages/slate-react/test/rendering/fixtures/empty-block.js      | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/slate-react/src/plugins/after.js b/packages/slate-react/src/plugins/after.js
index fd5b09464..92b2cd407 100644
--- a/packages/slate-react/src/plugins/after.js
+++ b/packages/slate-react/src/plugins/after.js
@@ -751,6 +751,7 @@ function AfterPlugin() {
 
   function renderPlaceholder(props) {
     const { editor, node } = props
+    if (!editor.props.placeholder) return
     if (editor.state.isComposing) return
     if (node.kind != 'block') return
     if (!Text.isTextList(node.nodes)) return
diff --git a/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js b/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js
index b3aa4dd9a..b72004197 100644
--- a/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js
+++ b/packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js
@@ -17,7 +17,6 @@ export const value = (
 export const output = `
 <div data-slate-editor="true" contenteditable="true" role="textbox">
   <div style="position:relative">
-    <span contenteditable="false" style="pointer-events:none;display:inline-block;width:0;max-width:100%;white-space:nowrap;opacity:0.333"></span>
     <span>
       <span>
         <span data-slate-empty-block="true">\n</span>
diff --git a/packages/slate-react/test/rendering/fixtures/empty-block.js b/packages/slate-react/test/rendering/fixtures/empty-block.js
index 7746912f4..f8e83bb26 100644
--- a/packages/slate-react/test/rendering/fixtures/empty-block.js
+++ b/packages/slate-react/test/rendering/fixtures/empty-block.js
@@ -15,7 +15,6 @@ export const value = (
 export const output = `
 <div data-slate-editor="true" contenteditable="true" role="textbox">
   <div style="position:relative">
-    <span contenteditable="false" style="pointer-events:none;display:inline-block;width:0;max-width:100%;white-space:nowrap;opacity:0.333"></span>
     <span>
       <span>
         <span data-slate-empty-block="true">\n</span>