From d1f43409f7c288b908e99ecde0468defbb9aa4bd Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Fri, 5 May 2017 13:59:59 -0400
Subject: [PATCH 1/4] Remove paragraphs from captioned content

---
 post-content.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/post-content.js b/post-content.js
index e55d831dc6bbb..6453504581fba 100644
--- a/post-content.js
+++ b/post-content.js
@@ -30,7 +30,7 @@ window._wpGutenbergPost = {
 			'<!-- /wp:core/text -->',
 
 			'<!-- wp:core/image align="center" -->',
-			'<figure><img src="https://cldup.com/E4PzNdrFSQ.jpg" class="aligncenter"/><figcaption><p>Give it a try. Press the &quot;really wide&quot; button on the image toolbar.</p></figcaption></figure>',
+			'<figure><img src="https://cldup.com/E4PzNdrFSQ.jpg" class="aligncenter"/><figcaption>Give it a try. Press the &quot;really wide&quot; button on the image toolbar.</figcaption></figure>',
 			'<!-- /wp:core/image -->',
 
 			'<!-- wp:core/text -->',
@@ -38,7 +38,7 @@ window._wpGutenbergPost = {
 			'<!-- /wp:core/text -->',
 
 			'<!-- wp:core/embed url="https://www.youtube.com/watch?v=Nl6U7UotA-M" -->',
-			'<figure><iframe width="560" height="315" src="//www.youtube.com/embed/Nl6U7UotA-M" frameborder="0" allowfullscreen></iframe><figcaption><p>State of the Word 2016</p></figcaption></figure>',
+			'<figure><iframe width="560" height="315" src="//www.youtube.com/embed/Nl6U7UotA-M" frameborder="0" allowfullscreen></iframe><figcaption>State of the Word 2016</figcaption></figure>',
 			'<!-- /wp:core/embed -->',
 
 			'<!-- wp:core/heading -->',

From 745aaf0d57b248ac4664b16776fdccb95796fa28 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Fri, 5 May 2017 14:00:34 -0400
Subject: [PATCH 2/4] Test caption length when considering to show editable

---
 blocks/library/embed/index.js | 2 +-
 blocks/library/image/index.js | 2 +-
 blocks/library/quote/index.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
index 20cbf22484ffb..986e87b37e0df 100644
--- a/blocks/library/embed/index.js
+++ b/blocks/library/embed/index.js
@@ -48,7 +48,7 @@ registerBlock( 'core/embed', {
 				<div className="iframe-overlay">
 					<iframe src={ url } title={ title } />
 				</div>
-				{ caption || !! focus ? (
+				{ caption.length > 0 || !! focus ? (
 					<Editable
 						tagName="figcaption"
 						placeholder={ wp.i18n.__( 'Write caption…' ) }
diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
index c7e26f0e237df..c6afca9439879 100644
--- a/blocks/library/image/index.js
+++ b/blocks/library/image/index.js
@@ -94,7 +94,7 @@ registerBlock( 'core/image', {
 		return (
 			<figure className="blocks-image">
 				<img src={ url } alt={ alt } />
-				{ caption || !! focus ? (
+				{ caption.length > 0 || !! focus ? (
 					<Editable
 						tagName="figcaption"
 						placeholder={ wp.i18n.__( 'Write caption…' ) }
diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
index e983c5af3a791..e3788c5e94828 100644
--- a/blocks/library/quote/index.js
+++ b/blocks/library/quote/index.js
@@ -120,7 +120,7 @@ registerBlock( 'core/quote', {
 					onMerge={ mergeWithPrevious }
 					showAlignments
 				/>
-				{ ( citation || !! focus ) && (
+				{ ( citation.length > 0 || !! focus ) && (
 					<Editable
 						tagName="footer"
 						value={ citation }

From 422cde3a4720563bfc7caebe355e6aa9f74b36b5 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Fri, 5 May 2017 14:24:06 -0400
Subject: [PATCH 3/4] Treat serialized content as array

---
 blocks/library/embed/index.js | 2 +-
 blocks/library/image/index.js | 2 +-
 blocks/library/quote/index.js | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
index 986e87b37e0df..81c7da9393398 100644
--- a/blocks/library/embed/index.js
+++ b/blocks/library/embed/index.js
@@ -67,7 +67,7 @@ registerBlock( 'core/embed', {
 		const { url, title, caption } = attributes;
 		const iframe = <iframe src={ url } title={ title } />;
 
-		if ( ! caption ) {
+		if ( ! caption.length ) {
 			return iframe;
 		}
 
diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
index c6afca9439879..81497027fa1fa 100644
--- a/blocks/library/image/index.js
+++ b/blocks/library/image/index.js
@@ -113,7 +113,7 @@ registerBlock( 'core/image', {
 		const { url, alt, caption, align = 'none' } = attributes;
 		const img = <img src={ url } alt={ alt } className={ `align${ align }` } />;
 
-		if ( ! caption ) {
+		if ( ! caption.length ) {
 			return img;
 		}
 
diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
index e3788c5e94828..ceb0938e8c415 100644
--- a/blocks/library/quote/index.js
+++ b/blocks/library/quote/index.js
@@ -143,10 +143,12 @@ registerBlock( 'core/quote', {
 
 		return (
 			<blockquote className={ `blocks-quote-style-${ style }` }>
-				{ value && wp.element.Children.map( value, ( paragraph, i ) => (
+				{ value.map( ( paragraph, i ) => (
 					<p key={ i }>{ paragraph }</p>
 				) ) }
-				<footer>{ citation }</footer>
+				{ citation.length > 0 && (
+					<footer>{ citation }</footer>
+				) }
 			</blockquote>
 		);
 	}

From b9a868ec5ddc02741a281d95d722db4caf8ce9da Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Fri, 5 May 2017 14:28:23 -0400
Subject: [PATCH 4/4] Test truthiness of children before assuming property

Can be undefined for new block. We may want to look to provide default,
but for now simply test truthiness.
---
 blocks/library/embed/index.js | 4 ++--
 blocks/library/image/index.js | 4 ++--
 blocks/library/quote/index.js | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
index 81c7da9393398..74d0be2e62478 100644
--- a/blocks/library/embed/index.js
+++ b/blocks/library/embed/index.js
@@ -48,7 +48,7 @@ registerBlock( 'core/embed', {
 				<div className="iframe-overlay">
 					<iframe src={ url } title={ title } />
 				</div>
-				{ caption.length > 0 || !! focus ? (
+				{ ( caption && caption.length > 0 ) || !! focus ? (
 					<Editable
 						tagName="figcaption"
 						placeholder={ wp.i18n.__( 'Write caption…' ) }
@@ -67,7 +67,7 @@ registerBlock( 'core/embed', {
 		const { url, title, caption } = attributes;
 		const iframe = <iframe src={ url } title={ title } />;
 
-		if ( ! caption.length ) {
+		if ( ! caption || ! caption.length ) {
 			return iframe;
 		}
 
diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
index 81497027fa1fa..d3855096de357 100644
--- a/blocks/library/image/index.js
+++ b/blocks/library/image/index.js
@@ -94,7 +94,7 @@ registerBlock( 'core/image', {
 		return (
 			<figure className="blocks-image">
 				<img src={ url } alt={ alt } />
-				{ caption.length > 0 || !! focus ? (
+				{ ( caption && caption.length > 0 ) || !! focus ? (
 					<Editable
 						tagName="figcaption"
 						placeholder={ wp.i18n.__( 'Write caption…' ) }
@@ -113,7 +113,7 @@ registerBlock( 'core/image', {
 		const { url, alt, caption, align = 'none' } = attributes;
 		const img = <img src={ url } alt={ alt } className={ `align${ align }` } />;
 
-		if ( ! caption.length ) {
+		if ( ! caption || ! caption.length ) {
 			return img;
 		}
 
diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
index ceb0938e8c415..690dfd7946d95 100644
--- a/blocks/library/quote/index.js
+++ b/blocks/library/quote/index.js
@@ -120,7 +120,7 @@ registerBlock( 'core/quote', {
 					onMerge={ mergeWithPrevious }
 					showAlignments
 				/>
-				{ ( citation.length > 0 || !! focus ) && (
+				{ ( ( citation && citation.length > 0 ) || !! focus ) && (
 					<Editable
 						tagName="footer"
 						value={ citation }
@@ -143,10 +143,10 @@ registerBlock( 'core/quote', {
 
 		return (
 			<blockquote className={ `blocks-quote-style-${ style }` }>
-				{ value.map( ( paragraph, i ) => (
+				{ value && value.map( ( paragraph, i ) => (
 					<p key={ i }>{ paragraph }</p>
 				) ) }
-				{ citation.length > 0 && (
+				{ citation && citation.length > 0 && (
 					<footer>{ citation }</footer>
 				) }
 			</blockquote>