@eeacms/volto-eea-website-theme 1.6.2 → 1.6.4

package/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.6.4](https://github.com/eea/volto-eea-website-theme/compare/1.6.3...1.6.4) - 31 January 2023
+
+#### :bug: Bug Fixes
+
+- fix(diff): Fix history diff - refs #159677 [Alin Voinea - [`0188cf4`](https://github.com/eea/volto-eea-website-theme/commit/0188cf4e40ee314920f9ba33423d409a39f21cae)]
+
+### [1.6.3](https://github.com/eea/volto-eea-website-theme/compare/1.6.2...1.6.3) - 30 January 2023
+
+#### :nail_care: Enhancements
+
+- change(menu): use nav title if found for menu items #90 from eea/develop [ichim-david - [`f5ff1a1`](https://github.com/eea/volto-eea-website-theme/commit/f5ff1a1b017a515f997455ef564e4562e73e587a)]
+- change(menu): use nav title if found for menu items otherwise fallback to normal item title [David Ichim - [`77fd15a`](https://github.com/eea/volto-eea-website-theme/commit/77fd15aadec86831f6192ae86b4291fd903e1b1a)]
+
 ### [1.6.2](https://github.com/eea/volto-eea-website-theme/compare/1.6.1...1.6.2) - 27 January 2023
 
 #### :bug: Bug Fixes
@@ -14,6 +27,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :nail_care: Enhancements
 
+- change(header): page header import from eea-design-system #89 from eea/develop [ichim-david - [`d168209`](https://github.com/eea/volto-eea-website-theme/commit/d16820910eb9f8cdb32784eb1206bb2cddbb3992)]
 - refactor(banner): sync storybook and Volto component #76 from eea/sync-page-banner-theme [ichim-david - [`fad29fb`](https://github.com/eea/volto-eea-website-theme/commit/fad29fb4581c640a27e14743803eadb63ff67334)]
 - change(banner): removed container wrapper since it was moved inside banner component [David Ichim - [`5cf9c3b`](https://github.com/eea/volto-eea-website-theme/commit/5cf9c3bc9f443ee45f234744a1a4c589420e3815)]
 - refactor(banner): sync storybook and Volto component [nileshgulia1 - [`d2d6a61`](https://github.com/eea/volto-eea-website-theme/commit/d2d6a617f5d270768448bc3f0637c5aea60d70f2)]

package/package.json

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

package/src/components/manage/Blocks/Title/View.jsx

@@ -9,19 +9,27 @@ import PropTypes from 'prop-types';
 
 import BannerView from '@eeacms/volto-eea-website-theme/components/theme/Banner/View';
 
+function IsomorphicPortal({ children }) {
+  const [isClient, setIsClient] = React.useState();
+  React.useEffect(() => setIsClient(true), []);
+
+  return isClient ? (
+    <Portal node={document.getElementById('page-header')}>{children}</Portal>
+  ) : (
+    children
+  );
+}
+
 /**
  * View title block class.
  * @class View
  * @extends Component
  */
-const View = (props) => {
-  if (__SERVER__) return <BannerView {...props} />;
-  return (
-    <Portal node={document.getElementById('page-header')}>
-      <BannerView {...props} />
-    </Portal>
-  );
-};
+const View = (props) => (
+  <IsomorphicPortal>
+    <BannerView {...props} />
+  </IsomorphicPortal>
+);
 
 /**
  * Property types.

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

@@ -231,14 +231,14 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
         renderMenuItem={(item, options, props) => (
           <UniversalLink
             href={item.url || '/'}
-            title={item.title}
+            title={item.nav_title || item.title}
             {...(options || {})}
             className={cx(options?.className, {
               active: item.url === router_pathname,
             })}
           >
             {props?.iconPosition !== 'right' && props?.children}
-            <span>{item.title}</span>
+            <span>{item.nav_title || item.title}</span>
             {props?.iconPosition === 'right' && props?.children}
           </UniversalLink>
         )}