Delay private publish

packages/e2e-tests/specs/editor/various/post-visibility.test.js

@@ -60,7 +60,12 @@ describe( 'Post visibility', () => {
 		const [ privateLabel ] = await page.$x( '//label[text()="Private"]' );
 		await privateLabel.click();
 
-		// Enter a title for this post.
+		// Publish private post
+		await page.click( '.editor-post-publish-panel__toggle' );
+
+		await page.click( '.editor-post-publish-button' );
+
+		// Enter a new title for this post.
 		await page.type( '.editor-post-title__input', ' Changed' );
 
 		await page.click( '.editor-post-publish-button' );

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

@@ -165,9 +165,10 @@ export class PostPublishButton extends Component {
 			onClick: this.createOnClick( onClickToggle ),
 		};
 
-		const toggleChildren = isBeingScheduled
-			? __( 'Schedule…' )
-			: __( 'Publish' );
+		const toggleChildren =
+			isBeingScheduled && publishStatus !== 'private'
+				? __( 'Schedule…' )
+				: __( 'Publish' );
 		const buttonChildren = (
 			<PublishButtonLabel
 				forceIsSaving={ forceIsSaving }

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

@@ -18,6 +18,7 @@ export function PublishButtonLabel( {
 	hasPublishAction,
 	isAutosaving,
 	hasNonPostEntityChanges,
+	visibility,
 } ) {
 	if ( isPublishing ) {
 		return __( 'Publishing…' );
@@ -31,10 +32,10 @@ export function PublishButtonLabel( {
 		return hasNonPostEntityChanges
 			? __( 'Submit for Review…' )
 			: __( 'Submit for Review' );
+	} else if ( isBeingScheduled && 'private' !== visibility ) {
+		return hasNonPostEntityChanges ? __( 'Schedule…' ) : __( 'Schedule' );
 	} else if ( isPublished ) {
 		return hasNonPostEntityChanges ? __( 'Update…' ) : __( 'Update' );
-	} else if ( isBeingScheduled ) {
-		return hasNonPostEntityChanges ? __( 'Schedule…' ) : __( 'Schedule' );
 	}
 
 	return __( 'Publish' );
@@ -50,6 +51,7 @@ export default compose( [
 			getCurrentPost,
 			getCurrentPostType,
 			isAutosavingPost,
+			getEditedPostVisibility,
 		} = select( 'core/editor' );
 		return {
 			isPublished: isCurrentPostPublished(),
@@ -63,6 +65,7 @@ export default compose( [
 			),
 			postType: getCurrentPostType(),
 			isAutosaving: isAutosavingPost(),
+			visibility: getEditedPostVisibility(),
 		};
 	} ),
 ] )( PublishButtonLabel );

packages/editor/src/components/post-publish-panel/prepublish.js

@@ -24,6 +24,7 @@ function PostPublishPanelPrepublish( {
 	hasPublishAction,
 	isBeingScheduled,
 	children,
+	visibility,
 } ) {
 	let prePublishTitle, prePublishBodyText;
 
@@ -32,7 +33,7 @@ function PostPublishPanelPrepublish( {
 		prePublishBodyText = __(
 			'When you’re ready, submit your work for review, and an Editor will be able to approve it for you.'
 		);
-	} else if ( isBeingScheduled ) {
+	} else if ( isBeingScheduled && 'private' !== visibility ) {
 		prePublishTitle = __( 'Are you ready to schedule?' );
 		prePublishBodyText = __(
 			'Your work will be published at the specified date and time.'
@@ -90,15 +91,18 @@ function PostPublishPanelPrepublish( {
 }
 
 export default withSelect( ( select ) => {
-	const { getCurrentPost, isEditedPostBeingScheduled } = select(
-		'core/editor'
-	);
+	const {
+		getCurrentPost,
+		isEditedPostBeingScheduled,
+		getEditedPostVisibility,
+	} = select( 'core/editor' );
 	return {
 		hasPublishAction: get(
 			getCurrentPost(),
 			[ '_links', 'wp:action-publish' ],
 			false
 		),
 		isBeingScheduled: isEditedPostBeingScheduled(),
+		visibility: getEditedPostVisibility(),
 	};
 } )( PostPublishPanelPrepublish );

packages/editor/src/components/post-saved-state/index.js

@@ -56,6 +56,7 @@ export class PostSavedState extends Component {
 			isAutosaving,
 			isPending,
 			isLargeViewport,
+			isPrivate,
 		} = this.props;
 		const { forceSavedMessage } = this.state;
 		if ( isSaving ) {
@@ -93,7 +94,7 @@ export class PostSavedState extends Component {
 			return <PostSwitchToDraftButton />;
 		}
 
-		if ( ! isSaveable ) {
+		if ( ! isSaveable || isPrivate ) {
 			return null;
 		}
 
@@ -166,6 +167,7 @@ export default compose( [
 			isSaveable: isEditedPostSaveable(),
 			isAutosaving: isAutosavingPost(),
 			isPending: 'pending' === getEditedPostAttribute( 'status' ),
+			isPrivate: 'private' === getEditedPostAttribute( 'status' ),
 		};
 	} ),
 	withDispatch( ( dispatch ) => ( {

packages/editor/src/components/post-visibility/index.js

@@ -33,20 +33,10 @@ export class PostVisibility extends Component {
 	}
 
 	setPrivate() {
-		if (
-			// eslint-disable-next-line no-alert
-			! window.confirm(
-				__( 'Would you like to privately publish this post now?' )
-			)
-		) {
-			return;
-		}
-
-		const { onUpdateVisibility, onSave } = this.props;
+		const { onUpdateVisibility } = this.props;
 
 		onUpdateVisibility( 'private' );
 		this.setState( { hasPassword: false } );
-		onSave();
 	}
 
 	setPasswordProtected() {
@@ -159,9 +149,8 @@ export default compose( [
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { savePost, editPost } = dispatch( 'core/editor' );
+		const { editPost } = dispatch( 'core/editor' );
 		return {
-			onSave: savePost,
 			onUpdateVisibility( status, password = '' ) {
 				editPost( { status, password } );
 			},

packages/editor/src/store/selectors.js

@@ -746,18 +746,20 @@ export function isEditedPostBeingScheduled( state ) {
  * infer that a post is set to publish "Immediately" we check whether the date
  * and modified date are the same.
  *
- * @param {Object} state Editor state.
+ * @param  {Object}  state Editor state.
  *
  * @return {boolean} Whether the edited post has a floating date value.
  */
 export function isEditedPostDateFloating( state ) {
 	const date = getEditedPostAttribute( state, 'date' );
 	const modified = getEditedPostAttribute( state, 'modified' );
 	const status = getEditedPostAttribute( state, 'status' );
+	const savedStatus = getCurrentPostAttribute( state, 'status' );
 	if (
 		status === 'draft' ||
 		status === 'auto-draft' ||
-		status === 'pending'
+		status === 'pending' ||
+		( status === 'private' && status !== savedStatus )
 	) {
 		return date === modified;
 	}