updates to activePageSelect

composer version changes

classes/navigation.php

@@ -194,6 +194,7 @@ class Navigation extends Template {
             Routes::getUri(false),
             Routes::getAddress() . $selectString,
             Routes::getAddress() . $explodedUrl[0],
+            '/' . $selectString,
             $selectString,
             $explodedUrl[0],
             '/' . $explodedUrl[0],
@@ -204,7 +205,7 @@ class Navigation extends Template {
         ];
 
         foreach ( $variations as $url ) {
-            $regex = "#(.*)<li(?: class=\")?(.*?)(?:\")?>\s*?<a href=\"$url\"(.*)#is";
+            $regex = "#(.*)<li(?: class=\")?(.*?)(?:\")?>\s*?<a href=\"$url\"(?: class=\")?(.*?)(?:\")>?#is";
             if ( preg_match( $regex, $view ) ) {
                 $regSelect = $url;
                 break;
@@ -212,15 +213,15 @@ class Navigation extends Template {
         }
         if ( ! empty( $regSelect ) ) {
             $regSelect = preg_quote( $regSelect );
-            $regActive = "$1<li class=\"$2 active\"><a href=\"$regSelect\"$3";
+            $regActive = "$1<li class=\"$2\"><a href=\"$regSelect\" class=\"$3 active\">";
-
             $view = preg_replace( $regex, $regActive, $view );
-            $parentRegex = "#(.*)class=\"collapse(.*?)<li class=\"submenu active\">\s*<a href=\"$regSelect\"(.*)#is";
 
+            $parentRegex = "#(.*)class=\"(.*?)collapse(.*?)<li class=\"nav-item\">\s*<a href=\"$regSelect\" class=\"submenu (.*?)\">#is";
             if ( preg_match( $parentRegex, $view ) ) {
-                $expandRegex = "$1 class=\"expand$2<li class=\"submenu active\"><a href=\"$regSelect\"$3";
+                $expandRegex = "$1 class=\"$2collapse show$3<li class=\"nav-item\"><a href=\"$regSelect\" class=\"submenu active $4\">";
                 $view = preg_replace( $parentRegex, $expandRegex, $view );
             }
+
             if ( !empty( $addToContent ) ) {
                 self::$content .= $view;
                 return true;

composer.json

@@ -24,8 +24,8 @@
     "require":
     {
         "php": ">=8.1.0",
-        "thetempusproject/canary": ">=1.0",
+        "thetempusproject/canary": "1.0.6",
-        "thetempusproject/hermes": ">=1.0"
+        "thetempusproject/hermes": "1.0.3"
     },
     "autoload":
     {

composer.lock

@@ -4,20 +4,19 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a5f3c6aec6567c9b48b59eecc9588183",
+    "content-hash": "22473999e0fcf4a9a664d37a38a750e7",
     "packages": [
         {
             "name": "thetempusproject/canary",
-            "version": "dev-main",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/canary",
-                "reference": "35415fbf3c5888ccdb8a8695989176a120026c7f"
+                "reference": "44b2ad688cff933964ec2ff50b408d94c7f51e40"
             },
             "require": {
                 "php": ">=8.1.0"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "files": [
@@ -48,20 +47,19 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-20T10:26:09+00:00"
+            "time": "2025-01-22T01:39:34+00:00"
         },
         {
             "name": "thetempusproject/hermes",
-            "version": "dev-main",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/hermes",
-                "reference": "31c51c1a5bad2871df800c89f27ace0a49848583"
+                "reference": "4b4e06a98f0f01695bda18de240bb3294d096ef4"
             },
             "require": {
                 "php": ">=8.1.0"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "files": [
@@ -92,7 +90,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-20T10:26:47+00:00"
+            "time": "2025-01-22T01:43:15+00:00"
         }
     ],
     "packages-dev": [],
@@ -105,5 +103,5 @@
         "php": ">=8.1.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }