@wordpress/edit-site 4.13.0 → 4.13.1-next.957ca95e4c.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "4.13.0",
+	"version": "4.13.1-next.957ca95e4c.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,33 +27,33 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.16.0",
-		"@wordpress/api-fetch": "^6.13.0",
-		"@wordpress/block-editor": "^9.8.0",
-		"@wordpress/block-library": "^7.13.0",
-		"@wordpress/blocks": "^11.15.0",
-		"@wordpress/components": "^20.0.0",
-		"@wordpress/compose": "^5.14.0",
-		"@wordpress/core-data": "^4.14.0",
-		"@wordpress/data": "^7.0.0",
-		"@wordpress/deprecated": "^3.16.0",
-		"@wordpress/editor": "^12.15.0",
-		"@wordpress/element": "^4.14.0",
-		"@wordpress/hooks": "^3.16.0",
-		"@wordpress/html-entities": "^3.16.0",
-		"@wordpress/i18n": "^4.16.0",
-		"@wordpress/icons": "^9.7.0",
-		"@wordpress/interface": "^4.15.0",
-		"@wordpress/keyboard-shortcuts": "^3.14.0",
-		"@wordpress/keycodes": "^3.16.0",
-		"@wordpress/media-utils": "^4.7.0",
-		"@wordpress/notices": "^3.16.0",
-		"@wordpress/plugins": "^4.14.0",
-		"@wordpress/preferences": "^2.8.0",
-		"@wordpress/reusable-blocks": "^3.14.0",
-		"@wordpress/style-engine": "^0.15.0",
-		"@wordpress/url": "^3.17.0",
-		"@wordpress/viewport": "^4.14.0",
+		"@wordpress/a11y": "^3.16.1-next.957ca95e4c.0",
+		"@wordpress/api-fetch": "^6.13.1-next.957ca95e4c.0",
+		"@wordpress/block-editor": "^9.8.1-next.957ca95e4c.0",
+		"@wordpress/block-library": "^7.13.1-next.957ca95e4c.0",
+		"@wordpress/blocks": "^11.15.1-next.957ca95e4c.0",
+		"@wordpress/components": "^20.0.2-next.957ca95e4c.0",
+		"@wordpress/compose": "^5.14.1-next.957ca95e4c.0",
+		"@wordpress/core-data": "^5.0.1-next.957ca95e4c.0",
+		"@wordpress/data": "^7.0.1-next.957ca95e4c.0",
+		"@wordpress/deprecated": "^3.16.1-next.957ca95e4c.0",
+		"@wordpress/editor": "^12.15.1-next.957ca95e4c.0",
+		"@wordpress/element": "^4.14.1-next.957ca95e4c.0",
+		"@wordpress/hooks": "^3.16.1-next.957ca95e4c.0",
+		"@wordpress/html-entities": "^3.16.1-next.957ca95e4c.0",
+		"@wordpress/i18n": "^4.16.1-next.957ca95e4c.0",
+		"@wordpress/icons": "^9.7.1-next.957ca95e4c.0",
+		"@wordpress/interface": "^4.15.1-next.957ca95e4c.0",
+		"@wordpress/keyboard-shortcuts": "^3.14.1-next.957ca95e4c.0",
+		"@wordpress/keycodes": "^3.16.1-next.957ca95e4c.0",
+		"@wordpress/media-utils": "^4.7.1-next.957ca95e4c.0",
+		"@wordpress/notices": "^3.16.1-next.957ca95e4c.0",
+		"@wordpress/plugins": "^4.14.1-next.957ca95e4c.0",
+		"@wordpress/preferences": "^2.8.1-next.957ca95e4c.0",
+		"@wordpress/reusable-blocks": "^3.14.1-next.957ca95e4c.0",
+		"@wordpress/style-engine": "^0.15.1-next.957ca95e4c.0",
+		"@wordpress/url": "^3.17.1-next.957ca95e4c.0",
+		"@wordpress/viewport": "^4.14.1-next.957ca95e4c.0",
 		"classnames": "^2.3.1",
 		"downloadjs": "^1.4.7",
 		"history": "^5.1.0",
@@ -68,5 +68,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "171b87c7465b93e685e081c5f57f153507363c95"
+	"gitHead": "272a74bbbaab10ee24424eafe9578e705fbfbbb4"
 }

package/src/components/add-new-template/new-template.js

@@ -41,6 +41,7 @@ import {
 	useTaxonomiesMenuItems,
 	usePostTypeMenuItems,
 	useAuthorMenuItem,
+	usePostTypeArchiveMenuItems,
 } from './utils';
 import AddCustomGenericTemplateModal from './add-custom-generic-template-modal';
 import { useHistory } from '../routes';
@@ -301,6 +302,7 @@ function useMissingTemplates(
 	} );
 	const missingTemplates = [
 		...enhancedMissingDefaultTemplateTypes,
+		...usePostTypeArchiveMenuItems(),
 		...postTypesMenuItems,
 		...taxonomiesMenuItems,
 	];

package/src/components/add-new-template/utils.js

@@ -12,7 +12,7 @@ import { store as editorStore } from '@wordpress/editor';
 import { decodeEntities } from '@wordpress/html-entities';
 import { useMemo, useCallback } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
-import { blockMeta, post } from '@wordpress/icons';
+import { blockMeta, post, archive } from '@wordpress/icons';
 
 /**
  * @typedef IHasNameAndId
@@ -86,10 +86,90 @@ const usePublicTaxonomies = () => {
 	}, [ taxonomies ] );
 };
 
+function usePostTypeNeedsUniqueIdentifier( publicPostTypes ) {
+	const postTypeLabels = useMemo( () =>
+		publicPostTypes?.reduce( ( accumulator, { labels } ) => {
+			const singularName = labels.singular_name.toLowerCase();
+			accumulator[ singularName ] =
+				( accumulator[ singularName ] || 0 ) + 1;
+			return accumulator;
+		}, {} )
+	);
+	return useCallback(
+		( { labels, slug } ) => {
+			const singularName = labels.singular_name.toLowerCase();
+			return postTypeLabels[ singularName ] > 1 && singularName !== slug;
+		},
+		[ postTypeLabels ]
+	);
+}
+
+export function usePostTypeArchiveMenuItems() {
+	const publicPostTypes = usePublicPostTypes();
+	const postTypesWithArchives = useMemo(
+		() => publicPostTypes?.filter( ( postType ) => postType.has_archive ),
+		[ publicPostTypes ]
+	);
+	const existingTemplates = useExistingTemplates();
+	const needsUniqueIdentifier = usePostTypeNeedsUniqueIdentifier(
+		postTypesWithArchives
+	);
+	return useMemo(
+		() =>
+			postTypesWithArchives
+				?.filter(
+					( postType ) =>
+						! ( existingTemplates || [] ).some(
+							( existingTemplate ) =>
+								existingTemplate.slug ===
+								'archive-' + postType.slug
+						)
+				)
+				.map( ( postType ) => {
+					let title;
+					if ( needsUniqueIdentifier( postType ) ) {
+						title = sprintf(
+							// translators: %1s: Name of the post type e.g: "Post"; %2s: Slug of the post type e.g: "book".
+							__( 'Archive: %1$s (%2$s)' ),
+							postType.labels.singular_name,
+							postType.slug
+						);
+					} else {
+						title = sprintf(
+							// translators: %s: Name of the post type e.g: "Post".
+							__( 'Archive: %s' ),
+							postType.labels.singular_name
+						);
+					}
+					return {
+						slug: 'archive-' + postType.slug,
+						description: sprintf(
+							// translators: %s: Name of the post type e.g: "Post".
+							__(
+								'Displays an archive with the latests posts of type: %s.'
+							),
+							postType.labels.singular_name
+						),
+						title,
+						// `icon` is the `menu_icon` property of a post type. We
+						// only handle `dashicons` for now, even if the `menu_icon`
+						// also supports urls and svg as values.
+						icon: postType.icon?.startsWith( 'dashicons-' )
+							? postType.icon.slice( 10 )
+							: archive,
+						templatePrefix: 'archive',
+					};
+				} ) || [],
+		[ postTypesWithArchives, existingTemplates, needsUniqueIdentifier ]
+	);
+}
+
 export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 	const publicPostTypes = usePublicPostTypes();
 	const existingTemplates = useExistingTemplates();
 	const defaultTemplateTypes = useDefaultTemplateTypes();
+	const needsUniqueIdentifier =
+		usePostTypeNeedsUniqueIdentifier( publicPostTypes );
 	// `page`is a special case in template hierarchy.
 	const templatePrefixes = useMemo(
 		() =>
@@ -103,21 +183,6 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 			}, {} ),
 		[ publicPostTypes ]
 	);
-	// We need to keep track of naming conflicts. If a conflict
-	// occurs, we need to add slug.
-	const postTypeLabels = publicPostTypes?.reduce(
-		( accumulator, { labels } ) => {
-			const singularName = labels.singular_name.toLowerCase();
-			accumulator[ singularName ] =
-				( accumulator[ singularName ] || 0 ) + 1;
-			return accumulator;
-		},
-		{}
-	);
-	const needsUniqueIdentifier = ( labels, slug ) => {
-		const singularName = labels.singular_name.toLowerCase();
-		return postTypeLabels[ singularName ] > 1 && singularName !== slug;
-	};
 	const postTypesInfo = useEntitiesInfo( 'postType', templatePrefixes );
 	const existingTemplateSlugs = ( existingTemplates || [] ).map(
 		( { slug } ) => slug
@@ -134,10 +199,7 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 			);
 			const hasGeneralTemplate =
 				existingTemplateSlugs?.includes( generalTemplateSlug );
-			const _needsUniqueIdentifier = needsUniqueIdentifier(
-				labels,
-				slug
-			);
+			const _needsUniqueIdentifier = needsUniqueIdentifier( postType );
 			let menuItemTitle = sprintf(
 				// translators: %s: Name of the post type e.g: "Post".
 				__( 'Single item: %s' ),

package/src/components/global-styles/dimensions-panel.js

@@ -121,20 +121,21 @@ function splitStyleValue( value ) {
 function splitGapValue( value ) {
 	// Check for shorthand value (a string value).
 	if ( value && typeof value === 'string' ) {
-		// Convert to value for individual sides for BoxControl.
+		// If the value is a string, treat it as a single side (top) for the spacing controls.
 		return {
 			top: value,
-			right: value,
-			bottom: value,
-			left: value,
 		};
 	}
 
-	return {
-		...value,
-		right: value?.left,
-		bottom: value?.top,
-	};
+	if ( value ) {
+		return {
+			...value,
+			right: value?.left,
+			bottom: value?.top,
+		};
+	}
+
+	return value;
 }
 
 // Props for managing `layout.contentSize`.
@@ -238,21 +239,26 @@ function useMarginProps( name ) {
 function useBlockGapProps( name ) {
 	const [ gapValue, setGapValue ] = useStyle( 'spacing.blockGap', name );
 	const gapValues = splitGapValue( gapValue );
-	const setGapValues = ( nextBoxGapValue ) => {
-		if ( ! nextBoxGapValue ) {
-			setGapValue( null );
-		}
-		setGapValue( {
-			top: nextBoxGapValue?.top,
-			left: nextBoxGapValue?.left,
-		} );
-	};
 	const gapSides = useCustomSides( name, 'blockGap' );
 	const isAxialGap =
 		gapSides && gapSides.some( ( side ) => AXIAL_SIDES.includes( side ) );
 	const resetGapValue = () => setGapValue( undefined );
 	const [ userSetGapValue ] = useStyle( 'spacing.blockGap', name, 'user' );
 	const hasGapValue = () => !! userSetGapValue;
+	const setGapValues = ( nextBoxGapValue ) => {
+		if ( ! nextBoxGapValue ) {
+			setGapValue( null );
+		}
+		// If axial gap is not enabled, treat the 'top' value as the shorthand gap value.
+		if ( ! isAxialGap && nextBoxGapValue?.hasOwnProperty( 'top' ) ) {
+			setGapValue( nextBoxGapValue.top );
+		} else {
+			setGapValue( {
+				top: nextBoxGapValue?.top,
+				left: nextBoxGapValue?.left,
+			} );
+		}
+	};
 	return {
 		gapValue,
 		gapValues,
@@ -469,27 +475,42 @@ export default function DimensionsPanel( { name } ) {
 					label={ __( 'Block spacing' ) }
 					onDeselect={ resetGapValue }
 					isShownByDefault={ true }
+					className={ classnames( {
+						'tools-panel-item-spacing': showSpacingPresetsControl,
+					} ) }
 				>
-					{ isAxialGap ? (
-						<BoxControl
+					{ ! showSpacingPresetsControl &&
+						( isAxialGap ? (
+							<BoxControl
+								label={ __( 'Block spacing' ) }
+								min={ 0 }
+								onChange={ setGapValues }
+								units={ units }
+								sides={ gapSides }
+								values={ gapValues }
+								allowReset={ false }
+								splitOnAxis={ isAxialGap }
+							/>
+						) : (
+							<UnitControl
+								label={ __( 'Block spacing' ) }
+								__unstableInputWidth="80px"
+								min={ 0 }
+								onChange={ setGapValue }
+								units={ units }
+								value={ gapValue }
+							/>
+						) ) }
+					{ showSpacingPresetsControl && (
+						<SpacingSizesControl
 							label={ __( 'Block spacing' ) }
 							min={ 0 }
 							onChange={ setGapValues }
-							units={ units }
-							sides={ gapSides }
+							sides={ isAxialGap ? gapSides : [ 'top' ] } // Use 'top' as the shorthand property in non-axial configurations.
 							values={ gapValues }
 							allowReset={ false }
 							splitOnAxis={ isAxialGap }
 						/>
-					) : (
-						<UnitControl
-							label={ __( 'Block spacing' ) }
-							__unstableInputWidth="80px"
-							min={ 0 }
-							onChange={ setGapValue }
-							units={ units }
-							value={ gapValue }
-						/>
 					) }
 				</ToolsPanelItem>
 			) }

package/src/components/global-styles/hooks.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { get, cloneDeep, set, isEqual, has } from 'lodash';
+import { get, cloneDeep, set, isEqual } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -210,10 +210,8 @@ export function getSupportedGlobalStylesPanels( name ) {
 		// unset, we still enable it.
 		if ( STYLE_PROPERTY[ styleName ].requiresOptOut ) {
 			if (
-				has(
-					blockType.supports,
-					STYLE_PROPERTY[ styleName ].support[ 0 ]
-				) &&
+				STYLE_PROPERTY[ styleName ].support[ 0 ] in
+					blockType.supports &&
 				get(
 					blockType.supports,
 					STYLE_PROPERTY[ styleName ].support

package/src/components/global-styles/preview.js

@@ -79,13 +79,13 @@ const StylesPreview = ( { label, isFocused } ) => {
 		)
 		.slice( 0, 2 );
 
-	// Reset leaked styles from WP common.css.
+	// Reset leaked styles from WP common.css and remove main content layout padding.
 	const editorStyles = useMemo( () => {
 		if ( styles ) {
 			return [
 				...styles,
 				{
-					css: 'body{min-width: 0;}',
+					css: 'body{min-width: 0;padding: 0;}',
 					isGlobalStyles: true,
 				},
 			];

package/src/components/global-styles/utils.js

@@ -79,7 +79,7 @@ export const PRESET_METADATA = [
 	},
 	{
 		path: [ 'spacing', 'spacingSizes' ],
-		valueKey: 'spacingSizes',
+		valueKey: 'size',
 		cssVarInfix: 'spacing',
 		valueFunc: ( { size } ) => size,
 		classes: [],