feat: support style option to drawTo method

qq15725 · Oct 24, 2024 · 9464363 · 9464363
1 parent 125a109
commit 9464363
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/canvas/setCanvasContext.ts b/src/canvas/setCanvasContext.ts
@@ -19,7 +19,7 @@ export function setCanvasContext(
     strokeLinecap = 'round',
     strokeLinejoin = 'miter',
     strokeMiterlimit = 0,
-    strokeDasharray,
+    strokeDasharray = [],
     strokeDashoffset = 0,
     shadowOffsetX = 0,
     shadowOffsetY = 0,
@@ -35,7 +35,7 @@ export function setCanvasContext(
   ctx.lineCap = strokeLinecap
   ctx.lineJoin = lineJoinMap[strokeLinejoin]
   ctx.miterLimit = strokeMiterlimit
-  strokeDasharray && ctx.setLineDash(strokeDasharray)
+  ctx.setLineDash(strokeDasharray)
   ctx.lineDashOffset = strokeDashoffset
 
   // shadow

diff --git a/src/paths/Path2D.ts b/src/paths/Path2D.ts
@@ -206,11 +206,10 @@ export class Path2D {
     return `data:image/svg+xml;base64,${btoa(this.getSvgXml())}`
   }
 
-  drawTo(ctx: CanvasRenderingContext2D, withStyle = true): void {
-    const { fill = '#000', stroke = 'none' } = this.style
-    if (withStyle) {
-      setCanvasContext(ctx, this.style)
-    }
+  drawTo(ctx: CanvasRenderingContext2D, style: Partial<PathStyle> = {}): void {
+    style = { ...this.style, ...style }
+    const { fill = '#000', stroke = 'none' } = style
+    setCanvasContext(ctx, style)
     this.paths.forEach((path) => {
       path.drawTo(ctx)
     })