remove sidebar from post-editor, move out component from block-editor…

… to site-editor package
WordPress · Feb 11, 2022 · 615b3f3 · 615b3f3
1 parent ddf4220
commit 615b3f3
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
@@ -8,10 +8,6 @@
 
 -   Removed unused `@wordpress/block-serialization-default-parser`, `css-mediaquery`, `memize` and `redux-multi` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
-### New Features
-
-- Added new `__experimentalNavigationInspector` component and `__experimentalGetGlobalBlocksByName` selector. [#38600](https://github.com/WordPress/gutenberg/pull/38600)
-
 ## 8.1.0 (2022-01-27)
 
 ## 8.0.0 (2021-11-07)

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
@@ -39,7 +39,6 @@
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/components": "file:../components",
 		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
 		"@wordpress/data": "file:../data",
 		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/dom": "file:../dom",

diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
@@ -104,7 +104,6 @@ export { default as __unstableInserterMenuExtension } from './inserter-menu-exte
 export { default as __experimentalPreviewOptions } from './preview-options';
 export { default as __experimentalUseResizeCanvas } from './use-resize-canvas';
 export { default as BlockInspector } from './block-inspector';
-export { default as __experimentalNavigationInspector } from './navigation-inspector';
 export { default as BlockList } from './block-list';
 export { useBlockProps } from './block-list/use-block-props';
 export { LayoutStyle as __experimentalLayoutStyle } from './block-list/layout';

diff --git a/packages/block-editor/src/style.scss b/packages/block-editor/src/style.scss
@@ -61,7 +61,6 @@
 
 @import "./components/block-toolbar/style.scss";
 @import "./components/inserter/style.scss";
-@import "./components/navigation-inspector/style.scss";
 @import "./components/preview-options/style.scss";
 
 @include wordpress-admin-schemes();
diff --git a/packages/edit-site/src/components/sidebar/navigation-menu-sidebar/index.js b/packages/edit-site/src/components/sidebar/navigation-menu-sidebar/index.js
@@ -4,12 +4,12 @@
 import { FlexBlock, Flex } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { navigation } from '@wordpress/icons';
-import { __experimentalNavigationInspector as NavigationInspector } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import DefaultSidebar from '../default-sidebar';
+import NavigationInspector from './navigation-inspector';
 
 export default function NavigationMenuSidebar() {
 	return (

diff --git a/.../components/navigation-inspector/index.js → ...tion-menu-sidebar/navigation-inspector.js b/.../components/navigation-inspector/index.js → ...tion-menu-sidebar/navigation-inspector.js
@@ -4,17 +4,19 @@
 import { useSelect } from '@wordpress/data';
 import { useState, useEffect } from '@wordpress/element';
 import { SelectControl } from '@wordpress/components';
+import {
+	__experimentalListView as ListView,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import NavigationOption from './navigation-option';
-import { store as blockEditorStore } from '../../store';
-import ListView from '../list-view';
 
 const EMPTY_BLOCKS = [];
 
-export default function __experimentalNavigationInspector() {
+export default function NavigationInspector() {
 	const {
 		selectedClientId,
 		selectedNavigationId,
@@ -69,7 +71,7 @@ export default function __experimentalNavigationInspector() {
 	const showListView = ! isLoading && hasMenus;
 
 	return (
-		<div className="block-editor-navigation-inspector">
+		<div className="edit-site-navigation-inspector">
 			{ showSelectControl && (
 				<SelectControl
 					value={ menu || firstNavigationId }
@@ -89,9 +91,9 @@ export default function __experimentalNavigationInspector() {
 			) }
 			{ isLoading && (
 				<>
-					<div className="block-editor-navigation-inspector__placeholder" />
-					<div className="block-editor-navigation-inspector__placeholder is-child" />
-					<div className="block-editor-navigation-inspector__placeholder is-child" />
+					<div className="edit-site-navigation-inspector__placeholder" />
+					<div className="edit-site-navigation-inspector__placeholder is-child" />
+					<div className="edit-site-navigation-inspector__placeholder is-child" />
 				</>
 			) }
 			{ showListView && (

diff --git a/...navigation-inspector/navigation-option.js → ...igation-menu-sidebar/navigation-option.js b/...navigation-inspector/navigation-option.js → ...igation-menu-sidebar/navigation-option.js
diff --git a/...omponents/navigation-inspector/style.scss → ...idebar/navigation-menu-sidebar/style.scss b/...omponents/navigation-inspector/style.scss → ...idebar/navigation-menu-sidebar/style.scss
@@ -10,19 +10,19 @@
 	}
 }
 
-.block-editor-navigation-inspector {
+.edit-site-navigation-inspector {
 	padding: $grid-unit-20;
 }
 
-.block-editor-navigation-inspector__placeholder {
+.edit-site-navigation-inspector__placeholder {
 	padding: $grid-unit-10;
 	margin: $grid-unit-10;
 	background-color: $gray-100;
 	animation: loadingpulse 1s linear infinite;
 	animation-delay: 0.5s; // avoid animating for fast network responses
 }
 
-.block-editor-navigation-inspector__placeholder.is-child {
+.edit-site-navigation-inspector__placeholder.is-child {
 	margin-left: $grid-unit-30;
 	width: 50%;
 }
diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
@@ -12,6 +12,7 @@
 @import "./components/add-new-template/style.scss";
 @import "./components/sidebar/style.scss";
 @import "./components/sidebar/settings-header/style.scss";
+@import "./components/sidebar/navigation-menu-sidebar/style.scss";
 @import "./components/sidebar/template-card/style.scss";
 @import "./components/editor/style.scss";
 @import "./components/template-details/style.scss";