@antv/g - npm Package Compare versions

Comparing version 3.3.3 to 3.3.4

lib/index.js

@@ -22,3 +22,3 @@ module.exports = {
   // version, etc.
-  version: '3.3.3'
+  version: '3.3.4'
 };

lib/renderers/svg/painter.js

@@ -531,3 +531,9 @@ var Util = require('../../util');
 
-    el.setAttribute('transform', "matrix(" + transform.join(',') + ")");
+    transform = transform.join(',');
+
+    if (transform.indexOf('NaN') === -1) {
+      el.setAttribute('transform', "matrix(" + transform + ")");
+    } else {
+      console.warn('invalid matrix:', matrix);
+    }
   };
@@ -774,9 +780,14 @@
     };
-    var id = this.context.find('filter', cfg);
 
-    if (!id) {
-      id = this.context.addShadow(cfg, this);
+    if (!cfg.dx && !cfg.dy && !cfg.blur && !cfg.color) {
+      el.removeAttribute('filter');
+    } else {
+      var id = this.context.find('filter', cfg);
+
+      if (!id) {
+        id = this.context.addShadow(cfg, this);
+      }
+
+      el.setAttribute('filter', "url(#" + id + ")");
     }
-
-    el.setAttribute('filter', "url(#" + id + ")");
   };
@@ -783,0 +794,0 @@

lib/util/common.js

@@ -1,43 +0,41 @@
-var Util = require('@antv/util/lib');
-
 module.exports = {
-  isFunction: Util.isFunction,
-  isObject: Util.isObject,
-  isBoolean: Util.isBoolean,
-  isNil: Util.isNil,
-  isString: Util.isString,
-  isArray: Util.isArray,
-  isNumber: Util.isNumber,
-  isEmpty: Util.isEmpty,
+  isFunction: require('@antv/util/lib/type/is-function'),
+  isObject: require('@antv/util/lib/type/is-object'),
+  isBoolean: require('@antv/util/lib/type/is-boolean'),
+  isNil: require('@antv/util/lib/type/is-nil'),
+  isString: require('@antv/util/lib/type/is-string'),
+  isArray: require('@antv/util/lib/type/is-array'),
+  isNumber: require('@antv/util/lib/type/is-number'),
+  isEmpty: require('@antv/util/lib/is-empty'),
   // isBlank
-  uniqueId: Util.uniqueId,
-  clone: Util.clone,
-  deepMix: Util.deepMix,
-  assign: Util.mix,
+  uniqueId: require('@antv/util/lib/unique-id'),
+  clone: require('@antv/util/lib/clone'),
+  deepMix: require('@antv/util/lib/deep-mix'),
+  assign: require('@antv/util/lib/mix'),
   // simpleMix
-  merge: Util.deepMix,
+  merge: require('@antv/util/lib/deep-mix'),
   // mix
-  upperFirst: Util.upperFirst,
+  upperFirst: require('@antv/util/lib/string/upper-first'),
   // ucfirst
-  each: Util.each,
-  isEqual: Util.isEqual,
-  toArray: Util.toArray,
-  extend: Util.extend,
-  augment: Util.augment,
-  remove: Util.arrayUtil.pull,
-  isNumberEqual: Util.isNumberEqual,
-  toRadian: Util.toRadian,
-  toDegree: Util.toDegree,
-  mod: Util.mod,
-  clamp: Util.clamp,
-  createDom: Util.createDom,
-  modifyCSS: Util.modifyCSS,
-  requestAnimationFrame: Util.requestAnimationFrame,
+  each: require('@antv/util/lib/each'),
+  isEqual: require('@antv/util/lib/is-equal'),
+  toArray: require('@antv/util/lib/to-array'),
+  extend: require('@antv/util/lib/extend'),
+  augment: require('@antv/util/lib/augment'),
+  remove: require('@antv/util/lib/array/pull'),
+  isNumberEqual: require('@antv/util/lib/math/is-number-equal'),
+  toRadian: require('@antv/util/lib/math/to-radian'),
+  toDegree: require('@antv/util/lib/math/to-degree'),
+  mod: require('@antv/util/lib/math/mod'),
+  clamp: require('@antv/util/lib/math/clamp'),
+  createDom: require('@antv/util/lib/dom/create-dom'),
+  modifyCSS: require('@antv/util/lib/dom/modify-css'),
+  requestAnimationFrame: require('@antv/util/lib/dom/request-animation-frame'),
   getRatio: function getRatio() {
     return window.devicePixelRatio ? window.devicePixelRatio : 2;
   },
-  mat3: Util.mat3,
-  vec2: Util.vec2,
-  vec3: Util.vec3,
-  transform: Util.transform
+  mat3: require('@antv/util/lib/matrix/mat3'),
+  vec2: require('@antv/util/lib/matrix/vec2'),
+  vec3: require('@antv/util/lib/matrix/vec3'),
+  transform: require('@antv/util/lib/matrix/transform')
 };

lib/util/path.js

@@ -1304,5 +1304,6 @@ var Util = require('./common');
   sourceLen = source.length;
+  var diff = targetLen - sourceLen;
 
   if (sourceLen < targetLen) {
-    for (var _i6 = 0; _i6 < targetLen - sourceLen; _i6++) {
+    for (var _i6 = 0; _i6 < diff; _i6++) {
       if (source[sourceLen - 1][0] === 'z' || source[sourceLen - 1][0] === 'Z') {
@@ -1313,2 +1314,4 @@ source.splice(sourceLen - 2, 0, source[sourceLen - 2]);
       }
+
+      sourceLen += 1;
     }
@@ -1315,0 +1318,0 @@ }

package.json

 {
   "name": "@antv/g",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "A canvas library which providing 2d draw for G2.",
@@ -73,3 +73,3 @@ "keywords": [
     "@antv/gl-matrix": "~2.7.1",
-    "@antv/util": "~1.2.3",
+    "@antv/util": "~1.3.1",
     "d3-ease": "~1.0.3",
@@ -76,0 +76,0 @@ "d3-interpolate": "~1.1.5",

src/index.js

@@ -22,3 +22,3 @@ module.exports = {
   // version, etc.
-  version: '3.3.3'
+  version: '3.3.4'
 };

src/renderers/svg/painter.js

@@ -445,7 +445,12 @@ const Util = require('../../util');
     const el = model._cfg.el;
-    const transform = [];
+    let transform = [];
     for (let i = 0; i < 9; i += 3) {
       transform.push(matrix[i] + ',' + matrix[i + 1]);
     }
-    el.setAttribute('transform', `matrix(${transform.join(',')})`);
+    transform = transform.join(',');
+    if (transform.indexOf('NaN') === -1) {
+      el.setAttribute('transform', `matrix(${transform})`);
+    } else {
+      console.warn('invalid matrix:', matrix);
+    }
   }
@@ -653,7 +658,11 @@ _setImage(model, img) {
     };
-    let id = this.context.find('filter', cfg);
-    if (!id) {
-      id = this.context.addShadow(cfg, this);
+    if (!cfg.dx && !cfg.dy && !cfg.blur && !cfg.color) {
+      el.removeAttribute('filter');
+    } else {
+      let id = this.context.find('filter', cfg);
+      if (!id) {
+        id = this.context.addShadow(cfg, this);
+      }
+      el.setAttribute('filter', `url(#${id})`);
     }
-    el.setAttribute('filter', `url(#${id})`);
   }
@@ -660,0 +669,0 @@ }

src/util/common.js

@@ -1,39 +0,37 @@
-const Util = require('@antv/util/lib');
-
 module.exports = {
-  isFunction: Util.isFunction,
-  isObject: Util.isObject,
-  isBoolean: Util.isBoolean,
-  isNil: Util.isNil,
-  isString: Util.isString,
-  isArray: Util.isArray,
-  isNumber: Util.isNumber,
-  isEmpty: Util.isEmpty, // isBlank
-  uniqueId: Util.uniqueId,
-  clone: Util.clone,
-  deepMix: Util.deepMix,
-  assign: Util.mix, // simpleMix
-  merge: Util.deepMix, // mix
-  upperFirst: Util.upperFirst, // ucfirst
-  each: Util.each,
-  isEqual: Util.isEqual,
-  toArray: Util.toArray,
-  extend: Util.extend,
-  augment: Util.augment,
-  remove: Util.arrayUtil.pull,
-  isNumberEqual: Util.isNumberEqual,
-  toRadian: Util.toRadian,
-  toDegree: Util.toDegree,
-  mod: Util.mod,
-  clamp: Util.clamp,
-  createDom: Util.createDom,
-  modifyCSS: Util.modifyCSS,
-  requestAnimationFrame: Util.requestAnimationFrame,
+  isFunction: require('@antv/util/lib/type/is-function'),
+  isObject: require('@antv/util/lib/type/is-object'),
+  isBoolean: require('@antv/util/lib/type/is-boolean'),
+  isNil: require('@antv/util/lib/type/is-nil'),
+  isString: require('@antv/util/lib/type/is-string'),
+  isArray: require('@antv/util/lib/type/is-array'),
+  isNumber: require('@antv/util/lib/type/is-number'),
+  isEmpty: require('@antv/util/lib/is-empty'), // isBlank
+  uniqueId: require('@antv/util/lib/unique-id'),
+  clone: require('@antv/util/lib/clone'),
+  deepMix: require('@antv/util/lib/deep-mix'),
+  assign: require('@antv/util/lib/mix'), // simpleMix
+  merge: require('@antv/util/lib/deep-mix'), // mix
+  upperFirst: require('@antv/util/lib/string/upper-first'), // ucfirst
+  each: require('@antv/util/lib/each'),
+  isEqual: require('@antv/util/lib/is-equal'),
+  toArray: require('@antv/util/lib/to-array'),
+  extend: require('@antv/util/lib/extend'),
+  augment: require('@antv/util/lib/augment'),
+  remove: require('@antv/util/lib/array/pull'),
+  isNumberEqual: require('@antv/util/lib/math/is-number-equal'),
+  toRadian: require('@antv/util/lib/math/to-radian'),
+  toDegree: require('@antv/util/lib/math/to-degree'),
+  mod: require('@antv/util/lib/math/mod'),
+  clamp: require('@antv/util/lib/math/clamp'),
+  createDom: require('@antv/util/lib/dom/create-dom'),
+  modifyCSS: require('@antv/util/lib/dom/modify-css'),
+  requestAnimationFrame: require('@antv/util/lib/dom/request-animation-frame'),
   getRatio: function getRatio() {
     return window.devicePixelRatio ? window.devicePixelRatio : 2;
   },
-  mat3: Util.mat3,
-  vec2: Util.vec2,
-  vec3: Util.vec3,
-  transform: Util.transform
+  mat3: require('@antv/util/lib/matrix/mat3'),
+  vec2: require('@antv/util/lib/matrix/vec2'),
+  vec3: require('@antv/util/lib/matrix/vec3'),
+  transform: require('@antv/util/lib/matrix/transform')
 };

src/util/path.js

@@ -1188,7 +1188,7 @@ const Util = require('./common');
   }
-
   // source尾部补齐
   sourceLen = source.length;
+  const diff = targetLen - sourceLen;
   if (sourceLen < targetLen) {
-    for (let i = 0; i < (targetLen - sourceLen); i++) {
+    for (let i = 0; i < diff; i++) {
       if (source[sourceLen - 1][0] === 'z' || source[sourceLen - 1][0] === 'Z') {
@@ -1199,3 +1199,3 @@ source.splice(sourceLen - 2, 0, source[sourceLen - 2]);
       }
-
+      sourceLen += 1;
     }
@@ -1202,0 +1202,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

Worsened metrics

Total package byte prevSize

1046144

decreased by-8.34%

Lines of code

27680

decreased by-8.33%

Dependency changes

• + Added@antv/util@1.3.1(transitive)

• - Removed@antv/util@1.2.5(transitive)

• Updated@antv/util@~1.3.1