Merge branch 'main' into us_49345_selezione_filtri

RedTurtle · Jan 11, 2024 · 1a93b8e · 1a93b8e
2 parents 674870f + 544be04
commit 1a93b8e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/components/ItaliaTheme/Search/Search.jsx b/src/components/ItaliaTheme/Search/Search.jsx
@@ -648,7 +648,6 @@ const Search = () => {
             <Col lg={9} tag="section" className="py-lg-5">
               <div
                 className="search-results-wrapper"
-                role="region"
                 id="search-results-region"
                 aria-live="polite"
               >

diff --git a/src/config/italiaConfig.js b/src/config/italiaConfig.js
@@ -65,8 +65,8 @@ import { schemaListing } from 'design-comuni-plone-theme/components/ItaliaTheme/
 
 import reducers from 'design-comuni-plone-theme/reducers';
 
-const ReleaseLog = loadable(
-  () => import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
+const ReleaseLog = loadable(() =>
+  import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
 );
 
 const messages = defineMessages({
@@ -486,10 +486,9 @@ export default function applyConfig(voltoConfig) {
     },
   };
   // Remove Horizontal Menu variation of TOC Block
-  config.blocks.blocksConfig.toc.variations =
-    config.blocks.blocksConfig.toc.variations.filter(
-      (v) => v.id !== 'horizontalMenu',
-    );
+  config.blocks.blocksConfig.toc.variations = config.blocks.blocksConfig.toc.variations.filter(
+    (v) => v.id !== 'horizontalMenu',
+  );
 
   // COMPONENTS
   config.components = {

diff --git a/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx b/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx
@@ -68,15 +68,19 @@ const ListingBody = React.memo(
 
         if (!block?.show_block_bg && !isSearchBlockResults) return 'full-width';
 
-        let bg_color = data.bg_color ? `bg-${data.bg_color}` : '';
+        let bg_color = config.blocks?.blocksConfig[
+          'listing'
+        ]?.listing_bg_colors.some((color) => color.name === data.bg_color)
+          ? `bg-${data.bg_color}`
+          : 'bg-light';
 
         if (block.template === 'gridGalleryTemplate') {
           return `section section-muted section-inset-shadow py-5 ${bg_color} ${
             isSearchBlockResults ? '' : 'full-width'
           }`;
         } else {
           return `py-5 ${bg_color} ${
-            isSearchBlockResults ? 'template-wrapper' : 'bg-light full-width'
+            isSearchBlockResults ? 'template-wrapper' : 'full-width'
           }`;
         }
       };