remove permissions from the useSelect

WordPress · Jul 4, 2023 · dc147f6 · dc147f6
1 parent 6929278
commit dc147f6
Showing 1 changed file with 15 additions and 26 deletions.
diff --git a/packages/block-library/src/navigation/use-navigation-menu.js b/packages/block-library/src/navigation/use-navigation-menu.js
@@ -18,14 +18,6 @@ export default function useNavigationMenu( ref ) {
 
 	const useSelectResult = useSelect(
 		( select ) => {
-			const {
-				canCreate,
-				canUpdate,
-				canDelete,
-				isResolving,
-				hasResolved,
-			} = permissions;
-
 			const {
 				navigationMenu,
 				isNavigationMenuResolved,
@@ -36,44 +28,41 @@ export default function useNavigationMenu( ref ) {
 				navigationMenu,
 				isNavigationMenuResolved,
 				isNavigationMenuMissing,
-
-				canUserCreateNavigationMenu: canCreate,
-				isResolvingCanUserCreateNavigationMenu: isResolving,
-				hasResolvedCanUserCreateNavigationMenu: hasResolved,
-
-				canUserUpdateNavigationMenu: canUpdate,
-				hasResolvedCanUserUpdateNavigationMenu: ref
-					? hasResolved
-					: undefined,
-
-				canUserDeleteNavigationMenu: canDelete,
-				hasResolvedCanUserDeleteNavigationMenu: ref
-					? hasResolved
-					: undefined,
 			};
 		},
-		[ ref, permissions ]
+		[ ref ]
 	);
 
+	const { canCreate, canUpdate, canDelete, isResolving, hasResolved } =
+		permissions;
+
 	const {
 		records: navigationMenus,
 		isResolving: isResolvingNavigationMenus,
 		hasResolved: hasResolvedNavigationMenus,
-		canSwitchNavigationMenu = ref
-			? navigationMenus?.length > 1
-			: navigationMenus?.length > 0,
 	} = useEntityRecords(
 		'postType',
 		`wp_navigation`,
 		PRELOADED_NAVIGATION_MENUS_QUERY
 	);
 
+	const canSwitchNavigationMenu = ref
+		? navigationMenus?.length > 1
+		: navigationMenus?.length > 0;
+
 	return {
 		...useSelectResult,
 		navigationMenus,
 		isResolvingNavigationMenus,
 		hasResolvedNavigationMenus,
 		canSwitchNavigationMenu,
+		canUserCreateNavigationMenu: canCreate,
+		isResolvingCanUserCreateNavigationMenu: isResolving,
+		hasResolvedCanUserCreateNavigationMenu: hasResolved,
+		canUserUpdateNavigationMenu: canUpdate,
+		hasResolvedCanUserUpdateNavigationMenu: ref ? hasResolved : undefined,
+		canUserDeleteNavigationMenu: canDelete,
+		hasResolvedCanUserDeleteNavigationMenu: ref ? hasResolved : undefined,
 	};
 }