From 030020e4ee0bd01acba6302a4f33b1f871f7a717 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Mon, 21 Aug 2023 17:00:28 +1000
Subject: [PATCH 1/2] BlockList: Ensure element styles are always output at the
 end of the document

---
 packages/block-editor/src/components/block-list/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
index 6b20789fa919e0..c2948f9fa8e15b 100644
--- a/packages/block-editor/src/components/block-list/index.js
+++ b/packages/block-editor/src/components/block-list/index.js
@@ -104,7 +104,6 @@ function Root( { className, ...settings } ) {
 			ref: useMergeRefs( [
 				useBlockSelectionClearer(),
 				useInBetweenInserter(),
-				setElement,
 				useTypingObserver(),
 			] ),
 			className: classnames( 'is-root-container', className, {
@@ -119,6 +118,8 @@ function Root( { className, ...settings } ) {
 		<elementContext.Provider value={ element }>
 			<IntersectionObserver.Provider value={ intersectionObserver }>
 				<div { ...innerBlocksProps } />
+				{ /* Ensure element and layout styles are always at the end of the document */ }
+				<div hidden ref={ setElement } />
 			</IntersectionObserver.Provider>
 		</elementContext.Provider>
 	);

From 430b991e60692e514426c3c5ad4369d9f8f29443 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Tue, 22 Aug 2023 11:15:03 +1000
Subject: [PATCH 2/2] Remove hidden attribute so that Duotone still works in FF

---
 packages/block-editor/src/components/block-list/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
index c2948f9fa8e15b..a9d5f15f12f81b 100644
--- a/packages/block-editor/src/components/block-list/index.js
+++ b/packages/block-editor/src/components/block-list/index.js
@@ -119,7 +119,7 @@ function Root( { className, ...settings } ) {
 			<IntersectionObserver.Provider value={ intersectionObserver }>
 				<div { ...innerBlocksProps } />
 				{ /* Ensure element and layout styles are always at the end of the document */ }
-				<div hidden ref={ setElement } />
+				<div ref={ setElement } />
 			</IntersectionObserver.Provider>
 		</elementContext.Provider>
 	);