@leafer-ui/render 1.0.0-alpha.10 → 1.0.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/render",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.23",
   "description": "@leafer-ui/render",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,10 +19,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/external": "1.0.0-alpha.10"
+    "@leafer-ui/external": "1.0.0-alpha.23"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-alpha.10",
-    "@leafer-ui/interface": "1.0.0-alpha.10"
+    "@leafer/interface": "1.0.0-alpha.23",
+    "@leafer-ui/interface": "1.0.0-alpha.23"
   }
 }

package/src/ImageRender.ts

@@ -1,7 +1,12 @@
+import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+
 import { IImageRenderModule } from '@leafer-ui/interface'
 
 
 export const ImageRender: IImageRenderModule = {
 
+    __draw(_canvas: ILeaferCanvas, _options: IRenderOptions): void {
+        
+    }
 
 }

package/src/RectRender.ts

@@ -8,6 +8,7 @@ export const RectRender: IRectRenderModule = {
     __drawFast(canvas: ILeaferCanvas, _options: IRenderOptions): void {
 
         const { width, height, fill, stroke } = this.__
+        canvas.smooth = false
 
         if (fill) {
             canvas.fillStyle = fill

package/src/TextRender.ts

@@ -1,25 +1,41 @@
 import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
 
-import { IUIRenderModule } from '@leafer-ui/interface'
+import { ITextRenderModule, ITextRowData } from '@leafer-ui/interface'
 
 
-export const TextRender: IUIRenderModule = {
+export const TextRender: ITextRenderModule = {
 
     __drawFast(canvas: ILeaferCanvas, _options: IRenderOptions): void {
 
-        const { fill, stroke, content, __font } = this.__
+        const { fill, stroke } = this.__
+        const { list, font, decorationY, decorationHeight } = this.__.__textDrawData
+
+        canvas.font = font
+        canvas.textBaseline = "alphabetic"
+
+        let item: ITextRowData
 
-        canvas.font = __font
 
         if (fill) {
             canvas.fillStyle = fill
-            canvas.fillText(content, 0, 0)
+            for (let i = 0, len = list.length; i < len; i++) {
+                item = list[i]
+                canvas.fillText(item.text, item.x, item.y)
+
+                if (decorationY) canvas.fillRect(item.x, item.y + decorationY, item.width, decorationHeight)
+            }
         }
 
         if (stroke) {
             canvas.strokeStyle = stroke
-            canvas.strokeText(content, 0, 0)
+            for (let i = 0, len = list.length; i < len; i++) {
+                item = list[i]
+                canvas.strokeText(item.text, item.x, item.y)
+
+                if (decorationY) canvas.strokeRect(item.x, item.y + decorationY, item.width, decorationHeight)
+            }
         }
+
     }
 
 }

package/src/UIRender.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
 
 import { IUIRenderModule, ILeafPaint, ILeafStrokePaint } from '@leafer-ui/interface'
-import { Paint } from '@leafer-ui/external'
+import { Paint, Effect } from '@leafer-ui/external'
 
 
 export const UIRender: IUIRenderModule = {
@@ -11,9 +11,9 @@ export const UIRender: IUIRenderModule = {
         let complex = data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect
 
         if (complex) {
-            this.__complex = true
+            data.__complex = true
         } else {
-            this.__complex && (this.__complex = false)
+            data.__complex && (data.__complex = false)
         }
     },
 
@@ -27,20 +27,61 @@ export const UIRender: IUIRenderModule = {
     },
 
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void {
-        if (this.__complex) {
+        if (this.__.__complex) {
 
             const { fill, stroke } = this.__
 
             this.__drawRenderPath(canvas)
 
-            if (fill) this.__.__isFills ? Paint.fills(this, canvas, fill as ILeafPaint[]) : Paint.fill(this, canvas, fill)
-            if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
+            if (this.__.__useEffect) {
+
+                const shape = Paint.shape(this, canvas, options)
+
+                const { shadow, innerShadow } = this.__
+
+                if (shadow) Effect.shadow(this, canvas, shape)
+
+                if (fill) this.__.__isFills ? Paint.fills(this, canvas, fill as ILeafPaint[]) : Paint.fill(this, canvas, fill)
+
+                if (innerShadow) Effect.innerShadow(this, canvas, shape)
+
+                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
+
+                if (shape.worldCanvas) shape.worldCanvas.recycle()
+                shape.canvas.recycle()
+
+            } else {
+
+                if (fill) this.__.__isFills ? Paint.fills(this, canvas, fill as ILeafPaint[]) : Paint.fill(this, canvas, fill)
+                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
+            }
+
 
         } else {
 
             this.__drawFast(canvas, options)
 
         }
+    },
+
+    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void {
+        if (!this.__worldOpacity) return
+
+        canvas.setWorld(this.__world, options.matrix)
+
+        const { fill, fills, stroke, strokes } = this.__
+        const { context } = canvas
+
+        this.__drawRenderPath(canvas)
+
+        if (fill || fills) {
+            context.fillStyle = '#000000'
+            context.fill()
+        }
+        if (stroke || strokes) {
+            context.lineWidth = 2
+            context.stroke()
+        }
     }
 
 }