From d6f3a809e3dfd93355b4121249c972c7d40b216e Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Tue, 6 Jun 2023 17:00:54 +0100
Subject: [PATCH 01/10] [4.x] Open CP nav item when it has any active child

---
 resources/views/partials/nav-main.blade.php   |  2 +-
 resources/views/partials/nav-mobile.blade.php |  2 +-
 src/CP/Navigation/NavItem.php                 | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/nav-main.blade.php b/resources/views/partials/nav-main.blade.php
index 29401900623..d8963a2ca80 100644
--- a/resources/views/partials/nav-main.blade.php
+++ b/resources/views/partials/nav-main.blade.php
@@ -14,7 +14,7 @@
                                 <a href="{{ $item->url() }}" {{ $item->attributes() }}>
                                     <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
                                 </a>
-                                @if ($item->children() && $item->isActive())
+                                @if ($item->children() && ($item->isActive() || $item->hasActiveChild()))
                                     <ul>
                                         @foreach ($item->children() as $child)
                                             <li class="{{ $child->isActive() ? 'current' : '' }}">
diff --git a/resources/views/partials/nav-mobile.blade.php b/resources/views/partials/nav-mobile.blade.php
index 047a90e77d0..6fcbb4b0dd2 100644
--- a/resources/views/partials/nav-mobile.blade.php
+++ b/resources/views/partials/nav-mobile.blade.php
@@ -13,7 +13,7 @@
                             <a href="{{ $item->url() }}">
                                 <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
                             </a>
-                            @if ($item->children() && $item->isActive())
+                            @if ($item->children() && ($item->isActive() || $item->hasActiveChild()))
                                 <ul>
                                     @foreach ($item->children() as $child)
                                         <li class="{{ $child->isActive() ? 'current' : '' }}">
diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 787977bda16..454ae6d8efa 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\CP\Navigation;
 
+use Illuminate\Support\Collection;
 use Statamic\Facades\CP\Nav;
 use Statamic\Statamic;
 use Statamic\Support\Html;
@@ -326,6 +327,16 @@ public function isActive()
         return preg_match('#'.$pattern.'#', request()->decodedPath()) === 1;
     }
 
+    /**
+     * Get whether the nav item has a currently active child.
+     *
+     * @return bool
+     */
+    public function hasActiveChild()
+    {
+        return $this->children() instanceof Collection && $this->children()->first(fn ($item) => $item->isActive()) !== null;
+    }
+
     /**
      * Get or set custom view.
      *

From 324c731c4469cc6a1967da75875c1b288e5c989d Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Sun, 10 Sep 2023 16:43:11 -0400
Subject: [PATCH 02/10] Add `URL::removeQueryAndFragment()` helper.

---
 src/Facades/Endpoint/URL.php | 14 ++++++++++++++
 tests/Facades/UrlTest.php    | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/Facades/Endpoint/URL.php b/src/Facades/Endpoint/URL.php
index 9a3f6cc2267..cd4e1261b65 100644
--- a/src/Facades/Endpoint/URL.php
+++ b/src/Facades/Endpoint/URL.php
@@ -301,4 +301,18 @@ public function gravatar($email, $size = null)
 
         return $url;
     }
+
+    /**
+     * Remove query and fragment from end of URL.
+     *
+     * @param  string  $url
+     * @return string
+     */
+    public function removeQueryAndFragment($url)
+    {
+        $url = Str::before($url, '?'); // Remove query params
+        $url = Str::before($url, '#'); // Remove anchor fragment
+
+        return $url;
+    }
 }
diff --git a/tests/Facades/UrlTest.php b/tests/Facades/UrlTest.php
index 8cc5673540e..74c9e534ab0 100644
--- a/tests/Facades/UrlTest.php
+++ b/tests/Facades/UrlTest.php
@@ -229,4 +229,23 @@ public function relativeProvider()
             ['/foo/bar/?bar=baz#fragment', '/foo/bar/?bar=baz#fragment'],
         ];
     }
+
+    /** @test */
+    public function it_can_remove_query_and_fragment()
+    {
+        $this->assertEquals('https://example.com', URL::removeQueryAndFragment('https://example.com?query'));
+        $this->assertEquals('https://example.com', URL::removeQueryAndFragment('https://example.com#anchor'));
+        $this->assertEquals('https://example.com', URL::removeQueryAndFragment('https://example.com?foo=bar&baz=qux'));
+        $this->assertEquals('https://example.com', URL::removeQueryAndFragment('https://example.com?foo=bar&baz=qux#anchor'));
+
+        $this->assertEquals('https://example.com/', URL::removeQueryAndFragment('https://example.com/?query'));
+        $this->assertEquals('https://example.com/', URL::removeQueryAndFragment('https://example.com/#anchor'));
+        $this->assertEquals('https://example.com/', URL::removeQueryAndFragment('https://example.com/?foo=bar&baz=qux'));
+        $this->assertEquals('https://example.com/', URL::removeQueryAndFragment('https://example.com/?foo=bar&baz=qux#anchor'));
+
+        $this->assertEquals('https://example.com/about', URL::removeQueryAndFragment('https://example.com/about?query'));
+        $this->assertEquals('https://example.com/about', URL::removeQueryAndFragment('https://example.com/about#anchor'));
+        $this->assertEquals('https://example.com/about', URL::removeQueryAndFragment('https://example.com/about?foo=bar&baz=qux'));
+        $this->assertEquals('https://example.com/about', URL::removeQueryAndFragment('https://example.com/about?foo=bar&baz=qux#anchor'));
+    }
 }

From ef24ff94c39f8993a8ea58984c33d450e815c5cd Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Sun, 10 Sep 2023 16:57:59 -0400
Subject: [PATCH 03/10] Check nav item and associated children for explicit
 `isActive()` URL status, only using pattern for resolving child closures.

---
 resources/views/partials/nav-main.blade.php   |   2 +-
 resources/views/partials/nav-mobile.blade.php |   2 +-
 src/CP/Navigation/NavItem.php                 | 101 ++++++++++++------
 tests/CP/Navigation/NavTest.php               |  24 ++---
 4 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/resources/views/partials/nav-main.blade.php b/resources/views/partials/nav-main.blade.php
index d8963a2ca80..29401900623 100644
--- a/resources/views/partials/nav-main.blade.php
+++ b/resources/views/partials/nav-main.blade.php
@@ -14,7 +14,7 @@
                                 <a href="{{ $item->url() }}" {{ $item->attributes() }}>
                                     <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
                                 </a>
-                                @if ($item->children() && ($item->isActive() || $item->hasActiveChild()))
+                                @if ($item->children() && $item->isActive())
                                     <ul>
                                         @foreach ($item->children() as $child)
                                             <li class="{{ $child->isActive() ? 'current' : '' }}">
diff --git a/resources/views/partials/nav-mobile.blade.php b/resources/views/partials/nav-mobile.blade.php
index 6fcbb4b0dd2..047a90e77d0 100644
--- a/resources/views/partials/nav-mobile.blade.php
+++ b/resources/views/partials/nav-mobile.blade.php
@@ -13,7 +13,7 @@
                             <a href="{{ $item->url() }}">
                                 <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
                             </a>
-                            @if ($item->children() && ($item->isActive() || $item->hasActiveChild()))
+                            @if ($item->children() && $item->isActive())
                                 <ul>
                                     @foreach ($item->children() as $child)
                                         <li class="{{ $child->isActive() ? 'current' : '' }}">
diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index e84b293e771..8893ddadf6f 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Statamic\Facades\CP\Nav;
+use Statamic\Facades\URL;
 use Statamic\Statamic;
 use Statamic\Support\Html;
 use Statamic\Support\Str;
@@ -20,8 +21,8 @@ class NavItem
     protected $icon;
     protected $children;
     protected $isChild;
+    protected $resolveChildrenPattern;
     protected $authorization;
-    protected $active;
     protected $view;
     protected $order;
     protected $hidden;
@@ -125,13 +126,28 @@ public function url($url = null)
             ->afterSetter(function ($url) {
                 $cpUrl = url(config('statamic.cp.route')).'/';
 
-                if (! $this->active && Str::startsWith($url, $cpUrl)) {
-                    $this->active = $this->generateActivePatternForCpUrl($url);
+                if (! $this->resolveChildrenPattern && Str::startsWith($url, $cpUrl)) {
+                    $this->resolveChildrenPattern = $this->generateResolveChildrenPatternForCpUrl($url);
                 }
             })
             ->value($url);
     }
 
+    /**
+     * Generate resolve children pattern for CP url.
+     *
+     * @param  string  $url
+     * @return string
+     */
+    protected function generateResolveChildrenPatternForCpUrl($url)
+    {
+        $cpUrl = url(config('statamic.cp.route')).'/';
+
+        $relativeUrl = str_replace($cpUrl, '', URL::removeQueryAndFragment($url));
+
+        return $relativeUrl.'(/(.*)?|$)';
+    }
+
     /**
      * Get editable url for nav builder UI.
      */
@@ -240,6 +256,28 @@ public function isChild($isChild = null)
             ->value($isChild);
     }
 
+    /**
+     * Pattern to determine when to resolve children for `hasActiveChild()` checks.
+     *
+     * @return $this
+     */
+    public function resolveChildrenPattern($pattern = null)
+    {
+        return $this->fluentlyGetOrSet('resolveChildrenPattern')->value($pattern);
+    }
+
+    /**
+     * Determine when to resolve children for `hasActiveChild()` checks.
+     *
+     * @return bool
+     */
+    protected function shouldResolveChildren()
+    {
+        $pattern = preg_quote(config('statamic.cp.route'), '#').'/'.$this->resolveChildrenPattern;
+
+        return preg_match('#'.$pattern.'#', request()->decodedPath()) === 1;
+    }
+
     /**
      * Resolve children closure.
      *
@@ -300,17 +338,6 @@ public function can($ability = null, $arguments = [])
         return $this->authorization($ability, $arguments);
     }
 
-    /**
-     * Get or set pattern for active state styling.
-     *
-     * @param  string|null  $pattern
-     * @return mixed
-     */
-    public function active($pattern = null)
-    {
-        return $this->fluentlyGetOrSet('active')->value($pattern);
-    }
-
     /**
      * Get whether the nav item is currently active.
      *
@@ -318,13 +345,11 @@ public function active($pattern = null)
      */
     public function isActive()
     {
-        if (! $this->active) {
-            return false;
+        if ($this->hasActiveChild()) {
+            return true;
         }
 
-        $pattern = preg_quote(config('statamic.cp.route'), '#').'/'.$this->active;
-
-        return preg_match('#'.$pattern.'#', request()->decodedPath()) === 1;
+        return request()->url() === URL::removeQueryAndFragment($this->url);
     }
 
     /**
@@ -332,9 +357,20 @@ public function isActive()
      *
      * @return bool
      */
-    public function hasActiveChild()
+    protected function hasActiveChild()
     {
-        return $this->children() instanceof Collection && $this->children()->first(fn ($item) => $item->isActive()) !== null;
+        if ($this->shouldResolveChildren()) {
+            $this->resolveChildren();
+        }
+
+        if (! $this->children() instanceof Collection) {
+            return false;
+        }
+
+        return $this
+            ->children()
+            ->filter(fn ($item) => $item->isActive())
+            ->isNotEmpty();
     }
 
     /**
@@ -454,20 +490,15 @@ public static function snakeCase($string)
     }
 
     /**
-     * Generate active pattern for CP url.
+     * This has been renamed to `resolveChildrenPattern()` because we no longer use this pattern
+     * to determine whether an item is active, but rather when to resolve an items children.
+     * Deprecating it in case addons are setting `active()` patterns on their nav items.
+     * Addons should now start using `resolveChildrenPattern()` from now on instead.
      *
-     * @param  string  $url
-     * @return string
+     * @deprecated
      */
-    protected function generateActivePatternForCpUrl($url)
-    {
-        $cpUrl = url(config('statamic.cp.route')).'/';
-
-        $url = Str::before($url, '?'); // Remove query params
-        $url = Str::before($url, '#'); // Remove anchors
-
-        $relativeUrl = str_replace($cpUrl, '', $url);
-
-        return $relativeUrl.'(/(.*)?|$)';
-    }
+    // public function active($pattern = null)
+    // {
+    //     return $this->fluentlyGetOrSet('resolveChildrenPattern')->value($pattern);
+    // }
 }
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index 0636f4d3f8e..d0387c2b788 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -97,7 +97,7 @@ public function it_can_create_a_nav_item_with_a_more_custom_config()
 
         Nav::droids('C-3PO')
             ->id('some::custom::id')
-            ->active('threepio*')
+            ->resolveChildrenPattern('threepio*')
             ->url('/human-cyborg-relations')
             ->view('cp.nav.importer')
             ->can('index', 'DroidsClass')
@@ -110,7 +110,7 @@ public function it_can_create_a_nav_item_with_a_more_custom_config()
         $this->assertEquals('C-3PO', $item->display());
         $this->assertEquals('http://localhost/human-cyborg-relations', $item->url());
         $this->assertEquals('cp.nav.importer', $item->view());
-        $this->assertEquals('threepio*', $item->active());
+        $this->assertEquals('threepio*', $item->resolveChildrenPattern());
         $this->assertEquals('index', $item->authorization()->ability);
         $this->assertEquals('DroidsClass', $item->authorization()->arguments);
         $this->assertEquals(' target="_blank" class="red"', $item->attributes());
@@ -433,15 +433,15 @@ public function it_checks_if_active()
         $this->assertFalse($hello->isActive());
         $this->assertFalse($helloWithQueryParams->isActive());
         $this->assertFalse($helloWithAnchor->isActive());
-        $this->assertTrue($hell->isActive());
+        $this->assertFalse($hell->isActive());
         $this->assertFalse($localNotCp->isActive());
         $this->assertFalse($external->isActive());
         $this->assertFalse($externalSecure->isActive());
 
         Request::swap(Request::create('http://localhost/cp/hello/test'));
-        $this->assertTrue($hello->isActive());
-        $this->assertTrue($helloWithQueryParams->isActive());
-        $this->assertTrue($helloWithAnchor->isActive());
+        $this->assertFalse($hello->isActive());
+        $this->assertFalse($helloWithQueryParams->isActive());
+        $this->assertFalse($helloWithAnchor->isActive());
         $this->assertFalse($hell->isActive());
         $this->assertFalse($localNotCp->isActive());
         $this->assertFalse($external->isActive());
@@ -471,17 +471,17 @@ public function it_sets_the_url()
     {
         tap(Nav::create('external-absolute')->url('http://domain.com'), function ($nav) {
             $this->assertEquals('http://domain.com', $nav->url());
-            $this->assertNull($nav->active());
+            $this->assertNull($nav->resolveChildrenPattern());
         });
 
         tap(Nav::create('site-relative')->url('/foo/bar'), function ($nav) {
             $this->assertEquals('http://localhost/foo/bar', $nav->url());
-            $this->assertNull($nav->active());
+            $this->assertNull($nav->resolveChildrenPattern());
         });
 
         tap(Nav::create('cp-relative')->url('foo/bar'), function ($nav) {
             $this->assertEquals('http://localhost/cp/foo/bar', $nav->url());
-            $this->assertEquals('foo/bar(/(.*)?|$)', $nav->active());
+            $this->assertEquals('foo/bar(/(.*)?|$)', $nav->resolveChildrenPattern());
         });
     }
 
@@ -502,11 +502,11 @@ public function it_gets_a_cleaner_editable_version_of_the_url()
     }
 
     /** @test */
-    public function it_does_not_automatically_add_an_active_pattern_when_setting_url_if_one_is_already_defined()
+    public function it_does_not_automatically_add_a_resolve_children_pattern_when_setting_url_if_one_is_already_defined()
     {
-        $nav = Nav::create('cp-relative')->active('foo.*')->url('foo/bar');
+        $nav = Nav::create('cp-relative')->resolveChildrenPattern('foo.*')->url('foo/bar');
         $this->assertEquals('http://localhost/cp/foo/bar', $nav->url());
-        $this->assertEquals('foo.*', $nav->active());
+        $this->assertEquals('foo.*', $nav->resolveChildrenPattern());
     }
 
     /** @test */

From 33cac12acfa30b0ab05318abeae667885568b67e Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Sun, 10 Sep 2023 17:17:57 -0400
Subject: [PATCH 04/10] Ensure `resolveChildrenPattern` actually resolves
 children for `hasActiveChild()` checks.

---
 tests/CP/Navigation/NavTest.php | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index d0387c2b788..270ce05b05e 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -466,6 +466,43 @@ public function it_checks_if_active()
         $this->assertFalse($externalSecure->isActive());
     }
 
+    /** @test */
+    public function it_checks_if_has_active_children()
+    {
+        $collections = Nav::content('Collections')
+            ->url('http://localhost/cp/collections')
+            ->children(function () use (&$pages, &$articles) {
+                return [
+                    $pages = Nav::item('Pages')->url('/cp/collections/pages'),
+                    $articles = Nav::item('Articles')->url('/cp/collections/articles'),
+                ];
+            });
+
+        Request::swap(Request::create('http://localhost/cp/collections/articles'));
+        $this->assertTrue($collections->isActive());
+        $this->assertFalse($pages->isActive());
+        $this->assertTrue($articles->isActive());
+    }
+
+    /** @test */
+    public function it_can_get_has_active_children_status_with_custom_resolve_children_pattern()
+    {
+        $collections = Nav::content('Custom Collections Url')
+            ->url('http://localhost/cp/custom/url')
+            ->resolveChildrenPattern('collections*')
+            ->children(function () use (&$pages, &$articles) {
+                return [
+                    $pages = Nav::item('Pages')->url('/cp/collections/pages'),
+                    $articles = Nav::item('Articles')->url('/cp/collections/articles'),
+                ];
+            });
+
+        Request::swap(Request::create('http://localhost/cp/collections/articles'));
+        $this->assertTrue($collections->isActive());
+        $this->assertFalse($pages->isActive());
+        $this->assertTrue($articles->isActive());
+    }
+
     /** @test */
     public function it_sets_the_url()
     {

From 2bf0700ec704bb78b6883187c33c50b6733a70f9 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Sun, 10 Sep 2023 17:36:50 -0400
Subject: [PATCH 05/10] Test it properly checks active status on moved items.

---
 tests/CP/Navigation/NavPreferencesTest.php | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tests/CP/Navigation/NavPreferencesTest.php b/tests/CP/Navigation/NavPreferencesTest.php
index 0257d3d8ef1..5b3b64510e1 100644
--- a/tests/CP/Navigation/NavPreferencesTest.php
+++ b/tests/CP/Navigation/NavPreferencesTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\CP\Navigation;
 
+use Illuminate\Support\Facades\Request;
 use Statamic\Facades;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -1637,6 +1638,55 @@ public function it_can_build_with_hidden_items()
         $this->assertEquals('@modify', $contentItems->keyBy->display()->get('Globetrotters')->manipulations()['action']);
     }
 
+    /** @test */
+    public function it_checks_active_status_on_moved_items()
+    {
+        Facades\Taxonomy::make('topics')->save();
+        Facades\Taxonomy::make('tags')->save();
+
+        $items = $this->buildNavWithPreferences([
+            'top_level' => [
+                'content::collections::articles' => [
+                    'action' => '@move',
+                    'children' => [
+                        'content::taxonomies::topics' => '@move',
+                    ],
+                ],
+            ],
+        ], true);
+
+        $articles = $items->get('Top Level')->keyBy->display()->get('Articles');
+        $topics = $articles->children()->first();
+        $taxonomies = $items->get('Content')->keyBy->display()->get('Taxonomies');
+        $tags = $items->get('Content')->keyBy->display()->get('Taxonomies')->children()->first();
+
+        $this->assertFalse($articles->isActive());
+        $this->assertFalse($topics->isActive());
+        $this->assertFalse($taxonomies->isActive());
+        $this->assertFalse($tags->isActive());
+
+        Request::swap(Request::create('http://localhost/cp/collections/articles'));
+
+        $this->assertTrue($articles->isActive());
+        $this->assertFalse($topics->isActive());
+        $this->assertFalse($taxonomies->isActive());
+        $this->assertFalse($tags->isActive());
+
+        Request::swap(Request::create('http://localhost/cp/taxonomies/topics'));
+
+        $this->assertTrue($articles->isActive());
+        $this->assertTrue($topics->isActive());
+        $this->assertFalse($taxonomies->isActive());
+        $this->assertFalse($tags->isActive());
+
+        Request::swap(Request::create('http://localhost/cp/taxonomies/tags'));
+
+        $this->assertFalse($articles->isActive());
+        $this->assertFalse($topics->isActive());
+        $this->assertTrue($taxonomies->isActive());
+        $this->assertTrue($tags->isActive());
+    }
+
     private function buildNavWithPreferences($preferences, $withHidden = false)
     {
         $this->actingAs(tap(Facades\User::make()->makeSuper())->save());

From 884fd61db575e46b0efb50b249770ea146f83d6b Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Sun, 10 Sep 2023 17:46:59 -0400
Subject: [PATCH 06/10] Temporarily test deprecated `active()` alias, since
 some addons may use it (ie. SEO Pro does).

---
 src/CP/Navigation/NavItem.php   |  8 ++++----
 tests/CP/Navigation/NavTest.php | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 8893ddadf6f..b8ee180df07 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -497,8 +497,8 @@ public static function snakeCase($string)
      *
      * @deprecated
      */
-    // public function active($pattern = null)
-    // {
-    //     return $this->fluentlyGetOrSet('resolveChildrenPattern')->value($pattern);
-    // }
+    public function active($pattern = null)
+    {
+        return $this->fluentlyGetOrSet('resolveChildrenPattern')->value($pattern);
+    }
 }
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index 270ce05b05e..b008fb323a4 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -503,6 +503,29 @@ public function it_can_get_has_active_children_status_with_custom_resolve_childr
         $this->assertTrue($articles->isActive());
     }
 
+    /**
+     * @deprecated
+     *
+     * @test
+     */
+    public function it_can_get_has_active_children_status_with_deprecated_active_pattern()
+    {
+        $collections = Nav::content('Custom Collections Url')
+            ->url('http://localhost/cp/custom/url')
+            ->active('collections*')
+            ->children(function () use (&$pages, &$articles) {
+                return [
+                    $pages = Nav::item('Pages')->url('/cp/collections/pages'),
+                    $articles = Nav::item('Articles')->url('/cp/collections/articles'),
+                ];
+            });
+
+        Request::swap(Request::create('http://localhost/cp/collections/articles'));
+        $this->assertTrue($collections->isActive());
+        $this->assertFalse($pages->isActive());
+        $this->assertTrue($articles->isActive());
+    }
+
     /** @test */
     public function it_sets_the_url()
     {

From 218db8b2848975bcdc0663828181e24210f14fa5 Mon Sep 17 00:00:00 2001
From: jesseleite <jesseleite@users.noreply.github.com>
Date: Sun, 10 Sep 2023 21:48:53 +0000
Subject: [PATCH 07/10] Fix styling

---
 src/Console/Commands/SupportZipBlueprint.php | 2 +-
 src/Search/Algolia/Index.php                 | 4 ++--
 tests/Data/Entries/EntryTest.php             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Console/Commands/SupportZipBlueprint.php b/src/Console/Commands/SupportZipBlueprint.php
index 0c7a20faec7..bf402ae381c 100644
--- a/src/Console/Commands/SupportZipBlueprint.php
+++ b/src/Console/Commands/SupportZipBlueprint.php
@@ -36,7 +36,7 @@ protected function createZip($blueprint)
 
         $zip = new ZipArchive();
 
-        if (true !== $zip->open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
+        if ($zip->open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE) !== true) {
             $this->error("Unable to create zip file \"$filename\"");
 
             return false;
diff --git a/src/Search/Algolia/Index.php b/src/Search/Algolia/Index.php
index 1b5df8e685f..be5c219d9e3 100644
--- a/src/Search/Algolia/Index.php
+++ b/src/Search/Algolia/Index.php
@@ -89,9 +89,9 @@ public function searchUsingApi($query, $fields = null)
 
     public function exists()
     {
-        return null !== collect($this->client->listIndices()['items'])->first(function ($index) {
+        return collect($this->client->listIndices()['items'])->first(function ($index) {
             return $index['name'] == $this->name;
-        });
+        }) !== null;
     }
 
     private function handleAlgoliaException($e)
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 4860561ab82..e1ae2945f27 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -2204,7 +2204,7 @@ public function __call($method, $args)
                 // Ugly. Sorry. ¯\_(ツ)_/¯
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
                 if (
-                    'Statamic\Entries\Entry@save' === $trace[2]['class'].'@'.$trace[2]['function']
+                    $trace[2]['class'].'@'.$trace[2]['function'] === 'Statamic\Entries\Entry@save'
                     && $method === 'forget'
                     && Str::startsWith($args[0], 'origin-Entry-')
                 ) {

From 265553b20db77ae61c691b233e2a548838b3ad5f Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 18 Sep 2023 16:25:57 -0400
Subject: [PATCH 08/10] Backpeddle on deprecated method rename, and just better
 explain purpose in docblock.

---
 src/CP/Navigation/NavItem.php   | 49 ++++++++++++++-------------------
 tests/CP/Navigation/NavTest.php | 16 +++++------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index b8ee180df07..9b06214b4ce 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -21,7 +21,7 @@ class NavItem
     protected $icon;
     protected $children;
     protected $isChild;
-    protected $resolveChildrenPattern;
+    protected $active;
     protected $authorization;
     protected $view;
     protected $order;
@@ -126,28 +126,13 @@ public function url($url = null)
             ->afterSetter(function ($url) {
                 $cpUrl = url(config('statamic.cp.route')).'/';
 
-                if (! $this->resolveChildrenPattern && Str::startsWith($url, $cpUrl)) {
-                    $this->resolveChildrenPattern = $this->generateResolveChildrenPatternForCpUrl($url);
+                if (! $this->active && Str::startsWith($url, $cpUrl)) {
+                    $this->active = $this->generateActivePatternForCpUrl($url);
                 }
             })
             ->value($url);
     }
 
-    /**
-     * Generate resolve children pattern for CP url.
-     *
-     * @param  string  $url
-     * @return string
-     */
-    protected function generateResolveChildrenPatternForCpUrl($url)
-    {
-        $cpUrl = url(config('statamic.cp.route')).'/';
-
-        $relativeUrl = str_replace($cpUrl, '', URL::removeQueryAndFragment($url));
-
-        return $relativeUrl.'(/(.*)?|$)';
-    }
-
     /**
      * Get editable url for nav builder UI.
      */
@@ -257,13 +242,13 @@ public function isChild($isChild = null)
     }
 
     /**
-     * Pattern to determine when to resolve children for `hasActiveChild()` checks.
+     * Active URL pattern to determine when to resolve children for `hasActiveChild()` checks.
      *
      * @return $this
      */
-    public function resolveChildrenPattern($pattern = null)
+    public function active($pattern = null)
     {
-        return $this->fluentlyGetOrSet('resolveChildrenPattern')->value($pattern);
+        return $this->fluentlyGetOrSet('active')->value($pattern);
     }
 
     /**
@@ -273,7 +258,11 @@ public function resolveChildrenPattern($pattern = null)
      */
     protected function shouldResolveChildren()
     {
-        $pattern = preg_quote(config('statamic.cp.route'), '#').'/'.$this->resolveChildrenPattern;
+        if (! $this->active) {
+            return false;
+        }
+
+        $pattern = preg_quote(config('statamic.cp.route'), '#').'/'.$this->active;
 
         return preg_match('#'.$pattern.'#', request()->decodedPath()) === 1;
     }
@@ -490,15 +479,17 @@ public static function snakeCase($string)
     }
 
     /**
-     * This has been renamed to `resolveChildrenPattern()` because we no longer use this pattern
-     * to determine whether an item is active, but rather when to resolve an items children.
-     * Deprecating it in case addons are setting `active()` patterns on their nav items.
-     * Addons should now start using `resolveChildrenPattern()` from now on instead.
+     * Generate active URL pattern to determine when to resolve children for `hasActiveChild()` checks.
      *
-     * @deprecated
+     * @param  string  $url
+     * @return string
      */
-    public function active($pattern = null)
+    protected function generateActivePatternForCpUrl($url)
     {
-        return $this->fluentlyGetOrSet('resolveChildrenPattern')->value($pattern);
+        $cpUrl = url(config('statamic.cp.route')).'/';
+
+        $relativeUrl = str_replace($cpUrl, '', URL::removeQueryAndFragment($url));
+
+        return $relativeUrl.'(/(.*)?|$)';
     }
 }
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index b008fb323a4..0fe2d54bde4 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -97,7 +97,7 @@ public function it_can_create_a_nav_item_with_a_more_custom_config()
 
         Nav::droids('C-3PO')
             ->id('some::custom::id')
-            ->resolveChildrenPattern('threepio*')
+            ->active('threepio*')
             ->url('/human-cyborg-relations')
             ->view('cp.nav.importer')
             ->can('index', 'DroidsClass')
@@ -110,7 +110,7 @@ public function it_can_create_a_nav_item_with_a_more_custom_config()
         $this->assertEquals('C-3PO', $item->display());
         $this->assertEquals('http://localhost/human-cyborg-relations', $item->url());
         $this->assertEquals('cp.nav.importer', $item->view());
-        $this->assertEquals('threepio*', $item->resolveChildrenPattern());
+        $this->assertEquals('threepio*', $item->active());
         $this->assertEquals('index', $item->authorization()->ability);
         $this->assertEquals('DroidsClass', $item->authorization()->arguments);
         $this->assertEquals(' target="_blank" class="red"', $item->attributes());
@@ -489,7 +489,7 @@ public function it_can_get_has_active_children_status_with_custom_resolve_childr
     {
         $collections = Nav::content('Custom Collections Url')
             ->url('http://localhost/cp/custom/url')
-            ->resolveChildrenPattern('collections*')
+            ->active('collections*')
             ->children(function () use (&$pages, &$articles) {
                 return [
                     $pages = Nav::item('Pages')->url('/cp/collections/pages'),
@@ -531,17 +531,17 @@ public function it_sets_the_url()
     {
         tap(Nav::create('external-absolute')->url('http://domain.com'), function ($nav) {
             $this->assertEquals('http://domain.com', $nav->url());
-            $this->assertNull($nav->resolveChildrenPattern());
+            $this->assertNull($nav->active());
         });
 
         tap(Nav::create('site-relative')->url('/foo/bar'), function ($nav) {
             $this->assertEquals('http://localhost/foo/bar', $nav->url());
-            $this->assertNull($nav->resolveChildrenPattern());
+            $this->assertNull($nav->active());
         });
 
         tap(Nav::create('cp-relative')->url('foo/bar'), function ($nav) {
             $this->assertEquals('http://localhost/cp/foo/bar', $nav->url());
-            $this->assertEquals('foo/bar(/(.*)?|$)', $nav->resolveChildrenPattern());
+            $this->assertEquals('foo/bar(/(.*)?|$)', $nav->active());
         });
     }
 
@@ -564,9 +564,9 @@ public function it_gets_a_cleaner_editable_version_of_the_url()
     /** @test */
     public function it_does_not_automatically_add_a_resolve_children_pattern_when_setting_url_if_one_is_already_defined()
     {
-        $nav = Nav::create('cp-relative')->resolveChildrenPattern('foo.*')->url('foo/bar');
+        $nav = Nav::create('cp-relative')->active('foo.*')->url('foo/bar');
         $this->assertEquals('http://localhost/cp/foo/bar', $nav->url());
-        $this->assertEquals('foo.*', $nav->resolveChildrenPattern());
+        $this->assertEquals('foo.*', $nav->active());
     }
 
     /** @test */

From cf9190100e765b5fd537f1f9211b076502e3611b Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 18 Sep 2023 16:27:56 -0400
Subject: [PATCH 09/10] Move method closer to usage.

---
 src/CP/Navigation/NavItem.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 9b06214b4ce..053467b10cc 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -133,6 +133,21 @@ public function url($url = null)
             ->value($url);
     }
 
+    /**
+     * Generate active URL pattern to determine when to resolve children for `hasActiveChild()` checks.
+     *
+     * @param  string  $url
+     * @return string
+     */
+    protected function generateActivePatternForCpUrl($url)
+    {
+        $cpUrl = url(config('statamic.cp.route')).'/';
+
+        $relativeUrl = str_replace($cpUrl, '', URL::removeQueryAndFragment($url));
+
+        return $relativeUrl.'(/(.*)?|$)';
+    }
+
     /**
      * Get editable url for nav builder UI.
      */
@@ -477,19 +492,4 @@ public static function snakeCase($string)
 
         return $string;
     }
-
-    /**
-     * Generate active URL pattern to determine when to resolve children for `hasActiveChild()` checks.
-     *
-     * @param  string  $url
-     * @return string
-     */
-    protected function generateActivePatternForCpUrl($url)
-    {
-        $cpUrl = url(config('statamic.cp.route')).'/';
-
-        $relativeUrl = str_replace($cpUrl, '', URL::removeQueryAndFragment($url));
-
-        return $relativeUrl.'(/(.*)?|$)';
-    }
 }

From 85d442bdddd2a256b70df1303f75718f32cdc064 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 18 Sep 2023 16:44:17 -0400
Subject: [PATCH 10/10] nitpick

---
 src/CP/Navigation/NavItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 053467b10cc..37f029a180a 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -21,8 +21,8 @@ class NavItem
     protected $icon;
     protected $children;
     protected $isChild;
-    protected $active;
     protected $authorization;
+    protected $active;
     protected $view;
     protected $order;
     protected $hidden;