@wordpress/editor 12.15.1-next.957ca95e4c.0 → 12.16.0

package/src/components/post-trash/index.js

@@ -11,10 +11,11 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { store as editorStore } from '../../store';
 
 export default function PostTrash() {
-	const { isNew, postId } = useSelect( ( select ) => {
+	const { isNew, isDeleting, postId } = useSelect( ( select ) => {
 		const store = select( editorStore );
 		return {
 			isNew: store.isEditedPostNew(),
+			isDeleting: store.isDeletingPost(),
 			postId: store.getCurrentPostId(),
 		};
 	}, [] );
@@ -29,7 +30,9 @@ export default function PostTrash() {
 			className="editor-post-trash"
 			isDestructive
 			variant="secondary"
-			onClick={ () => trashPost() }
+			isBusy={ isDeleting }
+			aria-disabled={ isDeleting }
+			onClick={ isDeleting ? undefined : () => trashPost() }
 		>
 			{ __( 'Move to trash' ) }
 		</Button>

package/src/components/provider/use-block-editor-settings.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { pick, unionBy } from 'lodash';
+import { pick } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -36,8 +36,10 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 		canUseUnfilteredHTML,
 		userCanCreatePages,
 		pageOnFront,
+		postType,
 	} = useSelect( ( select ) => {
-		const { canUserUseUnfilteredHTML } = select( editorStore );
+		const { canUserUseUnfilteredHTML, getCurrentPostType } =
+			select( editorStore );
 		const isWeb = Platform.OS === 'web';
 		const { canUser, getEntityRecord } = select( coreStore );
 
@@ -57,6 +59,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			hasUploadPermissions: canUser( 'create', 'media' ) ?? true,
 			userCanCreatePages: canUser( 'create', 'pages' ),
 			pageOnFront: siteSettings?.page_on_front,
+			postType: getCurrentPostType(),
 		};
 	}, [] );
 
@@ -77,16 +80,33 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 	);
 
 	const blockPatterns = useMemo(
-		() => unionBy( settingsBlockPatterns, restBlockPatterns, 'name' ),
-		[ settingsBlockPatterns, restBlockPatterns ]
+		() =>
+			[
+				...( settingsBlockPatterns || [] ),
+				...( restBlockPatterns || [] ),
+			]
+				.filter(
+					( x, index, arr ) =>
+						index === arr.findIndex( ( y ) => x.name === y.name )
+				)
+				.filter( ( { postTypes } ) => {
+					return (
+						! postTypes ||
+						( Array.isArray( postTypes ) &&
+							postTypes.includes( postType ) )
+					);
+				} ),
+		[ settingsBlockPatterns, restBlockPatterns, postType ]
 	);
 
 	const blockPatternCategories = useMemo(
 		() =>
-			unionBy(
-				settingsBlockPatternCategories,
-				restBlockPatternCategories,
-				'name'
+			[
+				...( settingsBlockPatternCategories || [] ),
+				...( restBlockPatternCategories || [] ),
+			].filter(
+				( x, index, arr ) =>
+					index === arr.findIndex( ( y ) => x.name === y.name )
 			),
 		[ settingsBlockPatternCategories, restBlockPatternCategories ]
 	);

package/src/store/actions.js

@@ -247,6 +247,7 @@ export const trashPost =
 		registry.dispatch( noticesStore ).removeNotice( TRASH_POST_NOTICE_ID );
 		const { rest_base: restBase, rest_namespace: restNamespace = 'wp/v2' } =
 			postType;
+		dispatch( { type: 'REQUEST_POST_DELETE_START' } );
 		try {
 			const post = select.getCurrentPost();
 			await apiFetch( {
@@ -262,6 +263,7 @@ export const trashPost =
 					...getNotificationArgumentsForTrashFail( { error } )
 				);
 		}
+		dispatch( { type: 'REQUEST_POST_DELETE_FINISH' } );
 	};
 
 /**

package/src/store/reducer.js

@@ -141,6 +141,26 @@ export function saving( state = {}, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning deleting post request state.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function deleting( state = {}, action ) {
+	switch ( action.type ) {
+		case 'REQUEST_POST_DELETE_START':
+		case 'REQUEST_POST_DELETE_FINISH':
+			return {
+				pending: action.type === 'REQUEST_POST_DELETE_START',
+			};
+	}
+
+	return state;
+}
+
 /**
  * Post Lock State.
  *
@@ -263,6 +283,7 @@ export default combineReducers( {
 	postId,
 	postType,
 	saving,
+	deleting,
 	postLock,
 	template,
 	postSavingLock,

package/src/store/selectors.js

@@ -672,6 +672,17 @@ export function isEditedPostDateFloating( state ) {
 	return false;
 }
 
+/**
+ * Returns true if the post is currently being deleted, or false otherwise.
+ *
+ * @param {Object} state Editor state.
+ *
+ * @return {boolean} Whether post is being deleted.
+ */
+export function isDeletingPost( state ) {
+	return !! state.deleting.pending;
+}
+
 /**
  * Returns true if the post is currently being saved, or false otherwise.
  *

package/src/store/test/actions.js

@@ -294,6 +294,48 @@ describe( 'Post actions', () => {
 			const { status } = registry.select( editorStore ).getCurrentPost();
 			expect( status ).toBe( 'trash' );
 		} );
+
+		it( 'sets deleting state', async () => {
+			const post = {
+				id: postId,
+				type: 'post',
+				content: 'foo',
+				status: 'publish',
+			};
+
+			const dispatch = Object.assign( jest.fn(), {
+				savePost: jest.fn(),
+			} );
+			const select = {
+				getCurrentPostType: () => 'post',
+				getCurrentPost: () => post,
+			};
+			const registry = {
+				dispatch: () => ( {
+					removeNotice: jest.fn(),
+					createErrorNotice: jest.fn(),
+				} ),
+				resolveSelect: () => ( {
+					getPostType: () => ( {
+						rest_namespace: 'wp/v2',
+						rest_base: 'posts',
+					} ),
+				} ),
+			};
+
+			apiFetch.setFetchHandler( async () => {
+				return { ...post, status: 'trash' };
+			} );
+
+			await actions.trashPost()( { select, dispatch, registry } );
+
+			expect( dispatch ).toHaveBeenCalledWith( {
+				type: 'REQUEST_POST_DELETE_START',
+			} );
+			expect( dispatch ).toHaveBeenCalledWith( {
+				type: 'REQUEST_POST_DELETE_FINISH',
+			} );
+		} );
 	} );
 } );