From 8dc4fa27f6b464c5eabab44d3e25cdecfeb237ec Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Mon, 7 May 2018 15:38:19 +0200
Subject: [PATCH] Edit Post: Add pin button for the plugin sidebar

---
 .../plugin-sidebar-more-menu-item/index.js    |  6 +--
 .../sidebar/plugin-sidebar/index.js           | 43 +++++++++++++++++--
 edit-post/store/test/selectors.js             | 13 ++++--
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/edit-post/components/header/plugin-sidebar-more-menu-item/index.js b/edit-post/components/header/plugin-sidebar-more-menu-item/index.js
index 34f0efe526793f..b98c48c8fb5a66 100644
--- a/edit-post/components/header/plugin-sidebar-more-menu-item/index.js
+++ b/edit-post/components/header/plugin-sidebar-more-menu-item/index.js
@@ -14,9 +14,9 @@ import PluginsMoreMenuGroup from '../plugins-more-menu-group';
 
 const PluginSidebarMoreMenuItem = ( { children, icon, isPinned, isSelected, onClick } ) => (
 	<Fragment>
-		{ isPinned && icon && (
+		{ icon && (
 			<PinnedPlugins>
-				{ <IconButton
+				{ isPinned && <IconButton
 					icon={ icon }
 					label={ children }
 					onClick={ onClick }
@@ -50,7 +50,7 @@ export default compose(
 		const sidebarName = `${ pluginContext.name }/${ target }`;
 
 		return {
-			isPinned: isPluginItemPinned( `sidebar/${ sidebarName }` ),
+			isPinned: isPluginItemPinned( sidebarName ),
 			isSelected: getActiveGeneralSidebarName() === sidebarName,
 			sidebarName,
 		};
diff --git a/edit-post/components/sidebar/plugin-sidebar/index.js b/edit-post/components/sidebar/plugin-sidebar/index.js
index e0a110645de5b8..316153d419cde0 100644
--- a/edit-post/components/sidebar/plugin-sidebar/index.js
+++ b/edit-post/components/sidebar/plugin-sidebar/index.js
@@ -1,7 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { Panel } from '@wordpress/components';
+import { IconButton, Panel } from '@wordpress/components';
+import { withDispatch, withSelect } from '@wordpress/data';
+import { compose } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { withPluginContext } from '@wordpress/plugins';
 
@@ -16,16 +18,25 @@ import SidebarHeader from '../sidebar-header';
  *
  * @return {WPElement} Plugin sidebar component.
  */
-function PluginSidebar( { children, name, pluginContext, title } ) {
+function PluginSidebar( { children, isPinned, sidebarName, title, togglePin, pinnable = true } ) {
 	return (
 		<Sidebar
-			name={ `${ pluginContext.name }/${ name }` }
+			name={ sidebarName }
 			label={ __( 'Editor plugins' ) }
 		>
 			<SidebarHeader
 				closeLabel={ __( 'Close plugin' ) }
 			>
 				<strong>{ title }</strong>
+				{ pinnable && (
+					<IconButton
+						onClick={ togglePin }
+						icon={ isPinned ? 'star-filled' : 'star-empty' }
+						label={ isPinned ? __( 'Unpin plugin' ) : __( 'Pin plugin' ) }
+						isToggled={ isPinned }
+						aria-expanded={ isPinned }
+					/>
+				) }
 			</SidebarHeader>
 			<Panel>
 				{ children }
@@ -34,4 +45,28 @@ function PluginSidebar( { children, name, pluginContext, title } ) {
 	);
 }
 
-export default withPluginContext( PluginSidebar );
+export default compose(
+	withPluginContext,
+	withSelect( ( select, { name, pluginContext } ) => {
+		const {
+			isPluginItemPinned,
+		} = select( 'core/edit-post' );
+		const sidebarName = `${ pluginContext.name }/${ name }`;
+
+		return {
+			isPinned: isPluginItemPinned( sidebarName ),
+			sidebarName,
+		};
+	} ),
+	withDispatch( ( dispatch, { sidebarName } ) => {
+		const {
+			togglePinnedPluginItem,
+		} = dispatch( 'core/edit-post' );
+
+		return {
+			togglePin() {
+				togglePinnedPluginItem( sidebarName );
+			},
+		};
+	} ),
+)( PluginSidebar );
diff --git a/edit-post/store/test/selectors.js b/edit-post/store/test/selectors.js
index 8a268d0b7b8c51..b237e8a458f497 100644
--- a/edit-post/store/test/selectors.js
+++ b/edit-post/store/test/selectors.js
@@ -192,17 +192,22 @@ describe( 'selectors', () => {
 		const state = {
 			preferences: {
 				pinnedPluginItems: {
-					'foo/bar': true,
+					'foo/pinned': true,
+					'foo/unpinned': false,
 				},
 			},
 		};
 
-		it( 'should return false if plugin item is not pinned', () => {
+		it( 'should return false if the flag is not set for the plugin item', () => {
 			expect( isPluginItemPinned( state, 'foo/unknown' ) ).toBe( false );
 		} );
 
-		it( 'should return true if plugin item item is pinned', () => {
-			expect( isPluginItemPinned( state, 'foo/bar' ) ).toBe( true );
+		it( 'should return true if plugin item is not pinned', () => {
+			expect( isPluginItemPinned( state, 'foo/pinned' ) ).toBe( true );
+		} );
+
+		it( 'should return false if plugin item item is unpinned', () => {
+			expect( isPluginItemPinned( state, 'foo/unpinned' ) ).toBe( false );
 		} );
 	} );