Merge branch 'develop' into feature/convert-site-install-to-recipes

Author: richardgaunt

package-lock.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@civictheme/sdc": "1.12.2"
+    "@civictheme/uikit": "github:civictheme/uikit#45c0254e305121f349fd849f5aa758d7ce4c1a28"
   },
   "scripts": {
     "uikit-change": "node scripts/civictheme-uikit-version-manager/index.mjs"

package.json

@@ -20,6 +20,16 @@ function civictheme_preprocess_table(array &$variables): void {
     }
 
     $variables['header'] = $rows;
+
+    // Create sanitised header array with HTML stripped.
+    $header_sanitized = [];
+    foreach ($variables['header'] as $header_item) {
+      $rendered = (string) \Drupal::service('renderer')->render($header_item);
+      // Set to empty string if visually-hidden class is present.
+      $has_visually_hidden = preg_match('/class=["\'][^"\']*\b(?:visually-hidden|ct-visually-hidden)\b[^"\']*["\']/', $rendered);
+      $header_sanitized[] = $has_visually_hidden ? '' : strip_tags($rendered);
+    }
+    $variables['header_sanitized'] = $header_sanitized;
   }
 
   // Rows, Footer.

web/themes/contrib/civictheme/includes/table.inc

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@civictheme/sdc": "1.12.2"
+    "@civictheme/uikit": "github:civictheme/uikit#45c0254e305121f349fd849f5aa758d7ce4c1a28"
   },
   "devDependencies": {
     "@civictheme/scss-variables-extractor": "^0.2.1",