@leafer/canvas 1.8.0 → 1.9.1

package/package.json

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

package/src/Canvas.ts

@@ -1,4 +1,6 @@
 import { ICanvasAttr, ITextMetrics, ICanvasContext2D, IPath2D, IObject, InnerId, IMatrixData, IFunction, IWindingRule, IBlendMode } from '@leafer/interface'
+import { isObject } from '@leafer/data'
+
 
 function contextAttr(realName?: string) {
     return (target: Canvas, key: string) => {
@@ -155,7 +157,7 @@ export class Canvas implements ICanvasAttr {
     public restore(): void { }
 
     public transform(a: number | IMatrixData, b?: number, c?: number, d?: number, e?: number, f?: number): void {
-        if (typeof a === 'object') {
+        if (isObject(a)) {
             this.context.transform(a.a, a.b, a.c, a.d, a.e, a.f)
         } else {
             this.context.transform(a, b, c, d, e, f)

package/src/LeaferCanvasBase.ts

@@ -1,7 +1,7 @@
 import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ILeaferCanvasConfig, IWindingRuleData, IExportOptions, IMatrixData, IBoundsData, IAutoBounds, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager, IWindingRule, IBlendMode, IExportImageType, IExportFileType, IBlob, ICursorType, ILeaferCanvasView, IRadiusPointData, IObject, IMatrixWithOptionHalfData } from '@leafer/interface'
 import { Bounds, tempBounds, BoundsHelper, MatrixHelper, IncrementId } from '@leafer/math'
 import { Creator, Platform } from '@leafer/platform'
-import { DataHelper } from '@leafer/data'
+import { DataHelper, isUndefined } from '@leafer/data'
 
 import { Canvas } from './Canvas'
 
@@ -61,7 +61,7 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
         const { width, height, pixelRatio } = config
         this.autoLayout = !width || !height
 
-        this.size.pixelRatio = pixelRatio | Platform.devicePixelRatio
+        this.size.pixelRatio = pixelRatio || Platform.devicePixelRatio
         this.config = config
 
         this.init()
@@ -166,8 +166,8 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
         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 (!isUndefined(childOptions.dashPattern)) dashPattern = childOptions.dashPattern
+            if (!isUndefined(childOptions.dashOffset)) dashOffset = childOptions.dashOffset
             if (childOptions.miterLimit) miterLimit = childOptions.miterLimit
         }
         this.strokeCap = strokeCap