PostPublishPanel: return focus to element that opened the panel

docs/reference/deprecated.md

@@ -1,5 +1,9 @@
 Gutenberg's deprecation policy is intended to support backwards-compatibility for releases, when possible. The current deprecations are listed below and are grouped by _the version at which they will be removed completely_. If your plugin depends on these behaviors, you must update to the recommended alternative before the noted version.
 
+## 5.1
+
+- `wp.editor.PostPublishPanelToggle` has been deprecated in favor of `wp.editor.PostPublishButton`.
+
 ## 4.5.0
 - `Dropdown.refresh()` has been deprecated as the contained `Popover` is now automatically refreshed.
 

packages/edit-post/src/components/header/index.js

@@ -39,34 +39,32 @@ function Header( {
 			tabIndex="-1"
 		>
 			<HeaderToolbar />
-			{ ! isPublishSidebarOpened && (
-				<div className="edit-post-header__settings">
-					<PostSavedState
-						forceIsDirty={ hasActiveMetaboxes }
-						forceIsSaving={ isSaving }
+			<div className="edit-post-header__settings">
+				{ ! isPublishSidebarOpened && ( <PostSavedState
+					forceIsDirty={ hasActiveMetaboxes }
+					forceIsSaving={ isSaving }
+				/> ) }
+				<PostPreviewButton />
+				<PostPublishButtonOrToggle
+					forceIsDirty={ hasActiveMetaboxes }
+					forceIsSaving={ isSaving }
+				/>
+				<div>
+					<IconButton
+						icon="admin-generic"
+						label={ __( 'Settings' ) }
+						onClick={ toggleGeneralSidebar }
+						isToggled={ isEditorSidebarOpened }
+						aria-expanded={ isEditorSidebarOpened }
+						shortcut={ shortcuts.toggleSidebar }
 					/>
-					<PostPreviewButton />
-					<PostPublishButtonOrToggle
-						forceIsDirty={ hasActiveMetaboxes }
-						forceIsSaving={ isSaving }
-					/>
-					<div>
-						<IconButton
-							icon="admin-generic"
-							label={ __( 'Settings' ) }
-							onClick={ toggleGeneralSidebar }
-							isToggled={ isEditorSidebarOpened }
-							aria-expanded={ isEditorSidebarOpened }
-							shortcut={ shortcuts.toggleSidebar }
-						/>
-						<DotTip tipId="core/editor.settings">
-							{ __( 'You’ll find more settings for your page and blocks in the sidebar. Click “Settings” to open it.' ) }
-						</DotTip>
-					</div>
-					<PinnedPlugins.Slot />
-					<MoreMenu />
+					<DotTip tipId="core/editor.settings">
+						{ __( 'You’ll find more settings for your page and blocks in the sidebar. Click “Settings” to open it.' ) }
+					</DotTip>
 				</div>
-			) }
+				<PinnedPlugins.Slot />
+				<MoreMenu />
+			</div>
 		</div>
 	);
 }

packages/edit-post/src/components/header/post-publish-button-or-toggle.js

@@ -6,9 +6,9 @@ import { get } from 'lodash';
 /**
  * WordPress dependencies.
  */
-import { PostPublishPanelToggle, PostPublishButton } from '@wordpress/editor';
 import { compose } from '@wordpress/compose';
 import { withDispatch, withSelect } from '@wordpress/data';
+import { PostPublishButton } from '@wordpress/editor';
 import { withViewportMatch } from '@wordpress/viewport';
 
 export function PostPublishButtonOrToggle( {
@@ -24,54 +24,54 @@ export function PostPublishButtonOrToggle( {
 	isScheduled,
 	togglePublishSidebar,
 } ) {
-	const button = (
-		<PostPublishButton
-			forceIsDirty={ forceIsDirty }
-			forceIsSaving={ forceIsSaving }
-		/>
-	);
-	const toggle = (
-		<PostPublishPanelToggle
-			isOpen={ isPublishSidebarOpened }
-			onToggle={ togglePublishSidebar }
-			forceIsSaving={ forceIsSaving }
-			forceIsDirty={ forceIsDirty }
-		/>
-	);
+	const IS_TOGGLE = 'toggle';
+	const IS_BUTTON = 'button';
+	let component;
 
 	/**
-	 * We want to show a BUTTON when the post status is at the _final stage_
+	 * Conditions to show a BUTTON (publish directly) or a TOGGLE (open publish sidebar):
+	 *
+	 * 1) We want to show a BUTTON when the post status is at the _final stage_
 	 * for a particular role (see https://codex.wordpress.org/Post_Status):
 	 *
 	 * - is published
 	 * - is scheduled to be published
-	 * - is pending and can't be published (but only for viewports >= medium)
+	 * - is pending and can't be published (but only for viewports >= medium).
+	 * 	 Originally, we considered showing a button for pending posts that couldn't be published
+	 * 	 (for ex, for a contributor role). Some languages can have really long translations
+	 * 	 for "Submit for review", so given the lack of UI real state available
+	 * 	 we decided to take into account the viewport in that particular case.
+	 *
+	 * 2) Then, in small viewports, we'll show a TOGGLE.
 	 *
-	 * Originally we considered showing a button for pending posts
-	 * that couldn't be published (for ex, for a contributor role).
-	 * Some languages can have really long translations for "Submit for review",
-	 * so given the lack of UI real state we decided to take into account the viewport
-	 * in that particular case.
+	 * 3) Finally, we'll use the publish sidebar status to decide:
+	 *
+	 * - if it is enabled, we show a TOGGLE
+	 * - if it is disabled, we show a BUTTON
 	 */
 	if (
 		isPublished ||
 		( isScheduled && isBeingScheduled ) ||
 		( isPending && ! hasPublishAction && ! isLessThanMediumViewport )
 	) {
-		return button;
+		component = IS_BUTTON;
+	} else if ( isLessThanMediumViewport ) {
+		component = IS_TOGGLE;
+	} else if ( isPublishSidebarEnabled ) {
+		component = IS_TOGGLE;
+	} else {
+		component = IS_BUTTON;
 	}
 
-	/**
-	 * Then, we take other things into account:
-	 *
-	 * - Show TOGGLE if it is small viewport.
-	 * - Otherwise, use publish sidebar status to decide - TOGGLE if enabled, BUTTON if not.
-	 */
-	if ( isLessThanMediumViewport ) {
-		return toggle;
-	}
-
-	return isPublishSidebarEnabled ? toggle : button;
+	return (
+		<PostPublishButton
+			forceIsDirty={ forceIsDirty }
+			forceIsSaving={ forceIsSaving }
+			isOpen={ isPublishSidebarOpened }
+			isToggle={ component === IS_TOGGLE }
+			onToggle={ togglePublishSidebar }
+		/>
+	);
 }
 
 export default compose(

packages/edit-post/src/components/header/test/__snapshots__/index.js.snap

@@ -1,13 +1,37 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PostPublishButtonOrToggle should render a button when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is disabled 1`] = `<WithSelect(WithDispatch(PostPublishButton)) />`;
+exports[`PostPublishButtonOrToggle should render a button when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is disabled 1`] = `
+<WithSelect(WithDispatch(PostPublishButton))
+  isToggle={false}
+/>
+`;
 
-exports[`PostPublishButtonOrToggle should render a button when the post is pending and cannot be published but the viewport is >= medium (3) 1`] = `<WithSelect(WithDispatch(PostPublishButton)) />`;
+exports[`PostPublishButtonOrToggle should render a button when the post is pending and cannot be published but the viewport is >= medium (3) 1`] = `
+<WithSelect(WithDispatch(PostPublishButton))
+  isToggle={false}
+/>
+`;
 
-exports[`PostPublishButtonOrToggle should render a button when the post is published (1) 1`] = `<WithSelect(WithDispatch(PostPublishButton)) />`;
+exports[`PostPublishButtonOrToggle should render a button when the post is published (1) 1`] = `
+<WithSelect(WithDispatch(PostPublishButton))
+  isToggle={false}
+/>
+`;
 
-exports[`PostPublishButtonOrToggle should render a button when the post is scheduled (2) 1`] = `<WithSelect(WithDispatch(PostPublishButton)) />`;
+exports[`PostPublishButtonOrToggle should render a button when the post is scheduled (2) 1`] = `
+<WithSelect(WithDispatch(PostPublishButton))
+  isToggle={false}
+/>
+`;
 
-exports[`PostPublishButtonOrToggle should render a toggle when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is enabled 1`] = `<WithSelect(PostPublishPanelToggle) />`;
+exports[`PostPublishButtonOrToggle should render a toggle when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is enabled 1`] = `
+<WithSelect(WithDispatch(PostPublishButton))
+  isToggle={true}
+/>
+`;
 
-exports[`PostPublishButtonOrToggle should render a toggle when post is not published or scheduled and the viewport is < medium 1`] = `<WithSelect(PostPublishPanelToggle) />`;
+exports[`PostPublishButtonOrToggle should render a toggle when post is not published or scheduled and the viewport is < medium 1`] = `
+<WithSelect(WithDispatch(PostPublishButton))
+  isToggle={true}
+/>
+`;

packages/editor/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 6.2.1 (Unreleased)
 
+### Deprecations
+
+- `wp.editor.PostPublishPanelToggle` has been deprecated in favor of `wp.editor.PostPublishButton`.
+
 ### Polish
 
 - Reactive block styles.

packages/editor/src/components/post-publish-button/index.js

@@ -10,6 +10,8 @@ import { Button } from '@wordpress/components';
 import { Component, createRef } from '@wordpress/element';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
+import { __ } from '@wordpress/i18n';
+import { DotTip } from '@wordpress/nux';
 
 /**
  * Internal dependencies
@@ -28,19 +30,22 @@ export class PostPublishButton extends Component {
 
 	render() {
 		const {
-			isSaving,
-			onStatusChange,
-			onSave,
+			forceIsDirty,
+			forceIsSaving,
+			hasPublishAction,
 			isBeingScheduled,
-			visibility,
-			isPublishable,
-			isSaveable,
+			isOpen,
 			isPostSavingLocked,
+			isPublishable,
 			isPublished,
-			hasPublishAction,
+			isSaveable,
+			isSaving,
+			isToggle,
+			onSave,
+			onStatusChange,
 			onSubmit = noop,
-			forceIsDirty,
-			forceIsSaving,
+			onToggle,
+			visibility,
 		} = this.props;
 		const isButtonDisabled =
 			isSaving ||
@@ -49,6 +54,13 @@ export class PostPublishButton extends Component {
 			isPostSavingLocked ||
 			( ! isPublishable && ! forceIsDirty );
 
+		const isToggleDisabled =
+			isPublished ||
+			isSaving ||
+			forceIsSaving ||
+			! isSaveable ||
+			( ! isPublishable && ! forceIsDirty );
+
 		let publishStatus;
 		if ( ! hasPublishAction ) {
 			publishStatus = 'pending';
@@ -66,17 +78,38 @@ export class PostPublishButton extends Component {
 			onSave();
 		};
 
+		const buttonProps = {
+			'aria-disabled': isButtonDisabled,
+			className: 'editor-post-publish-button',
+			isBusy: isSaving && isPublished,
+			isLarge: true,
+			isPrimary: true,
+			onClick,
+		};
+
+		const toggleProps = {
+			'aria-disabled': isToggleDisabled,
+			'aria-expanded': isOpen,
+			className: 'editor-post-publish-panel__toggle',
+			isBusy: isSaving && isPublished,
+			isPrimary: true,
+			onClick: onToggle,
+		};
+
+		const toggleChildren = isBeingScheduled ? __( 'Schedule…' ) : __( 'Publish…' );
+		const buttonChildren = <PublishButtonLabel forceIsSaving={ forceIsSaving } />;
+
+		const componentProps = isToggle ? toggleProps : buttonProps;
+		const componentChildren = isToggle ? toggleChildren : buttonChildren;
 		return (
 			<Button
 				ref={ this.buttonNode }
-				className="editor-post-publish-button"
-				isPrimary
-				isLarge
-				onClick={ onClick }
-				disabled={ isButtonDisabled }
-				isBusy={ isSaving && isPublished }
+				{ ...componentProps }
 			>
-				<PublishButtonLabel forceIsSaving={ forceIsSaving } />
+				{ componentChildren }
+				<DotTip tipId="core/editor.publish">
+					{ __( 'Finished writing? That’s great, let’s get this published right now. Just click “Publish” and you’re good to go.' ) }
+				</DotTip>
 			</Button>
 		);
 	}