@leafer-ui/paint 1.0.0-beta.10 → 1.0.0-beta.11

package/package.json

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

package/src/paint/image/check.ts

@@ -8,16 +8,17 @@ import { createPattern } from './pattern'
 
 
 export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
-    let { width, height } = ui.__world
+    const { scaleX, scaleY } = ui.__world
 
-    if (!paint.data || paint.patternId === width + height) {
+    if (!paint.data || paint.patternId === scaleX + scaleY) {
         return false
     } else {
 
         if (allowPaint) {
             if (paint.image.isSVG && paint.data.mode !== 'repeat') {
-                width *= canvas.pixelRatio
-                height *= canvas.pixelRatio
+                let { width, height } = paint.data
+                width *= scaleX * canvas.pixelRatio
+                height *= scaleY * canvas.pixelRatio
                 allowPaint = width > 4096 || height > 4096
             } else {
                 allowPaint = false
@@ -35,12 +36,13 @@ export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, al
             canvas.restore()
             return true
         } else {
-            ImageManager.patternTasker.addParallel(() => {
-                if (canvas.bounds.hit(ui.__world)) {
-                    createPattern(ui, paint, canvas.pixelRatio)
-                    ui.forceUpdate('surface')
-                }
-            }, null, true)
+            if (!paint.style) {
+                createPattern(ui, paint, canvas.pixelRatio)
+            } else {
+                ImageManager.patternTasker.add(async () => {
+                    if (canvas.bounds.hit(ui.__world) && createPattern(ui, paint, canvas.pixelRatio)) ui.forceUpdate('surface')
+                }, 300)
+            }
             return false
         }
     }

package/src/paint/image/pattern.ts

@@ -5,64 +5,77 @@ import { IUI, ILeafPaint, IMatrixData } from '@leafer-ui/interface'
 
 const { get, scale: scaleHelper, copy } = MatrixHelper
 
-export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): void {
-    const id = ui.__world.width + ui.__world.height
+export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean {
+
+    let { scaleX, scaleY } = ui.__world
+
+    const id = scaleX + scaleY
 
     if (paint.patternId !== id) {
 
         paint.patternId = id
 
-        let scale: number, matrix: IMatrixData, { a, d } = ui.__world, { width, height, scaleX, scaleY, opacity, transform, mode } = paint.data
+        const { image, data } = paint
+        const maxWidth = image.isSVG ? 4096 : Math.min(image.width, 4096)
+        const maxHeight = image.isSVG ? 4096 : Math.min(image.height, 4096)
+        let scale: number, matrix: IMatrixData, { width, height, scaleX: sx, scaleY: sy, opacity, transform, mode } = data
 
-        if (scaleX) {
+        if (sx) {
             matrix = get()
             copy(matrix, transform)
-            scaleHelper(matrix, 1 / scaleX, 1 / scaleY)
-            a *= scaleX
-            d *= scaleY
+            scaleHelper(matrix, 1 / sx, 1 / sy)
+            scaleX *= sx
+            scaleY *= sy
         }
 
-        a *= pixelRatio
-        d *= pixelRatio
-        width *= a
-        height *= d
-
-        const { image } = paint
-        const maxWidth = image.isSVG ? 4096 : Math.min(image.width, 4096)
-        const maxHeight = image.isSVG ? 4096 : Math.min(image.height, 4096)
+        scaleX *= pixelRatio
+        scaleY *= pixelRatio
+        width *= scaleX
+        height *= scaleY
 
         if (width > maxWidth || height > maxHeight) {
             scale = Math.max(width / maxWidth, height / maxHeight)
+        } else if (width < 32 || height < 32) {
+            scale = Math.min(width / 32, height / 32)
+        }
 
-            a /= scale
-            d /= scale
+        if (scale) {
+            scaleX /= scale
+            scaleY /= scale
             width /= scale
             height /= scale
         }
 
-        if (scaleX) {
-            a /= scaleX
-            d /= scaleY
+        if (sx) {
+            scaleX /= sx
+            scaleY /= sy
         }
 
-        if (transform || a !== 1 || d !== 1) {
+        if (transform || scaleX !== 1 || scaleY !== 1) {
             if (!matrix) {
                 matrix = get()
                 if (transform) copy(matrix, transform)
             }
-            scaleHelper(matrix, 1 / a, 1 / d)
+            scaleHelper(matrix, 1 / scaleX, 1 / scaleY)
         }
 
-        const style = Platform.canvas.createPattern(paint.image.getCanvas(width, height, opacity) as any, mode === 'repeat' ? 'repeat' : (Platform.origin.noRepeat || 'no-repeat'))
-
-        paint.transform = null
+        const style = Platform.canvas.createPattern(image.getCanvas(width, height, opacity) as any, mode === 'repeat' ? 'repeat' : (Platform.origin.noRepeat || 'no-repeat'))
 
         try {
+            paint.transform = null
             if (matrix) style.setTransform ? style.setTransform(matrix) : paint.transform = matrix
         } catch (e) {
             paint.transform = matrix
         }
 
         paint.style = style
+
+        return true
+
+    } else {
+
+        return false
+
     }
+
 }