@leafer-ui/image 2.0.2 → 2.0.4

package/package.json

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

package/src/check.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IRenderOptions, IScaleData } from '@leafer/interface'
-import { Platform, ResizeEvent } from '@leafer/core'
+import { Platform } from '@leafer/core'
 
 import { IUI, ILeafPaint, IImagePaint } from '@leafer-ui/interface'
 import { PaintImage } from "@leafer-ui/draw"
@@ -16,7 +16,7 @@ export function checkImage(paint: ILeafPaint, drawImage: boolean, ui: IUI, canva
         if (drawImage) {
             if (data.repeat) {
                 drawImage = false
-            } else if (!((originPaint as IImagePaint).changeful || paint.film || (Platform.name === 'miniapp' && ResizeEvent.isResizing(ui)) || exporting)) { //  小程序resize过程中直接绘制原图（绕过垃圾回收bug)
+            } else if (!((originPaint as IImagePaint).changeful || paint.film || Platform.name === 'miniapp' || exporting)) { //  小程序直接绘制原图（绕过垃圾回收bug)
                 drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096 // 非image类型的尽量绘制原图，大长图单边超过8096生成pattern会有问题
             }
         }

package/src/image.ts

@@ -108,6 +108,9 @@ function checkSizeAndCreateData(ui: IUI, attrName: string, paint: IImagePaint, i
         const clip = (transform && !transform.onlyScale) || data.path || data.cornerRadius
         if (clip || (opacity && opacity < 1) || blendMode) leafPaint.complex = clip ? 2 : true
     }
+
+    if (paint.filter) PaintImage.applyFilter(leafPaint, image, paint.filter, ui)
+
     return true
 }
 

package/src/pattern.ts

@@ -26,7 +26,7 @@ export function createPattern(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas,
     if (paint.patternId !== id && !ui.destroyed) {
         if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
 
-            const { image, data } = paint, { opacity, filters } = paint.originPaint as IImagePaint, { transform, gap } = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY)
+            const { image, data } = paint, { opacity } = paint.originPaint as IImagePaint, { transform, gap } = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY)
             let imageMatrix: IMatrixData, xGap: number, yGap: number, { width, height } = image
 
             if (fixScale) scaleX *= fixScale, scaleY *= fixScale
@@ -49,7 +49,7 @@ export function createPattern(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas,
                 scale(imageMatrix, 1 / scaleX, 1 / scaleY)
             }
 
-            const imageCanvas = image.getCanvas(width, height, opacity, filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace)
+            const imageCanvas = image.getCanvas(width, height, opacity, undefined, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace)
             const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || 'no-repeat'), imageMatrix, paint)
 
             paint.style = pattern

package/src/recycle.ts

@@ -1,7 +1,8 @@
 import { IBooleanMap, ILeaferImage, IObject } from '@leafer/interface'
 import { ImageManager, isArray } from '@leafer/core'
 
-import { IImagePaint, ILeafPaint, IPaintAttr, IUIData } from '@leafer-ui/interface'
+import { IImagePaint, ILeafPaint, IPaintAttr, IUI, IUIData } from '@leafer-ui/interface'
+import { PaintImage } from "@leafer-ui/draw"
 
 
 export function recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap {
@@ -21,6 +22,7 @@ export function recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap {
                 if (!recycleMap) recycleMap = {}
                 recycleMap[url] = true
                 ImageManager.recyclePaint(paint)
+                if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, data.__leaf as IUI)
 
                 // stop load
                 if (image.loading) {