@wordpress/edit-post 7.28.2 → 7.28.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.28.2",
+	"version": "7.28.4",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -29,34 +29,34 @@
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/a11y": "^3.51.1",
 		"@wordpress/api-fetch": "^6.48.1",
-		"@wordpress/block-editor": "^12.19.2",
-		"@wordpress/block-library": "^8.28.2",
-		"@wordpress/blocks": "^12.28.2",
-		"@wordpress/commands": "^0.22.2",
-		"@wordpress/components": "^26.0.2",
+		"@wordpress/block-editor": "^12.19.4",
+		"@wordpress/block-library": "^8.28.4",
+		"@wordpress/blocks": "^12.28.4",
+		"@wordpress/commands": "^0.22.3",
+		"@wordpress/components": "^26.0.3",
 		"@wordpress/compose": "^6.28.1",
-		"@wordpress/core-commands": "^0.20.2",
-		"@wordpress/core-data": "^6.28.2",
+		"@wordpress/core-commands": "^0.20.4",
+		"@wordpress/core-data": "^6.28.4",
 		"@wordpress/data": "^9.21.1",
 		"@wordpress/deprecated": "^3.51.1",
 		"@wordpress/dom": "^3.51.1",
-		"@wordpress/editor": "^13.28.2",
+		"@wordpress/editor": "^13.28.4",
 		"@wordpress/element": "^5.28.1",
 		"@wordpress/hooks": "^3.51.1",
 		"@wordpress/i18n": "^4.51.1",
-		"@wordpress/icons": "^9.42.1",
-		"@wordpress/interface": "^5.28.2",
+		"@wordpress/icons": "^9.42.2",
+		"@wordpress/interface": "^5.28.3",
 		"@wordpress/keyboard-shortcuts": "^4.28.1",
 		"@wordpress/keycodes": "^3.51.1",
 		"@wordpress/media-utils": "^4.42.1",
 		"@wordpress/notices": "^4.19.1",
-		"@wordpress/plugins": "^6.19.2",
-		"@wordpress/preferences": "^3.28.2",
+		"@wordpress/plugins": "^6.19.3",
+		"@wordpress/preferences": "^3.28.3",
 		"@wordpress/private-apis": "^0.33.1",
 		"@wordpress/url": "^3.52.1",
 		"@wordpress/viewport": "^5.28.1",
 		"@wordpress/warning": "^2.51.1",
-		"@wordpress/widgets": "^3.28.2",
+		"@wordpress/widgets": "^3.28.4",
 		"classnames": "^2.3.1",
 		"memize": "^2.1.0",
 		"rememo": "^4.0.2"
@@ -68,5 +68,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "730beb7fd33d3382d6032c3f33e451625a0fcf36"
+	"gitHead": "864c1c553cb284def3bd5c907998da45f5c143ea"
 }

package/src/components/editor-initialization/listener-hooks.js

@@ -5,6 +5,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { useEffect, useRef } from '@wordpress/element';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as editorStore } from '@wordpress/editor';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -22,19 +23,25 @@ import {
  * @param {number} postId The current post id.
  */
 export const useBlockSelectionListener = ( postId ) => {
-	const { hasBlockSelection, isEditorSidebarOpened } = useSelect(
-		( select ) => ( {
-			hasBlockSelection:
-				!! select( blockEditorStore ).getBlockSelectionStart(),
-			isEditorSidebarOpened: select( STORE_NAME ).isEditorSidebarOpened(),
-		} ),
-		[ postId ]
-	);
+	const { hasBlockSelection, isEditorSidebarOpened, isDistractionFree } =
+		useSelect(
+			( select ) => {
+				const { get } = select( preferencesStore );
+				return {
+					hasBlockSelection:
+						!! select( blockEditorStore ).getBlockSelectionStart(),
+					isEditorSidebarOpened:
+						select( STORE_NAME ).isEditorSidebarOpened(),
+					isDistractionFree: get( 'core', 'distractionFree' ),
+				};
+			},
+			[ postId ]
+		);
 
 	const { openGeneralSidebar } = useDispatch( STORE_NAME );
 
 	useEffect( () => {
-		if ( ! isEditorSidebarOpened ) {
+		if ( ! isEditorSidebarOpened || isDistractionFree ) {
 			return;
 		}
 		if ( hasBlockSelection ) {

package/src/components/editor-initialization/test/listener-hooks.js

@@ -44,6 +44,12 @@ describe( 'listener hook tests', () => {
 				isViewportMatch: jest.fn(),
 			},
 		},
+		'core/preferences': {
+			...storeConfig,
+			selectors: {
+				get: jest.fn(),
+			},
+		},
 		[ STORE_NAME ]: {
 			...storeConfig,
 			actions: {
@@ -112,6 +118,7 @@ describe( 'listener hook tests', () => {
 				'getBlockSelectionStart',
 				true
 			);
+			setMockReturnValue( 'core/preferences', 'get', false );
 
 			render( <TestedOutput /> );
 
@@ -120,12 +127,14 @@ describe( 'listener hook tests', () => {
 			).toHaveBeenCalledWith( 'edit-post/block' );
 		} );
 		it( 'opens document sidebar if block is not selected', () => {
+			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
 			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
 			setMockReturnValue(
 				'core/block-editor',
 				'getBlockSelectionStart',
 				false
 			);
+			setMockReturnValue( 'core/preferences', 'get', false );
 
 			render( <TestedOutput /> );
 
@@ -133,6 +142,37 @@ describe( 'listener hook tests', () => {
 				getSpyedAction( STORE_NAME, 'openGeneralSidebar' )
 			).toHaveBeenCalledWith( 'edit-post/document' );
 		} );
+		it( 'does not open block sidebar if block is selected and distraction free mode is on', () => {
+			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
+			setMockReturnValue(
+				'core/block-editor',
+				'getBlockSelectionStart',
+				true
+			);
+			setMockReturnValue( 'core/preferences', 'get', true );
+
+			render( <TestedOutput /> );
+
+			expect(
+				getSpyedAction( STORE_NAME, 'openGeneralSidebar' )
+			).toHaveBeenCalledTimes( 0 );
+		} );
+		it( 'does not open document sidebar if block is not selected and distraction free is on', () => {
+			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
+			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
+			setMockReturnValue(
+				'core/block-editor',
+				'getBlockSelectionStart',
+				false
+			);
+			setMockReturnValue( 'core/preferences', 'get', true );
+
+			render( <TestedOutput /> );
+
+			expect(
+				getSpyedAction( STORE_NAME, 'openGeneralSidebar' )
+			).toHaveBeenCalledTimes( 0 );
+		} );
 	} );
 
 	describe( 'useUpdatePostLinkListener', () => {

package/src/components/header/index.js

@@ -61,7 +61,7 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 	const blockToolbarRef = useRef();
 	const {
 		isTextEditor,
-		hasBlockSelection,
+		blockSelectionStart,
 		hasActiveMetaboxes,
 		hasFixedToolbar,
 		isPublishSidebarOpened,
@@ -73,8 +73,8 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 
 		return {
 			isTextEditor: getEditorMode() === 'text',
-			hasBlockSelection:
-				!! select( blockEditorStore ).getBlockSelectionStart(),
+			blockSelectionStart:
+				select( blockEditorStore ).getBlockSelectionStart(),
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
 			hasHistory:
 				!! select( editorStore ).getEditorSettings()
@@ -88,13 +88,14 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 
 	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
 		useState( true );
+	const hasBlockSelection = !! blockSelectionStart;
 
 	useEffect( () => {
 		// If we have a new block selection, show the block tools
-		if ( hasBlockSelection ) {
+		if ( blockSelectionStart ) {
 			setIsBlockToolsCollapsed( false );
 		}
-	}, [ hasBlockSelection ] );
+	}, [ blockSelectionStart ] );
 
 	return (
 		<div className="edit-post-header">
@@ -121,7 +122,9 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 							className={ classnames(
 								'selected-block-tools-wrapper',
 								{
-									'is-collapsed': isBlockToolsCollapsed,
+									'is-collapsed':
+										isBlockToolsCollapsed ||
+										! hasBlockSelection,
 								}
 							) }
 						>

package/src/components/layout/index.js

@@ -385,7 +385,7 @@ function Layout( { initialPost } ) {
 			<PostSyncStatusModal />
 			<StartPageOptions />
 			<PluginArea onError={ onPluginAreaError } />
-			<SettingsSidebar />
+			{ ! isDistractionFree && <SettingsSidebar /> }
 		</>
 	);
 }

package/src/index.js

@@ -49,6 +49,7 @@ export function initializeEditor(
 	settings,
 	initialEdits
 ) {
+	const isMediumOrBigger = window.matchMedia( '(min-width: 782px)' ).matches;
 	const target = document.getElementById( id );
 	const root = createRoot( target );
 
@@ -77,7 +78,9 @@ export function initializeEditor(
 
 	// Check if the block list view should be open by default.
 	// If `distractionFree` mode is enabled, the block list view should not be open.
+	// This behavior is disabled for small viewports.
 	if (
+		isMediumOrBigger &&
 		select( preferencesStore ).get( 'core', 'showListViewByDefault' ) &&
 		! select( preferencesStore ).get( 'core', 'distractionFree' )
 	) {

package/src/store/selectors.js

@@ -556,7 +556,7 @@ export const isEditingTemplate = createRegistrySelector( ( select ) => () => {
 		since: '6.5',
 		alternative: `select( 'core/editor' ).getRenderingMode`,
 	} );
-	return select( editorStore ).getCurrentPostType() !== 'post-only';
+	return select( editorStore ).getCurrentPostType() === 'wp_template';
 } );
 
 /**