From 867df42a8ae96f0546afb43e12490553648128f7 Mon Sep 17 00:00:00 2001 From: sabrina-bongiovanni <116291154+sabrina-bongiovanni@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:15:33 +0100 Subject: [PATCH 1/2] fix: aria tags to avoid double feedback on SR (#468) * fix: fixed aria tags to avoid double feedback on SR * chore: added RELEASE.md info --------- Co-authored-by: Piero Nicolli --- src/components/ItaliaTheme/Search/Search.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ItaliaTheme/Search/Search.jsx b/src/components/ItaliaTheme/Search/Search.jsx index 830cb4ec3..2c753585b 100644 --- a/src/components/ItaliaTheme/Search/Search.jsx +++ b/src/components/ItaliaTheme/Search/Search.jsx @@ -613,7 +613,6 @@ const Search = () => {
From 544be046ddca345f1b0c9073a4a57c876281031b Mon Sep 17 00:00:00 2001 From: Wagner Trezub <60133113+Wagner3UB@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:28:26 +0100 Subject: [PATCH 2/2] fix: listing bg color (#475) * fix: double bg removed * fix: listing bg colors --- src/config/italiaConfig.js | 11 +++++------ .../components/manage/Blocks/Listing/ListingBody.jsx | 8 ++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/config/italiaConfig.js b/src/config/italiaConfig.js index 2929a40aa..17ab57983 100644 --- 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 index cad27aa3f..ea9dd328c 100644 --- a/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx +++ b/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx @@ -68,7 +68,11 @@ 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} ${ @@ -76,7 +80,7 @@ const ListingBody = React.memo( }`; } else { return `py-5 ${bg_color} ${ - isSearchBlockResults ? 'template-wrapper' : 'bg-light full-width' + isSearchBlockResults ? 'template-wrapper' : 'full-width' }`; } };