From 99cc1f0b693b5060f733c8d618b1c122d8c88ce8 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 23 May 2017 11:30:21 +0100
Subject: [PATCH 1/4] Chrome: Adding the post excerpt panel

---
 editor/selectors.js                    |  6 ++++
 editor/sidebar/post-excerpt/index.js   | 50 ++++++++++++++++++++++++++
 editor/sidebar/post-excerpt/style.scss |  6 ++++
 editor/sidebar/post-settings/index.js  |  2 ++
 editor/test/selectors.js               | 29 +++++++++++++++
 5 files changed, 93 insertions(+)
 create mode 100644 editor/sidebar/post-excerpt/index.js
 create mode 100644 editor/sidebar/post-excerpt/style.scss

diff --git a/editor/selectors.js b/editor/selectors.js
index 886314c4082b5..1abd6376fda36 100644
--- a/editor/selectors.js
+++ b/editor/selectors.js
@@ -64,6 +64,12 @@ export function getEditedPostTitle( state ) {
 		: state.editor.edits.title;
 }
 
+export function getEditedPostExcerpt( state ) {
+	return state.editor.edits.excerpt === undefined
+		? state.currentPost.excerpt.raw
+		: state.editor.edits.excerpt;
+}
+
 export function getEditedPostPreviewLink( state ) {
 	const link = state.currentPost.link;
 	if ( ! link ) {
diff --git a/editor/sidebar/post-excerpt/index.js b/editor/sidebar/post-excerpt/index.js
new file mode 100644
index 0000000000000..df0615690f162
--- /dev/null
+++ b/editor/sidebar/post-excerpt/index.js
@@ -0,0 +1,50 @@
+/**
+ * External dependencies
+ */
+import { connect } from 'react-redux';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from 'i18n';
+import PanelBody from 'components/panel/body';
+
+/**
+ * Internal Dependencies
+ */
+import './style.scss';
+import { getEditedPostExcerpt } from '../../selectors';
+import { editPost } from '../../actions';
+
+function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
+	const onChange = ( event ) => onUpdateExcerpt( event.target.value );
+
+	return (
+		<PanelBody title={ __( 'Excerpt' ) } initialOpen={ false }>
+			<textarea
+				className="editor-post-excerpt__textarea"
+				onChange={ onChange }
+				value={ excerpt }
+				placeholder={ __( 'Write an excerpt (optional)' ) }
+			/>
+			<a href="https://codex.wordpress.org/Excerpt" target="_blank">
+				{ __( 'Learn more about manual excerpts' ) }
+			</a>
+		</PanelBody>
+	);
+	/* eslint-enable jsx-a11y/label-has-for */
+}
+
+export default connect(
+	( state ) => ( {
+		excerpt: getEditedPostExcerpt( state ),
+	} ),
+	( dispatch ) => {
+		return {
+			onUpdateExcerpt( excerpt ) {
+				dispatch( editPost( { excerpt } ) );
+			},
+		};
+	}
+)( PostExcerpt );
+
diff --git a/editor/sidebar/post-excerpt/style.scss b/editor/sidebar/post-excerpt/style.scss
new file mode 100644
index 0000000000000..72dc4489253e2
--- /dev/null
+++ b/editor/sidebar/post-excerpt/style.scss
@@ -0,0 +1,6 @@
+.editor-post-excerpt__textarea {
+	width: 100%;
+	height: 80px;
+	margin-top: 20px;
+	margin-bottom: 10px;
+}
diff --git a/editor/sidebar/post-settings/index.js b/editor/sidebar/post-settings/index.js
index 57b32b2d55c62..ce23efe639559 100644
--- a/editor/sidebar/post-settings/index.js
+++ b/editor/sidebar/post-settings/index.js
@@ -16,6 +16,7 @@ import IconButton from 'components/icon-button';
  */
 import './style.scss';
 import PostStatus from '../post-status';
+import PostExcerpt from '../post-excerpt';
 
 const PostSettings = ( { toggleSidebar } ) => {
 	return (
@@ -30,6 +31,7 @@ const PostSettings = ( { toggleSidebar } ) => {
 				</div>
 			</PanelHeader>
 			<PostStatus />
+			<PostExcerpt />
 		</Panel>
 	);
 };
diff --git a/editor/test/selectors.js b/editor/test/selectors.js
index f64e30bd87656..3ca9ae21c69fa 100644
--- a/editor/test/selectors.js
+++ b/editor/test/selectors.js
@@ -16,6 +16,7 @@ import {
 	getPostEdits,
 	getEditedPostStatus,
 	getEditedPostTitle,
+	getEditedPostExcerpt,
 	getEditedPostVisibility,
 	getEditedPostPreviewLink,
 	getBlock,
@@ -223,6 +224,34 @@ describe( 'selectors', () => {
 		} );
 	} );
 
+	describe( 'getEditedPostExcerpt', () => {
+		it( 'should return the post saved excerpt if the excerpt is not edited', () => {
+			const state = {
+				currentPost: {
+					excerpt: { raw: 'sassel' },
+				},
+				editor: {
+					edits: { status: 'private' },
+				},
+			};
+
+			expect( getEditedPostExcerpt( state ) ).to.equal( 'sassel' );
+		} );
+
+		it( 'should return the edited excerpt', () => {
+			const state = {
+				currentPost: {
+					excerpt: { raw: 'sassel' },
+				},
+				editor: {
+					edits: { excerpt: 'youcha' },
+				},
+			};
+
+			expect( getEditedPostExcerpt( state ) ).to.equal( 'youcha' );
+		} );
+	} );
+
 	describe( 'getEditedPostVisibility', () => {
 		it( 'should return public by default', () => {
 			const state = {

From c251345c708357a04001bb4958cc8b50d41bb31a Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 23 May 2017 12:06:52 +0100
Subject: [PATCH 2/4] Chrome: Fix post excerpt selector

---
 editor/selectors.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/editor/selectors.js b/editor/selectors.js
index 1abd6376fda36..5a31a7791c2ab 100644
--- a/editor/selectors.js
+++ b/editor/selectors.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { first, last } from 'lodash';
+import { first, last, get } from 'lodash';
 
 /**
  * Internal dependencies
@@ -60,13 +60,13 @@ export function getEditedPostVisibility( state ) {
 
 export function getEditedPostTitle( state ) {
 	return state.editor.edits.title === undefined
-		? state.currentPost.title.raw
+		? get( state.currentPost, 'title.raw' )
 		: state.editor.edits.title;
 }
 
 export function getEditedPostExcerpt( state ) {
 	return state.editor.edits.excerpt === undefined
-		? state.currentPost.excerpt.raw
+		? get( state.currentPost, 'excerpt.raw' )
 		: state.editor.edits.excerpt;
 }
 

From 061937f12ffe2f9f9a586707e1aae416c75fb165 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 23 May 2017 12:36:36 +0100
Subject: [PATCH 3/4] Chrome: Fix Post Visibility Z-index

Also adds an aria-label to the excerpt
---
 editor/assets/stylesheets/_z-index.scss   | 1 +
 editor/sidebar/post-excerpt/index.js      | 1 +
 editor/sidebar/post-visibility/style.scss | 1 +
 3 files changed, 3 insertions(+)

diff --git a/editor/assets/stylesheets/_z-index.scss b/editor/assets/stylesheets/_z-index.scss
index 06224f7b6c944..3ff782acf2fa8 100644
--- a/editor/assets/stylesheets/_z-index.scss
+++ b/editor/assets/stylesheets/_z-index.scss
@@ -7,6 +7,7 @@ $z-layers: (
 	'.editor-visual-editor__block {core/image aligned left or right}': 10,
 	'.editor-visual-editor__block-controls': 1,
 	'.editor-header': 20,
+	'.editor-post-visibility__dialog': 30,
 );
 
 @function z-index( $key ) {
diff --git a/editor/sidebar/post-excerpt/index.js b/editor/sidebar/post-excerpt/index.js
index df0615690f162..f4bf8164e3644 100644
--- a/editor/sidebar/post-excerpt/index.js
+++ b/editor/sidebar/post-excerpt/index.js
@@ -26,6 +26,7 @@ function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
 				onChange={ onChange }
 				value={ excerpt }
 				placeholder={ __( 'Write an excerpt (optional)' ) }
+				aria-label={ __( 'Excerpt' ) }
 			/>
 			<a href="https://codex.wordpress.org/Excerpt" target="_blank">
 				{ __( 'Learn more about manual excerpts' ) }
diff --git a/editor/sidebar/post-visibility/style.scss b/editor/sidebar/post-visibility/style.scss
index a1a7dfd294d23..453c0201c0a26 100644
--- a/editor/sidebar/post-visibility/style.scss
+++ b/editor/sidebar/post-visibility/style.scss
@@ -29,6 +29,7 @@
 	background: $white;
 	padding: 10px;
 	min-width: 240px;
+	z-index: z-index( '.editor-post-visibility__dialog' );
 }
 
 .editor-post-visibility__dialog-arrow {

From 58b90a84b1ba8dfc87509ae822838ca17f38edfc Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 23 May 2017 16:43:27 +0100
Subject: [PATCH 4/4] Chrome: Remove useless comment and consolidate
 react-redux callbacks

---
 editor/sidebar/post-excerpt/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/editor/sidebar/post-excerpt/index.js b/editor/sidebar/post-excerpt/index.js
index f4bf8164e3644..db6d3362f2f5f 100644
--- a/editor/sidebar/post-excerpt/index.js
+++ b/editor/sidebar/post-excerpt/index.js
@@ -33,13 +33,14 @@ function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
 			</a>
 		</PanelBody>
 	);
-	/* eslint-enable jsx-a11y/label-has-for */
 }
 
 export default connect(
-	( state ) => ( {
-		excerpt: getEditedPostExcerpt( state ),
-	} ),
+	( state ) => {
+		return {
+			excerpt: getEditedPostExcerpt( state ),
+		};
+	},
 	( dispatch ) => {
 		return {
 			onUpdateExcerpt( excerpt ) {