@leafer-ui/image 2.1.5 → 2.1.7

package/package.json

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

package/src/data.ts

@@ -66,8 +66,8 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
             }
             break
         case 'repeat':
-        case 'brush':
             if (!sameBox || scaleX || rotation || skew) PaintImage.repeatMode(data, box, width, height, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, align, paint.freeTransform)
+        case 'brush':
             if (!repeat) data.repeat = 'repeat'
             const count = isObject(repeat)
             if (gap || count) data.gap = getGapData(gap, count && repeat, tempImage.width, tempImage.height, box)
@@ -78,7 +78,7 @@ export function getPatternData(paint: IImagePaint, box: IBoundsData, image: ILea
             if (scaleX) PaintImage.fillOrFitMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation)
     }
 
-    if (!data.transform) {
+    if (!data.transform && mode !== 'brush') {
         if (box.x || box.y) translate(data.transform = get(), box.x, box.y)
     }
 

package/src/image.ts

@@ -94,7 +94,8 @@ function checkSizeAndCreateData(ui: IUI, attrName: IPaintAttr, paint: IImagePain
         data.__naturalHeight = image.height / data.pixelRatio
         if (data.__autoSide) {
             ui.forceUpdate('width')
-            LeafHelper.updateBounds(ui) // 立即更新 boxBounds
+            LeafHelper.updateBounds(ui) // 立即更新 boxBounds，避免图片闪动
+            ui.__layout.boundsChanged = true // fix(flow): 仍需要标记，以通知父级更新 bounds
             if (ui.__proxyData) {
                 ui.setProxyAttr('width', data.width)
                 ui.setProxyAttr('height', data.height)
@@ -103,7 +104,7 @@ function checkSizeAndCreateData(ui: IUI, attrName: IPaintAttr, paint: IImagePain
         }
     }
 
-    if (paint.mode === 'brush') PaintImage.brush(leafPaint, ui, attrName)
+    if (paint.mode === 'brush') PaintImage.brush(ui, attrName, leafPaint)
 
     if (!leafPaint.data) {
         PaintImage.createData(leafPaint, image, paint, boxBounds)

package/src/pattern.ts

@@ -26,9 +26,10 @@ 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, brush, 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
+            const { image, brush, data } = paint, { transform, gap } = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY)
+            let imageMatrix: IMatrixData, xGap: number, yGap: number, { width, height } = image, { opacity } = paint.originPaint as IImagePaint
 
+            if (brush || opacity === 1) opacity = undefined
             if (fixScale) scaleX *= fixScale, scaleY *= fixScale
 
             width *= scaleX