diff --git a/packages/base-styles/_z-index.scss b/packages/base-styles/_z-index.scss
index f28bf9c498bbe..ea6d369463548 100644
--- a/packages/base-styles/_z-index.scss
+++ b/packages/base-styles/_z-index.scss
@@ -24,7 +24,7 @@ $z-layers: (
".block-library-gallery-item__inline-menu": 20,
".block-editor-url-input__suggestions": 30,
".edit-post-layout__footer": 30,
- ".edit-post-editor-regions__header": 30,
+ ".block-editor-editor-skeleton__header": 30,
".edit-site-header": 62,
".edit-widgets-header": 30,
".block-library-button__inline-link .block-editor-url-input__suggestions": 6, // URL suggestions for button block above sibling inserter
@@ -64,7 +64,7 @@ $z-layers: (
// Show sidebar above wp-admin navigation bar for mobile viewports:
// #wpadminbar { z-index: 99999 }
- ".edit-post-editor-regions__sidebar": 100000,
+ ".block-editor-editor-skeleton__sidebar": 100000,
".edit-site-sidebar": 100000,
".edit-widgets-sidebar": 100000,
".edit-post-layout .edit-post-post-publish-panel": 100001,
@@ -74,7 +74,7 @@ $z-layers: (
// Show sidebar in greater than small viewports above editor related elements
// but bellow #adminmenuback { z-index: 100 }
- ".edit-post-editor-regions__sidebar {greater than small}": 90,
+ ".block-editor-editor-skeleton__sidebar {greater than small}": 90,
".edit-site-sidebar {greater than small}": 90,
".edit-widgets-sidebar {greater than small}": 90,
@@ -108,7 +108,7 @@ $z-layers: (
".components-autocomplete__results": 1000000,
".skip-to-selected-block": 100000,
- ".edit-post-editor-regions__publish": 100000,
+ ".block-editor-editor-skeleton__publish": 100000,
// Show NUX tips above popovers, wp-admin menus, submenus, and sidebar:
".nux-dot-tip": 1000001,
diff --git a/packages/edit-post/src/components/editor-regions/index.js b/packages/block-editor/src/components/editor-skeleton/index.js
similarity index 66%
rename from packages/edit-post/src/components/editor-regions/index.js
rename to packages/block-editor/src/components/editor-skeleton/index.js
index eee9dfcfdae9d..bf3084436d79d 100644
--- a/packages/edit-post/src/components/editor-regions/index.js
+++ b/packages/block-editor/src/components/editor-skeleton/index.js
@@ -9,7 +9,7 @@ import classnames from 'classnames';
import { navigateRegions } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
-function EditorRegions( {
+function EditorSkeleton( {
footer,
header,
sidebar,
@@ -18,10 +18,16 @@ function EditorRegions( {
className,
} ) {
return (
-
+
{ !! header && (
) }
-
+
{ !! sidebar && (
{ !! footer && (
{
// Click below editor to focus last field (block appender)
await clickAtBottom(
- await page.$( '.edit-post-editor-regions__content' )
+ await page.$( '.block-editor-editor-skeleton__content' )
);
expect( await page.$( '[data-type="core/paragraph"]' ) ).not.toBeNull();
await page.keyboard.type( 'Paragraph block' );
diff --git a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
index a32474aad3b5a..815528f8c0e7b 100644
--- a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
@@ -152,7 +152,7 @@ describe( 'Order of block keyboard navigation', () => {
await page.evaluate( () => {
document.querySelector( '.edit-post-visual-editor' ).focus();
document
- .querySelector( '.edit-post-editor-regions__sidebar' )
+ .querySelector( '.block-editor-editor-skeleton__sidebar' )
.focus();
} );
diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js
index f09141b9a8905..333137ab1723a 100644
--- a/packages/edit-post/src/components/layout/index.js
+++ b/packages/edit-post/src/components/layout/index.js
@@ -17,6 +17,7 @@ import {
import { useSelect, useDispatch } from '@wordpress/data';
import {
BlockBreadcrumb,
+ __experimentalEditorSkeleton as EditorSkeleton,
__experimentalPageTemplatePicker,
__experimentalUsePageTemplatePickerVisible,
} from '@wordpress/block-editor';
@@ -39,7 +40,6 @@ import EditPostKeyboardShortcuts from '../keyboard-shortcuts';
import KeyboardShortcutHelpModal from '../keyboard-shortcut-help-modal';
import ManageBlocksModal from '../manage-blocks-modal';
import OptionsModal from '../options-modal';
-import EditorRegions from '../editor-regions';
import FullscreenMode from '../fullscreen-mode';
import BrowserURL from '../browser-url';
import Header from '../header';
@@ -124,7 +124,7 @@ function Layout() {
- }
sidebar={
diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
index 1f10cb7a36ba6..086553ee738b6 100644
--- a/packages/edit-post/src/index.js
+++ b/packages/edit-post/src/index.js
@@ -113,14 +113,14 @@ export function initializeEditor(
// Without this hack the browser scrolls the mobile toolbar off-screen.
// Once supported in Safari we can replace this in favor of preventScroll.
// For details see issue #18632 and PR #18686
- // Specifically, we scroll `edit-post-editor-regions__body` to enable a fixed top toolbar.
+ // Specifically, we scroll `block-editor-editor-skeleton__body` to enable a fixed top toolbar.
// But Mobile Safari forces the `html` element to scroll upwards, hiding the toolbar.
const isIphone = window.navigator.userAgent.indexOf( 'iPhone' ) !== -1;
if ( isIphone ) {
window.addEventListener( 'scroll', function( event ) {
const editorScrollContainer = document.getElementsByClassName(
- 'edit-post-editor-regions__body'
+ 'block-editor-editor-skeleton__body'
)[ 0 ];
if ( event.target === document ) {
// Scroll element into view by scrolling the editor container by the same amount
diff --git a/packages/edit-post/src/style.scss b/packages/edit-post/src/style.scss
index 43b69c59da22c..babb793d4ac51 100644
--- a/packages/edit-post/src/style.scss
+++ b/packages/edit-post/src/style.scss
@@ -1,6 +1,5 @@
$footer-height: $icon-button-size-small;
-@import "./components/editor-regions/style.scss";
@import "./components/fullscreen-mode/style.scss";
@import "./components/header/style.scss";
@import "./components/header/fullscreen-mode-close/style.scss";