cytoscape - npm Package Compare versions

Comparing version 3.2.20 to 3.2.21

package.json

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

src/extensions/layout/cose.js

@@ -27,3 +27,3 @@ /*
   stop: function(){},
-  
+
   // Whether to animate while running the layout
@@ -922,3 +922,3 @@ // true : Animate continuously as the layout is running
 
-      while( f < options.refresh && i < options.numIter ){
+      while( (f < options.refresh || options.refresh === 0) && i < options.numIter ){
         var loopRet = mainLoop( i );
@@ -925,0 +925,0 @@ if( !loopRet ){ break; }

src/style/get-for-ele.js

@@ -57,12 +57,32 @@ let util = require( '../util' );
     let styleProp = ele.pstyle( prop.name );
-    let zoom = ele.cy().zoom();
 
     if( styleProp ){
-      let units = styleProp.units ? type.implicitUnits || 'px' : null;
-      let val = units ? [].concat( styleProp.pfValue ).map( function( pfValue ){
-        return ( pfValue * (isRenderedVal ? zoom : 1) ) + units;
-      } ).join( ' ' ) : styleProp.strValue;
+      let { value, units, strValue } = styleProp;
 
-      return val;
+      if( isRenderedVal && type.number && value != null && is.number(value) ){
+        let zoom = ele.cy().zoom();
+        let getRenderedValue = val => val * zoom;
+        let getValueStringWithUnits = (val, units) => getRenderedValue(val) + units;
+        let isArrayValue = is.array(value);
+        let haveUnits = isArrayValue ? units.every(u => u != null) : units != null;
+
+        if( haveUnits ){
+          if( isArrayValue ){
+            return value.map( (v, i) => getValueStringWithUnits(v, units[i]) ).join(' ');
+          } else {
+            return getValueStringWithUnits(value, units);
+          }
+        } else {
+          if( isArrayValue ){
+            return value.map(v => is.string(v) ? v : '' + getRenderedValue(v)).join(' ');
+          } else {
+            return '' + getRenderedValue(value);
+          }
+        }
+      } else if( strValue != null ){
+        return strValue;
+      }
     }
+
+    return null;
   }
@@ -69,0 +89,0 @@ };

src/version.js

@@ -1,1 +0,1 @@
-module.exports = "3.2.20";
+module.exports = "3.2.21";

No alert changes

Improved metrics

Total package byte prevSize

2639281

increased by0.11%

Lines of code

68929

increased by0.11%

Published versions last week

1

increased byInfinity%

No dependency changes