@visactor/vchart 2.0.22-alpha.1 → 2.0.22-alpha.2

package/build/index.es.js

@@ -20505,13 +20505,14 @@ class DefaultBaseTextureRenderContribution {
     texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
   }
   drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const {
       textureRatio = graphicAttribute.textureRatio,
       textureOptions = null
     } = graphic.attribute;
     let pattern = null;
-    const patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr);
+    const textureRadius = null !== (_a = null == textureOptions ? void 0 : textureOptions.radius) && void 0 !== _a ? _a : 0,
+      patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr, textureRadius);
     if (null !== patternKey && (pattern = this.textureMap.get(patternKey)), !pattern) {
       if ("string" == typeof texture) switch (texture) {
         case "circle":
@@ -20538,7 +20539,7 @@ class DefaultBaseTextureRenderContribution {
         case "grid":
           pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
       }
-      pattern || (pattern = this.createResourcePattern(texture, graphic, context)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
+      pattern || (pattern = this.createResourcePattern(texture, graphic, context, texturePadding, textureRadius)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
     }
     if ("string" == typeof texture && textureOptions && textureOptions.dynamicTexture) {
       const {
@@ -20585,19 +20586,19 @@ class DefaultBaseTextureRenderContribution {
       for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
         const _x = x + cellSize / 2 + j * cellSize,
           _y = y + cellSize / 2 + i * cellSize;
-        null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
+        null === (_b = textureOptions.beforeDynamicTexture) || void 0 === _b || _b.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
       }
       useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
     } else if (pattern) {
       if (pattern.setTransform) {
         const alignToGraphic = !!(null == textureOptions ? void 0 : textureOptions.alignToGraphic),
-          alignOffsetX = null !== (_b = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _b ? _b : 0,
-          alignOffsetY = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _c ? _c : 0;
+          alignOffsetX = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _c ? _c : 0,
+          alignOffsetY = null !== (_d = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _d ? _d : 0;
         let translateX = 0,
           translateY = 0;
         if (alignToGraphic) {
           const m = context.currentMatrix;
-          translateX = (null !== (_d = null == m ? void 0 : m.e) && void 0 !== _d ? _d : 0) + x + alignOffsetX, translateY = (null !== (_e = null == m ? void 0 : m.f) && void 0 !== _e ? _e : 0) + y + alignOffsetY;
+          translateX = (null !== (_e = null == m ? void 0 : m.e) && void 0 !== _e ? _e : 0) + x + alignOffsetX, translateY = (null !== (_f = null == m ? void 0 : m.f) && void 0 !== _f ? _f : 0) + y + alignOffsetY;
         } else (alignOffsetX || alignOffsetY) && (translateX = alignOffsetX, translateY = alignOffsetY);
         pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, translateX, translateY]));
       }
@@ -20610,14 +20611,42 @@ class DefaultBaseTextureRenderContribution {
       }), x + b.x1 - x, y + b.y1 - y), context.restore();
     }
   }
-  getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr) {
-    return "string" != typeof texture ? texture : "wave" === texture ? null : `${texture}-${textureSize}-${texturePadding}-${textureColor}-${dpr}`;
+  getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr, textureRadius) {
+    return "string" != typeof texture ? texturePadding > 0 || textureRadius > 0 ? null : texture : "wave" === texture ? null : `${texture}-${textureSize}-${texturePadding}-${textureColor}-${dpr}`;
   }
-  createResourcePattern(texture, graphic, context) {
+  createResourcePattern(texture, graphic, context, texturePadding, textureRadius) {
     var _a;
     const resource = null === (_a = graphic.resources) || void 0 === _a ? void 0 : _a.get(texture),
       data = "success" === (null == resource ? void 0 : resource.state) ? resource.data : "object" == typeof texture ? texture : null;
     if (!data) return null;
+    if (texturePadding > 0 || textureRadius > 0) {
+      const w = data.naturalWidth || data.width,
+        h = data.naturalHeight || data.height;
+      if (w > 0 && h > 0) {
+        const tileW = w + 2 * texturePadding,
+          tileH = h + 2 * texturePadding,
+          canvas = canvasAllocate.allocate({
+            width: tileW,
+            height: tileH,
+            dpr: context.dpr
+          }),
+          ctx = canvas.getContext("2d");
+        if (ctx) {
+          if (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, tileW, tileH), textureRadius > 0) {
+            const r = Math.max(0, Math.min(textureRadius, Math.min(w, h) / 2)),
+              x0 = texturePadding,
+              y0 = texturePadding,
+              x1 = x0 + w,
+              y1 = y0 + h;
+            ctx.beginPath(), ctx.moveTo(x0 + r, y0), ctx.lineTo(x1 - r, y0), ctx.quadraticCurveTo(x1, y0, x1, y0 + r), ctx.lineTo(x1, y1 - r), ctx.quadraticCurveTo(x1, y1, x1 - r, y1), ctx.lineTo(x0 + r, y1), ctx.quadraticCurveTo(x0, y1, x0, y1 - r), ctx.lineTo(x0, y0 + r), ctx.quadraticCurveTo(x0, y0, x0 + r, y0), ctx.closePath(), ctx.clip();
+          }
+          ctx.drawImage(data, texturePadding, texturePadding, w, h);
+          const pattern = context.createPattern(canvas.nativeCanvas, "repeat");
+          return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), canvasAllocate.free(canvas), pattern;
+        }
+        canvasAllocate.free(canvas);
+      }
+    }
     const pattern = context.createPattern(data, "repeat");
     return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), pattern;
   }

package/build/index.js

@@ -20511,13 +20511,14 @@
         texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
       }
       drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const {
           textureRatio = graphicAttribute.textureRatio,
           textureOptions = null
         } = graphic.attribute;
         let pattern = null;
-        const patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr);
+        const textureRadius = null !== (_a = null == textureOptions ? void 0 : textureOptions.radius) && void 0 !== _a ? _a : 0,
+          patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr, textureRadius);
         if (null !== patternKey && (pattern = this.textureMap.get(patternKey)), !pattern) {
           if ("string" == typeof texture) switch (texture) {
             case "circle":
@@ -20544,7 +20545,7 @@
             case "grid":
               pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
           }
-          pattern || (pattern = this.createResourcePattern(texture, graphic, context)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
+          pattern || (pattern = this.createResourcePattern(texture, graphic, context, texturePadding, textureRadius)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
         }
         if ("string" == typeof texture && textureOptions && textureOptions.dynamicTexture) {
           const {
@@ -20591,19 +20592,19 @@
           for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
             const _x = x + cellSize / 2 + j * cellSize,
               _y = y + cellSize / 2 + i * cellSize;
-            null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
+            null === (_b = textureOptions.beforeDynamicTexture) || void 0 === _b || _b.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
           }
           useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
         } else if (pattern) {
           if (pattern.setTransform) {
             const alignToGraphic = !!(null == textureOptions ? void 0 : textureOptions.alignToGraphic),
-              alignOffsetX = null !== (_b = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _b ? _b : 0,
-              alignOffsetY = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _c ? _c : 0;
+              alignOffsetX = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _c ? _c : 0,
+              alignOffsetY = null !== (_d = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _d ? _d : 0;
             let translateX = 0,
               translateY = 0;
             if (alignToGraphic) {
               const m = context.currentMatrix;
-              translateX = (null !== (_d = null == m ? void 0 : m.e) && void 0 !== _d ? _d : 0) + x + alignOffsetX, translateY = (null !== (_e = null == m ? void 0 : m.f) && void 0 !== _e ? _e : 0) + y + alignOffsetY;
+              translateX = (null !== (_e = null == m ? void 0 : m.e) && void 0 !== _e ? _e : 0) + x + alignOffsetX, translateY = (null !== (_f = null == m ? void 0 : m.f) && void 0 !== _f ? _f : 0) + y + alignOffsetY;
             } else (alignOffsetX || alignOffsetY) && (translateX = alignOffsetX, translateY = alignOffsetY);
             pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, translateX, translateY]));
           }
@@ -20616,14 +20617,42 @@
           }), x + b.x1 - x, y + b.y1 - y), context.restore();
         }
       }
-      getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr) {
-        return "string" != typeof texture ? texture : "wave" === texture ? null : `${texture}-${textureSize}-${texturePadding}-${textureColor}-${dpr}`;
+      getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr, textureRadius) {
+        return "string" != typeof texture ? texturePadding > 0 || textureRadius > 0 ? null : texture : "wave" === texture ? null : `${texture}-${textureSize}-${texturePadding}-${textureColor}-${dpr}`;
       }
-      createResourcePattern(texture, graphic, context) {
+      createResourcePattern(texture, graphic, context, texturePadding, textureRadius) {
         var _a;
         const resource = null === (_a = graphic.resources) || void 0 === _a ? void 0 : _a.get(texture),
           data = "success" === (null == resource ? void 0 : resource.state) ? resource.data : "object" == typeof texture ? texture : null;
         if (!data) return null;
+        if (texturePadding > 0 || textureRadius > 0) {
+          const w = data.naturalWidth || data.width,
+            h = data.naturalHeight || data.height;
+          if (w > 0 && h > 0) {
+            const tileW = w + 2 * texturePadding,
+              tileH = h + 2 * texturePadding,
+              canvas = canvasAllocate.allocate({
+                width: tileW,
+                height: tileH,
+                dpr: context.dpr
+              }),
+              ctx = canvas.getContext("2d");
+            if (ctx) {
+              if (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, tileW, tileH), textureRadius > 0) {
+                const r = Math.max(0, Math.min(textureRadius, Math.min(w, h) / 2)),
+                  x0 = texturePadding,
+                  y0 = texturePadding,
+                  x1 = x0 + w,
+                  y1 = y0 + h;
+                ctx.beginPath(), ctx.moveTo(x0 + r, y0), ctx.lineTo(x1 - r, y0), ctx.quadraticCurveTo(x1, y0, x1, y0 + r), ctx.lineTo(x1, y1 - r), ctx.quadraticCurveTo(x1, y1, x1 - r, y1), ctx.lineTo(x0 + r, y1), ctx.quadraticCurveTo(x0, y1, x0, y1 - r), ctx.lineTo(x0, y0 + r), ctx.quadraticCurveTo(x0, y0, x0 + r, y0), ctx.closePath(), ctx.clip();
+              }
+              ctx.drawImage(data, texturePadding, texturePadding, w, h);
+              const pattern = context.createPattern(canvas.nativeCanvas, "repeat");
+              return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), canvasAllocate.free(canvas), pattern;
+            }
+            canvasAllocate.free(canvas);
+          }
+        }
         const pattern = context.createPattern(data, "repeat");
         return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), pattern;
       }