From be0e241268aea05813cd4fb87c9d0686de46883f Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 19 Jan 2023 11:58:51 +0100 Subject: [PATCH 1/5] Bring back the Image component for testing with the ree-consolidate-image-loader-options --- .../volto-blocks-grid/components/Teaser/DefaultBody.jsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx b/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx index 61cf695a..d14aa051 100644 --- a/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx +++ b/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx @@ -10,7 +10,7 @@ import { getTeaserImageURL } from '@kitconcept/volto-blocks-grid/components/Teas import { MaybeWrap } from '@plone/volto/components'; import { UniversalLink } from '@plone/volto/components'; import cx from 'classnames'; -// import config from '@plone/volto/registry'; +import config from '@plone/volto/registry'; const messages = defineMessages({ PleaseChooseContent: { @@ -29,7 +29,7 @@ const TeaserDefaultTemplate = (props) => { const image = data.preview_image?.[0]; const align = data?.styles?.align; - const Image = DefaultImage; + const Image = config.getComponent('Image').component || DefaultImage; return (
@@ -53,9 +53,8 @@ const TeaserDefaultTemplate = (props) => { {(href.hasPreviewImage || href.image_field || image) && (
From ed062a3a58385ff01bc9bc4ab555ba4c7fad1b4d Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 26 Jan 2023 15:51:44 +0100 Subject: [PATCH 2/5] Remove the require from the title --- src/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/index.js b/src/index.js index 7e2b2c92..f816f031 100644 --- a/src/index.js +++ b/src/index.js @@ -29,6 +29,9 @@ defineMessages({ }); const applyConfig = (config) => { + // No required blocks (eg. Title) + config.blocks.requiredBlocks = []; + // Register custom Container component config.registerComponent({ name: 'Container', From bc7c6c8132eba555b5328031ae0d74007a0f0bf2 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 26 Jan 2023 15:52:08 +0100 Subject: [PATCH 3/5] Fix the single image use case in a grid --- src/theme/_layout.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/theme/_layout.scss b/src/theme/_layout.scss index 09f5a6b4..37713e93 100644 --- a/src/theme/_layout.scss +++ b/src/theme/_layout.scss @@ -179,6 +179,11 @@ $narrow-container-width: 620px; max-width: calc(var(--default-container-width) + 1rem); } +// Fix for Image Grid with only one image +#page-document .block.__grid .block.image.align.center figure { + max-width: unset; +} + // handlers adjustments body.has-toolbar.has-sidebar .drag.handle.wrapper { margin-left: -30px !important; From 9d699c4ba2087477ec62410bca93024ea66fc94a Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 26 Jan 2023 15:52:18 +0100 Subject: [PATCH 4/5] Remove custom Teaser body --- .../components/Teaser/DefaultBody.jsx | 84 ------------------- 1 file changed, 84 deletions(-) delete mode 100644 src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx diff --git a/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx b/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx deleted file mode 100644 index d14aa051..00000000 --- a/src/customizations/@kitconcept/volto-blocks-grid/components/Teaser/DefaultBody.jsx +++ /dev/null @@ -1,84 +0,0 @@ -// Remove when https://github.com/kitconcept/volto-light-theme/issues/40 -// is solved and merged -import React from 'react'; -import PropTypes from 'prop-types'; -import { Message } from 'semantic-ui-react'; -import { defineMessages, useIntl } from 'react-intl'; -import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg'; -import { flattenToAppURL } from '@plone/volto/helpers'; -import { getTeaserImageURL } from '@kitconcept/volto-blocks-grid/components/Teaser/utils'; -import { MaybeWrap } from '@plone/volto/components'; -import { UniversalLink } from '@plone/volto/components'; -import cx from 'classnames'; -import config from '@plone/volto/registry'; - -const messages = defineMessages({ - PleaseChooseContent: { - id: 'Please choose an existing content as source for this element', - defaultMessage: - 'Please choose an existing content as source for this element', - }, -}); - -const DefaultImage = (props) => {props.alt; - -const TeaserDefaultTemplate = (props) => { - const { className, data, isEditMode } = props; - const intl = useIntl(); - const href = data.href?.[0]; - const image = data.preview_image?.[0]; - const align = data?.styles?.align; - - const Image = config.getComponent('Image').component || DefaultImage; - - return ( -
- <> - {!href && isEditMode && ( - -
- -

{intl.formatMessage(messages.PleaseChooseContent)}

-
- - )} - {href && ( - -
- {(href.hasPreviewImage || href.image_field || image) && ( -
- -
- )} -
- {data?.head_title && ( -
{data.head_title}
- )} - -

{data?.title}

- {!data.hide_description &&

{data?.description}

} -
-
- - )} - -
- ); -}; - -TeaserDefaultTemplate.propTypes = { - data: PropTypes.objectOf(PropTypes.any).isRequired, - isEditMode: PropTypes.bool, -}; - -export default TeaserDefaultTemplate; From 9bd6084f14eccef81bbf50f36438a11df904adaf Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Fri, 27 Jan 2023 10:44:32 +0100 Subject: [PATCH 5/5] Changelog --- news/62.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/62.bugfix diff --git a/news/62.bugfix b/news/62.bugfix new file mode 100644 index 00000000..50dc05e1 --- /dev/null +++ b/news/62.bugfix @@ -0,0 +1 @@ +Remove Title as required block. Fix the single image use case in a grid @sneridagh