Merge branch 'main' into bug_47482_ricerca_in_testata

RedTurtle · Nov 14, 2023 · 5235b2c · 5235b2c
2 parents ad09ea1 + 0df93a5
commit 5235b2c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 22 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -50,6 +50,8 @@
 ### Fix
 
 - Quando viene effettuata una ricerca dalla barra di ricerca nelle sezioni Amministrazione, Servizi, Novità, o Documenti e Dati, viene automaticamente impostato il filtro sulla sezione stessa così da mostrare solo i contenuti corrispondenti.
+- Le icone del Blocco Numeri, del Blocco Icone e della Sidebar si aggiornano istantaneamente quando vengono cambiate
+- Sistemato un bug nell'header dei sottositi che mostrava le voci del menu del sito padre anche se queste erano indicate come non visibili nella configurazione del menu.
 
 ## Versione 10.3.0 (08/11/2023)
 

diff --git a/src/components/ItaliaTheme/Blocks/NumbersBlock/Edit.jsx b/src/components/ItaliaTheme/Blocks/NumbersBlock/Edit.jsx
@@ -49,6 +49,7 @@ class Edit extends SubblocksEdit {
     super(props);
     this.state.selectedField = 'title';
   }
+
   /**
    * Render method.
    * @method render

diff --git a/src/components/ItaliaTheme/Header/ParentSiteMenu.jsx b/src/components/ItaliaTheme/Header/ParentSiteMenu.jsx
@@ -27,7 +27,8 @@ const ParentSiteMenu = () => {
       // eslint-disable-next-line no-loop-func
       dropdownMenu.forEach((m) => {
         if (m.rootPath === s) {
-          menu = m;
+          // Filter non visible dropdown menu entries
+          menu = { ...m, items: m.items.filter((mi) => mi.visible) };
           i = 0;
         }
       });

diff --git a/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx b/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx
@@ -7,7 +7,11 @@ import { fontAwesomeAliases } from 'design-comuni-plone-theme/helpers/index';
 
 const FontAwesomeIcon = (props) => {
   const { className, icon, prefix, title } = props;
-  const [loadedIcon, setLoadedIcon] = React.useState(null);
+  const [loadedIcon, setLoadedIcon] = React.useState({
+    module: null,
+    iconName: '',
+    family: 'solid',
+  });
 
   const getIconAlias = (icon, aliasList) => {
     if (icon in aliasList) {
@@ -17,40 +21,58 @@ const FontAwesomeIcon = (props) => {
     }
   };
 
-  let prefixKey = prefix;
-  let iconName = '';
-
-  if (Array.isArray(icon)) {
-    prefixKey = icon[0];
-    iconName = getIconAlias(icon[1], fontAwesomeAliases);
-  } else {
-    iconName = getIconAlias(icon, fontAwesomeAliases);
-  }
+  const getIconInfo = (icon, prefix) => {
+    let prefixKey = prefix;
+    let iconName = '';
+    if (Array.isArray(icon)) {
+      prefixKey = icon[0];
+      iconName = getIconAlias(icon[1], fontAwesomeAliases);
+    } else {
+      iconName = getIconAlias(icon, fontAwesomeAliases);
+    }
 
-  const prefixFolder =
-    prefixKey === 'fab' ? 'brands' : prefixKey === 'far' ? 'regular' : 'solid';
+    return [
+      prefixKey === 'fab'
+        ? 'brands'
+        : prefixKey === 'far'
+        ? 'regular'
+        : 'solid',
+      iconName,
+    ];
+  };
 
   React.useEffect(() => {
-    if (iconName && !loadedIcon) {
+    const [prefixFolder, iconName] = getIconInfo(icon, prefix);
+    if (
+      iconName &&
+      (iconName !== loadedIcon.iconName || prefixFolder !== loadedIcon.family)
+    ) {
       import(
         `design-comuni-plone-theme/icons/fontawesome-free-6.4.0-web/svgs/${prefixFolder}/${iconName}.svg`
       )
         .then((_loadedIcon) => {
-          setLoadedIcon(_loadedIcon);
+          setLoadedIcon({
+            module: _loadedIcon.default,
+            iconName,
+            family: prefixFolder,
+          });
         })
         .catch((error) => {});
     }
-  }, [iconName, loadedIcon, prefixFolder]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [icon, prefix, loadedIcon]);
 
-  return loadedIcon ? (
+  return loadedIcon.module ? (
     <svg
-      xmlns={loadedIcon.attributes && loadedIcon.attributes.xmlns}
-      viewBox={loadedIcon.attributes && loadedIcon.attributes.viewBox}
+      xmlns={loadedIcon.module.attributes && loadedIcon.module.attributes.xmlns}
+      viewBox={
+        loadedIcon.module.attributes && loadedIcon.module.attributes.viewBox
+      }
       className={`icon fa-icon ${className ?? ''}`}
       dangerouslySetInnerHTML={{
         __html: title
-          ? `<title>${title}</title>${loadedIcon.content}`
-          : loadedIcon.content,
+          ? `<title>${title}</title>${loadedIcon.module.content}`
+          : loadedIcon.module.content,
       }}
     />
   ) : icon ? (

diff --git a/src/components/ItaliaTheme/manage/Widgets/IconPreviewWidget.jsx b/src/components/ItaliaTheme/manage/Widgets/IconPreviewWidget.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import PropTypes from 'prop-types';
 import { FontAwesomeIcon } from 'design-comuni-plone-theme/components/ItaliaTheme';
 import { defineMessages, useIntl } from 'react-intl';
@@ -14,6 +13,7 @@ const messages = defineMessages({
 const IconPreviewWidget = ({ icon, onEdit, title, description, children }) => {
   const intl = useIntl();
   const parts = icon?.split(' ') ?? [];
+
   return (
     <Form.Field inline className="help" id="icon-preview-widget-id">
       <Grid>