diff --git a/packages/editor/src/components/post-saved-state/index.js b/packages/editor/src/components/post-saved-state/index.js
index 24b88d4d96dee1..ed3115d5a6c54a 100644
--- a/packages/editor/src/components/post-saved-state/index.js
+++ b/packages/editor/src/components/post-saved-state/index.js
@@ -29,14 +29,11 @@ import { store as editorStore } from '../../store';
* @param {Object} props Component props.
* @param {?boolean} props.forceIsDirty Whether to force the post to be marked
* as dirty.
- * @param {?boolean} props.forceIsSaving Whether to force the post to be marked
- * as being saved.
* @param {?boolean} props.showIconLabels Whether interface buttons show labels instead of icons
* @return {import('@wordpress/element').WPComponent} The component.
*/
export default function PostSavedState( {
forceIsDirty,
- forceIsSaving,
showIconLabels = false,
} ) {
const [ forceSavedMessage, setForceSavedMessage ] = useState( false );
@@ -72,14 +69,14 @@ export default function PostSavedState( {
isNew: isEditedPostNew(),
isPending: 'pending' === getEditedPostAttribute( 'status' ),
isPublished: isCurrentPostPublished(),
- isSaving: forceIsSaving || isSavingPost(),
+ isSaving: isSavingPost(),
isSaveable: isEditedPostSaveable(),
isScheduled: isCurrentPostScheduled(),
hasPublishAction:
getCurrentPost()?._links?.[ 'wp:action-publish' ] ?? false,
};
},
- [ forceIsDirty, forceIsSaving ]
+ [ forceIsDirty ]
);
const { savePost } = useDispatch( editorStore );
diff --git a/packages/editor/src/store/actions.js b/packages/editor/src/store/actions.js
index 390c19571542dc..ece8d62f689a56 100644
--- a/packages/editor/src/store/actions.js
+++ b/packages/editor/src/store/actions.js
@@ -11,6 +11,7 @@ import {
import { store as noticesStore } from '@wordpress/notices';
import { store as coreStore } from '@wordpress/core-data';
import { store as blockEditorStore } from '@wordpress/block-editor';
+import { applyFilters } from '@wordpress/hooks';
import { store as preferencesStore } from '@wordpress/preferences';
/**
@@ -177,15 +178,26 @@ export const savePost =
edits,
options
);
- dispatch( { type: 'REQUEST_POST_UPDATE_FINISH', options } );
- const error = registry
+ let error = registry
.select( coreStore )
.getLastEntitySaveError(
'postType',
previousRecord.type,
previousRecord.id
);
+
+ if ( ! error ) {
+ await applyFilters(
+ 'editor.__unstableSavePost',
+ Promise.resolve(),
+ options
+ ).catch( ( err ) => {
+ error = err;
+ } );
+ }
+ dispatch( { type: 'REQUEST_POST_UPDATE_FINISH', options } );
+
if ( error ) {
const args = getNotificationArgumentsForSaveFail( {
post: previousRecord,
@@ -289,6 +301,26 @@ export const autosave =
}
};
+export const __unstableSaveForPreview =
+ ( { forceIsAutosaveable } ) =>
+ async ( { select, dispatch } ) => {
+ if (
+ ( forceIsAutosaveable || select.isEditedPostAutosaveable() ) &&
+ ! select.isPostLocked()
+ ) {
+ const isDraft = [ 'draft', 'auto-draft' ].includes(
+ select.getEditedPostAttribute( 'status' )
+ );
+ if ( isDraft ) {
+ await dispatch.savePost( { isPreview: true } );
+ } else {
+ await dispatch.autosave( { isPreview: true } );
+ }
+ }
+
+ return select.getEditedPostPreviewLink();
+ };
+
/**
* Action that restores last popped state in undo history.
*/
diff --git a/packages/editor/src/store/selectors.js b/packages/editor/src/store/selectors.js
index 51b307dce9e7c4..a533851751b183 100644
--- a/packages/editor/src/store/selectors.js
+++ b/packages/editor/src/store/selectors.js
@@ -681,15 +681,9 @@ export function isDeletingPost( state ) {
*
* @return {boolean} Whether post is being saved.
*/
-export const isSavingPost = createRegistrySelector( ( select ) => ( state ) => {
- const postType = getCurrentPostType( state );
- const postId = getCurrentPostId( state );
- return select( coreStore ).isSavingEntityRecord(
- 'postType',
- postType,
- postId
- );
-} );
+export function isSavingPost( state ) {
+ return !! state.saving.pending;
+}
/**
* Returns true if non-post entities are currently being saved, or false otherwise.
@@ -760,10 +754,7 @@ export const didPostSaveRequestFail = createRegistrySelector(
* @return {boolean} Whether the post is autosaving.
*/
export function isAutosavingPost( state ) {
- if ( ! isSavingPost( state ) ) {
- return false;
- }
- return Boolean( state.saving.options?.isAutosave );
+ return isSavingPost( state ) && Boolean( state.saving.options?.isAutosave );
}
/**
@@ -774,10 +765,7 @@ export function isAutosavingPost( state ) {
* @return {boolean} Whether the post is being previewed.
*/
export function isPreviewingPost( state ) {
- if ( ! isSavingPost( state ) ) {
- return false;
- }
- return Boolean( state.saving.options?.isPreview );
+ return isSavingPost( state ) && Boolean( state.saving.options?.isPreview );
}
/**
diff --git a/packages/editor/src/store/test/selectors.js b/packages/editor/src/store/test/selectors.js
index 4b29e251f80c02..2a22b4523444ba 100644
--- a/packages/editor/src/store/test/selectors.js
+++ b/packages/editor/src/store/test/selectors.js
@@ -75,10 +75,6 @@ selectorNames.forEach( ( name ) => {
};
},
- isSavingEntityRecord() {
- return state.saving && state.saving.requesting;
- },
-
getLastEntitySaveError() {
const saving = state.saving;
const successful = saving && saving.successful;
@@ -1254,7 +1250,7 @@ describe( 'selectors', () => {
title: 'sassel',
},
saving: {
- requesting: true,
+ pending: true,
},
};
@@ -1403,9 +1399,8 @@ describe( 'selectors', () => {
currentPost: {
title: 'sassel',
},
- saving: {
- requesting: true,
- },
+ postAutosavingLock: {},
+ saving: {},
getCurrentUser() {},
hasFetchedAutosaves() {
return false;
@@ -1434,9 +1429,8 @@ describe( 'selectors', () => {
currentPost: {
title: 'sassel',
},
- saving: {
- requesting: true,
- },
+ postAutosavingLock: {},
+ saving: {},
getCurrentUser() {},
hasFetchedAutosaves() {
return true;
@@ -2017,7 +2011,7 @@ describe( 'selectors', () => {
it( 'should return true if the post is currently being saved', () => {
const state = {
saving: {
- requesting: true,
+ pending: true,
},
};
@@ -2027,7 +2021,7 @@ describe( 'selectors', () => {
it( 'should return false if the post is not currently being saved', () => {
const state = {
saving: {
- requesting: false,
+ pending: false,
},
};