Shift auxiliary return path to helper method

hydephp · Mar 22, 2024 · 44b901e · 44b901e
1 parent ff21524
commit 44b901e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -93,7 +93,7 @@ public function isGroupActive(string $group): bool
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
         if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
+            return $this->shouldIndexPageBeActive($group, $currentPage);
         }
 
         return $this->groupMatchesCurrentPageGroup($currentPage, $group);
@@ -112,7 +112,7 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
+        return ($group === $this->getItems()->firstOrFail()->getGroupKey()) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
     }
 
     protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool