@leafer-ui/paint 1.0.0-beta.6 → 1.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/paint",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "@leafer-ui/paint",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,11 +19,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-beta.6",
-    "@leafer-ui/color": "1.0.0-beta.6"
+    "@leafer/core": "1.0.0-beta.7",
+    "@leafer-ui/color": "1.0.0-beta.7"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.6",
-    "@leafer-ui/interface": "1.0.0-beta.6"
+    "@leafer/interface": "1.0.0-beta.7",
+    "@leafer-ui/interface": "1.0.0-beta.7"
   }
 }

package/src/paint/image.ts

@@ -1,4 +1,4 @@
-import { IBoundsData } from '@leafer/interface'
+import { IBoundsData, ISizeData } from '@leafer/interface'
 import { Platform, MatrixHelper, ImageEvent } from '@leafer/core'
 
 import { IUI, IImagePaint, ILeafPaint, IMatrixData, IImagePaintMode, IPointData } from '@leafer-ui/interface'
@@ -7,53 +7,54 @@ import { IUI, IImagePaint, ILeafPaint, IMatrixData, IImagePaintMode, IPointData
 const { get, rotateOfOuter, translate, scaleOfOuter, scale: scaleHelper, rotate } = MatrixHelper
 
 export function image(ui: IUI, attrName: string, paint: IImagePaint, box: IBoundsData): ILeafPaint {
-    let { type, blendMode } = paint
-    let leaferPaint: ILeafPaint = {
-        type,
-        blendMode,
-        style: 'rgba(255,255,255,0)'
-    }
+    const { type, blendMode } = paint
+    let leaferPaint: ILeafPaint = { type, style: 'rgba(255,255,255,0)' }
+    if (blendMode) leaferPaint.blendMode = blendMode
 
     const { imageManager } = ui.leafer
     const image = imageManager.get(paint)
 
     if (image.ready) {
 
-        let transform: IMatrixData
-        let { opacity, mode, offset, scale, rotation } = paint
-        let { width, height } = image
-        const sameBox = box.width === width && box.height === height
-
-        switch (mode) {
-            case 'strench':
-                if (!sameBox) width = box.width, height = box.height
-                if (box.x || box.y) {
-                    transform = get()
-                    translate(transform, box.x, box.y)
-                }
-                break
-            case 'clip':
-                if (offset || scale || rotation) transform = getClipTransform(box, offset, scale, rotation)
-                break
-            case 'repeat':
-                if (!sameBox || scale || rotation) transform = getRepeatTransform(box, width, height, scale as number, rotation)
-                break
-            case 'fit':
-            case 'cover':
-            default:
-                if (!sameBox || rotation) transform = getFillOrFitTransform(mode, box, width, height, rotation)
-        }
+        if (!autoSize(ui, image)) {
+
+            let transform: IMatrixData
+            let { opacity, mode, offset, scale, rotation } = paint
+            let { width, height } = image
+            const sameBox = box.width === width && box.height === height
+
+            switch (mode) {
+                case 'strench':
+                    if (!sameBox) width = box.width, height = box.height
+                    if (box.x || box.y) {
+                        transform = get()
+                        translate(transform, box.x, box.y)
+                    }
+                    break
+                case 'clip':
+                    if (offset || scale || rotation) transform = getClipTransform(box, offset, scale, rotation)
+                    break
+                case 'repeat':
+                    if (!sameBox || scale || rotation) transform = getRepeatTransform(box, width, height, scale as number, rotation)
+                    break
+                case 'fit':
+                case 'cover':
+                default:
+                    if (!sameBox || rotation) transform = getFillOrFitTransform(mode, box, width, height, rotation)
+            }
 
-        leaferPaint.style = createPattern(image.getCanvas(width, height, opacity), transform, mode === 'repeat')
+            leaferPaint.style = createPattern(image.getCanvas(width, height, opacity), transform, mode === 'repeat')
+
+        }
 
     } else {
 
         imageManager.load(image,
             () => {
-                if (!ui.__.__getInput('width')) ui.width = image.width
-                if (!ui.__.__getInput('height')) ui.height = image.height
-                ui.forceUpdate('width')
-                ui.emitEvent(new ImageEvent(ImageEvent.LOADED, ui, image, attrName, paint))
+                if (ui.leafer) {
+                    if (!autoSize(ui, image)) ui.forceUpdate('width')
+                    ui.emitEvent(new ImageEvent(ImageEvent.LOADED, ui, image, attrName, paint))
+                }
             },
             (error) => {
                 ui.emitEvent(new ImageEvent(ImageEvent.ERROR, ui, image, attrName, paint, error))
@@ -65,6 +66,22 @@ export function image(ui: IUI, attrName: string, paint: IImagePaint, box: IBound
     return leaferPaint
 }
 
+function autoSize(ui: IUI, image: ISizeData): boolean {
+    let auto: boolean
+    const { __: data } = ui
+    if (data) {
+        if (!data.__getInput('width')) {
+            auto = true
+            ui.width = image.width
+        }
+        if (!data.__getInput('height')) {
+            auto = true
+            ui.height = image.height
+        }
+    }
+    return auto
+}
+
 function getFillOrFitTransform(mode: IImagePaintMode, box: IBoundsData, width: number, height: number, rotation: number): IMatrixData {
     const transform: IMatrixData = get()
     const swap = rotation && rotation !== 180