@wordpress/editor 12.4.0 → 12.5.2

package/src/components/provider/use-block-editor-settings.js

@@ -61,6 +61,22 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 		};
 	}, [] );
 
+	const {
+		__experimentalBlockPatterns: settingsBlockPatterns,
+		__experimentalBlockPatternCategories: settingsBlockPatternCategories,
+	} = settings;
+
+	const { blockPatterns, blockPatternCategories } = useSelect(
+		( select ) => ( {
+			blockPatterns:
+				settingsBlockPatterns ?? select( coreStore ).getBlockPatterns(),
+			blockPatternCategories:
+				settingsBlockPatternCategories ??
+				select( coreStore ).getBlockPatternCategories(),
+		} ),
+		[ settingsBlockPatterns, settingsBlockPatternCategories ]
+	);
+
 	const { undo } = useDispatch( editorStore );
 
 	const { saveEntityRecord } = useDispatch( coreStore );
@@ -85,17 +101,15 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 		() => ( {
 			...pick( settings, [
 				'__experimentalBlockDirectory',
-				'__experimentalBlockPatternCategories',
-				'__experimentalBlockPatterns',
 				'__experimentalDiscussionSettings',
 				'__experimentalFeatures',
 				'__experimentalPreferredStyleVariations',
 				'__experimentalSetIsInserterOpened',
-				'__experimentalGenerateAnchors',
 				'__unstableGalleryWithImageBlocks',
 				'alignWide',
 				'allowedBlockTypes',
 				'bodyPlaceholder',
+				'canLockBlocks',
 				'codeEditingEnabled',
 				'colors',
 				'disableCustomColors',
@@ -107,6 +121,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 				'focusMode',
 				'fontSizes',
 				'gradients',
+				'generateAnchors',
 				'hasFixedToolbar',
 				'hasReducedUI',
 				'imageDefaultSize',
@@ -127,6 +142,8 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			] ),
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
 			__experimentalReusableBlocks: reusableBlocks,
+			__experimentalBlockPatterns: blockPatterns,
+			__experimentalBlockPatternCategories: blockPatternCategories,
 			__experimentalFetchLinkSuggestions: ( search, searchOptions ) =>
 				fetchLinkSuggestions( search, searchOptions, settings ),
 			__experimentalFetchRichUrlData: fetchUrlData,
@@ -142,6 +159,8 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			settings,
 			hasUploadPermissions,
 			reusableBlocks,
+			blockPatterns,
+			blockPatternCategories,
 			canUseUnfilteredHTML,
 			undo,
 			hasTemplate,

package/src/store/actions.js

@@ -16,6 +16,7 @@ import {
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -320,26 +321,22 @@ export function updatePostLock( lock ) {
 }
 
 /**
- * Action that enables the publish sidebar.
- *
- * @return {Object} Action object
+ * Enable the publish sidebar.
  */
-export function enablePublishSidebar() {
-	return {
-		type: 'ENABLE_PUBLISH_SIDEBAR',
-	};
-}
+export const enablePublishSidebar = () => ( { registry } ) => {
+	registry
+		.dispatch( preferencesStore )
+		.set( 'core/edit-post', 'isPublishSidebarEnabled', true );
+};
 
 /**
- * Action that disables the publish sidebar.
- *
- * @return {Object} Action object
+ * Disables the publish sidebar.
  */
-export function disablePublishSidebar() {
-	return {
-		type: 'DISABLE_PUBLISH_SIDEBAR',
-	};
-}
+export const disablePublishSidebar = () => ( { registry } ) => {
+	registry
+		.dispatch( preferencesStore )
+		.set( 'core/edit-post', 'isPublishSidebarEnabled', false );
+};
 
 /**
  * Action that locks post saving.

package/src/store/defaults.js

@@ -3,11 +3,6 @@
  */
 import { SETTINGS_DEFAULTS } from '@wordpress/block-editor';
 
-export const PREFERENCES_DEFAULTS = {
-	insertUsage: {}, // Should be kept for backward compatibility, see: https://github.com/WordPress/gutenberg/issues/14580.
-	isPublishSidebarEnabled: true,
-};
-
 /**
  * The default post editor settings.
  *

package/src/store/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createReduxStore, registerStore } from '@wordpress/data';
+import { createReduxStore, register } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -33,12 +33,6 @@ export const storeConfig = {
  */
 export const store = createReduxStore( STORE_NAME, {
 	...storeConfig,
-	persist: [ 'preferences' ],
 } );
 
-// Once we build a more generic persistence plugin that works across types of stores
-// we'd be able to replace this with a register call.
-registerStore( STORE_NAME, {
-	...storeConfig,
-	persist: [ 'preferences' ],
-} );
+register( store );

package/src/store/reducer.js

@@ -11,7 +11,7 @@ import { combineReducers } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { PREFERENCES_DEFAULTS, EDITOR_SETTINGS_DEFAULTS } from './defaults';
+import { EDITOR_SETTINGS_DEFAULTS } from './defaults';
 
 /**
  * Returns a post attribute value, flattening nested rendered content using its
@@ -119,32 +119,6 @@ export function template( state = { isValid: true }, action ) {
 	return state;
 }
 
-/**
- * Reducer returning the user preferences.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- *
- * @return {string} Updated state.
- */
-export function preferences( state = PREFERENCES_DEFAULTS, action ) {
-	switch ( action.type ) {
-		case 'ENABLE_PUBLISH_SIDEBAR':
-			return {
-				...state,
-				isPublishSidebarEnabled: true,
-			};
-
-		case 'DISABLE_PUBLISH_SIDEBAR':
-			return {
-				...state,
-				isPublishSidebarEnabled: false,
-			};
-	}
-
-	return state;
-}
-
 /**
  * Reducer returning current network request state (whether a request to
  * the WP REST API is in progress, successful, or failed).
@@ -282,7 +256,6 @@ export function editorSettings( state = EDITOR_SETTINGS_DEFAULTS, action ) {
 export default combineReducers( {
 	postId,
 	postType,
-	preferences,
 	saving,
 	postLock,
 	template,

package/src/store/reducer.native.js

@@ -9,7 +9,6 @@ import { combineReducers } from '@wordpress/data';
 import {
 	postId,
 	postType,
-	preferences,
 	saving,
 	postLock,
 	postSavingLock,
@@ -84,7 +83,6 @@ export default combineReducers( {
 	postId,
 	postType,
 	postTitle,
-	preferences,
 	saving,
 	postLock,
 	postSavingLock,

package/src/store/selectors.js

@@ -20,11 +20,11 @@ import { Platform } from '@wordpress/element';
 import { layout } from '@wordpress/icons';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
-import { PREFERENCES_DEFAULTS } from './defaults';
 import {
 	EDIT_MERGE_PROPERTIES,
 	PERMALINK_POSTNAME_REGEX,
@@ -1093,16 +1093,15 @@ export function canUserUseUnfilteredHTML( state ) {
  * Returns whether the pre-publish panel should be shown
  * or skipped when the user clicks the "publish" button.
  *
- * @param {Object} state Global application state.
- *
  * @return {boolean} Whether the pre-publish panel should be shown or not.
  */
-export function isPublishSidebarEnabled( state ) {
-	if ( state.preferences.hasOwnProperty( 'isPublishSidebarEnabled' ) ) {
-		return state.preferences.isPublishSidebarEnabled;
-	}
-	return PREFERENCES_DEFAULTS.isPublishSidebarEnabled;
-}
+export const isPublishSidebarEnabled = createRegistrySelector(
+	( select ) => () =>
+		!! select( preferencesStore ).get(
+			'core/edit-post',
+			'isPublishSidebarEnabled'
+		)
+);
 
 /**
  * Return the current block list.

package/src/store/test/actions.js

@@ -6,6 +6,7 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { createRegistry } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -46,6 +47,7 @@ function createRegistryWithStores() {
 	registry.register( coreStore );
 	registry.register( editorStore );
 	registry.register( noticesStore );
+	registry.register( preferencesStore );
 
 	// Register post type entity.
 	registry.dispatch( coreStore ).addEntities( [ postTypeConfig ] );
@@ -349,4 +351,39 @@ describe( 'Editor actions', () => {
 			} );
 		} );
 	} );
+
+	describe( 'enablePublishSidebar', () => {
+		it( 'enables the publish sidebar', () => {
+			const registry = createRegistryWithStores();
+
+			// Starts off as `undefined` as a default hasn't been set.
+			expect(
+				registry.select( editorStore ).isPublishSidebarEnabled()
+			).toBe( false );
+
+			registry.dispatch( editorStore ).enablePublishSidebar();
+
+			expect(
+				registry.select( editorStore ).isPublishSidebarEnabled()
+			).toBe( true );
+		} );
+	} );
+
+	describe( 'disablePublishSidebar', () => {
+		it( 'disables the publish sidebar', () => {
+			const registry = createRegistryWithStores();
+
+			// Enable it to start with so that can test it flipping from `true` to `false`.
+			registry.dispatch( editorStore ).enablePublishSidebar();
+			expect(
+				registry.select( editorStore ).isPublishSidebarEnabled()
+			).toBe( true );
+
+			registry.dispatch( editorStore ).disablePublishSidebar();
+
+			expect(
+				registry.select( editorStore ).isPublishSidebarEnabled()
+			).toBe( false );
+		} );
+	} );
 } );

package/src/store/test/reducer.js

@@ -11,7 +11,6 @@ import {
 	isUpdatingSamePostProperty,
 	shouldOverwriteState,
 	getPostRawValue,
-	preferences,
 	saving,
 	postSavingLock,
 	postAutosavingLock,
@@ -163,36 +162,6 @@ describe( 'state', () => {
 		} );
 	} );
 
-	describe( 'preferences()', () => {
-		it( 'should apply all defaults', () => {
-			const state = preferences( undefined, {} );
-			expect( state ).toEqual( {
-				insertUsage: {},
-				isPublishSidebarEnabled: true,
-			} );
-		} );
-
-		it( 'should disable the publish sidebar', () => {
-			const original = deepFreeze( preferences( undefined, {} ) );
-			const state = preferences( original, {
-				type: 'DISABLE_PUBLISH_SIDEBAR',
-			} );
-
-			expect( state.isPublishSidebarEnabled ).toBe( false );
-		} );
-
-		it( 'should enable the publish sidebar', () => {
-			const original = deepFreeze(
-				preferences( { isPublishSidebarEnabled: false }, {} )
-			);
-			const state = preferences( original, {
-				type: 'ENABLE_PUBLISH_SIDEBAR',
-			} );
-
-			expect( state.isPublishSidebarEnabled ).toBe( true );
-		} );
-	} );
-
 	describe( 'saving()', () => {
 		it( 'should update when a request is started', () => {
 			const state = saving( null, {

package/src/store/test/selectors.js

@@ -22,7 +22,6 @@ import { layout, footer, header } from '@wordpress/icons';
  * Internal dependencies
  */
 import * as _selectors from '../selectors';
-import { PREFERENCES_DEFAULTS } from '../defaults';
 
 const selectors = { ..._selectors };
 const selectorNames = Object.keys( selectors );
@@ -182,7 +181,6 @@ const {
 	didPostSaveRequestFail,
 	getSuggestedPostFormat,
 	getEditedPostContent,
-	isPublishSidebarEnabled,
 	isPermalinkEditable,
 	getPermalink,
 	getPermalinkParts,
@@ -2570,39 +2568,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( 'isPublishSidebarEnabled', () => {
-		it( 'should return the value on state if it is thruthy', () => {
-			const state = {
-				preferences: {
-					isPublishSidebarEnabled: true,
-				},
-			};
-			expect( isPublishSidebarEnabled( state ) ).toBe(
-				state.preferences.isPublishSidebarEnabled
-			);
-		} );
-
-		it( 'should return the value on state if it is falsy', () => {
-			const state = {
-				preferences: {
-					isPublishSidebarEnabled: false,
-				},
-			};
-			expect( isPublishSidebarEnabled( state ) ).toBe(
-				state.preferences.isPublishSidebarEnabled
-			);
-		} );
-
-		it( 'should return the default value if there is no isPublishSidebarEnabled key on state', () => {
-			const state = {
-				preferences: {},
-			};
-			expect( isPublishSidebarEnabled( state ) ).toBe(
-				PREFERENCES_DEFAULTS.isPublishSidebarEnabled
-			);
-		} );
-	} );
-
 	describe( 'isPermalinkEditable', () => {
 		it( 'should be false if there is no permalink', () => {
 			const state = {