@leafer-ui/paint 1.0.0-beta.12 → 1.0.0-beta.16

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer-ui/paint",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.16",
   "description": "@leafer-ui/paint",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -19,11 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-beta.12",
-    "@leafer-ui/color": "1.0.0-beta.12"
+    "@leafer/core": "1.0.0-beta.16"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.12",
-    "@leafer-ui/interface": "1.0.0-beta.12"
+    "@leafer/interface": "1.0.0-beta.16",
+    "@leafer-ui/interface": "1.0.0-beta.16"
   }
 }

package/src/Compute.ts

@@ -1,5 +1,5 @@
 import { IUI, IPaint, ILeafPaint, IRGB, IBooleanMap } from '@leafer-ui/interface'
-import { ColorConvert } from '@leafer-ui/color'
+import { ColorConvert } from '@leafer-ui/core'
 
 import { image } from "./paint/image/image"
 import { linearGradient } from './paint/linear'

package/src/Shape.ts

@@ -13,12 +13,14 @@ export function shape(ui: IUI, current: ILeaferCanvas, options: IRenderOptions):
     let worldCanvas: ILeaferCanvas
 
     const { __world } = ui
-    let { a: scaleX, d: scaleY } = __world
+    let { scaleX, scaleY } = __world
+    if (scaleX < 0) scaleX = -scaleX
+    if (scaleY < 0) scaleY = -scaleY
 
     if (!current.bounds.includes(__world, options.matrix)) {
 
         const { renderShapeSpread: spread } = ui.__layout
-        const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, spread * scaleX) : current.bounds, __world, options.matrix)
+        const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, spread * scaleX, spread * scaleY) : current.bounds, __world, options.matrix)
         matrix = current.bounds.getFitMatrix(worldClipBounds)
 
         if (matrix.a < 1) {

package/src/Stroke.ts

@@ -29,7 +29,7 @@ export function stroke(ui: IUI, canvas: ILeaferCanvas, stroke: string): void {
                 canvas.save()
                 canvas.setStroke(stroke, strokeWidth * 2, options)
 
-                canvas.clip(options.windingRule)
+                options.windingRule ? canvas.clip(options.windingRule) : canvas.clip()
                 canvas.stroke()
 
                 canvas.restore()
@@ -44,7 +44,7 @@ export function stroke(ui: IUI, canvas: ILeaferCanvas, stroke: string): void {
 
                 out.stroke()
 
-                out.clip(options.windingRule)
+                options.windingRule ? out.clip(options.windingRule) : out.clip()
                 out.clearWorld(ui.__layout.renderBounds)
 
                 canvas.copyWorldToInner(out, ui.__world, ui.__layout.renderBounds)
@@ -78,7 +78,7 @@ export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]):
             case 'inside':
                 canvas.save()
                 canvas.setStroke(undefined, strokeWidth * 2, options)
-                canvas.clip(options.windingRule)
+                options.windingRule ? canvas.clip(options.windingRule) : canvas.clip()
 
                 drawStrokesStyle(ui, strokes, canvas)
 
@@ -94,7 +94,7 @@ export function strokes(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]):
 
                 drawStrokesStyle(ui, strokes, out)
 
-                out.clip(options.windingRule)
+                options.windingRule ? out.clip(options.windingRule) : out.clip()
                 out.clearWorld(renderBounds)
 
                 canvas.copyWorldToInner(out, ui.__world, renderBounds)

package/src/paint/image/check.ts

@@ -10,7 +10,7 @@ import { createPattern } from './pattern'
 export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean {
     const { scaleX, scaleY } = ui.__world
 
-    if (!paint.data || paint.patternId === scaleX + scaleY) {
+    if (!paint.data || paint.patternId === scaleX + '-' + scaleY) {
         return false
     } else {
 

package/src/paint/image/pattern.ts

@@ -9,12 +9,15 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
 
     let { scaleX, scaleY } = ui.__world
 
-    const id = scaleX + scaleY
+    const id = scaleX + '-' + scaleY
 
     if (paint.patternId !== id && !ui.destroyed) {
 
         paint.patternId = id
 
+        scaleX = Math.abs(scaleX) // maybe -1
+        scaleY = Math.abs(scaleY)
+
         const { image, data } = paint
         const maxWidth = image.isSVG ? 4096 : Math.min(image.width, 4096)
         const maxHeight = image.isSVG ? 4096 : Math.min(image.height, 4096)
@@ -35,8 +38,6 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
 
         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)
         }
 
         if (scale) {
@@ -59,12 +60,12 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
             scaleHelper(matrix, 1 / scaleX, 1 / scaleY)
         }
 
-        const style = Platform.canvas.createPattern(image.getCanvas(width, height, opacity) as any, mode === 'repeat' ? 'repeat' : (Platform.origin.noRepeat || 'no-repeat'))
+        const style = Platform.canvas.createPattern(image.getCanvas(width < 1 ? 1 : width, height < 1 ? 1 : height, opacity) as any, mode === 'repeat' ? 'repeat' : (Platform.origin.noRepeat || 'no-repeat'))
 
         try {
             if (paint.transform) paint.transform = null
             if (matrix) style.setTransform ? style.setTransform(matrix) : paint.transform = matrix
-        } catch (e) {
+        } catch {
             paint.transform = matrix
         }
 

package/src/paint/linear.ts

@@ -2,7 +2,7 @@ import { IObject, IBoundsData } from '@leafer/interface'
 import { Platform } from '@leafer/core'
 
 import { IGradientPaint, ILeafPaint, IColorStop } from '@leafer-ui/interface'
-import { ColorConvert } from '@leafer-ui/color'
+import { ColorConvert } from '@leafer-ui/core'
 
 
 const defaultFrom = { x: 0.5, y: 0 }

package/types/index.d.ts

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