@wordpress/edit-post 7.25.0 → 7.26.0

package/src/store/reducer.js

@@ -3,25 +3,6 @@
  */
 import { combineReducers } from '@wordpress/data';
 
-/**
- * Reducer storing the list of all programmatically removed panels.
- *
- * @param {Array}  state  Current state.
- * @param {Object} action Action object.
- *
- * @return {Array} Updated state.
- */
-export function removedPanels( state = [], action ) {
-	switch ( action.type ) {
-		case 'REMOVE_PANEL':
-			if ( ! state.includes( action.panelName ) ) {
-				return [ ...state, action.panelName ];
-			}
-	}
-
-	return state;
-}
-
 export function publishSidebarActive( state = false, action ) {
 	switch ( action.type ) {
 		case 'OPEN_PUBLISH_SIDEBAR':
@@ -98,44 +79,6 @@ export function metaBoxLocations( state = {}, action ) {
 	return state;
 }
 
-/**
- * Reducer to set the block inserter panel open or closed.
- *
- * Note: this reducer interacts with the list view panel reducer
- * to make sure that only one of the two panels is open at the same time.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- */
-export function blockInserterPanel( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_IS_LIST_VIEW_OPENED':
-			return action.isOpen ? false : state;
-		case 'SET_IS_INSERTER_OPENED':
-			return action.value;
-	}
-	return state;
-}
-
-/**
- * Reducer to set the list view panel open or closed.
- *
- * Note: this reducer interacts with the inserter panel reducer
- * to make sure that only one of the two panels is open at the same time.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- */
-export function listViewPanel( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_IS_INSERTER_OPENED':
-			return action.value ? false : state;
-		case 'SET_IS_LIST_VIEW_OPENED':
-			return action.isOpen;
-	}
-	return state;
-}
-
 /**
  * Reducer tracking whether meta boxes are initialized.
  *
@@ -161,7 +104,4 @@ const metaBoxes = combineReducers( {
 export default combineReducers( {
 	metaBoxes,
 	publishSidebarActive,
-	removedPanels,
-	blockInserterPanel,
-	listViewPanel,
 } );

package/src/store/selectors.js

@@ -13,13 +13,13 @@ import { store as coreStore } from '@wordpress/core-data';
 import { store as editorStore } from '@wordpress/editor';
 import deprecated from '@wordpress/deprecated';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+
 const EMPTY_ARRAY = [];
 const EMPTY_OBJECT = {};
-const EMPTY_INSERTION_POINT = {
-	rootClientId: undefined,
-	insertionIndex: undefined,
-	filterValue: undefined,
-};
 
 /**
  * Returns the current editing mode.
@@ -186,13 +186,10 @@ export const getPreferences = createRegistrySelector( ( select ) => () => {
 	// the new preferences store format to old format to ensure no breaking
 	// changes for plugins.
 	const inactivePanels = select( preferencesStore ).get(
-		'core/edit-post',
+		'core',
 		'inactivePanels'
 	);
-	const openPanels = select( preferencesStore ).get(
-		'core/edit-post',
-		'openPanels'
-	);
+	const openPanels = select( preferencesStore ).get( 'core', 'openPanels' );
 	const panels = convertPanelsToOldFormat( inactivePanels, openPanels );
 
 	return {
@@ -250,19 +247,29 @@ export function isPublishSidebarOpened( state ) {
  * Returns true if the given panel was programmatically removed, or false otherwise.
  * All panels are not removed by default.
  *
+ * @deprecated
+ *
  * @param {Object} state     Global application state.
  * @param {string} panelName A string that identifies the panel.
  *
  * @return {boolean} Whether or not the panel is removed.
  */
-export function isEditorPanelRemoved( state, panelName ) {
-	return state.removedPanels.includes( panelName );
-}
+export const isEditorPanelRemoved = createRegistrySelector(
+	( select ) => ( state, panelName ) => {
+		deprecated( `select( 'core/edit-post' ).isEditorPanelRemoved`, {
+			since: '6.5',
+			alternative: `select( 'core/editor' ).isEditorPanelRemoved`,
+		} );
+		return select( editorStore ).isEditorPanelRemoved( panelName );
+	}
+);
 
 /**
  * Returns true if the given panel is enabled, or false otherwise. Panels are
  * enabled by default.
  *
+ * @deprecated
+ *
  * @param {Object} state     Global application state.
  * @param {string} panelName A string that identifies the panel.
  *
@@ -270,14 +277,11 @@ export function isEditorPanelRemoved( state, panelName ) {
  */
 export const isEditorPanelEnabled = createRegistrySelector(
 	( select ) => ( state, panelName ) => {
-		const inactivePanels = select( preferencesStore ).get(
-			'core/edit-post',
-			'inactivePanels'
-		);
-		return (
-			! isEditorPanelRemoved( state, panelName ) &&
-			! inactivePanels?.includes( panelName )
-		);
+		deprecated( `select( 'core/edit-post' ).isEditorPanelEnabled`, {
+			since: '6.5',
+			alternative: `select( 'core/editor' ).isEditorPanelEnabled`,
+		} );
+		return select( editorStore ).isEditorPanelEnabled( panelName );
 	}
 );
 
@@ -285,6 +289,8 @@ export const isEditorPanelEnabled = createRegistrySelector(
  * Returns true if the given panel is open, or false otherwise. Panels are
  * closed by default.
  *
+ * @deprecated
+ *
  * @param {Object} state     Global application state.
  * @param {string} panelName A string that identifies the panel.
  *
@@ -292,11 +298,11 @@ export const isEditorPanelEnabled = createRegistrySelector(
  */
 export const isEditorPanelOpened = createRegistrySelector(
 	( select ) => ( state, panelName ) => {
-		const openPanels = select( preferencesStore ).get(
-			'core/edit-post',
-			'openPanels'
-		);
-		return !! openPanels?.includes( panelName );
+		deprecated( `select( 'core/edit-post' ).isEditorPanelOpened`, {
+			since: '6.5',
+			alternative: `select( 'core/editor' ).isEditorPanelOpened`,
+		} );
+		return select( editorStore ).isEditorPanelOpened( panelName );
 	}
 );
 
@@ -376,14 +382,19 @@ export const getActiveMetaBoxLocations = createSelector(
  *
  * @return {boolean} Whether the meta box location is active and visible.
  */
-export function isMetaBoxLocationVisible( state, location ) {
-	return (
-		isMetaBoxLocationActive( state, location ) &&
-		getMetaBoxesPerLocation( state, location )?.some( ( { id } ) => {
-			return isEditorPanelEnabled( state, `meta-box-${ id }` );
-		} )
-	);
-}
+export const isMetaBoxLocationVisible = createRegistrySelector(
+	( select ) => ( state, location ) => {
+		return (
+			isMetaBoxLocationActive( state, location ) &&
+			getMetaBoxesPerLocation( state, location )?.some( ( { id } ) => {
+				return select( editorStore ).isEditorPanelEnabled(
+					state,
+					`meta-box-${ id }`
+				);
+			} )
+		);
+	}
+);
 
 /**
  * Returns true if there is an active meta box in the given location, or false
@@ -473,28 +484,41 @@ export const __experimentalGetPreviewDeviceType = createRegistrySelector(
 /**
  * Returns true if the inserter is opened.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {boolean} Whether the inserter is opened.
  */
-export function isInserterOpened( state ) {
-	return !! state.blockInserterPanel;
-}
+export const isInserterOpened = createRegistrySelector( ( select ) => () => {
+	deprecated( `select( 'core/edit-post' ).isInserterOpened`, {
+		since: '6.5',
+		alternative: `select( 'core/editor' ).isInserterOpened`,
+	} );
+	return select( editorStore ).isInserterOpened();
+} );
 
 /**
  * Get the insertion point for the inserter.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {Object} The root client ID, index to insert at and starting filter value.
  */
-export function __experimentalGetInsertionPoint( state ) {
-	if ( typeof state.blockInserterPanel === 'boolean' ) {
-		return EMPTY_INSERTION_POINT;
+export const __experimentalGetInsertionPoint = createRegistrySelector(
+	( select ) => () => {
+		deprecated(
+			`select( 'core/edit-post' ).__experimentalGetInsertionPoint`,
+			{
+				since: '6.5',
+				version: '6.7',
+			}
+		);
+		return unlock( select( editorStore ) ).getInsertionPoint();
 	}
-
-	return state.blockInserterPanel;
-}
+);
 
 /**
  * Returns true if the list view is opened.
@@ -503,9 +527,13 @@ export function __experimentalGetInsertionPoint( state ) {
  *
  * @return {boolean} Whether the list view is opened.
  */
-export function isListViewOpened( state ) {
-	return state.listViewPanel;
-}
+export const isListViewOpened = createRegistrySelector( ( select ) => () => {
+	deprecated( `select( 'core/edit-post' ).isListViewOpened`, {
+		since: '6.5',
+		alternative: `select( 'core/editor' ).isListViewOpened`,
+	} );
+	return select( editorStore ).isListViewOpened();
+} );
 
 /**
  * Returns true if the template editing mode is enabled.

package/src/store/test/actions.js

@@ -56,14 +56,12 @@ describe( 'actions', () => {
 	it( 'openGeneralSidebar - should turn off distraction free mode when opening a general sidebar', () => {
 		registry
 			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'distractionFree', true );
+			.set( 'core', 'distractionFree', true );
 		registry
 			.dispatch( editPostStore )
 			.openGeneralSidebar( 'edit-post/block' );
 		expect(
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'distractionFree' )
+			registry.select( preferencesStore ).get( 'core', 'distractionFree' )
 		).toBe( false );
 	} );
 
@@ -119,12 +117,12 @@ describe( 'actions', () => {
 		it( 'should turn off distraction free mode when switching to code editor', () => {
 			registry
 				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'distractionFree', true );
+				.set( 'core', 'distractionFree', true );
 			registry.dispatch( editPostStore ).switchEditorMode( 'text' );
 			expect(
 				registry
 					.select( preferencesStore )
-					.get( 'core/edit-post', 'distractionFree' )
+					.get( 'core', 'distractionFree' )
 			).toBe( false );
 		} );
 	} );
@@ -205,83 +203,6 @@ describe( 'actions', () => {
 		} );
 	} );
 
-	describe( 'toggleEditorPanelEnabled', () => {
-		it( 'toggles panels to be enabled and not enabled', () => {
-			// This will switch it off, since the default is on.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelEnabled( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelEnabled( 'control-panel' )
-			).toBe( false );
-
-			// Also check that the `getPreference` selector includes panels.
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {
-				'control-panel': {
-					enabled: false,
-				},
-			} );
-
-			// Switch it on again.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelEnabled( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelEnabled( 'control-panel' )
-			).toBe( true );
-
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {} );
-		} );
-	} );
-
-	describe( 'toggleEditorPanelOpened', () => {
-		it( 'toggles panels open and closed', () => {
-			// This will open it, since the default is closed.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelOpened( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelOpened( 'control-panel' )
-			).toBe( true );
-
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {
-				'control-panel': {
-					opened: true,
-				},
-			} );
-
-			// Close it.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelOpened( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelOpened( 'control-panel' )
-			).toBe( false );
-
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {} );
-		} );
-	} );
-
 	describe( 'updatePreferredStyleVariations', () => {
 		it( 'sets a preferred style variation for a block when a style name is passed', () => {
 			registry
@@ -336,8 +257,8 @@ describe( 'actions', () => {
 			// Enable everything that shouldn't be enabled in distraction free mode.
 			registry
 				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'fixedToolbar', true );
-			registry.dispatch( editPostStore ).setIsListViewOpened( true );
+				.set( 'core', 'fixedToolbar', true );
+			registry.dispatch( editorStore ).setIsListViewOpened( true );
 			registry
 				.dispatch( editPostStore )
 				.openGeneralSidebar( 'edit-post/block' );
@@ -346,12 +267,12 @@ describe( 'actions', () => {
 			expect(
 				registry
 					.select( preferencesStore )
-					.get( 'core/edit-post', 'fixedToolbar' )
+					.get( 'core', 'fixedToolbar' )
 			).toBe( true );
-			expect( registry.select( editPostStore ).isListViewOpened() ).toBe(
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
 				false
 			);
-			expect( registry.select( editPostStore ).isInserterOpened() ).toBe(
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
 				false
 			);
 			expect(
@@ -362,22 +283,8 @@ describe( 'actions', () => {
 			expect(
 				registry
 					.select( preferencesStore )
-					.get( 'core/edit-post', 'distractionFree' )
+					.get( 'core', 'distractionFree' )
 			).toBe( true );
 		} );
 	} );
-
-	describe( 'setIsListViewOpened', () => {
-		it( 'should turn off distraction free mode when opening the list view', () => {
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'distractionFree', true );
-			registry.dispatch( editPostStore ).setIsListViewOpened( true );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-post', 'distractionFree' )
-			).toBe( false );
-		} );
-	} );
 } );

package/src/store/test/reducer.js

@@ -1,20 +1,7 @@
-/**
- * External dependencies
- */
-import deepFreeze from 'deep-freeze';
-
 /**
  * Internal dependencies
  */
-import {
-	isSavingMetaBoxes,
-	metaBoxLocations,
-	removedPanels,
-	blockInserterPanel,
-	listViewPanel,
-} from '../reducer';
-
-import { setIsInserterOpened } from '../actions';
+import { isSavingMetaBoxes, metaBoxLocations } from '../reducer';
 
 describe( 'state', () => {
 	describe( 'isSavingMetaBoxes', () => {
@@ -94,98 +81,4 @@ describe( 'state', () => {
 			} );
 		} );
 	} );
-
-	describe( 'removedPanels', () => {
-		it( 'should remove panel', () => {
-			const original = deepFreeze( [] );
-			const state = removedPanels( original, {
-				type: 'REMOVE_PANEL',
-				panelName: 'post-status',
-			} );
-			expect( state ).toEqual( [ 'post-status' ] );
-		} );
-
-		it( 'should not remove already removed panel', () => {
-			const original = deepFreeze( [ 'post-status' ] );
-			const state = removedPanels( original, {
-				type: 'REMOVE_PANEL',
-				panelName: 'post-status',
-			} );
-			expect( state ).toBe( original );
-		} );
-	} );
-
-	describe( 'blockInserterPanel()', () => {
-		it( 'should apply default state', () => {
-			expect( blockInserterPanel( undefined, {} ) ).toEqual( false );
-		} );
-
-		it( 'should default to returning the same state', () => {
-			expect( blockInserterPanel( true, {} ) ).toBe( true );
-		} );
-
-		it( 'should set the open state of the inserter panel', () => {
-			expect(
-				blockInserterPanel( false, setIsInserterOpened( true ) )
-			).toBe( true );
-			expect(
-				blockInserterPanel( true, setIsInserterOpened( false ) )
-			).toBe( false );
-		} );
-
-		it( 'should close the inserter when opening the list view panel', () => {
-			expect(
-				blockInserterPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: true,
-				} )
-			).toBe( false );
-		} );
-
-		it( 'should not change the state when closing the list view panel', () => {
-			expect(
-				blockInserterPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: false,
-				} )
-			).toBe( true );
-		} );
-	} );
-
-	describe( 'listViewPanel()', () => {
-		it( 'should apply default state', () => {
-			expect( listViewPanel( undefined, {} ) ).toEqual( false );
-		} );
-
-		it( 'should default to returning the same state', () => {
-			expect( listViewPanel( true, {} ) ).toBe( true );
-		} );
-
-		it( 'should set the open state of the list view panel', () => {
-			expect(
-				listViewPanel( false, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: true,
-				} )
-			).toBe( true );
-			expect(
-				listViewPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: false,
-				} )
-			).toBe( false );
-		} );
-
-		it( 'should close the list view when opening the inserter panel', () => {
-			expect( listViewPanel( true, setIsInserterOpened( true ) ) ).toBe(
-				false
-			);
-		} );
-
-		it( 'should not change the state when closing the inserter panel', () => {
-			expect( listViewPanel( true, setIsInserterOpened( false ) ) ).toBe(
-				true
-			);
-		} );
-	} );
 } );

package/src/store/test/selectors.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import deepFreeze from 'deep-freeze';
-
 /**
  * Internal dependencies
  */
@@ -11,32 +6,9 @@ import {
 	isSavingMetaBoxes,
 	getActiveMetaBoxLocations,
 	isMetaBoxLocationActive,
-	isEditorPanelRemoved,
-	isInserterOpened,
-	isListViewOpened,
 } from '../selectors';
 
 describe( 'selectors', () => {
-	describe( 'isEditorPanelRemoved', () => {
-		it( 'should return false by default', () => {
-			const state = deepFreeze( {
-				removedPanels: [],
-			} );
-
-			expect( isEditorPanelRemoved( state, 'post-status' ) ).toBe(
-				false
-			);
-		} );
-
-		it( 'should return true when panel was removed', () => {
-			const state = deepFreeze( {
-				removedPanels: [ 'post-status' ],
-			} );
-
-			expect( isEditorPanelRemoved( state, 'post-status' ) ).toBe( true );
-		} );
-	} );
-
 	describe( 'hasMetaBoxes', () => {
 		it( 'should return true if there are active meta boxes', () => {
 			const state = {
@@ -133,26 +105,4 @@ describe( 'selectors', () => {
 			expect( result ).toBe( true );
 		} );
 	} );
-
-	describe( 'isInserterOpened', () => {
-		it( 'returns the block inserter panel isOpened state', () => {
-			const state = {
-				blockInserterPanel: true,
-			};
-			expect( isInserterOpened( state ) ).toBe( true );
-			state.blockInserterPanel = false;
-			expect( isInserterOpened( state ) ).toBe( false );
-		} );
-	} );
-
-	describe( 'isListViewOpened', () => {
-		it( 'returns the list view panel isOpened state', () => {
-			const state = {
-				listViewPanel: true,
-			};
-			expect( isListViewOpened( state ) ).toBe( true );
-			state.listViewPanel = false;
-			expect( isListViewOpened( state ) ).toBe( false );
-		} );
-	} );
 } );

package/src/style.scss

@@ -1,14 +1,11 @@
 @import "../../interface/src/style.scss";
 @import "./components/header/style.scss";
 @import "./components/header/fullscreen-mode-close/style.scss";
-@import "./components/header/header-toolbar/style.scss";
 @import "./components/keyboard-shortcut-help-modal/style.scss";
 @import "./components/layout/style.scss";
 @import "./components/block-manager/style.scss";
 @import "./components/meta-boxes/meta-boxes-area/style.scss";
-@import "./components/secondary-sidebar/style.scss";
 @import "./components/sidebar/style.scss";
-@import "./components/sidebar/last-revision/style.scss";
 @import "./components/sidebar/post-format/style.scss";
 @import "./components/sidebar/post-slug/style.scss";
 @import "./components/sidebar/post-visibility/style.scss";
@@ -52,8 +49,7 @@ body.js.block-editor-page {
 .edit-post-sidebar,
 .editor-post-publish-panel,
 .components-popover,
-.components-modal__frame,
-.edit-post-editor__inserter-panel {
+.components-modal__frame {
 	@include reset;
 }
 

package/src/test/editor.native.js

@@ -11,6 +11,7 @@ import {
 	screen,
 	setupCoreBlocks,
 } from 'test/helpers';
+import { BackHandler } from 'react-native';
 
 /**
  * WordPress dependencies
@@ -129,4 +130,20 @@ describe( 'Editor', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
+
+	it( 'unselects current block when tapping on the hardware back button', async () => {
+		// Arrange
+		await initializeEditor();
+		await addBlock( screen, 'Spacer' );
+
+		// Act
+		act( () => {
+			BackHandler.mockPressBack();
+		} );
+
+		// Assert
+		const openBlockSettingsButton =
+			screen.queryAllByLabelText( 'Open Settings' );
+		expect( openBlockSettingsButton.length ).toBe( 0 );
+	} );
 } );