cytoscape - npm Package Compare versions

Comparing version 3.4.5 to 3.4.6

.size-snapshot.json

 {
   "build/cytoscape.umd.js": {
-    "bundled": 895481,
-    "minified": 331416,
-    "gzipped": 103169
+    "bundled": 895726,
+    "minified": 331525,
+    "gzipped": 103189
   },
   "build/cytoscape.cjs.js": {
-    "bundled": 825037,
-    "minified": 348487,
-    "gzipped": 105190
+    "bundled": 825274,
+    "minified": 348644,
+    "gzipped": 105237
   },
   "build/cytoscape.esm.js": {
-    "bundled": 824864,
-    "minified": 348344,
-    "gzipped": 105154,
+    "bundled": 825101,
+    "minified": 348501,
+    "gzipped": 105193,
     "treeshaked": {
       "rollup": {
-        "code": 326154,
+        "code": 326263,
         "import_statements": 51
       },
       "webpack": {
-        "code": 327980
+        "code": 328089
       }
@@ -24,0 +24,0 @@ }

package.json

 {
   "name": "cytoscape",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "license": "MIT",
@@ -5,0 +5,0 @@ "description": "Graph theory (a.k.a. network) library for analysis and visualisation",

src/collection/dimensions/bounds.js

@@ -80,3 +80,5 @@ import * as is from '../../is';
 
-    let bb = children.boundingBox( {
+    let takesUpSpace = ele => ele.pstyle('display').value === 'element';
+
+    let bb = children.filter(takesUpSpace).boundingBox( {
       includeLabels: includeLabels,
@@ -83,0 +85,0 @@ includeOverlays: false,

src/extensions/layout/cose.js

@@ -955,7 +955,6 @@ /*
     } else {
-      options.eles.nodes().layoutPositions( layout, options, function( node ){
-        var lnode = layoutInfo.layoutNodes[ layoutInfo.idToIndex[ node.data( 'id' ) ] ];
+      var nodes = options.eles.nodes();
+      var getScaledPos = getScaleInBoundsFn(layoutInfo, options, nodes);
 
-        return { x: lnode.positionX, y: lnode.positionY };
-      } );
+      nodes.layoutPositions(layout, options, getScaledPos);
     }
@@ -1343,15 +1342,3 @@ };
 
-
-/**
- * @brief          : Updates the positions of nodes in the network
- * @arg layoutInfo : LayoutInfo object
- * @arg cy         : Cytoscape object
- * @arg options    : Layout options
- */
-var refreshPositions = function( layoutInfo, cy, options ){
-  // var s = 'Refreshing positions';
-  // logDebug(s);
-
-  var layout = options.layout;
-  var nodes = options.eles.nodes();
+var getScaleInBoundsFn = function( layoutInfo, options, nodes ){
   var bb = layoutInfo.boundingBox;
@@ -1375,7 +1362,4 @@ var coseBB = { x1: Infinity, x2: -Infinity, y1: Infinity, y2: -Infinity };
 
-  nodes.positions( function( ele, i ){
+  return function( ele, i ){
     var lnode = layoutInfo.layoutNodes[ layoutInfo.idToIndex[ ele.data( 'id' ) ] ];
-    // s = "Node: " + lnode.id + ". Refreshed position: (" +
-    // lnode.positionX + ", " + lnode.positionY + ").";
-    // logDebug(s);
 
@@ -1396,4 +1380,21 @@ if( options.boundingBox ){ // then add extra bounding box constraint
     }
-  } );
+  };
+};
 
+/**
+ * @brief          : Updates the positions of nodes in the network
+ * @arg layoutInfo : LayoutInfo object
+ * @arg cy         : Cytoscape object
+ * @arg options    : Layout options
+ */
+var refreshPositions = function( layoutInfo, cy, options ){
+  // var s = 'Refreshing positions';
+  // logDebug(s);
+
+  var layout = options.layout;
+  var nodes = options.eles.nodes();
+  var getScaledPos = getScaleInBoundsFn(layoutInfo, options, nodes);
+
+  nodes.positions(getScaledPos);
+
   // Trigger layoutReady only on first call
@@ -1400,0 +1401,0 @@ if( true !== layoutInfo.ready ){

src/style/apply.js

@@ -319,6 +319,6 @@ import * as util from '../util';
       if( !haveNormNum && units != null ){
-        updateGrKeyWStr(units);
+        updateGrKeyWStr(units, grKey);
       }
     } else {
-      updateGrKeyWStr(parsedProp.strValue);
+      updateGrKeyWStr(parsedProp.strValue, grKey);
     }
@@ -325,0 +325,0 @@ }

src/style/properties.js

@@ -353,3 +353,3 @@ import * as util from '../util';
   [
-    { name: 'arrow-shape', type: t.arrowShape },
+    { name: 'arrow-shape', type: t.arrowShape, triggersBounds: diff.any },
     { name: 'arrow-color', type: t.color },
@@ -360,5 +360,5 @@ { name: 'arrow-fill', type: t.arrowFill }
       let name = prefix + '-' + prop.name;
-      let type = prop.type;
+      let { type, triggersBounds } = prop;
 
-      edgeArrow.push( { name: name, type: type } );
+      edgeArrow.push( { name, type, triggersBounds } );
     } );
@@ -365,0 +365,0 @@ }, {} );

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3737428

increased by0.03%

Lines of code

101309

increased by0.01%

No dependency changes