@leafer/canvas 1.7.0 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/canvas",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "@leafer/canvas",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,15 +22,15 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/file": "1.7.0",
-    "@leafer/list": "1.7.0",
-    "@leafer/math": "1.7.0",
-    "@leafer/data": "1.7.0",
-    "@leafer/path": "1.7.0",
-    "@leafer/debug": "1.7.0",
-    "@leafer/platform": "1.7.0"
+    "@leafer/file": "1.8.0",
+    "@leafer/list": "1.8.0",
+    "@leafer/math": "1.8.0",
+    "@leafer/data": "1.8.0",
+    "@leafer/path": "1.8.0",
+    "@leafer/debug": "1.8.0",
+    "@leafer/platform": "1.8.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.7.0"
+    "@leafer/interface": "1.8.0"
   }
 }

package/src/Canvas.ts

@@ -3,10 +3,12 @@ import { ICanvasAttr, ITextMetrics, ICanvasContext2D, IPath2D, IObject, InnerId,
 function contextAttr(realName?: string) {
     return (target: Canvas, key: string) => {
         if (!realName) realName = key
-        Object.defineProperty(target, key, {
-            get() { return (this.context as IObject)[realName] },
-            set(value: unknown) { (this.context as IObject)[realName] = value }
-        } as ThisType<Canvas>)
+        const property = {
+            get() { return ((this as unknown as Canvas).context as IObject)[realName] },
+            set(value: unknown) { ((this as unknown as Canvas).context as IObject)[realName] = value }
+        }
+        if (key === 'strokeCap') (property as any).set = function (value: unknown) { ((this as unknown as Canvas).context as IObject)[realName] = value === 'none' ? 'butt' : value }
+        Object.defineProperty(target, key, property)
     }
 }
 

package/src/LeaferCanvasBase.ts

@@ -25,8 +25,8 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     public get height(): number { return this.size.height }
 
     public get pixelRatio(): number { return this.size.pixelRatio }
-    public get pixelWidth(): number { return this.width * this.pixelRatio }
-    public get pixelHeight(): number { return this.height * this.pixelRatio }
+    public get pixelWidth(): number { return this.width * this.pixelRatio || 0 } // 防止出现 NaN
+    public get pixelHeight(): number { return this.height * this.pixelRatio || 0 }
 
     public get pixelSnap(): boolean { return this.config.pixelSnap }
     public set pixelSnap(value: boolean) { this.config.pixelSnap = value }
@@ -155,18 +155,26 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
         if (w) this.setTransform(w.a, w.b, w.c, w.d, w.e, w.f)
     }
 
-    public setStroke(color: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void {
+    public setStroke(color: string | object, strokeWidth: number, options?: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void {
         if (strokeWidth) this.strokeWidth = strokeWidth
         if (color) this.strokeStyle = color
-        if (options) this.setStrokeOptions(options)
+        if (options) this.setStrokeOptions(options, childOptions)
     }
 
-    public setStrokeOptions(options: ICanvasStrokeOptions): void {
-        this.strokeCap = options.strokeCap === 'none' ? 'butt' : options.strokeCap
-        this.strokeJoin = options.strokeJoin
-        this.dashPattern = options.dashPattern
-        this.dashOffset = options.dashOffset
-        this.miterLimit = options.miterLimit
+    public setStrokeOptions(options: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void {
+        let { strokeCap, strokeJoin, dashPattern, dashOffset, miterLimit } = options
+        if (childOptions) {
+            if (childOptions.strokeCap) strokeCap = childOptions.strokeCap
+            if (childOptions.strokeJoin) strokeJoin = childOptions.strokeJoin
+            if (childOptions.dashPattern !== undefined) dashPattern = childOptions.dashPattern
+            if (childOptions.dashOffset !== undefined) dashOffset = childOptions.dashOffset
+            if (childOptions.miterLimit) miterLimit = childOptions.miterLimit
+        }
+        this.strokeCap = strokeCap
+        this.strokeJoin = strokeJoin
+        this.dashPattern = dashPattern
+        this.dashOffset = dashOffset
+        this.miterLimit = miterLimit
     }
 
     public saveBlendMode(blendMode: IBlendMode): void {

package/types/index.d.ts

@@ -120,8 +120,8 @@ declare class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     setCursor(_cursor: ICursorType | ICursorType[]): void;
     setWorld(matrix: IMatrixWithOptionHalfData, parentMatrix?: IMatrixData): void;
     useWorldTransform(worldTransform?: IMatrixData): void;
-    setStroke(color: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void;
-    setStrokeOptions(options: ICanvasStrokeOptions): void;
+    setStroke(color: string | object, strokeWidth: number, options?: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void;
+    setStrokeOptions(options: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void;
     saveBlendMode(blendMode: IBlendMode): void;
     restoreBlendMode(): void;
     hitFill(_point: IPointData, _fillRule?: IWindingRule): boolean;