diff --git a/packages/block-editor/src/components/inserter/library.js b/packages/block-editor/src/components/inserter/library.js index 4e10a051996a9f..ee47b1dd2a6087 100644 --- a/packages/block-editor/src/components/inserter/library.js +++ b/packages/block-editor/src/components/inserter/library.js @@ -27,6 +27,7 @@ function InserterLibrary( onSelect = noop, shouldFocusBlock = false, onClose, + isEditorIframed, }, ref ) { @@ -58,6 +59,7 @@ function InserterLibrary( shouldFocusBlock={ shouldFocusBlock } ref={ ref } onClose={ onClose } + isEditorIframed={ isEditorIframed } /> ); } diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js index f1e387c5a59634..45007c3b194809 100644 --- a/packages/block-editor/src/components/inserter/menu.js +++ b/packages/block-editor/src/components/inserter/menu.js @@ -49,6 +49,7 @@ function InserterMenu( shouldFocusBlock = true, onPatternCategorySelection, onClose, + isEditorIframed, __experimentalInitialTab, __experimentalInitialCategory, }, @@ -93,7 +94,7 @@ function InserterMenu( hasSectionRootClientId && ( selectedTab === 'patterns' || selectedTab === 'media' ); - useZoomOut( shouldUseZoomOut && isLargeViewport ); + useZoomOut( shouldUseZoomOut && isLargeViewport && isEditorIframed ); const [ destinationRootClientId, onInsertBlocks, onToggleInsertionPoint ] = useInsertionPoint( { diff --git a/packages/editor/src/components/editor-interface/index.js b/packages/editor/src/components/editor-interface/index.js index 11743373396f3e..233177596f6272 100644 --- a/packages/editor/src/components/editor-interface/index.js +++ b/packages/editor/src/components/editor-interface/index.js @@ -128,6 +128,7 @@ export default function EditorInterface( { customSaveButton={ customSaveButton } forceDisableBlockTools={ forceDisableBlockTools } title={ title } + isEditorIframed={ ! disableIframe } /> ) } @@ -135,7 +136,9 @@ export default function EditorInterface( { secondarySidebar={ ! isPreviewMode && mode === 'visual' && - ( ( isInserterOpened && ) || + ( ( isInserterOpened && ( + + ) ) || ( isListViewOpened && ) ) } sidebar={ diff --git a/packages/editor/src/components/header/index.js b/packages/editor/src/components/header/index.js index 3a3e231259a57b..62492e53b9756a 100644 --- a/packages/editor/src/components/header/index.js +++ b/packages/editor/src/components/header/index.js @@ -57,6 +57,7 @@ function Header( { forceDisableBlockTools, setEntitiesSavedStatesCallback, title, + isEditorIframed, } ) { const isWideViewport = useViewportMatch( 'large' ); const isLargeViewport = useViewportMatch( 'medium' ); @@ -179,7 +180,7 @@ function Header( { forceIsAutosaveable={ forceIsDirty } /> - { isWideViewport && canBeZoomedOut && ( + { isWideViewport && canBeZoomedOut && isEditorIframed && ( ) } diff --git a/packages/editor/src/components/inserter-sidebar/index.js b/packages/editor/src/components/inserter-sidebar/index.js index 66730b43592b6e..4ee434c5facea1 100644 --- a/packages/editor/src/components/inserter-sidebar/index.js +++ b/packages/editor/src/components/inserter-sidebar/index.js @@ -20,7 +20,7 @@ import { store as editorStore } from '../../store'; const { PrivateInserterLibrary } = unlock( blockEditorPrivateApis ); -export default function InserterSidebar() { +export default function InserterSidebar( { isEditorIframed } ) { const { blockSectionRootClientId, inserterSidebarToggleRef, @@ -97,6 +97,7 @@ export default function InserterSidebar() { } ref={ libraryRef } onClose={ closeInserterSidebar } + isEditorIframed={ isEditorIframed } /> );