@eeacms/volto-eea-website-theme 1.8.2 → 1.9.1

package/CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.9.1](https://github.com/eea/volto-eea-website-theme/compare/1.9.0...1.9.1) - 28 February 2023
+
+#### :bug: Bug Fixes
+
+- fix(search): Fix accessibility for search suggestions #112 from eea/search-accessibility [ichim-david - [`d09551e`](https://github.com/eea/volto-eea-website-theme/commit/d09551e14ca630c2f0c93345c94a1c367e9d8bec)]
+- fix(search): Fix accessibility for search suggestions [kreafox - [`037cb79`](https://github.com/eea/volto-eea-website-theme/commit/037cb7941755de82cebc8168fdca4cced80f2806)]
+
+### [1.9.0](https://github.com/eea/volto-eea-website-theme/compare/1.8.2...1.9.0) - 21 February 2023
+
+#### :rocket: New Features
+
+- feat(contact-form): Redirect to config.settings.contactForm - refs #160689 [Alin Voinea - [`8d93c76`](https://github.com/eea/volto-eea-website-theme/commit/8d93c76f022d0036a43ff1564189dc49530ca4e1)]
+
+#### :bug: Bug Fixes
+
+- fix(dropdown): navigation of links when using the keyboard only [David Ichim - [`1d97367`](https://github.com/eea/volto-eea-website-theme/commit/1d973671a2941ebb1463ba65ae6bbee5447edf1a)]
+
+#### :nail_care: Enhancements
+
+- change(language): hide language dropdown by default on eea-website-theme [David Ichim - [`23ba000`](https://github.com/eea/volto-eea-website-theme/commit/23ba000e7c8998c5f1a6f706f706027e95abeb84)]
+
+#### :hammer_and_wrench: Others
+
+- Release 1.9.0 [Alin Voinea - [`895e0ae`](https://github.com/eea/volto-eea-website-theme/commit/895e0ae0f6174976a5ad4965274bfebb2c65433f)]
 ### [1.8.2](https://github.com/eea/volto-eea-website-theme/compare/1.8.1...1.8.2) - 14 February 2023
 
 #### :rocket: New Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "1.8.2",
+  "version": "1.9.1",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderSearchPopUp.js

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { Container, Input, List } from 'semantic-ui-react';
-import { withRouter } from 'react-router-dom';
+import { withRouter, Link } from 'react-router-dom';
 import { useClickOutside } from '@eeacms/volto-eea-design-system/helpers';
 import config from '@plone/volto/registry';
 
@@ -63,8 +63,6 @@ function HeaderSearchPopUp({
   };
 
   const onClickHandler = (suggestion) => {
-    history.push(`${path}?q=${suggestion}`);
-
     if (window?.searchContext?.resetSearch) {
       window.searchContext.resetSearch({ searchTerm: suggestion });
     }
@@ -97,8 +95,13 @@ function HeaderSearchPopUp({
               <List>
                 {visibleSuggestions.map((item, i) => {
                   return (
-                    <List.Item key={i} onClick={() => onClickHandler(item)}>
-                      {item}
+                    <List.Item key={i}>
+                      <Link
+                        to={`${path}?q=${item}`}
+                        onClick={() => onClickHandler(item)}
+                      >
+                        {item}
+                      </Link>
                     </List.Item>
                   );
                 })}

package/src/customizations/volto/components/theme/ContactForm/ContactForm.jsx

@@ -0,0 +1,27 @@
+import React, { Component } from 'react';
+import { UniversalLink } from '@plone/volto/components';
+import { FormattedMessage } from 'react-intl';
+import { Container } from 'semantic-ui-react';
+import config from '@plone/volto/registry';
+
+export class ContactFormComponent extends Component {
+  componentDidMount() {
+    if (config.settings.contactForm) {
+      this.props.history.replace(config.settings.contactForm);
+    }
+  }
+
+  render() {
+    const remoteUrl = config.settings.contactForm;
+    return (
+      <Container id="page-document">
+        <p>
+          <FormattedMessage id="Contact us:" defaultMessage="Contact us:" />{' '}
+          <UniversalLink href={remoteUrl}>{remoteUrl}</UniversalLink>
+        </p>
+      </Container>
+    );
+  }
+}
+
+export default ContactFormComponent;

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -101,10 +101,9 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
             className=""
             viewportWidth={width}
           >
+            {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
             <div
               className="content"
-              role="menu"
-              tabIndex="0"
               onClick={(evt) => evt.stopPropagation()}
               onKeyDown={(evt) => evt.stopPropagation()}
             >
@@ -116,8 +115,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
                 href="https://europa.eu/european-union/contact/institutions-bodies_en"
                 target="_blank"
                 rel="noreferrer"
-                role="option"
-                aria-selected="false"
+                onKeyDown={(evt) => evt.stopPropagation()}
               >
                 See all EU institutions and bodies
               </a>
@@ -140,6 +138,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
                       className="site"
                       target="_blank"
                       rel="noreferrer"
+                      onKeyDown={(evt) => evt.stopPropagation()}
                     >
                       {item.title}
                     </a>
@@ -154,7 +153,10 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
           <Header.TopDropdownMenu
             id="language-switcher"
             className="item"
-            hasLanguageDropdown={config.settings.supportedLanguages.length > 1}
+            hasLanguageDropdown={
+              config.settings.supportedLanguages.length > 1 &&
+              config.settings.hasLanguageDropdown
+            }
             text={`${language.toUpperCase()}`}
             mobileText={`${language.toUpperCase()}`}
             icon={
@@ -210,7 +212,14 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
 
             {!!subsite && subsite.title && (
               <UniversalLink item={subsite} className="subsite-logo">
-                {subsite.title}
+                {subsite.subsite_logo ? (
+                  <Image
+                    src={subsite.subsite_logo.scales.mini.download}
+                    alt={subsite.title}
+                  />
+                ) : (
+                  subsite.title
+                )}
               </UniversalLink>
             )}
           </div>

package/src/index.js

@@ -20,6 +20,9 @@ const applyConfig = (config) => {
     ...(config.settings.eea || {}),
   };
 
+  // #160689 Redirect contact-form to contact-us
+  config.settings.contactForm = '/contact';
+
   // Insert scripts on Error pages
   if (config.settings?.serverConfig?.extractScripts) {
     config.settings.serverConfig.extractScripts.errorPages = true;
@@ -115,6 +118,9 @@ const applyConfig = (config) => {
   // Custom block-style colors
   config.settings.available_colors = eea.colors;
 
+  // hide language dropdown by default
+  config.settings.hasLanguageDropdown = false;
+
   // Site theme colors
   config.settings.themeColors = [
     { value: undefined, title: 'No theme' },