From e45a7b6d261cff4692a231a003e061c1de689789 Mon Sep 17 00:00:00 2001
From: Paul Wilde <paul@ibexcreative.com>
Date: Sat, 10 Feb 2018 22:25:45 +0000
Subject: [PATCH 1/4] Update PostExcerpt component to use TextareaControl.

---
 editor/components/post-excerpt/index.js   | 18 +++++++-----------
 editor/components/post-excerpt/style.scss |  9 ++++++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/editor/components/post-excerpt/index.js b/editor/components/post-excerpt/index.js
index fa52257b31069..fe5555cd97146 100644
--- a/editor/components/post-excerpt/index.js
+++ b/editor/components/post-excerpt/index.js
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { ExternalLink, withInstanceId } from '@wordpress/components';
+import { ExternalLink, TextareaControl } from '@wordpress/components';
 
 /**
  * Internal Dependencies
@@ -16,17 +16,13 @@ import './style.scss';
 import { getEditedPostExcerpt } from '../../store/selectors';
 import { editPost } from '../../store/actions';
 
-function PostExcerpt( { excerpt, onUpdateExcerpt, instanceId } ) {
-	const id = `editor-post-excerpt-${ instanceId }`;
-	const onChange = ( event ) => onUpdateExcerpt( event.target.value );
-
+function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
 	return (
-		<div>
-			<label key="label" htmlFor={ id }>{ __( 'Write an excerpt (optional)' ) }</label>
-			<textarea
-				id={ id }
+		<div class="editor-post-excerpt">
+			<TextareaControl
+				label={ __( 'Write an excerpt (optional)' ) }
 				className="editor-post-excerpt__textarea"
-				onChange={ onChange }
+				onChange={ ( value ) => onUpdateExcerpt( value ) }
 				value={ excerpt }
 			/>
 			<ExternalLink href="https://codex.wordpress.org/Excerpt">
@@ -47,4 +43,4 @@ export default connect(
 			return editPost( { excerpt } );
 		},
 	}
-)( withInstanceId( PostExcerpt ) );
+)( PostExcerpt );
diff --git a/editor/components/post-excerpt/style.scss b/editor/components/post-excerpt/style.scss
index 5381151f939e3..80e763c06e9f5 100644
--- a/editor/components/post-excerpt/style.scss
+++ b/editor/components/post-excerpt/style.scss
@@ -1,5 +1,12 @@
+.editor-post-excerpt {
+	margin-bottom: 10px;
+}
+
+.editor-post-excerpt > .blocks-base-control {
+	margin-bottom: 0;
+}
+
 .editor-post-excerpt__textarea {
 	width: 100%;
 	height: 80px;
-	margin-bottom: 10px;
 }

From feb57a83fb5171dabf7cbcedb1ec95f495410192 Mon Sep 17 00:00:00 2001
From: Paul Wilde <paul@ibexcreative.com>
Date: Sun, 11 Feb 2018 12:53:43 +0000
Subject: [PATCH 2/4] Fix build error.

---
 editor/components/post-excerpt/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/components/post-excerpt/index.js b/editor/components/post-excerpt/index.js
index fe5555cd97146..10b7f6d858e4c 100644
--- a/editor/components/post-excerpt/index.js
+++ b/editor/components/post-excerpt/index.js
@@ -18,7 +18,7 @@ import { editPost } from '../../store/actions';
 
 function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
 	return (
-		<div class="editor-post-excerpt">
+		<div className="editor-post-excerpt">
 			<TextareaControl
 				label={ __( 'Write an excerpt (optional)' ) }
 				className="editor-post-excerpt__textarea"

From 6612a7eca98d71cdb65c7fe3048274421a2cef96 Mon Sep 17 00:00:00 2001
From: Paul Wilde <paul@ibexcreative.com>
Date: Mon, 12 Feb 2018 19:16:32 +0000
Subject: [PATCH 3/4] Fix spacing between 'Learn more about manual excerpts'
 link and textarea.

---
 editor/components/post-excerpt/style.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/editor/components/post-excerpt/style.scss b/editor/components/post-excerpt/style.scss
index 80e763c06e9f5..9c344b39ebae9 100644
--- a/editor/components/post-excerpt/style.scss
+++ b/editor/components/post-excerpt/style.scss
@@ -1,7 +1,3 @@
-.editor-post-excerpt {
-	margin-bottom: 10px;
-}
-
 .editor-post-excerpt > .blocks-base-control {
 	margin-bottom: 0;
 }
@@ -9,4 +5,5 @@
 .editor-post-excerpt__textarea {
 	width: 100%;
 	height: 80px;
+	margin-bottom: 10px;
 }

From 2f5b203b013a6d4699e74182b1942926585454e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20=28Greg=29=20Zi=C3=B3=C5=82kowski?=
 <grzegorz.ziolkowski@automattic.com>
Date: Thu, 10 May 2018 10:41:33 +0200
Subject: [PATCH 4/4] Add missing ) after failed rebase

---
 editor/components/post-excerpt/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/components/post-excerpt/index.js b/editor/components/post-excerpt/index.js
index 3c970c74b37e2..b7c7c9ce088b8 100644
--- a/editor/components/post-excerpt/index.js
+++ b/editor/components/post-excerpt/index.js
@@ -37,5 +37,5 @@ export default compose( [
 		onUpdateExcerpt( excerpt ) {
 			dispatch( 'core/editor' ).editPost( { excerpt } );
 		},
-	} ),
+	} ) ),
 ] )( PostExcerpt );