@leafer/canvas-web 1.0.0-alpha.6 → 1.0.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/canvas-web",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.9",
   "description": "@leafer/canvas-web",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,11 +19,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-alpha.6",
-    "@leafer/event": "1.0.0-alpha.6",
-    "@leafer/debug": "1.0.0-alpha.6"
+    "@leafer/math": "1.0.0-alpha.9",
+    "@leafer/event": "1.0.0-alpha.9",
+    "@leafer/debug": "1.0.0-alpha.9"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-alpha.6"
+    "@leafer/interface": "1.0.0-alpha.9"
   }
 }

package/src/CanvasBase.ts

@@ -1,4 +1,4 @@
-import { ICanvasAttr, ICanvasFillRule, ITextMetrics, ICanvasRenderingContext2D, IPath2D, IObject, InnerId, IMatrixData, IFunction } from '@leafer/interface'
+import { ICanvasAttr, ITextMetrics, ICanvasContext2D, IPath2D, IObject, InnerId, IMatrixData, IFunction, IWindingRule } from '@leafer/interface'
 
 
 function contextAttr(realName?: string) {
@@ -29,7 +29,7 @@ export class CanvasBase {
 
     public __: ICanvasAttr
 
-    public context: ICanvasRenderingContext2D
+    public context: ICanvasContext2D
 
     // canvas attr
 
@@ -157,13 +157,13 @@ export class CanvasBase {
     public rotate(_angle: number): void { }
 
     @contextMethod()
-    public fill(_path2d?: IPath2D | ICanvasFillRule, _rule?: ICanvasFillRule): void { }
+    public fill(_path2d?: IPath2D | IWindingRule, _rule?: IWindingRule): void { }
 
     @contextMethod()
     public stroke(_path2d?: IPath2D): void { }
 
     @contextMethod()
-    public clip(_path2d?: IPath2D | ICanvasFillRule, _rule?: ICanvasFillRule): void { }
+    public clip(_path2d?: IPath2D | IWindingRule, _rule?: IWindingRule): void { }
 
     @contextMethod()
     public fillRect(_x: number, _y: number, _width: number, _height: number): void { }

package/src/LeaferCanvas.ts

@@ -1,4 +1,4 @@
-import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ICanvasFillRule, ICanvasRenderingContext2D, ILeaferCanvasConfig, IMatrixData, IBoundsData, IAutoBounds, ISizeData, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager } from '@leafer/interface'
+import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ICanvasContext2D, ILeaferCanvasConfig, IMatrixData, IBoundsData, IAutoBounds, ISizeData, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager, IWindingRule } from '@leafer/interface'
 import { Bounds, BoundsHelper, IncrementId } from '@leafer/math'
 import { ResizeEvent } from '@leafer/event'
 import { Debug } from '@leafer/debug'
@@ -72,7 +72,7 @@ export class LeaferCanvas extends CanvasBase implements ILeaferCanvas {
         this.pixelRatio = config.pixelRatio
 
         if (!config.webgl) {
-            this.context = this.view.getContext('2d') as ICanvasRenderingContext2D
+            this.context = this.view.getContext('2d') as ICanvasContext2D
             this.smooth = true
             if (config.fill) this.view.style.backgroundColor = config.fill
             if (config.width && config.height) this.resize(config as IScreenSizeData)
@@ -215,7 +215,7 @@ export class LeaferCanvas extends CanvasBase implements ILeaferCanvas {
     }
 
 
-    public hitPath(point: IPointData, fillRule?: ICanvasFillRule): boolean {
+    public hitPath(point: IPointData, fillRule?: IWindingRule): boolean {
         return this.context.isPointInPath(point.x, point.y, fillRule)
     }