From 49affb3f99f2a6733ec8cebdcb6f253bc2558f6f Mon Sep 17 00:00:00 2001
From: Kaspars Dambis <hi@kaspars.net>
Date: Fri, 28 Feb 2025 10:45:02 +0200
Subject: [PATCH] Use memo to avoid rebuilding the list of options

---
 packages/block-library/src/query/utils.js | 68 ++++++++++++-----------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/packages/block-library/src/query/utils.js b/packages/block-library/src/query/utils.js
index 2d482b5859a5f..3f87a1c86ad01 100644
--- a/packages/block-library/src/query/utils.js
+++ b/packages/block-library/src/query/utils.js
@@ -203,43 +203,45 @@ export function useOrderByOptions( postType ) {
 		[ postType ]
 	);
 
-	const orderByOptions = [
-		{
-			label: __( 'Newest to oldest' ),
-			value: 'date/desc',
-		},
-		{
-			label: __( 'Oldest to newest' ),
-			value: 'date/asc',
-		},
-		{
-			/* translators: Label for ordering posts by title in ascending order. */
-			label: __( 'A → Z' ),
-			value: 'title/asc',
-		},
-		{
-			/* translators: Label for ordering posts by title in descending order. */
-			label: __( 'Z → A' ),
-			value: 'title/desc',
-		},
-	];
-
-	if ( supportsCustomOrder ) {
-		orderByOptions.push(
+	return useMemo( () => {
+		const orderByOptions = [
 			{
-				/* translators: Label for ordering posts by ascending menu order. */
-				label: __( 'Ascending by order' ),
-				value: 'menu_order/asc',
+				label: __( 'Newest to oldest' ),
+				value: 'date/desc',
 			},
 			{
-				/* translators: Label for ordering posts by descending menu order. */
-				label: __( 'Descending by order' ),
-				value: 'menu_order/desc',
-			}
-		);
-	}
+				label: __( 'Oldest to newest' ),
+				value: 'date/asc',
+			},
+			{
+				/* translators: Label for ordering posts by title in ascending order. */
+				label: __( 'A → Z' ),
+				value: 'title/asc',
+			},
+			{
+				/* translators: Label for ordering posts by title in descending order. */
+				label: __( 'Z → A' ),
+				value: 'title/desc',
+			},
+		];
+
+		if ( supportsCustomOrder ) {
+			orderByOptions.push(
+				{
+					/* translators: Label for ordering posts by ascending menu order. */
+					label: __( 'Ascending by order' ),
+					value: 'menu_order/asc',
+				},
+				{
+					/* translators: Label for ordering posts by descending menu order. */
+					label: __( 'Descending by order' ),
+					value: 'menu_order/desc',
+				}
+			);
+		}
 
-	return orderByOptions;
+		return orderByOptions;
+	}, [ supportsCustomOrder ] );
 }
 
 /**