[5.x] Fix create/edit CP nav descendants not properly triggering active status (#11832)

* Add failing test coverage.

* Allow non-explicitly defined restful descendants when checking active state.

Author: jesseleite

src/CP/Navigation/NavItem.php

@@ -281,13 +281,21 @@ public function isChild($isChild = null)
             ->value($isChild);
     }
 
+    /**
+     * Check if current url is a restful descendant.
+     */
+    protected function currentUrlIsRestfulDescendant(): bool
+    {
+        return (bool) Str::endsWith(request()->url(), [
+            '/create',
+            '/edit',
+        ]);
+    }
+
     /**
      * Check if this nav item was ever a child before user preferences were applied.
-     *
-     * @param  bool|null  $isChild
-     * @return mixed
      */
-    protected function wasOriginallyChild()
+    protected function wasOriginallyChild(): bool
     {
         return (bool) $this->wasOriginallyChild;
     }
@@ -382,8 +390,12 @@ public function isActive()
         // If the current URL is not explicitly referenced in the CP nav,
         // and if this item is/was ever a child nav item,
         // then check against URL heirarchy conventions using regex pattern.
-        if ($this->currentUrlIsNotExplicitlyReferencedInNav() && $this->wasOriginallyChild()) {
-            return $this->isActiveByPattern($this->active);
+        if ($this->currentUrlIsNotExplicitlyReferencedInNav()) {
+            switch (true) {
+                case $this->currentUrlIsRestfulDescendant():
+                case $this->wasOriginallyChild():
+                    return $this->isActiveByPattern($this->active);
+            }
         }
 
         return request()->url() === URL::removeQueryAndFragment($this->url);

tests/CP/Navigation/ActiveNavItemTest.php

@@ -196,6 +196,25 @@ public function it_resolves_core_children_closure_and_can_check_when_parent_and_
         $this->assertTrue($this->getItemByDisplay($collections->children(), 'Articles')->isActive());
     }
 
+    #[Test]
+    public function it_resolves_core_children_closure_and_can_check_when_parent_and_descendant_of_parent_item_is_active()
+    {
+        Facades\Collection::make('pages')->title('Pages')->save();
+        Facades\Collection::make('articles')->title('Articles')->save();
+
+        $this
+            ->prepareNavCaches()
+            ->get('http://localhost/cp/collections/create')
+            ->assertStatus(200);
+
+        $collections = $this->buildAndGetItem('Content', 'Collections');
+
+        $this->assertTrue($collections->isActive());
+        $this->assertInstanceOf(Collection::class, $collections->children());
+        $this->assertFalse($collections->children()->keyBy->display()->get('Pages')->isActive());
+        $this->assertFalse($collections->children()->keyBy->display()->get('Articles')->isActive());
+    }
+
     #[Test]
     public function it_resolves_core_children_closure_and_can_check_when_parent_and_descendant_of_child_item_is_active()
     {