diff --git a/lib/experiments-page.php b/lib/experiments-page.php index f88fcca5c16113..cef8e9d4214e44 100644 --- a/lib/experiments-page.php +++ b/lib/experiments-page.php @@ -51,17 +51,6 @@ function gutenberg_initialize_experiments_settings() { 'id' => 'gutenberg-widget-experiments', ) ); - add_settings_field( - 'gutenberg-menu-block', - __( 'Menu Block', 'gutenberg' ), - 'gutenberg_display_experiment_field', - 'gutenberg-experiments', - 'gutenberg_experiments_section', - array( - 'label' => __( 'Enable Navigation Menu Block', 'gutenberg' ), - 'id' => 'gutenberg-menu-block', - ) - ); add_settings_field( 'gutenberg-block-directory', __( 'Block Directory', 'gutenberg' ), @@ -132,10 +121,8 @@ function gutenberg_display_experiment_section() { function gutenberg_experiments_editor_settings( $settings ) { $experiments_settings = array( '__experimentalEnableLegacyWidgetBlock' => gutenberg_is_experiment_enabled( 'gutenberg-widget-experiments' ), - '__experimentalEnableMenuBlock' => gutenberg_is_experiment_enabled( 'gutenberg-menu-block' ), '__experimentalBlockDirectory' => gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ), '__experimentalEnableFullSiteEditing' => gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing' ), - ); $gradient_presets = current( (array) get_theme_support( '__experimental-editor-gradient-presets' ) ); diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md index 64734fa887afac..c90ced2fe3c7c2 100644 --- a/packages/block-editor/README.md +++ b/packages/block-editor/README.md @@ -408,7 +408,6 @@ _Properties_ - _showInserterHelpPanel_ `boolean`: Whether or not the inserter help panel is shown - _\_\_experimentalCanUserUseUnfilteredHTML_ `boolean`: Whether the user should be able to use unfiltered HTML or the HTML should be filtered e.g., to remove elements considered insecure like iframes. - _\_\_experimentalEnableLegacyWidgetBlock_ `boolean`: Whether the user has enabled the Legacy Widget Block -- _\_\_experimentalEnableMenuBlock_ `boolean`: Whether the user has enabled the Menu Block - _\_\_experimentalBlockDirectory_ `boolean`: Whether the user has enabled the Block Directory - _\_\_experimentalEnableFullSiteEditing_ `boolean`: Whether the user has enabled Full Site Editing diff --git a/packages/block-editor/src/store/defaults.js b/packages/block-editor/src/store/defaults.js index e5728274db8214..9e38f16a706f9f 100644 --- a/packages/block-editor/src/store/defaults.js +++ b/packages/block-editor/src/store/defaults.js @@ -31,7 +31,6 @@ export const PREFERENCES_DEFAULTS = { * @property {boolean} showInserterHelpPanel Whether or not the inserter help panel is shown * @property {boolean} __experimentalCanUserUseUnfilteredHTML Whether the user should be able to use unfiltered HTML or the HTML should be filtered e.g., to remove elements considered insecure like iframes. * @property {boolean} __experimentalEnableLegacyWidgetBlock Whether the user has enabled the Legacy Widget Block - * @property {boolean} __experimentalEnableMenuBlock Whether the user has enabled the Menu Block * @property {boolean} __experimentalBlockDirectory Whether the user has enabled the Block Directory * @property {boolean} __experimentalEnableFullSiteEditing Whether the user has enabled Full Site Editing */ @@ -152,7 +151,6 @@ export const SETTINGS_DEFAULTS = { showInserterHelpPanel: true, __experimentalCanUserUseUnfilteredHTML: false, __experimentalEnableLegacyWidgetBlock: false, - __experimentalEnableMenuBlock: false, __experimentalBlockDirectory: false, __experimentalEnableFullSiteEditing: false, gradients: [ diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js index 24e29328bfa56e..2ba0aaefec9b7f 100644 --- a/packages/block-library/src/index.js +++ b/packages/block-library/src/index.js @@ -128,6 +128,8 @@ export const registerCoreBlocks = () => { latestPosts, missing, more, + navigation, + navigationLink, nextpage, preformatted, pullquote, @@ -172,14 +174,11 @@ export const __experimentalRegisterExperimentalCoreBlocks = ( settings ) => { const { __experimentalEnableLegacyWidgetBlock, - __experimentalEnableMenuBlock, __experimentalEnableFullSiteEditing, } = settings ;[ __experimentalEnableLegacyWidgetBlock ? legacyWidget : null, - __experimentalEnableMenuBlock ? navigation : null, - __experimentalEnableMenuBlock ? navigationLink : null, socialLinks, ...socialLink.sites, diff --git a/packages/block-library/src/navigation/index.js b/packages/block-library/src/navigation/index.js index 950427163e8bab..5d504d720a2277 100644 --- a/packages/block-library/src/navigation/index.js +++ b/packages/block-library/src/navigation/index.js @@ -20,6 +20,8 @@ export const settings = { keywords: [ __( 'menu' ), __( 'navigation' ), __( 'links' ) ], + category: 'layout', + supports: { align: [ 'wide', 'full' ], anchor: true, diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php index 2c909b3c44eb52..d26d29be544722 100644 --- a/packages/block-library/src/navigation/index.php +++ b/packages/block-library/src/navigation/index.php @@ -124,7 +124,6 @@ function register_block_core_navigation() { register_block_type( 'core/navigation', array( - 'category' => 'layout', 'attributes' => array( 'className' => array( 'type' => 'string', diff --git a/packages/e2e-tests/specs/experimental/block-transforms.test.js b/packages/e2e-tests/specs/experimental/block-transforms.test.js index bf6e5027b745e6..5d2b97aa337008 100644 --- a/packages/e2e-tests/specs/experimental/block-transforms.test.js +++ b/packages/e2e-tests/specs/experimental/block-transforms.test.js @@ -109,7 +109,6 @@ describe( 'Block transforms', () => { beforeAll( async () => { await enableExperimentalFeatures( [ '#gutenberg-widget-experiments', - '#gutenberg-menu-block', '#gutenberg-full-site-editing', ] ); await createNewPost(); @@ -131,7 +130,6 @@ describe( 'Block transforms', () => { async () => { await disableExperimentalFeatures( [ '#gutenberg-widget-experiments', - '#gutenberg-menu-block', '#gutenberg-full-site-editing', ] ); } diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js index c44819b867a9d0..be92436213715d 100644 --- a/packages/editor/src/components/provider/index.js +++ b/packages/editor/src/components/provider/index.js @@ -104,7 +104,6 @@ class EditorProvider extends Component { 'titlePlaceholder', 'onUpdateDefaultBlockStyles', '__experimentalEnableLegacyWidgetBlock', - '__experimentalEnableMenuBlock', '__experimentalBlockDirectory', '__experimentalEnableFullSiteEditing', 'showInserterHelpPanel', diff --git a/test/integration/full-content/full-content.test.js b/test/integration/full-content/full-content.test.js index cab70d134b3720..953eba86306206 100644 --- a/test/integration/full-content/full-content.test.js +++ b/test/integration/full-content/full-content.test.js @@ -51,7 +51,6 @@ describe( 'full post content fixture', () => { unstable__bootstrapServerSideBlockDefinitions( require( './server-registered.json' ) ); const settings = { __experimentalEnableLegacyWidgetBlock: true, - __experimentalEnableMenuBlock: true, __experimentalEnableFullSiteEditing: true, }; // Load all hooks that modify blocks