{ hasBackButton && (
@@ -127,13 +138,20 @@ function Header( {
className="editor-header__settings"
>
{ ! customSaveButton && ! isPublishSidebarOpened && (
- // This button isn't completely hidden by the publish sidebar.
- // We can't hide the whole toolbar when the publish sidebar is open because
- // we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
- // We track that DOM node to return focus to the PostPublishButtonOrToggle
- // when the publish sidebar has been closed.
+ /*
+ * This button isn't completely hidden by the publish sidebar.
+ * We can't hide the whole toolbar when the publish sidebar is open because
+ * we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
+ * We track that DOM node to return focus to the PostPublishButtonOrToggle
+ * when the publish sidebar has been closed.
+ */
) }
+
+ { canBeZoomedOut && isEditorIframed && isWideViewport && (
+
) }
diff --git a/packages/editor/src/components/inserter-sidebar/index.js b/packages/editor/src/components/inserter-sidebar/index.js
index b98770b7afe8fa..5cace042fae58c 100644
--- a/packages/editor/src/components/inserter-sidebar/index.js
+++ b/packages/editor/src/components/inserter-sidebar/index.js
@@ -24,13 +24,13 @@ export default function InserterSidebar() {
const {
blockSectionRootClientId,
inserterSidebarToggleRef,
- insertionPoint,
+ inserter,
showMostUsedBlocks,
sidebarIsOpened,
} = useSelect( ( select ) => {
const {
getInserterSidebarToggleRef,
- getInsertionPoint,
+ getInserter,
isPublishSidebarOpened,
} = unlock( select( editorStore ) );
const {
@@ -52,7 +52,7 @@ export default function InserterSidebar() {
};
return {
inserterSidebarToggleRef: getInserterSidebarToggleRef(),
- insertionPoint: getInsertionPoint(),
+ inserter: getInserter(),
showMostUsedBlocks: get( 'core', 'mostUsedBlocks' ),
blockSectionRootClientId: getBlockSectionRootClientId(),
sidebarIsOpened: !! (
@@ -88,14 +88,11 @@ export default function InserterSidebar() {
showMostUsedBlocks={ showMostUsedBlocks }
showInserterHelpPanel
shouldFocusBlock={ isMobileViewport }
- rootClientId={
- blockSectionRootClientId ?? insertionPoint.rootClientId
- }
- __experimentalInsertionIndex={ insertionPoint.insertionIndex }
- onSelect={ insertionPoint.onSelect }
- __experimentalInitialTab={ insertionPoint.tab }
- __experimentalInitialCategory={ insertionPoint.category }
- __experimentalFilterValue={ insertionPoint.filterValue }
+ rootClientId={ blockSectionRootClientId }
+ onSelect={ inserter.onSelect }
+ __experimentalInitialTab={ inserter.tab }
+ __experimentalInitialCategory={ inserter.category }
+ __experimentalFilterValue={ inserter.filterValue }
onPatternCategorySelection={
sidebarIsOpened
? () => disableComplementaryArea( 'core' )
diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
index 8c8d757c583399..32ea69c425e0b5 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
@@ -98,8 +98,8 @@ function Image( { clientId, alt, url } ) {
animate={ { opacity: 1 } }
exit={ { opacity: 0, scale: 0 } }
style={ {
- width: '36px',
- height: '36px',
+ width: '32px',
+ height: '32px',
objectFit: 'cover',
borderRadius: '2px',
cursor: 'pointer',
@@ -256,7 +256,7 @@ export default function MaybeUploadMediaPanel() {