@leafer-ui/image 1.3.3 → 1.4.1

package/package.json

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

package/src/check.ts

@@ -40,7 +40,7 @@ export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, al
             if (paint.blendMode) canvas.blendMode = paint.blendMode
             if (data.opacity) canvas.opacity *= data.opacity
             if (data.transform) canvas.transform(data.transform)
-            canvas.drawImage(paint.image.view as any, 0, 0, data.width, data.height)
+            canvas.drawImage(paint.image.getFull(data.filters), 0, 0, data.width, data.height)
             canvas.restore()
             return true
         } else {

package/src/data.ts

@@ -23,7 +23,7 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
     if (paint.padding) box = tempBox.set(box).shrink(paint.padding)
     if (paint.mode === 'strench' as string) paint.mode = 'stretch' // 兼容代码，后续可移除
 
-    const { opacity, mode, align, offset, scale, size, rotation, repeat } = paint
+    const { opacity, mode, align, offset, scale, size, rotation, repeat, filters } = paint
     const sameBox = box.width === width && box.height === height
 
     const data: ILeafPaintPatternData = { mode }
@@ -86,6 +86,7 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
     data.width = width
     data.height = height
     if (opacity) data.opacity = opacity
+    if (filters) data.filters = filters
     if (repeat) data.repeat = typeof repeat === 'string' ? (repeat === 'x' ? 'repeat-x' : 'repeat-y') : 'repeat'
     return data
 }

package/src/pattern.ts

@@ -18,7 +18,7 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
         scaleY = abs(scaleY)
 
         const { image, data } = paint
-        let imageScale: number, imageMatrix: IMatrixData, { width, height, scaleX: sx, scaleY: sy, opacity, transform, repeat } = data
+        let imageScale: number, imageMatrix: IMatrixData, { width, height, scaleX: sx, scaleY: sy, transform, repeat } = data
 
         if (sx) {
             imageMatrix = get()
@@ -68,7 +68,7 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
             scale(imageMatrix, 1 / scaleX, 1 / scaleY)
         }
 
-        const canvas = image.getCanvas(ceil(width) || 1, ceil(height) || 1, opacity)
+        const canvas = image.getCanvas(ceil(width) || 1, ceil(height) || 1, data.opacity, data.filters)
         const pattern = image.getPattern(canvas, repeat || (Platform.origin.noRepeat || 'no-repeat'), imageMatrix, paint)
 
         paint.style = pattern