@wordpress/edit-post 7.31.0 → 7.32.0

package/build-style/style.css

@@ -447,7 +447,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   display: none;
   margin: 0;
 }
-.interface-pinned-items .components-button[aria-controls="edit-post:document"], .interface-pinned-items .components-button[aria-controls="edit-post:block"], .interface-pinned-items .components-button[aria-controls="edit-site:template"], .interface-pinned-items .components-button[aria-controls="edit-site:block-inspector"], .interface-pinned-items .components-button[aria-controls="edit-site:global-styles"] {
+.interface-pinned-items .components-button[aria-controls="edit-post:document"], .interface-pinned-items .components-button[aria-controls="edit-post:block"], .interface-pinned-items .components-button[aria-controls="edit-site:template"], .interface-pinned-items .components-button[aria-controls="edit-site:block-inspector"] {
   display: flex;
 }
 .interface-pinned-items .components-button svg {
@@ -1126,12 +1126,6 @@ body.is-fullscreen-mode .edit-post-layout .components-editor-notices__snackbar {
   margin: 8px;
 }
 
-h2.edit-post-template-summary__title {
-  line-height: 24px;
-  margin: 0 0 4px;
-  font-weight: 500;
-}
-
 .edit-post-text-editor {
   position: relative;
   width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.31.0",
+	"version": "7.32.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,36 +27,36 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.54.0",
-		"@wordpress/api-fetch": "^6.51.0",
-		"@wordpress/block-editor": "^12.22.0",
-		"@wordpress/block-library": "^8.31.0",
-		"@wordpress/blocks": "^12.31.0",
-		"@wordpress/commands": "^0.25.0",
-		"@wordpress/components": "^27.2.0",
-		"@wordpress/compose": "^6.31.0",
-		"@wordpress/core-commands": "^0.23.0",
-		"@wordpress/core-data": "^6.31.0",
-		"@wordpress/data": "^9.24.0",
-		"@wordpress/deprecated": "^3.54.0",
-		"@wordpress/dom": "^3.54.0",
-		"@wordpress/editor": "^13.31.0",
-		"@wordpress/element": "^5.31.0",
-		"@wordpress/hooks": "^3.54.0",
-		"@wordpress/i18n": "^4.54.0",
-		"@wordpress/icons": "^9.45.0",
-		"@wordpress/interface": "^5.31.0",
-		"@wordpress/keyboard-shortcuts": "^4.31.0",
-		"@wordpress/keycodes": "^3.54.0",
-		"@wordpress/media-utils": "^4.45.0",
-		"@wordpress/notices": "^4.22.0",
-		"@wordpress/plugins": "^6.22.0",
-		"@wordpress/preferences": "^3.31.0",
-		"@wordpress/private-apis": "^0.36.0",
-		"@wordpress/url": "^3.55.0",
-		"@wordpress/viewport": "^5.31.0",
-		"@wordpress/warning": "^2.54.0",
-		"@wordpress/widgets": "^3.31.0",
+		"@wordpress/a11y": "^3.55.0",
+		"@wordpress/api-fetch": "^6.52.0",
+		"@wordpress/block-editor": "^12.23.0",
+		"@wordpress/block-library": "^8.32.0",
+		"@wordpress/blocks": "^12.32.0",
+		"@wordpress/commands": "^0.26.0",
+		"@wordpress/components": "^27.3.0",
+		"@wordpress/compose": "^6.32.0",
+		"@wordpress/core-commands": "^0.24.0",
+		"@wordpress/core-data": "^6.32.0",
+		"@wordpress/data": "^9.25.0",
+		"@wordpress/deprecated": "^3.55.0",
+		"@wordpress/dom": "^3.55.0",
+		"@wordpress/editor": "^13.32.0",
+		"@wordpress/element": "^5.32.0",
+		"@wordpress/hooks": "^3.55.0",
+		"@wordpress/i18n": "^4.55.0",
+		"@wordpress/icons": "^9.46.0",
+		"@wordpress/interface": "^5.32.0",
+		"@wordpress/keyboard-shortcuts": "^4.32.0",
+		"@wordpress/keycodes": "^3.55.0",
+		"@wordpress/media-utils": "^4.46.0",
+		"@wordpress/notices": "^4.23.0",
+		"@wordpress/plugins": "^6.23.0",
+		"@wordpress/preferences": "^3.32.0",
+		"@wordpress/private-apis": "^0.37.0",
+		"@wordpress/url": "^3.56.0",
+		"@wordpress/viewport": "^5.32.0",
+		"@wordpress/warning": "^2.55.0",
+		"@wordpress/widgets": "^3.32.0",
 		"classnames": "^2.3.1",
 		"memize": "^2.1.0",
 		"rememo": "^4.0.2"
@@ -68,5 +68,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "ffc07735d0abfb3f69e91d48f25b7fe8d1ef92d2"
+	"gitHead": "ac2b13783c28f959770cf029a797a712f59e1958"
 }

package/src/classic.scss

@@ -1,7 +1,8 @@
 // Provide baseline auto margin for centering blocks.
 // Specificity is kept at this level as many classic themes output
 // rules like figure { margin: 0; } which would break centering.
-.editor-styles-wrapper .wp-block {
+// These rules should also not apply to direct children of flex layout blocks.
+:where(.editor-styles-wrapper) :where(:not(.is-layout-flex, .is-layout-grid)) > .wp-block {
 	margin-left: auto;
 	margin-right: auto;
 }

package/src/components/header/index.js

@@ -81,7 +81,7 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 				!! select( editorStore ).getEditorSettings()
 					.onNavigateToPreviousEntityRecord,
 			isPublishSidebarOpened:
-				select( editPostStore ).isPublishSidebarOpened(),
+				select( editorStore ).isPublishSidebarOpened(),
 			showIconLabels: getPreference( 'core', 'showIconLabels' ),
 		};
 	}, [] );

package/src/components/header/post-publish-button-or-toggle.js

@@ -5,11 +5,6 @@ import { useViewportMatch, compose } from '@wordpress/compose';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { PostPublishButton, store as editorStore } from '@wordpress/editor';
 
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
 export function PostPublishButtonOrToggle( {
 	forceIsDirty,
 	hasPublishAction,
@@ -85,12 +80,11 @@ export default compose(
 		isPublished: select( editorStore ).isCurrentPostPublished(),
 		isPublishSidebarEnabled:
 			select( editorStore ).isPublishSidebarEnabled(),
-		isPublishSidebarOpened:
-			select( editPostStore ).isPublishSidebarOpened(),
+		isPublishSidebarOpened: select( editorStore ).isPublishSidebarOpened(),
 		isScheduled: select( editorStore ).isCurrentPostScheduled(),
 	} ) ),
 	withDispatch( ( dispatch ) => {
-		const { togglePublishSidebar } = dispatch( editPostStore );
+		const { togglePublishSidebar } = dispatch( editorStore );
 		return {
 			togglePublishSidebar,
 		};

package/src/components/keyboard-shortcut-help-modal/index.js

@@ -136,6 +136,10 @@ export function KeyboardShortcutHelpModal( { isModalActive, toggleModal } ) {
 				title={ __( 'Text formatting' ) }
 				shortcuts={ textFormattingShortcuts }
 			/>
+			<ShortcutCategorySection
+				title={ __( 'List View shortcuts' ) }
+				categoryName="list-view"
+			/>
 		</Modal>
 	);
 }

package/src/components/layout/actions-panel.js

@@ -4,17 +4,18 @@
 import {
 	EntitiesSavedStates,
 	PostPublishPanel,
+	PluginPrePublishPanel,
+	PluginPostPublishPanel,
 	store as editorStore,
 } from '@wordpress/editor';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { Button, createSlotFill } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useCallback } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
-import PluginPostPublishPanel from '../sidebar/plugin-post-publish-panel';
-import PluginPrePublishPanel from '../sidebar/plugin-pre-publish-panel';
 import { store as editPostStore } from '../../store';
 
 const { Fill, Slot } = createSlotFill( 'ActionsPanel' );
@@ -27,7 +28,7 @@ export default function ActionsPanel( {
 	isEntitiesSavedStatesOpen,
 } ) {
 	const { closePublishSidebar, togglePublishSidebar } =
-		useDispatch( editPostStore );
+		useDispatch( editorStore );
 	const {
 		publishSidebarOpened,
 		hasActiveMetaboxes,
@@ -35,7 +36,7 @@ export default function ActionsPanel( {
 	} = useSelect(
 		( select ) => ( {
 			publishSidebarOpened:
-				select( editPostStore ).isPublishSidebarOpened(),
+				select( editorStore ).isPublishSidebarOpened(),
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
 			hasNonPostEntityChanges:
 				select( editorStore ).hasNonPostEntityChanges(),

package/src/components/layout/index.js

@@ -172,7 +172,7 @@ function Layout( { initialPost } ) {
 			sidebarIsOpened: !! (
 				select( interfaceStore ).getActiveComplementaryArea(
 					editPostStore.name
-				) || select( editPostStore ).isPublishSidebarOpened()
+				) || select( editorStore ).isPublishSidebarOpened()
 			),
 			isFullscreenActive:
 				select( editPostStore ).isFeatureActive( 'fullscreenMode' ),
@@ -258,7 +258,12 @@ function Layout( { initialPost } ) {
 
 	const secondarySidebar = () => {
 		if ( mode === 'visual' && isInserterOpened ) {
-			return <InserterSidebar />;
+			return (
+				<InserterSidebar
+					closeGeneralSidebar={ closeGeneralSidebar }
+					isRightSidebarOpen={ sidebarIsOpened }
+				/>
+			);
 		}
 		if ( mode === 'visual' && isListViewOpened ) {
 			return <ListViewSidebar />;

package/src/components/meta-boxes/meta-boxes-area/style.scss

@@ -88,7 +88,7 @@
 
 	// Until checkboxes WordPress-wide are updated to match the new style,
 	// checkboxes used in metaboxes have to be slightly unstyled here.
-	// @todo: remove this entire rule once checkboxes are the same everywhere.
+	// @todo remove this entire rule once checkboxes are the same everywhere.
 	// See: https://github.com/WordPress/gutenberg/issues/18053
 	.metabox-location-side .postbox input[type="checkbox"] {
 		border: $border-width solid $gray-700;

package/src/components/sidebar/plugin-post-publish-panel/index.js

@@ -1,83 +1,28 @@
 /**
  * WordPress dependencies
  */
-import { usePluginContext } from '@wordpress/plugins';
-import { createSlotFill, PanelBody } from '@wordpress/components';
-
-const { Fill, Slot } = createSlotFill( 'PluginPostPublishPanel' );
+import deprecated from '@wordpress/deprecated';
+import { PluginPostPublishPanel } from '@wordpress/editor';
 
 /**
  * Renders provided content to the post-publish panel in the publish flow
  * (side panel that opens after a user publishes the post).
  *
+ * @deprecated since 6.6, use `wp.editor.PluginPostPublishPanel` instead.
+ *
  * @param {Object}                props                                 Component properties.
  * @param {string}                [props.className]                     An optional class name added to the panel.
  * @param {string}                [props.title]                         Title displayed at the top of the panel.
  * @param {boolean}               [props.initialOpen=false]             Whether to have the panel initially opened. When no title is provided it is always opened.
  * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
  * @param {Element}               props.children                        Children to be rendered
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginPostPublishPanel = wp.editPost.PluginPostPublishPanel;
- *
- * function MyPluginPostPublishPanel() {
- * 	return React.createElement(
- * 		PluginPostPublishPanel,
- * 		{
- * 			className: 'my-plugin-post-publish-panel',
- * 			title: __( 'My panel title' ),
- * 			initialOpen: true,
- * 		},
- * 		__( 'My panel content' )
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginPostPublishPanel } from '@wordpress/edit-post';
- *
- * const MyPluginPostPublishPanel = () => (
- * 	<PluginPostPublishPanel
- * 		className="my-plugin-post-publish-panel"
- * 		title={ __( 'My panel title' ) }
- * 		initialOpen={ true }
- * 	>
- *         { __( 'My panel content' ) }
- * 	</PluginPostPublishPanel>
- * );
- * ```
- *
  * @return {Component} The component to be rendered.
  */
-const PluginPostPublishPanel = ( {
-	children,
-	className,
-	title,
-	initialOpen = false,
-	icon,
-} ) => {
-	const { icon: pluginIcon } = usePluginContext();
-
-	return (
-		<Fill>
-			<PanelBody
-				className={ className }
-				initialOpen={ initialOpen || ! title }
-				title={ title }
-				icon={ icon ?? pluginIcon }
-			>
-				{ children }
-			</PanelBody>
-		</Fill>
-	);
-};
-
-PluginPostPublishPanel.Slot = Slot;
-
-export default PluginPostPublishPanel;
+export default function EditPostPluginPostPublishPanel( props ) {
+	deprecated( 'wp.editPost.PluginPostPublishPanel', {
+		since: '6.6',
+		version: '6.8',
+		alternative: 'wp.editor.PluginPostPublishPanel',
+	} );
+	return <PluginPostPublishPanel { ...props } />;
+}

package/src/components/sidebar/plugin-pre-publish-panel/index.js

@@ -1,15 +1,15 @@
 /**
  * WordPress dependencies
  */
-import { createSlotFill, PanelBody } from '@wordpress/components';
-import { usePluginContext } from '@wordpress/plugins';
-
-const { Fill, Slot } = createSlotFill( 'PluginPrePublishPanel' );
+import deprecated from '@wordpress/deprecated';
+import { PluginPrePublishPanel } from '@wordpress/editor';
 
 /**
  * Renders provided content to the pre-publish side panel in the publish flow
  * (side panel that opens when a user first pushes "Publish" from the main editor).
  *
+ * @deprecated since 6.6, use `wp.editor.PluginPrePublishPanel` instead.
+ *
  * @param {Object}                props                                 Component props.
  * @param {string}                [props.className]                     An optional class name added to the panel.
  * @param {string}                [props.title]                         Title displayed at the top of the panel.
@@ -20,67 +20,13 @@ const { Fill, Slot } = createSlotFill( 'PluginPrePublishPanel' );
  *                                                                      the sidebar is pinned to toolbar.
  * @param {Element}               props.children                        Children to be rendered
  *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginPrePublishPanel = wp.editPost.PluginPrePublishPanel;
- *
- * function MyPluginPrePublishPanel() {
- * 	return React.createElement(
- * 		PluginPrePublishPanel,
- * 		{
- * 			className: 'my-plugin-pre-publish-panel',
- * 			title: __( 'My panel title' ),
- * 			initialOpen: true,
- * 		},
- * 		__( 'My panel content' )
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginPrePublishPanel } from '@wordpress/edit-post';
- *
- * const MyPluginPrePublishPanel = () => (
- * 	<PluginPrePublishPanel
- * 		className="my-plugin-pre-publish-panel"
- * 		title={ __( 'My panel title' ) }
- * 		initialOpen={ true }
- * 	>
- * 	    { __( 'My panel content' ) }
- * 	</PluginPrePublishPanel>
- * );
- * ```
- *
  * @return {Component} The component to be rendered.
  */
-const PluginPrePublishPanel = ( {
-	children,
-	className,
-	title,
-	initialOpen = false,
-	icon,
-} ) => {
-	const { icon: pluginIcon } = usePluginContext();
-
-	return (
-		<Fill>
-			<PanelBody
-				className={ className }
-				initialOpen={ initialOpen || ! title }
-				title={ title }
-				icon={ icon ?? pluginIcon }
-			>
-				{ children }
-			</PanelBody>
-		</Fill>
-	);
-};
-
-PluginPrePublishPanel.Slot = Slot;
-
-export default PluginPrePublishPanel;
+export default function EditPostPluginPrePublishPanel( props ) {
+	deprecated( 'wp.editPost.PluginPrePublishPanel', {
+		since: '6.6',
+		version: '6.8',
+		alternative: 'wp.editor.PluginPrePublishPanel',
+	} );
+	return <PluginPrePublishPanel { ...props } />;
+}

package/src/components/sidebar/settings-sidebar/index.js

@@ -25,6 +25,7 @@ import {
 	PostExcerptPanel,
 	PostLastRevisionPanel,
 	PostTaxonomiesPanel,
+	privateApis as editorPrivateApis,
 } from '@wordpress/editor';
 
 /**
@@ -34,12 +35,14 @@ import SettingsHeader from '../settings-header';
 import PostStatus from '../post-status';
 import MetaBoxes from '../../meta-boxes';
 import PluginSidebarEditPost from '../plugin-sidebar';
-import TemplateSummary from '../template-summary';
 import { store as editPostStore } from '../../../store';
 import { privateApis as componentsPrivateApis } from '@wordpress/components';
 import { unlock } from '../../../lock-unlock';
 
+const { PostCardPanel } = unlock( editorPrivateApis );
+
 const { Tabs } = unlock( componentsPrivateApis );
+const { PatternOverridesPanel } = unlock( editorPrivateApis );
 
 const SIDEBAR_ACTIVE_BY_DEFAULT = Platform.select( {
 	web: true,
@@ -110,6 +113,7 @@ const SidebarContent = ( {
 		>
 			<Tabs.Context.Provider value={ tabsContextValue }>
 				<Tabs.TabPanel tabId={ sidebars.document } focusable={ false }>
+					<PostCardPanel />
 					{ ! isEditingTemplate && (
 						<>
 							<PostStatus />
@@ -119,10 +123,10 @@ const SidebarContent = ( {
 							<PostExcerptPanel />
 							<PostDiscussionPanel />
 							<PageAttributesPanel />
+							<PatternOverridesPanel />
 							<MetaBoxes location="side" />
 						</>
 					) }
-					{ isEditingTemplate && <TemplateSummary /> }
 				</Tabs.TabPanel>
 				<Tabs.TabPanel tabId={ sidebars.block } focusable={ false }>
 					<BlockInspector />

package/src/editor.js

@@ -32,11 +32,14 @@ function Editor( {
 	...props
 } ) {
 	const {
-		initialPost,
 		currentPost,
 		onNavigateToEntityRecord,
 		onNavigateToPreviousEntityRecord,
-	} = useNavigateToEntityRecord( initialPostId, initialPostType );
+	} = useNavigateToEntityRecord(
+		initialPostId,
+		initialPostType,
+		'post-only'
+	);
 
 	const { post, template } = useSelect(
 		( select ) => {
@@ -80,6 +83,13 @@ function Editor( {
 		[ settings, onNavigateToEntityRecord, onNavigateToPreviousEntityRecord ]
 	);
 
+	const initialPost = useMemo( () => {
+		return {
+			type: initialPostType,
+			id: initialPostId,
+		};
+	}, [ initialPostType, initialPostId ] );
+
 	if ( ! post ) {
 		return null;
 	}

package/src/hooks/commands/use-common-commands.js

@@ -126,13 +126,13 @@ export default function useCommonCommands() {
 		icon: formatListBullets,
 		callback: ( { close } ) => {
 			close();
-			toggle( 'core/edit-post', 'isPublishSidebarEnabled' );
+			toggle( 'core', 'isPublishSidebarEnabled' );
 			createInfoNotice(
 				isPublishSidebarEnabled
 					? __( 'Pre-publish checks disabled.' )
 					: __( 'Pre-publish checks enabled.' ),
 				{
-					id: 'core/edit-post/publish-sidebar/notice',
+					id: 'core/editor/publish-sidebar/notice',
 					type: 'snackbar',
 				}
 			);

package/src/hooks/use-navigate-to-entity-record.js

@@ -1,7 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { useCallback, useReducer, useMemo } from '@wordpress/element';
+import { useCallback, useReducer } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
 
 /**
  * A hook that records the 'entity' history in the post editor as a user
@@ -11,20 +13,22 @@ import { useCallback, useReducer, useMemo } from '@wordpress/element';
  *
  * Used to control displaying UI elements like the back button.
  *
- * @param {number} initialPostId   The post id of the post when the editor loaded.
- * @param {string} initialPostType The post type of the post when the editor loaded.
+ * @param {number} initialPostId        The post id of the post when the editor loaded.
+ * @param {string} initialPostType      The post type of the post when the editor loaded.
+ * @param {string} defaultRenderingMode The rendering mode to switch to when navigating.
  *
  * @return {Object} An object containing the `currentPost` variable and
  *                 `onNavigateToEntityRecord` and `onNavigateToPreviousEntityRecord` functions.
  */
 export default function useNavigateToEntityRecord(
 	initialPostId,
-	initialPostType
+	initialPostType,
+	defaultRenderingMode
 ) {
 	const [ postHistory, dispatch ] = useReducer(
-		( historyState, { type, post } ) => {
+		( historyState, { type, post, previousRenderingMode } ) => {
 			if ( type === 'push' ) {
-				return [ ...historyState, post ];
+				return [ ...historyState, { post, previousRenderingMode } ];
 			}
 			if ( type === 'pop' ) {
 				// Try to leave one item in the history.
@@ -34,32 +38,41 @@ export default function useNavigateToEntityRecord(
 			}
 			return historyState;
 		},
-		[ { postId: initialPostId, postType: initialPostType } ]
+		[
+			{
+				post: { postId: initialPostId, postType: initialPostType },
+			},
+		]
 	);
 
-	const initialPost = useMemo( () => {
-		return {
-			type: initialPostType,
-			id: initialPostId,
-		};
-	}, [ initialPostType, initialPostId ] );
+	const { post, previousRenderingMode } =
+		postHistory[ postHistory.length - 1 ];
 
-	const onNavigateToEntityRecord = useCallback( ( params ) => {
-		dispatch( {
-			type: 'push',
-			post: { postId: params.postId, postType: params.postType },
-		} );
-	}, [] );
+	const { getRenderingMode } = useSelect( editorStore );
+	const { setRenderingMode } = useDispatch( editorStore );
+
+	const onNavigateToEntityRecord = useCallback(
+		( params ) => {
+			dispatch( {
+				type: 'push',
+				post: { postId: params.postId, postType: params.postType },
+				// Save the current rendering mode so we can restore it when navigating back.
+				previousRenderingMode: getRenderingMode(),
+			} );
+			setRenderingMode( defaultRenderingMode );
+		},
+		[ getRenderingMode, setRenderingMode, defaultRenderingMode ]
+	);
 
 	const onNavigateToPreviousEntityRecord = useCallback( () => {
 		dispatch( { type: 'pop' } );
-	}, [] );
-
-	const currentPost = postHistory[ postHistory.length - 1 ];
+		if ( previousRenderingMode ) {
+			setRenderingMode( previousRenderingMode );
+		}
+	}, [ setRenderingMode, previousRenderingMode ] );
 
 	return {
-		currentPost,
-		initialPost,
+		currentPost: post,
 		onNavigateToEntityRecord,
 		onNavigateToPreviousEntityRecord:
 			postHistory.length > 1

package/src/index.js

@@ -15,6 +15,7 @@ import {
 	registerWidgetGroupBlock,
 } from '@wordpress/widgets';
 import {
+	PluginBlockSettingsMenuItem,
 	PluginDocumentSettingPanel,
 	privateApis as editorPrivateApis,
 	store as editorStore,
@@ -55,7 +56,6 @@ export function initializeEditor(
 
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
 		fullscreenMode: true,
-		isPublishSidebarEnabled: true,
 		themeStyles: true,
 		welcomeGuide: true,
 		welcomeGuideTemplate: true,
@@ -71,6 +71,7 @@ export function initializeEditor(
 		showBlockBreadcrumbs: true,
 		showIconLabels: false,
 		showListViewByDefault: false,
+		isPublishSidebarEnabled: true,
 	} );
 
 	dispatch( blocksStore ).reapplyBlockTypeFilters();
@@ -161,7 +162,7 @@ export function reinitializeEditor() {
 	} );
 }
 
-export { default as PluginBlockSettingsMenuItem } from './components/block-settings-menu/plugin-block-settings-menu-item';
+export { PluginBlockSettingsMenuItem };
 export { PluginDocumentSettingPanel };
 export { default as PluginMoreMenuItem } from './components/header/plugin-more-menu-item';
 export { default as PluginPostPublishPanel } from './components/sidebar/plugin-post-publish-panel';