@kitconcept/volto-light-theme 6.0.0-alpha.3 → 6.0.0-alpha.5

package/.changelog.draft

@@ -1,13 +1,11 @@
-## 6.0.0-alpha.3 (2024-12-05)
+## 6.0.0-alpha.5 (2024-12-09)
 
-### Feature
+### Bugfix
 
-- New look and feel specs for footer logos. @sneridagh
-  Added two slots: `preFooter` and `postFooter`. [#437](https://github.com/kitconcept/volto-light-theme/pull/437)
+- Added guard in case blocks are corrupted or malformed. @sneridagh [#442](https://github.com/kitconcept/volto-light-theme/pull/442)
 
-### Bugfix
+### Internal
 
-- Fixed edge case when you delete the image content type from the site. @sneridagh [#437](https://github.com/kitconcept/volto-light-theme/pull/437)
-- Fixed layout shift jumps on RAC Popovers. @sneridagh [#440](https://github.com/kitconcept/volto-light-theme/pull/440)
+- Updated to latest 18.2.2 @sneridagh [#443](https://github.com/kitconcept/volto-light-theme/pull/443)
 
 

package/CHANGELOG.md

@@ -8,6 +8,22 @@
 
 <!-- towncrier release notes start -->
 
+## 6.0.0-alpha.5 (2024-12-09)
+
+### Bugfix
+
+- Added guard in case blocks are corrupted or malformed. @sneridagh [#442](https://github.com/kitconcept/volto-light-theme/pull/442)
+
+### Internal
+
+- Updated to latest 18.2.2 @sneridagh [#443](https://github.com/kitconcept/volto-light-theme/pull/443)
+
+## 6.0.0-alpha.4 (2024-12-08)
+
+### Bugfix
+
+- Fix initialBlocks config, do not override the whole thing. @sneridagh [#441](https://github.com/kitconcept/volto-light-theme/pull/441)
+
 ## 6.0.0-alpha.3 (2024-12-05)
 
 ### Feature

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme",
-  "version": "6.0.0-alpha.3",
+  "version": "6.0.0-alpha.5",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.ts",
   "types": "src/types/index.d.ts",

package/src/config/blocks.tsx

@@ -63,13 +63,11 @@ declare module '@plone/types' {
 
 export default function install(config: ConfigType) {
   // Initial block for event content type
-  config.blocks.initialBlocks = {
-    Event: [
-      { '@type': 'title' },
-      { '@type': 'eventMetadata', fixed: true, required: true },
-      { '@type': 'slate' },
-    ],
-  };
+  config.blocks.initialBlocks.Event = [
+    { '@type': 'title' },
+    { '@type': 'eventMetadata', fixed: true, required: true },
+    { '@type': 'slate' },
+  ];
 
   // Palettes
   config.blocks.themes = [

package/src/customizations/volto/components/theme/View/RenderBlocks.jsx

@@ -21,7 +21,8 @@ import {
   findStyleByName,
 } from '@plone/volto/helpers/Blocks/Blocks';
 import { defineMessages, useIntl } from 'react-intl';
-import { map } from 'lodash';
+import map from 'lodash/map';
+import isEmpty from 'lodash/isEmpty';
 import StyleWrapper from '@plone/volto/components/manage/Blocks/Block/StyleWrapper';
 import config from '@plone/volto/registry';
 import ViewDefaultBlock from '@plone/volto/components/manage/Blocks/Block/DefaultView';
@@ -45,6 +46,11 @@ export function groupByBGColor(blocks, blocks_layout, colorDefinitions) {
   let currentArr = [];
   let currentBGColor;
 
+  // Guard in case the block layout is empty or corrupted for some reason
+  if (blocks_layout.items.length === 0 || isEmpty(blocks)) {
+    return [];
+  }
+
   blocks_layout.items.forEach((blockId) => {
     let currentBlockColor = blocks[blockId]?.theme || 'default';
     if (currentBlockColor !== currentBGColor) {