@leafer-ui/image 1.9.7 → 1.9.8

package/package.json

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

package/src/check.ts

@@ -18,17 +18,15 @@ export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, al
         if (allowDraw) {
             if (data.repeat) {
                 allowDraw = false
-            } else {
-                if (!(paint.changeful || (Platform.name === 'miniapp' && ResizeEvent.isResizing(ui)) || Export.running)) { //  小程序resize过程中直接绘制原图（绕过垃圾回收bug)
-                    let { width, height } = data
-                    width *= scaleX * pixelRatio
-                    height *= scaleY * pixelRatio
-                    if (data.scaleX) {
-                        width *= data.scaleX
-                        height *= data.scaleY
-                    }
-                    allowDraw = (width * height > Platform.image.maxCacheSize)
+            } else if (!(paint.changeful || (Platform.name === 'miniapp' && ResizeEvent.isResizing(ui)) || Export.running)) { //  小程序resize过程中直接绘制原图（绕过垃圾回收bug)
+                let { width, height } = data
+                width *= scaleX * pixelRatio
+                height *= scaleY * pixelRatio
+                if (data.scaleX) {
+                    width *= data.scaleX
+                    height *= data.scaleY
                 }
+                allowDraw = (width * height > Platform.image.maxCacheSize)
             }
         }
 

package/src/data.ts

@@ -60,7 +60,12 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
             break
         case 'normal':
         case 'clip':
-            if (tempImage.x || tempImage.y || scaleX || clipSize || rotation || skew) clipMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, paint.clipSize)
+            if (tempImage.x || tempImage.y || scaleX || clipSize || rotation || skew) {
+                let clipScaleX: number, clipScaleY: number
+                if (clipSize) clipScaleX = box.width / clipSize.width, clipScaleY = box.height / clipSize.height
+                clipMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, clipScaleX, clipScaleY)
+                if (clipScaleX) scaleX = scaleX ? scaleX * clipScaleX : scaleX, scaleY = scaleY ? scaleY * clipScaleY : clipScaleY
+            }
             break
         case 'repeat':
             if (!sameBox || scaleX || rotation || skew) repeatMode(data, box, width, height, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, align, paint.freeTransform)

package/src/mode.ts

@@ -1,4 +1,4 @@
-import { IBoundsData, IPointData, IMatrixData, IAlign, ISizeData } from '@leafer/interface'
+import { IBoundsData, IPointData, IMatrixData, IAlign } from '@leafer/interface'
 import { getMatrixData, MatrixHelper } from '@leafer/core'
 
 import { ILeafPaintPatternData } from '@leafer-ui/interface'
@@ -15,11 +15,11 @@ export function fillOrFitMode(data: ILeafPaintPatternData, box: IBoundsData, x:
     data.transform = transform
 }
 
-export function clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipSize?: ISizeData): void {
+export function clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipScaleX?: number, clipScaleY?: number): void {
     const transform: IMatrixData = get()
     layout(transform, box, x, y, scaleX, scaleY, rotation, skew)
-    if (clipSize) {
-        tempMatrix.a = box.width / clipSize.width, tempMatrix.d = box.height / clipSize.height
+    if (clipScaleX) {
+        tempMatrix.a = clipScaleX, tempMatrix.d = clipScaleY
         multiplyParent(transform, tempMatrix)
     }
     data.transform = transform