@wordpress/edit-site 5.19.6 → 5.20.1

package/build-style/style-rtl.css

@@ -97,7 +97,7 @@
   --wp-block-synced-color: #7a00df;
   --wp-block-synced-color--rgb: 122, 0, 223;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   :root {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -841,8 +841,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 0;
   margin: auto 0;
   width: 12px;
-  -webkit-appearance: none;
-          appearance: none;
+  appearance: none;
   cursor: ew-resize;
   outline: none;
   background: none;
@@ -1129,6 +1128,44 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   color: rgba(30, 30, 30, 0.62);
 }
 
+.dataviews-wrapper {
+  width: 100%;
+  padding: 32px;
+}
+
+.dataviews-list-view {
+  width: 100%;
+  text-indent: 0;
+  border-color: inherit;
+  border-collapse: collapse;
+  position: relative;
+}
+.dataviews-list-view a {
+  text-decoration: none;
+}
+.dataviews-list-view th {
+  text-align: right;
+  font-weight: normal;
+  padding: 0 16px 16px;
+  color: #757575;
+}
+.dataviews-list-view td,
+.dataviews-list-view th {
+  padding: 12px;
+}
+.dataviews-list-view td:last-child,
+.dataviews-list-view th:last-child {
+  text-align: left;
+}
+.dataviews-list-view tr {
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.dataviews__per-page-control-prefix {
+  color: #757575;
+  text-wrap: nowrap;
+}
+
 .edit-site-global-styles-preview {
   display: flex;
   align-items: center;
@@ -1859,7 +1896,8 @@ body.is-fullscreen-mode .edit-site-list-header {
 .edit-site-list-added-by__avatar img {
   width: 32px;
   height: 32px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   opacity: 0;
   transition: opacity 0.1s linear;
 }
@@ -2724,7 +2762,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-welcome-guide__image > img {
   display: block;
   max-width: 100%;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
 }
 .edit-site-welcome-guide__heading {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -3295,11 +3334,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   flex-shrink: 0;
 }
 
-@media (min-width: 782px) {
-  .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container {
-    max-width: 292px;
-  }
-}
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container .edit-site-global-styles-variations_item-preview {
   border: #1e1e1e 1px solid;
 }
@@ -3404,10 +3438,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #949494;
 }
 .edit-site-sidebar-navigation-screen-page__featured-image img {
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   height: 100%;
   width: 100%;
-  object-position: 50% 50%;
+  -o-object-position: 50% 50%;
+     object-position: 50% 50%;
 }
 
 .edit-site-sidebar-navigation-screen-page__featured-image-description {
@@ -3715,7 +3751,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   width: 100%;
   height: auto;
   border-radius: 4px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   background: #333;
 }
 .edit-site-layout.is-full-canvas.is-edit-mode .edit-site-site-icon__image {
@@ -4079,7 +4116,7 @@ body.admin-color-light {
   --wp-admin-theme-color-darker-20--rgb: 0, 97, 135;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-light {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4094,7 +4131,7 @@ body.admin-color-modern {
   --wp-admin-theme-color-darker-20--rgb: 24, 58, 214;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-modern {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4109,7 +4146,7 @@ body.admin-color-blue {
   --wp-admin-theme-color-darker-20--rgb: 6, 64, 84;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-blue {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4124,7 +4161,7 @@ body.admin-color-coffee {
   --wp-admin-theme-color-darker-20--rgb: 43, 39, 36;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-coffee {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4139,7 +4176,7 @@ body.admin-color-ectoplasm {
   --wp-admin-theme-color-darker-20--rgb: 58, 44, 77;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ectoplasm {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4154,7 +4191,7 @@ body.admin-color-midnight {
   --wp-admin-theme-color-darker-20--rgb: 208, 44, 33;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-midnight {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4169,7 +4206,7 @@ body.admin-color-ocean {
   --wp-admin-theme-color-darker-20--rgb: 76, 96, 102;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ocean {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4184,7 +4221,7 @@ body.admin-color-sunrise {
   --wp-admin-theme-color-darker-20--rgb: 195, 105, 34;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-sunrise {
     --wp-admin-border-width-focus: 1.5px;
   }

package/build-style/style.css

@@ -97,7 +97,7 @@
   --wp-block-synced-color: #7a00df;
   --wp-block-synced-color--rgb: 122, 0, 223;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   :root {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -841,8 +841,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 0;
   margin: auto 0;
   width: 12px;
-  -webkit-appearance: none;
-          appearance: none;
+  appearance: none;
   cursor: ew-resize;
   outline: none;
   background: none;
@@ -1129,6 +1128,44 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   color: rgba(30, 30, 30, 0.62);
 }
 
+.dataviews-wrapper {
+  width: 100%;
+  padding: 32px;
+}
+
+.dataviews-list-view {
+  width: 100%;
+  text-indent: 0;
+  border-color: inherit;
+  border-collapse: collapse;
+  position: relative;
+}
+.dataviews-list-view a {
+  text-decoration: none;
+}
+.dataviews-list-view th {
+  text-align: left;
+  font-weight: normal;
+  padding: 0 16px 16px;
+  color: #757575;
+}
+.dataviews-list-view td,
+.dataviews-list-view th {
+  padding: 12px;
+}
+.dataviews-list-view td:last-child,
+.dataviews-list-view th:last-child {
+  text-align: right;
+}
+.dataviews-list-view tr {
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.dataviews__per-page-control-prefix {
+  color: #757575;
+  text-wrap: nowrap;
+}
+
 .edit-site-global-styles-preview {
   display: flex;
   align-items: center;
@@ -1860,7 +1897,8 @@ body.is-fullscreen-mode .edit-site-list-header {
 .edit-site-list-added-by__avatar img {
   width: 32px;
   height: 32px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   opacity: 0;
   transition: opacity 0.1s linear;
 }
@@ -2725,7 +2763,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-welcome-guide__image > img {
   display: block;
   max-width: 100%;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
 }
 .edit-site-welcome-guide__heading {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -3296,11 +3335,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   flex-shrink: 0;
 }
 
-@media (min-width: 782px) {
-  .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container {
-    max-width: 292px;
-  }
-}
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container .edit-site-global-styles-variations_item-preview {
   border: #1e1e1e 1px solid;
 }
@@ -3405,10 +3439,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #949494;
 }
 .edit-site-sidebar-navigation-screen-page__featured-image img {
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   height: 100%;
   width: 100%;
-  object-position: 50% 50%;
+  -o-object-position: 50% 50%;
+     object-position: 50% 50%;
 }
 
 .edit-site-sidebar-navigation-screen-page__featured-image-description {
@@ -3716,7 +3752,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   width: 100%;
   height: auto;
   border-radius: 4px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   background: #333;
 }
 .edit-site-layout.is-full-canvas.is-edit-mode .edit-site-site-icon__image {
@@ -4080,7 +4117,7 @@ body.admin-color-light {
   --wp-admin-theme-color-darker-20--rgb: 0, 97, 135;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-light {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4095,7 +4132,7 @@ body.admin-color-modern {
   --wp-admin-theme-color-darker-20--rgb: 24, 58, 214;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-modern {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4110,7 +4147,7 @@ body.admin-color-blue {
   --wp-admin-theme-color-darker-20--rgb: 6, 64, 84;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-blue {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4125,7 +4162,7 @@ body.admin-color-coffee {
   --wp-admin-theme-color-darker-20--rgb: 43, 39, 36;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-coffee {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4140,7 +4177,7 @@ body.admin-color-ectoplasm {
   --wp-admin-theme-color-darker-20--rgb: 58, 44, 77;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ectoplasm {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4155,7 +4192,7 @@ body.admin-color-midnight {
   --wp-admin-theme-color-darker-20--rgb: 208, 44, 33;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-midnight {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4170,7 +4207,7 @@ body.admin-color-ocean {
   --wp-admin-theme-color-darker-20--rgb: 76, 96, 102;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ocean {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4185,7 +4222,7 @@ body.admin-color-sunrise {
   --wp-admin-theme-color-darker-20--rgb: 195, 105, 34;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-sunrise {
     --wp-admin-border-width-focus: 1.5px;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.19.6",
+	"version": "5.20.1",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,44 +27,45 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.42.6",
-		"@wordpress/api-fetch": "^6.39.6",
-		"@wordpress/block-editor": "^12.10.6",
-		"@wordpress/block-library": "^8.19.6",
-		"@wordpress/blocks": "^12.19.6",
-		"@wordpress/commands": "^0.13.6",
-		"@wordpress/components": "^25.8.6",
-		"@wordpress/compose": "^6.19.6",
-		"@wordpress/core-commands": "^0.11.6",
-		"@wordpress/core-data": "^6.19.6",
-		"@wordpress/data": "^9.12.6",
-		"@wordpress/date": "^4.42.6",
-		"@wordpress/deprecated": "^3.42.6",
-		"@wordpress/dom": "^3.42.6",
-		"@wordpress/editor": "^13.19.6",
-		"@wordpress/element": "^5.19.6",
-		"@wordpress/escape-html": "^2.42.6",
-		"@wordpress/hooks": "^3.42.6",
-		"@wordpress/html-entities": "^3.42.6",
-		"@wordpress/i18n": "^4.42.6",
-		"@wordpress/icons": "^9.33.6",
-		"@wordpress/interface": "^5.19.6",
-		"@wordpress/keyboard-shortcuts": "^4.19.6",
-		"@wordpress/keycodes": "^3.42.6",
-		"@wordpress/media-utils": "^4.33.6",
-		"@wordpress/notices": "^4.10.6",
-		"@wordpress/patterns": "^1.3.6",
-		"@wordpress/plugins": "^6.10.6",
-		"@wordpress/preferences": "^3.19.6",
-		"@wordpress/primitives": "^3.40.6",
-		"@wordpress/private-apis": "^0.24.6",
-		"@wordpress/reusable-blocks": "^4.19.6",
-		"@wordpress/router": "^0.11.6",
-		"@wordpress/style-engine": "^1.25.6",
-		"@wordpress/url": "^3.43.6",
-		"@wordpress/viewport": "^5.19.6",
-		"@wordpress/widgets": "^3.19.6",
-		"@wordpress/wordcount": "^3.42.6",
+		"@tanstack/react-table": "^8.10.3",
+		"@wordpress/a11y": "^3.43.0",
+		"@wordpress/api-fetch": "^6.40.0",
+		"@wordpress/block-editor": "^12.11.1",
+		"@wordpress/block-library": "^8.20.1",
+		"@wordpress/blocks": "^12.20.1",
+		"@wordpress/commands": "^0.14.1",
+		"@wordpress/components": "^25.9.1",
+		"@wordpress/compose": "^6.20.0",
+		"@wordpress/core-commands": "^0.12.1",
+		"@wordpress/core-data": "^6.20.1",
+		"@wordpress/data": "^9.13.1",
+		"@wordpress/date": "^4.43.0",
+		"@wordpress/deprecated": "^3.43.0",
+		"@wordpress/dom": "^3.43.0",
+		"@wordpress/editor": "^13.20.1",
+		"@wordpress/element": "^5.20.0",
+		"@wordpress/escape-html": "^2.43.0",
+		"@wordpress/hooks": "^3.43.0",
+		"@wordpress/html-entities": "^3.43.0",
+		"@wordpress/i18n": "^4.43.0",
+		"@wordpress/icons": "^9.34.0",
+		"@wordpress/interface": "^5.20.1",
+		"@wordpress/keyboard-shortcuts": "^4.20.1",
+		"@wordpress/keycodes": "^3.43.0",
+		"@wordpress/media-utils": "^4.34.0",
+		"@wordpress/notices": "^4.11.1",
+		"@wordpress/patterns": "^1.4.1",
+		"@wordpress/plugins": "^6.11.1",
+		"@wordpress/preferences": "^3.20.1",
+		"@wordpress/primitives": "^3.41.0",
+		"@wordpress/private-apis": "^0.25.0",
+		"@wordpress/reusable-blocks": "^4.20.1",
+		"@wordpress/router": "^0.12.0",
+		"@wordpress/style-engine": "^1.26.0",
+		"@wordpress/url": "^3.44.0",
+		"@wordpress/viewport": "^5.20.1",
+		"@wordpress/widgets": "^3.20.1",
+		"@wordpress/wordcount": "^3.43.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
@@ -84,5 +85,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "640c80ab0fb4e0e2bce87e33895939f257e674df"
+	"gitHead": "e17f760ed0dc11cce78157d7c2f2086b1b3c09d8"
 }

package/src/components/block-editor/block-editor-provider/default-block-editor-provider.js

@@ -27,8 +27,8 @@ const noop = () => {};
  * mimic the look and feel of the post editor and
  * allow editing of the page content only.
  *
- * @param {Object}    props
- * @param {WPElement} props.children
+ * @param {Object}  props
+ * @param {Element} props.children
  */
 export default function DefaultBlockEditorProvider( { children } ) {
 	const settings = useSiteEditorSettings();
@@ -51,13 +51,18 @@ export default function DefaultBlockEditorProvider( { children } ) {
 		'postType',
 		templateType
 	);
-	const pageContentBlock = usePageContentBlocks( blocks, isTemplateHidden );
+	const pageContentBlocks = usePageContentBlocks( {
+		blocks,
+		isPageContentFocused: isTemplateHidden,
+		wrapPageContent: true,
+	} );
+
 	return (
 		<ExperimentalBlockEditorProvider
 			settings={ settings }
 			value={
-				isTemplateHidden && pageContentBlock.length
-					? pageContentBlock
+				isTemplateHidden && pageContentBlocks.length
+					? pageContentBlocks
 					: blocks
 			}
 			onInput={ isTemplateHidden ? noop : onInput }

package/src/components/block-editor/block-editor-provider/test/use-page-content-blocks.js

@@ -44,23 +44,52 @@ describe( 'usePageContentBlocks', () => {
 	];
 	it( 'should return empty array if `isPageContentFocused` is `false`', () => {
 		const { result } = renderHook( () =>
-			usePageContentBlocks( blocksList, false )
+			usePageContentBlocks( {
+				blocks: blocksList,
+				isPageContentFocused: false,
+			} )
 		);
 		expect( result.current ).toEqual( [] );
 	} );
 	it( 'should return empty array if `blocks` is undefined', () => {
 		const { result } = renderHook( () =>
-			usePageContentBlocks( undefined, true )
+			usePageContentBlocks( {
+				blocks: undefined,
+				isPageContentFocused: true,
+			} )
 		);
 		expect( result.current ).toEqual( [] );
 	} );
 	it( 'should return empty array if `blocks` is an empty array', () => {
-		const { result } = renderHook( () => usePageContentBlocks( [], true ) );
+		const { result } = renderHook( () =>
+			usePageContentBlocks( {
+				blocks: [],
+				isPageContentFocused: true,
+			} )
+		);
 		expect( result.current ).toEqual( [] );
 	} );
 	it( 'should return new block list', () => {
 		const { result } = renderHook( () =>
-			usePageContentBlocks( blocksList, true )
+			usePageContentBlocks( {
+				blocks: blocksList,
+				isPageContentFocused: true,
+			} )
+		);
+		expect( result.current ).toEqual( [
+			createBlock( 'core/post-title' ),
+			createBlock( 'core/post-featured-image' ),
+			createBlock( 'core/post-content' ),
+			createBlock( 'core/post-content' ),
+		] );
+	} );
+	it( 'should return new block list wrapped in a Group block', () => {
+		const { result } = renderHook( () =>
+			usePageContentBlocks( {
+				blocks: blocksList,
+				isPageContentFocused: true,
+				wrapPageContent: true,
+			} )
 		);
 		expect( result.current ).toEqual( [
 			{

package/src/components/block-editor/block-editor-provider/use-page-content-blocks.js

@@ -38,21 +38,38 @@ function flattenBlocks( blocks, transform ) {
 
 /**
  * Returns a memoized array of blocks that contain only page content blocks,
- * surrounded by a group block to mimic the post editor.
- *
- * @param {Array}   blocks               Block list.
- * @param {boolean} isPageContentFocused Whether the page content has focus. If `true` return page content blocks. Default `false`.
+ * surrounded by an optional group block to mimic the post editor.
  *
+ * @param {Object}  props                      The argument for the function.
+ * @param {Array}   props.blocks               Block list.
+ * @param {boolean} props.isPageContentFocused Whether the page content has focus (and the surrounding template is inert). If `true` return page content blocks. Default `false`.
+ * @param {boolean} props.wrapPageContent      Whether to wrap the page content blocks in a group block to mimic the post editor. Default `false`.
  * @return {Array} Page content blocks.
  */
-export default function usePageContentBlocks(
-	blocks,
-	isPageContentFocused = false
-) {
+export default function usePageContentBlocks( {
+	blocks = [],
+	isPageContentFocused = false,
+	wrapPageContent = false,
+} ) {
 	return useMemo( () => {
-		if ( ! isPageContentFocused || ! blocks || ! blocks.length ) {
+		if ( ! isPageContentFocused || ! blocks?.length ) {
+			return [];
+		}
+
+		const innerBlocks = flattenBlocks( blocks, ( block ) =>
+			PAGE_CONTENT_BLOCK_TYPES[ block.name ]
+				? createBlock( block.name )
+				: undefined
+		);
+
+		if ( ! innerBlocks.length ) {
 			return [];
 		}
+
+		if ( ! wrapPageContent ) {
+			return innerBlocks;
+		}
+
 		return [
 			createBlock(
 				'core/group',
@@ -66,11 +83,7 @@ export default function usePageContentBlocks(
 						},
 					},
 				},
-				flattenBlocks( blocks, ( block ) => {
-					if ( PAGE_CONTENT_BLOCK_TYPES[ block.name ] ) {
-						return createBlock( block.name );
-					}
-				} )
+				innerBlocks
 			),
 		];
 	}, [ blocks, isPageContentFocused ] );