Merge pull request #74 from localgovdrupal/2.x

Pull request ahead of realease 2.0.6

Author: finnlewis

composer.json

@@ -8,7 +8,7 @@
   "require": {
     "drupal/entity_hierarchy": "^2.24",
     "drupal/layout_paragraphs": "^1.0.0",
-    "drupal/tablefield": "dev-2.x",
+    "drupal/tablefield": "^2.2",
     "drupal/viewsreference": "^2.0",
     "localgovdrupal/localgov_core": "^2.1",
     "localgovdrupal/localgov_paragraphs": "^2.0"

localgov_subsites.module

@@ -29,12 +29,6 @@ function localgov_subsites_theme($existing, $type, $theme, $path) {
         'image' => '',
       ],
     ],
-    'subsite_overview_banner' => [
-      'variables' => [
-        'heading' => '',
-        'image' => '',
-      ],
-    ],
     'node__localgov_subsites_page__full' => [
       'template' => 'node--localgov-subsites-page--full',
       'base hook' => 'node',

src/Plugin/Block/SubsitesOverviewBlock.php

@@ -46,7 +46,11 @@
         ]
       %}
       <li{{ item.attributes.addClass(classes) }}>
-        {{ link(item.title, item.url) }}
+        {% if item.in_active_trail %}
+          {{ item.title }}
+        {% else %}
+          {{ link(item.title, item.url) }}
+        {% endif %}
         {% if item.below %}
           {{ subsite_navigation.menu_links(item.below, attributes, menu_level + 1) }}
         {% endif %}