@linkurious/ogma-annotations 1.1.3 → 1.1.5

package/dist/index.mjs

@@ -589,7 +589,7 @@ function Re(u, l, t) {
 function qt(u) {
   return { start: Ot(u), end: Ft(u) };
 }
-function wt(u, l, t, r) {
+function bt(u, l, t, r) {
   l === "start" ? Ne(u, t, r) : Re(u, t, r);
 }
 const He = (u) => parseInt(u.getAttribute("data-handle-id") || "-1");
@@ -1399,7 +1399,7 @@ var Ve = { exports: {} };
         h = (i = e[e.length - 1]).width, i.width > o.width ? (i.value = i.value.slice(0, -1), i.width = U(i, i.font), y += i.width) : e.pop(), y -= h;
       e[e.length - 1] instanceof pt && e.pop(), i = e[e.length - 1] || i || {}, o.font = S(o.font, i.bold, i.italic, ""), o.href = e.length ? i.href : null, o.rel = e.length ? i.rel : null, o.target = e.length ? i.target : null, e.push(o);
     }
-    function mt(e) {
+    function vt(e) {
       return Math.round(1e6 * e) / 1e6;
     }
     function ve(e) {
@@ -1433,7 +1433,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     function gn(e, n) {
       var o = [], i = n.font(), h = i.size, y = i.family, w = n.align(), x = n.createElement();
       if (e.length) {
-        var b = i.height, E = n.valign(), O = n.height()(), M = n.width()(0), I = !isFinite(M) && e.length === 1, z = I ? null : n.x(), R = mt(b / h), Q = I ? null : mt(b / (1.15 * h + (b - h) / 2));
+        var b = i.height, E = n.valign(), O = n.height()(), M = n.width()(0), I = !isFinite(M) && e.length === 1, z = I ? null : n.x(), R = vt(b / h), Q = I ? null : vt(b / (1.15 * h + (b - h) / 2));
         if (pn[E] && isFinite(O)) {
           var P = E === "bottom" ? 1 : 0.5;
           Q += (O * P - b * e.length * P) / h;
@@ -1447,21 +1447,21 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           }
           tt = "tspan", Z = null, j = "";
         }, it = 0, et = e.length; it < et; it++) {
-          var ot = "", ut = "", st = 0, at = e[it];
-          if (at.length) {
+          var at = "", ut = "", st = 0, lt = e[it];
+          if (lt.length) {
             $ = [];
-            for (var vt = 0, It = 0, lt = void 0, W = 0, $t = at.length; W < $t; W++) {
-              var q = at[W], K = q.font;
-              q.whitespace && vt++, It += q.width, W && !q.tracking && !st && Kt(K.id, ot) && Kt(q.class, ut) && Kt(lt, q.href) ? j += q.value : (_(), j = q.value, Z = { fontFamily: K.family !== y ? K.family : null, fontSize: K.size !== h ? K.size : null, fontWeight: K.weight || null, fontStyle: K.style || null, fontVariant: K.variant !== "normal" && K.variant || null, fill: K.color || null, baselineShift: K.baseline ? 100 * K.baseline + "%" : null, className: q.class || null }, st && (Z.dx = mt(st), st = 0), q.tracking && (st = K.size * q.tracking), q.href && !lt ? (lt = q.href, tt = "a", Z.href = lt, Z.rel = q.rel, Z.target = q.target) : lt = null, ot = K.id, ut = q.class);
+            for (var xt = 0, It = 0, ht = void 0, W = 0, $t = lt.length; W < $t; W++) {
+              var q = lt[W], K = q.font;
+              q.whitespace && xt++, It += q.width, W && !q.tracking && !st && Kt(K.id, at) && Kt(q.class, ut) && Kt(ht, q.href) ? j += q.value : (_(), j = q.value, Z = { fontFamily: K.family !== y ? K.family : null, fontSize: K.size !== h ? K.size : null, fontWeight: K.weight || null, fontStyle: K.style || null, fontVariant: K.variant !== "normal" && K.variant || null, fill: K.color || null, baselineShift: K.baseline ? 100 * K.baseline + "%" : null, className: q.class || null }, st && (Z.dx = vt(st), st = 0), q.tracking && (st = K.size * q.tracking), q.href && !ht ? (ht = q.href, tt = "a", Z.href = ht, Z.rel = q.rel, Z.target = q.target) : ht = null, at = K.id, ut = q.class);
             }
             if (_(), I)
               o.push.apply(o, ve($));
             else {
-              var Nt = null, _t = it === et - 1 || at[at.length - 1] instanceof nt;
-              L && at.length > 1 && !_t && (Nt = mt((M - It) / vt)), o.push(x.apply(void 0, ["tspan", { wordSpacing: Nt, x: z(it) + H, dy: mt(it ? R : Q) + "em" }].concat(ve($))));
+              var Nt = null, _t = it === et - 1 || lt[lt.length - 1] instanceof nt;
+              L && lt.length > 1 && !_t && (Nt = vt((M - It) / xt)), o.push(x.apply(void 0, ["tspan", { wordSpacing: Nt, x: z(it) + H, dy: vt(it ? R : Q) + "em" }].concat(ve($))));
             }
           } else
-            o.push(x("tspan", { x: z(it), dy: mt(it ? R : Q) + "em" }, " "));
+            o.push(x("tspan", { x: z(it), dy: vt(it ? R : Q) + "em" }, " "));
         }
       }
       return x.apply(void 0, ["text", { fontFamily: y, fontSize: h, textAnchor: fn[w] || "start" }].concat(o));
@@ -1490,8 +1490,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             var et = 0;
             if (E === "right" ? et += b - $ : E === "center" ? et += b / 2 - $ / 2 : E === "justify" && (j.whitespace || j instanceof nt) && (P += tt), o.fillText(j.value, P + et, L + it), j.href) {
               o.beginPath(), o.strokeStyle = o.fillStyle;
-              var ot = Math.floor(L + 0.45 * y) + 0.5;
-              o.moveTo(P + et, ot), o.lineTo(P + et + j.width, ot), o.stroke();
+              var at = Math.floor(L + 0.45 * y) + 0.5;
+              o.moveTo(P + et, at), o.lineTo(P + et + j.width, at), o.stroke();
             }
             P += j.width;
           });
@@ -1574,21 +1574,21 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
               else if (_.whitespace || $ + _.width < I(H))
                 $ += _.width;
               else if (Z.length) {
-                var et = void 0, ot = void 0;
+                var et = void 0, at = void 0;
                 do {
-                  ot = !0, et = Z.pop();
+                  at = !0, et = Z.pop();
                   var ut = b[et.index], st = void 0;
-                  ut instanceof pt && (st = U("-", ut.font), et.width + st > I(H) && (ot = !Z.length));
-                } while (!ot);
+                  ut instanceof pt && (st = U("-", ut.font), et.width + st > I(H) && (at = !Z.length));
+                } while (!at);
                 tt.push(et.index + 1), $ = 0, H++, L = et.index, Z = [];
               } else if (R === "break-word") {
-                var at = I(H);
-                if ($ + _.width > at) {
-                  var vt = _.clone();
+                var lt = I(H);
+                if ($ + _.width > lt) {
+                  var xt = _.clone();
                   do
                     _.value = _.value.slice(0, -1), _.width = U(_, _.font), $ += _.width;
-                  while (_.value && _.width > at);
-                  vt.value = vt.value.slice(_.value.length), b.splice(L + 1, 0, new Et(), vt);
+                  while (_.value && _.width > lt);
+                  xt.value = xt.value.slice(_.value.length), b.splice(L + 1, 0, new Et(), xt);
                 }
                 tt.push(L + 1), $ = 0, H++;
               } else
@@ -1596,18 +1596,18 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             L++, j = _.whitespace;
           }
           L !== tt[tt.length - 1] && tt.push(L);
-          var It = 0, lt = 0, W = tt.map(function(gt) {
+          var It = 0, ht = 0, W = tt.map(function(gt) {
             for (var J, yt = It; (J = b[yt]) && (J.whitespace || !J.value); )
               yt++;
             for (var dt = gt, ne = null; dt > yt && (J = b[dt - 1]) && (J.whitespace || !(J.value || J instanceof pt)); )
               J instanceof nt && (ne = J), dt--;
             J instanceof pt && (J.value = "-", J.width = U("-", J.font)), It = gt;
-            var xt = b.slice(yt, dt).filter(function(ie) {
+            var wt = b.slice(yt, dt).filter(function(ie) {
               return ie.value;
             });
-            return ne && xt.push(ne), xt.width = xt.reduce(function(ie, En) {
+            return ne && wt.push(ne), wt.width = wt.reduce(function(ie, En) {
               return ie + En.width;
-            }, 0), xt.width > lt && (lt = xt.width), xt;
+            }, 0), wt.width > ht && (ht = wt.width), wt;
           });
           if (W.hasLineOverflow = !1, z) {
             var $t = z === "ellipsis" ? "…" : z;
@@ -1625,7 +1625,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             _t.font = O, _t.width = U(q, Q), me(Nt, K, _t), W.hasOverflow = !0;
           } else
             W.hasOverflow = !1;
-          return W.font = O, W.width = lt, W;
+          return W.font = O, W.width = ht, W;
         }(y, this, w);
         return x.height = x.length * w.height, x.render = function(b) {
           return h.render(x, b);
@@ -2070,7 +2070,7 @@ class Bn extends Be {
       background: s,
       padding: d = 0
     } = t.properties.style || At, m = (g || 1) * c;
-    this.textArea.value = t.properties.content, this.editor.element.style.transform = `translate(${a.x}px, ${a.y}px)translate(-50%, -50%)translate(${r.width / 2 * c}px, ${r.height / 2 * c}px)`, this.editor.element.style.width = `${r.width * c}px`, this.editor.element.style.height = `${r.height * c}px`, this.textArea.style.font = `${m} ${f}`, this.textArea.style.fontFamily = f || "sans-serif", this.textArea.style.fontSize = `${m}px`, this.textArea.style.padding = `${d}px`, this.textArea.style.lineHeight = `${m}px`, this.textArea.style.boxSizing = "border-box", this.textArea.style.color = p || "black", this.textArea.style.background = s || "transparent", this.textArea.placeholder = this.placeholder, this.layer.refresh();
+    this.textArea.value = t.properties.content, this.editor.element.style.transform = `translate(${a.x}px, ${a.y}px)translate(-50%, -50%)translate(${r.width / 2 * c}px, ${r.height / 2 * c}px)`, this.editor.element.style.width = `${r.width * c}px`, this.editor.element.style.height = `${r.height * c}px`, this.textArea.style.font = `${m} ${f}`, this.textArea.style.fontFamily = f || "sans-serif", this.textArea.style.fontSize = `${m}px`, this.textArea.style.padding = `${c * d}px`, this.textArea.style.lineHeight = `${m}px`, this.textArea.style.boxSizing = "border-box", this.textArea.style.color = p || "black", this.textArea.style.background = s || "transparent", this.textArea.placeholder = this.placeholder, this.layer.refresh();
   }
   select(t) {
     super.select(t), this.textArea.focus();
@@ -2134,7 +2134,7 @@ class Vn {
     Object.values(this.links).forEach(l);
   }
 }
-const ht = (u) => u.properties.type === "arrow", bt = (u) => u.properties.type === "text", ze = (u) => u.type === "FeatureCollection", Un = {
+const ot = (u) => u.properties.type === "arrow", mt = (u) => u.properties.type === "text", ze = (u) => u.type === "FeatureCollection", Un = {
   magnetColor: "#3e8",
   detectMargin: 20,
   magnetHandleRadius: 5,
@@ -2184,31 +2184,31 @@ class Gn extends qe {
     });
     v(this, "_onFeatureDrag", (t, r) => {
       const a = r;
-      if (ht(t) && a === "line")
+      if (ot(t) && a === "line")
         ["start", "end"].find((c) => {
           const f = c === "start" ? Ot(t) : Ft(t);
           return this._snapToText(t, a, f) || this._findAndSnapToNode(t, c, f);
         });
-      else if (ht(t) && a !== "line") {
+      else if (ot(t) && a !== "line") {
         const c = a === "start" ? Ot(t) : Ft(t);
         this._snapToText(t, a, c) || this._findAndSnapToNode(t, a, c);
       } else
-        bt(t) && (this.activeLinks.forEach(({ arrow: c, side: f, connectionPoint: g }) => {
+        mt(t) && (this.activeLinks.forEach(({ arrow: c, side: f, connectionPoint: g }) => {
           const p = this.getAnnotation(c), s = ct(t), d = ft(t), m = new G(g.x, g.y).mul({ x: s.width, y: s.height }).rotateRadians(this.ogma.view.getAngle()).add(d);
           p.geometry.coordinates[f === "start" ? 0 : 1] = [m.x, m.y];
         }), this.activeLinks.length && this.arrows.refreshLayer());
       this.layer.refresh(), this.emit(Bt, t, r);
     });
     v(this, "_onFeatureDragEnd", (t) => {
-      this.dragged !== null && ht(t) && Ot(this.dragged) && Le.forEach((r) => {
+      this.dragged !== null && ot(t) && Ot(this.dragged) && Le.forEach((r) => {
         this.links.getArrowLink(t.id, r) && this.emit(Nn, {
           arrow: t,
           link: this.links.getArrowLink(t.id, r)
         });
-      }), (bt(t) || ht(t)) && this.onUpdate(t), this.dragged = null, this.activeLinks = [], this.textToMagnet = void 0, this.annotations.forEach((r) => r.enableDetection()), this.layer.refresh(), this.emit(St, t);
+      }), (mt(t) || ot(t)) && this.onUpdate(t), this.dragged = null, this.activeLinks = [], this.textToMagnet = void 0, this.annotations.forEach((r) => r.enableDetection()), this.layer.refresh(), this.emit(St, t);
     });
     v(this, "_onFeatureDragStart", (t) => {
-      this.textToMagnet = void 0, ht(t) ? this.dragged = t : bt(t) && this.activeLinks.push(...this.links.getTargetLinks(t.id, "text")), this.annotations.forEach((r) => {
+      this.textToMagnet = void 0, ot(t) ? this.dragged = t : mt(t) && this.activeLinks.push(...this.links.getTargetLinks(t.id, "text")), this.annotations.forEach((r) => {
         const a = r.getSelectedFeature();
         a && a !== t && r.unhover().unselect(), r.disableDetection();
       }), this.emit(Vt, t);
@@ -2227,7 +2227,7 @@ class Gn extends qe {
             g,
             p === "start" ? "end" : "start"
           ), d = t.positions.current[a], m = this.ogma.getNode(r).getAttribute("radius"), A = Ht(s, d, +m);
-          wt(g, p, A.x, A.y);
+          bt(g, p, A.x, A.y);
         });
       }), this.arrows.refreshLayer(), this.texts.refreshLayer();
     });
@@ -2271,7 +2271,7 @@ class Gn extends qe {
         );
         let A = g;
         const T = +c.getAttribute("radius"), S = 1e-6;
-        (p.connectionPoint.x - (g.x - r) > S || p.connectionPoint.y - (g.y - a) > S) && (A = Ht(m, g, T)), wt(s, d, A.x, A.y);
+        (p.connectionPoint.x - (g.x - r) > S || p.connectionPoint.y - (g.y - a) > S) && (A = Ht(m, g, T)), bt(s, d, A.x, A.y);
       });
     }), this.arrows.refreshLayer();
   }
@@ -2281,7 +2281,7 @@ class Gn extends qe {
       return !1;
     this.textToMagnet = c;
     const f = this.findMagnetPoint(Ce, c, a);
-    return f ? (wt(t, r, f.point.x, f.point.y), this.links.add(t, r, c.id, "text", f.magnet), !0) : !1;
+    return f ? (bt(t, r, f.point.x, f.point.y), this.links.add(t, r, c.id, "text", f.magnet), !0) : !1;
   }
   _findAndSnapToNode(t, r, a) {
     const c = this.ogma.view.graphToScreenCoordinates(a), f = this.ogma.view.getElementAt(c);
@@ -2295,7 +2295,7 @@ class Gn extends qe {
         const S = Rt(t, r === "end" ? "start" : "end");
         T = Ht(S, T, g);
       }
-      wt(t, r, T.x, T.y), this.links.add(t, r, a.getId(), "node", T);
+      bt(t, r, T.x, T.y), this.links.add(t, r, a.getId(), "node", T);
     }
   }
   refreshTextLinks() {
@@ -2305,7 +2305,7 @@ class Gn extends qe {
         return;
       t = !0;
       const p = this.getAnnotation(c), s = this.getAnnotation(f), d = ct(p), m = ft(p), A = new G(r.x, r.y).mul({ x: d.width, y: d.height }).rotateRadians(this.ogma.view.getAngle()).add(m);
-      wt(s, g, A.x, A.y);
+      bt(s, g, A.x, A.y);
     }), t && this.arrows.refreshLayer();
   }
   /**
@@ -2350,23 +2350,27 @@ class Gn extends qe {
    */
   select(t) {
     const r = this.getAnnotations().features.find((a) => a.id === t);
-    return r ? (ht(r) ? this.arrows.select(r.id) : bt(r) && this.texts.select(r.id), this) : this;
+    return r ? (ot(r) ? this.arrows.select(r.id) : mt(r) && this.texts.select(r.id), this) : this;
   }
   /**
    * Unselects the currently selected annotation
    */
   unselect() {
-    return this.selected ? (ht(this.selected) ? this.arrows.unselect() : bt(this.selected) && this.texts.unselect(), this) : this;
+    return this.selected ? (ot(this.selected) ? this.arrows.unselect() : mt(this.selected) && this.texts.unselect(), this) : this;
   }
   /**
    * Add an annotation to the controller
    * @param annotation The annotation to add
    */
   add(t) {
-    if (ze(t))
-      return t.features.forEach(
-        (r) => this.add(r)
+    if (ze(t)) {
+      const [r, a] = t.features.reduce((c, f) => (ot(f) ? c[1].push(f) : mt(f) && c[0].push(f), c), [[], []]);
+      return r.forEach(
+        (c) => this.add(c)
+      ), a.forEach(
+        (c) => this.add(c)
       ), this.arrows.refreshLayer(), this;
+    }
     switch (t.properties.type) {
       case "text":
         this.texts.add(t);
@@ -2384,7 +2388,7 @@ class Gn extends qe {
   remove(t) {
     return ze(t) ? (t.features.forEach(
       (r) => this.remove(r)
-    ), this) : (ht(t) ? (this.links.remove(t, "start"), this.links.remove(t, "end"), this.arrows.remove(t.id)) : this.texts.remove(t.id), this);
+    ), this) : (ot(t) ? (this.links.remove(t, "start"), this.links.remove(t, "end"), this.arrows.remove(t.id)) : this.texts.remove(t.id), this);
   }
   loadLink(t) {
     if (t.properties.link)
@@ -2392,15 +2396,16 @@ class Gn extends qe {
         const a = t.properties.link[r];
         if (!a)
           continue;
-        if (this.getAnnotation(a.id))
+        const c = this.getAnnotation(a.id);
+        if (a.type === "text" && c)
           this.links.add(t, r, a.id, a.type, a.magnet);
-        else {
+        else if (a.type === "node") {
           const f = this.ogma.getNode(a.id);
           if (!f)
             continue;
           this.links.add(t, r, a.id, a.type, a.magnet);
           const g = f.getPosition(), p = f.getAttribute("radius") || 0, s = Rt(t, r === "start" ? "end" : "start"), d = Ht(s, g, +p);
-          wt(t, r, d.x, d.y);
+          bt(t, r, d.x, d.y);
         }
       }
   }
@@ -2435,7 +2440,7 @@ class Gn extends qe {
    */
   updateStyle(t, r) {
     const a = this.getAnnotations().features.find((c) => c.id === t);
-    return a ? (ht(a) ? this.arrows.updateStyle(a, r) : bt(a) && this.texts.updateStyle(a, r), this.onUpdate(a), this) : this;
+    return a ? (ot(a) ? this.arrows.updateStyle(a, r) : mt(a) && this.texts.updateStyle(a, r), this.onUpdate(a), this) : this;
   }
   /**
    * 
@@ -2488,10 +2493,10 @@ export {
   ft as getTextPosition,
   ct as getTextSize,
   ze as isAnnotationCollection,
-  ht as isArrow,
-  bt as isText,
+  ot as isArrow,
+  mt as isText,
   Re as setArrowEnd,
-  wt as setArrowEndPoint,
+  bt as setArrowEndPoint,
   Ne as setArrowStart,
   zn as setTextBbox,
   Mn as updateTextBbox