fixes multiple blocks creation on image upload from os clipboard

plone · Mar 7, 2024 · 138a634 · 138a634
1 parent 04be832
commit 138a634
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/packages/volto-slate/src/utils/volto-blocks.js b/packages/volto-slate/src/utils/volto-blocks.js
@@ -3,6 +3,8 @@ import { v4 as uuid } from 'uuid';
 import {
   addBlock,
   changeBlock,
+  insertBlock,
+  blockHasValue,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
 } from '@plone/volto/helpers';
@@ -53,6 +55,7 @@ export function mergeSlateWithBlockBackward(editor, prevBlock, event) {
     let endPoint;
 
     Transforms.insertNodes(editor, { text: '' }, { at: end });
+
 
     end = Editor.end(editor, [0]);
 
@@ -121,8 +124,16 @@ export function createImageBlock(url, index, props) {
   const blocksFieldname = getBlocksFieldname(properties);
   const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
 
-  const [id, formData] = addBlock(properties, 'image', index + 1);
-  const newFormData = changeBlock(formData, id, { '@type': 'image', url });
+  const currBlockId = properties.blocks_layout.items[index];
+  const currBlockHasValue = blockHasValue(properties.blocks[currBlockId]);
+  let id, newFormData;
+
+  if (currBlockHasValue) {
+    [id, newFormData] = addBlock(properties, 'image', index + 1);
+    newFormData = changeBlock(newFormData, id, { '@type': 'image', url });
+  } else {
+    [id, newFormData] = insertBlock(properties, currBlockId, { '@type': 'image', url });
+  }
 
   ReactDOM.unstable_batchedUpdates(() => {
     onChangeField(blocksFieldname, newFormData[blocksFieldname]);