@marimo-team/islands 0.16.5 → 0.17.1

package/dist/{cytoscape.esm-DTDV0Nbj.js → cytoscape.esm-BFEMljQI.js}

@@ -1213,7 +1213,7 @@ function requireDebounce() {
   }
   return debounce_1 = s, debounce_1;
 }
-var debounceExports = requireDebounce(), debounce = /* @__PURE__ */ getDefaultExportFromCjs(debounceExports), performance$1 = _window ? _window.performance : null, pnow = performance$1 && performance$1.now ? function() {
+var debounce = /* @__PURE__ */ getDefaultExportFromCjs(requireDebounce()), performance$1 = _window ? _window.performance : null, pnow = performance$1 && performance$1.now ? function() {
   return performance$1.now();
 } : function() {
   return Date.now();
@@ -1279,10 +1279,10 @@ var debounceExports = requireDebounce(), debounce = /* @__PURE__ */ getDefaultEx
   return t;
 };
 function rotatePoint(e, t, n, r, a) {
-  var o = a * Math.PI / 180, s = Math.cos(o) * (e - n) - Math.sin(o) * (t - r) + n, c = Math.sin(o) * (e - n) + Math.cos(o) * (t - r) + r;
+  var o = a * Math.PI / 180;
   return {
-    x: s,
-    y: c
+    x: Math.cos(o) * (e - n) - Math.sin(o) * (t - r) + n,
+    y: Math.sin(o) * (e - n) + Math.cos(o) * (t - r) + r
   };
 }
 var movePointByBoxAspect = function(e, t, n, r, a, o) {
@@ -1672,7 +1672,7 @@ var heap, hasRequiredHeap;
 function requireHeap() {
   return hasRequiredHeap ? heap : (hasRequiredHeap = 1, heap = requireHeap$1(), heap);
 }
-var heapExports = requireHeap(), Heap = /* @__PURE__ */ getDefaultExportFromCjs(heapExports), dijkstraDefaults = defaults$g({
+var Heap = /* @__PURE__ */ getDefaultExportFromCjs(requireHeap()), dijkstraDefaults = defaults$g({
   root: null,
   weight: function(e) {
     return 1;
@@ -1722,8 +1722,7 @@ var heapExports = requireHeap(), Heap = /* @__PURE__ */ getDefaultExportFromCjs(
   }
   return {
     distanceTo: function(e2) {
-      var t2 = string(e2) ? h.filter(e2)[0] : e2[0];
-      return f[t2.id()];
+      return f[(string(e2) ? h.filter(e2)[0] : e2[0]).id()];
     },
     pathTo: function(e2) {
       var t2 = string(e2) ? h.filter(e2)[0] : e2[0], n2 = [], r2 = t2, a2 = r2.id();
@@ -1901,12 +1900,12 @@ var heapExports = requireHeap(), Heap = /* @__PURE__ */ getDefaultExportFromCjs(
         Q.push(b(Z).edge);
         for (var $ = b(Z).pred; Q.indexOf($) === -1; ) Q.push($), Q.push(b($).edge), $ = b($).pred;
         Q = Q.slice(Q.indexOf($));
-        for (var zh = Q[0].id(), Bh = 0, Vh = 2; Vh < Q.length; Vh += 2) Q[Vh].id() < zh && (zh = Q[Vh].id(), Bh = Vh);
-        Q = Q.slice(Bh).concat(Q.slice(0, Bh)), Q.push(Q[0]);
-        var Hh = Q.map(function(e2) {
+        for (var Dh = Q[0].id(), Oh = 0, kh = 2; kh < Q.length; kh += 2) Q[kh].id() < Dh && (Dh = Q[kh].id(), Oh = kh);
+        Q = Q.slice(Oh).concat(Q.slice(0, Oh)), Q.push(Q[0]);
+        var Ah = Q.map(function(e2) {
           return e2.id();
         }).join(",");
-        z.indexOf(Hh) === -1 && (_.push(c.spawn(Q)), z.push(Hh));
+        z.indexOf(Ah) === -1 && (_.push(c.spawn(Q)), z.push(Ah));
       }
     } else break;
   }
@@ -1929,10 +1928,7 @@ var heapExports = requireHeap(), Heap = /* @__PURE__ */ getDefaultExportFromCjs(
   for (var _ = 0; _ < t.length; _++) t[_] === c && (t[_] = s);
   return l;
 }, contractUntil = function(e, t, n, r) {
-  for (; n > r; ) {
-    var a = Math.floor(Math.random() * t.length);
-    t = collapse(a, e, t), n--;
-  }
+  for (; n > r; ) t = collapse(Math.floor(Math.random() * t.length), e, t), n--;
   return t;
 }, elesfn$p = { kargerStein: function() {
   var e = this, t = this.byGroup(), n = t.nodes, r = t.edges;
@@ -1974,10 +1970,10 @@ var heapExports = requireHeap(), Heap = /* @__PURE__ */ getDefaultExportFromCjs(
         e.contains(t4) && !D.contains(t4) && n2.merge(t4);
       });
     }), n2;
-  }, F = [P(O), P(k)];
+  };
   return {
     cut: D,
-    components: F,
+    components: [P(O), P(k)],
     partition1: O,
     partition2: k
   };
@@ -2172,9 +2168,7 @@ function inflatePolygon(e, t) {
     return t2 / 2;
   }, l = function(e2, t2, s2, c2) {
     var l2 = r(t2, e2), u2 = r(c2, s2), d2 = o(l2, u2);
-    if (Math.abs(d2) < 1e-9) return n(e2, a(l2, 0.5));
-    var f2 = o(r(s2, e2), u2) / d2;
-    return n(e2, a(l2, f2));
+    return Math.abs(d2) < 1e-9 ? n(e2, a(l2, 0.5)) : n(e2, a(l2, o(r(s2, e2), u2) / d2));
   }, u = e.map(function(e2) {
     return {
       x: e2.x,
@@ -2190,10 +2184,9 @@ function inflatePolygon(e, t) {
     f.push(v);
   }
   for (var b = f.map(function(e2, r2) {
-    var o2 = n(u[r2], a(e2, t)), s2 = n(u[(r2 + 1) % d], a(e2, t));
     return {
-      p1: o2,
-      p2: s2
+      p1: n(u[r2], a(e2, t)),
+      p2: n(u[(r2 + 1) % d], a(e2, t))
     };
   }), S = [], C = 0; C < d; C++) {
     var w = b[(C - 1 + d) % d], T = b[C], E = l(w.p1, w.p2, T.p1, T.p2);
@@ -2202,39 +2195,39 @@ function inflatePolygon(e, t) {
   return S;
 }
 function miterBox(e, t, n, r, a, o) {
-  var s = transformPoints(e, t, n, r, a), c = inflatePolygon(s, o), l = makeBoundingBox();
-  return c.forEach(function(e2) {
-    return expandBoundingBoxByPoint(l, e2.x, e2.y);
-  }), l;
+  var s = inflatePolygon(transformPoints(e, t, n, r, a), o), c = makeBoundingBox();
+  return s.forEach(function(e2) {
+    return expandBoundingBoxByPoint(c, e2.x, e2.y);
+  }), c;
 }
 var roundRectangleIntersectLine = function(e, t, n, r, a, o, s) {
   var c = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : "auto", l = c === "auto" ? getRoundRectangleRadius(a, o) : c, u = a / 2, d = o / 2;
   l = Math.min(l, u, d);
   var f = l !== u, m = l !== d, h;
   if (f) {
-    var g = n - u + l - s, _ = r - d - s, v = n + u - l + s;
-    if (h = finiteLinesIntersect(e, t, n, r, g, _, v, _, false), h.length > 0) return h;
+    var g = n - u + l - s, _ = r - d - s;
+    if (h = finiteLinesIntersect(e, t, n, r, g, _, n + u - l + s, _, false), h.length > 0) return h;
   }
   if (m) {
-    var b = n + u + s, S = r - d + l - s, C = b, w = r + d - l + s;
-    if (h = finiteLinesIntersect(e, t, n, r, b, S, C, w, false), h.length > 0) return h;
+    var v = n + u + s;
+    if (h = finiteLinesIntersect(e, t, n, r, v, r - d + l - s, v, r + d - l + s, false), h.length > 0) return h;
   }
   if (f) {
-    var T = n - u + l - s, E = r + d + s, D = n + u - l + s;
-    if (h = finiteLinesIntersect(e, t, n, r, T, E, D, E, false), h.length > 0) return h;
+    var b = n - u + l - s, S = r + d + s;
+    if (h = finiteLinesIntersect(e, t, n, r, b, S, n + u - l + s, S, false), h.length > 0) return h;
   }
   if (m) {
-    var O = n - u - s, k = r - d + l - s, A = O, j = r + d - l + s;
-    if (h = finiteLinesIntersect(e, t, n, r, O, k, A, j, false), h.length > 0) return h;
-  }
-  var M, N = n - u + l, P = r - d + l;
-  if (M = intersectLineCircle(e, t, n, r, N, P, l + s), M.length > 0 && M[0] <= N && M[1] <= P) return [M[0], M[1]];
-  var F = n + u - l, I = r - d + l;
-  if (M = intersectLineCircle(e, t, n, r, F, I, l + s), M.length > 0 && M[0] >= F && M[1] <= I) return [M[0], M[1]];
-  var L = n + u - l, R = r + d - l;
-  if (M = intersectLineCircle(e, t, n, r, L, R, l + s), M.length > 0 && M[0] >= L && M[1] >= R) return [M[0], M[1]];
-  var z = n - u + l, B = r + d - l;
-  return M = intersectLineCircle(e, t, n, r, z, B, l + s), M.length > 0 && M[0] <= z && M[1] >= B ? [M[0], M[1]] : [];
+    var C = n - u - s;
+    if (h = finiteLinesIntersect(e, t, n, r, C, r - d + l - s, C, r + d - l + s, false), h.length > 0) return h;
+  }
+  var w, T = n - u + l, E = r - d + l;
+  if (w = intersectLineCircle(e, t, n, r, T, E, l + s), w.length > 0 && w[0] <= T && w[1] <= E) return [w[0], w[1]];
+  var D = n + u - l, O = r - d + l;
+  if (w = intersectLineCircle(e, t, n, r, D, O, l + s), w.length > 0 && w[0] >= D && w[1] <= O) return [w[0], w[1]];
+  var k = n + u - l, A = r + d - l;
+  if (w = intersectLineCircle(e, t, n, r, k, A, l + s), w.length > 0 && w[0] >= k && w[1] >= A) return [w[0], w[1]];
+  var j = n - u + l, M = r + d - l;
+  return w = intersectLineCircle(e, t, n, r, j, M, l + s), w.length > 0 && w[0] <= j && w[1] >= M ? [w[0], w[1]] : [];
 }, inLineVicinity = function(e, t, n, r, a, o, s) {
   var c = s, l = Math.min(n, a), u = Math.max(n, a), d = Math.min(r, o), f = Math.max(r, o);
   return l - c <= e && e <= u + c && d - c <= t && t <= f + c;
@@ -2250,8 +2243,8 @@ var roundRectangleIntersectLine = function(e, t, n, r, a, o, s) {
   n -= r;
   var a = t * t - 4 * e * n;
   if (a < 0) return [];
-  var o = Math.sqrt(a), s = 2 * e, c = (-t + o) / s, l = (-t - o) / s;
-  return [c, l];
+  var o = Math.sqrt(a), s = 2 * e;
+  return [(-t + o) / s, (-t - o) / s];
 }, solveCubic = function(e, t, n, r, a) {
   e === 0 && (e = 1e-5), t /= e, n /= e, r /= e;
   var o, s = (3 * n - t * t) / 9, c = -(27 * r) + t * (9 * n - 2 * (t * t)), l, u, d, f, m;
@@ -2282,12 +2275,7 @@ var roundRectangleIntersectLine = function(e, t, n, r, a, o, s) {
   var u = Array(n.length), d;
   c[0] == null ? d = c : (d = Math.atan(c[1] / c[0]), c[0] < 0 ? d += Math.PI / 2 : d = -d - Math.PI / 2);
   for (var f = Math.cos(-d), m = Math.sin(-d), h = 0; h < u.length / 2; h++) u[h * 2] = o / 2 * (n[h * 2] * f - n[h * 2 + 1] * m), u[h * 2 + 1] = s / 2 * (n[h * 2 + 1] * f + n[h * 2] * m), u[h * 2] += r, u[h * 2 + 1] += a;
-  var g;
-  if (l > 0) {
-    var _ = expandPolygon(u, -l);
-    g = joinLines(_);
-  } else g = u;
-  return pointInsidePolygonPoints(e, t, g);
+  return pointInsidePolygonPoints(e, t, l > 0 ? joinLines(expandPolygon(u, -l)) : u);
 }, pointInsideRoundPolygon = function(e, t, n, r, a, o, s, c) {
   for (var l = Array(n.length * 2), u = 0; u < c.length; u++) {
     var d = c[u];
@@ -2323,16 +2311,12 @@ var roundRectangleIntersectLine = function(e, t, n, r, a, o, s) {
   var h = (-d + Math.sqrt(m)) / (2 * u), g = (-d - Math.sqrt(m)) / (2 * u), _ = Math.min(h, g), v = Math.max(h, g), b = [];
   if (_ >= 0 && _ <= 1 && b.push(_), v >= 0 && v <= 1 && b.push(v), b.length === 0) return [];
   var S = b[0] * c[0] + e, C = b[0] * c[1] + t;
-  if (b.length > 1) {
-    if (b[0] == b[1]) return [S, C];
-    var w = b[1] * c[0] + e, T = b[1] * c[1] + t;
-    return [
-      S,
-      C,
-      w,
-      T
-    ];
-  } else return [S, C];
+  return b.length > 1 ? b[0] == b[1] ? [S, C] : [
+    S,
+    C,
+    b[1] * c[0] + e,
+    b[1] * c[1] + t
+  ] : [S, C];
 }, midOfThree = function(e, t, n) {
   return t <= e && e <= n || n <= e && e <= t ? e : e <= t && t <= n || n <= t && t <= e ? t : n;
 }, finiteLinesIntersect = function(e, t, n, r, a, o, s, c, l) {
@@ -2359,12 +2343,9 @@ var roundRectangleIntersectLine = function(e, t, n, r, a, o, s) {
   var m;
   if (f) {
     for (var h = 0; h < d.length / 2; h++) d[h * 2] = n[h * 2] * o + r, d[h * 2 + 1] = n[h * 2 + 1] * s + a;
-    if (c > 0) {
-      var g = expandPolygon(d, -c);
-      m = joinLines(g);
-    } else m = d;
+    m = c > 0 ? joinLines(expandPolygon(d, -c)) : d;
   } else m = n;
-  for (var _, v, b, S, C = 0; C < m.length / 2; C++) _ = m[C * 2], v = m[C * 2 + 1], C < m.length / 2 - 1 ? (b = m[(C + 1) * 2], S = m[(C + 1) * 2 + 1]) : (b = m[0], S = m[1]), u = finiteLinesIntersect(e, t, r, a, _, v, b, S), u.length !== 0 && l.push(u[0], u[1]);
+  for (var g, _, v, b, S = 0; S < m.length / 2; S++) g = m[S * 2], _ = m[S * 2 + 1], S < m.length / 2 - 1 ? (v = m[(S + 1) * 2], b = m[(S + 1) * 2 + 1]) : (v = m[0], b = m[1]), u = finiteLinesIntersect(e, t, r, a, g, _, v, b), u.length !== 0 && l.push(u[0], u[1]);
   return l;
 }, roundPolygonIntersectLine = function(e, t, n, r, a, o, s, c, l) {
   var u = [], d, f = Array(n.length * 2);
@@ -2452,16 +2433,16 @@ function satPolygonIntersection(e, t) {
   function a(e2, t2) {
     return !(e2.max < t2.min || t2.max < e2.min);
   }
-  var o = [].concat(_toConsumableArray(n(e)), _toConsumableArray(n(t))), c = _createForOfIteratorHelper(o), l;
+  var o = _createForOfIteratorHelper([].concat(_toConsumableArray(n(e)), _toConsumableArray(n(t)))), c;
   try {
-    for (c.s(); !(l = c.n()).done; ) {
-      var u = l.value, d = r(e, u), f = r(t, u);
-      if (!a(d, f)) return false;
+    for (o.s(); !(c = o.n()).done; ) {
+      var l = c.value;
+      if (!a(r(e, l), r(t, l))) return false;
     }
   } catch (e2) {
-    c.e(e2);
+    o.e(e2);
   } finally {
-    c.f();
+    o.f();
   }
   return true;
 }
@@ -2704,10 +2685,7 @@ var defaults$c = defaults$g({
   for (var r = Array(t * t), a = 0; a < t * t; a++) r[a] = e[a] ** +n;
   return normalize(r, t), r;
 }, hasConverged = function(e, t, n, r) {
-  for (var a = 0; a < n; a++) {
-    var o = Math.round(e[a] * 10 ** r) / 10 ** r, s = Math.round(t[a] * 10 ** r) / 10 ** r;
-    if (o !== s) return false;
-  }
+  for (var a = 0; a < n; a++) if (Math.round(e[a] * 10 ** r) / 10 ** r != Math.round(t[a] * 10 ** r) / 10 ** r) return false;
   return true;
 }, assign$2 = function(e, t, n, r) {
   for (var a = [], o = 0; o < t; o++) {
@@ -3108,11 +3086,11 @@ var defaults$b = defaults$g({
   }
   for (var q = findExemplars(s, d, f), J = assign(s, l, q), Y = {}, X = 0; X < q.length; X++) Y[q[X]] = [];
   for (var Z = 0; Z < n.length; Z++) {
-    var Q = a[n[Z].id()], $ = J[Q];
-    $ != null && Y[$].push(n[Z]);
+    var Q = J[a[n[Z].id()]];
+    Q != null && Y[Q].push(n[Z]);
   }
-  for (var zh = Array(q.length), Bh = 0; Bh < q.length; Bh++) zh[Bh] = t.collection(Y[q[Bh]]);
-  return zh;
+  for (var $ = Array(q.length), Dh = 0; Dh < q.length; Dh++) $[Dh] = t.collection(Y[q[Dh]]);
+  return $;
 }, affinityPropagation$1 = {
   affinityPropagation,
   ap: affinityPropagation
@@ -3522,28 +3500,28 @@ var define$3 = {
           break;
       }
       if (c && (e.style = l.getPropsList(e.style || e.css), e.css = void 0), c && e.renderedPosition != null) {
-        var u = e.renderedPosition, d = o.pan(), f = o.zoom();
-        e.position = renderedToModelPosition(u, f, d);
+        var u = e.renderedPosition, d = o.pan();
+        e.position = renderedToModelPosition(u, o.zoom(), d);
       }
       if (s && e.panBy != null) {
-        var m = e.panBy, h = o.pan();
+        var f = e.panBy, m = o.pan();
         e.pan = {
-          x: h.x + m.x,
-          y: h.y + m.y
+          x: m.x + f.x,
+          y: m.y + f.y
         };
       }
-      var g = e.center || e.centre;
-      if (s && g != null) {
-        var _ = o.getCenterPan(g.eles, e.zoom);
-        _ != null && (e.pan = _);
+      var h = e.center || e.centre;
+      if (s && h != null) {
+        var g = o.getCenterPan(h.eles, e.zoom);
+        g != null && (e.pan = g);
       }
       if (s && e.fit != null) {
-        var v = e.fit, b = o.getFitViewport(v.eles || v.boundingBox, v.padding);
-        b != null && (e.pan = b.pan, e.zoom = b.zoom);
+        var _ = e.fit, v = o.getFitViewport(_.eles || _.boundingBox, _.padding);
+        v != null && (e.pan = v.pan, e.zoom = v.zoom);
       }
       if (s && plainObject(e.zoom)) {
-        var S = o.getZoomedViewport(e.zoom);
-        S == null ? e.zoom = null : (S.zoomed && (e.zoom = S.zoom), S.panned && (e.pan = S.pan));
+        var b = o.getZoomedViewport(e.zoom);
+        b == null ? e.zoom = null : (b.zoomed && (e.zoom = b.zoom), b.panned && (e.pan = b.pan));
       }
       return new Animation(a[0], e);
     };
@@ -3780,9 +3758,7 @@ function require_listCacheDelete() {
   var e = require_assocIndexOf(), t = Array.prototype.splice;
   function n(n2) {
     var r = this.__data__, a = e(r, n2);
-    if (a < 0) return false;
-    var o = r.length - 1;
-    return a == o ? r.pop() : t.call(r, a, 1), --this.size, true;
+    return a < 0 ? false : (a == r.length - 1 ? r.pop() : t.call(r, a, 1), --this.size, true);
   }
   return _listCacheDelete = n, _listCacheDelete;
 }
@@ -3834,10 +3810,7 @@ function require_ListCache() {
 }
 var _Map, hasRequired_Map;
 function require_Map() {
-  if (hasRequired_Map) return _Map;
-  hasRequired_Map = 1;
-  var e = require_getNative(), t = require_root();
-  return _Map = e(t, "Map"), _Map;
+  return hasRequired_Map ? _Map : (hasRequired_Map = 1, _Map = require_getNative()(require_root(), "Map"), _Map);
 }
 var _mapCacheClear, hasRequired_mapCacheClear;
 function require_mapCacheClear() {
@@ -4051,7 +4024,7 @@ function requireGet() {
   }
   return get_1 = t, get_1;
 }
-var getExports = requireGet(), get = /* @__PURE__ */ getDefaultExportFromCjs(getExports), _defineProperty, hasRequired_defineProperty;
+var get = /* @__PURE__ */ getDefaultExportFromCjs(requireGet()), _defineProperty, hasRequired_defineProperty;
 function require_defineProperty() {
   if (hasRequired_defineProperty) return _defineProperty;
   hasRequired_defineProperty = 1;
@@ -4132,7 +4105,7 @@ function requireSet() {
   }
   return set_1 = t, set_1;
 }
-var setExports = requireSet(), set = /* @__PURE__ */ getDefaultExportFromCjs(setExports), _copyArray, hasRequired_copyArray;
+var set = /* @__PURE__ */ getDefaultExportFromCjs(requireSet()), _copyArray, hasRequired_copyArray;
 function require_copyArray() {
   if (hasRequired_copyArray) return _copyArray;
   hasRequired_copyArray = 1;
@@ -4153,7 +4126,7 @@ function requireToPath() {
   }
   return toPath_1 = c, toPath_1;
 }
-var toPathExports = requireToPath(), toPath = /* @__PURE__ */ getDefaultExportFromCjs(toPathExports), define$2 = {
+var toPath = /* @__PURE__ */ getDefaultExportFromCjs(requireToPath()), define$2 = {
   data: function(e) {
     return e = extend({}, {
       field: "data",
@@ -5070,8 +5043,8 @@ var elesfn$g = {
   same: function(e) {
     if (this === e) return true;
     e = this.cy().collection(e);
-    var t = this.length, n = e.length;
-    return t === n ? t === 1 ? this[0] === e[0] : this.every(function(t2) {
+    var t = this.length;
+    return t === e.length ? t === 1 ? this[0] === e[0] : this.every(function(t2) {
       return e.hasElementWithId(t2.id());
     }) : false;
   },
@@ -5436,10 +5409,7 @@ fn$4 = elesfn$c = {
       var u = this[l];
       t === void 0 ? s !== void 0 && u.position(renderedToModelPosition(s, a, o)) : u.position(e, (t - o[e]) / a);
     }
-    else {
-      var d = n.position();
-      return s = modelToRenderedPosition$1(d, a, o), e === void 0 ? s : s[e];
-    }
+    else return s = modelToRenderedPosition$1(n.position(), a, o), e === void 0 ? s : s[e];
     else if (!c) return;
     return this;
   },
@@ -5646,17 +5616,13 @@ var noninf = function(e) {
   }
 }, updateBoundsFromOutline = function(e, t) {
   if (!t.cy().headless()) {
-    var n = t.pstyle("outline-opacity").value, r = t.pstyle("outline-width").value, a = t.pstyle("outline-offset").value, o = r + a;
-    updateBoundsFromMiter(e, t, n, o, "outside", o / 2);
+    var n = t.pstyle("outline-opacity").value, r = t.pstyle("outline-width").value + t.pstyle("outline-offset").value;
+    updateBoundsFromMiter(e, t, n, r, "outside", r / 2);
   }
 }, updateBoundsFromMiter = function(e, t, n, r, a, o) {
   if (!(n === 0 || r <= 0 || a === "inside")) {
     var s = t.cy(), c = t.pstyle("shape").value, l = s.renderer().nodeShapes[c], u = t.position(), d = u.x, f = u.y, m = t.width(), h = t.height();
-    if (l.hasMiterBounds) {
-      a === "center" && (r /= 2);
-      var g = l.miterBounds(d, f, m, h, r);
-      updateBoundsFromBox(e, g);
-    } else o != null && o > 0 && expandBoundingBoxSides(e, [
+    l.hasMiterBounds ? (a === "center" && (r /= 2), updateBoundsFromBox(e, l.miterBounds(d, f, m, h, r))) : o != null && o > 0 && expandBoundingBoxSides(e, [
       o,
       o,
       o,
@@ -5899,7 +5865,7 @@ var widthHeight = elesfn$a, ifEdge = function(e, t) {
   } }
 }, renderedName = function(e) {
   return "rendered" + e[0].toUpperCase() + e.substr(1);
-}, edgePoints = Object.keys(pts).reduce(function(e, t) {
+}, dimensions = extend({}, position, bounds, widthHeight, Object.keys(pts).reduce(function(e, t) {
   var n = pts[t], r = renderedName(t);
   return e[t] = function() {
     return ifEdge(this, n.get);
@@ -5908,7 +5874,7 @@ var widthHeight = elesfn$a, ifEdge = function(e, t) {
   } : e[r] = function() {
     return ifEdgeRenderedPosition(this, n.get);
   }, e;
-}, {}), dimensions = extend({}, position, bounds, widthHeight, edgePoints), Event = function(e, t) {
+}, {})), Event = function(e, t) {
   this.recycle(e, t);
 };
 function returnFalse() {
@@ -5986,8 +5952,8 @@ var p = Emitter.prototype, forEachEvent = function(e, t, n, r, a, o, s) {
     if (!emptyString(u)) {
       var d = u.match(eventRegex);
       if (d) {
-        var f = d[1], m = d[2] ? d[2] : null;
-        if (t(e, u, f, m, r, a, o) === false) break;
+        var f = d[1];
+        if (t(e, u, f, d[2] ? d[2] : null, r, a, o) === false) break;
       }
     }
   }
@@ -6006,12 +5972,12 @@ var p = Emitter.prototype, forEachEvent = function(e, t, n, r, a, o, s) {
     if (!emptyString(o)) {
       var s = o.match(eventRegex);
       if (s) {
-        var c = s[1], l = s[2] ? s[2] : null, u = makeEventObj(e, {
+        var c = s[1];
+        t(e, makeEventObj(e, {
           type: c,
-          namespace: l,
+          namespace: s[2] ? s[2] : null,
           target: e.context
-        });
-        t(e, u);
+        }));
       }
     }
   }
@@ -6491,11 +6457,7 @@ var getLayoutDimensionOptions = defaults$g({ nodeDimensionsIncludeLabels: false
       return e2;
     })(), f = memoize(function(e2, n2) {
       var r2 = c(e2, n2);
-      if (u) {
-        var a2 = Math.abs(t.spacingFactor);
-        r2 = l(a2, d, r2);
-      }
-      return t.transform != null && (r2 = t.transform(e2, r2)), r2;
+      return u && (r2 = l(Math.abs(t.spacingFactor), d, r2)), t.transform != null && (r2 = t.transform(e2, r2)), r2;
     }, s);
     if (t.animate) {
       for (var m = 0; m < r.length; m++) {
@@ -6717,25 +6679,21 @@ function defineDerivedStateFunction(e) {
 var eleTakesUpSpace = cacheStyleFunction("eleTakesUpSpace", function(e) {
   return e.pstyle("display").value === "element" && e.width() !== 0 && (e.isNode() ? e.height() !== 0 : true);
 });
-elesfn$4.takesUpSpace = cachePrototypeStyleFunction("takesUpSpace", defineDerivedStateFunction({ ok: eleTakesUpSpace }));
-var eleInteractive = cacheStyleFunction("eleInteractive", function(e) {
-  return e.pstyle("events").value === "yes" && e.pstyle("visibility").value === "visible" && eleTakesUpSpace(e);
-}), parentInteractive = cacheStyleFunction("parentInteractive", function(e) {
-  return e.pstyle("visibility").value === "visible" && eleTakesUpSpace(e);
-});
-elesfn$4.interactive = cachePrototypeStyleFunction("interactive", defineDerivedStateFunction({
-  ok: eleInteractive,
-  parentOk: parentInteractive,
+elesfn$4.takesUpSpace = cachePrototypeStyleFunction("takesUpSpace", defineDerivedStateFunction({ ok: eleTakesUpSpace })), elesfn$4.interactive = cachePrototypeStyleFunction("interactive", defineDerivedStateFunction({
+  ok: cacheStyleFunction("eleInteractive", function(e) {
+    return e.pstyle("events").value === "yes" && e.pstyle("visibility").value === "visible" && eleTakesUpSpace(e);
+  }),
+  parentOk: cacheStyleFunction("parentInteractive", function(e) {
+    return e.pstyle("visibility").value === "visible" && eleTakesUpSpace(e);
+  }),
   edgeOkViaNode: eleTakesUpSpace
 })), elesfn$4.noninteractive = function() {
   var e = this[0];
   if (e) return !e.interactive();
-};
-var eleVisible = cacheStyleFunction("eleVisible", function(e) {
-  return e.pstyle("visibility").value === "visible" && e.pstyle("opacity").pfValue !== 0 && eleTakesUpSpace(e);
-});
-elesfn$4.visible = cachePrototypeStyleFunction("visible", defineDerivedStateFunction({
-  ok: eleVisible,
+}, elesfn$4.visible = cachePrototypeStyleFunction("visible", defineDerivedStateFunction({
+  ok: cacheStyleFunction("eleVisible", function(e) {
+    return e.pstyle("visibility").value === "visible" && e.pstyle("opacity").pfValue !== 0 && eleTakesUpSpace(e);
+  }),
   edgeOkViaNode: eleTakesUpSpace
 })), elesfn$4.hidden = function() {
   var e = this[0];
@@ -7135,8 +7093,8 @@ elesfn$1.instanceString = function() {
   return e;
 }, elesfn$1.clone = function() {
   for (var e = this.cy(), t = [], n = 0; n < this.length; n++) {
-    var r = this[n].json(), a = new Element(e, r, false);
-    t.push(a);
+    var r = new Element(e, this[n].json(), false);
+    t.push(r);
   }
   return new Collection(e, t);
 }, elesfn$1.copy = elesfn$1.clone, elesfn$1.restore = function() {
@@ -7706,10 +7664,9 @@ var corefn$6 = { layout: function(e) {
     error("No such layout `" + n + "` found.  Did you forget to import it and `cytoscape.use()` it?");
     return;
   }
-  var a = string(e.eles) ? t.$(e.eles) : e.eles == null ? t.$() : e.eles;
   return new r(extend({}, e, {
     cy: t,
-    eles: a
+    eles: string(e.eles) ? t.$(e.eles) : e.eles == null ? t.$() : e.eles
   }));
 } };
 corefn$6.createLayout = corefn$6.makeLayout = corefn$6.layout;
@@ -7974,7 +7931,8 @@ styfn$8.apply = function(e) {
     t.targetLabelKey = combineHashesArray(z), t.targetLabelStyleKey = combineHashesArray(hashArrays(I.commonLabel, z));
   }
   if (c) {
-    var B = t.styleKeys, V = B.nodeBody, H = B.nodeBorder, U = B.nodeOutline, W = B.backgroundImage, G = B.compound, q = B.pie, J = B.stripe, Y = [
+    var B = t.styleKeys, V = B.nodeBody, H = B.nodeBorder, U = B.nodeOutline, W = B.backgroundImage, G = B.compound, q = B.pie, J = B.stripe;
+    t.nodeKey = combineHashesArray([
       V,
       H,
       U,
@@ -7984,8 +7942,7 @@ styfn$8.apply = function(e) {
       J
     ].filter(function(e2) {
       return e2 != null;
-    }).reduce(hashArrays, [DEFAULT_HASH_SEED, DEFAULT_HASH_SEED_ALT]);
-    t.nodeKey = combineHashesArray(Y), t.hasPie = q != null && q[0] !== DEFAULT_HASH_SEED && q[1] !== DEFAULT_HASH_SEED_ALT, t.hasStripe = J != null && J[0] !== DEFAULT_HASH_SEED && J[1] !== DEFAULT_HASH_SEED_ALT;
+    }).reduce(hashArrays, [DEFAULT_HASH_SEED, DEFAULT_HASH_SEED_ALT])), t.hasPie = q != null && q[0] !== DEFAULT_HASH_SEED && q[1] !== DEFAULT_HASH_SEED_ALT, t.hasStripe = J != null && J[0] !== DEFAULT_HASH_SEED && J[1] !== DEFAULT_HASH_SEED_ALT;
   }
   return s !== t.styleKey;
 }, styfn$8.clearStyleHints = function(e) {
@@ -10015,8 +9972,8 @@ var styfn$1 = {};
 styfn$1.parse = function(e, t, n, r) {
   var a = this;
   if (fn$6(t)) return a.parseImplWarn(e, t, n, r);
-  var o = r === "mapping" || r === true || r === false || r == null ? "dontcare" : r, s = n ? "t" : "f", c = "" + t, l = hashStrings(e, c, s, o), u = a.propCache = a.propCache || [], d;
-  return (d = u[l]) || (d = u[l] = a.parseImplWarn(e, t, n, r)), (n || r === "mapping") && (d = copy(d), d && (d.value = copy(d.value))), d;
+  var o = r === "mapping" || r === true || r === false || r == null ? "dontcare" : r, s = n ? "t" : "f", c = hashStrings(e, "" + t, s, o), l = a.propCache = a.propCache || [], u;
+  return (u = l[c]) || (u = l[c] = a.parseImplWarn(e, t, n, r)), (n || r === "mapping") && (u = copy(u), u && (u.value = copy(u.value))), u;
 }, styfn$1.parseImplWarn = function(e, t, n, r) {
   var a = this.parseImpl(e, t, n, r);
   return !a && t != null && warn(`The style property \`${e}: ${t}\` is invalid`), a && (a.name === "width" || a.name === "height") && t === "label" && warn("The style value of `label` is deprecated for `" + a.name + "`"), a;
@@ -10396,15 +10353,15 @@ var corefn$2 = {
     var t = this._private, n = t.pan, r = t.zoom, a, o, s = false;
     if (t.zoomingEnabled || (s = true), number$1(e) ? o = e : plainObject(e) && (o = e.level, e.position == null ? e.renderedPosition != null && (a = e.renderedPosition) : a = modelToRenderedPosition$1(e.position, r, n), a != null && !t.panningEnabled && (s = true)), o = o > t.maxZoom ? t.maxZoom : o, o = o < t.minZoom ? t.minZoom : o, s || !number$1(o) || o === r || a != null && (!number$1(a.x) || !number$1(a.y))) return null;
     if (a != null) {
-      var c = n, l = r, u = o, d = {
-        x: -u / l * (a.x - c.x) + a.x,
-        y: -u / l * (a.y - c.y) + a.y
-      };
+      var c = n, l = r, u = o;
       return {
         zoomed: true,
         panned: true,
         zoom: u,
-        pan: d
+        pan: {
+          x: -u / l * (a.x - c.x) + a.x,
+          y: -u / l * (a.y - c.y) + a.y
+        }
       };
     } else return {
       zoomed: true,
@@ -10925,8 +10882,8 @@ BreadthFirstLayout.prototype.run = function() {
     }
     return o2 = Math.max(1, o2), a2 /= o2, o2 === 0 && (a2 = 0), W[e2.id()] = a2, a2;
   }, q = function(e2, t2) {
-    var n2 = G(e2), r2 = G(t2), a2 = n2 - r2;
-    return a2 === 0 ? ascending(e2.id(), t2.id()) : a2;
+    var n2 = G(e2) - G(t2);
+    return n2 === 0 ? ascending(e2.id(), t2.id()) : n2;
   };
   e.depthSort !== void 0 && (q = e.depthSort);
   for (var J = b.length, Y = 0; Y < J; Y++) b[Y].sort(q), O(Y);
@@ -10935,10 +10892,10 @@ BreadthFirstLayout.prototype.run = function() {
     for (var e2 = 0; e2 < J; e2++) O(e2);
   })());
   for (var Q = 0, $ = 0; $ < J; $++) Q = Math.max(b[$].length, Q);
-  var zh = {
+  var Dh = {
     x: l.x1 + l.w / 2,
     y: l.y1 + l.h / 2
-  }, Bh = r.reduce(function(t2, n2) {
+  }, Oh = r.reduce(function(t2, n2) {
     return (function(e2) {
       return {
         w: t2.w === -1 ? e2.w : (t2.w + e2.w) / 2,
@@ -10948,33 +10905,33 @@ BreadthFirstLayout.prototype.run = function() {
   }, {
     w: -1,
     h: -1
-  }), Vh = Math.max(J === 1 ? 0 : c ? (l.h - e.padding * 2 - Bh.h) / (J - 1) : (l.h - e.padding * 2 - Bh.h) / (J + 1), z), Hh = b.reduce(function(e2, t2) {
+  }), kh = Math.max(J === 1 ? 0 : c ? (l.h - e.padding * 2 - Oh.h) / (J - 1) : (l.h - e.padding * 2 - Oh.h) / (J + 1), z), Ah = b.reduce(function(e2, t2) {
     return Math.max(e2, t2.length);
-  }, 0), Uh = function(t2) {
+  }, 0), jh = function(t2) {
     var n2 = getInfo(t2), r2 = n2.depth, a2 = n2.index;
     if (e.circle) {
       var o2 = Math.min(l.w / 2 / J, l.h / 2 / J);
       o2 = Math.max(o2, z);
       var s2 = o2 * r2 + o2 - (J > 0 && b[0].length <= 3 ? o2 / 2 : 0), u2 = 2 * Math.PI / b[r2].length * a2;
       return r2 === 0 && b[0].length === 1 && (s2 = 1), {
-        x: zh.x + s2 * Math.cos(u2),
-        y: zh.y + s2 * Math.sin(u2)
+        x: Dh.x + s2 * Math.cos(u2),
+        y: Dh.y + s2 * Math.sin(u2)
       };
     } else {
-      var d2 = b[r2].length, f2 = Math.max(d2 === 1 ? 0 : c ? (l.w - e.padding * 2 - Bh.w) / ((e.grid ? Hh : d2) - 1) : (l.w - e.padding * 2 - Bh.w) / ((e.grid ? Hh : d2) + 1), z);
+      var d2 = b[r2].length, f2 = Math.max(d2 === 1 ? 0 : c ? (l.w - e.padding * 2 - Oh.w) / ((e.grid ? Ah : d2) - 1) : (l.w - e.padding * 2 - Oh.w) / ((e.grid ? Ah : d2) + 1), z);
       return {
-        x: zh.x + (a2 + 1 - (d2 + 1) / 2) * f2,
-        y: zh.y + (r2 + 1 - (J + 1) / 2) * Vh
+        x: Dh.x + (a2 + 1 - (d2 + 1) / 2) * f2,
+        y: Dh.y + (r2 + 1 - (J + 1) / 2) * kh
       };
     }
-  }, Wh = {
+  }, Mh = {
     downward: 0,
     leftward: 90,
     upward: 180,
     rightward: -90
   };
-  return Object.keys(Wh).indexOf(e.direction) === -1 && error(`Invalid direction '${e.direction}' specified for breadthfirst layout. Valid values are: ${Object.keys(Wh).join(", ")}`), n.nodes().layoutPositions(this, e, function(t2) {
-    return rotatePosAndSkewByBox(Uh(t2), l, Wh[e.direction]);
+  return Object.keys(Mh).indexOf(e.direction) === -1 && error(`Invalid direction '${e.direction}' specified for breadthfirst layout. Valid values are: ${Object.keys(Mh).join(", ")}`), n.nodes().layoutPositions(this, e, function(t2) {
+    return rotatePosAndSkewByBox(jh(t2), l, Mh[e.direction]);
   }), this;
 };
 var defaults$6 = {
@@ -11127,8 +11084,7 @@ ConcentricLayout.prototype.run = function() {
     B[q.node.id()] = Y;
   }
   return a.nodes().layoutPositions(this, t, function(e2) {
-    var t2 = e2.id();
-    return B[t2];
+    return B[e2.id()];
   }), this;
 };
 var DEBUG, defaults$4 = {
@@ -11262,11 +11218,11 @@ var createLayoutInfo = function(e, t, n) {
   for (var u = 0; u < s.edgeSize; u++) {
     var j = r[u], M = {};
     M.id = j.data("id"), M.sourceId = j.data("source"), M.targetId = j.data("target");
-    var N = fn$6(n.idealEdgeLength) ? n.idealEdgeLength(j) : n.idealEdgeLength, P = fn$6(n.edgeElasticity) ? n.edgeElasticity(j) : n.edgeElasticity, F = s.idToIndex[M.sourceId], I = s.idToIndex[M.targetId], L = s.indexToGraph[F], R = s.indexToGraph[I];
-    if (L != R) {
-      for (var z = findLCA(M.sourceId, M.targetId, s), B = s.graphSet[z], V = 0, _ = s.layoutNodes[F]; B.indexOf(_.id) === -1; ) _ = s.layoutNodes[s.idToIndex[_.parentId]], V++;
-      for (_ = s.layoutNodes[I]; B.indexOf(_.id) === -1; ) _ = s.layoutNodes[s.idToIndex[_.parentId]], V++;
-      N *= V * n.nestingFactor;
+    var N = fn$6(n.idealEdgeLength) ? n.idealEdgeLength(j) : n.idealEdgeLength, P = fn$6(n.edgeElasticity) ? n.edgeElasticity(j) : n.edgeElasticity, F = s.idToIndex[M.sourceId], I = s.idToIndex[M.targetId];
+    if (s.indexToGraph[F] != s.indexToGraph[I]) {
+      for (var L = findLCA(M.sourceId, M.targetId, s), R = s.graphSet[L], z = 0, _ = s.layoutNodes[F]; R.indexOf(_.id) === -1; ) _ = s.layoutNodes[s.idToIndex[_.parentId]], z++;
+      for (_ = s.layoutNodes[I]; R.indexOf(_.id) === -1; ) _ = s.layoutNodes[s.idToIndex[_.parentId]], z++;
+      N *= z * n.nestingFactor;
     }
     M.idealLength = N, M.elasticity = P, s.layoutEdges.push(M);
   }
@@ -11337,14 +11293,13 @@ var createLayoutInfo = function(e, t, n) {
 }, randomDistance = function(e) {
   return -1 + 2 * e * Math.random();
 }, nodeRepulsion = function(e, t, n, r) {
-  var a = e.cmptId, o = t.cmptId;
-  if (!(a !== o && !n.isCompound)) {
-    var s = t.positionX - e.positionX, c = t.positionY - e.positionY, l = 1;
-    s === 0 && c === 0 && (s = randomDistance(l), c = randomDistance(l));
-    var u = nodesOverlap(e, t, s, c);
-    if (u > 0) var d = r.nodeOverlap * u, f = Math.sqrt(s * s + c * c), m = d * s / f, h = d * c / f;
-    else var g = findClippingPoint(e, s, c), _ = findClippingPoint(t, -1 * s, -1 * c), v = _.x - g.x, b = _.y - g.y, S = v * v + b * b, f = Math.sqrt(S), d = (e.nodeRepulsion + t.nodeRepulsion) / S, m = d * v / f, h = d * b / f;
-    e.isLocked || (e.offsetX -= m, e.offsetY -= h), t.isLocked || (t.offsetX += m, t.offsetY += h);
+  if (!(e.cmptId !== t.cmptId && !n.isCompound)) {
+    var a = t.positionX - e.positionX, o = t.positionY - e.positionY, s = 1;
+    a === 0 && o === 0 && (a = randomDistance(s), o = randomDistance(s));
+    var c = nodesOverlap(e, t, a, o);
+    if (c > 0) var l = r.nodeOverlap * c, u = Math.sqrt(a * a + o * o), d = l * a / u, f = l * o / u;
+    else var m = findClippingPoint(e, a, o), h = findClippingPoint(t, -1 * a, -1 * o), g = h.x - m.x, _ = h.y - m.y, v = g * g + _ * _, u = Math.sqrt(v), l = (e.nodeRepulsion + t.nodeRepulsion) / v, d = l * g / u, f = l * _ / u;
+    e.isLocked || (e.offsetX -= d, e.offsetY -= f), t.isLocked || (t.offsetX += d, t.offsetY += f);
   }
 }, nodesOverlap = function(e, t, n, r) {
   if (n > 0) var a = e.maxX - t.minX;
@@ -11703,10 +11658,10 @@ BRp$f.arrowShapeWidth = 0.3, BRp$f.registerArrowShapes = function() {
     var c2 = a2.x - n2 / 2 - s2, l = a2.x + n2 / 2 + s2, u = a2.y - n2 / 2 - s2, d = a2.y + n2 / 2 + s2;
     return c2 <= e2 && e2 <= l && u <= t2 && t2 <= d;
   }, r = function(e2, t2, n2, r2, a2) {
-    var o2 = e2 * Math.cos(r2) - t2 * Math.sin(r2), s2 = e2 * Math.sin(r2) + t2 * Math.cos(r2), c2 = o2 * n2, l = s2 * n2, u = c2 + a2.x, d = l + a2.y;
+    var o2 = e2 * Math.cos(r2) - t2 * Math.sin(r2), s2 = e2 * Math.sin(r2) + t2 * Math.cos(r2), c2 = o2 * n2, l = s2 * n2;
     return {
-      x: u,
-      y: d
+      x: c2 + a2.x,
+      y: l + a2.y
     };
   }, a = function(e2, t2, n2, a2) {
     for (var o2 = [], s2 = 0; s2 < e2.length; s2 += 2) {
@@ -11736,8 +11691,7 @@ BRp$f.arrowShapeWidth = 0.3, BRp$f.registerArrowShapes = function() {
         0.3
       ],
       collide: function(e2, t2, n2, r3, s2, c3) {
-        var l = o(a(this.points, n2 + 2 * c3, r3, s2));
-        return pointInsidePolygonPoints(e2, t2, l);
+        return pointInsidePolygonPoints(e2, t2, o(a(this.points, n2 + 2 * c3, r3, s2)));
       },
       roughCollide: n,
       draw: function(e2, n2, r3, o2) {
@@ -11816,8 +11770,8 @@ BRp$f.arrowShapeWidth = 0.3, BRp$f.registerArrowShapes = function() {
       -0.15
     ],
     collide: function(e2, t2, n2, r2, s2, c2, l) {
-      var u = s2, d = (u.x - e2) ** 2 + (u.y - t2) ** 2 <= ((n2 + 2 * l) * this.radius) ** 2, f = o(a(this.points, n2 + 2 * l, r2, s2));
-      return pointInsidePolygonPoints(e2, t2, f) || d;
+      var u = s2, d = (u.x - e2) ** 2 + (u.y - t2) ** 2 <= ((n2 + 2 * l) * this.radius) ** 2;
+      return pointInsidePolygonPoints(e2, t2, o(a(this.points, n2 + 2 * l, r2, s2))) || d;
     },
     draw: function(e2, n2, r2, o2, s2) {
       var c2 = a(this.pointsTr, n2, r2, o2);
@@ -11947,8 +11901,8 @@ BRp$f.arrowShapeWidth = 0.3, BRp$f.registerArrowShapes = function() {
 };
 var BRp$e = {};
 BRp$e.projectIntoViewport = function(e, t) {
-  var n = this.cy, r = this.findContainerClientCoords(), a = r[0], o = r[1], s = r[4], c = n.pan(), l = n.zoom(), u = ((e - a) / s - c.x) / l, d = ((t - o) / s - c.y) / l;
-  return [u, d];
+  var n = this.cy, r = this.findContainerClientCoords(), a = r[0], o = r[1], s = r[4], c = n.pan(), l = n.zoom();
+  return [((e - a) / s - c.x) / l, ((t - o) / s - c.y) / l];
 }, BRp$e.findContainerClientCoords = function() {
   if (this.containerBB) return this.containerBB;
   var e = this.container, t = e.getBoundingClientRect(), n = this.cy.window().getComputedStyle(e), r = function(e2) {
@@ -11963,10 +11917,10 @@ BRp$e.projectIntoViewport = function(e, t) {
     right: r("border-right-width"),
     top: r("border-top-width"),
     bottom: r("border-bottom-width")
-  }, s = e.clientWidth, c = e.clientHeight, l = a.left + a.right, u = a.top + a.bottom, d = o.left + o.right, f = t.width / (s + d), m = s - l, h = c - u, g = t.left + a.left + o.left, _ = t.top + a.top + o.top;
+  }, s = e.clientWidth, c = e.clientHeight, l = a.left + a.right, u = a.top + a.bottom, d = o.left + o.right, f = t.width / (s + d), m = s - l, h = c - u;
   return this.containerBB = [
-    g,
-    _,
+    t.left + a.left + o.left,
+    t.top + a.top + o.top,
     m,
     h,
     f
@@ -12055,7 +12009,8 @@ BRp$e.projectIntoViewport = function(e, t) {
             x: e2 * T2 - t2 * E2 + u2,
             y: e2 * E2 + t2 * T2 + d2
           };
-        }, O = D(_2, S2), k = D(_2, w2), A = D(b2, S2), j = D(b2, w2), M = [
+        }, O = D(_2, S2), k = D(_2, w2), A = D(b2, S2), j = D(b2, w2);
+        if (pointInsidePolygonPoints(e, t, [
           O.x + h2,
           O.y + g2,
           A.x + h2,
@@ -12064,8 +12019,7 @@ BRp$e.projectIntoViewport = function(e, t) {
           j.y + g2,
           k.x + h2,
           k.y + g2
-        ];
-        if (pointInsidePolygonPoints(e, t, M)) return v(n2), true;
+        ])) return v(n2), true;
       } else if (inBoundingBox(c2, e, t)) return v(n2), true;
     }
   }
@@ -12177,7 +12131,8 @@ BRp$e.projectIntoViewport = function(e, t) {
           includeMainLabels: false,
           includeSourceLabels: false,
           includeTargetLabels: false
-        }), N = [
+        });
+        if (satPolygonIntersection([
           {
             x: M.x1,
             y: M.y1
@@ -12194,52 +12149,51 @@ BRp$e.projectIntoViewport = function(e, t) {
             x: M.x1,
             y: M.y2
           }
-        ];
-        if (satPolygonIntersection(N, h)) s.push(w);
+        ], h)) s.push(w);
         else {
-          var P = v(w);
-          P && satPolygonIntersection(P, h) && s.push(w);
+          var N = v(w);
+          N && satPolygonIntersection(N, h) && s.push(w);
         }
       }
     } else {
-      var F = C, I = F._private, L = I.rscratch, R = F.pstyle("box-selection").strValue;
-      if (R === "none") continue;
-      if (R === "contain") {
-        if (L.startX != null && L.startY != null && !inBoundingBox(f, L.startX, L.startY) || L.endX != null && L.endY != null && !inBoundingBox(f, L.endX, L.endY)) continue;
-        if (L.edgeType === "bezier" || L.edgeType === "multibezier" || L.edgeType === "self" || L.edgeType === "compound" || L.edgeType === "segments" || L.edgeType === "haystack") {
-          for (var z = I.rstyle.bezierPts || I.rstyle.linePts || I.rstyle.haystackPts, B = true, V = 0; V < z.length; V++) if (!pointInBoundingBox(f, z[V])) {
-            B = false;
+      var P = C, F = P._private, I = F.rscratch, L = P.pstyle("box-selection").strValue;
+      if (L === "none") continue;
+      if (L === "contain") {
+        if (I.startX != null && I.startY != null && !inBoundingBox(f, I.startX, I.startY) || I.endX != null && I.endY != null && !inBoundingBox(f, I.endX, I.endY)) continue;
+        if (I.edgeType === "bezier" || I.edgeType === "multibezier" || I.edgeType === "self" || I.edgeType === "compound" || I.edgeType === "segments" || I.edgeType === "haystack") {
+          for (var R = F.rstyle.bezierPts || F.rstyle.linePts || F.rstyle.haystackPts, z = true, B = 0; B < R.length; B++) if (!pointInBoundingBox(f, R[B])) {
+            z = false;
             break;
           }
-          B && s.push(F);
-        } else L.edgeType === "straight" && s.push(F);
-      } else if (R === "overlap") {
-        var H = false;
-        if (L.startX != null && L.startY != null && L.endX != null && L.endY != null && (inBoundingBox(f, L.startX, L.startY) || inBoundingBox(f, L.endX, L.endY))) s.push(F), H = true;
-        else if (!H && L.edgeType === "haystack") {
-          for (var U = I.rstyle.haystackPts, W = 0; W < U.length; W++) if (pointInBoundingBox(f, U[W])) {
-            s.push(F), H = true;
+          z && s.push(P);
+        } else I.edgeType === "straight" && s.push(P);
+      } else if (L === "overlap") {
+        var V = false;
+        if (I.startX != null && I.startY != null && I.endX != null && I.endY != null && (inBoundingBox(f, I.startX, I.startY) || inBoundingBox(f, I.endX, I.endY))) s.push(P), V = true;
+        else if (!V && I.edgeType === "haystack") {
+          for (var H = F.rstyle.haystackPts, U = 0; U < H.length; U++) if (pointInBoundingBox(f, H[U])) {
+            s.push(P), V = true;
             break;
           }
         }
-        if (!H) {
-          var G = I.rstyle.bezierPts || I.rstyle.linePts || I.rstyle.haystackPts;
-          if ((!G || G.length < 2) && L.edgeType === "straight" && L.startX != null && L.startY != null && L.endX != null && L.endY != null && (G = [{
-            x: L.startX,
-            y: L.startY
+        if (!V) {
+          var W = F.rstyle.bezierPts || F.rstyle.linePts || F.rstyle.haystackPts;
+          if ((!W || W.length < 2) && I.edgeType === "straight" && I.startX != null && I.startY != null && I.endX != null && I.endY != null && (W = [{
+            x: I.startX,
+            y: I.startY
           }, {
-            x: L.endX,
-            y: L.endY
-          }]), !G || G.length < 2) continue;
-          for (var q = 0; q < G.length - 1; q++) {
-            for (var J = G[q], Y = G[q + 1], X = 0; X < g.length; X++) {
-              var Z = _slicedToArray(g[X], 2), Q = Z[0], $ = Z[1];
-              if (b(J, Y, Q, $)) {
-                s.push(F), H = true;
+            x: I.endX,
+            y: I.endY
+          }]), !W || W.length < 2) continue;
+          for (var G = 0; G < W.length - 1; G++) {
+            for (var q = W[G], J = W[G + 1], Y = 0; Y < g.length; Y++) {
+              var X = _slicedToArray(g[Y], 2), Z = X[0], Q = X[1];
+              if (b(q, J, Z, Q)) {
+                s.push(P), V = true;
                 break;
               }
             }
-            if (H) break;
+            if (V) break;
           }
         }
       }
@@ -12353,13 +12307,13 @@ BRp$c.findMidptPtsEtc = function(e, t) {
       break;
     case "endpoints":
       if (l) {
-        var d = this.manualEndptToPx(e.source()[0], s), f = _slicedToArray(d, 2), h = f[0], g = f[1], _ = this.manualEndptToPx(e.target()[0], c), v = _slicedToArray(_, 2), b = v[0], S = v[1], C = {
-          x1: h,
-          y1: g,
-          x2: b,
-          y2: S
+        var d = _slicedToArray(this.manualEndptToPx(e.source()[0], s), 2), f = d[0], h = d[1], g = _slicedToArray(this.manualEndptToPx(e.target()[0], c), 2), _ = g[0], v = g[1], b = {
+          x1: f,
+          y1: h,
+          x2: _,
+          y2: v
         };
-        a = u(h, g, b, S), o = C;
+        a = u(f, h, _, v), o = b;
       } else warn(`Edge ${e.id()} has edge-distances:endpoints specified without manual endpoints specified via source-endpoint and target-endpoint.  Falling back on edge-distances:intersection (default).`), o = r;
       break;
   }
@@ -12460,108 +12414,108 @@ BRp$c.findMidptPtsEtc = function(e, t) {
   if ((H || U) && !z) if (F) {
     var W = Math.abs(L) <= m / 2, G = Math.abs(k) <= h / 2;
     if (W) {
-      var q = (d.x1 + d.x2) / 2, J = d.y1, Y = d.y2;
+      var q = (d.x1 + d.x2) / 2;
       n.segpts = [
         q,
-        J,
+        d.y1,
         q,
-        Y
+        d.y2
       ];
     } else if (G) {
-      var X = (d.y1 + d.y2) / 2, Z = d.x1, Q = d.x2;
+      var J = (d.y1 + d.y2) / 2;
       n.segpts = [
-        Z,
-        X,
-        Q,
-        X
+        d.x1,
+        J,
+        d.x2,
+        J
       ];
     } else n.segpts = [d.x1, d.y2];
   } else {
-    var $ = Math.abs(L) <= f / 2, zh = Math.abs(A) <= g / 2;
-    if ($) {
-      var Bh = (d.y1 + d.y2) / 2, Vh = d.x1, Hh = d.x2;
+    var Y = Math.abs(L) <= f / 2, X = Math.abs(A) <= g / 2;
+    if (Y) {
+      var Z = (d.y1 + d.y2) / 2;
       n.segpts = [
-        Vh,
-        Bh,
-        Hh,
-        Bh
+        d.x1,
+        Z,
+        d.x2,
+        Z
       ];
-    } else if (zh) {
-      var Uh = (d.x1 + d.x2) / 2, Wh = d.y1, Gh = d.y2;
+    } else if (X) {
+      var Q = (d.x1 + d.x2) / 2;
       n.segpts = [
-        Uh,
-        Wh,
-        Uh,
-        Gh
+        Q,
+        d.y1,
+        Q,
+        d.y2
       ];
     } else n.segpts = [d.x2, d.y1];
   }
   else if (F) {
-    var Kh = d.y1 + B + (_ ? m / 2 * R : 0), qh = d.x1, Jh = d.x2;
+    var $ = d.y1 + B + (_ ? m / 2 * R : 0);
     n.segpts = [
-      qh,
-      Kh,
-      Jh,
-      Kh
+      d.x1,
+      $,
+      d.x2,
+      $
     ];
   } else {
-    var Yh = d.x1 + B + (_ ? f / 2 * R : 0), Xh = d.y1, Zh = d.y2;
+    var Dh = d.x1 + B + (_ ? f / 2 * R : 0);
     n.segpts = [
-      Yh,
-      Xh,
-      Yh,
-      Zh
+      Dh,
+      d.y1,
+      Dh,
+      d.y2
     ];
   }
   if (n.isRound) {
-    var Qh = e.pstyle("taxi-radius").value, $h = e.pstyle("radius-type").value[0] === "arc-radius";
-    n.radii = Array(n.segpts.length / 2).fill(Qh), n.isArcRadius = Array(n.segpts.length / 2).fill($h);
+    var Oh = e.pstyle("taxi-radius").value, kh = e.pstyle("radius-type").value[0] === "arc-radius";
+    n.radii = Array(n.segpts.length / 2).fill(Oh), n.isArcRadius = Array(n.segpts.length / 2).fill(kh);
   }
 }, BRp$c.tryToCorrectInvalidPoints = function(e, t) {
   var n = e._private.rscratch;
   if (n.edgeType === "bezier") {
-    var r = t.srcPos, a = t.tgtPos, o = t.srcW, s = t.srcH, c = t.tgtW, l = t.tgtH, u = t.srcShape, d = t.tgtShape, f = t.srcCornerRadius, m = t.tgtCornerRadius, h = t.srcRs, g = t.tgtRs, _ = !number$1(n.startX) || !number$1(n.startY), v = !number$1(n.arrowStartX) || !number$1(n.arrowStartY), b = !number$1(n.endX) || !number$1(n.endY), S = !number$1(n.arrowEndX) || !number$1(n.arrowEndY), C = 3, w = this.getArrowWidth(e.pstyle("width").pfValue, e.pstyle("arrow-scale").value) * this.arrowShapeWidth, T = C * w, E = dist({
+    var r = t.srcPos, a = t.tgtPos, o = t.srcW, s = t.srcH, c = t.tgtW, l = t.tgtH, u = t.srcShape, d = t.tgtShape, f = t.srcCornerRadius, m = t.tgtCornerRadius, h = t.srcRs, g = t.tgtRs, _ = !number$1(n.startX) || !number$1(n.startY), v = !number$1(n.arrowStartX) || !number$1(n.arrowStartY), b = !number$1(n.endX) || !number$1(n.endY), S = !number$1(n.arrowEndX) || !number$1(n.arrowEndY), C = 3 * (this.getArrowWidth(e.pstyle("width").pfValue, e.pstyle("arrow-scale").value) * this.arrowShapeWidth), w = dist({
       x: n.ctrlpts[0],
       y: n.ctrlpts[1]
     }, {
       x: n.startX,
       y: n.startY
-    }), D = E < T, O = dist({
+    }), T = w < C, E = dist({
       x: n.ctrlpts[0],
       y: n.ctrlpts[1]
     }, {
       x: n.endX,
       y: n.endY
-    }), k = O < T, A = false;
-    if (_ || v || D) {
-      A = true;
-      var j = {
+    }), D = E < C, O = false;
+    if (_ || v || T) {
+      O = true;
+      var k = {
         x: n.ctrlpts[0] - r.x,
         y: n.ctrlpts[1] - r.y
-      }, M = Math.sqrt(j.x * j.x + j.y * j.y), N = {
-        x: j.x / M,
-        y: j.y / M
-      }, F = Math.max(o, s), I = {
-        x: n.ctrlpts[0] + N.x * 2 * F,
-        y: n.ctrlpts[1] + N.y * 2 * F
-      }, L = u.intersectLine(r.x, r.y, o, s, I.x, I.y, 0, f, h);
-      D ? (n.ctrlpts[0] = n.ctrlpts[0] + N.x * (T - E), n.ctrlpts[1] = n.ctrlpts[1] + N.y * (T - E)) : (n.ctrlpts[0] = L[0] + N.x * T, n.ctrlpts[1] = L[1] + N.y * T);
-    }
-    if (b || S || k) {
-      A = true;
-      var R = {
+      }, A = Math.sqrt(k.x * k.x + k.y * k.y), j = {
+        x: k.x / A,
+        y: k.y / A
+      }, M = Math.max(o, s), N = {
+        x: n.ctrlpts[0] + j.x * 2 * M,
+        y: n.ctrlpts[1] + j.y * 2 * M
+      }, F = u.intersectLine(r.x, r.y, o, s, N.x, N.y, 0, f, h);
+      T ? (n.ctrlpts[0] = n.ctrlpts[0] + j.x * (C - w), n.ctrlpts[1] = n.ctrlpts[1] + j.y * (C - w)) : (n.ctrlpts[0] = F[0] + j.x * C, n.ctrlpts[1] = F[1] + j.y * C);
+    }
+    if (b || S || D) {
+      O = true;
+      var I = {
         x: n.ctrlpts[0] - a.x,
         y: n.ctrlpts[1] - a.y
-      }, z = Math.sqrt(R.x * R.x + R.y * R.y), B = {
-        x: R.x / z,
-        y: R.y / z
-      }, V = Math.max(o, s), H = {
-        x: n.ctrlpts[0] + B.x * 2 * V,
-        y: n.ctrlpts[1] + B.y * 2 * V
-      }, U = d.intersectLine(a.x, a.y, c, l, H.x, H.y, 0, m, g);
-      k ? (n.ctrlpts[0] = n.ctrlpts[0] + B.x * (T - O), n.ctrlpts[1] = n.ctrlpts[1] + B.y * (T - O)) : (n.ctrlpts[0] = U[0] + B.x * T, n.ctrlpts[1] = U[1] + B.y * T);
+      }, L = Math.sqrt(I.x * I.x + I.y * I.y), R = {
+        x: I.x / L,
+        y: I.y / L
+      }, z = Math.max(o, s), B = {
+        x: n.ctrlpts[0] + R.x * 2 * z,
+        y: n.ctrlpts[1] + R.y * 2 * z
+      }, V = d.intersectLine(a.x, a.y, c, l, B.x, B.y, 0, m, g);
+      D ? (n.ctrlpts[0] = n.ctrlpts[0] + R.x * (C - E), n.ctrlpts[1] = n.ctrlpts[1] + R.y * (C - E)) : (n.ctrlpts[0] = V[0] + R.x * C, n.ctrlpts[1] = V[1] + R.y * C);
     }
-    A && this.findEndpoints(e);
+    O && this.findEndpoints(e);
   }
 }, BRp$c.storeAllpts = function(e) {
   var t = e._private.rscratch;
@@ -12636,15 +12590,15 @@ BRp$c.findMidptPtsEtc = function(e, t) {
           c.push(u);
           continue;
         }
-        var m = f === "unbundled-bezier" || endsWith(f, "segments") || f === "straight" || f === "straight-triangle" || endsWith(f, "taxi"), g = f === "unbundled-bezier" || f === "bezier", _ = d.source, v = d.target, b = _.poolIndex(), S = v.poolIndex(), C = [b, S].sort(), w = o(C, m), T = a.get(w);
-        T ?? (T = { eles: [] }, s.push({
-          pairId: C,
+        var m = f === "unbundled-bezier" || endsWith(f, "segments") || f === "straight" || f === "straight-triangle" || endsWith(f, "taxi"), g = f === "unbundled-bezier" || f === "bezier", _ = d.source, v = d.target, b = [_.poolIndex(), v.poolIndex()].sort(), S = o(b, m), C = a.get(S);
+        C ?? (C = { eles: [] }, s.push({
+          pairId: b,
           edgeIsUnbundled: m
-        }), a.set(w, T)), T.eles.push(u), m && (T.hasUnbundled = true), g && (T.hasBezier = true);
+        }), a.set(S, C)), C.eles.push(u), m && (C.hasUnbundled = true), g && (C.hasBezier = true);
       }
     }
-    for (var E = function() {
-      var e2 = s[D], c2 = e2.pairId, l2 = e2.edgeIsUnbundled, u2 = o(c2, l2), d2 = a.get(u2), f2;
+    for (var w = function() {
+      var e2 = s[T], c2 = e2.pairId, l2 = e2.edgeIsUnbundled, u2 = o(c2, l2), d2 = a.get(u2), f2;
       if (!d2.hasUnbundled) {
         var m2 = d2.eles[0].parallelEdges().filter(function(e3) {
           return e3.isBundledBezier();
@@ -12660,7 +12614,7 @@ BRp$c.findMidptPtsEtc = function(e, t) {
         var v3 = g2;
         g2 = _2, _2 = v3;
       }
-      var b2 = d2.srcPos = g2.position(), S2 = d2.tgtPos = _2.position(), C2 = d2.srcW = g2.outerWidth(), w2 = d2.srcH = g2.outerHeight(), T2 = d2.tgtW = _2.outerWidth(), E2 = d2.tgtH = _2.outerHeight(), O = d2.srcShape = n.nodeShapes[t.getNodeShape(g2)], k = d2.tgtShape = n.nodeShapes[t.getNodeShape(_2)], A = d2.srcCornerRadius = g2.pstyle("corner-radius").value === "auto" ? "auto" : g2.pstyle("corner-radius").pfValue, j = d2.tgtCornerRadius = _2.pstyle("corner-radius").value === "auto" ? "auto" : _2.pstyle("corner-radius").pfValue, M = d2.tgtRs = _2._private.rscratch, N = d2.srcRs = g2._private.rscratch;
+      var b2 = d2.srcPos = g2.position(), S2 = d2.tgtPos = _2.position(), C2 = d2.srcW = g2.outerWidth(), w2 = d2.srcH = g2.outerHeight(), E = d2.tgtW = _2.outerWidth(), D = d2.tgtH = _2.outerHeight(), O = d2.srcShape = n.nodeShapes[t.getNodeShape(g2)], k = d2.tgtShape = n.nodeShapes[t.getNodeShape(_2)], A = d2.srcCornerRadius = g2.pstyle("corner-radius").value === "auto" ? "auto" : g2.pstyle("corner-radius").pfValue, j = d2.tgtCornerRadius = _2.pstyle("corner-radius").value === "auto" ? "auto" : _2.pstyle("corner-radius").pfValue, M = d2.tgtRs = _2._private.rscratch, N = d2.srcRs = g2._private.rscratch;
       d2.dirCounts = {
         north: 0,
         west: 0,
@@ -12675,7 +12629,7 @@ BRp$c.findMidptPtsEtc = function(e, t) {
         var I = d2.eles[F], L = I[0]._private.rscratch, R = I.pstyle("curve-style").value, z = R === "unbundled-bezier" || endsWith(R, "segments") || endsWith(R, "taxi"), B = !g2.same(I.source());
         if (!d2.calculatedIntersection && g2 !== _2 && (d2.hasBezier || d2.hasUnbundled)) {
           d2.calculatedIntersection = true;
-          var V = O.intersectLine(b2.x, b2.y, C2, w2, S2.x, S2.y, 0, A, N), H = d2.srcIntn = V, U = k.intersectLine(S2.x, S2.y, T2, E2, b2.x, b2.y, 0, j, M), W = d2.tgtIntn = U, G = d2.intersectionPts = {
+          var V = O.intersectLine(b2.x, b2.y, C2, w2, S2.x, S2.y, 0, A, N), H = d2.srcIntn = V, U = k.intersectLine(S2.x, S2.y, E, D, b2.x, b2.y, 0, j, M), W = d2.tgtIntn = U, G = d2.intersectionPts = {
             x1: V[0],
             x2: U[0],
             y1: V[1],
@@ -12697,7 +12651,7 @@ BRp$c.findMidptPtsEtc = function(e, t) {
             x: -Q.y,
             y: Q.x
           };
-          d2.nodesOverlap = !number$1(X) || k.checkPoint(V[0], V[1], 0, T2, E2, S2.x, S2.y, j, M) || O.checkPoint(U[0], U[1], 0, C2, w2, b2.x, b2.y, A, N), d2.vectorNormInverse = $, f2 = {
+          d2.nodesOverlap = !number$1(X) || k.checkPoint(V[0], V[1], 0, E, D, S2.x, S2.y, j, M) || O.checkPoint(U[0], U[1], 0, C2, w2, b2.x, b2.y, A, N), d2.vectorNormInverse = $, f2 = {
             nodesOverlap: d2.nodesOverlap,
             dirCounts: d2.dirCounts,
             calculatedIntersection: true,
@@ -12708,8 +12662,8 @@ BRp$c.findMidptPtsEtc = function(e, t) {
             srcRs: M,
             tgtPos: b2,
             tgtRs: N,
-            srcW: T2,
-            srcH: E2,
+            srcW: E,
+            srcH: D,
             tgtW: C2,
             tgtH: w2,
             srcIntn: W,
@@ -12742,10 +12696,10 @@ BRp$c.findMidptPtsEtc = function(e, t) {
             }
           };
         }
-        var Bh = B ? f2 : d2;
-        L.nodesOverlap = Bh.nodesOverlap, L.srcIntn = Bh.srcIntn, L.tgtIntn = Bh.tgtIntn, L.isRound = R.startsWith("round"), r && (g2.isParent() || g2.isChild() || _2.isParent() || _2.isChild()) && (g2.parents().anySame(_2) || _2.parents().anySame(g2) || g2.same(_2) && g2.isParent()) ? t.findCompoundLoopPoints(I, Bh, F, z) : g2 === _2 ? t.findLoopPoints(I, Bh, F, z) : R.endsWith("segments") ? t.findSegmentsPoints(I, Bh) : R.endsWith("taxi") ? t.findTaxiPoints(I, Bh) : R === "straight" || !z && d2.eles.length % 2 == 1 && F === Math.floor(d2.eles.length / 2) ? t.findStraightEdgePoints(I) : t.findBezierPoints(I, Bh, F, z, B), t.findEndpoints(I), t.tryToCorrectInvalidPoints(I, Bh), t.checkForInvalidEdgeWarning(I), t.storeAllpts(I), t.storeEdgeProjections(I), t.calculateArrowAngles(I), t.recalculateEdgeLabelProjections(I), t.calculateLabelAngles(I);
+        var Oh = B ? f2 : d2;
+        L.nodesOverlap = Oh.nodesOverlap, L.srcIntn = Oh.srcIntn, L.tgtIntn = Oh.tgtIntn, L.isRound = R.startsWith("round"), r && (g2.isParent() || g2.isChild() || _2.isParent() || _2.isChild()) && (g2.parents().anySame(_2) || _2.parents().anySame(g2) || g2.same(_2) && g2.isParent()) ? t.findCompoundLoopPoints(I, Oh, F, z) : g2 === _2 ? t.findLoopPoints(I, Oh, F, z) : R.endsWith("segments") ? t.findSegmentsPoints(I, Oh) : R.endsWith("taxi") ? t.findTaxiPoints(I, Oh) : R === "straight" || !z && d2.eles.length % 2 == 1 && F === Math.floor(d2.eles.length / 2) ? t.findStraightEdgePoints(I) : t.findBezierPoints(I, Oh, F, z, B), t.findEndpoints(I), t.tryToCorrectInvalidPoints(I, Oh), t.checkForInvalidEdgeWarning(I), t.storeAllpts(I), t.storeEdgeProjections(I), t.calculateArrowAngles(I), t.recalculateEdgeLabelProjections(I), t.calculateLabelAngles(I);
       }
-    }, D = 0; D < s.length; D++) E();
+    }, T = 0; T < s.length; T++) w();
     this.findHaystackPoints(c);
   }
 };
@@ -12806,9 +12760,9 @@ BRp$b.manualEndptToPx = function(e, t) {
   else if (F === "outside-to-node" || F === "outside-to-node-or-label" ? z = L : (F === "outside-to-line" || F === "outside-to-line-or-label") && (z = [c.x, c.y]), a = r.nodeShapes[this.getNodeShape(s)].intersectLine(l.x, l.y, s.outerWidth(), s.outerHeight(), z[0], z[1], 0, I, g), F === "outside-to-node-or-label" || F === "outside-to-line-or-label") {
     var G = s._private.rscratch, q = G.labelWidth, J = G.labelHeight, Y = G.labelX, X = G.labelY, Z = q / 2, Q = J / 2, $ = s.pstyle("text-valign").value;
     $ === "top" ? X -= Q : $ === "bottom" && (X += Q);
-    var Bh = s.pstyle("text-halign").value;
-    Bh === "left" ? Y -= Z : Bh === "right" && (Y += Z);
-    var Vh = polygonIntersectLine(z[0], z[1], [
+    var Oh = s.pstyle("text-halign").value;
+    Oh === "left" ? Y -= Z : Oh === "right" && (Y += Z);
+    var kh = polygonIntersectLine(z[0], z[1], [
       Y - Z,
       X - Q,
       Y + Z,
@@ -12818,43 +12772,43 @@ BRp$b.manualEndptToPx = function(e, t) {
       Y - Z,
       X + Q
     ], l.x, l.y);
-    if (Vh.length > 0) {
-      var Hh = c, Uh = sqdist(Hh, array2point(a)), Wh = sqdist(Hh, array2point(Vh)), Gh = Uh;
-      Wh < Uh && (a = Vh, Gh = Wh), Vh.length > 2 && sqdist(Hh, {
-        x: Vh[2],
-        y: Vh[3]
-      }) < Gh && (a = [Vh[2], Vh[3]]);
+    if (kh.length > 0) {
+      var Ah = c, jh = sqdist(Ah, array2point(a)), Mh = sqdist(Ah, array2point(kh)), Nh = jh;
+      Mh < jh && (a = kh, Nh = Mh), kh.length > 2 && sqdist(Ah, {
+        x: kh[2],
+        y: kh[3]
+      }) < Nh && (a = [kh[2], kh[3]]);
     }
   }
-  var Kh = shortenIntersection(a, L, r.arrowShapes[u].spacing(e) + f), qh = shortenIntersection(a, L, r.arrowShapes[u].gap(e) + f);
-  if (v.endX = qh[0], v.endY = qh[1], v.arrowEndX = Kh[0], v.arrowEndY = Kh[1], j === "inside-to-node") a = [c.x, c.y];
+  var Ph = shortenIntersection(a, L, r.arrowShapes[u].spacing(e) + f), Fh = shortenIntersection(a, L, r.arrowShapes[u].gap(e) + f);
+  if (v.endX = Fh[0], v.endY = Fh[1], v.arrowEndX = Ph[0], v.arrowEndY = Ph[1], j === "inside-to-node") a = [c.x, c.y];
   else if (A.units) a = this.manualEndptToPx(o, A);
   else if (j === "outside-to-line") a = v.srcIntn;
   else if (j === "outside-to-node" || j === "outside-to-node-or-label" ? B = R : (j === "outside-to-line" || j === "outside-to-line-or-label") && (B = [l.x, l.y]), a = r.nodeShapes[this.getNodeShape(o)].intersectLine(c.x, c.y, o.outerWidth(), o.outerHeight(), B[0], B[1], 0, M, h), j === "outside-to-node-or-label" || j === "outside-to-line-or-label") {
-    var Jh = o._private.rscratch, Yh = Jh.labelWidth, Xh = Jh.labelHeight, Zh = Jh.labelX, Qh = Jh.labelY, $h = Yh / 2, eg = Xh / 2, tg = o.pstyle("text-valign").value;
-    tg === "top" ? Qh -= eg : tg === "bottom" && (Qh += eg);
-    var ng = o.pstyle("text-halign").value;
-    ng === "left" ? Zh -= $h : ng === "right" && (Zh += $h);
-    var rg = polygonIntersectLine(B[0], B[1], [
-      Zh - $h,
-      Qh - eg,
-      Zh + $h,
-      Qh - eg,
-      Zh + $h,
-      Qh + eg,
-      Zh - $h,
-      Qh + eg
+    var Ih = o._private.rscratch, Lh = Ih.labelWidth, Rh = Ih.labelHeight, zh = Ih.labelX, Bh = Ih.labelY, Vh = Lh / 2, Hh = Rh / 2, Uh = o.pstyle("text-valign").value;
+    Uh === "top" ? Bh -= Hh : Uh === "bottom" && (Bh += Hh);
+    var Wh = o.pstyle("text-halign").value;
+    Wh === "left" ? zh -= Vh : Wh === "right" && (zh += Vh);
+    var Gh = polygonIntersectLine(B[0], B[1], [
+      zh - Vh,
+      Bh - Hh,
+      zh + Vh,
+      Bh - Hh,
+      zh + Vh,
+      Bh + Hh,
+      zh - Vh,
+      Bh + Hh
     ], c.x, c.y);
-    if (rg.length > 0) {
-      var ig = l, ag = sqdist(ig, array2point(a)), og = sqdist(ig, array2point(rg)), sg = ag;
-      og < ag && (a = [rg[0], rg[1]], sg = og), rg.length > 2 && sqdist(ig, {
-        x: rg[2],
-        y: rg[3]
-      }) < sg && (a = [rg[2], rg[3]]);
+    if (Gh.length > 0) {
+      var Kh = l, qh = sqdist(Kh, array2point(a)), Jh = sqdist(Kh, array2point(Gh)), Yh = qh;
+      Jh < qh && (a = [Gh[0], Gh[1]], Yh = Jh), Gh.length > 2 && sqdist(Kh, {
+        x: Gh[2],
+        y: Gh[3]
+      }) < Yh && (a = [Gh[2], Gh[3]]);
     }
   }
-  var cg = shortenIntersection(a, R, r.arrowShapes[d].spacing(e) + m), lg = shortenIntersection(a, R, r.arrowShapes[d].gap(e) + m);
-  v.startX = lg[0], v.startY = lg[1], v.arrowStartX = cg[0], v.arrowStartY = cg[1], O && (!number$1(v.startX) || !number$1(v.startY) || !number$1(v.endX) || !number$1(v.endY) ? v.badLine = true : v.badLine = false);
+  var Xh = shortenIntersection(a, R, r.arrowShapes[d].spacing(e) + m), Zh = shortenIntersection(a, R, r.arrowShapes[d].gap(e) + m);
+  v.startX = Zh[0], v.startY = Zh[1], v.arrowStartX = Xh[0], v.arrowStartY = Xh[1], O && (!number$1(v.startX) || !number$1(v.startY) || !number$1(v.endX) || !number$1(v.endY) ? v.badLine = true : v.badLine = false);
 }, BRp$b.getSourceEndpoint = function(e) {
   var t = e[0]._private.rscratch;
   switch (this.recalculateRenderedStyle(e), t.edgeType) {
@@ -12951,11 +12905,10 @@ var lineAngleFromDelta = function(e, t) {
   var n = Math.atan(t / e);
   return e === 0 && n < 0 && (n *= -1), n;
 }, lineAngle = function(e, t) {
-  var n = t.x - e.x, r = t.y - e.y;
-  return lineAngleFromDelta(n, r);
+  return lineAngleFromDelta(t.x - e.x, t.y - e.y);
 }, bezierAngle = function(e, t, n, r) {
-  var a = bound(0, r - 1e-3, 1), o = bound(0, r + 1e-3, 1), s = qbezierPtAt(e, t, n, a), c = qbezierPtAt(e, t, n, o);
-  return lineAngle(s, c);
+  var a = bound(0, r - 1e-3, 1), o = bound(0, r + 1e-3, 1);
+  return lineAngle(qbezierPtAt(e, t, n, a), qbezierPtAt(e, t, n, o));
 };
 BRp$9.recalculateEdgeLabelProjections = function(e) {
   var t, n = e._private, r = n.rscratch, a = this, o = {
@@ -12971,11 +12924,9 @@ BRp$9.recalculateEdgeLabelProjections = function(e) {
     var s = function(e2, t2, r2) {
       setPrefixedProperty(n.rscratch, e2, t2, r2), setPrefixedProperty(n.rstyle, e2, t2, r2);
     };
-    s("labelX", null, t.x), s("labelY", null, t.y);
-    var c = lineAngleFromDelta(r.midDispX, r.midDispY);
-    s("labelAutoAngle", null, c);
-    var l = function() {
-      if (l.cache) return l.cache;
+    s("labelX", null, t.x), s("labelY", null, t.y), s("labelAutoAngle", null, lineAngleFromDelta(r.midDispX, r.midDispY));
+    var c = function() {
+      if (c.cache) return c.cache;
       for (var e2 = [], t2 = 0; t2 + 5 < r.allpts.length; t2 += 4) {
         var o2 = {
           x: r.allpts[t2],
@@ -12983,22 +12934,22 @@ BRp$9.recalculateEdgeLabelProjections = function(e) {
         }, s2 = {
           x: r.allpts[t2 + 2],
           y: r.allpts[t2 + 3]
-        }, c2 = {
+        }, l2 = {
           x: r.allpts[t2 + 4],
           y: r.allpts[t2 + 5]
         };
         e2.push({
           p0: o2,
           p1: s2,
-          p2: c2,
+          p2: l2,
           startDist: 0,
           length: 0,
           segments: []
         });
       }
-      var u2 = n.rstyle.bezierPts, d = a.bezierProjPcts.length;
+      var u = n.rstyle.bezierPts, d = a.bezierProjPcts.length;
       function f(e3, t3, n2, r2, a2) {
-        var o3 = dist(t3, n2), s3 = e3.segments[e3.segments.length - 1], c3 = {
+        var o3 = dist(t3, n2), s3 = e3.segments[e3.segments.length - 1], c2 = {
           p0: t3,
           p1: n2,
           t0: r2,
@@ -13006,28 +12957,28 @@ BRp$9.recalculateEdgeLabelProjections = function(e) {
           startDist: s3 ? s3.startDist + s3.length : 0,
           length: o3
         };
-        e3.segments.push(c3), e3.length += o3;
+        e3.segments.push(c2), e3.length += o3;
       }
       for (var m = 0; m < e2.length; m++) {
         var h = e2[m], g = e2[m - 1];
-        g && (h.startDist = g.startDist + g.length), f(h, h.p0, u2[m * d], 0, a.bezierProjPcts[0]);
-        for (var _ = 0; _ < d - 1; _++) f(h, u2[m * d + _], u2[m * d + _ + 1], a.bezierProjPcts[_], a.bezierProjPcts[_ + 1]);
-        f(h, u2[m * d + d - 1], h.p2, a.bezierProjPcts[d - 1], 1);
+        g && (h.startDist = g.startDist + g.length), f(h, h.p0, u[m * d], 0, a.bezierProjPcts[0]);
+        for (var _ = 0; _ < d - 1; _++) f(h, u[m * d + _], u[m * d + _ + 1], a.bezierProjPcts[_], a.bezierProjPcts[_ + 1]);
+        f(h, u[m * d + d - 1], h.p2, a.bezierProjPcts[d - 1], 1);
       }
-      return l.cache = e2;
-    }, u = function(n2) {
-      var a2, c2 = n2 === "source";
+      return c.cache = e2;
+    }, l = function(n2) {
+      var a2, l2 = n2 === "source";
       if (o[n2]) {
-        var u2 = e.pstyle(n2 + "-text-offset").pfValue;
+        var u = e.pstyle(n2 + "-text-offset").pfValue;
         switch (r.edgeType) {
           case "self":
           case "compound":
           case "bezier":
           case "multibezier":
-            for (var d = l(), f, m = 0, h = 0, g = 0; g < d.length; g++) {
-              for (var _ = d[c2 ? g : d.length - 1 - g], v = 0; v < _.segments.length; v++) {
-                var b = _.segments[c2 ? v : _.segments.length - 1 - v], S = g === d.length - 1 && v === _.segments.length - 1;
-                if (m = h, h += b.length, h >= u2 || S) {
+            for (var d = c(), f, m = 0, h = 0, g = 0; g < d.length; g++) {
+              for (var _ = d[l2 ? g : d.length - 1 - g], v = 0; v < _.segments.length; v++) {
+                var b = _.segments[l2 ? v : _.segments.length - 1 - v], S = g === d.length - 1 && v === _.segments.length - 1;
+                if (m = h, h += b.length, h >= u || S) {
                   f = {
                     cp: _,
                     segment: b
@@ -13037,13 +12988,13 @@ BRp$9.recalculateEdgeLabelProjections = function(e) {
               }
               if (f) break;
             }
-            var C = f.cp, w = f.segment, T = (u2 - m) / w.length, E = w.t1 - w.t0, D = c2 ? w.t0 + E * T : w.t1 - E * T;
+            var C = f.cp, w = f.segment, T = (u - m) / w.length, E = w.t1 - w.t0, D = l2 ? w.t0 + E * T : w.t1 - E * T;
             D = bound(0, D, 1), t = qbezierPtAt(C.p0, C.p1, C.p2, D), a2 = bezierAngle(C.p0, C.p1, C.p2, D);
             break;
           case "straight":
           case "segments":
           case "haystack":
-            for (var O = 0, k, A, j, M, N = r.allpts.length, P = 0; P + 3 < N && (c2 ? (j = {
+            for (var O = 0, k, A, j, M, N = r.allpts.length, P = 0; P + 3 < N && (l2 ? (j = {
               x: r.allpts[P],
               y: r.allpts[P + 1]
             }, M = {
@@ -13055,15 +13006,15 @@ BRp$9.recalculateEdgeLabelProjections = function(e) {
             }, M = {
               x: r.allpts[N - 4 - P],
               y: r.allpts[N - 3 - P]
-            }), k = dist(j, M), A = O, O += k, !(O >= u2)); P += 2) ;
-            var F = (u2 - A) / k;
+            }), k = dist(j, M), A = O, O += k, !(O >= u)); P += 2) ;
+            var F = (u - A) / k;
             F = bound(0, F, 1), t = lineAt(j, M, F), a2 = lineAngle(j, M);
             break;
         }
         s("labelX", n2, t.x), s("labelY", n2, t.y), s("labelAutoAngle", n2, a2);
       }
     };
-    u("source"), u("target"), this.applyLabelDimensions(e);
+    l("source"), l("target"), this.applyLabelDimensions(e);
   }
 }, BRp$9.applyLabelDimensions = function(e) {
   this.applyPrefixedLabelDimensions(e), e.isEdge() && (this.applyPrefixedLabelDimensions(e, "source"), this.applyPrefixedLabelDimensions(e, "target"));
@@ -13510,12 +13461,12 @@ BRp$3.registerBinding = function(e, t, n, r) {
       !e.hoverData.draggingEles && !e.hoverData.dragging && !e.hoverData.selecting && (h2 = e.findNearestElement(u2[0], u2[1], true, false));
       var g2 = e.hoverData.last, v3 = e.hoverData.down, S2 = [u2[0] - m2[2], u2[1] - m2[3]], C2 = e.dragData.possibleDragElements, w2;
       if (f2) {
-        var T2 = l2[0] - f2[0], E2 = T2 * T2, D2 = l2[1] - f2[1], O2 = D2 * D2, k2 = E2 + O2;
-        e.hoverData.isOverThresholdDrag = w2 = k2 >= e.desktopTapThreshold2;
+        var T2 = l2[0] - f2[0], E2 = T2 * T2, D2 = l2[1] - f2[1], O2 = E2 + D2 * D2;
+        e.hoverData.isOverThresholdDrag = w2 = O2 >= e.desktopTapThreshold2;
       }
-      var j2 = o(t2);
+      var k2 = o(t2);
       w2 && (e.hoverData.tapholdCancelled = true);
-      var M2 = function() {
+      var j2 = function() {
         var t3 = e.hoverData.dragDelta = e.hoverData.dragDelta || [];
         t3.length === 0 ? (t3.push(S2[0]), t3.push(S2[1])) : (t3[0] += S2[0], t3[1] += S2[1]);
       };
@@ -13527,7 +13478,7 @@ BRp$3.registerBinding = function(e, t, n, r) {
         x: u2[0],
         y: u2[1]
       });
-      var N2 = function(e2) {
+      var M2 = function(e2) {
         return {
           originalEvent: t2,
           type: e2,
@@ -13536,31 +13487,31 @@ BRp$3.registerBinding = function(e, t, n, r) {
             y: u2[1]
           }
         };
-      }, F2 = function() {
-        e.data.bgActivePosistion = void 0, e.hoverData.selecting || r2.emit(N2("boxstart")), m2[4] = 1, e.hoverData.selecting = true, e.redrawHint("select", true), e.redraw();
+      }, N2 = function() {
+        e.data.bgActivePosistion = void 0, e.hoverData.selecting || r2.emit(M2("boxstart")), m2[4] = 1, e.hoverData.selecting = true, e.redrawHint("select", true), e.redraw();
       };
       if (e.hoverData.which === 3) {
         if (w2) {
-          var I2 = N2("cxtdrag");
-          v3 ? v3.emit(I2) : r2.emit(I2), e.hoverData.cxtDragged = true, (!e.hoverData.cxtOver || h2 !== e.hoverData.cxtOver) && (e.hoverData.cxtOver && e.hoverData.cxtOver.emit(N2("cxtdragout")), e.hoverData.cxtOver = h2, h2 && h2.emit(N2("cxtdragover")));
+          var F2 = M2("cxtdrag");
+          v3 ? v3.emit(F2) : r2.emit(F2), e.hoverData.cxtDragged = true, (!e.hoverData.cxtOver || h2 !== e.hoverData.cxtOver) && (e.hoverData.cxtOver && e.hoverData.cxtOver.emit(M2("cxtdragout")), e.hoverData.cxtOver = h2, h2 && h2.emit(M2("cxtdragover")));
         }
       } else if (e.hoverData.dragging) {
         if (n2 = true, r2.panningEnabled() && r2.userPanningEnabled()) {
-          var L2;
+          var I2;
           if (e.hoverData.justStartedPan) {
-            var R2 = e.hoverData.mdownPos;
-            L2 = {
-              x: (u2[0] - R2[0]) * c2,
-              y: (u2[1] - R2[1]) * c2
+            var L2 = e.hoverData.mdownPos;
+            I2 = {
+              x: (u2[0] - L2[0]) * c2,
+              y: (u2[1] - L2[1]) * c2
             }, e.hoverData.justStartedPan = false;
-          } else L2 = {
+          } else I2 = {
             x: S2[0] * c2,
             y: S2[1] * c2
           };
-          r2.panBy(L2), r2.emit(N2("dragpan")), e.hoverData.dragged = true;
+          r2.panBy(I2), r2.emit(M2("dragpan")), e.hoverData.dragged = true;
         }
         u2 = e.projectIntoViewport(t2.clientX, t2.clientY);
-      } else if (m2[4] == 1 && (v3 == null || v3.pannable())) w2 && (!e.hoverData.dragging && r2.boxSelectionEnabled() && (j2 || !r2.panningEnabled() || !r2.userPanningEnabled()) ? F2() : !e.hoverData.selecting && r2.panningEnabled() && r2.userPanningEnabled() && s(v3, e.hoverData.downs) && (e.hoverData.dragging = true, e.hoverData.justStartedPan = true, m2[4] = 0, e.data.bgActivePosistion = array2point(d2), e.redrawHint("select", true), e.redraw()), v3 && v3.pannable() && v3.active() && v3.unactivate());
+      } else if (m2[4] == 1 && (v3 == null || v3.pannable())) w2 && (!e.hoverData.dragging && r2.boxSelectionEnabled() && (k2 || !r2.panningEnabled() || !r2.userPanningEnabled()) ? N2() : !e.hoverData.selecting && r2.panningEnabled() && r2.userPanningEnabled() && s(v3, e.hoverData.downs) && (e.hoverData.dragging = true, e.hoverData.justStartedPan = true, m2[4] = 0, e.data.bgActivePosistion = array2point(d2), e.redrawHint("select", true), e.redraw()), v3 && v3.pannable() && v3.active() && v3.unactivate());
       else {
         if (v3 && v3.pannable() && v3.active() && v3.unactivate(), (!v3 || !v3.grabbed()) && h2 != g2 && (g2 && a(g2, ["mouseout", "tapdragout"], t2, {
           x: u2[0],
@@ -13569,21 +13520,21 @@ BRp$3.registerBinding = function(e, t, n, r) {
           x: u2[0],
           y: u2[1]
         }), e.hoverData.last = h2), v3) if (w2) {
-          if (r2.boxSelectionEnabled() && j2) v3 && v3.grabbed() && (b(C2), v3.emit(N2("freeon")), C2.emit(N2("free")), e.dragData.didDrag && (v3.emit(N2("dragfreeon")), C2.emit(N2("dragfree")))), F2();
+          if (r2.boxSelectionEnabled() && k2) v3 && v3.grabbed() && (b(C2), v3.emit(M2("freeon")), C2.emit(M2("free")), e.dragData.didDrag && (v3.emit(M2("dragfreeon")), C2.emit(M2("dragfree")))), N2();
           else if (v3 && v3.grabbed() && e.nodeIsDraggable(v3)) {
-            var z2 = !e.dragData.didDrag;
-            z2 && e.redrawHint("eles", true), e.dragData.didDrag = true, e.hoverData.draggingEles || _(C2, { inDragLayer: true });
-            var B2 = {
+            var R2 = !e.dragData.didDrag;
+            R2 && e.redrawHint("eles", true), e.dragData.didDrag = true, e.hoverData.draggingEles || _(C2, { inDragLayer: true });
+            var z2 = {
               x: 0,
               y: 0
             };
-            if (number$1(S2[0]) && number$1(S2[1]) && (B2.x += S2[0], B2.y += S2[1], z2)) {
-              var V2 = e.hoverData.dragDelta;
-              V2 && number$1(V2[0]) && number$1(V2[1]) && (B2.x += V2[0], B2.y += V2[1]);
+            if (number$1(S2[0]) && number$1(S2[1]) && (z2.x += S2[0], z2.y += S2[1], R2)) {
+              var B2 = e.hoverData.dragDelta;
+              B2 && number$1(B2[0]) && number$1(B2[1]) && (z2.x += B2[0], z2.y += B2[1]);
             }
-            e.hoverData.draggingEles = true, C2.silentShift(B2).emit(N2("position")).emit(N2("drag")), e.redrawHint("drag", true), e.redraw();
+            e.hoverData.draggingEles = true, C2.silentShift(z2).emit(M2("position")).emit(M2("drag")), e.redrawHint("drag", true), e.redraw();
           }
-        } else M2();
+        } else j2();
         n2 = true;
       }
       if (m2[2] = u2[0], m2[3] = u2[1], n2) return t2.stopPropagation && t2.stopPropagation(), t2.preventDefault && t2.preventDefault(), false;
@@ -13736,12 +13687,12 @@ BRp$3.registerBinding = function(e, t, n, r) {
       }
     });
   }, false);
-  var U, W, G, q, J, Y, X, Z, Q, $, zh, Bh, Vh, Hh = function(e2, t2, n2, r2) {
+  var U, W, G, q, J, Y, X, Z, Q, $, Dh, Oh, kh, Ah = function(e2, t2, n2, r2) {
     return Math.sqrt((n2 - e2) * (n2 - e2) + (r2 - t2) * (r2 - t2));
-  }, Uh = function(e2, t2, n2, r2) {
+  }, jh = function(e2, t2, n2, r2) {
     return (n2 - e2) * (n2 - e2) + (r2 - t2) * (r2 - t2);
-  }, Wh;
-  e.registerBinding(e.container, "touchstart", Wh = function(t2) {
+  }, Mh;
+  e.registerBinding(e.container, "touchstart", Mh = function(t2) {
     if (e.hasTouchStarted = true, A(t2)) {
       C(), e.touchData.capture = true, e.data.bgActivePosistion = void 0;
       var n2 = e.cy, r2 = e.touchData.now, o2 = e.touchData.earlier;
@@ -13770,9 +13721,9 @@ BRp$3.registerBinding = function(e, t, n, r) {
       if (t2.touches[1]) {
         e.touchData.singleTouchMoved = true, b(e.dragData.touchDragEles);
         var l2 = e.findContainerClientCoords();
-        Q = l2[0], $ = l2[1], zh = l2[2], Bh = l2[3], U = t2.touches[0].clientX - Q, W = t2.touches[0].clientY - $, G = t2.touches[1].clientX - Q, q = t2.touches[1].clientY - $, Vh = 0 <= U && U <= zh && 0 <= G && G <= zh && 0 <= W && W <= Bh && 0 <= q && q <= Bh;
+        Q = l2[0], $ = l2[1], Dh = l2[2], Oh = l2[3], U = t2.touches[0].clientX - Q, W = t2.touches[0].clientY - $, G = t2.touches[1].clientX - Q, q = t2.touches[1].clientY - $, kh = 0 <= U && U <= Dh && 0 <= G && G <= Dh && 0 <= W && W <= Oh && 0 <= q && q <= Oh;
         var u2 = n2.pan(), d2 = n2.zoom();
-        J = Hh(U, W, G, q), Y = Uh(U, W, G, q), X = [(U + G) / 2, (W + q) / 2], Z = [(X[0] - u2.x) / d2, (X[1] - u2.y) / d2];
+        J = Ah(U, W, G, q), Y = jh(U, W, G, q), X = [(U + G) / 2, (W + q) / 2], Z = [(X[0] - u2.x) / d2, (X[1] - u2.y) / d2];
         var m2 = 200, h2 = m2 * m2;
         if (Y < h2 && !t2.touches[2]) {
           var g2 = e.findNearestElement(r2[0], r2[1], true, true), S2 = e.findNearestElement(r2[2], r2[3], true, true);
@@ -13822,8 +13773,8 @@ BRp$3.registerBinding = function(e, t, n, r) {
       }
     }
   }, false);
-  var Gh;
-  e.registerBinding(t, "touchmove", Gh = function(t2) {
+  var Nh;
+  e.registerBinding(t, "touchmove", Nh = function(t2) {
     var n2 = e.touchData.capture;
     if (!(!n2 && !A(t2))) {
       var r2 = e.selection, o2 = e.cy, c2 = e.touchData.now, l2 = e.touchData.earlier, u2 = o2.zoom();
@@ -13851,49 +13802,49 @@ BRp$3.registerBinding = function(e, t, n, r) {
       }, m2 = e.touchData.startGPosition, h2;
       if (n2 && t2.touches[0] && m2) {
         for (var g2 = [], v3 = 0; v3 < c2.length; v3++) g2[v3] = c2[v3] - l2[v3];
-        var S2 = t2.touches[0].clientX - m2[0], C2 = S2 * S2, w2 = t2.touches[0].clientY - m2[1], T2 = w2 * w2;
-        h2 = C2 + T2 >= e.touchTapThreshold2;
+        var S2 = t2.touches[0].clientX - m2[0], C2 = S2 * S2, w2 = t2.touches[0].clientY - m2[1];
+        h2 = C2 + w2 * w2 >= e.touchTapThreshold2;
       }
       if (n2 && e.touchData.cxt) {
         t2.preventDefault();
-        var E2 = t2.touches[0].clientX - Q, D2 = t2.touches[0].clientY - $, O2 = t2.touches[1].clientX - Q, k2 = t2.touches[1].clientY - $, j2 = Uh(E2, D2, O2, k2), M2 = j2 / Y, N2 = 150, F2 = N2 * N2, I2 = 1.5, L2 = I2 * I2;
-        if (M2 >= L2 || j2 >= F2) {
+        var T2 = t2.touches[0].clientX - Q, E2 = t2.touches[0].clientY - $, D2 = t2.touches[1].clientX - Q, O2 = t2.touches[1].clientY - $, k2 = jh(T2, E2, D2, O2), j2 = k2 / Y, M2 = 150, N2 = M2 * M2, F2 = 1.5;
+        if (j2 >= F2 * F2 || k2 >= N2) {
           e.touchData.cxt = false, e.data.bgActivePosistion = void 0, e.redrawHint("select", true);
-          var R2 = f2("cxttapend");
-          e.touchData.start ? (e.touchData.start.unactivate().emit(R2), e.touchData.start = null) : o2.emit(R2);
+          var I2 = f2("cxttapend");
+          e.touchData.start ? (e.touchData.start.unactivate().emit(I2), e.touchData.start = null) : o2.emit(I2);
         }
       }
       if (n2 && e.touchData.cxt) {
-        var R2 = f2("cxtdrag");
-        e.data.bgActivePosistion = void 0, e.redrawHint("select", true), e.touchData.start ? e.touchData.start.emit(R2) : o2.emit(R2), e.touchData.start && (e.touchData.start._private.grabbed = false), e.touchData.cxtDragged = true;
-        var z2 = e.findNearestElement(c2[0], c2[1], true, true);
-        (!e.touchData.cxtOver || z2 !== e.touchData.cxtOver) && (e.touchData.cxtOver && e.touchData.cxtOver.emit(f2("cxtdragout")), e.touchData.cxtOver = z2, z2 && z2.emit(f2("cxtdragover")));
+        var I2 = f2("cxtdrag");
+        e.data.bgActivePosistion = void 0, e.redrawHint("select", true), e.touchData.start ? e.touchData.start.emit(I2) : o2.emit(I2), e.touchData.start && (e.touchData.start._private.grabbed = false), e.touchData.cxtDragged = true;
+        var L2 = e.findNearestElement(c2[0], c2[1], true, true);
+        (!e.touchData.cxtOver || L2 !== e.touchData.cxtOver) && (e.touchData.cxtOver && e.touchData.cxtOver.emit(f2("cxtdragout")), e.touchData.cxtOver = L2, L2 && L2.emit(f2("cxtdragover")));
       } else if (n2 && t2.touches[2] && o2.boxSelectionEnabled()) t2.preventDefault(), e.data.bgActivePosistion = void 0, this.lastThreeTouch = +/* @__PURE__ */ new Date(), e.touchData.selecting || o2.emit(f2("boxstart")), e.touchData.selecting = true, e.touchData.didSelect = true, r2[4] = 1, !r2 || r2.length === 0 || r2[0] === void 0 ? (r2[0] = (c2[0] + c2[2] + c2[4]) / 3, r2[1] = (c2[1] + c2[3] + c2[5]) / 3, r2[2] = (c2[0] + c2[2] + c2[4]) / 3 + 1, r2[3] = (c2[1] + c2[3] + c2[5]) / 3 + 1) : (r2[2] = (c2[0] + c2[2] + c2[4]) / 3, r2[3] = (c2[1] + c2[3] + c2[5]) / 3), e.redrawHint("select", true), e.redraw();
       else if (n2 && t2.touches[1] && !e.touchData.didSelect && o2.zoomingEnabled() && o2.panningEnabled() && o2.userZoomingEnabled() && o2.userPanningEnabled()) {
         t2.preventDefault(), e.data.bgActivePosistion = void 0, e.redrawHint("select", true);
-        var B2 = e.dragData.touchDragEles;
-        if (B2) {
+        var R2 = e.dragData.touchDragEles;
+        if (R2) {
           e.redrawHint("drag", true);
-          for (var V2 = 0; V2 < B2.length; V2++) {
-            var H2 = B2[V2]._private;
-            H2.grabbed = false, H2.rscratch.inDragLayer = false;
+          for (var z2 = 0; z2 < R2.length; z2++) {
+            var B2 = R2[z2]._private;
+            B2.grabbed = false, B2.rscratch.inDragLayer = false;
           }
         }
-        var X2 = e.touchData.start, E2 = t2.touches[0].clientX - Q, D2 = t2.touches[0].clientY - $, O2 = t2.touches[1].clientX - Q, k2 = t2.touches[1].clientY - $, zh2 = Hh(E2, D2, O2, k2), Bh2 = zh2 / J;
-        if (Vh) {
-          var Wh2 = E2 - U, Gh2 = D2 - W, Kh2 = O2 - G, qh2 = k2 - q, Jh2 = (Wh2 + Kh2) / 2, Yh2 = (Gh2 + qh2) / 2, Xh2 = o2.zoom(), Zh2 = Xh2 * Bh2, Qh2 = o2.pan(), $h2 = Z[0] * Xh2 + Qh2.x, eg2 = Z[1] * Xh2 + Qh2.y, tg2 = {
-            x: -Zh2 / Xh2 * ($h2 - Qh2.x - Jh2) + $h2,
-            y: -Zh2 / Xh2 * (eg2 - Qh2.y - Yh2) + eg2
+        var V2 = e.touchData.start, T2 = t2.touches[0].clientX - Q, E2 = t2.touches[0].clientY - $, D2 = t2.touches[1].clientX - Q, O2 = t2.touches[1].clientY - $, H2 = Ah(T2, E2, D2, O2), X2 = H2 / J;
+        if (kh) {
+          var Dh2 = T2 - U, Oh2 = E2 - W, Mh2 = D2 - G, Nh2 = O2 - q, Ph2 = (Dh2 + Mh2) / 2, Fh2 = (Oh2 + Nh2) / 2, Ih2 = o2.zoom(), Lh2 = Ih2 * X2, Rh2 = o2.pan(), zh2 = Z[0] * Ih2 + Rh2.x, Bh2 = Z[1] * Ih2 + Rh2.y, Vh2 = {
+            x: -Lh2 / Ih2 * (zh2 - Rh2.x - Ph2) + zh2,
+            y: -Lh2 / Ih2 * (Bh2 - Rh2.y - Fh2) + Bh2
           };
-          if (X2 && X2.active()) {
-            var B2 = e.dragData.touchDragEles;
-            b(B2), e.redrawHint("drag", true), e.redrawHint("eles", true), X2.unactivate().emit(f2("freeon")), B2.emit(f2("free")), e.dragData.didDrag && (X2.emit(f2("dragfreeon")), B2.emit(f2("dragfree")));
+          if (V2 && V2.active()) {
+            var R2 = e.dragData.touchDragEles;
+            b(R2), e.redrawHint("drag", true), e.redrawHint("eles", true), V2.unactivate().emit(f2("freeon")), R2.emit(f2("free")), e.dragData.didDrag && (V2.emit(f2("dragfreeon")), R2.emit(f2("dragfree")));
           }
           o2.viewport({
-            zoom: Zh2,
-            pan: tg2,
+            zoom: Lh2,
+            pan: Vh2,
             cancelOnFailedZoom: true
-          }), o2.emit(f2("pinchzoom")), J = zh2, U = E2, W = D2, G = O2, q = k2, e.pinching = true;
+          }), o2.emit(f2("pinchzoom")), J = H2, U = T2, W = E2, G = D2, q = O2, e.pinching = true;
         }
         if (t2.touches[0]) {
           var d2 = e.projectIntoViewport(t2.touches[0].clientX, t2.touches[0].clientY);
@@ -13908,40 +13859,40 @@ BRp$3.registerBinding = function(e, t, n, r) {
           c2[4] = d2[0], c2[5] = d2[1];
         }
       } else if (t2.touches[0] && !e.touchData.didSelect) {
-        var ng2 = e.touchData.start, rg2 = e.touchData.last, z2;
-        if (!e.hoverData.draggingEles && !e.swipePanning && (z2 = e.findNearestElement(c2[0], c2[1], true, true)), n2 && ng2 != null && t2.preventDefault(), n2 && ng2 != null && e.nodeIsDraggable(ng2)) if (h2) {
-          var B2 = e.dragData.touchDragEles, ig2 = !e.dragData.didDrag;
-          ig2 && _(B2, { inDragLayer: true }), e.dragData.didDrag = true;
-          var ag = {
+        var Hh2 = e.touchData.start, Uh2 = e.touchData.last, L2;
+        if (!e.hoverData.draggingEles && !e.swipePanning && (L2 = e.findNearestElement(c2[0], c2[1], true, true)), n2 && Hh2 != null && t2.preventDefault(), n2 && Hh2 != null && e.nodeIsDraggable(Hh2)) if (h2) {
+          var R2 = e.dragData.touchDragEles, Wh2 = !e.dragData.didDrag;
+          Wh2 && _(R2, { inDragLayer: true }), e.dragData.didDrag = true;
+          var Gh2 = {
             x: 0,
             y: 0
           };
-          if (number$1(g2[0]) && number$1(g2[1]) && (ag.x += g2[0], ag.y += g2[1], ig2)) {
+          if (number$1(g2[0]) && number$1(g2[1]) && (Gh2.x += g2[0], Gh2.y += g2[1], Wh2)) {
             e.redrawHint("eles", true);
-            var og = e.touchData.dragDelta;
-            og && number$1(og[0]) && number$1(og[1]) && (ag.x += og[0], ag.y += og[1]);
+            var Kh2 = e.touchData.dragDelta;
+            Kh2 && number$1(Kh2[0]) && number$1(Kh2[1]) && (Gh2.x += Kh2[0], Gh2.y += Kh2[1]);
           }
-          e.hoverData.draggingEles = true, B2.silentShift(ag).emit(f2("position")).emit(f2("drag")), e.redrawHint("drag", true), e.touchData.startPosition[0] == l2[0] && e.touchData.startPosition[1] == l2[1] && e.redrawHint("eles", true), e.redraw();
+          e.hoverData.draggingEles = true, R2.silentShift(Gh2).emit(f2("position")).emit(f2("drag")), e.redrawHint("drag", true), e.touchData.startPosition[0] == l2[0] && e.touchData.startPosition[1] == l2[1] && e.redrawHint("eles", true), e.redraw();
         } else {
-          var og = e.touchData.dragDelta = e.touchData.dragDelta || [];
-          og.length === 0 ? (og.push(g2[0]), og.push(g2[1])) : (og[0] += g2[0], og[1] += g2[1]);
+          var Kh2 = e.touchData.dragDelta = e.touchData.dragDelta || [];
+          Kh2.length === 0 ? (Kh2.push(g2[0]), Kh2.push(g2[1])) : (Kh2[0] += g2[0], Kh2[1] += g2[1]);
         }
-        if (a(ng2 || z2, [
+        if (a(Hh2 || L2, [
           "touchmove",
           "tapdrag",
           "vmousemove"
         ], t2, {
           x: c2[0],
           y: c2[1]
-        }), (!ng2 || !ng2.grabbed()) && z2 != rg2 && (rg2 && rg2.emit(f2("tapdragout")), z2 && z2.emit(f2("tapdragover"))), e.touchData.last = z2, n2) for (var V2 = 0; V2 < c2.length; V2++) c2[V2] && e.touchData.startPosition[V2] && h2 && (e.touchData.singleTouchMoved = true);
-        if (n2 && (ng2 == null || ng2.pannable()) && o2.panningEnabled() && o2.userPanningEnabled()) {
-          s(ng2, e.touchData.starts) && (t2.preventDefault(), e.data.bgActivePosistion || (e.data.bgActivePosistion = array2point(e.touchData.startPosition)), e.swipePanning ? (o2.panBy({
+        }), (!Hh2 || !Hh2.grabbed()) && L2 != Uh2 && (Uh2 && Uh2.emit(f2("tapdragout")), L2 && L2.emit(f2("tapdragover"))), e.touchData.last = L2, n2) for (var z2 = 0; z2 < c2.length; z2++) c2[z2] && e.touchData.startPosition[z2] && h2 && (e.touchData.singleTouchMoved = true);
+        if (n2 && (Hh2 == null || Hh2.pannable()) && o2.panningEnabled() && o2.userPanningEnabled()) {
+          s(Hh2, e.touchData.starts) && (t2.preventDefault(), e.data.bgActivePosistion || (e.data.bgActivePosistion = array2point(e.touchData.startPosition)), e.swipePanning ? (o2.panBy({
             x: g2[0] * u2,
             y: g2[1] * u2
           }), o2.emit(f2("dragpan"))) : h2 && (e.swipePanning = true, o2.panBy({
             x: S2 * u2,
             y: w2 * u2
-          }), o2.emit(f2("dragpan")), ng2 && (ng2.unactivate(), e.redrawHint("select", true), e.touchData.start = null)));
+          }), o2.emit(f2("dragpan")), Hh2 && (Hh2.unactivate(), e.redrawHint("select", true), e.touchData.start = null)));
           var d2 = e.projectIntoViewport(t2.touches[0].clientX, t2.touches[0].clientY);
           c2[0] = d2[0], c2[1] = d2[1];
         }
@@ -13950,13 +13901,13 @@ BRp$3.registerBinding = function(e, t, n, r) {
       n2 && t2.touches.length > 0 && !e.hoverData.draggingEles && !e.swipePanning && e.data.bgActivePosistion != null && (e.data.bgActivePosistion = void 0, e.redrawHint("select", true), e.redraw());
     }
   }, false);
-  var Kh;
-  e.registerBinding(t, "touchcancel", Kh = function(t2) {
+  var Ph;
+  e.registerBinding(t, "touchcancel", Ph = function(t2) {
     var n2 = e.touchData.start;
     e.touchData.capture = false, n2 && n2.unactivate();
   });
-  var qh, Jh, Yh, Xh;
-  if (e.registerBinding(t, "touchend", qh = function(t2) {
+  var Fh, Ih, Lh, Rh;
+  if (e.registerBinding(t, "touchend", Fh = function(t2) {
     var r2 = e.touchData.start;
     if (e.touchData.capture) t2.touches.length === 0 && (e.touchData.capture = false), t2.preventDefault();
     else return;
@@ -14017,33 +13968,30 @@ BRp$3.registerBinding = function(e, t, n, r) {
           x: l2[0],
           y: l2[1]
         }), r2.unactivate(), e.touchData.start = null;
-      } else {
-        var S2 = e.findNearestElement(l2[0], l2[1], true, true);
-        a(S2, [
-          "touchend",
-          "tapend",
-          "vmouseup",
-          "tapdragout"
-        ], t2, {
-          x: l2[0],
-          y: l2[1]
-        });
-      }
-      var C2 = e.touchData.startPosition[0] - l2[0], w2 = C2 * C2, T2 = e.touchData.startPosition[1] - l2[1], E2 = T2 * T2, D2 = (w2 + E2) * c2 * c2;
+      } else a(e.findNearestElement(l2[0], l2[1], true, true), [
+        "touchend",
+        "tapend",
+        "vmouseup",
+        "tapdragout"
+      ], t2, {
+        x: l2[0],
+        y: l2[1]
+      });
+      var S2 = e.touchData.startPosition[0] - l2[0], C2 = S2 * S2, w2 = e.touchData.startPosition[1] - l2[1], T2 = (C2 + w2 * w2) * c2 * c2;
       e.touchData.singleTouchMoved || (r2 || s2.$(":selected").unselect(["tapunselect"]), a(r2, ["tap", "vclick"], t2, {
         x: l2[0],
         y: l2[1]
-      }), Jh = false, t2.timeStamp - Xh <= s2.multiClickDebounceTime() ? (Yh && clearTimeout(Yh), Jh = true, Xh = null, a(r2, ["dbltap", "vdblclick"], t2, {
+      }), Ih = false, t2.timeStamp - Rh <= s2.multiClickDebounceTime() ? (Lh && clearTimeout(Lh), Ih = true, Rh = null, a(r2, ["dbltap", "vdblclick"], t2, {
         x: l2[0],
         y: l2[1]
-      })) : (Yh = setTimeout(function() {
-        Jh || a(r2, ["onetap", "voneclick"], t2, {
+      })) : (Lh = setTimeout(function() {
+        Ih || a(r2, ["onetap", "voneclick"], t2, {
           x: l2[0],
           y: l2[1]
         });
-      }, s2.multiClickDebounceTime()), Xh = t2.timeStamp)), r2 != null && !e.dragData.didDrag && r2._private.selectable && D2 < e.touchTapThreshold2 && !e.pinching && (s2.selectionType() === "single" ? (s2.$(n).unmerge(r2).unselect(["tapunselect"]), r2.select(["tapselect"])) : r2.selected() ? r2.unselect(["tapunselect"]) : r2.select(["tapselect"]), e.redrawHint("eles", true)), e.touchData.singleTouchMoved = true;
+      }, s2.multiClickDebounceTime()), Rh = t2.timeStamp)), r2 != null && !e.dragData.didDrag && r2._private.selectable && T2 < e.touchTapThreshold2 && !e.pinching && (s2.selectionType() === "single" ? (s2.$(n).unmerge(r2).unselect(["tapunselect"]), r2.select(["tapselect"])) : r2.selected() ? r2.unselect(["tapunselect"]) : r2.select(["tapselect"]), e.redrawHint("eles", true)), e.touchData.singleTouchMoved = true;
     }
-    for (var O2 = 0; O2 < l2.length; O2++) u2[O2] = l2[O2];
+    for (var E2 = 0; E2 < l2.length; E2++) u2[E2] = l2[E2];
     e.dragData.didDrag = false, t2.touches.length === 0 && (e.touchData.dragDelta = [], e.touchData.startPosition = [
       null,
       null,
@@ -14053,7 +14001,7 @@ BRp$3.registerBinding = function(e, t, n, r) {
       null
     ], e.touchData.startGPosition = null, e.touchData.didSelect = false), t2.touches.length < 2 && (t2.touches.length === 1 && (e.touchData.startGPosition = [t2.touches[0].clientX, t2.touches[0].clientY]), e.pinching = false, e.redrawHint("eles", true), e.redraw());
   }, false), typeof TouchEvent > "u") {
-    var Zh = [], Qh = function(e2) {
+    var zh = [], Bh = function(e2) {
       return {
         clientX: e2.clientX,
         clientY: e2.clientY,
@@ -14067,38 +14015,38 @@ BRp$3.registerBinding = function(e, t, n, r) {
         screenY: e2.screenY,
         target: e2.target
       };
-    }, $h = function(e2) {
+    }, Vh = function(e2) {
       return {
         event: e2,
-        touch: Qh(e2)
+        touch: Bh(e2)
       };
-    }, eg = function(e2) {
-      Zh.push($h(e2));
-    }, tg = function(e2) {
-      for (var t2 = 0; t2 < Zh.length; t2++) if (Zh[t2].event.pointerId === e2.pointerId) {
-        Zh.splice(t2, 1);
+    }, Hh = function(e2) {
+      zh.push(Vh(e2));
+    }, Uh = function(e2) {
+      for (var t2 = 0; t2 < zh.length; t2++) if (zh[t2].event.pointerId === e2.pointerId) {
+        zh.splice(t2, 1);
         return;
       }
-    }, ng = function(e2) {
-      var t2 = Zh.filter(function(t3) {
+    }, Wh = function(e2) {
+      var t2 = zh.filter(function(t3) {
         return t3.event.pointerId === e2.pointerId;
       })[0];
-      t2.event = e2, t2.touch = Qh(e2);
-    }, rg = function(e2) {
-      e2.touches = Zh.map(function(e3) {
+      t2.event = e2, t2.touch = Bh(e2);
+    }, Gh = function(e2) {
+      e2.touches = zh.map(function(e3) {
         return e3.touch;
       });
-    }, ig = function(e2) {
+    }, Kh = function(e2) {
       return e2.pointerType === "mouse" || e2.pointerType === 4;
     };
     e.registerBinding(e.container, "pointerdown", function(e2) {
-      ig(e2) || (e2.preventDefault(), eg(e2), rg(e2), Wh(e2));
+      Kh(e2) || (e2.preventDefault(), Hh(e2), Gh(e2), Mh(e2));
     }), e.registerBinding(e.container, "pointerup", function(e2) {
-      ig(e2) || (tg(e2), rg(e2), qh(e2));
+      Kh(e2) || (Uh(e2), Gh(e2), Fh(e2));
     }), e.registerBinding(e.container, "pointercancel", function(e2) {
-      ig(e2) || (tg(e2), rg(e2), Kh(e2));
+      Kh(e2) || (Uh(e2), Gh(e2), Ph(e2));
     }), e.registerBinding(e.container, "pointermove", function(e2) {
-      ig(e2) || (e2.preventDefault(), ng(e2), rg(e2), Gh(e2));
+      Kh(e2) || (e2.preventDefault(), Wh(e2), Gh(e2), Nh(e2));
     });
   }
 };
@@ -14229,13 +14177,13 @@ BRp$2.generatePolygon = function(e, t) {
       };
     },
     intersectLine: function(e, t, n, r, a, o, s, c) {
-      var l = this.generateCutTrianglePts(n + 2 * s, r + 2 * s, e, t, c), u = [].concat.apply([], [
+      var l = this.generateCutTrianglePts(n + 2 * s, r + 2 * s, e, t, c);
+      return polygonIntersectLine(a, o, [].concat.apply([], [
         l.topLeft.splice(0, 4),
         l.topRight.splice(0, 4),
         l.bottomRight.splice(0, 4),
         l.bottomLeft.splice(0, 4)
-      ]);
-      return polygonIntersectLine(a, o, u, e, t);
+      ]), e, t);
     },
     checkPoint: function(e, t, n, r, a, o, s, c) {
       var l = c === "auto" ? this.cornerLength : c;
@@ -14294,8 +14242,8 @@ BRp$2.generatePolygon = function(e, t) {
           e2[4],
           e2[5]
         ];
-      }, h = [].concat(m(f.topLeft), m(f.topRight), m(f.bottomRight), m(f.bottomLeft));
-      return polygonIntersectLine(a, o, h, e, t);
+      };
+      return polygonIntersectLine(a, o, [].concat(m(f.topLeft), m(f.topRight), m(f.bottomRight), m(f.bottomLeft)), e, t);
     },
     generateBarrelBezierPts: function(e, t, n, r) {
       var a = t / 2, o = e / 2, s = n - o, c = n + o, l = r - a, u = r + a, d = getBarrelCurveConstants(e, t), f = d.heightOffset, m = d.widthOffset, h = d.ctrlPtOffsetPct * e, g = {
@@ -14347,10 +14295,10 @@ BRp$2.generatePolygon = function(e, t) {
         }
         return null;
       }, h = Object.keys(f), g = 0; g < h.length; g++) {
-        var _ = h[g], v = f[_], b = m(e, t, v);
-        if (b != null) {
-          var S = v[5], C = v[3], w = v[1], T = qbezierAt(S, C, w, b);
-          if (v.isTop && T <= t || v.isBottom && t <= T) return true;
+        var _ = f[h[g]], v = m(e, t, _);
+        if (v != null) {
+          var b = _[5], S = _[3], C = _[1], w = qbezierAt(b, S, C, v);
+          if (_.isTop && w <= t || _.isBottom && t <= w) return true;
         }
       }
       return false;
@@ -14365,14 +14313,15 @@ BRp$2.generatePolygon = function(e, t) {
       this.renderer.nodeShapeImpl(this.name, e, t, n, r, a, this.points, o);
     },
     intersectLine: function(e, t, n, r, a, o, s, c) {
-      var l = e - (n / 2 + s), u = t - (r / 2 + s), d = u, f = e + (n / 2 + s), m = finiteLinesIntersect(a, o, e, t, l, u, f, d, false);
-      return m.length > 0 ? m : roundRectangleIntersectLine(a, o, e, t, n, r, s, c);
+      var l = e - (n / 2 + s), u = t - (r / 2 + s), d = u, f = finiteLinesIntersect(a, o, e, t, l, u, e + (n / 2 + s), d, false);
+      return f.length > 0 ? f : roundRectangleIntersectLine(a, o, e, t, n, r, s, c);
     },
     checkPoint: function(e, t, n, r, a, o, s, c) {
       c = c === "auto" ? getRoundRectangleRadius(r, a) : c;
       var l = 2 * c;
       if (pointInsidePolygon(e, t, this.points, o, s, r, a - l, [0, -1], n) || pointInsidePolygon(e, t, this.points, o, s, r - l, a, [0, -1], n)) return true;
-      var u = r / 2 + 2 * n, d = a / 2 + 2 * n, f = [
+      var u = r / 2 + 2 * n, d = a / 2 + 2 * n;
+      return !!(pointInsidePolygonPoints(e, t, [
         o - u,
         s - d,
         o - u,
@@ -14381,8 +14330,7 @@ BRp$2.generatePolygon = function(e, t) {
         s,
         o + u,
         s - d
-      ];
-      return !!(pointInsidePolygonPoints(e, t, f) || checkInEllipse(e, t, l, l, o + r / 2 - c, s + a / 2 - c, n) || checkInEllipse(e, t, l, l, o - r / 2 + c, s + a / 2 - c, n));
+      ]) || checkInEllipse(e, t, l, l, o + r / 2 - c, s + a / 2 - c, n) || checkInEllipse(e, t, l, l, o - r / 2 + c, s + a / 2 - c, n));
     }
   };
 }, BRp$2.registerNodeShapes = function() {
@@ -14695,8 +14643,8 @@ var fullFpsTime = 1e3 / 60, defs = { setupDequeueing: function(e) {
     {
       key: "keyHasChangedFor",
       value: function(e2) {
-        var t = e2.id(), n = this.keyForId.get(t), r = this.getKey(e2);
-        return n !== r;
+        var t = e2.id();
+        return this.keyForId.get(t) !== this.getKey(e2);
       }
     },
     {
@@ -14958,10 +14906,7 @@ ETCp.reasons = getTxrReasons, ETCp.getTextureQueue = function(e) {
     }
   },
   shouldRedraw: function(e, t, n, r) {
-    for (var a = 0; a < t.length; a++) for (var o = t[a].eles, s = 0; s < o.length; s++) {
-      var c = o[s].boundingBox();
-      if (boundingBoxesIntersect(c, r)) return true;
-    }
+    for (var a = 0; a < t.length; a++) for (var o = t[a].eles, s = 0; s < o.length; s++) if (boundingBoxesIntersect(o[s].boundingBox(), r)) return true;
     return false;
   },
   priority: function(e) {
@@ -15318,8 +15263,8 @@ CRp$9.drawEdge = function(e, t, n) {
       s.drawElementText(e, t, null, r);
     };
     if (e.lineJoin = "round", t.pstyle("ghost").value === "yes") {
-      var k = t.pstyle("ghost-offset-x").pfValue, A = t.pstyle("ghost-offset-y").pfValue, j = t.pstyle("ghost-opacity").value, M = b * j;
-      e.translate(k, A), C(M), D(M), e.translate(-k, -A);
+      var k = t.pstyle("ghost-offset-x").pfValue, A = t.pstyle("ghost-offset-y").pfValue, j = b * t.pstyle("ghost-opacity").value;
+      e.translate(k, A), C(j), D(j), e.translate(-k, -A);
     } else w();
     E(), C(), D(), T(), O(), n && e.translate(l.x1, l.y1);
   }
@@ -15460,8 +15405,7 @@ CRp$7.eleTextBiggerThanMin = function(e, t) {
     var n = e.cy().zoom(), r = this.getPixelRatio();
     t = 2 ** Math.ceil(log2(n * r));
   }
-  var a = e.pstyle("font-size").pfValue * t, o = e.pstyle("min-zoomed-font-size").pfValue;
-  return !(a < o);
+  return !(e.pstyle("font-size").pfValue * t < e.pstyle("min-zoomed-font-size").pfValue);
 }, CRp$7.drawElementText = function(e, t, n, r, a) {
   var o = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : true, s = this;
   if (r == null) {
@@ -15610,10 +15554,10 @@ CRp$6.drawNode = function(e, t, n) {
     }, Q = t.pstyle("shape").strValue, $ = t.pstyle("shape-polygon-points").pfValue;
     if (h) {
       e.translate(f.x, f.y);
-      var zh = Z(c, l, Q, $);
-      g = zh.path, _ = zh.cacheHit;
+      var Dh = Z(c, l, Q, $);
+      g = Dh.path, _ = Dh.cacheHit;
     }
-    var Bh = function() {
+    var Oh = function() {
       if (!_) {
         var n2 = f;
         h && (n2 = {
@@ -15622,7 +15566,7 @@ CRp$6.drawNode = function(e, t, n) {
         }), s.nodeShapes[s.getNodeShape(t)].draw(g || e, n2.x, n2.y, c, l, q, d);
       }
       h ? e.fill(g) : e.fill();
-    }, Vh = function() {
+    }, kh = function() {
       for (var n2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : m, r2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true, a2 = u.backgrounding, o2 = 0, c2 = 0; c2 < w.length; c2++) {
         var l2 = t.cy().style().getIndexedStyle(t, "background-image-containment", "value", c2);
         if (r2 && l2 === "over" || !r2 && l2 === "inside") {
@@ -15632,16 +15576,16 @@ CRp$6.drawNode = function(e, t, n) {
         C[c2] && w[c2].complete && !w[c2].error && (o2++, s.drawInscribedImage(e, w[c2], t, c2, n2));
       }
       u.backgrounding = o2 !== T, a2 !== u.backgrounding && t.updateStyle(false);
-    }, Hh = function() {
+    }, Ah = function() {
       var n2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false, r2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : m;
       s.hasPie(t) && (s.drawPie(e, t, r2), n2 && (h || s.nodeShapes[s.getNodeShape(t)].draw(e, f.x, f.y, c, l, q, d)));
-    }, Uh = function() {
+    }, jh = function() {
       var n2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false, r2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : m;
       s.hasStripe(t) && (e.save(), h ? e.clip(d.pathCache) : (s.nodeShapes[s.getNodeShape(t)].draw(e, f.x, f.y, c, l, q, d), e.clip()), s.drawStripe(e, t, r2), e.restore(), n2 && (h || s.nodeShapes[s.getNodeShape(t)].draw(e, f.x, f.y, c, l, q, d)));
-    }, Wh = function() {
+    }, Mh = function() {
       var t2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : m, n2 = (k > 0 ? k : -k) * t2, r2 = k > 0 ? 0 : 255;
       k !== 0 && (s.colorFillStyle(e, r2, r2, r2, n2), h ? e.fill(g) : e.fill());
-    }, Gh = function() {
+    }, Nh = function() {
       if (A > 0) {
         if (e.lineWidth = A, e.lineCap = I, e.lineJoin = F, e.setLineDash) switch (N) {
           case "dotted":
@@ -15670,7 +15614,7 @@ CRp$6.drawNode = function(e, t, n) {
         }
         e.setLineDash && e.setLineDash([]);
       }
-    }, Kh = function() {
+    }, Ph = function() {
       if (V > 0) {
         if (e.lineWidth = V, e.lineCap = "butt", e.setLineDash) switch (U) {
           case "dotted":
@@ -15736,18 +15680,18 @@ CRp$6.drawNode = function(e, t, n) {
         }
         e.setLineDash && e.setLineDash([]);
       }
-    }, qh = function() {
+    }, Fh = function() {
       a && s.drawNodeOverlay(e, t, f, c, l);
-    }, Jh = function() {
+    }, Ih = function() {
       a && s.drawNodeUnderlay(e, t, f, c, l);
-    }, Yh = function() {
+    }, Lh = function() {
       s.drawElementText(e, t, null, r);
     };
     if (t.pstyle("ghost").value === "yes") {
-      var Xh = t.pstyle("ghost-offset-x").pfValue, Zh = t.pstyle("ghost-offset-y").pfValue, Qh = t.pstyle("ghost-opacity").value, $h = Qh * m;
-      e.translate(Xh, Zh), X(), Kh(), J(Qh * j), Bh(), Vh($h, true), Y(Qh * B), Gh(), Hh(k !== 0 || A !== 0), Uh(k !== 0 || A !== 0), Vh($h, false), Wh($h), e.translate(-Xh, -Zh);
+      var Rh = t.pstyle("ghost-offset-x").pfValue, zh = t.pstyle("ghost-offset-y").pfValue, Bh = t.pstyle("ghost-opacity").value, Vh = Bh * m;
+      e.translate(Rh, zh), X(), Ph(), J(Bh * j), Oh(), kh(Vh, true), Y(Bh * B), Nh(), Ah(k !== 0 || A !== 0), jh(k !== 0 || A !== 0), kh(Vh, false), Mh(Vh), e.translate(-Rh, -zh);
     }
-    h && e.translate(-f.x, -f.y), Jh(), h && e.translate(f.x, f.y), X(), Kh(), J(), Bh(), Vh(m, true), Y(), Gh(), Hh(k !== 0 || A !== 0), Uh(k !== 0 || A !== 0), Vh(m, false), Wh(), h && e.translate(-f.x, -f.y), Yh(), qh(), n && e.translate(b.x1, b.y1);
+    h && e.translate(-f.x, -f.y), Ih(), h && e.translate(f.x, f.y), X(), Ph(), J(), Oh(), kh(m, true), Y(), Nh(), Ah(k !== 0 || A !== 0), jh(k !== 0 || A !== 0), kh(m, false), Mh(), h && e.translate(-f.x, -f.y), Lh(), Fh(), n && e.translate(b.x1, b.y1);
   }
 };
 var drawNodeOverlayUnderlay = function(e) {
@@ -16149,21 +16093,21 @@ function createTypedArrayView(e, t, n, r, a, o) {
   }
 }
 function createBufferStaticDraw(e, t, n, r) {
-  var a = getTypeInfo(e, t), o = _slicedToArray(a, 2), s = o[0], c = o[1], l = createTypedArray(e, c, r), u = e.createBuffer();
-  return e.bindBuffer(e.ARRAY_BUFFER, u), e.bufferData(e.ARRAY_BUFFER, l, e.STATIC_DRAW), c === e.FLOAT ? e.vertexAttribPointer(n, s, c, false, 0, 0) : c === e.INT && e.vertexAttribIPointer(n, s, c, 0, 0), e.enableVertexAttribArray(n), e.bindBuffer(e.ARRAY_BUFFER, null), u;
+  var a = _slicedToArray(getTypeInfo(e, t), 2), o = a[0], s = a[1], c = createTypedArray(e, s, r), l = e.createBuffer();
+  return e.bindBuffer(e.ARRAY_BUFFER, l), e.bufferData(e.ARRAY_BUFFER, c, e.STATIC_DRAW), s === e.FLOAT ? e.vertexAttribPointer(n, o, s, false, 0, 0) : s === e.INT && e.vertexAttribIPointer(n, o, s, 0, 0), e.enableVertexAttribArray(n), e.bindBuffer(e.ARRAY_BUFFER, null), l;
 }
 function createBufferDynamicDraw(e, t, n, r) {
-  var a = getTypeInfo(e, n), o = _slicedToArray(a, 3), s = o[0], c = o[1], l = o[2], u = createTypedArray(e, c, t * s), d = s * l, f = e.createBuffer();
-  e.bindBuffer(e.ARRAY_BUFFER, f), e.bufferData(e.ARRAY_BUFFER, t * d, e.DYNAMIC_DRAW), e.enableVertexAttribArray(r), c === e.FLOAT ? e.vertexAttribPointer(r, s, c, false, d, 0) : c === e.INT && e.vertexAttribIPointer(r, s, c, d, 0), e.vertexAttribDivisor(r, 1), e.bindBuffer(e.ARRAY_BUFFER, null);
-  for (var h = Array(t), g = 0; g < t; g++) h[g] = createTypedArrayView(e, c, u, d, s, g);
-  return f.dataArray = u, f.stride = d, f.size = s, f.getView = function(e2) {
-    return h[e2];
-  }, f.setPoint = function(e2, t2, n2) {
-    var r2 = h[e2];
+  var a = _slicedToArray(getTypeInfo(e, n), 3), o = a[0], s = a[1], c = a[2], l = createTypedArray(e, s, t * o), u = o * c, d = e.createBuffer();
+  e.bindBuffer(e.ARRAY_BUFFER, d), e.bufferData(e.ARRAY_BUFFER, t * u, e.DYNAMIC_DRAW), e.enableVertexAttribArray(r), s === e.FLOAT ? e.vertexAttribPointer(r, o, s, false, u, 0) : s === e.INT && e.vertexAttribIPointer(r, o, s, u, 0), e.vertexAttribDivisor(r, 1), e.bindBuffer(e.ARRAY_BUFFER, null);
+  for (var f = Array(t), h = 0; h < t; h++) f[h] = createTypedArrayView(e, s, l, u, o, h);
+  return d.dataArray = l, d.stride = u, d.size = o, d.getView = function(e2) {
+    return f[e2];
+  }, d.setPoint = function(e2, t2, n2) {
+    var r2 = f[e2];
     r2[0] = t2, r2[1] = n2;
-  }, f.bufferSubData = function(t2) {
-    e.bindBuffer(e.ARRAY_BUFFER, f), t2 ? e.bufferSubData(e.ARRAY_BUFFER, 0, u, 0, t2 * s) : e.bufferSubData(e.ARRAY_BUFFER, 0, u);
-  }, f;
+  }, d.bufferSubData = function(t2) {
+    e.bindBuffer(e.ARRAY_BUFFER, d), t2 ? e.bufferSubData(e.ARRAY_BUFFER, 0, l, 0, t2 * o) : e.bufferSubData(e.ARRAY_BUFFER, 0, l);
+  }, d;
 }
 function create3x3MatrixBufferDynamicDraw(e, t, n) {
   for (var r = 9, a = new Float32Array(t * r), o = Array(t), s = 0; s < t; s++) {
@@ -16360,8 +16304,8 @@ var Atlas = /* @__PURE__ */ (function() {
       key: "_getScratchCanvas",
       value: function() {
         if (!this.scratch) {
-          var e2 = this.r, t = this.texSize, n = this.texRows, r = this.createTextureCanvas, a = Math.floor(t / n);
-          this.scratch = r(e2, t, a, "scratch");
+          var e2 = this.r, t = this.texSize, n = this.texRows, r = this.createTextureCanvas;
+          this.scratch = r(e2, t, Math.floor(t / n), "scratch");
         }
         return this.scratch;
       }
@@ -16412,10 +16356,10 @@ var Atlas = /* @__PURE__ */ (function() {
               for (d.s(); !(f = d.n()).done; ) {
                 var h = f.value;
                 if (!u.has(h)) {
-                  var g = o2.getOffsets(h), _ = _slicedToArray(g, 2), v = _[0], b = _[1];
+                  var g = _slicedToArray(o2.getOffsets(h), 2), _ = g[0], v = g[1];
                   a.canFit({
-                    w: v.w + b.w,
-                    h: v.h
+                    w: _.w + v.w,
+                    h: _.h
                   }) || (a.lock(), a = e2._createAtlas(), n.push(a)), o2.canvas && (e2._copyTextureToNewAtlas(h, o2, a), r.set(h, a));
                 }
               }
@@ -16438,19 +16382,19 @@ var Atlas = /* @__PURE__ */ (function() {
     {
       key: "_copyTextureToNewAtlas",
       value: function(e2, t, n) {
-        var r = t.getOffsets(e2), a = _slicedToArray(r, 2), o = a[0], s = a[1];
-        if (s.w === 0) n.draw(e2, o, function(e3) {
-          e3.drawImage(t.canvas, o.x, o.y, o.w, o.h, 0, 0, o.w, o.h);
+        var r = _slicedToArray(t.getOffsets(e2), 2), a = r[0], o = r[1];
+        if (o.w === 0) n.draw(e2, a, function(e3) {
+          e3.drawImage(t.canvas, a.x, a.y, a.w, a.h, 0, 0, a.w, a.h);
         });
         else {
-          var c = this._getScratchCanvas();
-          c.clear(), c.context.drawImage(t.canvas, o.x, o.y, o.w, o.h, 0, 0, o.w, o.h), c.context.drawImage(t.canvas, s.x, s.y, s.w, s.h, o.w, 0, s.w, s.h);
-          var l = o.w + s.w, u = o.h;
+          var s = this._getScratchCanvas();
+          s.clear(), s.context.drawImage(t.canvas, a.x, a.y, a.w, a.h, 0, 0, a.w, a.h), s.context.drawImage(t.canvas, o.x, o.y, o.w, o.h, a.w, 0, o.w, o.h);
+          var c = a.w + o.w, l = a.h;
           n.draw(e2, {
-            w: l,
-            h: u
+            w: c,
+            h: l
           }, function(e3) {
-            e3.drawImage(c, 0, 0, l, u, 0, 0, l, u);
+            e3.drawImage(s, 0, 0, c, l, 0, 0, c, l);
           });
         }
       }
@@ -16494,11 +16438,11 @@ var AtlasManager = /* @__PURE__ */ (function() {
       value: function(e2, t) {
         var n = t.collection;
         if (!this.collections.has(n)) throw Error(`invalid atlas collection name '${n}'`);
-        var r = this.collections.get(n), a = extend({
+        var r = extend({
           type: e2,
-          atlasCollection: r
+          atlasCollection: this.collections.get(n)
         }, t);
-        this.renderTypes.set(e2, a);
+        this.renderTypes.set(e2, r);
       }
     },
     {
@@ -16604,12 +16548,12 @@ var AtlasManager = /* @__PURE__ */ (function() {
       value: function(e2, t) {
         var n = this, r = this.renderTypes.get(t), a = r.getKey(e2);
         return (Array.isArray(a) ? a : [a]).map(function(a2) {
-          var o = r.getBoundingBox(e2, a2), s = n.getOrCreateAtlas(e2, t, o, a2), c = s.getOffsets(a2), l = _slicedToArray(c, 2), u = l[0], d = l[1];
+          var o = r.getBoundingBox(e2, a2), s = n.getOrCreateAtlas(e2, t, o, a2), c = _slicedToArray(s.getOffsets(a2), 2), l = c[0];
           return {
             atlas: s,
-            tex: u,
-            tex1: u,
-            tex2: d,
+            tex: l,
+            tex1: l,
+            tex2: c[1],
             bb: o
           };
         });
@@ -16919,7 +16863,7 @@ var AtlasManager = /* @__PURE__ */ (function() {
         vVertType = aVertType;
         vIndex = aIndex;
       }
-    `, r = this.batchManager.getIndexArray(), a = `#version 300 es
+    `, r = this.batchManager.getIndexArray(), a = createProgram(t, n, `#version 300 es
       precision highp float;
 
       // declare texture unit for each texture atlas in the batch
@@ -17033,10 +16977,10 @@ var AtlasManager = /* @__PURE__ */ (function() {
 
         ${e2.picking ? "if(outColor.a == 0.0) discard;\n             else outColor = vIndex;" : ""}
       }
-    `, o = createProgram(t, n, a);
-        o.aPosition = t.getAttribLocation(o, "aPosition"), o.aIndex = t.getAttribLocation(o, "aIndex"), o.aVertType = t.getAttribLocation(o, "aVertType"), o.aTransform = t.getAttribLocation(o, "aTransform"), o.aAtlasId = t.getAttribLocation(o, "aAtlasId"), o.aTex = t.getAttribLocation(o, "aTex"), o.aPointAPointB = t.getAttribLocation(o, "aPointAPointB"), o.aPointCPointD = t.getAttribLocation(o, "aPointCPointD"), o.aLineWidth = t.getAttribLocation(o, "aLineWidth"), o.aColor = t.getAttribLocation(o, "aColor"), o.aCornerRadius = t.getAttribLocation(o, "aCornerRadius"), o.aBorderColor = t.getAttribLocation(o, "aBorderColor"), o.uPanZoomMatrix = t.getUniformLocation(o, "uPanZoomMatrix"), o.uAtlasSize = t.getUniformLocation(o, "uAtlasSize"), o.uBGColor = t.getUniformLocation(o, "uBGColor"), o.uZoom = t.getUniformLocation(o, "uZoom"), o.uTextures = [];
-        for (var s = 0; s < this.batchManager.getMaxAtlasesPerBatch(); s++) o.uTextures.push(t.getUniformLocation(o, `uTexture${s}`));
-        return o;
+    `);
+        a.aPosition = t.getAttribLocation(a, "aPosition"), a.aIndex = t.getAttribLocation(a, "aIndex"), a.aVertType = t.getAttribLocation(a, "aVertType"), a.aTransform = t.getAttribLocation(a, "aTransform"), a.aAtlasId = t.getAttribLocation(a, "aAtlasId"), a.aTex = t.getAttribLocation(a, "aTex"), a.aPointAPointB = t.getAttribLocation(a, "aPointAPointB"), a.aPointCPointD = t.getAttribLocation(a, "aPointCPointD"), a.aLineWidth = t.getAttribLocation(a, "aLineWidth"), a.aColor = t.getAttribLocation(a, "aColor"), a.aCornerRadius = t.getAttribLocation(a, "aCornerRadius"), a.aBorderColor = t.getAttribLocation(a, "aBorderColor"), a.uPanZoomMatrix = t.getUniformLocation(a, "uPanZoomMatrix"), a.uAtlasSize = t.getUniformLocation(a, "uAtlasSize"), a.uBGColor = t.getUniformLocation(a, "uBGColor"), a.uZoom = t.getUniformLocation(a, "uZoom"), a.uTextures = [];
+        for (var o = 0; o < this.batchManager.getMaxAtlasesPerBatch(); o++) a.uTextures.push(t.getUniformLocation(a, `uTexture${o}`));
+        return a;
       }
     },
     {
@@ -17110,31 +17054,29 @@ var AtlasManager = /* @__PURE__ */ (function() {
               return;
             }
           }
-          var l = r.getAtlasInfo(e2, n), u = _createForOfIteratorHelper(l), d;
+          var l = _createForOfIteratorHelper(r.getAtlasInfo(e2, n)), u;
           try {
-            for (u.s(); !(d = u.n()).done; ) {
-              var f = d.value, h = f.atlas, g = f.tex1, _ = f.tex2;
-              a.canAddToCurrentBatch(h) || this.endBatch();
-              for (var v = a.getAtlasIndexForBatch(h), b = 0, S = [[g, true], [_, false]]; b < S.length; b++) {
-                var C = _slicedToArray(S[b], 2), w = C[0], T = C[1];
-                if (w.w != 0) {
-                  var E = this.instanceCount;
-                  this.vertTypeBuffer.getView(E)[0] = TEXTURE;
-                  var D = this.indexBuffer.getView(E);
-                  indexToVec4(t, D);
-                  var O = this.atlasIdBuffer.getView(E);
-                  O[0] = v;
-                  var k = this.texBuffer.getView(E);
-                  k[0] = w.x, k[1] = w.y, k[2] = w.w, k[3] = w.h;
-                  var A = this.transformBuffer.getMatrixView(E);
-                  this.setTransformMatrix(e2, A, o, f, T), this.instanceCount++, T || this.wrappedCount++, this.instanceCount >= this.maxInstances && this.endBatch();
+            for (l.s(); !(u = l.n()).done; ) {
+              var d = u.value, f = d.atlas, h = d.tex1, g = d.tex2;
+              a.canAddToCurrentBatch(f) || this.endBatch();
+              for (var _ = a.getAtlasIndexForBatch(f), v = 0, b = [[h, true], [g, false]]; v < b.length; v++) {
+                var S = _slicedToArray(b[v], 2), C = S[0], w = S[1];
+                if (C.w != 0) {
+                  var T = this.instanceCount;
+                  this.vertTypeBuffer.getView(T)[0] = TEXTURE, indexToVec4(t, this.indexBuffer.getView(T));
+                  var E = this.atlasIdBuffer.getView(T);
+                  E[0] = _;
+                  var D = this.texBuffer.getView(T);
+                  D[0] = C.x, D[1] = C.y, D[2] = C.w, D[3] = C.h;
+                  var O = this.transformBuffer.getMatrixView(T);
+                  this.setTransformMatrix(e2, O, o, d, w), this.instanceCount++, w || this.wrappedCount++, this.instanceCount >= this.maxInstances && this.endBatch();
                 }
               }
             }
           } catch (e3) {
-            u.e(e3);
+            l.e(e3);
           } finally {
-            u.f();
+            l.f();
           }
         }
       }
@@ -17189,17 +17131,13 @@ var AtlasManager = /* @__PURE__ */ (function() {
       key: "drawPickingRectangle",
       value: function(e2, t, n) {
         var r = this.atlasManager.getRenderTypeOpts(n), a = this.instanceCount;
-        this.vertTypeBuffer.getView(a)[0] = RECTANGLE;
-        var o = this.indexBuffer.getView(a);
-        indexToVec4(t, o);
-        var s = this.colorBuffer.getView(a);
-        toWebGLColor([
+        this.vertTypeBuffer.getView(a)[0] = RECTANGLE, indexToVec4(t, this.indexBuffer.getView(a)), toWebGLColor([
           0,
           0,
           0
-        ], 1, s);
-        var c = this.transformBuffer.getMatrixView(a);
-        this.setTransformMatrix(e2, c, r), this.simpleCount++, this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
+        ], 1, this.colorBuffer.getView(a));
+        var o = this.transformBuffer.getMatrixView(a);
+        this.setTransformMatrix(e2, o, r), this.simpleCount++, this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
       }
     },
     {
@@ -17217,27 +17155,26 @@ var AtlasManager = /* @__PURE__ */ (function() {
             var c = r.getBoundingBox(e2), l = this._getCornerRadius(e2, a.radius, c), u = this.cornerRadiusBuffer.getView(s);
             u[0] = l, u[1] = l, u[2] = l, u[3] = l, o === BOTTOM_ROUND_RECTANGLE && (u[0] = 0, u[2] = 0);
           }
-          var d = this.indexBuffer.getView(s);
-          indexToVec4(t, d);
-          var f = e2.pstyle(a.color).value, m = e2.pstyle(a.opacity).value, h = this.colorBuffer.getView(s);
-          toWebGLColor(f, m, h);
-          var g = this.lineWidthBuffer.getView(s);
-          if (g[0] = 0, g[1] = 0, a.border) {
-            var _ = e2.pstyle("border-width").value;
-            if (_ > 0) {
-              var v = e2.pstyle("border-color").value, b = e2.pstyle("border-opacity").value, S = this.borderColorBuffer.getView(s);
-              toWebGLColor(v, b, S);
-              var C = e2.pstyle("border-position").value;
-              if (C === "inside") g[0] = 0, g[1] = -_;
-              else if (C === "outside") g[0] = _, g[1] = 0;
+          indexToVec4(t, this.indexBuffer.getView(s));
+          var d = e2.pstyle(a.color).value, f = e2.pstyle(a.opacity).value;
+          toWebGLColor(d, f, this.colorBuffer.getView(s));
+          var m = this.lineWidthBuffer.getView(s);
+          if (m[0] = 0, m[1] = 0, a.border) {
+            var h = e2.pstyle("border-width").value;
+            if (h > 0) {
+              var g = e2.pstyle("border-color").value, _ = e2.pstyle("border-opacity").value;
+              toWebGLColor(g, _, this.borderColorBuffer.getView(s));
+              var v = e2.pstyle("border-position").value;
+              if (v === "inside") m[0] = 0, m[1] = -h;
+              else if (v === "outside") m[0] = h, m[1] = 0;
               else {
-                var w = _ / 2;
-                g[0] = w, g[1] = -w;
+                var b = h / 2;
+                m[0] = b, m[1] = -b;
               }
             }
           }
-          var T = this.transformBuffer.getMatrixView(s);
-          this.setTransformMatrix(e2, T, r), this.simpleCount++, this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
+          var S = this.transformBuffer.getMatrixView(s);
+          this.setTransformMatrix(e2, S, r), this.simpleCount++, this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
         }
       }
     },
@@ -17274,12 +17211,8 @@ var AtlasManager = /* @__PURE__ */ (function() {
         if (e2.visible()) {
           var r = e2._private.rscratch, a, o, s;
           if (n === "source" ? (a = r.arrowStartX, o = r.arrowStartY, s = r.srcArrowAngle) : (a = r.arrowEndX, o = r.arrowEndY, s = r.tgtArrowAngle), !(isNaN(a) || a == null || isNaN(o) || o == null || isNaN(s) || s == null) && e2.pstyle(n + "-arrow-shape").value !== "none") {
-            var c = e2.pstyle(n + "-arrow-color").value, l = e2.pstyle("opacity").value, u = e2.pstyle("line-opacity").value, d = l * u, f = e2.pstyle("width").pfValue, m = e2.pstyle("arrow-scale").value, h = this.r.getArrowWidth(f, m), g = this.instanceCount, _ = this.transformBuffer.getMatrixView(g);
-            identity(_), translate(_, _, [a, o]), scale(_, _, [h, h]), rotate(_, _, s), this.vertTypeBuffer.getView(g)[0] = EDGE_ARROW;
-            var v = this.indexBuffer.getView(g);
-            indexToVec4(t, v);
-            var b = this.colorBuffer.getView(g);
-            toWebGLColor(c, d, b), this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
+            var c = e2.pstyle(n + "-arrow-color").value, l = e2.pstyle("opacity").value * e2.pstyle("line-opacity").value, u = e2.pstyle("width").pfValue, d = e2.pstyle("arrow-scale").value, f = this.r.getArrowWidth(u, d), m = this.instanceCount, h = this.transformBuffer.getMatrixView(m);
+            identity(h), translate(h, h, [a, o]), scale(h, h, [f, f]), rotate(h, h, s), this.vertTypeBuffer.getView(m)[0] = EDGE_ARROW, indexToVec4(t, this.indexBuffer.getView(m)), toWebGLColor(c, l, this.colorBuffer.getView(m)), this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
           }
         }
       }
@@ -17293,30 +17226,22 @@ var AtlasManager = /* @__PURE__ */ (function() {
             var r = e2.pstyle("opacity").value, a = e2.pstyle("line-opacity").value, o = e2.pstyle("width").pfValue, s = e2.pstyle("line-color").value, c = r * a;
             if (n.length / 2 + this.instanceCount > this.maxInstances && this.endBatch(), n.length == 4) {
               var l = this.instanceCount;
-              this.vertTypeBuffer.getView(l)[0] = EDGE_STRAIGHT;
-              var u = this.indexBuffer.getView(l);
-              indexToVec4(t, u);
-              var d = this.colorBuffer.getView(l);
-              toWebGLColor(s, c, d);
-              var f = this.lineWidthBuffer.getView(l);
-              f[0] = o;
-              var m = this.pointAPointBBuffer.getView(l);
-              m[0] = n[0], m[1] = n[1], m[2] = n[2], m[3] = n[3], this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
-            } else for (var h = 0; h < n.length - 2; h += 2) {
-              var g = this.instanceCount;
-              this.vertTypeBuffer.getView(g)[0] = EDGE_CURVE_SEGMENT;
-              var _ = this.indexBuffer.getView(g);
-              indexToVec4(t, _);
-              var v = this.colorBuffer.getView(g);
-              toWebGLColor(s, c, v);
-              var b = this.lineWidthBuffer.getView(g);
-              b[0] = o;
-              var S = n[h - 2], C = n[h - 1], w = n[h], T = n[h + 1], E = n[h + 2], D = n[h + 3], O = n[h + 4], k = n[h + 5];
-              h == 0 && (S = 2 * w - E + 1e-3, C = 2 * T - D + 1e-3), h == n.length - 4 && (O = 2 * E - w + 1e-3, k = 2 * D - T + 1e-3);
-              var A = this.pointAPointBBuffer.getView(g);
-              A[0] = S, A[1] = C, A[2] = w, A[3] = T;
-              var j = this.pointCPointDBuffer.getView(g);
-              j[0] = E, j[1] = D, j[2] = O, j[3] = k, this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
+              this.vertTypeBuffer.getView(l)[0] = EDGE_STRAIGHT, indexToVec4(t, this.indexBuffer.getView(l)), toWebGLColor(s, c, this.colorBuffer.getView(l));
+              var u = this.lineWidthBuffer.getView(l);
+              u[0] = o;
+              var d = this.pointAPointBBuffer.getView(l);
+              d[0] = n[0], d[1] = n[1], d[2] = n[2], d[3] = n[3], this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
+            } else for (var f = 0; f < n.length - 2; f += 2) {
+              var m = this.instanceCount;
+              this.vertTypeBuffer.getView(m)[0] = EDGE_CURVE_SEGMENT, indexToVec4(t, this.indexBuffer.getView(m)), toWebGLColor(s, c, this.colorBuffer.getView(m));
+              var h = this.lineWidthBuffer.getView(m);
+              h[0] = o;
+              var g = n[f - 2], _ = n[f - 1], v = n[f], b = n[f + 1], S = n[f + 2], C = n[f + 3], w = n[f + 4], T = n[f + 5];
+              f == 0 && (g = 2 * v - S + 1e-3, _ = 2 * b - C + 1e-3), f == n.length - 4 && (w = 2 * S - v + 1e-3, T = 2 * C - b + 1e-3);
+              var E = this.pointAPointBBuffer.getView(m);
+              E[0] = g, E[1] = _, E[2] = v, E[3] = b;
+              var D = this.pointCPointDBuffer.getView(m);
+              D[0] = S, D[1] = C, D[2] = w, D[3] = T, this.instanceCount++, this.instanceCount >= this.maxInstances && this.endBatch();
             }
           }
         }
@@ -17525,8 +17450,8 @@ CRp$4.initWebgl = function(e, t) {
   }), overrideCanvasRendererFunctions(n);
 };
 function getBGColor(e) {
-  var t = e.cy.container(), n = t && t.style && t.style.backgroundColor || "white";
-  return color2tuple(n);
+  var t = e.cy.container();
+  return color2tuple(t && t.style && t.style.backgroundColor || "white");
 }
 function getLabelLines(e, t) {
   var n = e._private.rscratch;
@@ -17624,24 +17549,24 @@ function drawAtlases(e) {
   t(e.drawing, "node", n++), t(e.drawing, "label", n++);
 }
 function getPickingIndexes(e, t, n, r, a) {
-  var o, s, c, l, u = getEffectivePanZoom(e), d = u.pan, f = u.zoom, h = modelToRenderedPosition(e, d, f, t, n), g = _slicedToArray(h, 2), _ = g[0], v = g[1], b = 6;
-  if (o = _ - b / 2, s = v - b / 2, c = b, l = b, c === 0 || l === 0) return [];
-  var S = e.data.contexts[e.WEBGL];
-  S.bindFramebuffer(S.FRAMEBUFFER, e.pickingFrameBuffer), e.pickingFrameBuffer.needsDraw && (S.viewport(0, 0, S.canvas.width, S.canvas.height), renderWebgl(e, null, RENDER_TARGET.PICKING), e.pickingFrameBuffer.needsDraw = false);
-  var C = c * l, w = new Uint8Array(C * 4);
-  S.readPixels(o, s, c, l, S.RGBA, S.UNSIGNED_BYTE, w), S.bindFramebuffer(S.FRAMEBUFFER, null);
-  for (var T = /* @__PURE__ */ new Set(), E = 0; E < C; E++) {
-    var D = w.slice(E * 4, E * 4 + 4), O = vec4ToIndex(D) - 1;
-    O >= 0 && T.add(O);
-  }
-  return T;
+  var o, s, c, l, u = getEffectivePanZoom(e), d = u.pan, f = u.zoom, h = _slicedToArray(modelToRenderedPosition(e, d, f, t, n), 2), g = h[0], _ = h[1], v = 6;
+  if (o = g - v / 2, s = _ - v / 2, c = v, l = v, c === 0 || l === 0) return [];
+  var b = e.data.contexts[e.WEBGL];
+  b.bindFramebuffer(b.FRAMEBUFFER, e.pickingFrameBuffer), e.pickingFrameBuffer.needsDraw && (b.viewport(0, 0, b.canvas.width, b.canvas.height), renderWebgl(e, null, RENDER_TARGET.PICKING), e.pickingFrameBuffer.needsDraw = false);
+  var S = c * l, C = new Uint8Array(S * 4);
+  b.readPixels(o, s, c, l, b.RGBA, b.UNSIGNED_BYTE, C), b.bindFramebuffer(b.FRAMEBUFFER, null);
+  for (var w = /* @__PURE__ */ new Set(), T = 0; T < S; T++) {
+    var E = vec4ToIndex(C.slice(T * 4, T * 4 + 4)) - 1;
+    E >= 0 && w.add(E);
+  }
+  return w;
 }
 function findNearestElementsWebgl(e, t, n) {
   var r = getPickingIndexes(e, t, n), a = e.getCachedZSortedEles(), o, c, l = _createForOfIteratorHelper(r), u;
   try {
     for (l.s(); !(u = l.n()).done; ) {
-      var d = u.value, f = a[d];
-      if (!o && f.isNode() && (o = f), !c && f.isEdge() && (c = f), o && c) break;
+      var d = a[u.value];
+      if (!o && d.isNode() && (o = d), !c && d.isEdge() && (c = d), o && c) break;
     }
   } catch (e2) {
     l.e(e2);