Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix card duplication on move to before flexcontainer (#64205)

Denis Berezinf7183cf1caca
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/DropHandlers/cardToDocument.ts b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/DropHandlers/cardToDocument.ts
index fd9949d995f..484033c89af 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/DropHandlers/cardToDocument.ts
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/DropHandlers/cardToDocument.ts
@@ -127,7 +127,7 @@ export const handleCardDropOnDocument = (payload: DroppedCardEmbedNodeData) => {
view.dispatch(tr);
return true;
}
- } else {
+ } else if (originalPos !== null) {
// Handle general case: cardEmbed being moved within document or from resizeNode
// Always ensure cardEmbed is wrapped in resizeNode when dropped in document
const tr = view.state.tr;
@@ -141,23 +141,32 @@ export const handleCardDropOnDocument = (payload: DroppedCardEmbedNodeData) => {
[cardEmbedNode],
);
+ const nodeToRemove = originalParent || cardEmbedNode;
+
// Remove the original node from its position
- if (originalPos !== null) {
- // Find the actual node to remove (could be the cardEmbed itself or its resizeNode wrapper)
- view.state.doc.descendants((node, pos) => {
- if (
- node === originalParent ||
- extractCardEmbed(node) === cardEmbedNode
- ) {
- // Remove the node (whether it's a standalone cardEmbed or wrapped in resizeNode)
- tr.delete(pos, pos + node.nodeSize);
- return false;
- }
- });
+ // Find the actual node to remove (could be the cardEmbed itself or its resizeNode wrapper)
+ let removalHandled = false;
+ let removePos: number | null = null;
+
+ view.state.doc.descendants((node, pos) => {
+ if (node === nodeToRemove && !removalHandled) {
+ // Remove the node (whether it's a standalone cardEmbed or wrapped in resizeNode)
+ tr.delete(pos, pos + node.nodeSize);
+ removalHandled = true;
+ removePos = pos;
+ return false;
+ }
+ });
+
+ let adjustedInsertPos = dropPos;
+ if (removalHandled && removePos !== null && removePos < dropPos) {
+ // If we removed something before the replace position, adjust it
+ const removedSize = nodeToRemove.nodeSize;
+ adjustedInsertPos = dropPos - removedSize;
}
// Insert wrapped node at drop position
- tr.insert(dropPos, wrappedNode);
+ tr.insert(adjustedInsertPos, wrappedNode);
view.dispatch(tr);
return true;
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/HandleEditorDrop.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/HandleEditorDrop.tsx
index 8a5d1e0514d..26f8e3e1a74 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/HandleEditorDrop.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/HandleEditorDrop/HandleEditorDrop.tsx
@@ -60,7 +60,7 @@ export const HandleEditorDrop = Extension.create({
dropToParent.type.name !== "cardEmbed" &&
dropToParent.type.name !== "resizeNode"
) {
- handleCardDropOnDocument(cardEmbedInitialData);
+ return handleCardDropOnDocument(cardEmbedInitialData);
}
}