Reapply block type filters for all editor screens

WordPress · Aug 27, 2021 · 393278e · 393278e
1 parent 3ea3f22
commit 393278e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/packages/customize-widgets/src/index.js b/packages/customize-widgets/src/index.js
@@ -11,7 +11,10 @@ import {
 	registerLegacyWidgetBlock,
 	registerLegacyWidgetVariations,
 } from '@wordpress/widgets';
-import { setFreeformContentHandlerName } from '@wordpress/blocks';
+import {
+	setFreeformContentHandlerName,
+	store as blocksStore,
+} from '@wordpress/blocks';
 import { dispatch } from '@wordpress/data';
 import { store as interfaceStore } from '@wordpress/interface';
 
@@ -40,6 +43,7 @@ export function initialize( editorName, blockEditorSettings ) {
 		welcomeGuide: true,
 	} );
 
+	dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();
 	const coreBlocks = __experimentalGetCoreBlocks().filter( ( block ) => {
 		return ! (
 			DISABLED_BLOCKS.includes( block.name ) ||

diff --git a/packages/edit-navigation/src/index.js b/packages/edit-navigation/src/index.js
@@ -1,10 +1,12 @@
 /**
  * WordPress dependencies
  */
+import { store as blocksStore } from '@wordpress/blocks';
 import {
 	registerCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
+import { dispatch } from '@wordpress/data';
 import { render } from '@wordpress/element';
 import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
 
@@ -21,8 +23,9 @@ import './store';
 
 export function initialize( id, settings ) {
 	addFilters( ! settings.blockNavMenus );
-	registerCoreBlocks();
 
+	dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();
+	registerCoreBlocks();
 	if ( process.env.GUTENBERG_PHASE === 2 ) {
 		__experimentalRegisterExperimentalCoreBlocks();
 	}

diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store as blocksStore, registerBlockType } from '@wordpress/blocks';
+import { registerBlockType } from '@wordpress/blocks';
 import {
 	registerCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
@@ -135,8 +135,7 @@ export function initializeEditor(
 		);
 	}
 
-	dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();
-
+	// dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();
 	registerCoreBlocks();
 	if ( process.env.GUTENBERG_PHASE === 2 ) {
 		__experimentalRegisterExperimentalCoreBlocks( {

diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js
@@ -1,10 +1,12 @@
 /**
  * WordPress dependencies
  */
+import { store as blocksStore } from '@wordpress/blocks';
 import {
 	registerCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
+import { dispatch } from '@wordpress/data';
 import { render, unmountComponentAtNode } from '@wordpress/element';
 import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
 
@@ -47,6 +49,7 @@ export function initialize( id, settings ) {
 	const target = document.getElementById( id );
 	const reboot = reinitializeEditor.bind( null, target, settings );
 
+	dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();
 	registerCoreBlocks();
 	if ( process.env.GUTENBERG_PHASE === 2 ) {
 		__experimentalRegisterExperimentalCoreBlocks( {

diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js
@@ -5,7 +5,9 @@ import {
 	registerBlockType,
 	unstable__bootstrapServerSideBlockDefinitions, // eslint-disable-line camelcase
 	setFreeformContentHandlerName,
+	store as blocksStore,
 } from '@wordpress/blocks';
+import { dispatch } from '@wordpress/data';
 import { render, unmountComponentAtNode } from '@wordpress/element';
 import {
 	registerCoreBlocks,
@@ -17,7 +19,6 @@ import {
 	registerLegacyWidgetBlock,
 	registerLegacyWidgetVariations,
 } from '@wordpress/widgets';
-import { dispatch } from '@wordpress/data';
 import { store as interfaceStore } from '@wordpress/interface';
 
 /**
@@ -80,6 +81,7 @@ export function initialize( id, settings ) {
 		themeStyles: true,
 	} );
 
+	dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();
 	registerCoreBlocks( coreBlocks );
 	registerLegacyWidgetBlock();
 	if ( process.env.GUTENBERG_PHASE === 2 ) {