Moved applyBlockDefaults one component up so the style is computed …

…correctly (#6451)
plone · Oct 29, 2024 · ec4dc83 · ec4dc83
1 parent ec89ad8
commit ec4dc83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/volto/news/6451.bugfix b/packages/volto/news/6451.bugfix
@@ -0,0 +1 @@
+Moved `applyBlockDefaults` one component up so the style is computed correctly. @sneridagh
diff --git a/packages/volto/src/components/manage/Blocks/Block/Edit.jsx b/packages/volto/src/components/manage/Blocks/Block/Edit.jsx
@@ -12,7 +12,6 @@ import cx from 'classnames';
 import { setSidebarTab, setUIState } from '@plone/volto/actions';
 import config from '@plone/volto/registry';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
-import { applyBlockDefaults } from '@plone/volto/helpers';
 import { ViewDefaultBlock, EditDefaultBlock } from '@plone/volto/components';
 
 import {
@@ -199,7 +198,7 @@ export class Edit extends Component {
             <Block
               {...this.props}
               blockNode={this.blockNode}
-              data={applyBlockDefaults(this.props)}
+              data={this.props.data}
             />
             {this.props.manage && (
               <SidebarPortal

diff --git a/packages/volto/src/components/manage/Blocks/Block/EditBlockWrapper.jsx b/packages/volto/src/components/manage/Blocks/Block/EditBlockWrapper.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Icon } from '@plone/volto/components';
 import {
+  applyBlockDefaults,
   applyBlockInitialValue,
   getBlocksFieldname,
   blockHasValue,
@@ -48,14 +49,16 @@ const EditBlockWrapper = (props) => {
     onInsertBlock,
     onSelectBlock,
     onMutateBlock,
-    data,
+    data: originalData,
     editable,
     properties,
     showBlockChooser,
     navRoot,
     contentType,
   } = blockProps;
 
+  const data = applyBlockDefaults({ data: originalData, ...blockProps, intl });
+
   const visible = selected && !hideHandler(data);
 
   const required = isBoolean(data.required)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Moved `applyBlockDefaults` one component up so the style is computed correctly. @sneridagh