Updates nav logic to lean on getCpNavItem data instead of handle

Author: BenParizek

CHANGELOG/CHANGELOG-CORE.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.0.12 - UNRELEASED
+
+### Fixed
+
+- Fixed module nav items positioning when nav items use different value than plugin handles ([#372])
+
+[#372]: https://github.com/barrelstrength/sprout/issues/372
+
 ## 5.0.10 - 2026-02-16
 
 ### Changed

src/core/modules/CpNavHelper.php

@@ -30,7 +30,9 @@ public static function getUpdatedCpNavItems(array $cpNavItems): array
         // get the nav items of the plugins with cp sections from the $cpNavItems based on the $pluginsWithCpSections matching the url to the plugin handle
         $cpNavOldPluginNavItems = array_filter($cpNavItems, static function($navItem) use ($pluginsWithCpSections) {
             foreach ($pluginsWithCpSections as $plugin) {
-                if ($navItem['url'] === $plugin->handle) {
+                $cpNavItem = $plugin->getCpNavItem();
+                $pluginNavItemUrl = $cpNavItem['url'] ?? null;
+                if ($navItem['url'] === $pluginNavItemUrl) {
                     return true;
                 }
             }
@@ -110,7 +112,9 @@ public static function getUpdatedCpNavItems(array $cpNavItems): array
         // Remove all the Sprout Plugin hasCpSection nav items
         $newCpNavItems = array_filter($cpNavItems, static function($navItem) use ($pluginsWithCpSections) {
             foreach ($pluginsWithCpSections as $plugin) {
-                if ($navItem['url'] === $plugin->handle) {
+                $cpNavItem = $plugin->getCpNavItem();
+                $pluginNavItemUrl = $cpNavItem['url'] ?? null;
+                if ($navItem['url'] === $pluginNavItemUrl) {
                     return false;
                 }
             }
@@ -119,8 +123,10 @@ public static function getUpdatedCpNavItems(array $cpNavItems): array
         });
 
         // If no other plugins are installed and no modules are enabled, this will be the Sprout plugin and just get removed later
-        $cpNavFirstPluginItemKey = array_key_first($pluginsWithCpSections);
-        $cpNavFirstPluginItemIndex = Collection::make($cpNavItems)->search(fn(array $item) => $item['url'] === $cpNavFirstPluginItemKey);
+        $firstPlugin = reset($pluginsWithCpSections);
+        $firstCpNavItem = $firstPlugin->getCpNavItem();
+        $firstPluginNavItemUrl = $firstCpNavItem['url'] ?? null;
+        $cpNavFirstPluginItemIndex = Collection::make($cpNavItems)->search(fn(array $item) => $item['url'] === $firstPluginNavItemUrl);
 
         // If we don't find any plugins with CP sections (a Sprout Plugin should always be there), we'll just add the Sprout Modules to the end of the nav
         if ($cpNavFirstPluginItemIndex === false) {