@plone/volto 17.11.0 → 17.11.2

package/CHANGELOG.md

@@ -17,6 +17,19 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 17.11.2 (2024-01-17)
+
+### Bugfix
+
+- Merge the StyleWrapper styles with the draggable props from b-D&D. @sneridagh
+  This fixes the D&D bug introduced in https://github.com/plone/volto/pull/5581 [#5652](https://github.com/plone/volto/issues/5652)
+
+## 17.11.1 (2024-01-17)
+
+### Bugfix
+
+- Fix order of preference in addons-registry for the theme definition (THEME, volto.config.js, package.json) @sneridagh [#5650](https://github.com/plone/volto/issues/5650)
+
 ## 17.11.0 (2024-01-15)
 
 ### Feature

package/addon-registry.js

@@ -134,10 +134,10 @@ class AddonConfigurationRegistry {
     this.packages = {};
     this.customizations = new Map();
 
-    // Theme from a package.json key, from volto.config.js or from an ENV VAR
-    // Programatically via volto.config.js wins or the ENV VAR if present
+    // Theme from an ENV VAR, from volto.config.js or from a package.json key
+    // in this order of preference
     this.theme =
-      packageJson.theme || this.voltoConfigJS.theme || process.env.THEME;
+      process.env.THEME || this.voltoConfigJS.theme || packageJson.theme;
 
     this.initDevelopmentPackages();
     this.initPublishedPackages();

package/news/5652.bugfix

@@ -0,0 +1,2 @@
+Merge the StyleWrapper styles with the draggable props from b-D&D. @sneridagh
+This fixes the D&D bug introduced in https://github.com/plone/volto/pull/5581

package/package.json

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

package/packages/volto-slate/package.json

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

package/src/components/manage/Blocks/Block/EditBlockWrapper.jsx

@@ -61,17 +61,22 @@ const EditBlockWrapper = (props) => {
   const classNames = buildStyleClassNamesFromData(data.styles);
   const style = buildStyleObjectFromData(data.styles);
 
+  // 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}
       // Right now, we can have the alignment information in the styles property or in the
       // block data root, we inject the classname here for having control over the whole
       // Block Edit wrapper
       className={cx(`block-editor-${data['@type']}`, classNames, {
         [data.align]: data.align,
       })}
-      style={style}
     >
       <div style={{ position: 'relative' }}>
         <div