Allow scrolling in view mode

WordPress · Dec 1, 2022 · a8683bd · a8683bd
1 parent d5dcbc7
commit a8683bd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
@@ -196,6 +196,7 @@ function Iframe(
 		assets,
 		scale = 1,
 		frameSize = 0,
+		readonly,
 		...props
 	},
 	ref
@@ -355,6 +356,7 @@ function Iframe(
 									marginTop: frameSize,
 									transform: `scale( ${ scale } )`,
 								} }
+								inert={ readonly ? 'true' : undefined }
 							>
 								{ contentResizeListener }
 								{ /*

diff --git a/packages/edit-site/src/components/block-editor/resizable-editor.js b/packages/edit-site/src/components/block-editor/resizable-editor.js
@@ -127,6 +127,7 @@ function ResizableEditor( { enableResizing, settings, children, ...props } ) {
 				ref={ ref }
 				name="editor-canvas"
 				className="edit-site-visual-editor__editor-canvas"
+				readonly={ canvasMode === 'view' }
 				{ ...props }
 			>
 				{ /* Filters need to be rendered before children to avoid Safari rendering issues. */ }

diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
@@ -191,32 +191,23 @@ export default function Editor() {
 								content={
 									<>
 										<GlobalStylesRenderer />
-
-										<div
-											className="edit-site-editor__container"
-											inert={
-												isViewMode ? 'true' : undefined
-											}
-										>
-											<EditorNotices />
-											{ showVisualEditor &&
-												editedPost && <BlockEditor /> }
-											{ editorMode === 'text' &&
-												editedPost && <CodeEditor /> }
-											{ hasLoadedPost && ! editedPost && (
-												<Notice
-													status="warning"
-													isDismissible={ false }
-												>
-													{ __(
-														"You attempted to edit an item that doesn't exist. Perhaps it was deleted?"
-													) }
-												</Notice>
-											) }
-											{ isEditMode && (
-												<KeyboardShortcuts />
-											) }
-										</div>
+										<EditorNotices />
+										{ showVisualEditor && editedPost && (
+											<BlockEditor />
+										) }
+										{ editorMode === 'text' &&
+											editedPost && <CodeEditor /> }
+										{ hasLoadedPost && ! editedPost && (
+											<Notice
+												status="warning"
+												isDismissible={ false }
+											>
+												{ __(
+													"You attempted to edit an item that doesn't exist. Perhaps it was deleted?"
+												) }
+											</Notice>
+										) }
+										{ isEditMode && <KeyboardShortcuts /> }
 									</>
 								}
 								secondarySidebar={

diff --git a/packages/edit-site/src/components/editor/style.scss b/packages/edit-site/src/components/editor/style.scss
@@ -1,7 +1,3 @@
-.edit-site-editor__container {
-	height: 100%;
-}
-
 .edit-site-editor__toggle-save-panel {
 	box-sizing: border-box;
 	width: $sidebar-width;