@leafer-ui/image 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

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

package/src/check.ts

@@ -10,7 +10,7 @@ import { createPattern } from './pattern'
 const { abs } = Math
 
 export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
-    const { scaleX, scaleY } = ui.__nowWorld
+    const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld
 
     if (!paint.data || paint.patternId === scaleX + '-' + scaleY) {
         return false

package/src/data.ts

@@ -1,5 +1,5 @@
 import { IBoundsData, ILeaferImage } from '@leafer/interface'
-import { MatrixHelper } from '@leafer/core'
+import { MatrixHelper, Bounds } from '@leafer/core'
 
 import { IImagePaint, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
 
@@ -7,9 +7,11 @@ import { clipMode, fillOrFitMode, repeatMode } from './mode'
 
 
 const { get, translate } = MatrixHelper
+const tempBox = new Bounds()
 
 export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
     let { width, height } = image
+    if (paint.padding) box = tempBox.set(box).shrink(paint.padding)
 
     const { opacity, mode, offset, scale, size, rotation, blendMode, repeat } = paint
     const sameBox = box.width === width && box.height === height

package/src/image.ts

@@ -24,7 +24,7 @@ export function image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds:
     } else {
         leafPaint = { type: paint.type, image }
 
-        cache = image.use > 1 ? { leafPaint, paint, boxBounds: box.set(boxBounds) } : null
+        cache = image.use > 1 ? { leafPaint, paint, boxBounds: box.set(boxBounds) } : null // 只保留最后一个cache
     }
 
     if (firstUse || image.loading) event = { image, attrName, attrValue: paint }
@@ -52,7 +52,10 @@ export function image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds:
             () => {
                 ignoreRender(ui, false)
                 if (!ui.destroyed) {
-                    if (checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds)) ui.forceUpdate('surface')
+                    if (checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds)) {
+                        if (image.hasOpacityPixel) ui.__layout.hitCanvasChanged = true
+                        ui.forceUpdate('surface')
+                    }
                     onLoadSuccess(ui, event)
                 }
                 leafPaint.loadId = null

package/src/pattern.ts

@@ -1,4 +1,4 @@
-import { Platform, MatrixHelper } from '@leafer/core'
+import { Platform, MatrixHelper, ImageManager } from '@leafer/core'
 
 import { IUI, ILeafPaint, IMatrixData } from '@leafer-ui/interface'
 
@@ -8,7 +8,7 @@ const { ceil, abs } = Math
 
 export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean {
 
-    let { scaleX, scaleY } = ui.__nowWorld
+    let { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld
 
     const id = scaleX + '-' + scaleY