@leafer-ui/render 1.6.1 → 1.6.3

package/package.json

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

package/src/UIRender.ts

@@ -1,28 +1,29 @@
 import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { DataHelper } from '@leafer/core'
 
 import { IUIRenderModule, ILeafPaint, ILeafStrokePaint, IUI } from '@leafer-ui/interface'
-import { Paint, Effect, Filter } from '@leafer-ui/external'
+import { Paint, Effect, Filter, ColorConvert } from '@leafer-ui/external'
 
+const { stintSet } = DataHelper
 
 export const UIRender: IUIRenderModule = {
 
     __updateChange(): void {
-        const data = this.__, w = this.__world
+        const data = this.__
 
         if (data.__useEffect) {
-            const { shadow, innerShadow, blur, backgroundBlur, filter } = this.__
-            data.__useEffect = !!(shadow || innerShadow || blur || backgroundBlur || filter)
+            const { shadow, fill, stroke } = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter
+            stintSet(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !(shadow[0].box && data.__isTransparentFill) && fill && !(fill instanceof Array && fill.length > 1) && (this.useFastShadow || !stroke || (stroke && data.strokeAlign === 'inside')))
+            data.__useEffect = !!(shadow || otherEffect)
         }
 
-        const half = data.__hasHalf
-        w.half !== half && (w.half = half)
+        stintSet(this.__world, 'half', data.__hasHalf)
 
-        data.__checkSingle()
+        stintSet(data, '__fillAfterStroke', data.stroke && data.strokeAlign === 'outside' && data.fill && !data.__isTransparentFill)
 
-        const complex = data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect
+        data.__checkSingle()
 
-        if (complex) data.__complex = true
-        else data.__complex && (data.__complex = false)
+        stintSet(data, '__complex', data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect)
     },
 
     __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void {
@@ -36,11 +37,11 @@ export const UIRender: IUIRenderModule = {
 
             if (data.__needComputePaint) data.__computePaint()
 
-            const { fill, stroke, __drawAfterFill } = data
+            const { fill, stroke, __drawAfterFill, __fillAfterStroke, __isFastShadow } = data
 
             this.__drawRenderPath(canvas)
 
-            if (data.__useEffect) {
+            if (data.__useEffect && !__isFastShadow) {
 
                 const shape = Paint.shape(this, canvas, options)
                 this.__nowWorld = this.__getNowWorld(options) // restore
@@ -49,13 +50,15 @@ export const UIRender: IUIRenderModule = {
 
                 if (shadow) Effect.shadow(this, canvas, shape)
 
+                if (__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
+
                 if (fill) data.__isFills ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill(fill as string, this, canvas)
 
                 if (__drawAfterFill) this.__drawAfterFill(canvas, options)
 
                 if (innerShadow) Effect.innerShadow(this, canvas, shape)
 
-                if (stroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
+                if (stroke && !__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
 
                 if (filter) Filter.apply(filter, this, this.__nowWorld, canvas, originCanvas, shape)
 
@@ -64,19 +67,27 @@ export const UIRender: IUIRenderModule = {
 
             } else {
 
+                if (__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
+
+                if (__isFastShadow) {
+                    const shadow = data.shadow[0], { scaleX, scaleY } = this.__nowWorld
+                    canvas.save(), canvas.setWorldShadow(shadow.x * scaleX, shadow.y * scaleY, shadow.blur * scaleX, ColorConvert.string(shadow.color))
+                }
+
                 if (fill) data.__isFills ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill(fill as string, this, canvas)
+
+                if (__isFastShadow) canvas.restore()
+
                 if (__drawAfterFill) this.__drawAfterFill(canvas, options)
-                if (stroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
+
+                if (stroke && !__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
 
             }
 
         } else {
 
-            if (data.__pathInputed) {
-                drawFast(this, canvas, options)
-            } else {
-                this.__drawFast(canvas, options)
-            }
+            if (data.__pathInputed) drawFast(this, canvas, options)
+            else this.__drawFast(canvas, options)
 
         }
     },
@@ -89,9 +100,9 @@ export const UIRender: IUIRenderModule = {
 
             this.__drawRenderPath(canvas)
 
-            if (fill && !ignoreFill) this.__.__pixelFill ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill('#000000', this, canvas)
+            if (fill && !ignoreFill) this.__.__isAlphaPixelFill ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill('#000000', this, canvas)
             if (this.__.__isCanvas) this.__drawAfterFill(canvas, options)
-            if (stroke && !ignoreStroke) this.__.__pixelStroke ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke('#000000', this, canvas)
+            if (stroke && !ignoreStroke) this.__.__isAlphaPixelStroke ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke('#000000', this, canvas)
         }
     },
 
@@ -108,11 +119,14 @@ export const UIRender: IUIRenderModule = {
 
 
 function drawFast(ui: IUI, canvas: ILeaferCanvas, options: IRenderOptions): void {
-    const { fill, stroke, __drawAfterFill } = ui.__
+    const { fill, stroke, __drawAfterFill, __fillAfterStroke } = ui.__
 
     ui.__drawRenderPath(canvas)
 
+    if (__fillAfterStroke) Paint.stroke(stroke as string, ui, canvas)
+
     if (fill) Paint.fill(fill as string, ui, canvas)
     if (__drawAfterFill) ui.__drawAfterFill(canvas, options)
-    if (stroke) Paint.stroke(stroke as string, ui, canvas)
+
+    if (stroke && !__fillAfterStroke) Paint.stroke(stroke as string, ui, canvas)
 }