@wordpress/editor 12.2.1 → 12.2.2

package/src/store/actions.js

@@ -6,9 +6,8 @@ import { has } from 'lodash';
 /**
  * WordPress dependencies
  */
+import apiFetch from '@wordpress/api-fetch';
 import deprecated from '@wordpress/deprecated';
-import { controls } from '@wordpress/data';
-import { apiFetch } from '@wordpress/data-controls';
 import {
 	parse,
 	synchronizeBlocksWithTemplate,
@@ -21,7 +20,8 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
 /**
  * Internal dependencies
  */
-import { STORE_NAME, TRASH_POST_NOTICE_ID } from './constants';
+import { TRASH_POST_NOTICE_ID } from './constants';
+import { localAutosaveSet } from './local-autosave';
 import {
 	getNotificationArgumentsForSaveSuccess,
 	getNotificationArgumentsForSaveFail,
@@ -36,15 +36,8 @@ import {
  * @param {Object} edits    Initial edited attributes object.
  * @param {Array?} template Block Template.
  */
-export function* setupEditor( post, edits, template ) {
-	yield resetPost( post );
-	yield {
-		type: 'SETUP_EDITOR',
-		post,
-		edits,
-		template,
-	};
-	yield setupEditorState( post );
+export const setupEditor = ( post, edits, template ) => ( { dispatch } ) => {
+	dispatch.setupEditorState( post );
 	// Apply a template for new posts only, if exists.
 	const isNewPost = post.status === 'auto-draft';
 	if ( isNewPost && template ) {
@@ -59,21 +52,19 @@ export function* setupEditor( post, edits, template ) {
 		}
 		let blocks = parse( content );
 		blocks = synchronizeBlocksWithTemplate( blocks, template );
-		yield resetEditorBlocks( blocks, {
+		dispatch.resetEditorBlocks( blocks, {
 			__unstableShouldCreateUndoLevel: false,
 		} );
 	}
 	if (
 		edits &&
-		Object.keys( edits ).some(
-			( key ) =>
-				edits[ key ] !==
-				( has( post, [ key, 'raw' ] ) ? post[ key ].raw : post[ key ] )
+		Object.values( edits ).some(
+			( [ key, edit ] ) => edit !== ( post[ key ]?.raw ?? post[ key ] )
 		)
 	) {
-		yield editPost( edits );
+		dispatch.editPost( edits );
 	}
-}
+};
 
 /**
  * Returns an action object signalling that the editor is being destroyed and
@@ -89,43 +80,15 @@ export function __experimentalTearDownEditor() {
  * Returns an action object used in signalling that the latest version of the
  * post has been received, either by initialization or save.
  *
- * @param {Object} post Post object.
- *
- * @return {Object} Action object.
- */
-export function resetPost( post ) {
-	return {
-		type: 'RESET_POST',
-		post,
-	};
-}
-
-/**
- * Action for dispatching that a post update request has started.
- *
- * @param {Object} options
- *
- * @return {Object} An action object
- */
-export function __experimentalRequestPostUpdateStart( options = {} ) {
-	return {
-		type: 'REQUEST_POST_UPDATE_START',
-		options,
-	};
-}
-
-/**
- * Action for dispatching that a post update request has finished.
- *
- * @param {Object} options
- *
- * @return {Object} An action object
+ * @deprecated Since WordPress 6.0.
  */
-export function __experimentalRequestPostUpdateFinish( options = {} ) {
-	return {
-		type: 'REQUEST_POST_UPDATE_FINISH',
-		options,
-	};
+export function resetPost() {
+	deprecated( "wp.data.dispatch( 'core/editor' ).resetPost", {
+		since: '6.0',
+		version: '6.3',
+		alternative: 'Initialize the editor with the setupEditorState action',
+	} );
+	return { type: 'DO_NOTHING' };
 }
 
 /**
@@ -166,73 +129,59 @@ export function setupEditorState( post ) {
  *
  * @param {Object} edits   Post attributes to edit.
  * @param {Object} options Options for the edit.
- *
- * @yield {Object} Action object or control.
- */
-export function* editPost( edits, options ) {
-	const { id, type } = yield controls.select( STORE_NAME, 'getCurrentPost' );
-	yield controls.dispatch(
-		coreStore,
-		'editEntityRecord',
-		'postType',
-		type,
-		id,
-		edits,
-		options
-	);
-}
+ */
+export const editPost = ( edits, options ) => ( { select, registry } ) => {
+	const { id, type } = select.getCurrentPost();
+	registry
+		.dispatch( coreStore )
+		.editEntityRecord( 'postType', type, id, edits, options );
+};
 
 /**
- * Action generator for saving the current post in the editor.
+ * Action for saving the current post in the editor.
  *
  * @param {Object} options
  */
-export function* savePost( options = {} ) {
-	if ( ! ( yield controls.select( STORE_NAME, 'isEditedPostSaveable' ) ) ) {
+export const savePost = ( options = {} ) => async ( {
+	select,
+	dispatch,
+	registry,
+} ) => {
+	if ( ! select.isEditedPostSaveable() ) {
 		return;
 	}
-	let edits = {
-		content: yield controls.select( STORE_NAME, 'getEditedPostContent' ),
-	};
+
+	const content = select.getEditedPostContent();
+
 	if ( ! options.isAutosave ) {
-		yield controls.dispatch( STORE_NAME, 'editPost', edits, {
-			undoIgnore: true,
-		} );
+		dispatch.editPost( { content }, { undoIgnore: true } );
 	}
 
-	yield __experimentalRequestPostUpdateStart( options );
-	const previousRecord = yield controls.select(
-		STORE_NAME,
-		'getCurrentPost'
-	);
-	edits = {
+	const previousRecord = select.getCurrentPost();
+	const edits = {
 		id: previousRecord.id,
-		...( yield controls.select(
-			coreStore,
-			'getEntityRecordNonTransientEdits',
+		...registry
+			.select( coreStore )
+			.getEntityRecordNonTransientEdits(
+				'postType',
+				previousRecord.type,
+				previousRecord.id
+			),
+		content,
+	};
+	dispatch( { type: 'REQUEST_POST_UPDATE_START', options } );
+	await registry
+		.dispatch( coreStore )
+		.saveEntityRecord( 'postType', previousRecord.type, edits, options );
+	dispatch( { type: 'REQUEST_POST_UPDATE_FINISH', options } );
+
+	const error = registry
+		.select( coreStore )
+		.getLastEntitySaveError(
 			'postType',
 			previousRecord.type,
 			previousRecord.id
-		) ),
-		...edits,
-	};
-	yield controls.dispatch(
-		coreStore,
-		'saveEntityRecord',
-		'postType',
-		previousRecord.type,
-		edits,
-		options
-	);
-	yield __experimentalRequestPostUpdateFinish( options );
-
-	const error = yield controls.select(
-		coreStore,
-		'getLastEntitySaveError',
-		'postType',
-		previousRecord.type,
-		previousRecord.id
-	);
+		);
 	if ( error ) {
 		const args = getNotificationArgumentsForSaveFail( {
 			post: previousRecord,
@@ -240,44 +189,30 @@ export function* savePost( options = {} ) {
 			error,
 		} );
 		if ( args.length ) {
-			yield controls.dispatch(
-				noticesStore,
-				'createErrorNotice',
-				...args
-			);
+			registry.dispatch( noticesStore ).createErrorNotice( ...args );
 		}
 	} else {
-		const updatedRecord = yield controls.select(
-			STORE_NAME,
-			'getCurrentPost'
-		);
+		const updatedRecord = select.getCurrentPost();
 		const args = getNotificationArgumentsForSaveSuccess( {
 			previousPost: previousRecord,
 			post: updatedRecord,
-			postType: yield controls.resolveSelect(
-				coreStore,
-				'getPostType',
-				updatedRecord.type
-			),
+			postType: await registry
+				.resolveSelect( coreStore )
+				.getPostType( updatedRecord.type ),
 			options,
 		} );
 		if ( args.length ) {
-			yield controls.dispatch(
-				noticesStore,
-				'createSuccessNotice',
-				...args
-			);
+			registry.dispatch( noticesStore ).createSuccessNotice( ...args );
 		}
 		// Make sure that any edits after saving create an undo level and are
 		// considered for change detection.
 		if ( ! options.isAutosave ) {
-			yield controls.dispatch(
-				blockEditorStore,
-				'__unstableMarkLastChangeAsPersistent'
-			);
+			registry
+				.dispatch( blockEditorStore )
+				.__unstableMarkLastChangeAsPersistent();
 		}
 	}
-}
+};
 
 /**
  * Action for refreshing the current post.
@@ -294,104 +229,68 @@ export function refreshPost() {
 }
 
 /**
- * Action generator for trashing the current post in the editor.
- */
-export function* trashPost() {
-	const postTypeSlug = yield controls.select(
-		STORE_NAME,
-		'getCurrentPostType'
-	);
-	const postType = yield controls.resolveSelect(
-		coreStore,
-		'getPostType',
-		postTypeSlug
-	);
-	yield controls.dispatch(
-		noticesStore,
-		'removeNotice',
-		TRASH_POST_NOTICE_ID
-	);
+ * Action for trashing the current post in the editor.
+ */
+export const trashPost = () => async ( { select, dispatch, registry } ) => {
+	const postTypeSlug = select.getCurrentPostType();
+	const postType = await registry
+		.resolveSelect( coreStore )
+		.getPostType( postTypeSlug );
+	registry.dispatch( noticesStore ).removeNotice( TRASH_POST_NOTICE_ID );
 	try {
-		const post = yield controls.select( STORE_NAME, 'getCurrentPost' );
-		yield apiFetch( {
+		const post = select.getCurrentPost();
+		await apiFetch( {
 			path: `/wp/v2/${ postType.rest_base }/${ post.id }`,
 			method: 'DELETE',
 		} );
 
-		yield controls.dispatch( STORE_NAME, 'savePost' );
+		await dispatch.savePost();
 	} catch ( error ) {
-		yield controls.dispatch(
-			noticesStore,
-			'createErrorNotice',
-			...getNotificationArgumentsForTrashFail( { error } )
-		);
+		registry
+			.dispatch( noticesStore )
+			.createErrorNotice(
+				...getNotificationArgumentsForTrashFail( { error } )
+			);
 	}
-}
+};
 
 /**
- * Action generator used in signalling that the post should autosave.  This
+ * Action that autosaves the current post.  This
  * includes server-side autosaving (default) and client-side (a.k.a. local)
  * autosaving (e.g. on the Web, the post might be committed to Session
  * Storage).
  *
  * @param {Object?} options Extra flags to identify the autosave.
  */
-export function* autosave( { local = false, ...options } = {} ) {
+export const autosave = ( { local = false, ...options } = {} ) => async ( {
+	select,
+	dispatch,
+} ) => {
 	if ( local ) {
-		const post = yield controls.select( STORE_NAME, 'getCurrentPost' );
-		const isPostNew = yield controls.select(
-			STORE_NAME,
-			'isEditedPostNew'
-		);
-		const title = yield controls.select(
-			STORE_NAME,
-			'getEditedPostAttribute',
-			'title'
-		);
-		const content = yield controls.select(
-			STORE_NAME,
-			'getEditedPostAttribute',
-			'content'
-		);
-		const excerpt = yield controls.select(
-			STORE_NAME,
-			'getEditedPostAttribute',
-			'excerpt'
-		);
-		yield {
-			type: 'LOCAL_AUTOSAVE_SET',
-			postId: post.id,
-			isPostNew,
-			title,
-			content,
-			excerpt,
-		};
+		const post = select.getCurrentPost();
+		const isPostNew = select.isEditedPostNew();
+		const title = select.getEditedPostAttribute( 'title' );
+		const content = select.getEditedPostAttribute( 'content' );
+		const excerpt = select.getEditedPostAttribute( 'excerpt' );
+		localAutosaveSet( post.id, isPostNew, title, content, excerpt );
 	} else {
-		yield controls.dispatch( STORE_NAME, 'savePost', {
-			isAutosave: true,
-			...options,
-		} );
+		await dispatch.savePost( { isAutosave: true, ...options } );
 	}
-}
+};
 
 /**
- * Returns an action object used in signalling that undo history should
- * restore last popped state.
- *
- * @yield {Object} Action object.
+ * Action that restores last popped state in undo history.
  */
-export function* redo() {
-	yield controls.dispatch( coreStore, 'redo' );
-}
+export const redo = () => ( { registry } ) => {
+	registry.dispatch( coreStore ).redo();
+};
 
 /**
- * Returns an action object used in signalling that undo history should pop.
- *
- * @yield {Object} Action object.
+ * Action that pops a record from undo history and undoes the edit.
  */
-export function* undo() {
-	yield controls.dispatch( coreStore, 'undo' );
-}
+export const undo = () => ( { registry } ) => {
+	registry.dispatch( coreStore ).undo();
+};
 
 /**
  * Action that creates an undo history record.
@@ -408,10 +307,9 @@ export function createUndoLevel() {
 }
 
 /**
- * Returns an action object used to lock the editor.
+ * Action that locks the editor.
  *
  * @param {Object} lock Details about the post lock status, user, and nonce.
- *
  * @return {Object} Action object.
  */
 export function updatePostLock( lock ) {
@@ -422,8 +320,7 @@ export function updatePostLock( lock ) {
 }
 
 /**
- * Returns an action object used in signalling that the user has enabled the
- * publish sidebar.
+ * Action that enables the publish sidebar.
  *
  * @return {Object} Action object
  */
@@ -434,8 +331,7 @@ export function enablePublishSidebar() {
 }
 
 /**
- * Returns an action object used in signalling that the user has disabled the
- * publish sidebar.
+ * Action that disables the publish sidebar.
  *
  * @return {Object} Action object
  */
@@ -446,7 +342,7 @@ export function disablePublishSidebar() {
 }
 
 /**
- * Returns an action object used to signal that post saving is locked.
+ * Action that locks post saving.
  *
  * @param {string} lockName The lock name.
  *
@@ -496,7 +392,7 @@ export function lockPostSaving( lockName ) {
 }
 
 /**
- * Returns an action object used to signal that post saving is unlocked.
+ * Action that unlocks post saving.
  *
  * @param {string} lockName The lock name.
  *
@@ -516,7 +412,7 @@ export function unlockPostSaving( lockName ) {
 }
 
 /**
- * Returns an action object used to signal that post autosaving is locked.
+ * Action that locks post autosaving.
  *
  * @param {string} lockName The lock name.
  *
@@ -536,7 +432,7 @@ export function lockPostAutosaving( lockName ) {
 }
 
 /**
- * Returns an action object used to signal that post autosaving is unlocked.
+ * Action that unlocks post autosaving.
  *
  * @param {string} lockName The lock name.
  *
@@ -560,34 +456,27 @@ export function unlockPostAutosaving( lockName ) {
  *
  * @param {Array}   blocks  Block Array.
  * @param {?Object} options Optional options.
- *
- * @yield {Object} Action object
  */
-export function* resetEditorBlocks( blocks, options = {} ) {
+export const resetEditorBlocks = ( blocks, options = {} ) => ( {
+	select,
+	dispatch,
+	registry,
+} ) => {
 	const { __unstableShouldCreateUndoLevel, selection } = options;
 	const edits = { blocks, selection };
 
 	if ( __unstableShouldCreateUndoLevel !== false ) {
-		const { id, type } = yield controls.select(
-			STORE_NAME,
-			'getCurrentPost'
-		);
+		const { id, type } = select.getCurrentPost();
 		const noChange =
-			( yield controls.select(
-				coreStore,
-				'getEditedEntityRecord',
-				'postType',
-				type,
-				id
-			) ).blocks === edits.blocks;
+			registry
+				.select( coreStore )
+				.getEditedEntityRecord( 'postType', type, id ).blocks ===
+			edits.blocks;
 		if ( noChange ) {
-			return yield controls.dispatch(
-				coreStore,
-				'__unstableCreateUndoLevel',
-				'postType',
-				type,
-				id
-			);
+			registry
+				.dispatch( coreStore )
+				.__unstableCreateUndoLevel( 'postType', type, id );
+			return;
 		}
 
 		// We create a new function here on every persistent edit
@@ -596,8 +485,9 @@ export function* resetEditorBlocks( blocks, options = {} ) {
 		edits.content = ( { blocks: blocksForSerialization = [] } ) =>
 			__unstableSerializeAndClean( blocksForSerialization );
 	}
-	yield* editPost( edits );
-}
+
+	dispatch.editPost( edits );
+};
 
 /*
  * Returns an action object used in signalling that the post editor settings have been updated.
@@ -617,16 +507,14 @@ export function updateEditorSettings( settings ) {
  * Backward compatibility
  */
 
-const getBlockEditorAction = ( name ) =>
-	function* ( ...args ) {
-		deprecated( "`wp.data.dispatch( 'core/editor' )." + name + '`', {
-			since: '5.3',
-			alternative:
-				"`wp.data.dispatch( 'core/block-editor' )." + name + '`',
-			version: '6.2',
-		} );
-		yield controls.dispatch( blockEditorStore, name, ...args );
-	};
+const getBlockEditorAction = ( name ) => ( ...args ) => ( { registry } ) => {
+	deprecated( "`wp.data.dispatch( 'core/editor' )." + name + '`', {
+		since: '5.3',
+		alternative: "`wp.data.dispatch( 'core/block-editor' )." + name + '`',
+		version: '6.2',
+	} );
+	registry.dispatch( blockEditorStore )[ name ]( ...args );
+};
 
 /**
  * @see resetBlocks in core/block-editor store.

package/src/store/actions.native.js

@@ -20,8 +20,8 @@ export function togglePostTitleSelection( isSelected = true ) {
 }
 
 /**
- * Action generator used in signalling that the post should autosave.
+ * Action that autosaves the post.
  */
-export function* autosave() {
+export const autosave = () => () => {
 	RNReactNativeGutenbergBridge.editorDidAutosave();
-}
+};

package/src/store/index.js

@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { createReduxStore, registerStore } from '@wordpress/data';
-import { controls as dataControls } from '@wordpress/data-controls';
 
 /**
  * Internal dependencies
@@ -10,7 +9,6 @@ import { controls as dataControls } from '@wordpress/data-controls';
 import reducer from './reducer';
 import * as selectors from './selectors';
 import * as actions from './actions';
-import controls from './controls';
 import { STORE_NAME } from './constants';
 
 /**
@@ -24,10 +22,6 @@ export const storeConfig = {
 	reducer,
 	selectors,
 	actions,
-	controls: {
-		...dataControls,
-		...controls,
-	},
 };
 
 /**

package/src/store/{controls.js → local-autosave.js}

@@ -36,11 +36,3 @@ export function localAutosaveSet( postId, isPostNew, title, content, excerpt ) {
 export function localAutosaveClear( postId, isPostNew ) {
 	window.sessionStorage.removeItem( postKey( postId, isPostNew ) );
 }
-
-const controls = {
-	LOCAL_AUTOSAVE_SET( { postId, isPostNew, title, content, excerpt } ) {
-		localAutosaveSet( postId, isPostNew, title, content, excerpt );
-	},
-};
-
-export default controls;

package/src/store/reducer.js

@@ -84,7 +84,6 @@ export function shouldOverwriteState( action, previousAction ) {
 export function postId( state = null, action ) {
 	switch ( action.type ) {
 		case 'SETUP_EDITOR_STATE':
-		case 'RESET_POST':
 			return action.post.id;
 	}
 
@@ -94,7 +93,6 @@ export function postId( state = null, action ) {
 export function postType( state = null, action ) {
 	switch ( action.type ) {
 		case 'SETUP_EDITOR_STATE':
-		case 'RESET_POST':
 			return action.post.type;
 	}