Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

fix: boundElementIds when arrows bound to elements are deleted (#5077)

Aakansha Doshia66cfe26271d
diff --git a/src/element/binding.ts b/src/element/binding.ts
index 8d681bc2a3..ff23dd07b3 100644
--- a/src/element/binding.ts
+++ b/src/element/binding.ts
@@ -660,28 +660,47 @@ export const fixBindingsAfterDeletion = (
const deletedElementIds = new Set(
deletedElements.map((element) => element.id),
);
- // Non deleted and need an update
- const boundElementIds: Set<ExcalidrawElement["id"]> = new Set();
+ // non-deleted which bindings need to be updated
+ const affectedElements: Set<ExcalidrawElement["id"]> = new Set();
deletedElements.forEach((deletedElement) => {
if (isBindableElement(deletedElement)) {
deletedElement.boundElements?.forEach((element) => {
if (!deletedElementIds.has(element.id)) {
- boundElementIds.add(element.id);
+ affectedElements.add(element.id);
}
});
+ } else if (isBindingElement(deletedElement)) {
+ if (deletedElement.startBinding) {
+ affectedElements.add(deletedElement.startBinding.elementId);
+ }
+ if (deletedElement.endBinding) {
+ affectedElements.add(deletedElement.endBinding.elementId);
+ }
}
});
- (
- sceneElements.filter(({ id }) =>
- boundElementIds.has(id),
- ) as ExcalidrawLinearElement[]
- ).forEach((element: ExcalidrawLinearElement) => {
- const { startBinding, endBinding } = element;
- mutateElement(element, {
- startBinding: newBindingAfterDeletion(startBinding, deletedElementIds),
- endBinding: newBindingAfterDeletion(endBinding, deletedElementIds),
+ sceneElements
+ .filter(({ id }) => affectedElements.has(id))
+ .forEach((element) => {
+ if (isBindableElement(element)) {
+ mutateElement(element, {
+ boundElements: newBoundElementsAfterDeletion(
+ element.boundElements,
+ deletedElementIds,
+ ),
+ });
+ } else if (isBindingElement(element)) {
+ mutateElement(element, {
+ startBinding: newBindingAfterDeletion(
+ element.startBinding,
+ deletedElementIds,
+ ),
+ endBinding: newBindingAfterDeletion(
+ element.endBinding,
+ deletedElementIds,
+ ),
+ });
+ }
});
- });
};
const newBindingAfterDeletion = (
@@ -693,3 +712,13 @@ const newBindingAfterDeletion = (
}
return binding;
};
+
+const newBoundElementsAfterDeletion = (
+ boundElements: ExcalidrawElement["boundElements"],
+ deletedElementIds: Set<ExcalidrawElement["id"]>,
+) => {
+ if (!boundElements) {
+ return null;
+ }
+ return boundElements.filter((ele) => !deletedElementIds.has(ele.id));
+};