Merge branch 'master' into jori/collection-new-document

2017-07-18 23:37:38 -07:00
parent 7b589ff46a 68302f25c4
commit f9f43e0b40
1 changed files with 6 additions and 1 deletions
--- a/frontend/components/Editor/components/Paragraph.js
+++ b/frontend/components/Editor/components/Paragraph.js
@@ -10,12 +10,17 @@ export default function Link({
  node,
  parent,
  children,
+  readOnly,
 }: Props) {
  const parentIsDocument = parent instanceof Document;
  const firstParagraph = parent && parent.nodes.get(1) === node;
  const lastParagraph = parent && parent.nodes.last() === node;
  const showPlaceholder =
-    parentIsDocument && firstParagraph && lastParagraph && !node.text;
+    !readOnly &&
+    parentIsDocument &&
+    firstParagraph &&
+    lastParagraph &&
+    !node.text;

  return (
    <p>