@wordpress/edit-post 6.4.0 → 6.7.0

package/build-style/style.css

@@ -416,7 +416,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 @media (min-width: 480px) {
   .interface-more-menu-dropdown__content .components-popover__content {
-    width: auto;
     max-width: 480px;
   }
 }
@@ -430,6 +429,8 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 
 .interface-pinned-items {
   display: flex;
+  gap: 4px;
+  margin-right: -4px;
 }
 .interface-pinned-items .components-button:not(:first-child) {
   display: none;
@@ -440,7 +441,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 .interface-pinned-items .components-button {
-  margin-left: 4px;
+  margin: 0;
 }
 .interface-pinned-items .components-button svg {
   max-width: 24px;
@@ -571,38 +572,26 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 
+/**
+ * Buttons on the right side
+ */
 .edit-post-header__settings {
   display: inline-flex;
   align-items: center;
   flex-wrap: wrap;
   padding-right: 4px;
-  /**
-   * Buttons in the Toolbar
-  	 */
+  gap: 4px;
 }
 @media (min-width: 600px) {
   .edit-post-header__settings {
-    padding-right: 16px;
+    padding-right: 10px;
   }
 }
-.edit-post-header__settings .editor-post-saved-state,
-.edit-post-header__settings .components-button.components-button {
-  margin-right: 4px;
-}
 @media (min-width: 600px) {
-  .edit-post-header__settings .editor-post-saved-state,
-.edit-post-header__settings .components-button.components-button {
-    margin-right: 12px;
+  .edit-post-header__settings {
+    gap: 8px;
   }
 }
-.edit-post-header__settings .editor-post-saved-state,
-.edit-post-header__settings .components-button.is-tertiary {
-  padding: 0 6px;
-}
-.edit-post-header__settings .interface-more-menu-dropdown .components-button,
-.edit-post-header__settings .interface-pinned-items .components-button {
-  margin-right: 0;
-}
 
 .edit-post-header-preview__grouping-external {
   display: flex;
@@ -621,10 +610,13 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   margin-left: auto;
 }
 
-.edit-post-post-preview-dropdown .components-popover__content > div {
+.edit-post-post-preview-dropdown .components-popover__content {
   padding-bottom: 0;
 }
 
+/**
+ * Show icon labels.
+ */
 .show-icon-labels.interface-pinned-items .components-button.has-icon,
 .show-icon-labels .edit-post-header .components-button.has-icon,
 .edit-post-header__dropdown .components-button.has-icon {
@@ -697,22 +689,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
     padding-right: 12px;
   }
 }
-.show-icon-labels.interface-pinned-items .components-dropdown-menu__toggle,
-.show-icon-labels .edit-post-header .components-dropdown-menu__toggle,
-.edit-post-header__dropdown .components-dropdown-menu__toggle {
-  margin-left: 8px;
-  padding-left: 8px;
-  padding-right: 8px;
-}
-@media (min-width: 600px) {
-  .show-icon-labels.interface-pinned-items .components-dropdown-menu__toggle,
-.show-icon-labels .edit-post-header .components-dropdown-menu__toggle,
-.edit-post-header__dropdown .components-dropdown-menu__toggle {
-    margin-left: 12px;
-    padding-left: 12px;
-    padding-right: 12px;
-  }
-}
 .show-icon-labels.interface-pinned-items .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle::after,
 .show-icon-labels .edit-post-header .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle::after,
 .edit-post-header__dropdown .edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle::after {
@@ -992,26 +968,42 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 
 .edit-post-template-top-area__popover .components-popover__content {
   min-width: 280px;
-  padding: 8px;
+}
+.edit-post-template-top-area__popover .components-popover__content > div {
+  padding: 0;
+}
+.edit-post-template-top-area__popover .edit-site-template-details__group {
+  padding: 16px;
+}
+.edit-post-template-top-area__popover .edit-site-template-details__group .components-base-control__help {
+  margin-bottom: 0;
 }
 .edit-post-template-top-area__popover .edit-post-template-details__description {
   color: #757575;
 }
 
 .edit-post-template-top-area__second-menu-group {
-  margin-left: -16px;
-  margin-right: -16px;
-  padding: 16px;
-  padding-bottom: 0;
   border-top: 1px solid #ddd;
+  padding: 16px 8px;
 }
 .edit-post-template-top-area__second-menu-group .edit-post-template-top-area__delete-template-button {
   display: flex;
   justify-content: center;
+  padding: 4px 8px;
+}
+.edit-post-template-top-area__second-menu-group .edit-post-template-top-area__delete-template-button.is-destructive {
+  padding: inherit;
+  margin-left: 8px;
+  margin-right: 8px;
+  width: calc(100% - 16px);
+}
+.edit-post-template-top-area__second-menu-group .edit-post-template-top-area__delete-template-button.is-destructive .components-menu-item__item {
+  width: auto;
 }
 .edit-post-template-top-area__second-menu-group .edit-post-template-top-area__delete-template-button .components-menu-item__item {
   margin-right: 0;
   min-width: 0;
+  width: 100%;
 }
 
 .edit-post-keyboard-shortcut-help-modal__section {
@@ -1229,10 +1221,6 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   font-weight: 600;
 }
 
-.edit-post-block-manager__show-all {
-  margin-right: 8px;
-}
-
 .edit-post-block-manager__checklist {
   margin-top: 0;
 }
@@ -1488,8 +1476,8 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   text-align: right;
 }
 
-.edit-post-post-schedule__dialog .components-popover__content > div {
-  padding: 0;
+.edit-post-post-schedule__dialog .components-popover__content {
+  padding: 16px;
 }
 
 .editor-post-slug__input {
@@ -1512,36 +1500,8 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   width: 45%;
 }
 
-@media (min-width: 782px) {
-  .edit-post-post-visibility__dialog .components-popover__content {
-    width: 257px;
-  }
-}
-
-.edit-post-post-visibility__dialog-legend {
-  font-weight: 600;
-}
-
-.edit-post-post-visibility__choice {
-  margin: 10px 0;
-}
-
-.edit-post-post-visibility__dialog-radio,
-.edit-post-post-visibility__dialog-label {
-  vertical-align: top;
-}
-
-.edit-post-post-visibility__dialog-password-input {
-  width: calc(100% - 20px);
-  margin-left: 20px;
-}
-
-.edit-post-post-visibility__dialog-info {
-  color: #757575;
-  padding-left: 20px;
-  font-style: italic;
-  margin: 4px 0 0;
-  line-height: 1.4;
+.edit-post-post-visibility__dialog .components-popover__content {
+  width: 262px;
 }
 
 .components-button.edit-post-sidebar__panel-tab {
@@ -1566,7 +1526,7 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   visibility: hidden;
 }
 .components-button.edit-post-sidebar__panel-tab.is-active {
-  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) transparent, inset 0 -4px 0 0 var(--wp-admin-theme-color);
+  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) transparent, inset 0 -1.5px 0 0 var(--wp-admin-theme-color);
   position: relative;
   z-index: 1;
 }
@@ -1577,7 +1537,7 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   bottom: 1px;
   right: 0;
   left: 0;
-  border-bottom: 4px solid transparent;
+  border-bottom: 1.5px solid transparent;
 }
 .components-button.edit-post-sidebar__panel-tab:focus {
   box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
@@ -1585,7 +1545,7 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   z-index: 1;
 }
 .components-button.edit-post-sidebar__panel-tab.is-active:focus {
-  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 -4px 0 0 var(--wp-admin-theme-color);
+  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 -3px 0 0 var(--wp-admin-theme-color);
 }
 
 @media (min-width: 782px) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "6.4.0",
+	"version": "6.7.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,35 +27,35 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.7.0",
-		"@wordpress/api-fetch": "^6.4.0",
-		"@wordpress/block-editor": "^8.6.0",
-		"@wordpress/block-library": "^7.4.0",
-		"@wordpress/blocks": "^11.6.0",
-		"@wordpress/components": "^19.9.0",
-		"@wordpress/compose": "^5.5.0",
-		"@wordpress/core-data": "^4.5.0",
-		"@wordpress/data": "^6.7.0",
-		"@wordpress/deprecated": "^3.7.0",
-		"@wordpress/editor": "^12.6.0",
-		"@wordpress/element": "^4.5.0",
-		"@wordpress/hooks": "^3.7.0",
-		"@wordpress/i18n": "^4.7.0",
-		"@wordpress/icons": "^8.3.0",
-		"@wordpress/interface": "^4.6.0",
-		"@wordpress/keyboard-shortcuts": "^3.5.0",
-		"@wordpress/keycodes": "^3.7.0",
-		"@wordpress/media-utils": "^3.5.0",
-		"@wordpress/notices": "^3.7.0",
-		"@wordpress/plugins": "^4.5.0",
-		"@wordpress/preferences": "^1.3.0",
-		"@wordpress/url": "^3.8.0",
-		"@wordpress/viewport": "^4.5.0",
-		"@wordpress/warning": "^2.7.0",
+		"@wordpress/a11y": "^3.10.0",
+		"@wordpress/api-fetch": "^6.7.0",
+		"@wordpress/block-editor": "^9.2.0",
+		"@wordpress/block-library": "^7.7.0",
+		"@wordpress/blocks": "^11.9.0",
+		"@wordpress/components": "^19.12.0",
+		"@wordpress/compose": "^5.8.0",
+		"@wordpress/core-data": "^4.8.0",
+		"@wordpress/data": "^6.10.0",
+		"@wordpress/deprecated": "^3.10.0",
+		"@wordpress/editor": "^12.9.0",
+		"@wordpress/element": "^4.8.0",
+		"@wordpress/hooks": "^3.10.0",
+		"@wordpress/i18n": "^4.10.0",
+		"@wordpress/icons": "^9.1.0",
+		"@wordpress/interface": "^4.9.0",
+		"@wordpress/keyboard-shortcuts": "^3.8.0",
+		"@wordpress/keycodes": "^3.10.0",
+		"@wordpress/media-utils": "^4.1.0",
+		"@wordpress/notices": "^3.10.0",
+		"@wordpress/plugins": "^4.8.0",
+		"@wordpress/preferences": "^2.2.0",
+		"@wordpress/url": "^3.11.0",
+		"@wordpress/viewport": "^4.8.0",
+		"@wordpress/warning": "^2.10.0",
 		"classnames": "^2.3.1",
 		"lodash": "^4.17.21",
 		"memize": "^1.1.0",
-		"rememo": "^3.0.0"
+		"rememo": "^4.0.0"
 	},
 	"peerDependencies": {
 		"react": "^17.0.0",
@@ -64,5 +64,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "1ba52312b56db563df2d8d4fba5b00613fb46d8c"
+	"gitHead": "a3e0b62091e8a8bdf5e2518e42d60d7098af48cc"
 }

package/src/components/block-manager/style.scss

@@ -44,10 +44,6 @@
 	}
 }
 
-.edit-post-block-manager__show-all {
-	margin-right: $grid-unit-10;
-}
-
 .edit-post-block-manager__checklist {
 	margin-top: 0;
 }

package/src/components/device-preview/index.js

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import { get } from 'lodash';
+
 /**
  * WordPress dependencies
  */
@@ -7,6 +12,7 @@ import { external } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { __experimentalPreviewOptions as PreviewOptions } from '@wordpress/block-editor';
 import { useDispatch, useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -18,18 +24,23 @@ export default function DevicePreview() {
 		hasActiveMetaboxes,
 		isPostSaveable,
 		isSaving,
+		isViewable,
 		deviceType,
-	} = useSelect(
-		( select ) => ( {
+	} = useSelect( ( select ) => {
+		const { getEditedPostAttribute } = select( editorStore );
+		const { getPostType } = select( coreStore );
+		const postType = getPostType( getEditedPostAttribute( 'type' ) );
+
+		return {
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
 			isSaving: select( editPostStore ).isSavingMetaBoxes(),
 			isPostSaveable: select( editorStore ).isEditedPostSaveable(),
+			isViewable: get( postType, [ 'viewable' ], false ),
 			deviceType: select(
 				editPostStore
 			).__experimentalGetPreviewDeviceType(),
-		} ),
-		[]
-	);
+		};
+	}, [] );
 	const {
 		__experimentalSetPreviewDeviceType: setPreviewDeviceType,
 	} = useDispatch( editPostStore );
@@ -41,24 +52,26 @@ export default function DevicePreview() {
 			deviceType={ deviceType }
 			setDeviceType={ setPreviewDeviceType }
 		>
-			<MenuGroup>
-				<div className="edit-post-header-preview__grouping-external">
-					<PostPreviewButton
-						className={
-							'edit-post-header-preview__button-external'
-						}
-						role="menuitem"
-						forceIsAutosaveable={ hasActiveMetaboxes }
-						forcePreviewLink={ isSaving ? null : undefined }
-						textContent={
-							<>
-								{ __( 'Preview in new tab' ) }
-								<Icon icon={ external } />
-							</>
-						}
-					/>
-				</div>
-			</MenuGroup>
+			{ isViewable && (
+				<MenuGroup>
+					<div className="edit-post-header-preview__grouping-external">
+						<PostPreviewButton
+							className={
+								'edit-post-header-preview__button-external'
+							}
+							role="menuitem"
+							forceIsAutosaveable={ hasActiveMetaboxes }
+							forcePreviewLink={ isSaving ? null : undefined }
+							textContent={
+								<>
+									{ __( 'Preview in new tab' ) }
+									<Icon icon={ external } />
+								</>
+							}
+						/>
+					</div>
+				</MenuGroup>
+			) }
 		</PreviewOptions>
 	);
 }

package/src/components/header/style.scss

@@ -44,6 +44,10 @@
 	}
 }
 
+/**
+ * Buttons on the right side
+ */
+
 .edit-post-header__settings {
 	display: inline-flex;
 	align-items: center;
@@ -51,31 +55,13 @@
 	padding-right: $grid-unit-05;
 
 	@include break-small () {
-		padding-right: $grid-unit-20;
-	}
-
-	/**
-	 * Buttons in the Toolbar
- 	 */
-
-	// Adjust button paddings to scale better to mobile.
-	.editor-post-saved-state,
-	.components-button.components-button {
-		margin-right: $grid-unit-05;
-
-		@include break-small() {
-			margin-right: $grid-unit-15;
-		}
+		padding-right: $grid-unit-20 - ($grid-unit-15 * 0.5);
 	}
 
-	.editor-post-saved-state,
-	.components-button.is-tertiary {
-		padding: 0 #{ $grid-unit-15 * 0.5 };
-	}
+	gap: $grid-unit-05;
 
-	.interface-more-menu-dropdown .components-button,
-	.interface-pinned-items .components-button {
-		margin-right: 0;
+	@include break-small() {
+		gap: $grid-unit-10;
 	}
 }
 
@@ -98,12 +84,14 @@
 	}
 }
 
-.edit-post-post-preview-dropdown {
-	.components-popover__content > div {
-		padding-bottom: 0;
-	}
+.edit-post-post-preview-dropdown .components-popover__content {
+	padding-bottom: 0;
 }
 
+/**
+ * Show icon labels.
+ */
+
 .show-icon-labels.interface-pinned-items,
 .show-icon-labels .edit-post-header,
 .edit-post-header__dropdown {
@@ -157,17 +145,7 @@
 			padding-right: $grid-unit-15;
 		}
 	}
-	.components-dropdown-menu__toggle {
-		margin-left: $grid-unit;
-		padding-left: $grid-unit;
-		padding-right: $grid-unit;
 
-		@include break-small {
-			margin-left: $grid-unit-15;
-			padding-left: $grid-unit-15;
-			padding-right: $grid-unit-15;
-		}
-	}
 	// The inserter has a custom label, different from its aria-label, so we don't want to display both.
 	.edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle {
 		&::after {

package/src/components/header/template-title/delete-template.js

@@ -48,6 +48,8 @@ export default function DeleteTemplate() {
 		templateTitle = template.title;
 	}
 
+	const isRevertable = template?.has_theme_file;
+
 	const onDelete = () => {
 		clearSelectedBlock();
 		setIsEditingTemplate( false );
@@ -77,14 +79,19 @@ export default function DeleteTemplate() {
 			<>
 				<MenuItem
 					className="edit-post-template-top-area__delete-template-button"
-					isDestructive
-					variant="secondary"
-					aria-label={ __( 'Delete template' ) }
+					isDestructive={ ! isRevertable }
 					onClick={ () => {
 						setShowConfirmDialog( true );
 					} }
+					info={
+						isRevertable
+							? __( 'Restore template to default state' )
+							: undefined
+					}
 				>
-					{ __( 'Delete template' ) }
+					{ isRevertable
+						? __( 'Clear customizations' )
+						: __( 'Delete template' ) }
 				</MenuItem>
 				<ConfirmDialog
 					isOpen={ showConfirmDialog }

package/src/components/header/template-title/edit-template-title.js

@@ -29,7 +29,8 @@ export default function EditTemplateTitle() {
 	const { getEditorSettings } = useSelect( editorStore );
 	const { updateEditorSettings } = useDispatch( editorStore );
 
-	if ( template.has_theme_file ) {
+	// Only user-created and non-default templates can change the name.
+	if ( ! template.is_custom || template.has_theme_file ) {
 		return null;
 	}
 
@@ -41,31 +42,33 @@ export default function EditTemplateTitle() {
 	}
 
 	return (
-		<TextControl
-			label={ __( 'Title' ) }
-			value={ templateTitle }
-			help={ __(
-				'Give the template a title that indicates its purpose, e.g. "Full Width".'
-			) }
-			onChange={ ( newTitle ) => {
-				const settings = getEditorSettings();
-				const newAvailableTemplates = mapValues(
-					settings.availableTemplates,
-					( existingTitle, id ) => {
-						if ( id !== template.slug ) {
-							return existingTitle;
+		<div className="edit-site-template-details__group">
+			<TextControl
+				label={ __( 'Title' ) }
+				value={ templateTitle }
+				help={ __(
+					'Give the template a title that indicates its purpose, e.g. "Full Width".'
+				) }
+				onChange={ ( newTitle ) => {
+					const settings = getEditorSettings();
+					const newAvailableTemplates = mapValues(
+						settings.availableTemplates,
+						( existingTitle, id ) => {
+							if ( id !== template.slug ) {
+								return existingTitle;
+							}
+							return newTitle;
 						}
-						return newTitle;
-					}
-				);
-				updateEditorSettings( {
-					...settings,
-					availableTemplates: newAvailableTemplates,
-				} );
-				editEntityRecord( 'postType', 'wp_template', template.id, {
-					title: newTitle,
-				} );
-			} }
-		/>
+					);
+					updateEditorSettings( {
+						...settings,
+						availableTemplates: newAvailableTemplates,
+					} );
+					editEntityRecord( 'postType', 'wp_template', template.id, {
+						title: newTitle,
+					} );
+				} }
+			/>
+		</div>
 	);
 }

package/src/components/header/template-title/style.scss

@@ -49,7 +49,18 @@
 .edit-post-template-top-area__popover {
 	.components-popover__content {
 		min-width: 280px;
-		padding: $grid-unit-10;
+
+		> div {
+			padding: 0;
+		}
+	}
+
+	.edit-site-template-details__group {
+		padding: $grid-unit-20;
+
+		.components-base-control__help {
+			margin-bottom: 0;
+		}
 	}
 
 	.edit-post-template-details__description {
@@ -58,19 +69,29 @@
 }
 
 .edit-post-template-top-area__second-menu-group {
-	margin-left: -$grid-unit-20;
-	margin-right: -$grid-unit-20;
-	padding: $grid-unit-20;
-	padding-bottom: 0;
 	border-top: $border-width solid $gray-300;
+	padding: $grid-unit-20 $grid-unit-10;
 
 	.edit-post-template-top-area__delete-template-button {
 		display: flex;
 		justify-content: center;
+		padding: $grid-unit-05 $grid-unit;
+
+		&.is-destructive {
+			padding: inherit;
+			margin-left: $grid-unit-10;
+			margin-right: $grid-unit-10;
+			width: calc(100% - #{($grid-unit * 2)});
+
+			.components-menu-item__item {
+				width: auto;
+			}
+		}
 
 		.components-menu-item__item {
 			margin-right: 0;
 			min-width: 0;
+			width: 100%;
 		}
 	}
 }

package/src/components/header/template-title/template-description.js

@@ -23,8 +23,9 @@ export default function TemplateDescription() {
 	if ( ! description ) {
 		return null;
 	}
+
 	return (
-		<>
+		<div className="edit-site-template-details__group">
 			<Heading level={ 4 } weight={ 600 }>
 				{ title }
 			</Heading>
@@ -36,6 +37,6 @@ export default function TemplateDescription() {
 			>
 				{ description }
 			</Text>
-		</>
+		</div>
 	);
 }

package/src/components/layout/index.js

@@ -181,6 +181,7 @@ function Layout( { styles } ) {
 		if ( mode === 'visual' && isListViewOpened ) {
 			return <ListViewSidebar />;
 		}
+
 		return null;
 	};