@metadev/daga 1.5.4 → 1.5.5

package/Changelog.md

@@ -6,6 +6,12 @@ List of releases and changes.
 
 ## Next release Lobera
 
+## v. 1.5.5
+
+Date: _2024-10-02_
+
+- Ensure that decorators are always removed [#167](https://github.com/metadevpro/daga/pull/167)
+
 ## v. 1.5.4
 
 Date: _2024-09-21_

package/fesm2022/metadev-daga.mjs

@@ -3061,6 +3061,10 @@ class DiagramNodeSet extends DiagramEntitySet {
             while (node.ports.length > 0) {
                 this.model.ports.remove(node.ports[0].id);
             }
+            // remove all decorators
+            while (node.decorators.length > 0) {
+                this.model.decorators.remove(node.decorators[0].id);
+            }
             // remove label
             if (node.label) {
                 this.model.fields.remove(node.label.id);
@@ -3827,6 +3831,8 @@ class SetSelfRemovedCollabAction {
         this.canvas.updatePortsInView(...this.portIds);
         this.canvas.updateConnectionsInView(...this.connectionIds);
         this.canvas.updateFieldsInView(...this.fieldIds);
+        // some of the nodes and sections may have decorators, so update them
+        this.canvas.updateDecoratorsInView();
     }
     serialize() {
         return {
@@ -5424,11 +5430,12 @@ class DiagramEvent {
  * @public
  */
 class DiagramDecorator extends DiagramElement {
-    constructor(model, coords, width, height, priority, html, id) {
+    constructor(model, rootElement, coords, width, height, priority, html, id) {
         if (model.objects.get(id) !== undefined) {
             throw new Error(`DiagramObject with id "${id}" already exists`);
         }
         super(model, id);
+        this.rootElement = rootElement;
         this.coords = coords;
         this.width = width;
         this.height = height;
@@ -5441,7 +5448,8 @@ class DiagramDecorator extends DiagramElement {
             ?.select(`foreignObject#${this.id}`);
     }
     get removed() {
-        return this.selfRemoved;
+        return (this.selfRemoved ||
+            (this.rootElement !== undefined && this.rootElement.removed));
     }
     updateInView() {
         this.model.canvas?.updateDecoratorsInView(this.id);
@@ -5473,7 +5481,7 @@ class DiagramDecoratorSet extends DiagramEntitySet {
      * @private
      */
     new(rootElement, coords, width, height, priority, html, id) {
-        const decorator = new DiagramDecorator(this.model, coords, width, height, priority, html, id);
+        const decorator = new DiagramDecorator(this.model, rootElement, coords, width, height, priority, html, id);
         super.add(decorator);
         decorator.updateInView();
         // add this port to its root element
@@ -5483,12 +5491,17 @@ class DiagramDecoratorSet extends DiagramEntitySet {
         return decorator;
     }
     remove(id) {
-        const object = this.get(id);
-        if (object) {
+        const decorator = this.get(id);
+        if (decorator) {
+            // remove from root element
+            if (decorator.rootElement instanceof DiagramNode ||
+                decorator.rootElement instanceof DiagramSection) {
+                removeIfExists(decorator.rootElement.decorators, decorator);
+            }
             // remove from set of objects
             super.remove(id);
             // remove from canvas
-            object.updateInView();
+            decorator.updateInView();
         }
     }
 }
@@ -5641,6 +5654,7 @@ class DiagramModel {
         this.connections.clear();
         this.fields.clear();
         this.objects.clear();
+        this.decorators.clear();
         this.valueSet.resetValues();
         this.canvas?.updateModelInView();
     }