Refactor retrieval of first and last panel items

WordPress · Jan 10, 2022 · 5bc8da0 · 5bc8da0
1 parent cdf668a
commit 5bc8da0
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/packages/components/src/tools-panel/tools-panel/hook.ts b/packages/components/src/tools-panel/tools-panel/hook.ts
@@ -232,23 +232,21 @@ export function useToolsPanel(
 
 	// Assist ItemGroup styling when there are potentially hidden placeholder
 	// items by identifying first & last items that are toggled on for display.
-	const getFirstItem = () => {
+	const getFirstVisibleItemLabel = ( items: ToolsPanelItem[] ) => {
 		const optionalItems = menuItems.optional || {};
-		const firstItem = panelItems.find(
+		const firstItem = items.find(
 			( item ) => item.isShownByDefault || !! optionalItems[ item.label ]
 		);
 
 		return firstItem?.label;
 	};
 
-	const getLastItem = () => {
-		const reversedPanelItems = [ ...panelItems ].reverse();
-		const optionalItems = menuItems.optional || {};
-		const lastItem = reversedPanelItems.find(
-			( item ) => item.isShownByDefault || !! optionalItems[ item.label ]
-		);
+	const getFirstItem = () => {
+		return getFirstVisibleItemLabel( panelItems );
+	};
 
-		return lastItem?.label;
+	const getLastItem = () => {
+		return getFirstVisibleItemLabel( [ ...panelItems ].reverse() );
 	};
 
 	const panelContext = {