@leafer/canvas-miniapp 1.0.0-rc.9 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/canvas-miniapp",
-  "version": "1.0.0-rc.9",
+  "version": "1.0.1",
   "description": "@leafer/canvas-miniapp",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/canvas": "1.0.0-rc.9",
-    "@leafer/data": "1.0.0-rc.9",
-    "@leafer/event": "1.0.0-rc.9",
-    "@leafer/platform": "1.0.0-rc.9",
-    "@leafer/debug": "1.0.0-rc.9"
+    "@leafer/canvas": "1.0.1",
+    "@leafer/data": "1.0.1",
+    "@leafer/event": "1.0.1",
+    "@leafer/platform": "1.0.1",
+    "@leafer/debug": "1.0.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.9"
+    "@leafer/interface": "1.0.1"
   }
 }

package/src/LeaferCanvas.ts

@@ -1,4 +1,4 @@
-import { IResizeEventListener, IAutoBounds, IScreenSizeData, IFunction, IMiniappSelect, IObject } from '@leafer/interface'
+import { IResizeEventListener, IAutoBounds, IScreenSizeData, IFunction, IMiniappSelect, IObject, ICanvasContext2D } from '@leafer/interface'
 import { LeaferCanvasBase, canvasPatch, canvasSizeAttrs, Platform, DataHelper, ResizeEvent } from '@leafer/core'
 
 
@@ -10,10 +10,12 @@ export class LeaferCanvas extends LeaferCanvasBase {
     public resizeListener: IResizeEventListener
 
     public testView: any
-    public testContext: any
+    public testContext: ICanvasContext2D
 
     public init(): void {
-        let { view } = this.config
+        const { config } = this
+        let view = config.view || config.canvas
+
         if (view) {
             if (typeof view === 'string') {
                 if (view[0] !== '#') view = '#' + view
@@ -39,19 +41,22 @@ export class LeaferCanvas extends LeaferCanvasBase {
         } else {
             this.view = view.view || view
         }
-        this.__createContext()
+
+        this.view.getContext ? this.__createContext() : this.unrealCanvas()
+
         const { width, height, pixelRatio } = this.config
         const size = { width: width || view.width, height: height || view.height, pixelRatio }
         this.resize(size)
 
-        // fix roundRect
-        if (this.context.roundRect) {
-            this.roundRect = function (x: number, y: number, width: number, height: number, radius?: number | number[]): void {
-                this.context.roundRect(x, y, width, height, typeof radius === 'number' ? [radius] : radius)
+        if (this.context) {
+            // fix roundRect
+            if (this.context.roundRect) {
+                this.roundRect = function (x: number, y: number, width: number, height: number, radius?: number | number[]): void {
+                    this.context.roundRect(x, y, width, height, typeof radius === 'number' ? [radius] : radius)
+                }
             }
+            canvasPatch((this.context as IObject).__proto__)
         }
-        canvasPatch((this.context as IObject).__proto__)
-
     }
 
     protected __createView(): void {
@@ -61,8 +66,8 @@ export class LeaferCanvas extends LeaferCanvasBase {
     public updateViewSize(): void {
         const { width, height, pixelRatio } = this
 
-        this.view.width = width * pixelRatio
-        this.view.height = height * pixelRatio
+        this.view.width = Math.ceil(width * pixelRatio)
+        this.view.height = Math.ceil(height * pixelRatio)
     }
 
     public updateClientBounds(callback?: IFunction): void {
@@ -73,10 +78,12 @@ export class LeaferCanvas extends LeaferCanvasBase {
     }
 
 
-    public startAutoLayout(_autoBounds: IAutoBounds, listener: IResizeEventListener): void {
+    public startAutoLayout(autoBounds: IAutoBounds, listener: IResizeEventListener): void {
         this.resizeListener = listener
-        this.checkSize = this.checkSize.bind(this)
-        Platform.miniapp.onWindowResize(this.checkSize)
+        if (autoBounds) {
+            this.checkSize = this.checkSize.bind(this)
+            Platform.miniapp.onWindowResize(this.checkSize)
+        }
     }
 
     public checkSize(): void {
@@ -86,12 +93,7 @@ export class LeaferCanvas extends LeaferCanvasBase {
                     const { width, height } = this.clientBounds
                     const { pixelRatio } = this
                     const size = { width, height, pixelRatio }
-                    if (!this.isSameSize(size)) {
-                        const oldSize = {} as IScreenSizeData
-                        DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs)
-                        this.resize(size)
-                        if (this.width !== undefined) this.resizeListener(new ResizeEvent(size, oldSize))
-                    }
+                    if (!this.isSameSize(size)) this.emitResize(size)
                 })
             }, 500)
         }
@@ -103,4 +105,15 @@ export class LeaferCanvas extends LeaferCanvasBase {
         Platform.miniapp.offWindowResize(this.checkSize)
     }
 
+    public unrealCanvas(): void { // App needs to use
+        this.unreal = true
+    }
+
+    protected emitResize(size: IScreenSizeData): void {
+        const oldSize = {} as IScreenSizeData
+        DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs)
+        this.resize(size)
+        if (this.width !== undefined) this.resizeListener(new ResizeEvent(size, oldSize))
+    }
+
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IMiniappSelect, IResizeEventListener, IObject, IFunction, IAutoBounds } from '@leafer/interface';
+import { IMiniappSelect, IResizeEventListener, ICanvasContext2D, IObject, IFunction, IAutoBounds, IScreenSizeData } from '@leafer/interface';
 import { LeaferCanvasBase } from '@leafer/core';
 
 declare class LeaferCanvas extends LeaferCanvasBase {
@@ -6,15 +6,17 @@ declare class LeaferCanvas extends LeaferCanvasBase {
     viewSelect: IMiniappSelect;
     resizeListener: IResizeEventListener;
     testView: any;
-    testContext: any;
+    testContext: ICanvasContext2D;
     init(): void;
     protected initView(view?: IObject): void;
     protected __createView(): void;
     updateViewSize(): void;
     updateClientBounds(callback?: IFunction): void;
-    startAutoLayout(_autoBounds: IAutoBounds, listener: IResizeEventListener): void;
+    startAutoLayout(autoBounds: IAutoBounds, listener: IResizeEventListener): void;
     checkSize(): void;
     stopAutoLayout(): void;
+    unrealCanvas(): void;
+    protected emitResize(size: IScreenSizeData): void;
 }
 
 export { LeaferCanvas };