Chrome: Update the "opened/closed" state of the sidebar panels in loc…

…alStorage

components/panel/body.js

@@ -26,16 +26,22 @@ class PanelBody extends Component {
 
 	toggle( event ) {
 		event.preventDefault();
-		this.setState( ( state ) => ( {
-			opened: ! state.opened,
-		} ) );
+		if ( this.props.opened === undefined ) {
+			this.setState( ( state ) => ( {
+				opened: ! state.opened,
+			} ) );
+		}
+
+		if ( this.props.onToggle ) {
+			this.props.onToggle();
+		}
 	}
 
 	render() {
-		const { title, children } = this.props;
-		const { opened } = this.state;
-		const icon = `arrow-${ opened ? 'down' : 'right' }`;
-		const className = classnames( 'components-panel__body', { 'is-opened': opened } );
+		const { title, children, opened } = this.props;
+		const isOpened = opened === undefined ? this.state.opened : opened;
+		const icon = `arrow-${ isOpened ? 'down' : 'right' }`;
+		const className = classnames( 'components-panel__body', { 'is-opened': isOpened } );
 
 		return (
 			<div className={ className }>
@@ -44,15 +50,15 @@ class PanelBody extends Component {
 						<Button
 							className="components-panel__body-toggle"
 							onClick={ this.toggle }
-							aria-expanded={ opened }
+							aria-expanded={ isOpened }
 							label={ sprintf( __( 'Open section: %s' ), title ) }
 						>
 							<Dashicon icon={ icon } />
 							{ title }
 						</Button>
 					</h3>
 				) }
-				{ this.state.opened && children }
+				{ isOpened && children }
 			</div>
 		);
 	}

components/panel/test/body.js

@@ -35,6 +35,13 @@ describe( 'PanelBody', () => {
 			expect( icon.prop( 'icon' ) ).toBe( 'arrow-right' );
 		} );
 
+		it( 'should use the "opened" prop instead of state if provided', () => {
+			const panelBody = shallow( <PanelBody title="Some Text" opened={ true } initialOpen={ false } /> );
+			expect( panelBody.state( 'opened' ) ).toBe( false );
+			const icon = panelBody.find( 'Dashicon' );
+			expect( icon.prop( 'icon' ) ).toBe( 'arrow-down' );
+		} );
+
 		it( 'should render child elements within PanelBody element', () => {
 			const panelBody = shallow( <PanelBody children="Some Text" /> );
 			expect( panelBody.instance().props.children ).toBe( 'Some Text' );

editor/actions.js

@@ -255,6 +255,19 @@ export function stopTyping() {
 	};
 }
 
+/**
+ * Returns an action object used in signalling that the user toggled a sidebar panel
+ *
+ * @param  {String} panel   The panel name
+ * @return {Object}         Action object
+ */
+export function toggleSidebarPanel( panel ) {
+	return {
+		type: 'TOGGLE_SIDEBAR_PANEL',
+		panel,
+	};
+}
+
 /**
  * Returns an action object used to create a notice
  *

editor/reducer.js

@@ -3,7 +3,7 @@
  */
 import optimist from 'redux-optimist';
 import { combineReducers } from 'redux';
-import { reduce, keyBy, first, last, omit, without, mapValues } from 'lodash';
+import { get, reduce, keyBy, first, last, omit, without, mapValues } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -441,13 +441,21 @@ export function mode( state = 'visual', action ) {
 	return state;
 }
 
-export function preferences( state = { isSidebarOpened: ! isMobile }, action ) {
+export function preferences( state = { isSidebarOpened: ! isMobile, panels: { 'post-status': true } }, action ) {
 	switch ( action.type ) {
 		case 'TOGGLE_SIDEBAR':
 			return {
-				... state,
+				...state,
 				isSidebarOpened: ! state.isSidebarOpened,
 			};
+		case 'TOGGLE_SIDEBAR_PANEL':
+			return {
+				...state,
+				panels: {
+					...state.panels,
+					[ action.panel ]: ! get( state, [ 'panels', action.panel ], false ),
+				},
+			};
 	}
 
 	return state;

editor/selectors.js

@@ -54,7 +54,7 @@ export function getPreference( state, preferenceKey ) {
 }
 
 /**
- * Returns true if the editor sidebar panel is open, or false otherwise.
+ * Returns true if the editor sidebar is open, or false otherwise.
  *
  * @param  {Object}  state Global application state
  * @return {Boolean}       Whether sidebar is open
@@ -63,6 +63,18 @@ export function isEditorSidebarOpened( state ) {
 	return getPreference( state, 'isSidebarOpened' );
 }
 
+/**
+ * Returns true if the editor sidebar panel is open, or false otherwise.
+ *
+ * @param  {Object}  state Global application state
+ * @param  {STring}  panel Sidebar panel name
+ * @return {Boolean}       Whether sidebar is open
+ */
+export function isEditorSidebarPanelOpened( state, panel ) {
+	const panels = getPreference( state, 'panels' );
+	return panels ? !! panels[ panel ] : false;
+}
+
 /**
  * Returns true if any past editor history snapshots exist, or false otherwise.
  *

editor/sidebar/discussion-panel/index.js

@@ -12,18 +12,24 @@ import { PanelBody, PanelRow, FormToggle, withInstanceId } from '@wordpress/comp
 /**
  * Internal Dependencies
  */
-import { getEditedPostAttribute } from '../../selectors';
-import { editPost } from '../../actions';
+import { getEditedPostAttribute, isEditorSidebarPanelOpened } from '../../selectors';
+import { editPost, toggleSidebarPanel } from '../../actions';
 
-function DiscussionPanel( { pingStatus = 'open', commentStatus = 'open', instanceId, ...props } ) {
+/**
+ * Module Constants
+ */
+const PANEL_NAME = 'discussion-panel';
+
+function DiscussionPanel( { pingStatus = 'open', commentStatus = 'open', instanceId, isOpened, ...props } ) {
 	const onTogglePingback = () => props.editPost( { ping_status: pingStatus === 'open' ? 'closed' : 'open' } );
 	const onToggleComments = () => props.editPost( { comment_status: commentStatus === 'open' ? 'closed' : 'open' } );
+	const onTogglePanel = () => props.toggleSidebarPanel( PANEL_NAME );
 
 	const commentsToggleId = 'allow-comments-toggle-' + instanceId;
 	const pingbacksToggleId = 'allow-pingbacks-toggle-' + instanceId;
 
 	return (
-		<PanelBody title={ __( 'Discussion' ) } initialOpen={ false }>
+		<PanelBody title={ __( 'Discussion' ) } opened={ isOpened } onToggle={ onTogglePanel }>
 			<PanelRow>
 				<label htmlFor={ commentsToggleId }>{ __( 'Allow Comments' ) }</label>
 				<FormToggle
@@ -51,8 +57,9 @@ export default connect(
 		return {
 			pingStatus: getEditedPostAttribute( state, 'ping_status' ),
 			commentStatus: getEditedPostAttribute( state, 'comment_status' ),
+			isOpened: isEditorSidebarPanelOpened( state, PANEL_NAME ),
 		};
 	},
-	{ editPost }
+	{ editPost, toggleSidebarPanel }
 )( withInstanceId( DiscussionPanel ) );
 

editor/sidebar/featured-image/index.js

@@ -15,12 +15,19 @@ import { MediaUploadButton } from '@wordpress/blocks';
  * Internal dependencies
  */
 import './style.scss';
-import { getEditedPostAttribute } from '../../selectors';
-import { editPost } from '../../actions';
+import { getEditedPostAttribute, isEditorSidebarPanelOpened } from '../../selectors';
+import { editPost, toggleSidebarPanel } from '../../actions';
+
+/**
+ * Module Constants
+ */
+const PANEL_NAME = 'featured-image';
+
+function FeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, media, isOpened, ...props } ) {
+	const onToggle = () => props.toggleSidebarPanel( PANEL_NAME );
 
-function FeaturedImage( { featuredImageId, onUpdateImage, onRemoveImage, media } ) {
 	return (
-		<PanelBody title={ __( 'Featured image' ) } initialOpen={ false }>
+		<PanelBody title={ __( 'Featured image' ) } opened={ isOpened } onToggle={ onToggle }>
 			<div className="editor-featured-image__content">
 				{ !! featuredImageId &&
 					<MediaUploadButton
@@ -67,17 +74,17 @@ const applyConnect = connect(
 	( state ) => {
 		return {
 			featuredImageId: getEditedPostAttribute( state, 'featured_media' ),
+			isOpened: isEditorSidebarPanelOpened( state, PANEL_NAME ),
 		};
 	},
-	( dispatch ) => {
-		return {
-			onUpdateImage( image ) {
-				dispatch( editPost( { featured_media: image.id } ) );
-			},
-			onRemoveImage() {
-				dispatch( editPost( { featured_media: null } ) );
-			},
-		};
+	{
+		onUpdateImage( image ) {
+			return editPost( { featured_media: image.id } );
+		},
+		onRemoveImage() {
+			return editPost( { featured_media: null } );
+		},
+		toggleSidebarPanel,
 	}
 );
 

editor/sidebar/page-attributes/index.js

@@ -14,14 +14,20 @@ import { PanelBody, PanelRow, withAPIData, withInstanceId } from '@wordpress/com
 /**
  * Internal dependencies
  */
-import { editPost } from '../../actions';
-import { getCurrentPostType, getEditedPostAttribute } from '../../selectors';
+import { editPost, toggleSidebarPanel } from '../../actions';
+import { getCurrentPostType, getEditedPostAttribute, isEditorSidebarPanelOpened } from '../../selectors';
+
+/**
+ * Module Constants
+ */
+const PANEL_NAME = 'page-attributes';
 
 export class PageAttributes extends Component {
 	constructor() {
 		super( ...arguments );
 
 		this.setUpdatedOrder = this.setUpdatedOrder.bind( this );
+		this.onToggle = this.onToggle.bind( this );
 
 		this.state = {
 			supportsPageAttributes: false,
@@ -35,8 +41,12 @@ export class PageAttributes extends Component {
 		}
 	}
 
+	onToggle() {
+		this.props.toggleSidebarPanel( PANEL_NAME );
+	}
+
 	render() {
-		const { instanceId, order, postType } = this.props;
+		const { instanceId, order, postType, isOpened } = this.props;
 		const supportsPageAttributes = get( postType.data, [
 			'supports',
 			'page-attributes',
@@ -53,7 +63,8 @@ export class PageAttributes extends Component {
 		return (
 			<PanelBody
 				title={ __( 'Page Attributes' ) }
-				initialOpen={ false }
+				opened={ isOpened }
+				onToggle={ this.onToggle }
 			>
 				<PanelRow>
 					<label htmlFor={ inputId }>
@@ -76,16 +87,16 @@ const applyConnect = connect(
 		return {
 			postTypeSlug: getCurrentPostType( state ),
 			order: getEditedPostAttribute( state, 'menu_order' ),
+			isOpened: isEditorSidebarPanelOpened( state, PANEL_NAME ),
 		};
 	},
-	( dispatch ) => {
-		return {
-			onUpdateOrder( order ) {
-				dispatch( editPost( {
-					menu_order: order,
-				} ) );
-			},
-		};
+	{
+		onUpdateOrder( order ) {
+			return editPost( {
+				menu_order: order,
+			} );
+		},
+		toggleSidebarPanel,
 	}
 );
 

editor/sidebar/post-excerpt/index.js

@@ -13,14 +13,20 @@ import { ExternalLink, PanelBody } from '@wordpress/components';
  * Internal Dependencies
  */
 import './style.scss';
-import { getEditedPostExcerpt } from '../../selectors';
-import { editPost } from '../../actions';
+import { getEditedPostExcerpt, isEditorSidebarPanelOpened } from '../../selectors';
+import { editPost, toggleSidebarPanel } from '../../actions';
 
-function PostExcerpt( { excerpt, onUpdateExcerpt } ) {
+/**
+ * Module Constants
+ */
+const PANEL_NAME = 'post-excerpt';
+
+function PostExcerpt( { excerpt, onUpdateExcerpt, isOpened, ...props } ) {
 	const onChange = ( event ) => onUpdateExcerpt( event.target.value );
+	const onTogglePanel = () => props.toggleSidebarPanel( PANEL_NAME );
 
 	return (
-		<PanelBody title={ __( 'Excerpt' ) } initialOpen={ false }>
+		<PanelBody title={ __( 'Excerpt' ) } opened={ isOpened } onToggle={ onTogglePanel }>
 			<textarea
 				className="editor-post-excerpt__textarea"
 				onChange={ onChange }
@@ -39,14 +45,14 @@ export default connect(
 	( state ) => {
 		return {
 			excerpt: getEditedPostExcerpt( state ),
+			isOpened: isEditorSidebarPanelOpened( state, PANEL_NAME ),
 		};
 	},
-	( dispatch ) => {
-		return {
-			onUpdateExcerpt( excerpt ) {
-				dispatch( editPost( { excerpt } ) );
-			},
-		};
+	{
+		onUpdateExcerpt( excerpt ) {
+			return editPost( { excerpt } );
+		},
+		toggleSidebarPanel,
 	}
 )( PostExcerpt );