@openeuropa/bcl-theme-joinup 1.10.4 → 1.10.6

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openeuropa/bcl-theme-joinup",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "description": "OE - BCL theme joinup",
   "scripts": {
     "align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
@@ -28,10 +28,10 @@
     "@ecl/resources-eu-logo": "3.7.1",
     "@ecl/resources-flag-icons": "3.7.1",
     "@fontsource/roboto": "5.1.1",
-    "@openeuropa/bcl-bootstrap": "^1.10.4",
-    "@openeuropa/bcl-builder": "^1.10.4",
-    "@openeuropa/bcl-theme-default": "^1.10.4",
-    "@openeuropa/bcl-twig-templates": "^1.10.4",
+    "@openeuropa/bcl-bootstrap": "^1.10.6",
+    "@openeuropa/bcl-builder": "^1.10.6",
+    "@openeuropa/bcl-theme-default": "^1.10.6",
+    "@openeuropa/bcl-twig-templates": "^1.10.6",
     "@rollup/plugin-replace": "6.0.2",
     "copyfiles": "2.4.1",
     "cross-env": "7.0.3",
@@ -57,5 +57,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "52247384e1ce1f63ac2fba5ac0965af9924130fa"
+  "gitHead": "f2c1911b328b12531079c209ecada73a505713c2"
 }

package/src/js/index.esm.js

@@ -14,6 +14,8 @@ import Gallery from "@openeuropa/bcl-theme-default/src/js/gallery/gallery";
 import Modal from "@openeuropa/bcl-bootstrap/js/src/modal";
 import AccessibleToggle from "@openeuropa/bcl-theme-default/src/js/accessible-toggle/accessible-toggle";
 import AccordionToggle from "@openeuropa/bcl-theme-default/src/js/accordion-toggle/accordion-toggle";
+import MainNavigation from "@openeuropa/bcl-theme-default/src/js/main-navigation/main-navigation";
+import MegaMenu from "@openeuropa/bcl-theme-default/src/js/mega-menu/mega-menu";
 import Offcanvas from "@openeuropa/bcl-bootstrap/js/src/offcanvas";
 import Popover from "@openeuropa/bcl-bootstrap/js/src/popover";
 import ScrollSpyV2 from "@openeuropa/bcl-bootstrap/js/src/scrollspy";
@@ -30,6 +32,8 @@ export {
   Dropdown,
   Gallery,
   Modal,
+  MainNavigation,
+  MegaMenu,
   AccessibleToggle,
   AccordionToggle,
   Offcanvas,

package/src/js/index.umd.js

@@ -14,6 +14,8 @@ import Gallery from "@openeuropa/bcl-theme-default/src/js/gallery/gallery";
 import Modal from "@openeuropa/bcl-bootstrap/js/src/modal";
 import AccessibleToggle from "@openeuropa/bcl-theme-default/src/js/accessible-toggle/accessible-toggle";
 import AccordionToggle from "@openeuropa/bcl-theme-default/src/js/accordion-toggle/accordion-toggle";
+import MainNavigation from "@openeuropa/bcl-theme-default/src/js/main-navigation/main-navigation";
+import MegaMenu from "@openeuropa/bcl-theme-default/src/js/mega-menu/mega-menu";
 import Offcanvas from "@openeuropa/bcl-bootstrap/js/src/offcanvas";
 import Popover from "@openeuropa/bcl-bootstrap/js/src/popover";
 import ScrollSpyV2 from "@openeuropa/bcl-bootstrap/js/src/scrollspy";
@@ -30,6 +32,8 @@ export default {
   Dropdown,
   Gallery,
   Modal,
+  MainNavigation,
+  MegaMenu,
   AccessibleToggle,
   AccordionToggle,
   Offcanvas,

package/src/scss/oe-bcl-joinup.scss

@@ -82,6 +82,7 @@
 @import "@openeuropa/bcl-theme-default/src/scss/badge";
 @import "@openeuropa/bcl-theme-default/src/scss/multiselect";
 @import "@openeuropa/bcl-theme-default/src/scss/multiselect-2";
+@import "@openeuropa/bcl-theme-default/src/scss/mega-menu";
 @import "@openeuropa/bcl-theme-default/src/scss/breadcrumb";
 @import "@openeuropa/bcl-theme-default/src/scss/banners";
 @import "@openeuropa/bcl-theme-default/src/scss/timeline";

package/templates/bcl-button/button.html.twig

@@ -1,6 +1,6 @@
 {% apply spaceless %}
 
-{# 
+{#
   Parameters:
   - label (string) (default: '')
   - variant (string) (default: 'primary')
@@ -38,6 +38,7 @@
 {% set _spinner = spinner|default({}) %}
 {% set _show_spinner = show_spinner ?? false %}
 {% set _clean_class = clean_class ?? false %}
+{% set _remove_icon_spacers = remove_icon_spacers ?? false %}
 
 {% set _classes = [] %}
 {% if _clean_class == false %}
@@ -68,7 +69,7 @@
         size: "fluid",
       })
     %}
-  {% if _label is not empty %}
+  {% if _label is not empty and not _remove_icon_spacers %}
     {% if _icon.attributes is empty %}
       {% set _icon = _icon|merge({
           attributes: create_attribute()

package/templates/bcl-header/header.html.twig

@@ -25,6 +25,7 @@
 {% set _project_logo = project_logo|default({}) %}
 {% set _site_name = site_name|default('') %}
 {% set _project_link = project_link|default('') %}
+{% set _navbar_id = navbar_id|default('header-navbar-' ~ random(100)) %}
 {% set _head = head|default({}) %}
 {% set _breadcrumbs = breadcrumbs|default({}) %}
 {% set _language_modal = language_modal|default({}) %}
@@ -51,10 +52,38 @@
 <header
   {{ attributes }}
 >
-  <!-- navbar_settings -->
-  {% if _head is not empty %}
-    {% include '@oe-bcl/bcl-navbar/navbar.html.twig' with _head only %}
-  {% endif %}
+  <nav
+    {{ _head.attributes.addClass(['navbar', 'navbar-expand-lg', 'navbar-light']) }}>
+    <div class='container'>
+    {% if _head.brand is not empty %}
+      <a class='navbar-brand' href='{{ _head.brand.link }}'>
+      {% for logo in _head.brand.logos %}
+        <img
+          src='{{ logo.src }}'
+          {% if logo.alt is not empty %}
+          alt='{{ logo.alt }}'
+          {% endif %}
+          {% if logo.class is not empty %}
+          class='{{ logo.class }}'
+          {% endif %}
+        />
+      {% endfor %}
+      </a>
+    {% endif %}
+      <button
+        class="navbar-toggler bcl-navbar-toggler"
+        type="button"
+        data-bs-toggle="collapse"
+        data-bs-target='#{{ _navbar_id }}'
+        aria-controls='{{ _navbar_id }}'
+        aria-expanded="false"
+        aria-label="Toggle navigation"
+      >
+        <span class="navbar-toggler-icon"></span>
+      </button>
+    </div>
+  </nav>
+
 
   <!-- project name -->
   {% if _project_logo is not empty or _site_name is not empty %}
@@ -62,7 +91,6 @@
     <div class="container">
     {% if _project_link is not empty %}
       <a
-        class="d-inline-block"
         href="{{ _project_link }}"
       >
     {% endif %}
@@ -93,7 +121,10 @@
 
   <!-- navbar -->
   {% if _navbar is not empty %}
-    {% include '@oe-bcl/bcl-navbar/navbar.html.twig' with _navbar only %}
+    {% include '@oe-bcl/bcl-navbar/navbar.html.twig' with _navbar|merge({
+      disable_collapse: true,
+      attributes: create_attribute().addClass('bcl-header__navbar collapse navbar-collapse').setAttribute('id', _navbar_id).setAttribute('aria-label', 'Main Navigation'),
+    }) only %}
   {% endif %}
 
   <!-- breadcrumbs -->

package/templates/bcl-mega-menu/mega-menu-items.html.twig

@@ -0,0 +1,35 @@
+{% apply spaceless %}
+
+{% set _label = label ?? null %}
+{% set _items = items ?? [] %}
+{% set _icon_path = icon_path ?? '' %}
+{% set _level = level ?? 1 %}
+{% set _see_all = see_all ?? null %}
+
+<ul class="bcl-mega-menu__items __level-{{ _level }}">
+  {% for _item in _items %}
+    {% set _li_attributes = _item.li_attributes ?? create_attribute() %}
+    {% if _item.items is defined and _item.items is not empty %}
+      {# This is a parent item. #}
+      <li{{ _li_attributes.addClass('__parent') }}>
+        {% include '@oe-bcl/bcl-mega-menu/mega-menu-submenu.html.twig' with _item|merge({
+          icon_path: _icon_path,
+          level: _level + 1,
+        }) only %}
+      </li>
+    {% else %}
+      {# This is a leaf item. #}
+      <li{{ _li_attributes.addClass('__leaf') }}>
+        {% if _item.path is empty %}
+          {# This is a nolink item. #}
+          <span{{ _item.attributes ?? '' }}>{{ _item.label }}</span>
+        {% else %}
+          {# This is a link. #}
+          {% include '@oe-bcl/bcl-link/link.html.twig' with _item only %}
+        {% endif %}
+      </li>
+    {% endif %}
+  {% endfor %}
+</ul>
+
+{% endapply %}

package/templates/bcl-mega-menu/mega-menu-submenu.html.twig

@@ -0,0 +1,65 @@
+{% apply spaceless %}
+
+{% set _items = items ?? [] %}
+{% set _trigger = trigger ?? null %}
+{% set _icon_path = icon_path ?? '' %}
+{% set _level = level ?? 2 %}
+{% set _see_all = see_all ?? null %}
+
+{% set _trigger_id = _trigger.id|default('mm-trigger-' ~ random(10000)) %}
+{% set _panel_id = 'mm-panel-' ~ _trigger_id %}
+
+{% set _trigger_attributes = _trigger.attributes ?? create_attribute() %}
+{% set _trigger = _trigger|merge({
+  attributes: _trigger_attributes
+    .setAttribute('id', _trigger_id)
+    .setAttribute('aria-controls', _panel_id)
+    .setAttribute('aria-expanded', 'false')
+    .setAttribute('aria-haspopup', 'menu'),
+  remove_icon_spacers: true,
+  clean_class: true,
+}) %}
+{% include '@oe-bcl/bcl-button/button.html.twig' with _trigger only %}
+
+{# Add an optional "See all" link as last item. #}
+{% if _see_all is not empty %}
+  {# Wrap the label for an ellipsis. #}
+  {% set _see_all_label %}
+    <span>{{- _see_all.label -}}</span>
+  {% endset %}
+  {% set _see_all_attr = (_see_all.attributes is defined ? _see_all.attributes : create_attribute()) %}
+  {% set _see_all = _see_all|merge({
+    label: _see_all_label,
+    icon: {
+      name: 'arrow-right',
+      path: _icon_path,
+    },
+    li_attributes: create_attribute()
+      .addClass('__see_all'),
+    attributes: _see_all_attr
+      .addClass(['see-all-button'])
+      .setAttribute('aria-label', 'See all items in ‘' ~ _trigger.label ~ '’')
+  }) %}
+  {% set _items = _items|merge([_see_all]) %}
+{% endif %}
+{% set submenu_attributes = create_attribute()
+  .setAttribute('id', _panel_id)
+  .setAttribute('hidden', '')
+  .setAttribute('role', 'group')
+  .setAttribute('aria-labelledby', _trigger_id)
+  .addClass('bcl-mega-menu__submenu', '__level-' ~ _level)
+%}
+<div{{ submenu_attributes }}>
+  {% if _trigger %}
+  <div class="__header">
+      <p class="__label">{{ _trigger.label }}</p>
+  </div>
+  {% endif %}
+  {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with {
+    items: _items,
+    icon_path: _icon_path,
+    level: _level,
+  } only %}
+</div>
+
+{% endapply %}

package/templates/bcl-mega-menu/mega-menu.html.twig

@@ -0,0 +1,115 @@
+{% apply spaceless %}
+
+{# Parameters:
+  - id (string) (default: dropdown-random(1000))
+  - link (boolean) (default: false) - sets trigger to link, default is button
+  - trigger (link or button)
+  - content_block (block) (default: '')
+  - content_link (link)
+  - icon_path (string) (default: '')
+  - min_height (string) (default: '300px')
+    ! set min-height of mega-menu
+  - items (object[])
+    format: [
+      {
+        - link or dropdown
+      }
+    ]
+  - back_button_label (string) (default: 'Back')
+  - icon_path (string) (default: '')
+#}
+
+{% set _id = id|default('dropdown-' ~ random(1000)) %}
+{% set _link = link ?? false %}
+{% set _trigger = trigger|default({}) %}
+{% set _content_block = content_block|default('') %}
+{% set _content_link = content_link|default({}) %}
+{% set _icon_path = icon_path|default('') %}
+{% set _items = items|default([]) %}
+{% set _back_button_label = back_button_label|default('Back') %}
+{% set _icon_path = icon_path|default('') %}
+{% set _menu_id = 'mega-menu-' ~ _id %}
+
+{% if attributes is empty %}
+  {% set attributes = create_attribute() %}
+{% endif %}
+
+{% set _classes = ['bcl-mega-menu'] %}
+
+{% set attributes = attributes.addClass(_classes) %}
+
+{% if _trigger.attributes is empty %}
+  {% set _trigger = _trigger|merge({
+    attributes: create_attribute()
+  }) %}
+{% endif %}
+{% set _trigger = _trigger|merge({
+  attributes: _trigger.attributes.addClass(['dropdown-toggle', 'nav-link'])
+                      .setAttribute('aria-expanded', 'false')
+                      .setAttribute('aria-haspopup', 'menu')
+                      .setAttribute('aria-controls', _menu_id)
+                      .setAttribute('data-bs-toggle', 'dropdown')
+                      .setAttribute('data-bs-auto-close', 'outside')
+                      .setAttribute('id', _id)
+}) %}
+
+<div {{ attributes }}>
+  {% include '@oe-bcl/bcl-button/button.html.twig' with _trigger|merge({
+    variant: 'link',
+    clean_class: true,
+  }) only %}
+  {# Mega menu panel. #}
+  <nav id="{{ _menu_id }}" class="bcl-mega-menu__container dropdown-menu" aria-labelledby="{{ _id }}" aria-label="Main mega menu">
+    <div class="container">
+      {# Mobile back button. #}
+      <div class="container d-lg-none bcl-mega-menu__back-button-block">
+        {% include '@oe-bcl/bcl-button/button.html.twig' with {
+          label: _back_button_label,
+          icon_position: "before",
+          variant: 'link',
+          icon: {
+            path: _icon_path,
+            name: "arrow-left",
+          },
+          attributes: create_attribute().addClass(['back-button']).setAttribute('aria-label', 'Back to main menu')
+        } only %}
+      </div>
+      {# Info/summary and submenu columns. #}
+      <div class="position-relative">
+        <div class="row">
+          {# Content / summary column. #}
+          {% if content_block is defined %}
+            <div class="col-md-12 col-xl-3 position-relative bcl-mega-menu__info">
+              <div class="content-block">
+                {%- block content_block -%}
+                  {{ _content_block }}
+                {%- endblock -%}
+                {% if _content_link.path is not empty %}
+                  {% set _content_link = _content_link|merge({
+                    icon: _content_link.icon|default({})|merge({
+                      path: _icon_path
+                    }),
+                    attributes: (_content_link.attributes is defined
+                      ? _content_link.attributes
+                      : create_attribute()
+                    ).addClass('content-link')
+                  }) %}
+                  <p class="m-0">{% include '@oe-bcl/bcl-link/link.html.twig' with _content_link only %}</p>
+                {% endif %}
+              </div>
+              <div class="shadow-container">
+                <span class="shadow-bg"></span>
+              </div>
+            </div>
+          {% endif %}
+          {# Submenu column. #}
+          <div class="col-md-12 col-lg-4 col-xl-3 bcl-mega-menu__menu">
+            {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' %}
+          </div>
+        </div>
+      </div>
+    </div>
+  </nav>
+</div>
+
+{% endapply %}

package/templates/bcl-navigation/navigation.html.twig

@@ -91,7 +91,7 @@
           {% set _nav_class = _nav_class ~ ' dropdown' %}
           {% set _item = _item|merge({remove_wrapper: true}) %}
         {% endif %}
-        {% if _item.dropdown %}
+        {% if _item.dropdown or _item.mega_menu %}
           {% set _item_classes = [] %}
         {% else %}
           {% set _item_classes = ['nav-link'] %}
@@ -124,6 +124,8 @@
           {% include '@oe-bcl/bcl-dropdown/dropdown.html.twig' with _item only %}
         {% elseif _item.button is defined %}
           {% include '@oe-bcl/bcl-button/button.html.twig' with _item only %}
+        {% elseif _item.mega_menu is defined %}
+          {% include '@oe-bcl/bcl-mega-menu/mega-menu.html.twig' with _item only %}
         {% else %}
           {% include '@oe-bcl/bcl-link/link.html.twig' with _item only %}
         {% endif %}

package/templates/bcl-offcanvas/offcanvas.html.twig

@@ -25,7 +25,7 @@
 {% set _title_link = title_link|default({}) %}
 {% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _placement = placement|default('') %}
-{% set _id = id|default('') %}
+{% set _id = id|default('bcl-offcanvas-' ~ random(10000)) %}
 {% set _body = body|default('') %}
 {% set _with_body_scroll = with_body_scroll ?? false %}
 {% set _with_backdrop = with_backdrop ?? true %}
@@ -57,14 +57,12 @@
   {% set attributes = create_attribute() %}
 {% endif %}
 
+{% set attributes = attributes.setAttribute('id', _id) %}
+
 {% if _aria_labelled is defined and _aria_labelled is not empty %}
   {% set attributes = attributes.setAttribute('aria-labelledby', _aria_labelled) %}
 {% endif %}
 
-{% if _id is not empty %}
- {% set attributes = attributes.setAttribute('id', _id) %}
-{% endif %}
-
 {% if _with_body_scroll %}
  {% set attributes = attributes.setAttribute('data-bs-scroll', 'true') %}
 {% endif %}
@@ -73,6 +71,10 @@
  {% set attributes = attributes.setAttribute('data-bs-backdrop', 'false') %}
 {% endif %}
 
+{% if _title is not empty %}
+ {% set attributes = attributes.setAttribute('aria-labelledby', _id ~ '-title') %}
+{% endif %}
+
 {% set attributes = attributes.setAttribute('tabindex', '-1').addClass(_classes) %}
 
 <div
@@ -85,7 +87,7 @@
       title: _title,
       title_tag: _title_tag,
       title_link: _title_link,
-      attributes: _title_attributes.addClass(['offcanvas-title']),
+      attributes: _title_attributes.setAttribute('id', _id ~ '-title').addClass(['offcanvas-title']),
     } only %}
   {% endif %}
   {% if _with_close %}
@@ -94,6 +96,7 @@
                               .setAttribute('data-bs-dismiss', 'offcanvas')
                               .setAttribute('data-bs-target', '#' ~ _id)
                               .setAttribute('aria-label', _close_aria_label)
+                              .setAttribute('aria-controls', _id)
     %}
     {% if _extra_classes_close is not empty %}
       {% set button_attributes = button_attributes.addClass(_extra_classes_close) %}