@plone/volto 17.15.3 → 17.15.5

package/CHANGELOG.md

@@ -17,6 +17,18 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 17.15.5 (2024-03-07)
+
+### Bugfix
+
+- Fix other occurrences of mutable (referenced) objects when assigning the default inner `blocksConfig` object for the `grid` block, pass by value instead. sneridagh [#5859](https://github.com/plone/volto/issues/5859)
+
+## 17.15.4 (2024-03-06)
+
+### Bugfix
+
+- Fix the introduction of a mutable (referenced) object when assigning the default inner `blocksConfig` object for the `grid` block, pass by value instead. sneridagh [#5850](https://github.com/plone/volto/issues/5850)
+
 ## 17.15.3 (2024-03-04)
 
 ### Bugfix

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "17.15.3",
+  "version": "17.15.5",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

package/packages/volto-slate/news/5859.bugfix

@@ -0,0 +1 @@
+Fix other occurrences of mutable (referenced) objects when assigning the default inner `blocksConfig` object for the `grid` block, pass by value instead. sneridagh

package/packages/volto-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "17.15.3",
+  "version": "17.15.5",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/packages/volto-slate/src/blocks/Text/index.js

@@ -3,6 +3,7 @@ import redraft from 'redraft';
 import TextBlockView from './TextBlockView';
 import TextBlockEdit from './TextBlockEdit';
 import TextBlockSchema from './TextBlockSchema';
+import { cloneDeep } from 'lodash';
 
 import {
   goDown,
@@ -164,7 +165,9 @@ export default function applyConfig(config) {
     // This is required in order to initialize the inner blocksConfig
     // for the grid block, since the slate block lives in an add-on
     // it should be responsible to fill itself into the grid configuration
-    config.blocks.blocksConfig.gridBlock.blocksConfig.slate = slateBlockConfig;
+    // The cloneDeep is mandatory in order to not mess with pass by reference problems
+    config.blocks.blocksConfig.gridBlock.blocksConfig.slate =
+      cloneDeep(slateBlockConfig);
   }
 
   return config;

package/src/config/Blocks.jsx

@@ -1,4 +1,5 @@
 import { defineMessages } from 'react-intl';
+import { cloneDeep } from 'lodash';
 
 import ViewTitleBlock from '@plone/volto/components/manage/Blocks/Title/View';
 import ViewDescriptionBlock from '@plone/volto/components/manage/Blocks/Description/View';
@@ -519,15 +520,11 @@ const blocksConfig = {
 // for the grid block, since we need to modify how the inner teaser
 // block behave in it (= no schemaEnhancer fields for teasers inside a grid)
 // Afterwards, it can be further customized in add-ons using the same technique.
-blocksConfig.gridBlock.blocksConfig = { ...blocksConfig };
-blocksConfig.gridBlock.blocksConfig.teaser = {
-  ...blocksConfig.teaser,
-  schemaEnhancer: gridTeaserDisableStylingSchema,
-};
-blocksConfig.gridBlock.blocksConfig.image = {
-  ...blocksConfig.image,
-  schemaEnhancer: gridImageDisableSizeAndPositionHandlersSchema,
-};
+blocksConfig.gridBlock.blocksConfig = cloneDeep(blocksConfig);
+blocksConfig.gridBlock.blocksConfig.teaser.schemaEnhancer =
+  gridTeaserDisableStylingSchema;
+blocksConfig.gridBlock.blocksConfig.image.schemaEnhancer =
+  gridImageDisableSizeAndPositionHandlersSchema;
 
 const requiredBlocks = ['title'];
 

package/types/config/Blocks.d.ts

@@ -8,51 +8,9 @@ export namespace blocksConfig {
         namespace blocksConfig {
             namespace teaser {
                 export { gridTeaserDisableStylingSchema as schemaEnhancer };
-                export let id: string;
-                export let title: string;
-                export { imagesSVG as icon };
-                export let group: string;
-                export { TeaserViewBlock as view };
-                export { TeaserEditBlock as edit };
-                export let restricted: boolean;
-                export let mostUsed: boolean;
-                export let sidebarTab: number;
-                export { TeaserSchema as blockSchema };
-                export { TeaserBlockDataAdapter as dataAdapter };
-                export let variations: {
-                    id: string;
-                    isDefault: boolean;
-                    title: string;
-                    template: {
-                        (props: any): JSX.Element;
-                        propTypes: {
-                            data: import("prop-types").Validator<{
-                                [x: string]: any;
-                            }>;
-                            isEditMode: import("prop-types").Requireable<boolean>;
-                        };
-                    };
-                }[];
             }
             namespace image {
                 export { gridImageDisableSizeAndPositionHandlersSchema as schemaEnhancer };
-                let id_1: string;
-                export { id_1 as id };
-                let title_1: string;
-                export { title_1 as title };
-                export { cameraSVG as icon };
-                let group_1: string;
-                export { group_1 as group };
-                export { ViewImageBlock as view };
-                export { EditImageBlock as edit };
-                export { ImageSettingsSchema as schema };
-                let restricted_1: boolean;
-                export { restricted_1 as restricted };
-                let mostUsed_1: boolean;
-                export { mostUsed_1 as mostUsed };
-                let sidebarTab_1: number;
-                export { sidebarTab_1 as sidebarTab };
-                export { getImageBlockSizes as getSizes };
             }
         }
     }
@@ -60,12 +18,4 @@ export namespace blocksConfig {
 export const initialBlocks: {};
 export const initialBlocksFocus: {};
 import { gridTeaserDisableStylingSchema } from '@plone/volto/components/manage/Blocks/Teaser/schema';
-import TeaserViewBlock from '@plone/volto/components/manage/Blocks/Teaser/View';
-import TeaserEditBlock from '@plone/volto/components/manage/Blocks/Teaser/Edit';
-import { TeaserSchema } from '@plone/volto/components/manage/Blocks/Teaser/schema';
-import { TeaserBlockDataAdapter } from '@plone/volto/components/manage/Blocks/Teaser/adapter';
 import { gridImageDisableSizeAndPositionHandlersSchema } from '@plone/volto/components/manage/Blocks/Image/schema';
-import ViewImageBlock from '@plone/volto/components/manage/Blocks/Image/View';
-import EditImageBlock from '@plone/volto/components/manage/Blocks/Image/Edit';
-import ImageSettingsSchema from '@plone/volto/components/manage/Blocks/Image/LayoutSchema';
-import { getImageBlockSizes } from '@plone/volto/components/manage/Blocks/Image/utils';