@antv/g-plugin-canvas-path-generator - npm Package Compare versions

Comparing version 0.1.2 to 0.1.3

dist/index.esm.js

@@ -44,2 +44,6 @@ import { Syringe, clamp, Module, Shape } from '@antv/g';
 function generatePath$3(context, parsedStyle) {
+  var _parsedStyle$defX = parsedStyle.defX,
+      defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+      _parsedStyle$defY = parsedStyle.defY,
+      defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
   var _parsedStyle$path = parsedStyle.path,
@@ -55,13 +59,12 @@ curve = _parsedStyle$path.curve,
   for (var i = 0; i < path.length; i++) {
-    var params = path[i]; // eg. M 100 200
+    var params = path[i];
+    var command = params[0];
 
-    var command = params[0]; // V,H,S,T 都在前面被转换成标准形式
-
     switch (command) {
       case 'M':
-        context.moveTo(params[1], params[2]);
+        context.moveTo(params[1] - defX, params[2] - defY);
         break;
 
       case 'C':
-        context.bezierCurveTo(params[1], params[2], params[3], params[4], params[5], params[6]);
+        context.bezierCurveTo(params[1] - defX, params[2] - defY, params[3] - defX, params[4] - defY, params[5] - defX, params[6] - defY);
         break;
@@ -78,8 +81,12 @@ // @ts-ignore
 function generatePath$4(context, parsedStyle) {
+  var _parsedStyle$defX = parsedStyle.defX,
+      defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+      _parsedStyle$defY = parsedStyle.defY,
+      defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
   var points = parsedStyle.points.points;
   var length = points.length;
-  var x1 = points[0][0];
-  var y1 = points[0][1];
-  var x2 = points[length - 1][0];
-  var y2 = points[length - 1][1];
+  var x1 = points[0][0] - defX;
+  var y1 = points[0][1] - defY;
+  var x2 = points[length - 1][0] - defX;
+  var y2 = points[length - 1][1] - defY;
   context.moveTo(x1, y1);
@@ -89,3 +96,3 @@
     var point = points[i];
-    context.lineTo(point[0], point[1]);
+    context.lineTo(point[0] - defX, point[1] - defY);
   }
@@ -97,8 +104,12 @@
 function generatePath$5(context, parsedStyle) {
+  var _parsedStyle$defX = parsedStyle.defX,
+      defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+      _parsedStyle$defY = parsedStyle.defY,
+      defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
   var points = parsedStyle.points.points;
   var length = points.length;
-  var x1 = points[0][0];
-  var y1 = points[0][1];
-  var x2 = points[length - 1][0];
-  var y2 = points[length - 1][1];
+  var x1 = points[0][0] - defX;
+  var y1 = points[0][1] - defY;
+  var x2 = points[length - 1][0] - defX;
+  var y2 = points[length - 1][1] - defY;
   context.moveTo(x1, y1);
@@ -108,3 +119,3 @@
     var point = points[i];
-    context.lineTo(point[0], point[1]);
+    context.lineTo(point[0] - defX, point[1] - defY);
   }
@@ -111,0 +122,0 @@

dist/index.js

@@ -48,2 +48,6 @@ 'use strict';
 function generatePath$3(context, parsedStyle) {
+  var _parsedStyle$defX = parsedStyle.defX,
+      defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+      _parsedStyle$defY = parsedStyle.defY,
+      defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
   var _parsedStyle$path = parsedStyle.path,
@@ -59,13 +63,12 @@ curve = _parsedStyle$path.curve,
   for (var i = 0; i < path.length; i++) {
-    var params = path[i]; // eg. M 100 200
+    var params = path[i];
+    var command = params[0];
 
-    var command = params[0]; // V,H,S,T 都在前面被转换成标准形式
-
     switch (command) {
       case 'M':
-        context.moveTo(params[1], params[2]);
+        context.moveTo(params[1] - defX, params[2] - defY);
         break;
 
       case 'C':
-        context.bezierCurveTo(params[1], params[2], params[3], params[4], params[5], params[6]);
+        context.bezierCurveTo(params[1] - defX, params[2] - defY, params[3] - defX, params[4] - defY, params[5] - defX, params[6] - defY);
         break;
@@ -82,8 +85,12 @@ // @ts-ignore
 function generatePath$4(context, parsedStyle) {
+  var _parsedStyle$defX = parsedStyle.defX,
+      defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+      _parsedStyle$defY = parsedStyle.defY,
+      defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
   var points = parsedStyle.points.points;
   var length = points.length;
-  var x1 = points[0][0];
-  var y1 = points[0][1];
-  var x2 = points[length - 1][0];
-  var y2 = points[length - 1][1];
+  var x1 = points[0][0] - defX;
+  var y1 = points[0][1] - defY;
+  var x2 = points[length - 1][0] - defX;
+  var y2 = points[length - 1][1] - defY;
   context.moveTo(x1, y1);
@@ -93,3 +100,3 @@
     var point = points[i];
-    context.lineTo(point[0], point[1]);
+    context.lineTo(point[0] - defX, point[1] - defY);
   }
@@ -101,8 +108,12 @@
 function generatePath$5(context, parsedStyle) {
+  var _parsedStyle$defX = parsedStyle.defX,
+      defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+      _parsedStyle$defY = parsedStyle.defY,
+      defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
   var points = parsedStyle.points.points;
   var length = points.length;
-  var x1 = points[0][0];
-  var y1 = points[0][1];
-  var x2 = points[length - 1][0];
-  var y2 = points[length - 1][1];
+  var x1 = points[0][0] - defX;
+  var y1 = points[0][1] - defY;
+  var x2 = points[length - 1][0] - defX;
+  var y2 = points[length - 1][1] - defY;
   context.moveTo(x1, y1);
@@ -112,3 +123,3 @@
     var point = points[i];
-    context.lineTo(point[0], point[1]);
+    context.lineTo(point[0] - defX, point[1] - defY);
   }
@@ -115,0 +126,0 @@

dist/index.umd.js

@@ -48,2 +48,6 @@ (function (global, factory) {
   function generatePath$3(context, parsedStyle) {
+    var _parsedStyle$defX = parsedStyle.defX,
+        defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+        _parsedStyle$defY = parsedStyle.defY,
+        defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
     var _parsedStyle$path = parsedStyle.path,
@@ -59,13 +63,12 @@ curve = _parsedStyle$path.curve,
     for (var i = 0; i < path.length; i++) {
-      var params = path[i]; // eg. M 100 200
+      var params = path[i];
+      var command = params[0];
 
-      var command = params[0]; // V,H,S,T 都在前面被转换成标准形式
-
       switch (command) {
         case 'M':
-          context.moveTo(params[1], params[2]);
+          context.moveTo(params[1] - defX, params[2] - defY);
           break;
 
         case 'C':
-          context.bezierCurveTo(params[1], params[2], params[3], params[4], params[5], params[6]);
+          context.bezierCurveTo(params[1] - defX, params[2] - defY, params[3] - defX, params[4] - defY, params[5] - defX, params[6] - defY);
           break;
@@ -82,8 +85,12 @@ // @ts-ignore
   function generatePath$4(context, parsedStyle) {
+    var _parsedStyle$defX = parsedStyle.defX,
+        defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+        _parsedStyle$defY = parsedStyle.defY,
+        defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
     var points = parsedStyle.points.points;
     var length = points.length;
-    var x1 = points[0][0];
-    var y1 = points[0][1];
-    var x2 = points[length - 1][0];
-    var y2 = points[length - 1][1];
+    var x1 = points[0][0] - defX;
+    var y1 = points[0][1] - defY;
+    var x2 = points[length - 1][0] - defX;
+    var y2 = points[length - 1][1] - defY;
     context.moveTo(x1, y1);
@@ -93,3 +100,3 @@
       var point = points[i];
-      context.lineTo(point[0], point[1]);
+      context.lineTo(point[0] - defX, point[1] - defY);
     }
@@ -101,8 +108,12 @@
   function generatePath$5(context, parsedStyle) {
+    var _parsedStyle$defX = parsedStyle.defX,
+        defX = _parsedStyle$defX === void 0 ? 0 : _parsedStyle$defX,
+        _parsedStyle$defY = parsedStyle.defY,
+        defY = _parsedStyle$defY === void 0 ? 0 : _parsedStyle$defY;
     var points = parsedStyle.points.points;
     var length = points.length;
-    var x1 = points[0][0];
-    var y1 = points[0][1];
-    var x2 = points[length - 1][0];
-    var y2 = points[length - 1][1];
+    var x1 = points[0][0] - defX;
+    var y1 = points[0][1] - defY;
+    var x2 = points[length - 1][0] - defX;
+    var y2 = points[length - 1][1] - defY;
     context.moveTo(x1, y1);
@@ -112,3 +123,3 @@
       var point = points[i];
-      context.lineTo(point[0], point[1]);
+      context.lineTo(point[0] - defX, point[1] - defY);
     }
@@ -115,0 +126,0 @@

dist/index.umd.min.js

@@ -1,1 +0,1 @@
-!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?a(exports,require("@antv/g")):"function"==typeof define&&define.amd?define(["exports","@antv/g"],a):a(((e="undefined"!=typeof globalThis?globalThis:e||self).G=e.G||{},e.G.CanvasPathGenerator={}),e.window.G)}(this,(function(e,a){"use strict";var n=a.Syringe.defineToken("PathGeneratorFactory"),t=a.Syringe.defineToken("PathGenerator");function o(e,a){var n=a.r;e.arc(n.value,n.value,n.value,0,2*Math.PI,!1)}function r(e,a){var n=a.rx.value,t=a.ry.value;if(e.ellipse)e.ellipse(n,t,n,t,0,0,2*Math.PI,!1);else{var o=n>t?n:t,r=n>t?1:n/t,u=n>t?t/n:1;e.save(),e.scale(r,u),e.arc(0,0,o,0,2*Math.PI)}}function u(e,a){var n=a.x2,t=a.y2,o=a.defX,r=void 0===o?0:o,u=a.defY,i=void 0===u?0:u;e.moveTo(a.x1.value-r,a.y1.value-i),e.lineTo(n.value-r,t.value-i)}function i(e,a){var n=a.path,t=n.zCommandIndexes,o=[].concat(n.curve);t.forEach((function(e,a){o.splice(e+a,1,["Z"])}));for(var r=0;o.length>r;r++){var u=o[r];switch(u[0]){case"M":e.moveTo(u[1],u[2]);break;case"C":e.bezierCurveTo(u[1],u[2],u[3],u[4],u[5],u[6]);break;case"Z":e.closePath()}}}function l(e,a){var n=a.points.points,t=n.length,o=n[t-1][0],r=n[t-1][1];e.moveTo(n[0][0],n[0][1]);for(var u=0;t-1>u;u++){var i=n[u];e.lineTo(i[0],i[1])}e.lineTo(o,r)}function c(e,a){var n=a.points.points,t=n.length,o=n[t-1][0],r=n[t-1][1];e.moveTo(n[0][0],n[0][1]);for(var u=0;t-1>u;u++){var i=n[u];e.lineTo(i[0],i[1])}e.lineTo(o,r)}function v(e,n){var t=n.radius,o=n.width,r=n.height,u=o.value,i=r.value;if(t&&t.some((function(e){return 0!==e.value}))){var l=o.value>0?1:-1,c=r.value>0?1:-1,v=l+c===0,h=t.map((function(e){return a.clamp(e.value,0,Math.min(Math.abs(u)/2,Math.abs(i)/2))})),s=h[0],f=h[1],d=h[2],p=h[3];e.moveTo(l*s,0),e.lineTo(u-l*f,0),0!==f&&e.arc(u-l*f,c*f,f,-c*Math.PI/2,l>0?0:Math.PI,v),e.lineTo(u,i-c*d),0!==d&&e.arc(u-l*d,i-c*d,d,l>0?0:Math.PI,c>0?Math.PI/2:1.5*Math.PI,v),e.lineTo(l*p,i),0!==p&&e.arc(l*p,i-c*p,p,c>0?Math.PI/2:-Math.PI/2,l>0?Math.PI:0,v),e.lineTo(0,c*s),0!==s&&e.arc(l*s,c*s,s,l>0?Math.PI:0,c>0?1.5*Math.PI:Math.PI/2,v)}else e.rect(0,0,u,i)}var h=a.Module((function(e){e({token:{token:t,named:a.Shape.CIRCLE},useValue:o}),e({token:{token:t,named:a.Shape.ELLIPSE},useValue:r}),e({token:{token:t,named:a.Shape.RECT},useValue:v}),e({token:{token:t,named:a.Shape.LINE},useValue:u}),e({token:{token:t,named:a.Shape.POLYLINE},useValue:c}),e({token:{token:t,named:a.Shape.POLYGON},useValue:l}),e({token:{token:t,named:a.Shape.PATH},useValue:i}),e({token:n,useFactory:function(e){return function(a){return e.container.isBoundNamed(t,a)?e.container.getNamed(t,a):null}}})})),s=function(){function e(){this.name="canvas-path-generator"}var a=e.prototype;return a.init=function(e){e.load(h,!0)},a.destroy=function(e){e.unload(h)},e}();e.PathGenerator=t,e.PathGeneratorFactory=n,e.Plugin=s,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?a(exports,require("@antv/g")):"function"==typeof define&&define.amd?define(["exports","@antv/g"],a):a(((e="undefined"!=typeof globalThis?globalThis:e||self).G=e.G||{},e.G.CanvasPathGenerator={}),e.window.G)}(this,(function(e,a){"use strict";var n=a.Syringe.defineToken("PathGeneratorFactory"),o=a.Syringe.defineToken("PathGenerator");function t(e,a){var n=a.r;e.arc(n.value,n.value,n.value,0,2*Math.PI,!1)}function r(e,a){var n=a.rx.value,o=a.ry.value;if(e.ellipse)e.ellipse(n,o,n,o,0,0,2*Math.PI,!1);else{var t=n>o?n:o,r=n>o?1:n/o,i=n>o?o/n:1;e.save(),e.scale(r,i),e.arc(0,0,t,0,2*Math.PI)}}function i(e,a){var n=a.x2,o=a.y2,t=a.defX,r=void 0===t?0:t,i=a.defY,u=void 0===i?0:i;e.moveTo(a.x1.value-r,a.y1.value-u),e.lineTo(n.value-r,o.value-u)}function u(e,a){var n=a.defX,o=void 0===n?0:n,t=a.defY,r=void 0===t?0:t,i=a.path,u=i.zCommandIndexes,l=[].concat(i.curve);u.forEach((function(e,a){l.splice(e+a,1,["Z"])}));for(var v=0;l.length>v;v++){var c=l[v];switch(c[0]){case"M":e.moveTo(c[1]-o,c[2]-r);break;case"C":e.bezierCurveTo(c[1]-o,c[2]-r,c[3]-o,c[4]-r,c[5]-o,c[6]-r);break;case"Z":e.closePath()}}}function l(e,a){var n=a.defX,o=void 0===n?0:n,t=a.defY,r=void 0===t?0:t,i=a.points.points,u=i.length,l=i[u-1][0]-o,v=i[u-1][1]-r;e.moveTo(i[0][0]-o,i[0][1]-r);for(var c=0;u-1>c;c++){var d=i[c];e.lineTo(d[0]-o,d[1]-r)}e.lineTo(l,v)}function v(e,a){var n=a.defX,o=void 0===n?0:n,t=a.defY,r=void 0===t?0:t,i=a.points.points,u=i.length,l=i[u-1][0]-o,v=i[u-1][1]-r;e.moveTo(i[0][0]-o,i[0][1]-r);for(var c=0;u-1>c;c++){var d=i[c];e.lineTo(d[0]-o,d[1]-r)}e.lineTo(l,v)}function c(e,n){var o=n.radius,t=n.width,r=n.height,i=t.value,u=r.value;if(o&&o.some((function(e){return 0!==e.value}))){var l=t.value>0?1:-1,v=r.value>0?1:-1,c=l+v===0,d=o.map((function(e){return a.clamp(e.value,0,Math.min(Math.abs(i)/2,Math.abs(u)/2))})),f=d[0],h=d[1],s=d[2],p=d[3];e.moveTo(l*f,0),e.lineTo(i-l*h,0),0!==h&&e.arc(i-l*h,v*h,h,-v*Math.PI/2,l>0?0:Math.PI,c),e.lineTo(i,u-v*s),0!==s&&e.arc(i-l*s,u-v*s,s,l>0?0:Math.PI,v>0?Math.PI/2:1.5*Math.PI,c),e.lineTo(l*p,u),0!==p&&e.arc(l*p,u-v*p,p,v>0?Math.PI/2:-Math.PI/2,l>0?Math.PI:0,c),e.lineTo(0,v*f),0!==f&&e.arc(l*f,v*f,f,l>0?Math.PI:0,v>0?1.5*Math.PI:Math.PI/2,c)}else e.rect(0,0,i,u)}var d=a.Module((function(e){e({token:{token:o,named:a.Shape.CIRCLE},useValue:t}),e({token:{token:o,named:a.Shape.ELLIPSE},useValue:r}),e({token:{token:o,named:a.Shape.RECT},useValue:c}),e({token:{token:o,named:a.Shape.LINE},useValue:i}),e({token:{token:o,named:a.Shape.POLYLINE},useValue:v}),e({token:{token:o,named:a.Shape.POLYGON},useValue:l}),e({token:{token:o,named:a.Shape.PATH},useValue:u}),e({token:n,useFactory:function(e){return function(a){return e.container.isBoundNamed(o,a)?e.container.getNamed(o,a):null}}})})),f=function(){function e(){this.name="canvas-path-generator"}var a=e.prototype;return a.init=function(e){e.load(d,!0)},a.destroy=function(e){e.unload(d)},e}();e.PathGenerator=o,e.PathGeneratorFactory=n,e.Plugin=f,Object.defineProperty(e,"__esModule",{value:!0})}));

package.json

 {
   "name": "@antv/g-plugin-canvas-path-generator",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A G plugin of path generator with Canvas2D API",
@@ -30,3 +30,3 @@ "keywords": [
   "dependencies": {
-    "@antv/g-math": "^1.2.2",
+    "@antv/g-math": "^1.2.3",
     "tslib": "^2.3.1"
@@ -43,3 +43,3 @@ },
   },
-  "gitHead": "f0d3036ed1439859167f135b8a61c84a415582df"
+  "gitHead": "e83fa4cd73c6c22a60988c072275d2a191067b87"
 }

No alert changes

Improved metrics

Total package byte prevSize

32956

increased by8%

Lines of code

729

increased by5.19%

Dependency changes

• Updated@antv/g-math@^1.2.3