@wordpress/edit-post 6.7.0 → 6.10.0

package/src/components/start-page-options/index.js

@@ -3,7 +3,7 @@
  */
 import { Modal } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useState, useEffect } from '@wordpress/element';
+import { useState, useEffect, useMemo } from '@wordpress/element';
 import {
 	store as blockEditorStore,
 	__experimentalBlockPatternsList as BlockPatternsList,
@@ -17,17 +17,42 @@ import { store as editorStore } from '@wordpress/editor';
  */
 import { store as editPostStore } from '../../store';
 
+function useStartPatterns() {
+	// A pattern is a start pattern if it includes 'core/post-content' in its blockTypes,
+	// and it has no postTypes declares and the current post type is page or if
+	// the current post type is part of the postTypes declared.
+	const { blockPatternsWithPostContentBlockType, postType } = useSelect(
+		( select ) => {
+			const { __experimentalGetPatternsByBlockTypes } =
+				select( blockEditorStore );
+			const { getCurrentPostType } = select( editorStore );
+			return {
+				// get pa
+				blockPatternsWithPostContentBlockType:
+					__experimentalGetPatternsByBlockTypes(
+						'core/post-content'
+					),
+				postType: getCurrentPostType(),
+			};
+		},
+		[]
+	);
+
+	return useMemo( () => {
+		// filter patterns without postTypes declared if the current postType is page
+		// or patterns that declare the current postType in its post type array.
+		return blockPatternsWithPostContentBlockType.filter( ( pattern ) => {
+			return (
+				( postType === 'page' && ! pattern.postTypes ) ||
+				( Array.isArray( pattern.postTypes ) &&
+					pattern.postTypes.includes( postType ) )
+			);
+		} );
+	}, [ postType, blockPatternsWithPostContentBlockType ] );
+}
+
 function PatternSelection( { onChoosePattern } ) {
-	const { blockPatterns } = useSelect( ( select ) => {
-		const { __experimentalGetPatternsByBlockTypes } = select(
-			blockEditorStore
-		);
-		return {
-			blockPatterns: __experimentalGetPatternsByBlockTypes(
-				'core/post-content'
-			),
-		};
-	}, [] );
+	const blockPatterns = useStartPatterns();
 	const shownBlockPatterns = useAsyncList( blockPatterns );
 	const { resetEditorBlocks } = useDispatch( editorStore );
 	return (
@@ -52,33 +77,28 @@ export default function StartPageOptions() {
 	const [ modalState, setModalState ] = useState(
 		START_PAGE_MODAL_STATES.INITIAL
 	);
+	const blockPatterns = useStartPatterns();
+	const hasStartPattern = blockPatterns.length > 0;
 	const shouldOpenModel = useSelect(
 		( select ) => {
-			if ( modalState !== START_PAGE_MODAL_STATES.INITIAL ) {
+			if (
+				! hasStartPattern ||
+				modalState !== START_PAGE_MODAL_STATES.INITIAL
+			) {
 				return false;
 			}
-			const { __experimentalGetPatternsByBlockTypes } = select(
-				blockEditorStore
-			);
-			const {
-				getCurrentPostType,
-				getEditedPostContent,
-				isEditedPostSaveable,
-			} = select( editorStore );
-			const { isEditingTemplate, isFeatureActive } = select(
-				editPostStore
-			);
+			const { getEditedPostContent, isEditedPostSaveable } =
+				select( editorStore );
+			const { isEditingTemplate, isFeatureActive } =
+				select( editPostStore );
 			return (
-				getCurrentPostType() === 'page' &&
 				! isEditedPostSaveable() &&
 				'' === getEditedPostContent() &&
 				! isEditingTemplate() &&
-				! isFeatureActive( 'welcomeGuide' ) &&
-				__experimentalGetPatternsByBlockTypes( 'core/post-content' )
-					.length >= 1
+				! isFeatureActive( 'welcomeGuide' )
 			);
 		},
-		[ modalState ]
+		[ modalState, hasStartPattern ]
 	);
 
 	useEffect( () => {

package/src/components/start-page-options/style.scss

@@ -11,15 +11,6 @@
 	@include break-large() {
 		height: 70%;
 	}
-
-	// @todo: Consider this for a minimal modal prop.
-	.components-modal__header {
-		border-bottom: none;
-	}
-
-	.components-modal__content::before {
-		content: none;
-	}
 }
 
 // 2 column masonry layout.

package/src/components/visual-editor/block-inspector-button.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { noop } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -17,6 +12,8 @@ import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
  */
 import { store as editPostStore } from '../../store';
 
+const noop = () => {};
+
 export function BlockInspectorButton( { onClick = noop, small = false } ) {
 	const { shortcut, areAdvancedSettingsOpened } = useSelect(
 		( select ) => ( {
@@ -29,9 +26,8 @@ export function BlockInspectorButton( { onClick = noop, small = false } ) {
 		} ),
 		[]
 	);
-	const { openGeneralSidebar, closeGeneralSidebar } = useDispatch(
-		editPostStore
-	);
+	const { openGeneralSidebar, closeGeneralSidebar } =
+		useDispatch( editPostStore );
 
 	const label = areAdvancedSettingsOpened
 		? __( 'Hide more settings' )

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

@@ -245,6 +245,7 @@ export default function VisualEditor( { styles } ) {
 							<LayoutStyle
 								selector=".edit-post-visual-editor__post-title-wrapper, .block-editor-block-list__layout.is-root-container"
 								layout={ defaultLayout }
+								layoutDefinitions={ defaultLayout?.definitions }
 							/>
 						) }
 						{ ! isTemplateMode && (
@@ -260,7 +261,7 @@ export default function VisualEditor( { styles } ) {
 								className={
 									isTemplateMode
 										? 'wp-site-blocks'
-										: undefined
+										: 'is-layout-flow' // Ensure root level blocks receive default/flow blockGap styling rules.
 								}
 								__experimentalLayout={ layout }
 							/>

package/src/editor.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { forEach, size, map, without } from 'lodash';
+import { forEach, map, without } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -56,9 +56,8 @@ function Editor( {
 				getEditedPostTemplate,
 				getHiddenBlockTypes,
 			} = select( editPostStore );
-			const { getEntityRecord, getPostType, getEntityRecords } = select(
-				coreStore
-			);
+			const { getEntityRecord, getPostType, getEntityRecords } =
+				select( coreStore );
 			const { getEditorSettings } = select( editorStore );
 			const { getBlockTypes } = select( blocksStore );
 			const isTemplate = [ 'wp_template', 'wp_template_part' ].includes(
@@ -75,8 +74,8 @@ function Editor( {
 			} else {
 				postObject = getEntityRecord( 'postType', postType, postId );
 			}
-			const supportsTemplateMode = getEditorSettings()
-				.supportsTemplateMode;
+			const supportsTemplateMode =
+				getEditorSettings().supportsTemplateMode;
 			const isViewable = getPostType( postType )?.viewable ?? false;
 
 			return {
@@ -104,9 +103,8 @@ function Editor( {
 		[ postType, postId ]
 	);
 
-	const { updatePreferredStyleVariations, setIsInserterOpened } = useDispatch(
-		editPostStore
-	);
+	const { updatePreferredStyleVariations, setIsInserterOpened } =
+		useDispatch( editPostStore );
 
 	const editorSettings = useMemo( () => {
 		const result = {
@@ -128,7 +126,7 @@ function Editor( {
 		};
 
 		// Omit hidden block types if exists and non-empty.
-		if ( size( hiddenBlockTypes ) > 0 ) {
+		if ( hiddenBlockTypes.length > 0 ) {
 			// Defer to passed setting for `allowedBlockTypes` if provided as
 			// anything other than `true` (where `true` is equivalent to allow
 			// all block types).

package/src/editor.native.js

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import memize from 'memize';
-import { size, map, without } from 'lodash';
+import { map, without } from 'lodash';
 import { I18nManager } from 'react-native';
 
 /**
@@ -62,7 +62,7 @@ class Editor extends Component {
 		};
 
 		// Omit hidden block types if exists and non-empty.
-		if ( size( hiddenBlockTypes ) > 0 ) {
+		if ( hiddenBlockTypes.length > 0 ) {
 			if ( settings.allowedBlockTypes === undefined ) {
 				// If no specific flags for allowedBlockTypes are set, assume `true`
 				// meaning allow all block types.
@@ -99,8 +99,8 @@ class Editor extends Component {
 			}
 		);
 
-		this.subscriptionParentFeaturedImageIdNativeUpdated = subscribeFeaturedImageIdNativeUpdated(
-			( payload ) => {
+		this.subscriptionParentFeaturedImageIdNativeUpdated =
+			subscribeFeaturedImageIdNativeUpdated( ( payload ) => {
 				editEntityRecord(
 					'postType',
 					postType,
@@ -110,8 +110,7 @@ class Editor extends Component {
 						undoIgnore: true,
 					}
 				);
-			}
-		);
+			} );
 	}
 
 	componentWillUnmount() {

package/src/plugins/copy-content-menu-item/index.js

@@ -25,5 +25,5 @@ export default function CopyContentMenuItem() {
 
 	const ref = useCopyToClipboard( getText, onSuccess );
 
-	return <MenuItem ref={ ref }>{ __( 'Copy all content' ) }</MenuItem>;
+	return <MenuItem ref={ ref }>{ __( 'Copy all blocks' ) }</MenuItem>;
 }