Fix regression in moving blocks from Grid block

plone · Feb 4, 2025 · 0ded876 · 0ded876
1 parent 80e3d77
commit 0ded876
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/packages/volto/src/components/manage/Blocks/Container/EditBlockWrapper.jsx b/packages/volto/src/components/manage/Blocks/Container/EditBlockWrapper.jsx
@@ -40,13 +40,18 @@ const EditBlockWrapper = (props) => {
 
   const style = buildStyleObjectFromData(data);
 
+  // We need to merge the StyleWrapper styles with the draggable props from b-D&D
+  const styleMergedWithDragProps = {
+    ...draginfo.draggableProps,
+    style: { ...style, ...draginfo.draggableProps.style },
+  };
+
   return (
     <div
       ref={draginfo.innerRef}
-      {...draginfo.draggableProps}
+      {...styleMergedWithDragProps}
       {...draginfo.dragHandleProps}
       className={cx(`block-editor-${data['@type']} contained`, { selected })}
-      style={style}
     >
       <div
         role="presentation"