@visactor/vrender 0.16.18 → 0.16.19-alpha.2

package/cjs/index.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "0.16.18";
+export declare const version = "0.16.19-alpha.2";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,5 +21,5 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits");
 
-exports.version = "0.16.18", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
+exports.version = "0.16.19-alpha.2", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
 __exportStar(require("@visactor/vrender-core"), exports), __exportStar(require("@visactor/vrender-kits"), exports);

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAuD;AAG1C,QAAA,OAAO,GAAG,SAAS,CAAC;AAEjC,IAAA,4BAAa,EAAC,wBAAS,CAAC,CAAC;AAEzB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadAllModule } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.16.18\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAuD;AAG1C,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,IAAA,4BAAa,EAAC,wBAAS,CAAC,CAAC;AAEzB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadAllModule } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.16.19-alpha.2\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -6422,7 +6422,10 @@
     lineClamp: 1 / 0,
     suffixPosition: "end"
   };
-  var DefaultStyle = Object.assign(Object.assign(Object.assign({
+  var DefaultPickStyle = {
+    pickStrokeBuffer: 0
+  };
+  var DefaultStyle = Object.assign(Object.assign(Object.assign(Object.assign({
     opacity: 1,
     background: null,
     texture: null,
@@ -6433,7 +6436,7 @@
     blur: 0,
     cursor: null,
     html: null
-  }, DefaultFillStyle), DefaultStrokeStyle), DefaultLayout);
+  }, DefaultFillStyle), DefaultStrokeStyle), DefaultLayout), DefaultPickStyle);
   var DefaultConnectAttribute = {
     connectedType: "none",
     connectedStyle: {},
@@ -19202,12 +19205,14 @@
           shadowBlur = _attribute$shadowBlur2 === void 0 ? theme.shadowBlur : _attribute$shadowBlur2,
           _attribute$lineWidth = attribute.lineWidth,
           lineWidth = _attribute$lineWidth === void 0 ? theme.lineWidth : _attribute$lineWidth,
+          _attribute$pickStroke = attribute.pickStrokeBuffer,
+          pickStrokeBuffer = _attribute$pickStroke === void 0 ? theme.pickStrokeBuffer : _attribute$pickStroke,
           _attribute$strokeBoun2 = attribute.strokeBoundsBuffer,
           strokeBoundsBuffer = _attribute$strokeBoun2 === void 0 ? theme.strokeBoundsBuffer : _attribute$strokeBoun2,
           tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
         if (stroke) {
-          var scaledHalfLineWidth = lineWidth / Math.abs(scaleX + scaleY);
+          var scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);
           boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }
         if (shadowBlur) {
@@ -19215,8 +19220,8 @@
             shadowOffsetX = _attribute$shadowOffs === void 0 ? theme.shadowOffsetX : _attribute$shadowOffs,
             _attribute$shadowOffs2 = attribute.shadowOffsetY,
             shadowOffsetY = _attribute$shadowOffs2 === void 0 ? theme.shadowOffsetY : _attribute$shadowOffs2,
-            shadowBlurWidth = shadowBlur / Math.abs(scaleX + scaleY) * 2 + Math.max(shadowOffsetX, shadowOffsetY);
-          boundStroke(tb1, shadowBlurWidth, miter, strokeBoundsBuffer + 1), aabbBounds.union(tb1);
+            shadowBlurWidth = shadowBlur / Math.abs(scaleX + scaleY) * 2;
+          boundStroke(tb1, shadowBlurWidth, !1, strokeBoundsBuffer + 1), tb1.translate(shadowOffsetX, shadowOffsetY), aabbBounds.union(tb1);
         }
         this.combindShadowAABBBounds(aabbBounds, graphic), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix);
       }
@@ -31585,7 +31590,7 @@
           blur = _attribute$blur === void 0 ? defaultParams.blur : _attribute$blur,
           _attribute$globalComp = attribute.globalCompositeOperation,
           globalCompositeOperation = _attribute$globalComp === void 0 ? defaultParams.globalCompositeOperation : _attribute$globalComp;
-        opacity <= 1e-12 || (shadowBlur || shadowOffsetX || shadowOffsetY ? (_context.shadowBlur = shadowBlur, _context.shadowColor = shadowColor, _context.shadowOffsetX = shadowOffsetX, _context.shadowOffsetY = shadowOffsetY, this._clearShadowStyle = !0) : this._clearShadowStyle && (_context.shadowBlur = 0, _context.shadowOffsetX = 0, _context.shadowOffsetY = 0), blur ? (_context.filter = "blur(".concat(blur, "px)"), this._clearFilterStyle = !0) : this._clearFilterStyle && (_context.filter = "blur(0px)", this._clearFilterStyle = !1), globalCompositeOperation ? (_context.globalCompositeOperation = globalCompositeOperation, this._clearGlobalCompositeOperationStyle = !0) : this._clearGlobalCompositeOperationStyle && (_context.globalCompositeOperation = "source-over", this._clearGlobalCompositeOperationStyle = !1));
+        opacity <= 1e-12 || (shadowBlur || shadowOffsetX || shadowOffsetY ? (_context.shadowBlur = shadowBlur * this.dpr, _context.shadowColor = shadowColor, _context.shadowOffsetX = shadowOffsetX * this.dpr, _context.shadowOffsetY = shadowOffsetY * this.dpr, this._clearShadowStyle = !0) : this._clearShadowStyle && (_context.shadowBlur = 0, _context.shadowOffsetX = 0, _context.shadowOffsetY = 0), blur ? (_context.filter = "blur(".concat(blur, "px)"), this._clearFilterStyle = !0) : this._clearFilterStyle && (_context.filter = "blur(0px)", this._clearFilterStyle = !1), globalCompositeOperation ? (_context.globalCompositeOperation = globalCompositeOperation, this._clearGlobalCompositeOperationStyle = !0) : this._clearGlobalCompositeOperationStyle && (_context.globalCompositeOperation = "source-over", this._clearGlobalCompositeOperationStyle = !1));
       }
     }, {
       key: "setStrokeStyle",
@@ -31941,8 +31946,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, circleAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = circleAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -32000,8 +32006,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, rectAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
         });else {
           var _rect$attribute2 = rect.attribute,
             _rect$attribute2$fill = _rect$attribute2.fill,
@@ -32066,8 +32073,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, arcAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = arcAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -32214,10 +32222,11 @@
         var picked = !1;
         return this.canvasRenderer.drawShape(line, pickContext, x, y, {}, null, function (context) {
           return !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked);
-        }, function (context, circleAttribute, themeAttribute) {
+        }, function (context, lineAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
+          var lineWidth = lineAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = lineAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         }), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -32276,8 +32285,9 @@
           return !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked);
         }, function (context, pathAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
+          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         }), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -32339,8 +32349,9 @@
           return !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked);
         }, function (context, symbolAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
+          var lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         }), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -32465,8 +32476,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, pathAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -33390,8 +33402,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, pathAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -33442,8 +33455,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, circleAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = circleAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -33501,8 +33515,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, rectAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         });else if (picked) {
           var _rect$attribute2 = rect.attribute,
             _rect$attribute2$fill = _rect$attribute2.fill,
@@ -33567,8 +33582,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, arcAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = arcAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -33667,8 +33683,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, circleAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = circleAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -33719,8 +33736,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, symbolAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -33792,8 +33810,9 @@
           return !!picked || (picked = context.isPointInPath(point.x, point.y), picked);
         }, function (context, pathAttribute, themeAttribute) {
           if (picked) return !0;
-          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-          return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
+          var lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth,
+            pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+          return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }]);
@@ -35094,7 +35113,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.16.18";
+  const version = "0.16.19-alpha.2";
   loadAllModule(container);
 
   exports.ACustomAnimate = ACustomAnimate;
@@ -35156,6 +35175,7 @@
   exports.DefaultMatrixAllocate = DefaultMatrixAllocate;
   exports.DefaultMorphingAnimateConfig = DefaultMorphingAnimateConfig;
   exports.DefaultPathAttribute = DefaultPathAttribute;
+  exports.DefaultPickStyle = DefaultPickStyle;
   exports.DefaultPolygonAttribute = DefaultPolygonAttribute;
   exports.DefaultRect3dAttribute = DefaultRect3dAttribute;
   exports.DefaultRectAttribute = DefaultRectAttribute;