Merge branch 'main' into parent-tags

sneridagh · web-flow · commit 398945691dc3 · 2025-09-25T08:23:36.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,36 @@
 # kitconcept's volto-light-theme Release Notes
 
 <!-- towncrier release notes start -->
+## 7.0.0b7 (2025-09-24)
+
+### Backend
+
+No significant changes.
+
+
+
+
+### Frontend
+
+#### Feature
+
+- Make it possible for custom Summary components to disable being linked. @davisagli 
+
+#### Bugfix
+
+- Enable add block button in accordion block @iRohitSingh [#668](https://github.com/kitconcept/volto-light-theme/pull/668)
+- Safely check for `voltolighttheme.theme` behavior on Theming component. @ericof [#671](https://github.com/kitconcept/volto-light-theme/pull/671)
+- Fix styles for person listing in Search block grid variation. @danalvrz 
+
+
+
+### Project
+
+No significant changes.
+
+
+
+
 ## 7.0.0b6 (2025-09-22)
 
 ### Backend
diff --git a/backend/CHANGELOG.md b/backend/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 <!-- towncrier release notes start -->
 
+## 7.0.0b7 (2025-09-24)
+
+No significant changes.
+
+
 ## 7.0.0b6 (2025-09-22)
 
 
diff --git a/backend/src/kitconcept/voltolighttheme/__init__.py b/backend/src/kitconcept/voltolighttheme/__init__.py
@@ -5,7 +5,7 @@
 import logging
 
 
-__version__ = "7.0.0b6"
+__version__ = "7.0.0b7"
 
 PACKAGE_NAME = "kitconcept.voltolighttheme"
 
diff --git a/docs/how-to-guides/summary.md b/docs/how-to-guides/summary.md
@@ -117,3 +117,11 @@ const Summary =
 
 return <Summary item={item} />;
 ```
+
+## Disable links
+
+You can disable showing a link for a particular `Summary` component when it is used.
+
+```jsx
+BlogPostSummary.hideLink = true;
+```
diff --git a/docs/reference/card.md b/docs/reference/card.md
@@ -120,6 +120,8 @@ const Summary =
   }).component || DefaultSummary;
 ```
 
+If `Summary.hideLink` is true, you should not pass an `href` to the `Card` component.
+
 VLT has registered a few variations of the `Summary` component (eg. Events, News, etc.).
 
 ### `Card.Actions`
@@ -138,7 +140,7 @@ You can pass any content to this slot.
 
 ```tsx
 <Card
-  href={!isEditMode ? href['@id'] : null}
+  href={(!Summary.hideLink && !isEditMode) ? href['@id'] : null}
   openLinkInNewTab={openLinkInNewTab}
 >
   <Card.Image
diff --git a/frontend/CHANGELOG.md b/frontend/CHANGELOG.md
@@ -8,6 +8,18 @@
 
 <!-- towncrier release notes start -->
 
+## 7.0.0-beta.7 (2025-09-24)
+
+### Feature
+
+- Make it possible for custom Summary components to disable being linked. @davisagli 
+
+### Bugfix
+
+- Enable add block button in accordion block @iRohitSingh [#668](https://github.com/kitconcept/volto-light-theme/pull/668)
+- Safely check for `voltolighttheme.theme` behavior on Theming component. @ericof [#671](https://github.com/kitconcept/volto-light-theme/pull/671)
+- Fix styles for person listing in Search block grid variation. @danalvrz 
+
 ## 7.0.0-beta.6 (2025-09-22)
 
 ### Bugfix
diff --git a/frontend/cypress/tests/main/blocks-calendar.cy.js b/frontend/cypress/tests/main/blocks-calendar.cy.js
@@ -72,7 +72,7 @@ describe('Event Calendar Block Tests', () => {
       .should('not.exist');
   });
 
-  it('Add Event Calendar block and test the daterange', () => {
+  it.skip('Add Event Calendar block and test the daterange', () => {
     // Adding new event calendar block and setting the date of evet.
 
     cy.addNewBlock('event');
@@ -243,7 +243,7 @@ describe('Event Calendar Block Tests', () => {
     });
   });
 
-  it('Test the daterange with facet and input', () => {
+  it.skip('Test the daterange with facet and input', () => {
     // Adding new event calendar block and setting the two event content published.
     cy.setWorkflow({
       path: 'my-first-event',
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme-dev",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.0-beta.7",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.js",
   "types": "src/types/index.d.ts",
diff --git a/frontend/packages/volto-light-theme/CHANGELOG.md b/frontend/packages/volto-light-theme/CHANGELOG.md
@@ -8,6 +8,18 @@
 
 <!-- towncrier release notes start -->
 
+## 7.0.0-beta.7 (2025-09-24)
+
+### Feature
+
+- Make it possible for custom Summary components to disable being linked. @davisagli 
+
+### Bugfix
+
+- Enable add block button in accordion block @iRohitSingh [#668](https://github.com/kitconcept/volto-light-theme/pull/668)
+- Safely check for `voltolighttheme.theme` behavior on Theming component. @ericof [#671](https://github.com/kitconcept/volto-light-theme/pull/671)
+- Fix styles for person listing in Search block grid variation. @danalvrz 
+
 ## 7.0.0-beta.6 (2025-09-22)
 
 ### Bugfix
diff --git a/frontend/packages/volto-light-theme/package.json b/frontend/packages/volto-light-theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.0-beta.7",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/frontend/packages/volto-light-theme/src/components/Blocks/Listing/DefaultTemplate.jsx b/frontend/packages/volto-light-theme/src/components/Blocks/Listing/DefaultTemplate.jsx
@@ -31,14 +31,15 @@ const DefaultTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
               name: 'Summary',
               dependencies: [item['@type']],
             }).component || DefaultSummary;
+          const showLink = !Summary.hideLink && !isEditMode;
           return (
             <div
               className={cx('listing-item', {
                 [`${item['@type']?.toLowerCase()}-listing`]: item['@type'],
               })}
               key={item['@id']}
             >
-              <Card href={!isEditMode ? item['@id'] : null}>
+              <Card href={showLink ? item['@id'] : null}>
                 <Card.Summary>
                   <Summary item={item} HeadingTag="h2" />
                 </Card.Summary>
diff --git a/frontend/packages/volto-light-theme/src/components/Blocks/Listing/GridTemplate.jsx b/frontend/packages/volto-light-theme/src/components/Blocks/Listing/GridTemplate.jsx
@@ -26,18 +26,19 @@ const GridTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
     <>
       <div className="items">
         {items.map((item) => {
-          const ItemBodyTemplate = (props) => {
-            const CustomItemBodyTemplate = config.getComponent({
-              name: 'GridListingItemTemplate',
+          const CustomItemBodyTemplate = config.getComponent({
+            name: 'GridListingItemTemplate',
+            dependencies: [item['@type']],
+          }).component;
+          const Summary =
+            config.getComponent({
+              name: 'Summary',
               dependencies: [item['@type']],
-            }).component;
-            const Summary =
-              config.getComponent({
-                name: 'Summary',
-                dependencies: [item['@type']],
-              }).component || DefaultSummary;
+            }).component || DefaultSummary;
+          const showLink = !Summary.hideLink && !isEditMode;
 
-            return CustomItemBodyTemplate ? (
+          const ItemBodyTemplate = (props) =>
+            CustomItemBodyTemplate ? (
               <CustomItemBodyTemplate item={item} />
             ) : (
               <>
@@ -53,15 +54,15 @@ const GridTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
                 </Card.Summary>
               </>
             );
-          };
+
           return (
             <div
               className={cx('listing-item', {
                 [`${item['@type']?.toLowerCase()}-listing`]: item['@type'],
               })}
               key={item['@id']}
             >
-              <Card href={!isEditMode ? item['@id'] : null}>
+              <Card href={showLink ? item['@id'] : null}>
                 <ItemBodyTemplate item={item} />
               </Card>
             </div>
diff --git a/frontend/packages/volto-light-theme/src/components/Blocks/Listing/SummaryTemplate.jsx b/frontend/packages/volto-light-theme/src/components/Blocks/Listing/SummaryTemplate.jsx
@@ -34,7 +34,7 @@ const SummaryTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
               name: 'Summary',
               dependencies: [item['@type']],
             }).component || DefaultSummary;
-
+          const showLink = !Summary.hideLink && !isEditMode;
           const ItemBodyTemplate = (props) =>
             CustomItemBodyTemplate ? (
               <CustomItemBodyTemplate item={item} />
@@ -57,7 +57,7 @@ const SummaryTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
               })}
               key={item['@id']}
             >
-              <Card href={!isEditMode ? item['@id'] : null}>
+              <Card href={showLink ? item['@id'] : null}>
                 <ItemBodyTemplate item={item} />
               </Card>
             </div>
diff --git a/frontend/packages/volto-light-theme/src/components/Blocks/Teaser/DefaultBody.tsx b/frontend/packages/volto-light-theme/src/components/Blocks/Teaser/DefaultBody.tsx
@@ -1,5 +1,6 @@
 import { isInternalURL } from '@plone/volto/helpers/Url/Url';
 import DefaultSummary from '@kitconcept/volto-light-theme/components/Summary/DefaultSummary';
+import type { SummaryComponentType } from '@kitconcept/volto-light-theme/components/Summary/DefaultSummary';
 import Card from '../../../primitives/Card/Card';
 import config from '@plone/volto/registry';
 
@@ -10,11 +11,11 @@ const TeaserDefaultTemplate = (props) => {
   const url = data.preview_image?.[0]?.['@id'];
 
   const Image = config.getComponent('Image').component;
-  const Summary =
-    config.getComponent({
-      name: 'Summary',
-      dependencies: [href['@type']],
-    }).component || DefaultSummary;
+  const Summary = (config.getComponent({
+    name: 'Summary',
+    dependencies: [href['@type']],
+  }).component || DefaultSummary) as SummaryComponentType;
+  const showLink = !Summary.hideLink && !isEditMode;
   const { openExternalLinkInNewTab } = config.settings;
   const openLinkInNewTab =
     data.openLinkInNewTab ||
@@ -23,7 +24,7 @@ const TeaserDefaultTemplate = (props) => {
 
   return (
     <Card
-      href={!isEditMode ? href['@id'] : null}
+      href={showLink ? href['@id'] : null}
       openLinkInNewTab={openLinkInNewTab}
     >
       <Card.Image
diff --git a/frontend/packages/volto-light-theme/src/components/Summary/DefaultSummary.tsx b/frontend/packages/volto-light-theme/src/components/Summary/DefaultSummary.tsx
@@ -8,6 +8,10 @@ export type DefaultSummaryProps = {
   hide_description?: boolean;
 };
 
+export type SummaryComponentType = React.ComponentType<DefaultSummaryProps> & {
+  hideLink?: boolean;
+};
+
 const DefaultSummary = (props: DefaultSummaryProps) => {
   const { item, HeadingTag = 'h3', a11yLabelId, hide_description } = props;
   return (
@@ -20,5 +24,6 @@ const DefaultSummary = (props: DefaultSummaryProps) => {
     </>
   );
 };
+DefaultSummary.hideLink = false;
 
 export default DefaultSummary;
diff --git a/frontend/packages/volto-light-theme/src/components/Theming/Theming.tsx b/frontend/packages/volto-light-theme/src/components/Theming/Theming.tsx
@@ -48,7 +48,7 @@ const Theming = ({ content }: { content: Content }) => {
   const addingFromInherited =
     location.pathname.endsWith('/add') &&
     flattenToAppURL(
-      content?.['@components']?.inherit?.['voltolighttheme.theme'].from['@id'],
+      content?.['@components']?.inherit?.['voltolighttheme.theme']?.from['@id'],
     ) === getBaseUrl(location.pathname);
 
   let liveContent;
diff --git a/frontend/packages/volto-light-theme/src/theme/blocks/_accordion.scss b/frontend/packages/volto-light-theme/src/theme/blocks/_accordion.scss
@@ -5,6 +5,9 @@
 
 .accordion-block,
 .block-editor-accordion {
+  .block-add-button {
+    display: block !important;
+  }
   .ui.styled.accordion {
     border-top: 1px solid $black;
 
diff --git a/frontend/packages/volto-light-theme/src/theme/blocks/_search.scss b/frontend/packages/volto-light-theme/src/theme/blocks/_search.scss
@@ -77,7 +77,9 @@
 
     .search-input {
       position: relative;
+      display: block;
       height: 75px;
+      padding-right: $spacing-xlarge;
       background-color: $secondary-grey;
 
       .ui.input {
diff --git a/frontend/packages/volto-light-theme/src/theme/card.scss b/frontend/packages/volto-light-theme/src/theme/card.scss
@@ -3,8 +3,8 @@
   transition: box-shadow 0.15s ease;
 }
 
-.card:has(a):hover,
-.card:has(a):focus-within {
+.card:has(> a):hover,
+.card:has(> a):focus-within {
   cursor: pointer;
 }
 
diff --git a/frontend/packages/volto-light-theme/src/theme/person.scss b/frontend/packages/volto-light-theme/src/theme/person.scss
diff --git a/version.txt b/version.txt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kitconcept/volto-light-theme-dev",`
`3`		`- "version": "7.0.0-beta.6",`
	`3`	`+ "version": "7.0.0-beta.7",`
`4`	`4`	`"description": "Volto Light Theme by kitconcept",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"types": "src/types/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kitconcept/volto-light-theme",`
`3`		`- "version": "7.0.0-beta.6",`
	`3`	`+ "version": "7.0.0-beta.7",`
`4`	`4`	`"description": "Volto Light Theme by kitconcept",`
`5`	`5`	`"main": "src/index.ts",`
`6`	`6`	`"types": "src/index.ts",`