@leafer/canvas 1.0.0-beta.7 → 1.0.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/canvas",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.9",
   "description": "@leafer/canvas",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,13 +19,15 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/file": "1.0.0-beta.7",
-    "@leafer/list": "1.0.0-beta.7",
-    "@leafer/math": "1.0.0-beta.7",
-    "@leafer/data": "1.0.0-beta.7",
-    "@leafer/platform": "1.0.0-beta.7"
+    "@leafer/file": "1.0.0-beta.9",
+    "@leafer/list": "1.0.0-beta.9",
+    "@leafer/math": "1.0.0-beta.9",
+    "@leafer/data": "1.0.0-beta.9",
+    "@leafer/path": "1.0.0-beta.9",
+    "@leafer/debug": "1.0.0-beta.9",
+    "@leafer/platform": "1.0.0-beta.9"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.7"
+    "@leafer/interface": "1.0.0-beta.9"
   }
 }

package/src/Canvas.ts

@@ -136,6 +136,7 @@ export class Canvas implements ICanvasAttr {
             method = (this.context as IObject)[name]
             if (method) (this as IObject)[name] = method.bind(this.context)
         })
+        this.textBaseline = "alphabetic"
     }
 
     // canvas method

package/src/CanvasManager.ts

@@ -49,7 +49,7 @@ export class CanvasManager implements ICanvasManager {
         this.list.length = 0
     }
 
-    public destory(): void {
+    public destroy(): void {
         this.clear()
     }
 

package/src/LeaferCanvasBase.ts

@@ -29,13 +29,14 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     public get allowBackgroundColor(): boolean { return this.view && this.parentView && !this.offscreen }
 
     public bounds: IBounds
+    public clientBounds: IBoundsData
 
     public config: ILeaferCanvasConfig
 
     public autoLayout: boolean
 
-    public view: unknown
-    public parentView: unknown
+    public view: any
+    public parentView: any
 
     public unreal?: boolean
 
@@ -63,12 +64,14 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
         this.config = config
 
         this.init()
-
-        this.textBaseline = "alphabetic"
     }
 
     public init(): void { }
 
+    protected __createContext(): void {
+        this.context = this.view.getContext('2d')
+        this.__bindContext()
+    }
 
     public toBlob(type?: IExportFileType, quality?: number): Promise<IBlob> {
         return new Promise((resolve) => {
@@ -131,6 +134,8 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
             this.smooth = this.config.smooth
         }
 
+        this.updateClientBounds()
+
         if (this.context && !this.unreal && takeCanvas) {
             this.clearWorld(takeCanvas.bounds)
             this.copyWorld(takeCanvas)
@@ -139,6 +144,8 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     }
 
     public updateViewSize(): void { }
+    public updateClientBounds(): void { }
+
     public startAutoLayout(_autoBounds: IAutoBounds, _listener: IResizeEventListener): void { }
     public stopAutoLayout(): void { }
 
@@ -205,7 +212,7 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     }
 
     public hitFill(point: IPointData, fillRule?: IWindingRule): boolean {
-        return this.context.isPointInPath(point.x, point.y, fillRule)
+        return fillRule ? this.context.isPointInPath(point.x, point.y, fillRule) : this.context.isPointInPath(point.x, point.y)
     }
 
     public hitStroke(point: IPointData, strokeWidth?: number): boolean {

package/src/index.ts

@@ -1,4 +1,4 @@
 export { CanvasManager } from './CanvasManager'
 export { HitCanvasManager } from './HitCanvasManager'
 export { LeaferCanvasBase, canvasSizeAttrs } from './LeaferCanvasBase'
-
+export { canvasPatch } from './patch'

package/src/patch/index.ts

@@ -0,0 +1,7 @@
+import { IPathDrawer } from '@leafer/interface'
+
+import { roundRect } from './roundRect'
+
+export function canvasPatch(drawer: IPathDrawer): void {
+    roundRect(drawer)
+}

package/src/patch/roundRect.ts

@@ -0,0 +1,18 @@
+import { IPathDrawer } from '@leafer/interface'
+import { RectHelper } from '@leafer/path'
+
+
+const { drawRoundRect } = RectHelper
+
+export function roundRect(drawer: IPathDrawer): void {
+
+    if (drawer && !drawer.roundRect) {
+
+        drawer.roundRect = function (x: number, y: number, width: number, height: number, cornerRadius: number | number[]): void {
+
+            drawRoundRect(this as IPathDrawer, x, y, width, height, cornerRadius)
+        }
+    }
+
+}
+