') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [5.x] Fix active state for nav items with implicit children by jesseleite · Pull Request #11937 · statamic/cms · GitHub
Skip to content

[5.x] Fix active state for nav items with implicit children#11937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 6 commits into from
Jul 8, 2025
Merged

[5.x] Fix active state for nav items with implicit children #11937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
971de0e
Allow `->children(true)` to assume conventional nested URLs for activ…
jesseleite Jul 7, 2025
2966934
Updates page has implicit children.
jesseleite Jul 7, 2025
07873f7
Revert "Updates page has implicit children."
jesseleite Jul 8, 2025
312cdae
Revert "Allow `->children(true)` to assume conventional nested URLs f…
jesseleite Jul 8, 2025
ceaf3b8
Add failing test coverage.
jesseleite Jul 8, 2025
406060a
If item has no children, always treat nested URLs as children for act…
jesseleite Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/CP/Navigation/NavItem.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -292,6 +292,14 @@ protected function currentUrlIsRestfulDescendant(): bool
]);
}

/**
* Check if we should assume nested URL conventions for active state on children.
*/
protected function doesntHaveExplicitChildren(): bool
{
return (bool) ! $this->children;
}

/**
* Check if this nav item was ever a child before user preferences were applied.
*/
Expand DownExpand Up@@ -393,6 +401,7 @@ public function isActive()
if ($this->currentUrlIsNotExplicitlyReferencedInNav()) {
switch (true) {
case $this->currentUrlIsRestfulDescendant():
case $this->doesntHaveExplicitChildren():
case $this->wasOriginallyChild():
return $this->isActiveByPattern($this->active);
}
Expand Down
19 changes: 19 additions & 0 deletions tests/CP/Navigation/ActiveNavItemTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -536,6 +536,25 @@ public function it_properly_handles_various_edge_cases_when_checking_is_active_o
$this->assertFalse($externalSecure->isActive());
}

#[Test]
public function active_nav_descendant_url_still_functions_properly_when_parent_item_has_no_children()
{
Facades\CP\Nav::extend(function ($nav) {
$nav->tools('Schopify')->url('/cp/totally-custom-url');
});

$this
->prepareNavCaches()
->get('http://localhost/cp/totally-custom-url/deeper/descendant')
->assertStatus(200);

$toolsItems = $this->build()->get('Tools');

$this->assertTrue($this->getItemByDisplay($toolsItems, 'Schopify')->isActive());
$this->assertFalse($this->getItemByDisplay($toolsItems, 'Addons')->isActive());
$this->assertFalse($this->getItemByDisplay($toolsItems, 'Utilities')->isActive());
}

#[Test]
public function active_nav_check_still_functions_properly_when_custom_nav_extension_hijacks_a_core_item_child()
{
Expand Down