@eeacms/volto-marine-policy 1.1.4 → 1.1.5

package/CHANGELOG.md

@@ -4,11 +4,14 @@ 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.1.4](https://github.com/eea/volto-marine-policy/compare/1.1.3...1.1.4) - 29 April 2024
+### [1.1.5](https://github.com/eea/volto-marine-policy/compare/1.1.4...1.1.5) - 6 May 2024
 
-#### :rocket: New Features
+#### :bug: Bug Fixes
 
-- feat: add styleMenu styles [nileshgulia1 - [`582bc26`](https://github.com/eea/volto-marine-policy/commit/582bc26a9363181699e178e9adb6ae8449ceaab3)]
+- fix: eslint . [nileshgulia1 - [`6280d19`](https://github.com/eea/volto-marine-policy/commit/6280d191037782ce11c491b681b9e20878da15f2)]
+- fix(navigation): do not expand accordion without children [nileshgulia1 - [`057e1ca`](https://github.com/eea/volto-marine-policy/commit/057e1ca6966b023cb9354ba437c9879c8f1e14d4)]
+
+### [1.1.4](https://github.com/eea/volto-marine-policy/compare/1.1.3...1.1.4) - 29 April 2024
 
 ### [1.1.3](https://github.com/eea/volto-marine-policy/compare/1.1.2...1.1.3) - 25 April 2024
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-marine-policy",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "@eeacms/volto-marine-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/Blocks/ContextNavigation/Accordion.jsx

@@ -1,12 +1,12 @@
 import React from 'react';
 import { Accordion as SemanticAccordion, Icon } from 'semantic-ui-react';
-
 import AccordionContent from './AccordionContent';
 import { useHistory } from 'react-router-dom';
 
 const Accordion = (props) => {
   const { items = {}, curent_location, activeMenu, data = {} } = props;
   const [currentIndex, setIndex] = React.useState(activeMenu ?? 0);
+  const [showChildren, setShowChildren] = React.useState(false);
   const history = useHistory();
 
   const handleClick = (e, item) => {
@@ -19,6 +19,7 @@ const Accordion = (props) => {
     const newIndex = currentIndex === index ? -1 : index;
     setIndex(newIndex);
   };
+
   return (
     <>
       <div className="context-navigation-header">{data?.title}</div>
@@ -45,7 +46,7 @@ const Accordion = (props) => {
               }}
             >
               <span className="item-title">{item.title}</span>
-              {active ? (
+              {active && showChildren ? (
                 <Icon
                   className="ri-arrow-up-s-line"
                   onClick={(e) => {
@@ -61,7 +62,7 @@ const Accordion = (props) => {
                 />
               )}
             </SemanticAccordion.Title>
-            <SemanticAccordion.Content active={active}>
+            <SemanticAccordion.Content active={active && showChildren}>
               <AccordionContent
                 curent_location={curent_location}
                 key={index}
@@ -71,6 +72,7 @@ const Accordion = (props) => {
                   url: item.url,
                 }}
                 data={data}
+                setShowChildren={setShowChildren}
               />
             </SemanticAccordion.Content>
           </SemanticAccordion>

package/src/components/Blocks/ContextNavigation/AccordionContent.jsx

@@ -10,6 +10,7 @@ const AccordionContent = (props) => {
     main,
     curent_location,
     data: { types = [] },
+    setShowChildren,
   } = props;
   const location = main.url;
 
@@ -22,6 +23,14 @@ const AccordionContent = (props) => {
   //   (state) => state.content?.subrequests?.[location]?.data?.items || [],
   // );
   const items = useChildren(location);
+
+  React.useEffect(() => {
+    const filteredItems = items.filter((item) =>
+      types.length ? types.includes(item['@type']) : item,
+    );
+    if (filteredItems.length) setShowChildren(true);
+  }, [items, setShowChildren, types]);
+
   return (
     <div className="dataset-content">
       <div>