@wordpress/edit-post 7.5.0 → 7.6.0

package/src/components/visual-editor/index.js

@@ -80,19 +80,20 @@ function MaybeIframe( { children, contentRef, shouldIframe, styles, style } ) {
 
 /**
  * Given an array of nested blocks, find the first Post Content
- * block inside it, recursing through any nesting levels.
+ * block inside it, recursing through any nesting levels,
+ * and return its attributes.
  *
  * @param {Array} blocks A list of blocks.
  *
  * @return {Object | undefined} The Post Content block.
  */
-function findPostContent( blocks ) {
+function getPostContentAttributes( blocks ) {
 	for ( let i = 0; i < blocks.length; i++ ) {
 		if ( blocks[ i ].name === 'core/post-content' ) {
-			return blocks[ i ];
+			return blocks[ i ].attributes;
 		}
 		if ( blocks[ i ].innerBlocks.length ) {
-			const nestedPostContent = findPostContent(
+			const nestedPostContent = getPostContentAttributes(
 				blocks[ i ].innerBlocks
 			);
 
@@ -108,6 +109,7 @@ export default function VisualEditor( { styles } ) {
 		deviceType,
 		isWelcomeGuideVisible,
 		isTemplateMode,
+		postContentAttributes,
 		editedPostTemplate = {},
 		wrapperBlockName,
 		wrapperUniqueId,
@@ -116,8 +118,8 @@ export default function VisualEditor( { styles } ) {
 		const {
 			isFeatureActive,
 			isEditingTemplate,
-			__experimentalGetPreviewDeviceType,
 			getEditedPostTemplate,
+			__experimentalGetPreviewDeviceType,
 		} = select( editPostStore );
 		const { getCurrentPostId, getCurrentPostType, getEditorSettings } =
 			select( editorStore );
@@ -141,8 +143,9 @@ export default function VisualEditor( { styles } ) {
 			deviceType: __experimentalGetPreviewDeviceType(),
 			isWelcomeGuideVisible: isFeatureActive( 'welcomeGuide' ),
 			isTemplateMode: _isTemplateMode,
+			postContentAttributes: getEditorSettings().postContentAttributes,
 			// Post template fetch returns a 404 on classic themes, which
-			// messes with e2e tests, so we check it's a block theme first.
+			// messes with e2e tests, so check it's a block theme first.
 			editedPostTemplate:
 				supportsTemplateMode && canEditTemplate
 					? getEditedPostTemplate()
@@ -230,10 +233,13 @@ export default function VisualEditor( { styles } ) {
 		return { type: 'default' };
 	}, [ isTemplateMode, themeSupportsLayout, globalLayoutSettings ] );
 
-	const postContentBlock = useMemo( () => {
+	const newestPostContentAttributes = useMemo( () => {
+		if ( ! editedPostTemplate?.content && ! editedPostTemplate?.blocks ) {
+			return postContentAttributes;
+		}
 		// When in template editing mode, we can access the blocks directly.
 		if ( editedPostTemplate?.blocks ) {
-			return findPostContent( editedPostTemplate?.blocks );
+			return getPostContentAttributes( editedPostTemplate?.blocks );
 		}
 		// If there are no blocks, we have to parse the content string.
 		// Best double-check it's a string otherwise the parse function gets unhappy.
@@ -242,10 +248,19 @@ export default function VisualEditor( { styles } ) {
 				? editedPostTemplate?.content
 				: '';
 
-		return findPostContent( parse( parseableContent ) ) || {};
-	}, [ editedPostTemplate?.content, editedPostTemplate?.blocks ] );
+		return getPostContentAttributes( parse( parseableContent ) ) || {};
+	}, [
+		editedPostTemplate?.content,
+		editedPostTemplate?.blocks,
+		postContentAttributes,
+	] );
+
+	const layout = newestPostContentAttributes?.layout || {};
 
-	const postContentLayoutClasses = useLayoutClasses( postContentBlock );
+	const postContentLayoutClasses = useLayoutClasses(
+		newestPostContentAttributes,
+		'core/post-content'
+	);
 
 	const blockListLayoutClass = classnames(
 		{
@@ -255,12 +270,11 @@ export default function VisualEditor( { styles } ) {
 	);
 
 	const postContentLayoutStyles = useLayoutStyles(
-		postContentBlock,
+		newestPostContentAttributes,
+		'core/post-content',
 		'.block-editor-block-list__layout.is-root-container'
 	);
 
-	const layout = postContentBlock?.attributes?.layout || {};
-
 	// Update type for blocks using legacy layouts.
 	const postContentLayout = useMemo( () => {
 		return layout &&
@@ -280,7 +294,7 @@ export default function VisualEditor( { styles } ) {
 
 	// If there is a Post Content block we use its layout for the block list;
 	// if not, this must be a classic theme, in which case we use the fallback layout.
-	const blockListLayout = postContentBlock?.isValid
+	const blockListLayout = postContentAttributes
 		? postContentLayout
 		: fallbackLayout;
 
@@ -318,7 +332,7 @@ export default function VisualEditor( { styles } ) {
 			<motion.div
 				className="edit-post-visual-editor__content-area"
 				animate={ {
-					padding: isTemplateMode ? '48px 48px 0' : '0',
+					padding: isTemplateMode ? '48px 48px 0' : 0,
 				} }
 				ref={ blockSelectionClearerRef }
 			>
@@ -376,15 +390,11 @@ export default function VisualEditor( { styles } ) {
 						{ ! isTemplateMode && (
 							<div
 								className={ classnames(
-									// This wrapper div should have the same
-									// classes as the block list beneath.
-									'is-root-container',
-									'block-editor-block-list__layout',
 									'edit-post-visual-editor__post-title-wrapper',
 									{
 										'is-focus-mode': isFocusMode,
 									},
-									blockListLayoutClass
+									'is-layout-flow'
 								) }
 								contentEditable={ false }
 							>

package/src/components/welcome-guide/default.js

@@ -110,7 +110,7 @@ export default function WelcomeGuideDefault() {
 								) }
 								<ExternalLink
 									href={ __(
-										'https://wordpress.org/support/article/wordpress-editor/'
+										'https://wordpress.org/documentation/article/wordpress-block-editor/'
 									) }
 								>
 									{ __( "Here's a detailed guide." ) }

package/src/index.js

@@ -11,7 +11,10 @@ import { createRoot } from '@wordpress/element';
 import { dispatch, select } from '@wordpress/data';
 import { addFilter } from '@wordpress/hooks';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { registerLegacyWidgetBlock } from '@wordpress/widgets';
+import {
+	registerLegacyWidgetBlock,
+	registerWidgetGroupBlock,
+} from '@wordpress/widgets';
 
 /**
  * Internal dependencies
@@ -68,6 +71,7 @@ export function initializeEditor(
 
 	registerCoreBlocks();
 	registerLegacyWidgetBlock( { inserter: false } );
+	registerWidgetGroupBlock( { inserter: false } );
 	if ( process.env.IS_GUTENBERG_PLUGIN ) {
 		__experimentalRegisterExperimentalCoreBlocks( {
 			enableFSEBlocks: settings.__unstableEnableFullSiteEditingBlocks,

package/src/test/editor.native.js

@@ -26,7 +26,7 @@ const unsupportedBlock = `
 `;
 
 beforeAll( () => {
-	jest.useFakeTimers( 'legacy' );
+	jest.useFakeTimers( { legacyFakeTimers: true } );
 } );
 
 afterAll( () => {