Taxonomies: Retain flat term order

WordPress · Aug 13, 2024 · 958c94f · 958c94f
1 parent c73aa36
commit 958c94f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/editor/src/components/post-taxonomies/flat-term-selector.js b/packages/editor/src/components/post-taxonomies/flat-term-selector.js
@@ -103,6 +103,10 @@ export function FlatTermSelector( { slug, __nextHasNoMarginBottom } ) {
 				per_page: -1,
 			};
 
+			const _terms = _termIds?.length
+				? getEntityRecords( 'taxonomy', slug, query )
+				: EMPTY_ARRAY;
+
 			return {
 				hasCreateAction: _taxonomy
 					? post._links?.[
@@ -116,8 +120,10 @@ export function FlatTermSelector( { slug, __nextHasNoMarginBottom } ) {
 					: false,
 				taxonomy: _taxonomy,
 				termIds: _termIds,
-				terms: _termIds?.length
-					? getEntityRecords( 'taxonomy', slug, query )
+				terms: _terms
+					? _termIds.map( ( termId ) =>
+							_terms.find( ( term ) => term.id === termId )
+					  )
 					: EMPTY_ARRAY,
 				hasResolvedTerms: hasFinishedResolution( 'getEntityRecords', [
 					'taxonomy',