@leafer-ui/render 1.0.0-alpha.21 → 1.0.0-alpha.30

package/package.json

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

package/src/RectRender.ts

@@ -5,15 +5,17 @@ import { IRectRenderModule } from '@leafer-ui/interface'
 
 export const RectRender: IRectRenderModule = {
 
-    __drawFast(canvas: ILeaferCanvas, _options: IRenderOptions): void {
+    __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void {
 
-        const { width, height, fill, stroke } = this.__
+        const { width, height, fill, stroke, __drawAfterFill } = this.__
 
         if (fill) {
             canvas.fillStyle = fill
             canvas.fillRect(0, 0, width, height)
         }
 
+        if (__drawAfterFill) this.__drawAfterFill(canvas, options)
+
         if (stroke) {
 
             const { strokeAlign, strokeWidth } = this.__

package/src/TextRender.ts

@@ -1,27 +1,25 @@
 import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
 
-import { IUIRenderModule } from '@leafer-ui/interface'
+import { ITextRenderModule } from '@leafer-ui/interface'
+import { Paint } from '@leafer-ui/external'
 
 
-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 { __font } = this.__
 
         canvas.font = __font
 
         if (fill) {
             canvas.fillStyle = fill
-            canvas.fillText(content, 0, 0)
+            Paint.drawText(this, canvas)
         }
 
-        if (stroke) {
-            canvas.strokeStyle = stroke
-            canvas.strokeText(content, 0, 0)
-        }
+        if (stroke) Paint.strokeText(this, canvas, stroke)
+
     }
 
 }
-
-TextRender.__draw = TextRender.__drawFast

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 = {
@@ -17,30 +17,75 @@ export const UIRender: IUIRenderModule = {
         }
     },
 
-    __drawFast(canvas: ILeaferCanvas, _options: IRenderOptions): void {
-        const { fill, stroke } = this.__
+    __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void {
+        const { fill, stroke, __drawAfterFill } = this.__
 
         this.__drawRenderPath(canvas)
-
         if (fill) Paint.fill(this, canvas, fill)
+        if (__drawAfterFill) this.__drawAfterFill(canvas, options)
         if (stroke) Paint.stroke(this, canvas, stroke)
     },
 
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void {
         if (this.__.__complex) {
 
-            const { fill, stroke } = this.__
+            const { fill, stroke, __drawAfterFill, __font } = this.__
+
+            __font ? canvas.font = __font : this.__drawRenderPath(canvas)
+
+            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 (__drawAfterFill) this.__drawAfterFill(canvas, options)
+
+                if (innerShadow) Effect.innerShadow(this, canvas, shape)
+
+                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
 
-            this.__drawRenderPath(canvas)
+                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 (__drawAfterFill) this.__drawAfterFill(canvas, options)
+                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
+            }
 
-            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, stroke, __font } = this.__
+
+        __font ? canvas.font = __font : this.__drawRenderPath(canvas)
+
+        if (fill) {
+            canvas.fillStyle = '#000000'
+            __font ? Paint.drawText(this, canvas) : canvas.fill()
+        }
+        if (stroke) {
+            const { strokeWidth, strokeAlign } = this.__
+            if (strokeAlign !== 'inside') {
+                canvas.setStroke('#000000', strokeAlign === 'outside' ? strokeWidth * 2 : strokeWidth, this.__)
+                __font ? Paint.drawTextStroke(this, canvas) : canvas.stroke()
+            }
+        }
     }
 
 }

package/src/index.ts

@@ -1,4 +1,3 @@
 export { UIRender } from './UIRender'
-export { FrameRender } from './FrameRender'
 export { RectRender } from './RectRender'
 export { TextRender } from './TextRender'

package/src/FrameRender.ts

@@ -1,40 +0,0 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
-
-import { IFrameRenderModule } from '@leafer-ui/interface'
-
-
-export const FrameRender: IFrameRenderModule = {
-
-    __render(canvas: ILeaferCanvas, options: IRenderOptions): void {
-
-        const { fill, stroke } = this.__
-
-        if (stroke) this.__.stroke = undefined
-
-        this.__renderRect(canvas, options)
-
-        const { clip } = this.__
-        if (clip) {
-            canvas.save()
-            canvas.clip()
-
-            this.__renderGroup(canvas, options)
-
-            canvas.restore()
-        } else {
-            this.__renderGroup(canvas, options)
-
-        }
-
-
-        if (stroke) {
-            this.__.stroke = stroke
-
-            if (fill) this.__.fill = undefined
-            this.__renderRect(canvas, options)
-            if (fill) this.__.fill = fill
-        }
-
-    }
-
-}

package/src/ImageRender.ts

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