Build 3.18.1

cytoscape · Feb 23, 2021 · 8da20f4 · 8da20f4
1 parent c7691ac
commit 8da20f4
Show file tree

Hide file tree

Showing 8 changed files with 469 additions and 429 deletions.
diff --git a/.size-snapshot.json b/.size-snapshot.json
@@ -1,39 +1,39 @@
 {
   "build/cytoscape.umd.js": {
-    "bundled": 935606,
-    "minified": 348105,
-    "gzipped": 108363
+    "bundled": 936014,
+    "minified": 348258,
+    "gzipped": 108399
   },
   "build/cytoscape.cjs.js": {
-    "bundled": 862511,
-    "minified": 367393,
-    "gzipped": 110701
+    "bundled": 862907,
+    "minified": 367546,
+    "gzipped": 110728
   },
   "build/cytoscape.esm.js": {
-    "bundled": 862338,
-    "minified": 367250,
-    "gzipped": 110657,
+    "bundled": 862734,
+    "minified": 367403,
+    "gzipped": 110686,
     "treeshaked": {
       "rollup": {
-        "code": 342753,
+        "code": 342906,
         "import_statements": 51
       },
       "webpack": {
-        "code": 344141
+        "code": 344294
       }
     }
   },
   "build/cytoscape.esm.min.js": {
-    "bundled": 347910,
-    "minified": 347412,
-    "gzipped": 108184,
+    "bundled": 348063,
+    "minified": 347565,
+    "gzipped": 108217,
     "treeshaked": {
       "rollup": {
-        "code": 346906,
+        "code": 347059,
         "import_statements": 0
       },
       "webpack": {
-        "code": 348194
+        "code": 348347
       }
     }
   }

diff --git a/dist/cytoscape.cjs.js b/dist/cytoscape.cjs.js
@@ -19159,6 +19159,11 @@ BreadthFirstLayout.prototype.run = function () {
       }
 
       var bf = getInfo(neighbor);
+
+      if (bf == null) {
+        continue;
+      }
+
       var index = bf.index;
       var depth = bf.depth; // unassigned neighbours shouldn't affect the ordering
 
@@ -21750,14 +21755,17 @@ BRp$1.findNearestElements = function (x, y, interactiveElementsOnly, isTouch) {
       return;
     }
 
-    var rstyle = _p.rstyle;
-    var lx = preprop(rstyle, 'labelX', prefix);
-    var ly = preprop(rstyle, 'labelY', prefix);
+    var lx = preprop(_p.rscratch, 'labelX', prefix);
+    var ly = preprop(_p.rscratch, 'labelY', prefix);
     var theta = preprop(_p.rscratch, 'labelAngle', prefix);
-    var lx1 = bb.x1 - th;
-    var lx2 = bb.x2 + th;
-    var ly1 = bb.y1 - th;
-    var ly2 = bb.y2 + th;
+    var ox = ele.pstyle(prefixDash + 'text-margin-x').pfValue;
+    var oy = ele.pstyle(prefixDash + 'text-margin-y').pfValue;
+    var lx1 = bb.x1 - th - ox; // (-ox, -oy) as bb already includes margin
+
+    var lx2 = bb.x2 + th - ox; // and rotation is about (lx, ly)
+
+    var ly1 = bb.y1 - th - oy;
+    var ly2 = bb.y2 + th - oy;
 
     if (theta) {
       var cos = Math.cos(theta);
@@ -21776,7 +21784,8 @@ BRp$1.findNearestElements = function (x, y, interactiveElementsOnly, isTouch) {
       var px1y2 = rotate(lx1, ly2);
       var px2y1 = rotate(lx2, ly1);
       var px2y2 = rotate(lx2, ly2);
-      var points = [px1y1.x, px1y1.y, px2y1.x, px2y1.y, px2y2.x, px2y2.y, px1y2.x, px1y2.y];
+      var points = [// with the margin added after the rotation is applied
+      px1y1.x + ox, px1y1.y + oy, px2y1.x + ox, px2y1.y + oy, px2y2.x + ox, px2y2.y + oy, px1y2.x + ox, px1y2.y + oy];
 
       if (pointInsidePolygonPoints(x, y, points)) {
         addEle(ele);
@@ -23273,6 +23282,7 @@ BRp$6.recalculateNodeLabelProjection = function (node) {
   rs.labelY = textY;
   rstyle.labelX = textX;
   rstyle.labelY = textY;
+  this.calculateLabelAngles(node);
   this.applyLabelDimensions(node);
 };
 
@@ -31621,7 +31631,7 @@ sheetfn.appendToStyle = function (style) {
   return style;
 };
 
-var version = "3.18.0";
+var version = "3.18.1";
 
 var cytoscape = function cytoscape(options) {
   // if no options specified, use default

diff --git a/dist/cytoscape.esm.js b/dist/cytoscape.esm.js
@@ -19155,6 +19155,11 @@ BreadthFirstLayout.prototype.run = function () {
       }
 
       var bf = getInfo(neighbor);
+
+      if (bf == null) {
+        continue;
+      }
+
       var index = bf.index;
       var depth = bf.depth; // unassigned neighbours shouldn't affect the ordering
 
@@ -21746,14 +21751,17 @@ BRp$1.findNearestElements = function (x, y, interactiveElementsOnly, isTouch) {
       return;
     }
 
-    var rstyle = _p.rstyle;
-    var lx = preprop(rstyle, 'labelX', prefix);
-    var ly = preprop(rstyle, 'labelY', prefix);
+    var lx = preprop(_p.rscratch, 'labelX', prefix);
+    var ly = preprop(_p.rscratch, 'labelY', prefix);
     var theta = preprop(_p.rscratch, 'labelAngle', prefix);
-    var lx1 = bb.x1 - th;
-    var lx2 = bb.x2 + th;
-    var ly1 = bb.y1 - th;
-    var ly2 = bb.y2 + th;
+    var ox = ele.pstyle(prefixDash + 'text-margin-x').pfValue;
+    var oy = ele.pstyle(prefixDash + 'text-margin-y').pfValue;
+    var lx1 = bb.x1 - th - ox; // (-ox, -oy) as bb already includes margin
+
+    var lx2 = bb.x2 + th - ox; // and rotation is about (lx, ly)
+
+    var ly1 = bb.y1 - th - oy;
+    var ly2 = bb.y2 + th - oy;
 
     if (theta) {
       var cos = Math.cos(theta);
@@ -21772,7 +21780,8 @@ BRp$1.findNearestElements = function (x, y, interactiveElementsOnly, isTouch) {
       var px1y2 = rotate(lx1, ly2);
       var px2y1 = rotate(lx2, ly1);
       var px2y2 = rotate(lx2, ly2);
-      var points = [px1y1.x, px1y1.y, px2y1.x, px2y1.y, px2y2.x, px2y2.y, px1y2.x, px1y2.y];
+      var points = [// with the margin added after the rotation is applied
+      px1y1.x + ox, px1y1.y + oy, px2y1.x + ox, px2y1.y + oy, px2y2.x + ox, px2y2.y + oy, px1y2.x + ox, px1y2.y + oy];
 
       if (pointInsidePolygonPoints(x, y, points)) {
         addEle(ele);
@@ -23269,6 +23278,7 @@ BRp$6.recalculateNodeLabelProjection = function (node) {
   rs.labelY = textY;
   rstyle.labelX = textX;
   rstyle.labelY = textY;
+  this.calculateLabelAngles(node);
   this.applyLabelDimensions(node);
 };
 
@@ -31617,7 +31627,7 @@ sheetfn.appendToStyle = function (style) {
   return style;
 };
 
-var version = "3.18.0";
+var version = "3.18.1";
 
 var cytoscape = function cytoscape(options) {
   // if no options specified, use default

diff --git a/dist/cytoscape.esm.min.js b/dist/cytoscape.esm.min.js
diff --git a/dist/cytoscape.min.js b/dist/cytoscape.min.js
diff --git a/dist/cytoscape.umd.js b/dist/cytoscape.umd.js
@@ -19918,6 +19918,11 @@
         }
 
         var bf = getInfo(neighbor);
+
+        if (bf == null) {
+          continue;
+        }
+
         var index = bf.index;
         var depth = bf.depth; // unassigned neighbours shouldn't affect the ordering
 
@@ -22509,14 +22514,17 @@
         return;
       }
 
-      var rstyle = _p.rstyle;
-      var lx = preprop(rstyle, 'labelX', prefix);
-      var ly = preprop(rstyle, 'labelY', prefix);
+      var lx = preprop(_p.rscratch, 'labelX', prefix);
+      var ly = preprop(_p.rscratch, 'labelY', prefix);
       var theta = preprop(_p.rscratch, 'labelAngle', prefix);
-      var lx1 = bb.x1 - th;
-      var lx2 = bb.x2 + th;
-      var ly1 = bb.y1 - th;
-      var ly2 = bb.y2 + th;
+      var ox = ele.pstyle(prefixDash + 'text-margin-x').pfValue;
+      var oy = ele.pstyle(prefixDash + 'text-margin-y').pfValue;
+      var lx1 = bb.x1 - th - ox; // (-ox, -oy) as bb already includes margin
+
+      var lx2 = bb.x2 + th - ox; // and rotation is about (lx, ly)
+
+      var ly1 = bb.y1 - th - oy;
+      var ly2 = bb.y2 + th - oy;
 
       if (theta) {
         var cos = Math.cos(theta);
@@ -22535,7 +22543,8 @@
         var px1y2 = rotate(lx1, ly2);
         var px2y1 = rotate(lx2, ly1);
         var px2y2 = rotate(lx2, ly2);
-        var points = [px1y1.x, px1y1.y, px2y1.x, px2y1.y, px2y2.x, px2y2.y, px1y2.x, px1y2.y];
+        var points = [// with the margin added after the rotation is applied
+        px1y1.x + ox, px1y1.y + oy, px2y1.x + ox, px2y1.y + oy, px2y2.x + ox, px2y2.y + oy, px1y2.x + ox, px1y2.y + oy];
 
         if (pointInsidePolygonPoints(x, y, points)) {
           addEle(ele);
@@ -24032,6 +24041,7 @@
     rs.labelY = textY;
     rstyle.labelX = textX;
     rstyle.labelY = textY;
+    this.calculateLabelAngles(node);
     this.applyLabelDimensions(node);
   };
 
@@ -32380,7 +32390,7 @@
     return style;
   };
 
-  var version = "3.18.0";
+  var version = "3.18.1";
 
   var cytoscape = function cytoscape(options) {
     // if no options specified, use default