Address feedback and attempt to fix e2e tests

WordPress · Jul 9, 2021 · 2a39dc3 · 2a39dc3
1 parent 855a9ce
commit 2a39dc3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/lib/block-supports/layout.php b/lib/block-supports/layout.php
@@ -86,8 +86,11 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		1
 	);
 
+	// Ideally styles should be loaded in the head, but blocks may be parsed
+	// after that, so loading in the footer for now.
+	// See https://core.trac.wordpress.org/ticket/53494.
 	add_action(
-		'wp_head',
+		'wp_footer',
 		function () use ( $style ) {
 			echo '<style>' . $style . '</style>';
 		}

diff --git a/packages/block-editor/src/hooks/duotone.js b/packages/block-editor/src/hooks/duotone.js
@@ -237,14 +237,15 @@ const withDuotoneStyles = createHigherOrderComponent(
 
 		return (
 			<>
-				{ createPortal(
-					<DuotoneFilter
-						selector={ selectorsGroup }
-						id={ id }
-						values={ getValuesFromColors( values ) }
-					/>,
-					element
-				) }
+				{ element &&
+					createPortal(
+						<DuotoneFilter
+							selector={ selectorsGroup }
+							id={ id }
+							values={ getValuesFromColors( values ) }
+						/>,
+						element
+					) }
 				<BlockListBlock { ...props } className={ className } />
 			</>
 		);

diff --git a/packages/block-editor/src/hooks/layout.js b/packages/block-editor/src/hooks/layout.js
@@ -216,13 +216,14 @@ export const withLayoutStyles = createHigherOrderComponent(
 
 		return (
 			<>
-				{ createPortal(
-					<LayoutStyle
-						selector={ `.wp-container-${ id }` }
-						layout={ usedLayout }
-					/>,
-					element
-				) }
+				{ element &&
+					createPortal(
+						<LayoutStyle
+							selector={ `.wp-container-${ id }` }
+							layout={ usedLayout }
+						/>,
+						element
+					) }
 				<BlockListBlock { ...props } className={ className } />
 			</>
 		);