@wordpress/edit-post 7.28.3 → 7.29.0

package/src/components/layout/index.js

@@ -20,7 +20,6 @@ import {
 } from '@wordpress/editor';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
-	useBlockCommands,
 	BlockBreadcrumb,
 	BlockToolbar,
 	privateApis as blockEditorPrivateApis,
@@ -134,7 +133,6 @@ function useEditorStyles() {
 function Layout( { initialPost } ) {
 	useCommands();
 	useCommonCommands();
-	useBlockCommands();
 
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 	const isHugeViewport = useViewportMatch( 'huge', '>=' );
@@ -180,7 +178,7 @@ function Layout( { initialPost } ) {
 				select( editPostStore ).isFeatureActive( 'fullscreenMode' ),
 			isInserterOpened: select( editorStore ).isInserterOpened(),
 			isListViewOpened: select( editorStore ).isListViewOpened(),
-			mode: select( editPostStore ).getEditorMode(),
+			mode: select( editorStore ).getEditorMode(),
 			isRichEditingEnabled: editorSettings.richEditingEnabled,
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
 			previousShortcut: select(
@@ -310,7 +308,8 @@ function Layout( { initialPost } ) {
 				editorNotices={ <EditorNotices /> }
 				secondarySidebar={ secondarySidebar() }
 				sidebar={
-					( ! isMobileViewport || sidebarIsOpened ) && (
+					( ( isMobileViewport && sidebarIsOpened ) ||
+						( ! isMobileViewport && ! isDistractionFree ) ) && (
 						<>
 							{ ! isMobileViewport && ! sidebarIsOpened && (
 								<div className="edit-post-layout__toggle-sidebar-panel">

package/src/components/layout/index.native.js

@@ -36,7 +36,6 @@ import styles from './style.scss';
 import headerToolbarStyles from '../header/header-toolbar/style.scss';
 import Header from '../header';
 import VisualEditor from '../visual-editor';
-import { store as editPostStore } from '../../store';
 
 class Layout extends Component {
 	constructor() {
@@ -192,9 +191,8 @@ class Layout extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { __unstableIsEditorReady: isEditorReady } =
+		const { __unstableIsEditorReady: isEditorReady, getEditorMode } =
 			select( editorStore );
-		const { getEditorMode } = select( editPostStore );
 		const { getSettings } = select( blockEditorStore );
 		const globalStyles =
 			getSettings()?.__experimentalGlobalStylesBaseStyles?.color;

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

@@ -21,7 +21,7 @@ export default function TextEditor() {
 	const isRichEditingEnabled = useSelect( ( select ) => {
 		return select( editorStore ).getEditorSettings().richEditingEnabled;
 	}, [] );
-	const { switchEditorMode } = useDispatch( editPostStore );
+	const { switchEditorMode } = useDispatch( editorStore );
 
 	const { isWelcomeGuideVisible } = useSelect( ( select ) => {
 		const { isFeatureActive } = select( editPostStore );

package/src/editor.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import {
 	ErrorBoundary,
 	PostLockedModal,
@@ -11,7 +11,6 @@ import {
 import { useMemo } from '@wordpress/element';
 import { SlotFillProvider } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
-import { store as preferencesStore } from '@wordpress/preferences';
 import { CommandMenu } from '@wordpress/commands';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
@@ -49,46 +48,37 @@ function Editor( {
 		onNavigateToPreviousEntityRecord,
 	} = useNavigateToEntityRecord( initialPostId, initialPostType );
 
-	const { hasInlineToolbar, post, preferredStyleVariations, template } =
-		useSelect(
-			( select ) => {
-				const { isFeatureActive, getEditedPostTemplate } =
-					select( editPostStore );
-				const { getEntityRecord, getPostType, canUser } =
-					select( coreStore );
-				const { getEditorSettings } = select( editorStore );
+	const { post, template } = useSelect(
+		( select ) => {
+			const { getEditedPostTemplate } = select( editPostStore );
+			const { getEntityRecord, getPostType, canUser } =
+				select( coreStore );
+			const { getEditorSettings } = select( editorStore );
 
-				const postObject = getEntityRecord(
-					'postType',
-					currentPost.postType,
-					currentPost.postId
-				);
+			const postObject = getEntityRecord(
+				'postType',
+				currentPost.postType,
+				currentPost.postId
+			);
 
-				const supportsTemplateMode =
-					getEditorSettings().supportsTemplateMode;
-				const isViewable =
-					getPostType( currentPost.postType )?.viewable ?? false;
-				const canEditTemplate = canUser( 'create', 'templates' );
-				return {
-					hasInlineToolbar: isFeatureActive( 'inlineToolbar' ),
-					preferredStyleVariations: select( preferencesStore ).get(
-						'core/edit-post',
-						'preferredStyleVariations'
-					),
-					template:
-						supportsTemplateMode &&
-						isViewable &&
-						canEditTemplate &&
-						currentPost.postType !== 'wp_template'
-							? getEditedPostTemplate()
-							: null,
-					post: postObject,
-				};
-			},
-			[ currentPost.postType, currentPost.postId ]
-		);
-
-	const { updatePreferredStyleVariations } = useDispatch( editPostStore );
+			const supportsTemplateMode =
+				getEditorSettings().supportsTemplateMode;
+			const isViewable =
+				getPostType( currentPost.postType )?.viewable ?? false;
+			const canEditTemplate = canUser( 'create', 'templates' );
+			return {
+				template:
+					supportsTemplateMode &&
+					isViewable &&
+					canEditTemplate &&
+					currentPost.postType !== 'wp_template'
+						? getEditedPostTemplate()
+						: null,
+				post: postObject,
+			};
+		},
+		[ currentPost.postType, currentPost.postId ]
+	);
 
 	const editorSettings = useMemo(
 		() => ( {
@@ -96,20 +86,8 @@ function Editor( {
 			onNavigateToEntityRecord,
 			onNavigateToPreviousEntityRecord,
 			defaultRenderingMode: 'post-only',
-			__experimentalPreferredStyleVariations: {
-				value: preferredStyleVariations,
-				onChange: updatePreferredStyleVariations,
-			},
-			hasInlineToolbar,
 		} ),
-		[
-			settings,
-			hasInlineToolbar,
-			preferredStyleVariations,
-			updatePreferredStyleVariations,
-			onNavigateToEntityRecord,
-			onNavigateToPreviousEntityRecord,
-		]
+		[ settings, onNavigateToEntityRecord, onNavigateToPreviousEntityRecord ]
 	);
 
 	if ( ! post ) {

package/src/editor.native.js

@@ -9,7 +9,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { EditorProvider } from '@wordpress/editor';
+import { EditorProvider, store as editorStore } from '@wordpress/editor';
 import { parse, serialize } from '@wordpress/blocks';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
@@ -24,7 +24,6 @@ import { store as coreStore } from '@wordpress/core-data';
  * Internal dependencies
  */
 import Layout from './components/layout';
-import { store as editPostStore } from './store';
 
 class Editor extends Component {
 	constructor( props ) {
@@ -154,14 +153,14 @@ class Editor extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { getEditorMode } = select( editPostStore );
+		const { getEditorMode } = select( editorStore );
 
 		return {
 			mode: getEditorMode(),
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { switchEditorMode } = dispatch( editPostStore );
+		const { switchEditorMode } = dispatch( editorStore );
 		const { editEntityRecord } = dispatch( coreStore );
 		return {
 			switchEditorMode,

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

@@ -4,14 +4,11 @@
 import { useSelect, useDispatch } from '@wordpress/data';
 import { __, isRTL } from '@wordpress/i18n';
 import {
-	code,
 	drawerLeft,
 	drawerRight,
 	blockDefault,
 	keyboard,
 	fullscreen,
-	listView,
-	external,
 	formatListBullets,
 } from '@wordpress/icons';
 import { useCommand } from '@wordpress/commands';
@@ -28,48 +25,26 @@ import { PREFERENCES_MODAL_NAME } from '../../components/preferences-modal';
 import { store as editPostStore } from '../../store';
 
 export default function useCommonCommands() {
-	const {
-		openGeneralSidebar,
-		closeGeneralSidebar,
-		switchEditorMode,
-		toggleDistractionFree,
-	} = useDispatch( editPostStore );
+	const { openGeneralSidebar, closeGeneralSidebar } =
+		useDispatch( editPostStore );
 	const { openModal } = useDispatch( interfaceStore );
-	const {
-		editorMode,
-		activeSidebar,
-		isListViewOpen,
-		isFullscreen,
-		isPublishSidebarEnabled,
-		showBlockBreadcrumbs,
-		isDistractionFree,
-		isTopToolbar,
-		isFocusMode,
-	} = useSelect( ( select ) => {
-		const { get } = select( preferencesStore );
-		const { getEditorMode } = select( editPostStore );
-		const { isListViewOpened } = select( editorStore );
-
-		return {
-			activeSidebar: select( interfaceStore ).getActiveComplementaryArea(
-				editPostStore.name
-			),
-			editorMode: getEditorMode(),
-			isListViewOpen: isListViewOpened(),
-			isPublishSidebarEnabled:
-				select( editorStore ).isPublishSidebarEnabled(),
-			showBlockBreadcrumbs: get( 'core', 'showBlockBreadcrumbs' ),
-			isDistractionFree: get( 'core', 'distractionFree' ),
-			isFocusMode: get( 'core', 'focusMode' ),
-			isTopToolbar: get( 'core', 'fixedToolbar' ),
-			isFullscreen: get( 'core/edit-post', 'fullscreenMode' ),
-		};
-	}, [] );
+	const { activeSidebar, isFullscreen, isPublishSidebarEnabled } = useSelect(
+		( select ) => {
+			const { get } = select( preferencesStore );
+
+			return {
+				activeSidebar: select(
+					interfaceStore
+				).getActiveComplementaryArea( editPostStore.name ),
+				isPublishSidebarEnabled:
+					select( editorStore ).isPublishSidebarEnabled(),
+				isFullscreen: get( 'core/edit-post', 'fullscreenMode' ),
+			};
+		},
+		[]
+	);
 	const { toggle } = useDispatch( preferencesStore );
 	const { createInfoNotice } = useDispatch( noticesStore );
-	const { __unstableSaveForPreview, setIsListViewOpened } =
-		useDispatch( editorStore );
-	const { getCurrentPostId } = useSelect( editorStore );
 
 	useCommand( {
 		name: 'core/open-settings-sidebar',
@@ -99,41 +74,6 @@ export default function useCommonCommands() {
 		},
 	} );
 
-	useCommand( {
-		name: 'core/toggle-distraction-free',
-		label: isDistractionFree
-			? __( 'Exit Distraction Free' )
-			: __( 'Enter Distraction Free ' ),
-		callback: ( { close } ) => {
-			toggleDistractionFree();
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-spotlight-mode',
-		label: __( 'Toggle spotlight' ),
-		callback: ( { close } ) => {
-			toggle( 'core', 'focusMode' );
-			close();
-			createInfoNotice(
-				isFocusMode ? __( 'Spotlight off.' ) : __( 'Spotlight on.' ),
-				{
-					id: 'core/edit-post/toggle-spotlight-mode/notice',
-					type: 'snackbar',
-					actions: [
-						{
-							label: __( 'Undo' ),
-							onClick: () => {
-								toggle( 'core', 'focusMode' );
-							},
-						},
-					],
-				}
-			);
-		},
-	} );
-
 	useCommand( {
 		name: 'core/toggle-fullscreen-mode',
 		label: isFullscreen
@@ -161,67 +101,6 @@ export default function useCommonCommands() {
 		},
 	} );
 
-	useCommand( {
-		name: 'core/toggle-list-view',
-		label: isListViewOpen
-			? __( 'Close List View' )
-			: __( 'Open List View' ),
-		icon: listView,
-		callback: ( { close } ) => {
-			setIsListViewOpened( ! isListViewOpen );
-			close();
-			createInfoNotice(
-				isListViewOpen ? __( 'List View off.' ) : __( 'List View on.' ),
-				{
-					id: 'core/edit-post/toggle-list-view/notice',
-					type: 'snackbar',
-				}
-			);
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-top-toolbar',
-		label: __( 'Toggle top toolbar' ),
-		callback: ( { close } ) => {
-			toggle( 'core', 'fixedToolbar' );
-			if ( isDistractionFree ) {
-				toggleDistractionFree();
-			}
-			close();
-			createInfoNotice(
-				isTopToolbar
-					? __( 'Top toolbar off.' )
-					: __( 'Top toolbar on.' ),
-				{
-					id: 'core/edit-post/toggle-top-toolbar/notice',
-					type: 'snackbar',
-					actions: [
-						{
-							label: __( 'Undo' ),
-							onClick: () => {
-								toggle( 'core', 'fixedToolbar' );
-							},
-						},
-					],
-				}
-			);
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-code-editor',
-		label:
-			editorMode === 'visual'
-				? __( 'Open code editor' )
-				: __( 'Exit code editor' ),
-		icon: code,
-		callback: ( { close } ) => {
-			switchEditorMode( editorMode === 'visual' ? 'text' : 'visual' );
-			close();
-		},
-	} );
-
 	useCommand( {
 		name: 'core/open-preferences',
 		label: __( 'Editor preferences' ),
@@ -239,26 +118,6 @@ export default function useCommonCommands() {
 		},
 	} );
 
-	useCommand( {
-		name: 'core/toggle-breadcrumbs',
-		label: showBlockBreadcrumbs
-			? __( 'Hide block breadcrumbs' )
-			: __( 'Show block breadcrumbs' ),
-		callback: ( { close } ) => {
-			toggle( 'core', 'showBlockBreadcrumbs' );
-			close();
-			createInfoNotice(
-				showBlockBreadcrumbs
-					? __( 'Breadcrumbs hidden.' )
-					: __( 'Breadcrumbs visible.' ),
-				{
-					id: 'core/edit-post/toggle-breadcrumbs/notice',
-					type: 'snackbar',
-				}
-			);
-		},
-	} );
-
 	useCommand( {
 		name: 'core/toggle-publish-sidebar',
 		label: isPublishSidebarEnabled
@@ -279,16 +138,4 @@ export default function useCommonCommands() {
 			);
 		},
 	} );
-
-	useCommand( {
-		name: 'core/preview-link',
-		label: __( 'Preview in a new tab' ),
-		icon: external,
-		callback: async ( { close } ) => {
-			close();
-			const postId = getCurrentPostId();
-			const link = await __unstableSaveForPreview();
-			window.open( link, `wp-preview-${ postId }` );
-		},
-	} );
 }

package/src/index.js

@@ -9,7 +9,6 @@ import {
 import deprecated from '@wordpress/deprecated';
 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,
@@ -56,7 +55,6 @@ export function initializeEditor(
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
 		fullscreenMode: true,
 		isPublishSidebarEnabled: true,
-		preferredStyleVariations: {},
 		themeStyles: true,
 		welcomeGuide: true,
 		welcomeGuideTemplate: true,
@@ -96,48 +94,6 @@ export function initializeEditor(
 		} );
 	}
 
-	/*
-	 * Prevent adding template part in the post editor.
-	 * Only add the filter when the post editor is initialized, not imported.
-	 * Also only add the filter(s) after registerCoreBlocks()
-	 * so that common filters in the block library are not overwritten.
-	 */
-	addFilter(
-		'blockEditor.__unstableCanInsertBlockType',
-		'removeTemplatePartsFromInserter',
-		( canInsert, blockType ) => {
-			if ( blockType.name === 'core/template-part' ) {
-				return false;
-			}
-			return canInsert;
-		}
-	);
-
-	/*
-	 * Prevent adding post content block (except in query block) in the post editor.
-	 * Only add the filter when the post editor is initialized, not imported.
-	 * Also only add the filter(s) after registerCoreBlocks()
-	 * so that common filters in the block library are not overwritten.
-	 */
-	addFilter(
-		'blockEditor.__unstableCanInsertBlockType',
-		'removePostContentFromInserter',
-		(
-			canInsert,
-			blockType,
-			rootClientId,
-			{ getBlockParentsByBlockName }
-		) => {
-			if ( blockType.name === 'core/post-content' ) {
-				return (
-					getBlockParentsByBlockName( rootClientId, 'core/query' )
-						.length > 0
-				);
-			}
-			return canInsert;
-		}
-	);
-
 	// Show a console log warning if the browser is not in Standards rendering mode.
 	const documentMode =
 		document.compatMode === 'CSS1Compat' ? 'Standards' : 'Quirks';

package/src/index.native.js

@@ -27,7 +27,6 @@ export function initializeEditor( id, postType, postId ) {
 		inactivePanels: [],
 		isPublishSidebarEnabled: true,
 		openPanels: [ 'post-status' ],
-		preferredStyleVariations: {},
 		welcomeGuide: true,
 	} );
 	dispatch( preferencesStore ).setDefaults( 'core', {