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

package/package.json

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

package/src/UIRender.ts

@@ -8,7 +8,13 @@ export const UIRender: IUIRenderModule = {
 
     __updateChange(): void {
         let data = this.__
-        let complex = data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect
+
+        if (data.__useEffect) {
+            const { shadow, innerShadow, blur, backgroundBlur } = this.__
+            data.__useEffect = !!(shadow || innerShadow || blur || backgroundBlur)
+        }
+
+        let complex = data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect || data.blendMode !== 'pass-through'
 
         if (complex) {
             data.__complex = true
@@ -27,9 +33,17 @@ export const UIRender: IUIRenderModule = {
     },
 
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void {
+
         if (this.__.__complex) {
 
-            const { fill, stroke, __drawAfterFill, __font } = this.__
+            const { fill, stroke, __drawAfterFill, __font, __blendLayer } = this.__
+
+            let orginCanvas: ILeaferCanvas
+
+            if (__blendLayer) {
+                orginCanvas = canvas
+                canvas = canvas.getSameCanvas(true)
+            }
 
             __font ? canvas.font = __font : this.__drawRenderPath(canvas)
 
@@ -53,9 +67,16 @@ export const UIRender: IUIRenderModule = {
                 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 (orginCanvas) {
+                orginCanvas.copyWorldToInner(canvas, this.__world, this.__layout.renderBounds, this.__.blendMode)
+                canvas.recycle()
             }