diff --git a/packages/edit-site/src/components/canvas-spinner/style.scss b/packages/edit-site/src/components/canvas-loader/style.scss
similarity index 66%
rename from packages/edit-site/src/components/canvas-spinner/style.scss
rename to packages/edit-site/src/components/canvas-loader/style.scss
index e6926cb8149f5..7bef5868e8707 100644
--- a/packages/edit-site/src/components/canvas-spinner/style.scss
+++ b/packages/edit-site/src/components/canvas-loader/style.scss
@@ -1,4 +1,4 @@
-.edit-site-canvas-spinner {
+.edit-site-canvas-loader {
width: 100%;
height: 100%;
display: flex;
@@ -9,7 +9,7 @@
align-items: center;
justify-content: center;
- animation: 0.5s ease 1s edit-site-canvas-spinner__fade-in-animation;
+ animation: 0.5s ease 1s edit-site-canvas-loader__fade-in-animation;
animation-fill-mode: forwards;
@include reduce-motion("animation");
@@ -18,7 +18,7 @@
}
}
-@keyframes edit-site-canvas-spinner__fade-in-animation {
+@keyframes edit-site-canvas-loader__fade-in-animation {
from {
opacity: 0;
}
diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
index adbc964fc89f1..4bdd98b5d170e 100644
--- a/packages/edit-site/src/components/editor/index.js
+++ b/packages/edit-site/src/components/editor/index.js
@@ -40,7 +40,7 @@ import StartTemplateOptions from '../start-template-options';
import { store as editSiteStore } from '../../store';
import { GlobalStylesRenderer } from '../global-styles-renderer';
import useTitle from '../routes/use-title';
-import CanvasSpinner from '../canvas-spinner';
+import CanvasLoader from '../canvas-loader';
import { unlock } from '../../lock-unlock';
import useEditedEntityRecord from '../use-edited-entity-record';
import { SidebarFixedBottomSlot } from '../sidebar-edit-mode/sidebar-fixed-bottom';
@@ -180,7 +180,7 @@ export default function Editor( { isLoading } ) {
useTitle( hasLoadedPost && title );
const loadingProgressId = useInstanceId(
- CanvasSpinner,
+ CanvasLoader,
'edit-site-editor__loading-progress'
);
@@ -193,7 +193,7 @@ export default function Editor( { isLoading } ) {
return (
<>
- { isLoading ?
: null }
+ { isLoading ?
: null }
{ isEditMode &&
}
spacingType === 'blockGap'
+ ) )
+ ) {
+ settings.spacing.blockGap = false;
+ }
+
const blockVariations = useBlockVariations( name );
const hasTypographyPanel = useHasTypographyPanel( settings );
const hasColorPanel = useHasColorPanel( settings );
diff --git a/packages/edit-site/src/components/header-edit-mode/index.js b/packages/edit-site/src/components/header-edit-mode/index.js
index 6cff62b94c51e..da682e995defd 100644
--- a/packages/edit-site/src/components/header-edit-mode/index.js
+++ b/packages/edit-site/src/components/header-edit-mode/index.js
@@ -45,6 +45,7 @@ import {
useHasEditorCanvasContainer,
} from '../editor-canvas-container';
import { unlock } from '../../lock-unlock';
+import { FOCUSABLE_ENTITIES } from '../../utils/constants';
const { useShouldContextualToolbarShow } = unlock( blockEditorPrivateApis );
@@ -156,8 +157,7 @@ export default function HeaderEditMode() {
const hasDefaultEditorCanvasView = ! useHasEditorCanvasContainer();
- const isFocusMode =
- templateType === 'wp_template_part' || templateType === 'wp_navigation';
+ const isFocusMode = FOCUSABLE_ENTITIES.includes( templateType );
/* translators: button label text should, if possible, be under 16 characters. */
const longLabel = _x(
@@ -216,6 +216,7 @@ export default function HeaderEditMode() {
showIconLabels ? shortLabel : longLabel
}
showTooltip={ ! showIconLabels }
+ aria-expanded={ isInserterOpen }
/>
) }
{ isLargeViewport && (
@@ -265,6 +266,7 @@ export default function HeaderEditMode() {
? 'tertiary'
: undefined
}
+ aria-expanded={ isListViewOpen }
/>
) }
{ isZoomedOutViewExperimentEnabled &&
@@ -311,39 +313,40 @@ export default function HeaderEditMode() {
variants={ toolbarVariants }
transition={ toolbarTransition }
>
- { ! isFocusMode && hasDefaultEditorCanvasView && (
-
+
-
- { ( { onClose } ) => (
-
-
-
- ) }
-
-