@leafer-ui/image 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/image",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "@leafer-ui/image",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0",
-    "@leafer-ui/draw": "1.0.0"
+    "@leafer/core": "1.0.2",
+    "@leafer-ui/draw": "1.0.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0",
-    "@leafer-ui/interface": "1.0.0"
+    "@leafer/interface": "1.0.2",
+    "@leafer-ui/interface": "1.0.2"
   }
 }

package/src/check.ts

@@ -12,7 +12,7 @@ const { abs } = Math
 export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
     const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld
 
-    if (!paint.data || paint.patternId === scaleX + '-' + scaleY) {
+    if (!paint.data || (paint.patternId === scaleX + '-' + scaleY && !Export.running)) {
         return false
     } else {
 
@@ -43,7 +43,7 @@ export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, al
             canvas.restore()
             return true
         } else {
-            if (!paint.style || Export.running) {
+            if (!paint.style || paint.sync || Export.running) {
                 createPattern(ui, paint, canvas.pixelRatio)
             } else {
                 if (!paint.patternTask) {

package/src/data.ts

@@ -1,5 +1,5 @@
-import { IBoundsData, ILeaferImage, IPointData } from '@leafer/interface'
-import { MatrixHelper, Bounds, AlignHelper } from '@leafer/core'
+import { IBoundsData, ILeaferImage, IPointData, IScaleData } from '@leafer/interface'
+import { MatrixHelper, MathHelper, Bounds, AlignHelper } from '@leafer/core'
 
 import { IImagePaint, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
 
@@ -9,10 +9,12 @@ import { clipMode, fillOrFitMode, repeatMode } from './mode'
 const { get, translate } = MatrixHelper
 const tempBox = new Bounds()
 const tempPoint = {} as IPointData
+const tempScaleData = {} as IScaleData
 
 export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
-    const { blendMode } = paint
+    const { blendMode, sync } = paint
     if (blendMode) leafPaint.blendMode = blendMode
+    if (sync) leafPaint.sync = sync
     leafPaint.data = getPatternData(paint, box, image)
 }
 
@@ -35,12 +37,10 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
             scaleX = scaleY = mode === 'fit' ? Math.min(sw, sh) : Math.max(sw, sh)
             x += (box.width - width * scaleX) / 2, y += (box.height - height * scaleY) / 2
         }
-    } else if (size) {
-        scaleX = (typeof size === 'number' ? size : size.width) / width
-        scaleY = (typeof size === 'number' ? size : size.height) / height
-    } else if (scale) {
-        scaleX = typeof scale === 'number' ? scale : scale.x
-        scaleY = typeof scale === 'number' ? scale : scale.y
+    } else if (scale || size) {
+        MathHelper.getScaleData(scale, size, image, tempScaleData)
+        scaleX = tempScaleData.scaleX
+        scaleY = tempScaleData.scaleY
     }
 
     if (align) {