Merge pull request #87 from studioespresso/86-nodeactive-incorrectly-returns-true-for-headings

86 nodeactive incorrectly returns true for headings

Author: janhenckens

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 5.1.5 - Unreleased
+### Fixed 
+- Headings should never be marked as active ([#86](https://github.com/studioespresso/craft-navigate/issues/86)
+
 ## 5.1.4 - 2025-05-29
 ### Fixed
 - Fix for updating url node values ([#82](https://github.com/studioespresso/craft-navigate/issues/82))

src/models/NodeModel.php

@@ -92,9 +92,9 @@ public function rules(): array
 
     /**
      * Added to make migrating from amNav easier
-     * @since 2.6.0
      * @return mixed
      * @throws \craft\errors\DeprecationException
+     * @since 2.6.0
      */
     public function listClass()
     {
@@ -105,9 +105,9 @@ public function listClass()
 
     /**
      * Added to make migrating from amNav easier
-     * @since 2.6.0
      * @return mixed
      * @throws \craft\errors\DeprecationException
+     * @since 2.6.0
      */
     public function hasChildren()
     {
@@ -130,13 +130,14 @@ public function active()
                 if (substr("/" . Craft::$app->request->getPathInfo(), 0, strlen($this->url)) === $this->url) {
                     return true;
                 }
-
                 break;
+            case 'heading':
+                return false;
             default:
                 if ($this->url === Craft::$app->request->getAbsoluteUrl()) {
                     return true;
                 }
-                
+
                 if (strpos(Craft::$app->request->getAbsoluteUrl(), '?')) {
                     if (explode('?', Craft::$app->request->getAbsoluteUrl())[0] === $this->url) {
                         return true;
@@ -163,13 +164,14 @@ public function current()
                 if (substr("/" . Craft::$app->request->getPathInfo(), 0, strlen($this->url)) === $this->url) {
                     return true;
                 }
-
                 break;
+            case 'heading':
+                return false;
             default:
                 if ($this->url === Craft::$app->request->getAbsoluteUrl()) {
                     return true;
                 }
-                
+
                 if (strpos(Craft::$app->request->getAbsoluteUrl(), '?')) {
                     if (explode('?', Craft::$app->request->getAbsoluteUrl())[0] === $this->url) {
                         return true;