@wordpress/editor 12.0.21 → 12.2.1-next.f435e9e01b.0

package/src/components/post-publish-panel/maybe-category-panel.js

@@ -0,0 +1,88 @@
+/**
+ * External dependencies
+ */
+import { some } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { PanelBody } from '@wordpress/components';
+import { store as coreStore } from '@wordpress/core-data';
+import { useState, useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import HierarchicalTermSelector from '../post-taxonomies/hierarchical-term-selector';
+import { store as editorStore } from '../../store';
+
+function MaybeCategoryPanel() {
+	const hasNoCategory = useSelect( ( select ) => {
+		const postType = select( editorStore ).getCurrentPostType();
+		const categoriesTaxonomy = select( coreStore ).getTaxonomy(
+			'category'
+		);
+		const defaultCategorySlug = 'uncategorized';
+		const defaultCategory = select( coreStore ).getEntityRecords(
+			'taxonomy',
+			'category',
+			{
+				slug: defaultCategorySlug,
+			}
+		)?.[ 0 ];
+		const postTypeSupportsCategories =
+			categoriesTaxonomy &&
+			some( categoriesTaxonomy.types, ( type ) => type === postType );
+		const categories =
+			categoriesTaxonomy &&
+			select( editorStore ).getEditedPostAttribute(
+				categoriesTaxonomy.rest_base
+			);
+
+		// This boolean should return true if everything is loaded
+		// ( categoriesTaxonomy, defaultCategory )
+		// and the post has not been assigned a category different than "uncategorized".
+		return (
+			!! categoriesTaxonomy &&
+			!! defaultCategory &&
+			postTypeSupportsCategories &&
+			( categories?.length === 0 ||
+				( categories?.length === 1 &&
+					defaultCategory.id === categories[ 0 ] ) )
+		);
+	}, [] );
+	const [ shouldShowPanel, setShouldShowPanel ] = useState( false );
+	useEffect( () => {
+		// We use state to avoid hiding the panel if the user edits the categories
+		// and adds one within the panel itself (while visible).
+		if ( hasNoCategory ) {
+			setShouldShowPanel( true );
+		}
+	}, [ hasNoCategory ] );
+
+	if ( ! shouldShowPanel ) {
+		return null;
+	}
+
+	const panelBodyTitle = [
+		__( 'Suggestion:' ),
+		<span className="editor-post-publish-panel__link" key="label">
+			{ __( 'Assign a category' ) }
+		</span>,
+	];
+
+	return (
+		<PanelBody initialOpen={ false } title={ panelBodyTitle }>
+			<p>
+				{ __(
+					'Categories provide a helpful way to group related posts together and to quickly tell readers what a post is about.'
+				) }
+			</p>
+			<HierarchicalTermSelector slug="category" />
+		</PanelBody>
+	);
+}
+
+export default MaybeCategoryPanel;

package/src/components/post-publish-panel/prepublish.js

@@ -24,6 +24,7 @@ import PostScheduleLabel from '../post-schedule/label';
 import MaybeTagsPanel from './maybe-tags-panel';
 import MaybePostFormatPanel from './maybe-post-format-panel';
 import { store as editorStore } from '../../store';
+import MaybeCategoryPanel from './maybe-category-panel';
 
 function PostPublishPanelPrepublish( { children } ) {
 	const {
@@ -145,6 +146,7 @@ function PostPublishPanelPrepublish( { children } ) {
 			) }
 			<MaybePostFormatPanel />
 			<MaybeTagsPanel />
+			<MaybeCategoryPanel />
 			{ children }
 		</div>
 	);

package/src/components/post-taxonomies/README.md

@@ -33,7 +33,31 @@ function customizeProductTypeSelector( OriginalComponent ) {
 
 wp.hooks.addFilter(
 	'editor.PostTaxonomyType',
-	'my-custom-plugin',
+	'my-plugin/set-custom-term-selector',
 	customizeProductTypeSelector
 );
 ```
+
+Or, to use the hierarchical term selector with a non-hierarchical taxonomy `track`,
+you can set the `HierarchicalTermSelector` component as shown below.
+
+```js
+const el = wp.element.createElement;
+const HierarchicalTermSelector = wp.editor.PostTaxonomiesHierarchicalTermSelector;
+
+function customizeTrackSelector( OriginalComponent ) {
+	return function ( props ) {
+		if ( props.slug === 'track' ) {
+			return el( HierarchicalTermSelector, props );
+		} else {
+			return el( OriginalComponent, props );
+		}
+	};
+}
+
+wp.hooks.addFilter(
+	'editor.PostTaxonomyType',
+	'my-plugin/set-hierarchical-term-selector',
+	customizeTrackSelector
+);
+```

package/src/components/post-taxonomies/most-used-terms.js

@@ -15,9 +15,9 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { unescapeTerms } from '../../utils/terms';
 
-const MAX_MOST_USED_TERMS = 10;
+const MIN_MOST_USED_TERMS = 3;
 const DEFAULT_QUERY = {
-	per_page: MAX_MOST_USED_TERMS,
+	per_page: 10,
 	orderby: 'count',
 	order: 'desc',
 	hide_empty: true,
@@ -34,7 +34,7 @@ export default function MostUsedTerms( { onSelect, taxonomy } ) {
 		);
 		return {
 			_terms: mostUsedTerms,
-			showTerms: mostUsedTerms?.length === MAX_MOST_USED_TERMS,
+			showTerms: mostUsedTerms?.length >= MIN_MOST_USED_TERMS,
 		};
 	}, [] );
 

package/src/components/post-title/index.native.js

@@ -147,6 +147,7 @@ class PostTitle extends Component {
 					style={ titleStyles }
 					styles={ styles }
 					fontSize={ 24 }
+					lineHeight={ 1 }
 					fontWeight={ 'bold' }
 					deleteEnter={ true }
 					onChange={ ( value ) => {

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

@@ -22,7 +22,7 @@ function PostTrash( { isNew, postId, postType, ...props } ) {
 		<Button
 			className="editor-post-trash"
 			isDestructive
-			variant="tertiary"
+			variant="secondary"
 			onClick={ onClick }
 		>
 			{ __( 'Move to trash' ) }

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

@@ -3,7 +3,10 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
-import { VisuallyHidden } from '@wordpress/components';
+import {
+	VisuallyHidden,
+	__experimentalConfirmDialog as ConfirmDialog,
+} from '@wordpress/components';
 import { withInstanceId, compose } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
 
@@ -24,6 +27,7 @@ export class PostVisibility extends Component {
 
 		this.state = {
 			hasPassword: !! props.password,
+			showPrivateConfirmDialog: false,
 		};
 	}
 
@@ -35,21 +39,23 @@ 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;
-		}
+		this.setState( { showPrivateConfirmDialog: true } );
+	}
 
+	confirmPrivate = () => {
 		const { onUpdateVisibility, onSave } = this.props;
 
 		onUpdateVisibility( 'private' );
-		this.setState( { hasPassword: false } );
+		this.setState( {
+			hasPassword: false,
+			showPrivateConfirmDialog: false,
+		} );
 		onSave();
-	}
+	};
+
+	handleDialogCancel = () => {
+		this.setState( { showPrivateConfirmDialog: false } );
+	};
 
 	setPasswordProtected() {
 		const { visibility, onUpdateVisibility, status, password } = this.props;
@@ -145,6 +151,14 @@ export class PostVisibility extends Component {
 					/>
 				</div>
 			),
+			<ConfirmDialog
+				key="private-publish-confirmation"
+				isOpen={ this.state.showPrivateConfirmDialog }
+				onConfirm={ this.confirmPrivate }
+				onCancel={ this.handleDialogCancel }
+			>
+				{ __( 'Would you like to privately publish this post now?' ) }
+			</ConfirmDialog>,
 		];
 	}
 }

package/src/components/provider/index.native.js

@@ -56,7 +56,10 @@ const postTypeEntities = [
 	},
 	rawAttributes: [ 'title', 'excerpt', 'content' ],
 } ) );
-import { EditorHelpTopics } from '@wordpress/editor';
+import { EditorHelpTopics, store as editorStore } from '@wordpress/editor';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as editPostStore } from '@wordpress/edit-post';
 
 /**
  * Internal dependencies
@@ -350,8 +353,8 @@ export default compose( [
 			getEditorBlocks,
 			getEditedPostAttribute,
 			getEditedPostContent,
-		} = select( 'core/editor' );
-		const { getEditorMode } = select( 'core/edit-post' );
+		} = select( editorStore );
+		const { getEditorMode } = select( editPostStore );
 
 		const {
 			getBlockIndex,
@@ -374,16 +377,16 @@ export default compose( [
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { editPost, resetEditorBlocks } = dispatch( 'core/editor' );
+		const { editPost, resetEditorBlocks } = dispatch( editorStore );
 		const {
 			updateSettings,
 			clearSelectedBlock,
 			insertBlock,
 			replaceBlock,
 		} = dispatch( blockEditorStore );
-		const { switchEditorMode } = dispatch( 'core/edit-post' );
-		const { addEntities, receiveEntityRecords } = dispatch( 'core' );
-		const { createSuccessNotice } = dispatch( 'core/notices' );
+		const { switchEditorMode } = dispatch( editPostStore );
+		const { addEntities, receiveEntityRecords } = dispatch( coreStore );
+		const { createSuccessNotice } = dispatch( noticesStore );
 
 		return {
 			updateSettings,

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

@@ -35,12 +35,18 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 		hasUploadPermissions,
 		canUseUnfilteredHTML,
 		userCanCreatePages,
+		pageOnFront,
 	} = useSelect( ( select ) => {
 		const { canUserUseUnfilteredHTML } = select( editorStore );
 		const isWeb = Platform.OS === 'web';
-		const { canUser, getUnstableBase, hasFinishedResolution } = select(
-			coreStore
-		);
+		const {
+			canUser,
+			getUnstableBase,
+			hasFinishedResolution,
+			getEntityRecord,
+		} = select( coreStore );
+
+		const siteSettings = getEntityRecord( 'root', 'site' );
 
 		const siteData = getUnstableBase();
 
@@ -64,6 +70,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			hasResolvedLocalSiteData: hasFinishedResolvingSiteData,
 			baseUrl: siteData?.url || '',
 			userCanCreatePages: canUser( 'create', 'pages' ),
+			pageOnFront: siteSettings?.page_on_front,
 		};
 	}, [] );
 
@@ -93,10 +100,10 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 				'__experimentalBlockDirectory',
 				'__experimentalBlockPatternCategories',
 				'__experimentalBlockPatterns',
+				'__experimentalDiscussionSettings',
 				'__experimentalFeatures',
 				'__experimentalPreferredStyleVariations',
 				'__experimentalSetIsInserterOpened',
-				'__experimentalGenerateAnchors',
 				'__unstableGalleryWithImageBlocks',
 				'alignWide',
 				'allowedBlockTypes',
@@ -128,6 +135,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 				'titlePlaceholder',
 				'supportsLayout',
 				'widgetTypesToHideFromLegacyWidgetBlock',
+				'__unstableResolvedAssets',
 			] ),
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
 			__experimentalReusableBlocks: reusableBlocks,
@@ -139,6 +147,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			outlineMode: hasTemplate,
 			__experimentalCreatePageEntity: createPageEntity,
 			__experimentalUserCanCreatePages: userCanCreatePages,
+			pageOnFront,
 		} ),
 		[
 			settings,
@@ -148,6 +157,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			undo,
 			hasTemplate,
 			userCanCreatePages,
+			pageOnFront,
 		]
 	);
 }

package/src/store/actions.js

@@ -280,27 +280,17 @@ export function* savePost( options = {} ) {
 }
 
 /**
- * Action generator for handling refreshing the current post.
+ * Action for refreshing the current post.
+ *
+ * @deprecated Since WordPress 6.0.
  */
-export function* refreshPost() {
-	const post = yield controls.select( STORE_NAME, 'getCurrentPost' );
-	const postTypeSlug = yield controls.select(
-		STORE_NAME,
-		'getCurrentPostType'
-	);
-	const postType = yield controls.resolveSelect(
-		coreStore,
-		'getPostType',
-		postTypeSlug
-	);
-	const newPost = yield apiFetch( {
-		// Timestamp arg allows caller to bypass browser caching, which is
-		// expected for this specific function.
-		path:
-			`/wp/v2/${ postType.rest_base }/${ post.id }` +
-			`?context=edit&_timestamp=${ Date.now() }`,
+export function refreshPost() {
+	deprecated( "wp.data.dispatch( 'core/editor' ).refreshPost", {
+		since: '6.0',
+		version: '6.3',
+		alternative: 'Use the core entities store instead',
 	} );
-	yield controls.dispatch( STORE_NAME, 'resetPost', newPost );
+	return { type: 'DO_NOTHING' };
 }
 
 /**
@@ -404,13 +394,17 @@ export function* undo() {
 }
 
 /**
- * Returns an action object used in signalling that undo history record should
- * be created.
+ * Action that creates an undo history record.
  *
- * @return {Object} Action object.
+ * @deprecated Since WordPress 6.0
  */
 export function createUndoLevel() {
-	return { type: 'CREATE_UNDO_LEVEL' };
+	deprecated( "wp.data.dispatch( 'core/editor' ).createUndoLevel", {
+		since: '6.0',
+		version: '6.3',
+		alternative: 'Use the core entities store instead',
+	} );
+	return { type: 'DO_NOTHING' };
 }
 
 /**
@@ -629,6 +623,7 @@ const getBlockEditorAction = ( name ) =>
 			since: '5.3',
 			alternative:
 				"`wp.data.dispatch( 'core/block-editor' )." + name + '`',
+			version: '6.2',
 		} );
 		yield controls.dispatch( blockEditorStore, name, ...args );
 	};

package/src/store/selectors.js

@@ -277,41 +277,6 @@ export const getPostEdits = createRegistrySelector( ( select ) => ( state ) => {
 	);
 } );
 
-/**
- * Returns a new reference when edited values have changed. This is useful in
- * inferring where an edit has been made between states by comparison of the
- * return values using strict equality.
- *
- * @deprecated since Gutenberg 6.5.0.
- *
- * @example
- *
- * ```
- * const hasEditOccurred = (
- *    getReferenceByDistinctEdits( beforeState ) !==
- *    getReferenceByDistinctEdits( afterState )
- * );
- * ```
- *
- * @param {Object} state Editor state.
- *
- * @return {*} A value whose reference will change only when an edit occurs.
- */
-export const getReferenceByDistinctEdits = createRegistrySelector(
-	( select ) => (/* state */) => {
-		deprecated(
-			"`wp.data.select( 'core/editor' ).getReferenceByDistinctEdits`",
-			{
-				since: '5.4',
-				alternative:
-					"`wp.data.select( 'core' ).getReferenceByDistinctEdits`",
-			}
-		);
-
-		return select( coreStore ).getReferenceByDistinctEdits();
-	}
-);
-
 /**
  * Returns an attribute value of the saved post.
  *
@@ -839,7 +804,12 @@ export function getEditedPostPreviewLink( state ) {
 	}
 
 	let previewLink = getAutosaveAttribute( state, 'preview_link' );
-	if ( ! previewLink ) {
+	// Fix for issue: https://github.com/WordPress/gutenberg/issues/33616
+	// If the post is draft, ignore the preview link from the autosave record,
+	// because the preview could be a stale autosave if the post was switched from
+	// published to draft.
+	// See: https://github.com/WordPress/gutenberg/pull/37952
+	if ( ! previewLink || 'draft' === getCurrentPost( state ).status ) {
 		previewLink = getEditedPostAttribute( state, 'link' );
 		if ( previewLink ) {
 			previewLink = addQueryArgs( previewLink, { preview: true } );
@@ -1166,8 +1136,7 @@ export function getEditorBlocks( state ) {
  */
 export function getEditorSelectionStart( state ) {
 	deprecated( "select('core/editor').getEditorSelectionStart", {
-		since: '10.0',
-		plugin: 'Gutenberg',
+		since: '5.8',
 		alternative: "select('core/editor').getEditorSelection",
 	} );
 	return getEditedPostAttribute( state, 'selection' )?.selectionStart;
@@ -1183,8 +1152,7 @@ export function getEditorSelectionStart( state ) {
  */
 export function getEditorSelectionEnd( state ) {
 	deprecated( "select('core/editor').getEditorSelectionStart", {
-		since: '10.0',
-		plugin: 'Gutenberg',
+		since: '5.8',
 		alternative: "select('core/editor').getEditorSelection",
 	} );
 	return getEditedPostAttribute( state, 'selection' )?.selectionEnd;
@@ -1258,6 +1226,7 @@ function getBlockEditorSelector( name ) {
 		deprecated( "`wp.data.select( 'core/editor' )." + name + '`', {
 			since: '5.3',
 			alternative: "`wp.data.select( 'core/block-editor' )." + name + '`',
+			version: '6.2',
 		} );
 
 		return select( blockEditorStore )[ name ]( ...args );

package/src/store/test/actions.js

@@ -196,7 +196,7 @@ describe( 'Post generator actions', () => {
 								'createSuccessNotice',
 								currentPostStatus === 'publish'
 									? 'Updated Post'
-									: 'Saved',
+									: 'Draft saved',
 								{
 									actions: [],
 									id: 'SAVE_POST_NOTICE_ID',
@@ -358,46 +358,6 @@ describe( 'Post generator actions', () => {
 			} );
 		} );
 	} );
-	describe( 'refreshPost()', () => {
-		let fulfillment;
-		const currentPost = { id: 10, content: 'foo' };
-		const reset = () => ( fulfillment = actions.refreshPost() );
-		it( 'yields expected action for selecting the currentPost', () => {
-			reset();
-			const { value } = fulfillment.next();
-			expect( value ).toEqual(
-				controls.select( STORE_NAME, 'getCurrentPost' )
-			);
-		} );
-		it( 'yields expected action for selecting the current post type', () => {
-			const { value } = fulfillment.next( currentPost );
-			expect( value ).toEqual(
-				controls.select( STORE_NAME, 'getCurrentPostType' )
-			);
-		} );
-		it( 'yields expected action for selecting the post type object', () => {
-			const { value } = fulfillment.next( postTypeSlug );
-			expect( value ).toEqual(
-				controls.resolveSelect( 'core', 'getPostType', postTypeSlug )
-			);
-		} );
-		it( 'yields expected action for the api fetch call', () => {
-			const { value } = fulfillment.next( postType );
-			// since the timestamp is a computed value we can't do a direct comparison.
-			// so we'll just see if the path has most of the value.
-			expect( value.request.path ).toEqual(
-				expect.stringContaining(
-					`/wp/v2/${ postType.rest_base }/${ currentPost.id }?context=edit&_timestamp=`
-				)
-			);
-		} );
-		it( 'yields expected action for dispatching the reset of the post', () => {
-			const { value } = fulfillment.next( currentPost );
-			expect( value ).toEqual(
-				controls.dispatch( STORE_NAME, 'resetPost', currentPost )
-			);
-		} );
-	} );
 } );
 
 describe( 'Editor actions', () => {

package/src/store/utils/notice-builder.js

@@ -38,7 +38,7 @@ export function getNotificationArgumentsForSaveSuccess( data ) {
 	// Always should a notice, which will be spoken for accessibility.
 	if ( ! isPublished && ! willPublish ) {
 		// If saving a non-published post, don't show notice.
-		noticeMessage = __( 'Saved' );
+		noticeMessage = __( 'Draft saved' );
 		shouldShowLink = false;
 	} else if ( isPublished && ! willPublish ) {
 		// If undoing publish status, show specific notice

package/src/store/utils/test/notice-builder.js

@@ -34,7 +34,7 @@ describe( 'getNotificationArgumentsForSaveSuccess()', () => {
 		[
 			'when previous post is not published and post will not be published',
 			[ 'draft', 'draft', false ],
-			[ 'Saved', defaultExpectedAction ],
+			[ 'Draft saved', defaultExpectedAction ],
 		],
 		[
 			'when previous post is published and post will be unpublished',