@leafer-ui/paint 1.0.0-rc.8 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/paint",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.0",
   "description": "@leafer-ui/paint",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,17 +15,18 @@
     "type": "git",
     "url": "https://github.com/leaferjs/ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/paint",
+  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/partner/paint",
   "bugs": "https://github.com/leaferjs/ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.8"
+    "@leafer/core": "1.0.0",
+    "@leafer-ui/draw": "1.0.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.8",
-    "@leafer-ui/interface": "1.0.0-rc.8"
+    "@leafer/interface": "1.0.0",
+    "@leafer-ui/interface": "1.0.0"
   }
 }

package/src/Compute.ts

@@ -1,50 +1,35 @@
-import { IUI, IPaint, ILeafPaint, IRGB, IBooleanMap, IImagePaint, IObject } from '@leafer-ui/interface'
-import { ColorConvert, ImageManager } from '@leafer-ui/core'
-
-import { image } from "./paint/image/image"
-import { linearGradient } from './paint/linear'
-import { radialGradient } from "./paint/radial"
-import { conicGradient } from "./paint/conic"
-import { recycleImage } from './paint/image'
+import { IUI, IPaint, ILeafPaint, IRGB, IBooleanMap, IObject, IPaintAttr } from '@leafer-ui/interface'
+import { ColorConvert, PaintImage, PaintGradient } from '@leafer-ui/draw'
 
 
 let recycleMap: IBooleanMap
 
-export function compute(attrName: 'fill' | 'stroke', ui: IUI): void {
-    const value: ILeafPaint[] = []
-    const data = ui.__
-
-    let item: ILeafPaint
-    let paints = data.__input[attrName] as IPaint[]
+export function compute(attrName: IPaintAttr, ui: IUI): void {
+    const data = ui.__, leafPaints: ILeafPaint[] = []
 
+    let paints: IPaint[] = data.__input[attrName], hasOpacityPixel: boolean
     if (!(paints instanceof Array)) paints = [paints]
 
-    recycleMap = recycleImage(attrName, data)
+    recycleMap = PaintImage.recycleImage(attrName, data)
 
-    for (let i = 0, len = paints.length; i < len; i++) {
+    for (let i = 0, len = paints.length, item: ILeafPaint; i < len; i++) {
         item = getLeafPaint(attrName, paints[i], ui)
-        if (item) value.push(item)
+        if (item) leafPaints.push(item)
     }
 
-    (data as IObject)['_' + attrName] = value.length ? value : undefined
+    (data as IObject)['_' + attrName] = leafPaints.length ? leafPaints : undefined
 
-    // check png / svg / webp
-
-    let isPixel
-    if (paints.length === 1) {
-        const paint = paints[0] as IImagePaint
-        if (paint.type === 'image') isPixel = ImageManager.isPixel(paint)
-    }
+    if (leafPaints.length && leafPaints[0].image) hasOpacityPixel = leafPaints[0].image.hasOpacityPixel
 
     if (attrName === 'fill') {
-        data.__pixelFill = isPixel
+        data.__pixelFill = hasOpacityPixel
     } else {
-        data.__pixelStroke = isPixel
+        data.__pixelStroke = hasOpacityPixel
     }
 }
 
 
-function getLeafPaint(attrName: string, paint: IPaint, ui: IUI,): ILeafPaint {
+function getLeafPaint(attrName: string, paint: IPaint, ui: IUI): ILeafPaint {
     if (typeof paint !== 'object' || paint.visible === false || paint.opacity === 0) return undefined
     const { boxBounds } = ui.__layout
 
@@ -53,14 +38,14 @@ function getLeafPaint(attrName: string, paint: IPaint, ui: IUI,): ILeafPaint {
             let { type, blendMode, color, opacity } = paint
             return { type, blendMode, style: ColorConvert.string(color, opacity) }
         case 'image':
-            return image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url])
+            return PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url])
         case 'linear':
-            return linearGradient(paint, boxBounds)
+            return PaintGradient.linearGradient(paint, boxBounds)
         case 'radial':
-            return radialGradient(paint, boxBounds)
+            return PaintGradient.radialGradient(paint, boxBounds)
         case 'angular':
-            return conicGradient(paint, boxBounds)
+            return PaintGradient.conicGradient(paint, boxBounds)
         default:
-            return (paint as IRGB).r ? { type: 'solid', style: ColorConvert.string(paint) } : undefined
+            return (paint as IRGB).r !== undefined ? { type: 'solid', style: ColorConvert.string(paint) } : undefined
     }
 }

package/src/Fill.ts

@@ -1,8 +1,8 @@
 import { ILeaferCanvas } from '@leafer/interface'
 
 import { ILeafPaint, IUI } from '@leafer-ui/interface'
+import { PaintImage } from "@leafer-ui/draw"
 
-import { checkImage } from './paint/image'
 import { fillText } from './FillText'
 
 
@@ -18,7 +18,7 @@ export function fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
     for (let i = 0, len = fills.length; i < len; i++) {
         item = fills[i]
 
-        if (item.image && checkImage(ui, canvas, item, !__font)) continue
+        if (item.image && PaintImage.checkImage(ui, canvas, item, !__font)) continue
 
         if (item.style) {
 

package/src/Shape.ts

@@ -8,52 +8,52 @@ const { getSpread, getOuterOf, getByMove, getIntersectData } = BoundsHelper
 
 export function shape(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape {
     const canvas = current.getSameCanvas()
+    const nowWorld = ui.__nowWorld
 
-    let bounds: IBoundsData, matrix: IMatrix, shapeBounds: IBoundsData
-    let worldCanvas: ILeaferCanvas
+    let bounds: IBoundsData, fitMatrix: IMatrix, shapeBounds: IBoundsData, worldCanvas: ILeaferCanvas
 
-    const { __world } = ui
-    let { scaleX, scaleY } = __world
+    let { scaleX, scaleY } = nowWorld
     if (scaleX < 0) scaleX = -scaleX
     if (scaleY < 0) scaleY = -scaleY
 
-    if (!current.bounds.includes(__world, options.matrix)) {
+    if (current.bounds.includes(nowWorld)) {
+
+        worldCanvas = canvas
+        bounds = shapeBounds = nowWorld
+
+    } else {
 
         const { renderShapeSpread: spread } = ui.__layout
-        const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, spread * scaleX, spread * scaleY) : current.bounds, __world, options.matrix)
-        matrix = current.bounds.getFitMatrix(worldClipBounds)
+        const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, scaleX === scaleY ? spread * scaleX : [spread * scaleY, spread * scaleX]) : current.bounds, nowWorld)
+        fitMatrix = current.bounds.getFitMatrix(worldClipBounds)
+        let { a: fitScaleX, d: fitScaleY } = fitMatrix
 
-        if (matrix.a < 1) {
+        if (fitMatrix.a < 1) {
             worldCanvas = current.getSameCanvas()
             ui.__renderShape(worldCanvas, options)
 
-            scaleX *= matrix.a
-            scaleY *= matrix.d
+            scaleX *= fitScaleX
+            scaleY *= fitScaleY
         }
 
-        shapeBounds = getOuterOf(__world, matrix)
-        bounds = getByMove(shapeBounds, -matrix.e, -matrix.f)
-
-        if (options.matrix) matrix.multiply(options.matrix)
-        options = { ...options, matrix }
-
-    } else {
+        shapeBounds = getOuterOf(nowWorld, fitMatrix)
+        bounds = getByMove(shapeBounds, -fitMatrix.e, -fitMatrix.f)
 
         if (options.matrix) {
-            scaleX *= options.matrix.a
-            scaleY *= options.matrix.d
-            bounds = shapeBounds = getOuterOf(__world, options.matrix)
-        } else {
-            bounds = shapeBounds = __world
+            const { matrix } = options
+            fitMatrix.multiply(matrix)
+            fitScaleX *= matrix.scaleX
+            fitScaleY *= matrix.scaleY
         }
 
-        worldCanvas = canvas
+        options = { ...options, matrix: fitMatrix.withScale(fitScaleX, fitScaleY) }
+
     }
 
     ui.__renderShape(canvas, options)
 
     return {
-        canvas, matrix, bounds,
+        canvas, matrix: fitMatrix, bounds,
         worldCanvas, shapeBounds, scaleX, scaleY
     }
 }

package/src/Stroke.ts

@@ -1,18 +1,18 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaferCanvas } from '@leafer/interface'
 
 import { IUI, ILeafPaint } from '@leafer-ui/interface'
 
 import { strokeText, drawStrokesStyle } from './StrokeText'
 
 
-export function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void {
+export function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void {
     const options = ui.__
-    const { strokeWidth, strokeAlign, __font } = options
-    if (!strokeWidth) return
+    const { __strokeWidth, strokeAlign, __font } = options
+    if (!__strokeWidth) return
 
     if (__font) {
 
-        strokeText(stroke, ui, canvas, renderOptions)
+        strokeText(stroke, ui, canvas)
 
     } else {
 
@@ -20,14 +20,14 @@ export function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOpt
 
             case 'center':
 
-                canvas.setStroke(stroke, strokeWidth, options)
+                canvas.setStroke(stroke, __strokeWidth, options)
                 canvas.stroke()
                 break
 
             case 'inside':
 
                 canvas.save()
-                canvas.setStroke(stroke, strokeWidth * 2, options)
+                canvas.setStroke(stroke, __strokeWidth * 2, options)
 
                 options.windingRule ? canvas.clip(options.windingRule) : canvas.clip()
                 canvas.stroke()
@@ -37,8 +37,8 @@ export function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOpt
                 break
 
             case 'outside':
-                const out = canvas.getSameCanvas(true)
-                out.setStroke(stroke, strokeWidth * 2, ui.__)
+                const out = canvas.getSameCanvas(true, true)
+                out.setStroke(stroke, __strokeWidth * 2, options)
 
                 ui.__drawRenderPath(out)
 
@@ -47,14 +47,13 @@ export function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOpt
                 options.windingRule ? out.clip(options.windingRule) : out.clip()
                 out.clearWorld(ui.__layout.renderBounds)
 
-                if (ui.__worldFlipped || renderOptions.matrix) {
-                    canvas.copyWorldByReset(out)
+                if (ui.__worldFlipped) {
+                    canvas.copyWorldByReset(out, ui.__nowWorld)
                 } else {
-                    canvas.copyWorldToInner(out, ui.__world, ui.__layout.renderBounds)
+                    canvas.copyWorldToInner(out, ui.__nowWorld, ui.__layout.renderBounds)
                 }
 
-                out.recycle()
-
+                out.recycle(ui.__nowWorld)
                 break
         }
 
@@ -62,27 +61,27 @@ export function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOpt
 }
 
 
-export function strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void {
+export function strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void {
     const options = ui.__
-    const { strokeWidth, strokeAlign, __font } = options
-    if (!strokeWidth) return
+    const { __strokeWidth, strokeAlign, __font } = options
+    if (!__strokeWidth) return
 
     if (__font) {
 
-        strokeText(strokes, ui, canvas, renderOptions)
+        strokeText(strokes, ui, canvas)
 
     } else {
 
         switch (strokeAlign) {
 
             case 'center':
-                canvas.setStroke(undefined, strokeWidth, options)
+                canvas.setStroke(undefined, __strokeWidth, options)
                 drawStrokesStyle(strokes, false, ui, canvas)
                 break
 
             case 'inside':
                 canvas.save()
-                canvas.setStroke(undefined, strokeWidth * 2, options)
+                canvas.setStroke(undefined, __strokeWidth * 2, options)
                 options.windingRule ? canvas.clip(options.windingRule) : canvas.clip()
 
                 drawStrokesStyle(strokes, false, ui, canvas)
@@ -92,23 +91,23 @@ export function strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, r
 
             case 'outside':
                 const { renderBounds } = ui.__layout
-                const out = canvas.getSameCanvas(true)
+                const out = canvas.getSameCanvas(true, true)
                 ui.__drawRenderPath(out)
 
-                out.setStroke(undefined, strokeWidth * 2, ui.__)
+                out.setStroke(undefined, __strokeWidth * 2, options)
 
                 drawStrokesStyle(strokes, false, ui, out)
 
                 options.windingRule ? out.clip(options.windingRule) : out.clip()
                 out.clearWorld(renderBounds)
 
-                if (ui.__worldFlipped || renderOptions.matrix) {
-                    canvas.copyWorldByReset(out)
+                if (ui.__worldFlipped) {
+                    canvas.copyWorldByReset(out, ui.__nowWorld)
                 } else {
-                    canvas.copyWorldToInner(out, ui.__world, renderBounds)
+                    canvas.copyWorldToInner(out, ui.__nowWorld, renderBounds)
                 }
 
-                out.recycle()
+                out.recycle(ui.__nowWorld)
                 break
         }
 

package/src/StrokeText.ts

@@ -1,12 +1,12 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaferCanvas } from '@leafer/interface'
 
 import { IUI, ITextRowData, ILeafPaint, IStrokeAlign, ILeafStrokePaint } from '@leafer-ui/interface'
+import { PaintImage } from "@leafer-ui/draw"
 
 import { fillText } from './FillText'
-import { checkImage } from './paint/image'
 
 
-export function strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions?: IRenderOptions): void {
+export function strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void {
     const { strokeAlign } = ui.__
     const isStrokes = typeof stroke !== 'string'
     switch (strokeAlign) {
@@ -15,19 +15,19 @@ export function strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaf
             isStrokes ? drawStrokesStyle(stroke as ILeafPaint[], true, ui, canvas) : drawTextStroke(ui, canvas)
             break
         case 'inside':
-            drawAlignStroke('inside', stroke, isStrokes, ui, canvas, renderOptions)
+            drawAlignStroke('inside', stroke, isStrokes, ui, canvas)
             break
         case 'outside':
-            drawAlignStroke('outside', stroke, isStrokes, ui, canvas, renderOptions)
+            drawAlignStroke('outside', stroke, isStrokes, ui, canvas)
             break
     }
 }
 
-function drawAlignStroke(align: IStrokeAlign, stroke: string | ILeafPaint[], isStrokes: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void {
-    const { strokeWidth, __font } = ui.__
+function drawAlignStroke(align: IStrokeAlign, stroke: string | ILeafPaint[], isStrokes: boolean, ui: IUI, canvas: ILeaferCanvas): void {
+    const { __strokeWidth, __font } = ui.__
 
-    const out = canvas.getSameCanvas(true)
-    out.setStroke(isStrokes ? undefined : stroke, strokeWidth * 2, ui.__)
+    const out = canvas.getSameCanvas(true, true)
+    out.setStroke(isStrokes ? undefined : stroke, __strokeWidth * 2, ui.__)
 
     out.font = __font
     isStrokes ? drawStrokesStyle(stroke as ILeafPaint[], true, ui, out) : drawTextStroke(ui, out)
@@ -36,13 +36,13 @@ function drawAlignStroke(align: IStrokeAlign, stroke: string | ILeafPaint[], isS
     fillText(ui, out)
     out.blendMode = 'normal'
 
-    if (ui.__worldFlipped || renderOptions.matrix) {
-        canvas.copyWorldByReset(out)
+    if (ui.__worldFlipped) {
+        canvas.copyWorldByReset(out, ui.__nowWorld)
     } else {
-        canvas.copyWorldToInner(out, ui.__world, ui.__layout.renderBounds)
+        canvas.copyWorldToInner(out, ui.__nowWorld, ui.__layout.renderBounds)
     }
 
-    out.recycle()
+    out.recycle(ui.__nowWorld)
 }
 
 export function drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void {
@@ -71,7 +71,7 @@ export function drawStrokesStyle(strokes: ILeafStrokePaint[], isText: boolean, u
     for (let i = 0, len = strokes.length; i < len; i++) {
         item = strokes[i]
 
-        if (item.image && checkImage(ui, canvas, item, false)) continue
+        if (item.image && PaintImage.checkImage(ui, canvas, item, false)) continue
 
         if (item.style) {
 

package/src/index.ts

@@ -1,7 +1,21 @@
-export { fill, fills } from './Fill'
-export { fillText } from './FillText'
-export { stroke, strokes } from './Stroke'
-export { strokeText, drawTextStroke } from './StrokeText'
-export { shape } from './Shape'
-export { compute } from './Compute'
-export { recycleImage } from './paint/image'
+import { IPaintModule } from '@leafer-ui/interface'
+
+import { fill, fills } from './Fill'
+import { fillText } from './FillText'
+import { stroke, strokes } from './Stroke'
+import { strokeText, drawTextStroke } from './StrokeText'
+import { shape } from './Shape'
+import { compute } from './Compute'
+
+
+export const PaintModule: IPaintModule = {
+    compute,
+    fill,
+    fills,
+    fillText,
+    stroke,
+    strokes,
+    strokeText,
+    drawTextStroke,
+    shape
+}

package/types/index.d.ts

@@ -1,21 +1,5 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap } from '@leafer/interface';
-import { IUI, ILeafPaint, ICachedShape, IUIData } from '@leafer-ui/interface';
+import { IPaintModule } from '@leafer-ui/interface';
 
-declare function fill(fill: string, ui: IUI, canvas: ILeaferCanvas): void;
-declare function fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
+declare const PaintModule: IPaintModule;
 
-declare function fillText(ui: IUI, canvas: ILeaferCanvas): void;
-
-declare function stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
-declare function strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
-
-declare function strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions?: IRenderOptions): void;
-declare function drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void;
-
-declare function shape(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape;
-
-declare function compute(attrName: 'fill' | 'stroke', ui: IUI): void;
-
-declare function recycleImage(attrName: 'fill' | 'stroke', data: IUIData): IBooleanMap;
-
-export { compute, drawTextStroke, fill, fillText, fills, recycleImage, shape, stroke, strokeText, strokes };
+export { PaintModule };

package/src/paint/conic.ts

@@ -1,48 +0,0 @@
-import { IMatrixData, IPointData, IBoundsData } from '@leafer/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, rotateOfOuter, scaleOfOuter } = MatrixHelper
-
-const defaultFrom = { x: 0.5, y: 0.5 }
-const defaultTo = { x: 0.5, y: 1 }
-
-const realFrom = {} as IPointData
-const realTo = {} as IPointData
-
-export function conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint {
-
-    let { from, to, type, opacity, blendMode, stretch } = paint
-
-    from || (from = defaultFrom)
-    to || (to = defaultTo)
-
-    const { x, y, width, height } = box
-
-    set(realFrom, x + from.x * width, y + from.y * height)
-    set(realTo, x + to.x * width, y + to.y * height)
-
-    const transform: IMatrixData = get()
-    const angle = getAngle(realFrom, realTo)
-
-    if (Platform.conicGradientRotate90) {
-        scaleOfOuter(transform, realFrom, width / height * (stretch || 1), 1)
-        rotateOfOuter(transform, realFrom, angle + 90)
-    } else {
-        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)
-
-    const data: ILeafPaint = { type, style, transform }
-    if (blendMode) data.blendMode = blendMode
-    return data
-
-}

package/src/paint/image/check.ts

@@ -1,60 +0,0 @@
-
-import { ILeaferCanvas } from '@leafer/interface'
-import { ImageManager, Platform } from '@leafer/core'
-
-import { IUI, ILeafPaint } from '@leafer-ui/interface'
-import { Export } from '@leafer-ui/external'
-
-import { createPattern } from './pattern'
-
-const { abs } = Math
-
-export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
-    const { scaleX, scaleY } = ui.__world
-
-    if (!paint.data || paint.patternId === scaleX + '-' + scaleY) {
-        return false
-    } else {
-
-        const { data } = paint
-
-        if (allowPaint) {
-            if (!data.repeat) {
-                let { width, height } = data
-                width *= abs(scaleX) * canvas.pixelRatio
-                height *= abs(scaleY) * canvas.pixelRatio
-                if (data.scaleX) {
-                    width *= data.scaleX
-                    height *= data.scaleY
-                }
-                allowPaint = width * height > Platform.image.maxCacheSize
-            } else {
-                allowPaint = false
-            }
-        }
-
-        if (allowPaint) {
-            canvas.save()
-            canvas.clip()
-            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 {
-            if (!paint.style || Export.running) {
-                createPattern(ui, paint, canvas.pixelRatio)
-            } else {
-                if (!paint.patternTask) {
-                    paint.patternTask = ImageManager.patternTasker.add(async () => {
-                        paint.patternTask = null
-                        if (canvas.bounds.hit(ui.__world)) createPattern(ui, paint, canvas.pixelRatio)
-                        ui.forceUpdate('surface')
-                    }, 300)
-                }
-            }
-            return false
-        }
-    }
-}

package/src/paint/image/data.ts

@@ -1,45 +0,0 @@
-import { IBoundsData, ILeaferImage } from '@leafer/interface'
-import { MatrixHelper } from '@leafer/core'
-
-import { IImagePaint, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
-
-import { clipMode, fillOrFitMode, repeatMode } from './mode'
-
-
-const { get, translate } = MatrixHelper
-
-export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
-    let { width, height } = image
-
-    const { opacity, mode, offset, scale, rotation, blendMode, repeat } = 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)
-            if (!repeat) data.repeat = 'repeat'
-            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
-    if (repeat) data.repeat = typeof repeat === 'string' ? (repeat === 'x' ? 'repeat-x' : 'repeat-y') : 'repeat'
-}

package/src/paint/image/image.ts

@@ -1,81 +0,0 @@
-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, firstUse: boolean): ILeafPaint {
-    const leafPaint: ILeafPaint = { type: attrValue.type }
-    const image = leafPaint.image = ImageManager.get(attrValue)
-
-    const event: IImageEvent = (firstUse || image.loading) && { target: ui, image, attrName, attrValue }
-
-    if (image.ready) {
-
-        if (hasNaturalSize(ui, attrName, image)) createData(leafPaint, image, attrValue, box)
-
-        if (firstUse) {
-            emit(ImageEvent.LOAD, event)
-            emit(ImageEvent.LOADED, event)
-        }
-
-    } else if (image.error) {
-
-        if (firstUse) {
-            ui.forceUpdate('surface')
-            event.error = image.error
-            emit(ImageEvent.ERROR, event)
-        }
-
-    } else {
-
-        if (firstUse) emit(ImageEvent.LOAD, event)
-
-        leafPaint.loadId = image.load(
-            () => {
-                if (!ui.destroyed) {
-
-                    if (hasNaturalSize(ui, attrName, image)) {
-                        createData(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')
-            if (ui.__proxyData) {
-                ui.setProxyAttr('width', ui.__.width)
-                ui.setProxyAttr('height', ui.__.height)
-            }
-            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

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

package/src/paint/image/mode.ts

@@ -1,62 +0,0 @@
-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

@@ -1,90 +0,0 @@
-import { Platform, MatrixHelper } from '@leafer/core'
-
-import { IUI, ILeafPaint, IMatrixData } from '@leafer-ui/interface'
-
-
-const { get, scale, copy } = MatrixHelper
-
-export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean {
-
-    let { scaleX, scaleY } = ui.__world
-
-    const id = scaleX + '-' + scaleY
-
-    if (paint.patternId !== id && !ui.destroyed) {
-
-        scaleX = Math.abs(scaleX) // maybe -1
-        scaleY = Math.abs(scaleY)
-
-        const { image, data } = paint
-        let imageScale: number, imageMatrix: IMatrixData, { width, height, scaleX: sx, scaleY: sy, opacity, transform, repeat } = data
-
-        if (sx) {
-            imageMatrix = get()
-            copy(imageMatrix, transform)
-            scale(imageMatrix, 1 / sx, 1 / sy)
-            scaleX *= sx
-            scaleY *= sy
-        }
-
-        scaleX *= pixelRatio
-        scaleY *= pixelRatio
-        width *= scaleX
-        height *= scaleY
-
-        const size = width * height
-
-        if (!repeat) {
-            if (size > Platform.image.maxCacheSize) return false // same as check()
-        }
-
-        let maxSize = Platform.image.maxPatternSize
-
-        if (!image.isSVG) {
-            const imageSize = image.width * image.height
-            if (maxSize > imageSize) maxSize = imageSize
-        }
-
-        if (size > maxSize) imageScale = Math.sqrt(size / maxSize)
-
-        if (imageScale) {
-            scaleX /= imageScale
-            scaleY /= imageScale
-            width /= imageScale
-            height /= imageScale
-        }
-
-        if (sx) {
-            scaleX /= sx
-            scaleY /= sy
-        }
-
-        if (transform || scaleX !== 1 || scaleY !== 1) {
-            if (!imageMatrix) {
-                imageMatrix = get()
-                if (transform) copy(imageMatrix, transform)
-            }
-            scale(imageMatrix, 1 / scaleX, 1 / scaleY)
-        }
-
-        const pattern = Platform.canvas.createPattern(image.getCanvas(width < 1 ? 1 : width, height < 1 ? 1 : height, opacity) as any, repeat || (Platform.origin.noRepeat || 'no-repeat'))
-
-        try {
-            if (paint.transform) paint.transform = null
-            if (imageMatrix) pattern.setTransform ? pattern.setTransform(imageMatrix) : paint.transform = imageMatrix
-        } catch {
-            paint.transform = imageMatrix
-        }
-
-        paint.style = pattern
-        paint.patternId = id
-
-        return true
-
-    } else {
-
-        return false
-
-    }
-
-}

package/src/paint/image/recycle.ts

@@ -1,41 +0,0 @@
-import { IBooleanMap, ILeaferImage, IObject } from '@leafer/interface'
-import { ImageManager } from '@leafer/core'
-
-import { IImagePaint, ILeafPaint, IUIData } from '@leafer-ui/interface'
-
-
-export function recycleImage(attrName: 'fill' | 'stroke', data: IUIData): IBooleanMap {
-    const paints = (data as IObject)['_' + attrName] as ILeafPaint[]
-
-    if (paints instanceof Array) {
-
-        let image: ILeaferImage, recycleMap: IBooleanMap, input: IImagePaint[], url: string
-
-        for (let i = 0, len = paints.length; i < len; i++) {
-
-            image = paints[i].image
-            url = image && image.url
-
-            if (url) {
-                if (!recycleMap) recycleMap = {}
-                recycleMap[url] = true
-                ImageManager.recycle(image)
-
-                // stop load
-                if (image.loading) {
-                    if (!input) {
-                        input = (data.__input && data.__input[attrName]) || []
-                        if (!(input instanceof Array)) input = [input]
-                    }
-                    image.unload(paints[i].loadId, !input.some((item: IImagePaint) => item.url === url))
-                }
-            }
-
-        }
-
-        return recycleMap
-
-    }
-
-    return null
-}

package/src/paint/linear.ts

@@ -1,33 +0,0 @@
-import { IObject, IBoundsData } from '@leafer/interface'
-import { Platform } from '@leafer/core'
-
-import { IGradientPaint, ILeafPaint, IColorStop } from '@leafer-ui/interface'
-import { ColorConvert } from '@leafer-ui/core'
-
-
-const defaultFrom = { x: 0.5, y: 0 }
-const defaultTo = { x: 0.5, y: 1 }
-
-export function linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint {
-
-    let { from, to, type, blendMode, opacity } = paint
-
-    from || (from = defaultFrom)
-    to || (to = defaultTo)
-
-    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)
-
-    const data: ILeafPaint = { type, style }
-    if (blendMode) data.blendMode = blendMode
-    return data
-
-}
-
-export function applyStops(gradient: IObject, stops: IColorStop[], opacity: number): void {
-    let stop: IColorStop
-    for (let i = 0, len = stops.length; i < len; i++) {
-        stop = stops[i]
-        gradient.addColorStop(stop.offset, ColorConvert.string(stop.color, opacity))
-    }
-}

package/src/paint/radial.ts

@@ -1,44 +0,0 @@
-import { IBoundsData } from '@leafer/interface'
-import { Platform, PointHelper, MatrixHelper } from '@leafer/core'
-
-import { IGradientPaint, ILeafPaint, IMatrixData, IPointData } from '@leafer-ui/interface'
-
-import { applyStops } from './linear'
-
-
-const { set, getAngle, getDistance } = PointHelper
-const { get, rotateOfOuter, scaleOfOuter } = MatrixHelper
-
-const defaultFrom = { x: 0.5, y: 0.5 }
-const defaultTo = { x: 0.5, y: 1 }
-
-const realFrom = {} as IPointData
-const realTo = {} as IPointData
-
-export function radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint {
-
-    let { from, to, type, opacity, blendMode, stretch } = paint
-
-    from || (from = defaultFrom)
-    to || (to = defaultTo)
-
-    const { x, y, width, height } = box
-    set(realFrom, x + from.x * width, y + from.y * height)
-    set(realTo, x + to.x * width, y + to.y * height)
-
-    let transform: IMatrixData
-
-    if (width !== height || stretch) {
-        transform = get()
-        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)
-
-    const data: ILeafPaint = { type, style, transform }
-    if (blendMode) data.blendMode = blendMode
-    return data
-
-}