Merge pull request #17 from loic425/fix/active-menu

Fix active menu detection
mobizel · Sep 29, 2020 · 3c0c7e6 · 3c0c7e6
2 parents fc246e7 + 42f4432
commit 3c0c7e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Resources/views/layout/menu.html.twig b/src/Resources/views/layout/menu.html.twig
@@ -2,6 +2,6 @@
 
 <ul class="nav flex-column">
     {% for item in menu_items %}
-        {{ menu.nav_item(page_title(item.slug), item.path, current_item) }}
+        {{ menu.nav_item(item.slug, item.path, current_item) }}
     {% endfor %}
 </ul>
diff --git a/src/Resources/views/layout/sidebar_menu.html.twig b/src/Resources/views/layout/sidebar_menu.html.twig
@@ -1,5 +1,5 @@
 {% import '@MobizelMarkdownDocs/macro/menu.html.twig' as menu %}
 
 <ul class="nav flex-column">
-    {{ render(path('mobizel_markdown_docs_menu', {'current_item': app.request.requestUri})) }}
+    {{ render(path('mobizel_markdown_docs_menu', {'current_item': app.request.get('slug')})) }}
 </ul>
diff --git a/src/Resources/views/macro/menu.html.twig b/src/Resources/views/macro/menu.html.twig
@@ -1,8 +1,9 @@
-{% macro nav_item(title, path, current_item) %}
-    {% set current = (path in current_item) %}
+{% macro nav_item(slug, path, current_item) %}
+    {% set root = current_item|split('/')|first %}
+    {% set current = (slug == root) %}
     <li class="nav-item">
         <a class="nav-link {% if current %}active{% endif %}" href="{{ path }}">
-            {{ title }} {% if current %}<span class="sr-only">(current)</span>{% endif %}
+            {{ page_title(slug) }} {% if current %}<span class="sr-only">(current)</span>{% endif %}
         </a>
     </li>
 {% endmacro %}