Move getFootnotesOrder computation to the block level

WordPress · Jul 12, 2023 · 1b49eb6 · 1b49eb6
1 parent 4909a4c
commit 1b49eb6
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/core-data/src/footnotes/get-footnotes-order.js b/packages/core-data/src/footnotes/get-footnotes-order.js
@@ -3,13 +3,10 @@
  */
 import getRichTextValuesCached from './get-rich-text-values-cached';
 
-export default function getFootnotesOrder( blocks ) {
-	const values = blocks.map( getRichTextValuesCached );
-	const content = values.join( '' );
-
+function getBlockFootnotesOrder( block ) {
+	const content = getRichTextValuesCached( block ).join( '' );
 	const newOrder = [];
 
-	// This can be avoided when
 	// https://github.com/WordPress/gutenberg/pull/43204 lands. We can then
 	// get the order directly from the rich text values.
 	if ( content.indexOf( 'data-fn' ) !== -1 ) {
@@ -22,3 +19,7 @@ export default function getFootnotesOrder( blocks ) {
 
 	return newOrder;
 }
+
+export default function getFootnotesOrder( blocks ) {
+	return blocks.flatMap( getBlockFootnotesOrder );
+}