menu navigation bug fix

Signed-off-by: MarioRadu <magda_marior@yahoo.com>

Author: MarioRadu

config/autoload/navigation.global.php

@@ -15,7 +15,7 @@
                             'options' => [
                                 'label' => 'Dashboard',
                                 'route' => [
-                                    'route_name' => 'app::index-redirect',
+                                    'route_name' => 'dashboard::dashboard-view',
                                 ],
                                 'icon'  => 'c-blue-500 ti-home',
                             ],

src/App/src/Twig/Extension/RouteExtension.php

@@ -6,6 +6,8 @@
 
 use Dot\DependencyInjection\Attribute\Inject;
 use Mezzio\Helper\UrlHelper;
+use Mezzio\Router\RouteResult;
+use Psr\Http\Message\UriInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -25,22 +27,21 @@ public function getFunctions(): array
         ];
     }
 
-    public function getCurrentRoute(): ?string
+    public function getCurrentRoute(): ?RouteResult
     {
-        return $this->urlHelper->getRequest()?->getUri()?->getPath();
+        return $this->urlHelper->getRouteResult();
     }
 
-    public function isRoute(?string $route): bool
+    public function isRoute(?string $routeName): bool
     {
-        if (null === $route) {
+        if (null === $routeName) {
             return false;
         }
 
-        $currentRoute = $this->getCurrentRoute();
-        if (null === $currentRoute) {
+        if (null === $this->getCurrentRoute()) {
             return false;
         }
 
-        return $currentRoute === $route;
+        return $this->getCurrentRoute()->getMatchedRouteName() === $routeName;
     }
 }

src/App/templates/partial/menu.html.twig

@@ -5,7 +5,7 @@
     {% for page in container %}
         {% if navigation.isAllowed(page) %}
             {% if page.hasChildren() %}
-                <li class="nav-item dropdown nav-group {% if loop.first %} mT-30 {% endif %} {% if isRoute(page.getOption('uri')) %} open {% endif %}">
+                <li class="nav-item dropdown nav-group {% if loop.first %} mT-30 {% endif %} {% if isRoute(page.getOption('route')['route_name'] ?? '') %} open current-route {% endif %}">
                     <a class="dropdown-toggle cur-p" {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %}>
                         <span class="icon-holder">
                             <i class="{{ page.getOption('icon') }}"></i>
@@ -23,13 +23,13 @@
             {% else %}
                 {% if page.hasParent() %}
                     <li class="nav-item dropdown">
-                        <a href="{{ navigation.getHref(page) }}" class="{% if isRoute(page.getOption('uri')) %} text-primary fw-medium current-route {% endif %} {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %}">
+                        <a href="{{ navigation.getHref(page) }}" class="{% if isRoute(page.getOption('route')['route_name'] ?? '') %} text-primary fw-medium current-route {% endif %} {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %}">
                             <span>{{ page.getOption('label') }}</span>
                         </a>
                     </li>
                 {% else %}
                     <li class="nav-item {% if loop.first %} mT-30 {% endif %}">
-                        <a class="sidebar-link {% if isRoute(page.getOption('uri')) %} text-primary fw-medium current-route {% endif %}" href="{{ navigation.getHref(page) }}" {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %}>
+                        <a class="sidebar-link {% if isRoute(page.getOption('route')['route_name'] ?? '') %} text-primary fw-medium current-route {% endif %}" href="{{ navigation.getHref(page) }}" {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %}>
                             <span class="icon-holder">
                                 <i class="{{ page.getOption('icon') }}"></i>
                             </span>