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

package/package.json

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

package/src/Compute.ts

@@ -1,34 +1,32 @@
-import { IUI, IPaint, ILeafPaint, IRGB } from '@leafer-ui/interface'
+import { IUI, IPaint, ILeafPaint, IRGB, IBooleanMap } from '@leafer-ui/interface'
 import { ColorConvert } from '@leafer-ui/color'
 
-import { image } from "./paint/image"
+import { image } from "./paint/image/image"
 import { linearGradient } from './paint/linear'
 import { radialGradient } from "./paint/radial"
 import { conicGradient } from "./paint/conic"
 
 
-export function computeFill(ui: IUI): void {
-    compute(ui, 'fill')
-}
-
-export function computeStroke(ui: IUI): void {
-    compute(ui, 'stroke')
-}
+let recycleMap: IBooleanMap
 
-function compute(ui: IUI, attrName: string): void {
+export function compute(ui: IUI, attrName: string): void {
+    const value: ILeafPaint[] = []
+    let item: ILeafPaint
     let paints = ui.__.__input[attrName] as IPaint[]
 
-    let item: ILeafPaint
-    const value: ILeafPaint[] = []
     if (!(paints instanceof Array)) paints = [paints]
 
+    recycleMap = ui.__.__recycleImage(attrName)
+
     for (let i = 0, len = paints.length; i < len; i++) {
         item = getLeafPaint(ui, paints[i], attrName)
         if (item) value.push(item)
     }
+
     ui.__['_' + attrName] = value.length ? value : undefined
 }
 
+
 function getLeafPaint(ui: IUI, paint: IPaint, attrName: string): ILeafPaint {
     if (typeof paint !== 'object' || paint.visible === false || paint.opacity === 0) return undefined
     const { boxBounds } = ui.__layout
@@ -38,7 +36,7 @@ function getLeafPaint(ui: IUI, paint: IPaint, attrName: string): ILeafPaint {
             let { type, blendMode, color, opacity } = paint
             return { type, blendMode, style: ColorConvert.string(color, opacity) }
         case 'image':
-            return image(ui, attrName, paint, boxBounds)
+            return image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url])
         case 'linear':
             return linearGradient(paint, boxBounds)
         case 'radial':

package/src/Fill.ts

@@ -1,44 +1,53 @@
 import { ILeaferCanvas } from '@leafer/interface'
 
 import { ILeafPaint, IUI } from '@leafer-ui/interface'
-import { drawText } from './FillText'
 
+import { checkImage } from './paint/image'
+import { fillText } from './FillText'
 
-export function fill(ui: IUI, canvas: ILeaferCanvas, fill: string | object): void {
+
+export function fill(ui: IUI, canvas: ILeaferCanvas, fill: string): void {
     canvas.fillStyle = fill
-    ui.__.__font ? drawText(ui, canvas) : canvas.fill(ui.__.windingRule)
+    ui.__.__font ? fillText(ui, canvas) : (ui.__.windingRule ? canvas.fill(ui.__.windingRule) : canvas.fill())
 }
 
+
 export function fills(ui: IUI, canvas: ILeaferCanvas, fills: ILeafPaint[]): void {
     let item: ILeafPaint
     const { windingRule, __font } = ui.__
     for (let i = 0, len = fills.length; i < len; i++) {
         item = fills[i]
-        canvas.fillStyle = item.style
 
-        if (item.transform) {
-            canvas.save()
+        if (item.image && checkImage(ui, canvas, item, !__font)) continue
+
+        if (item.style) {
 
-            const { a, b, c, d, e, f } = item.transform
-            canvas.transform(a, b, c, d, e, f)
+            canvas.fillStyle = item.style
 
-            if (item.blendMode) canvas.blendMode = item.blendMode
+            if (item.transform) {
+                canvas.save()
 
-            __font ? drawText(ui, canvas) : canvas.fill(windingRule)
+                canvas.transform(item.transform)
 
-            canvas.restore()
-        } else {
-            if (item.blendMode) {
-                canvas.saveBlendMode(item.blendMode)
+                if (item.blendMode) canvas.blendMode = item.blendMode
 
-                __font ? drawText(ui, canvas) : canvas.fill(windingRule)
+                __font ? fillText(ui, canvas) : (windingRule ? canvas.fill(windingRule) : canvas.fill())
 
-                canvas.restoreBlendMode()
+                canvas.restore()
             } else {
+                if (item.blendMode) {
+                    canvas.saveBlendMode(item.blendMode)
 
-                __font ? drawText(ui, canvas) : canvas.fill(windingRule)
+                    __font ? fillText(ui, canvas) : (windingRule ? canvas.fill(windingRule) : canvas.fill())
 
+                    canvas.restoreBlendMode()
+                } else {
+
+                    __font ? fillText(ui, canvas) : (windingRule ? canvas.fill(windingRule) : canvas.fill())
+
+                }
             }
         }
+
     }
 }

package/src/FillText.ts

@@ -3,7 +3,7 @@ import { ILeaferCanvas } from '@leafer/interface'
 import { IUI, ITextRowData } from '@leafer-ui/interface'
 
 
-export function drawText(ui: IUI, canvas: ILeaferCanvas): void {
+export function fillText(ui: IUI, canvas: ILeaferCanvas): void {
 
     let row: ITextRowData
     const { rows, decorationY, decorationHeight } = ui.__.__textDrawData

package/src/Shape.ts

@@ -1,8 +1,9 @@
 import { IBoundsData, ILeaferCanvas, IRenderOptions, IMatrix } from '@leafer/interface'
-import { BoundsHelper } from '@leafer/math'
+import { BoundsHelper } from '@leafer/core'
 
 import { IUI, ICachedShape } from '@leafer-ui/interface'
 
+
 const { getSpread, getOuterOf, getByMove, getIntersectData } = BoundsHelper
 
 export function shape(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape {
@@ -16,7 +17,7 @@ export function shape(ui: IUI, current: ILeaferCanvas, options: IRenderOptions):
 
     if (!current.bounds.includes(__world, options.matrix)) {
 
-        const { shapeRenderSpread: spread } = ui.__layout
+        const { renderShapeSpread: spread } = ui.__layout
         const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, spread * scaleX) : current.bounds, __world, options.matrix)
         matrix = current.bounds.getFitMatrix(worldClipBounds)
 
@@ -36,7 +37,14 @@ export function shape(ui: IUI, current: ILeaferCanvas, options: IRenderOptions):
 
     } else {
 
-        bounds = shapeBounds = __world
+        if (options.matrix) {
+            scaleX *= options.matrix.a
+            scaleY *= options.matrix.d
+            bounds = shapeBounds = getOuterOf(__world, options.matrix)
+        } else {
+            bounds = shapeBounds = __world
+        }
+
         worldCanvas = canvas
     }
 

package/src/Stroke.ts

@@ -1,12 +1,14 @@
 import { ILeaferCanvas } from '@leafer/interface'
 
-import { IUI, ILeafStrokePaint, ILeafPaint } from '@leafer-ui/interface'
-import { strokeText, strokesText } from './StrokeText'
+import { IUI, ILeafPaint } from '@leafer-ui/interface'
 
+import { strokeText, drawStrokesStyle } from './StrokeText'
 
-export function stroke(ui: IUI, canvas: ILeaferCanvas, stroke: string | object): void {
+
+export function stroke(ui: IUI, canvas: ILeaferCanvas, stroke: string): void {
     const options = ui.__
     const { strokeWidth, strokeAlign, __font } = options
+    if (!strokeWidth) return
 
     if (__font) {
 
@@ -54,13 +56,15 @@ export function stroke(ui: IUI, canvas: ILeaferCanvas, stroke: string | object):
     }
 }
 
+
 export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void {
     const options = ui.__
     const { strokeWidth, strokeAlign, __font } = options
+    if (!strokeWidth) return
 
     if (__font) {
 
-        strokesText(ui, canvas, strokes)
+        strokeText(ui, canvas, strokes)
 
     } else {
 
@@ -68,7 +72,7 @@ export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]):
 
             case 'center':
                 canvas.setStroke(undefined, strokeWidth, options)
-                drawStrokesStyle(strokes, canvas)
+                drawStrokesStyle(ui, strokes, canvas)
                 break
 
             case 'inside':
@@ -76,7 +80,7 @@ export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]):
                 canvas.setStroke(undefined, strokeWidth * 2, options)
                 canvas.clip(options.windingRule)
 
-                drawStrokesStyle(strokes, canvas)
+                drawStrokesStyle(ui, strokes, canvas)
 
                 canvas.restore()
                 break
@@ -88,7 +92,7 @@ export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]):
 
                 out.setStroke(undefined, strokeWidth * 2, ui.__)
 
-                drawStrokesStyle(strokes, out)
+                drawStrokesStyle(ui, strokes, out)
 
                 out.clip(options.windingRule)
                 out.clearWorld(renderBounds)
@@ -101,18 +105,3 @@ export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]):
     }
 
 }
-
-function drawStrokesStyle(strokes: ILeafStrokePaint[], canvas: ILeaferCanvas): void {
-    strokes.forEach((item: ILeafStrokePaint) => {
-        canvas.strokeStyle = item.style
-
-        if (item.blendMode) {
-            canvas.saveBlendMode(item.blendMode)
-            canvas.stroke()
-            canvas.restoreBlendMode()
-        } else {
-            canvas.stroke()
-        }
-
-    })
-}

package/src/StrokeText.ts

@@ -1,92 +1,45 @@
 import { ILeaferCanvas } from '@leafer/interface'
 
-import { IUI, ITextRowData, ILeafStrokePaint, ILeafPaint, IStrokeAlign } from '@leafer-ui/interface'
-import { drawText } from './FillText'
+import { IUI, ITextRowData, ILeafPaint, IStrokeAlign, ILeafStrokePaint } from '@leafer-ui/interface'
 
+import { fillText } from './FillText'
+import { checkImage } from './paint/image'
 
-export function strokeText(ui: IUI, canvas: ILeaferCanvas, stroke: string | object): void {
-    const { strokeAlign } = ui.__
-    switch (strokeAlign) {
-        case 'center':
-            canvas.setStroke(stroke, ui.__.strokeWidth, ui.__)
-            drawTextStroke(ui, canvas)
-            break
-        case 'inside':
-            drawAlignStroke(ui, canvas, stroke, 'inside')
-            break
-        case 'outside':
-            drawAlignStroke(ui, canvas, stroke, 'outside')
-            break
-    }
-}
-
-function drawAlignStroke(ui: IUI, canvas: ILeaferCanvas, stroke: string | object, align: IStrokeAlign): void {
-    const { strokeWidth, __font } = ui.__
-
-    const out = canvas.getSameCanvas(true)
-    out.setStroke(stroke, strokeWidth * 2, ui.__)
-
-    out.font = __font
-    drawTextStroke(ui, out)
-
-    out.blendMode = align === 'outside' ? 'destination-out' : 'destination-in'
-    drawText(ui, out)
-    out.blendMode = 'normal'
 
-    canvas.copyWorldToInner(out, ui.__world, ui.__layout.renderBounds)
-    out.recycle()
-}
-
-export function strokesText(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void {
+export function strokeText(ui: IUI, canvas: ILeaferCanvas, stroke: string | ILeafPaint[]): void {
     const { strokeAlign } = ui.__
+    const isStrokes = typeof stroke !== 'string'
     switch (strokeAlign) {
         case 'center':
-            canvas.setStroke(undefined, ui.__.strokeWidth, ui.__)
-            drawStrokesStyle(ui, strokes, canvas)
+            canvas.setStroke(isStrokes ? undefined : stroke, ui.__.strokeWidth, ui.__)
+            isStrokes ? drawStrokesStyle(ui, stroke as ILeafPaint[], canvas, true) : drawTextStroke(ui, canvas)
             break
         case 'inside':
-            drawAlignStroke(ui, canvas, strokes, 'inside')
+            drawAlignStroke(ui, canvas, stroke, 'inside', isStrokes)
             break
         case 'outside':
-            drawAlignStrokes(ui, canvas, strokes, 'outside')
+            drawAlignStroke(ui, canvas, stroke, 'outside', isStrokes)
             break
     }
 }
 
-
-function drawAlignStrokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[], align: IStrokeAlign): void {
+function drawAlignStroke(ui: IUI, canvas: ILeaferCanvas, stroke: string | ILeafPaint[], align: IStrokeAlign, isStrokes?: boolean): void {
     const { strokeWidth, __font } = ui.__
 
     const out = canvas.getSameCanvas(true)
-    out.setStroke(undefined, strokeWidth * 2, ui.__)
+    out.setStroke(isStrokes ? undefined : stroke, strokeWidth * 2, ui.__)
 
     out.font = __font
-    drawStrokesStyle(ui, strokes, out)
+    isStrokes ? drawStrokesStyle(ui, stroke as ILeafPaint[], out, true) : drawTextStroke(ui, out)
 
-    out.blendMode = align === 'outside' ? 'destination - out' : 'destination -in '
-    drawText(ui, out)
+    out.blendMode = align === 'outside' ? 'destination-out' : 'destination-in'
+    fillText(ui, out)
     out.blendMode = 'normal'
 
     canvas.copyWorldToInner(out, ui.__world, ui.__layout.renderBounds)
     out.recycle()
 }
 
-
-function drawStrokesStyle(ui: IUI, strokes: ILeafStrokePaint[], canvas: ILeaferCanvas): void {
-    strokes.forEach((item: ILeafStrokePaint) => {
-        canvas.strokeStyle = item.style
-
-        if (item.blendMode) {
-            canvas.saveBlendMode(item.blendMode)
-            drawTextStroke(ui, canvas)
-            canvas.restoreBlendMode()
-        } else {
-            drawTextStroke(ui, canvas)
-        }
-
-    })
-}
-
 export function drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void {
 
     let row: ITextRowData
@@ -107,3 +60,25 @@ export function drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void {
     }
 
 }
+
+export function drawStrokesStyle(ui: IUI, strokes: ILeafStrokePaint[], canvas: ILeaferCanvas, isText?: boolean): void {
+    let item: ILeafStrokePaint
+    for (let i = 0, len = strokes.length; i < len; i++) {
+        item = strokes[i]
+
+        if (item.image && checkImage(ui, canvas, item, false)) continue
+
+        if (item.style) {
+
+            canvas.strokeStyle = item.style
+
+            if (item.blendMode) {
+                canvas.saveBlendMode(item.blendMode)
+                isText ? drawTextStroke(ui, canvas) : canvas.stroke()
+                canvas.restoreBlendMode()
+            } else {
+                isText ? drawTextStroke(ui, canvas) : canvas.stroke()
+            }
+        }
+    }
+}

package/src/index.ts

@@ -1,6 +1,6 @@
 export { fill, fills } from './Fill'
-export { drawText } from './FillText'
+export { fillText } from './FillText'
 export { stroke, strokes } from './Stroke'
-export { strokeText, strokesText, drawTextStroke } from './StrokeText'
+export { strokeText, drawTextStroke } from './StrokeText'
 export { shape } from './Shape'
-export { computeFill, computeStroke } from './Compute'
+export { compute } from './Compute'

package/src/paint/conic.ts

@@ -1,11 +1,13 @@
 import { IMatrixData, IPointData, IBoundsData } from '@leafer/interface'
-import { IGradientPaint, ILeafPaint } from '@leafer-ui/interface'
 import { Platform, PointHelper, MatrixHelper } from '@leafer/core'
+
+import { IGradientPaint, ILeafPaint } from '@leafer-ui/interface'
+
 import { applyStops } from './linear'
 
 
 const { set, getAngle, getDistance } = PointHelper
-const { get, rotateOf, scaleOf } = MatrixHelper
+const { get, rotateOfOuter, scaleOfOuter } = MatrixHelper
 
 const defaultFrom = { x: 0.5, y: 0.5 }
 const defaultTo = { x: 0.5, y: 1 }
@@ -29,21 +31,18 @@ export function conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPai
     const angle = getAngle(realFrom, realTo)
 
     if (Platform.conicGradientRotate90) {
-        scaleOf(transform, realFrom, width / height * (stretch || 1), 1)
-        rotateOf(transform, realFrom, angle + 90)
+        scaleOfOuter(transform, realFrom, width / height * (stretch || 1), 1)
+        rotateOfOuter(transform, realFrom, angle + 90)
     } else {
-        scaleOf(transform, realFrom, 1, width / height * (stretch || 1))
-        rotateOf(transform, realFrom, angle)
+        scaleOfOuter(transform, realFrom, 1, width / height * (stretch || 1))
+        rotateOfOuter(transform, realFrom, angle)
     }
 
     const style = Platform.conicGradientSupport ? Platform.canvas.createConicGradient(0, realFrom.x, realFrom.y) : Platform.canvas.createRadialGradient(realFrom.x, realFrom.y, 0, realFrom.x, realFrom.y, getDistance(realFrom, realTo))
     applyStops(style, paint.stops, opacity)
 
-    return {
-        type,
-        blendMode,
-        style,
-        transform
-    }
+    const data: ILeafPaint = { type, style, transform }
+    if (blendMode) data.blendMode = blendMode
+    return data
 
 }

package/src/paint/image/check.ts

@@ -0,0 +1,47 @@
+
+import { ILeaferCanvas } from '@leafer/interface'
+import { ImageManager } from '@leafer/core'
+
+import { IUI, ILeafPaint } from '@leafer-ui/interface'
+
+import { createPattern } from './pattern'
+
+
+export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
+    let { width, height } = ui.__world
+
+    if (!paint.data || paint.patternId === width + height) {
+        return false
+    } else {
+
+        if (allowPaint) {
+            if (paint.image.isSVG && paint.data.mode !== 'repeat') {
+                width *= canvas.pixelRatio
+                height *= canvas.pixelRatio
+                allowPaint = width > 4096 || height > 4096
+            } else {
+                allowPaint = false
+            }
+        }
+
+        if (allowPaint) {
+            canvas.save()
+            canvas.clip()
+            const { data } = paint
+            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.restore()
+            return true
+        } else {
+            ImageManager.patternTasker.addParallel(() => {
+                if (canvas.bounds.hit(ui.__world)) {
+                    createPattern(ui, paint, canvas.pixelRatio)
+                    ui.forceUpdate('surface')
+                }
+            }, null, true)
+            return false
+        }
+    }
+}

package/src/paint/image/data.ts

@@ -0,0 +1,47 @@
+import { IBoundsData, ILeaferImage } from '@leafer/interface'
+import { MatrixHelper } from '@leafer/core'
+
+import { IUI, IImagePaint, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
+
+import { clipMode, fillOrFitMode, repeatMode } from './mode'
+import { createPattern } from './pattern'
+
+
+const { get, translate } = MatrixHelper
+
+export function createData(ui: IUI, leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
+    let { width, height } = image
+
+    const { opacity, mode, offset, scale, rotation, blendMode } = paint
+    const sameBox = box.width === width && box.height === height
+    if (blendMode) leafPaint.blendMode = blendMode
+
+    const data: ILeafPaintPatternData = leafPaint.data = { mode }
+
+    switch (mode) {
+        case 'strench':
+            if (!sameBox) width = box.width, height = box.height
+            if (box.x || box.y) {
+                data.transform = get()
+                translate(data.transform, box.x, box.y)
+            }
+            break
+        case 'clip':
+            if (offset || scale || rotation) clipMode(data, box, offset, scale, rotation)
+            break
+        case 'repeat':
+            if (!sameBox || scale || rotation) repeatMode(data, box, width, height, scale as number, rotation)
+            break
+        case 'fit':
+        case 'cover':
+        default:
+            if (!sameBox || rotation) fillOrFitMode(data, mode, box, width, height, rotation)
+    }
+
+    data.width = width
+    data.height = height
+    if (opacity) data.opacity = opacity
+
+    const canvas = ui.leafer && ui.leafer.canvas
+    if (canvas && canvas.bounds.hit(ui.__world)) createPattern(ui, leafPaint, canvas.pixelRatio)
+}

package/src/paint/image/image.ts

@@ -0,0 +1,77 @@
+import { IBoundsData, IImageEvent, ISizeData } from '@leafer/interface'
+import { ImageEvent, ImageManager } from '@leafer/core'
+
+import { IUI, IImagePaint, ILeafPaint } from '@leafer-ui/interface'
+
+import { createData } from './data'
+
+
+export function image(ui: IUI, attrName: string, attrValue: IImagePaint, box: IBoundsData, first: boolean): ILeafPaint {
+    const leafPaint: ILeafPaint = { type: attrValue.type }
+    const image = leafPaint.image = ImageManager.get(attrValue)
+
+    if (image.ready && hasNaturalSize(ui, attrName, image)) createData(ui, leafPaint, image, attrValue, box)
+
+    if (first) {
+
+        const event: IImageEvent = { target: ui, image, attrName, attrValue }
+
+        if (image.ready) {
+
+            emit(ImageEvent.LOAD, event)
+            emit(ImageEvent.LOADED, event)
+
+        } else if (image.error) {
+
+            ui.forceUpdate('surface')
+            event.error = image.error
+            emit(ImageEvent.ERROR, event)
+
+        } else {
+
+            emit(ImageEvent.LOAD, event)
+
+            leafPaint.loadId = image.load(
+                () => {
+                    if (ui.__) {
+
+                        if (hasNaturalSize(ui, attrName, image)) {
+                            createData(ui, leafPaint, image, attrValue, box)
+                            ui.forceUpdate('surface')
+                        }
+
+                        emit(ImageEvent.LOADED, event)
+                    }
+                },
+                (error) => {
+                    ui.forceUpdate('surface')
+                    event.error = error
+                    emit(ImageEvent.ERROR, event)
+                }
+            )
+
+        }
+
+    }
+
+    return leafPaint
+}
+
+
+function hasNaturalSize(ui: IUI, attrName: string, image: ISizeData): boolean {
+    if (attrName === 'fill' && !ui.__.__naturalWidth) {
+        const { __: d } = ui
+        d.__naturalWidth = image.width
+        d.__naturalHeight = image.height
+        if (!d.__getInput('width') || !d.__getInput('height')) {
+            ui.forceUpdate('width')
+            return false
+        }
+    }
+    return true
+}
+
+function emit(type: string, data: IImageEvent): void {
+    if (data.target.hasEvent(type)) data.target.emitEvent(new ImageEvent(type, data))
+}
+

package/src/paint/image/index.ts

@@ -0,0 +1,2 @@
+export { image } from './image'
+export { checkImage } from './check'

package/src/paint/image/mode.ts

@@ -0,0 +1,62 @@
+import { IBoundsData } from '@leafer/interface'
+import { MatrixHelper } from '@leafer/core'
+
+import { IMatrixData, IImagePaintMode, IPointData, ILeafPaintPatternData } from '@leafer-ui/interface'
+
+
+const { get, rotateOfOuter, translate, scaleOfOuter, scale: scaleHelper, rotate } = MatrixHelper
+
+export function fillOrFitMode(data: ILeafPaintPatternData, mode: IImagePaintMode, box: IBoundsData, width: number, height: number, rotation: number): void {
+    const transform: IMatrixData = get()
+    const swap = rotation && rotation !== 180
+    const sw = box.width / (swap ? height : width)
+    const sh = box.height / (swap ? width : height)
+    const scale = mode === 'fit' ? Math.min(sw, sh) : Math.max(sw, sh)
+    const x = box.x + (box.width - width * scale) / 2
+    const y = box.y + (box.height - height * scale) / 2
+    translate(transform, x, y)
+    scaleHelper(transform, scale)
+    if (rotation) rotateOfOuter(transform, { x: box.x + box.width / 2, y: box.y + box.height / 2 }, rotation)
+    data.scaleX = data.scaleY = scale
+    data.transform = transform
+}
+
+
+export function clipMode(data: ILeafPaintPatternData, box: IBoundsData, offset: IPointData, scale: number | IPointData, rotation: number): void {
+    const transform: IMatrixData = get()
+    translate(transform, box.x, box.y)
+    if (offset) translate(transform, offset.x, offset.y)
+    if (scale) {
+        typeof scale === 'number' ? scaleHelper(transform, scale) : scaleHelper(transform, scale.x, scale.y)
+        data.scaleX = transform.a
+        data.scaleY = transform.d
+    }
+    if (rotation) rotate(transform, rotation)
+    data.transform = transform
+}
+
+
+export function repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, scale: number, rotation: number): void {
+    const transform = get()
+
+    if (rotation) {
+        rotate(transform, rotation)
+        switch (rotation) {
+            case 90:
+                translate(transform, height, 0)
+                break
+            case 180:
+                translate(transform, width, height)
+                break
+            case 270:
+                translate(transform, 0, width)
+                break
+        }
+    }
+    translate(transform, box.x, box.y)
+    if (scale) {
+        scaleOfOuter(transform, box, scale)
+        data.scaleX = data.scaleY = scale
+    }
+    data.transform = transform
+}

package/src/paint/image/pattern.ts

@@ -0,0 +1,68 @@
+import { Platform, MatrixHelper } from '@leafer/core'
+
+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
+
+    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
+
+        if (scaleX) {
+            matrix = get()
+            copy(matrix, transform)
+            scaleHelper(matrix, 1 / scaleX, 1 / scaleY)
+            a *= scaleX
+            d *= scaleY
+        }
+
+        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)
+
+        if (width > maxWidth || height > maxHeight) {
+            scale = Math.max(width / maxWidth, height / maxHeight)
+
+            a /= scale
+            d /= scale
+            width /= scale
+            height /= scale
+        }
+
+        if (scaleX) {
+            a /= scaleX
+            d /= scaleY
+        }
+
+        if (transform || a !== 1 || d !== 1) {
+            if (!matrix) {
+                matrix = get()
+                if (transform) copy(matrix, transform)
+            }
+            scaleHelper(matrix, 1 / a, 1 / d)
+        }
+
+        const style = Platform.canvas.createPattern(paint.image.getCanvas(width, height, opacity) as any, mode === 'repeat' ? 'repeat' : (Platform.origin.noRepeat || 'no-repeat'))
+
+        paint.transform = null
+
+        try {
+            if (matrix) style.setTransform ? style.setTransform(matrix) : paint.transform = matrix
+        } catch (e) {
+            paint.transform = matrix
+        }
+
+        paint.style = style
+    }
+}

package/src/paint/linear.ts

@@ -18,11 +18,9 @@ export function linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPa
     const style = Platform.canvas.createLinearGradient(box.x + from.x * box.width, box.y + from.y * box.height, box.x + to.x * box.width, box.y + to.y * box.height)
     applyStops(style, paint.stops, opacity)
 
-    return {
-        type,
-        blendMode,
-        style
-    }
+    const data: ILeafPaint = { type, style }
+    if (blendMode) data.blendMode = blendMode
+    return data
 
 }
 

package/src/paint/radial.ts

@@ -7,7 +7,7 @@ import { applyStops } from './linear'
 
 
 const { set, getAngle, getDistance } = PointHelper
-const { get, rotateOf, scaleOf } = MatrixHelper
+const { get, rotateOfOuter, scaleOfOuter } = MatrixHelper
 
 const defaultFrom = { x: 0.5, y: 0.5 }
 const defaultTo = { x: 0.5, y: 1 }
@@ -30,18 +30,15 @@ export function radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPa
 
     if (width !== height || stretch) {
         transform = get()
-        scaleOf(transform, realFrom, width / height * (stretch || 1), 1)
-        rotateOf(transform, realFrom, getAngle(realFrom, realTo) + 90)
+        scaleOfOuter(transform, realFrom, width / height * (stretch || 1), 1)
+        rotateOfOuter(transform, realFrom, getAngle(realFrom, realTo) + 90)
     }
 
     const style = Platform.canvas.createRadialGradient(realFrom.x, realFrom.y, 0, realFrom.x, realFrom.y, getDistance(realFrom, realTo))
     applyStops(style, paint.stops, opacity)
 
-    return {
-        type,
-        blendMode,
-        style,
-        transform
-    }
+    const data: ILeafPaint = { type, style, transform }
+    if (blendMode) data.blendMode = blendMode
+    return data
 
 }

package/src/paint/image.ts

@@ -1,116 +0,0 @@
-import { IBoundsData } from '@leafer/interface'
-import { IUI, IImagePaint, ILeafPaint, IMatrixData, IImagePaintMode, IPointData } from '@leafer-ui/interface'
-import { Platform, MatrixHelper, ImageEvent } from '@leafer/core'
-
-
-const { get, rotateOf, translate, scaleOf, 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 image = ui.leafer.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)
-        }
-
-        leaferPaint.style = createPattern(image.getCanvas(width, height, opacity), transform, mode === 'repeat')
-
-    } else {
-
-        image.load(() => {
-            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))
-        }, (error) => {
-            ui.emitEvent(new ImageEvent(ImageEvent.ERROR, ui, image, attrName, paint, error))
-        })
-
-    }
-
-    return leaferPaint
-}
-
-function getFillOrFitTransform(mode: IImagePaintMode, box: IBoundsData, width: number, height: number, rotation: number): IMatrixData {
-    const transform: IMatrixData = get()
-    const swap = rotation && rotation !== 180
-    const sw = box.width / (swap ? height : width)
-    const sh = box.height / (swap ? width : height)
-    const scale = mode === 'fit' ? Math.min(sw, sh) : Math.max(sw, sh)
-    const x = box.x + (box.width - width * scale) / 2
-    const y = box.y + (box.height - height * scale) / 2
-    translate(transform, x, y)
-    scaleHelper(transform, scale)
-    if (rotation) rotateOf(transform, { x: box.x + box.width / 2, y: box.y + box.height / 2 }, rotation)
-    return transform
-}
-
-function getClipTransform(box: IBoundsData, offset: IPointData, scale: number | IPointData, rotation: number): IMatrixData {
-    const transform: IMatrixData = get()
-    translate(transform, box.x, box.y)
-    if (offset) translate(transform, offset.x, offset.y)
-    if (scale) typeof scale === 'number' ? scaleHelper(transform, scale) : scaleHelper(transform, scale.x, scale.y)
-    if (rotation) rotate(transform, rotation)
-    return transform
-}
-
-function getRepeatTransform(box: IBoundsData, width: number, height: number, scale: number, rotation: number): IMatrixData {
-    const transform = get()
-
-    if (rotation) {
-        rotate(transform, rotation)
-        switch (rotation) {
-            case 90:
-                translate(transform, height, 0)
-                break
-            case 180:
-                translate(transform, width, height)
-                break
-            case 270:
-                translate(transform, 0, width)
-                break
-        }
-    }
-    translate(transform, box.x, box.y)
-    if (scale) scaleOf(transform, box, scale)
-    return transform
-}
-
-
-function createPattern(canvas: any, transform?: IMatrixData, repeat?: boolean,): CanvasPattern {
-    let style = Platform.canvas.createPattern(canvas, repeat ? 'repeat' : 'no-repeat')
-    if (transform) {
-        const { a, b, c, d, e, f } = transform
-        style.setTransform(new DOMMatrix([a, b, c, d, e, f]))
-    }
-    return style
-}