@leafer-ui/render 1.0.0-beta.9 → 1.0.0-rc.10

package/package.json

@@ -1,28 +1,31 @@
 {
   "name": "@leafer-ui/render",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.10",
   "description": "@leafer-ui/render",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
     "url": "https://github.com/leaferjs/ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/render",
+  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/display-module/render",
   "bugs": "https://github.com/leaferjs/ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/external": "1.0.0-beta.9"
+    "@leafer-ui/external": "1.0.0-rc.10"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.9",
-    "@leafer-ui/interface": "1.0.0-beta.9"
+    "@leafer/interface": "1.0.0-rc.10",
+    "@leafer-ui/interface": "1.0.0-rc.10"
   }
 }

package/src/RectRender.ts

@@ -18,19 +18,21 @@ export const RectRender: IRectRenderModule = {
 
         if (stroke) {
 
-            const { strokeAlign, strokeWidth } = this.__
-            canvas.setStroke(stroke, strokeWidth, this.__)
-            const half = strokeWidth / 2
+            const { strokeAlign, __strokeWidth } = this.__
+            if (!__strokeWidth) return
+
+            canvas.setStroke(stroke, __strokeWidth, this.__)
+            const half = __strokeWidth / 2
 
             switch (strokeAlign) {
                 case 'center':
                     canvas.strokeRect(0, 0, width, height)
                     break
                 case 'inside':
-                    canvas.strokeRect(half, half, width - strokeWidth, height - strokeWidth)
+                    canvas.strokeRect(half, half, width - __strokeWidth, height - __strokeWidth)
                     break
                 case 'outside':
-                    canvas.strokeRect(-half, -half, width + strokeWidth, height + strokeWidth)
+                    canvas.strokeRect(-half, -half, width + __strokeWidth, height + __strokeWidth)
                     break
             }
         }

package/src/UIRender.ts

@@ -30,47 +30,51 @@ export const UIRender: IUIRenderModule = {
 
         this.__drawRenderPath(canvas)
 
-        if (fill) Paint.fill(this, canvas, fill)
+        if (fill) Paint.fill(fill as string, this, canvas)
         if (__drawAfterFill) this.__drawAfterFill(canvas, options)
-        if (stroke) Paint.stroke(this, canvas, stroke)
+        if (stroke) Paint.stroke(stroke as string, this, canvas)
     },
 
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void {
 
         if (this.__.__complex) {
 
-            const { fill, stroke, __drawAfterFill } = this.__
+            const data = this.__
+
+            if (data.__needComputePaint) data.__computePaint()
+
+            const { fill, stroke, __drawAfterFill } = data
 
             this.__drawRenderPath(canvas)
 
-            if (this.__.__useEffect) {
+            if (data.__useEffect) {
 
                 const shape = Paint.shape(this, canvas, options)
+                this.__nowWorld = this.__getNowWorld(options) // restore
 
-                const { shadow, innerShadow } = this.__
+                const { shadow, innerShadow } = data
 
-                if (shadow) Effect.shadow(this, canvas, shape, options)
+                if (shadow) Effect.shadow(this, canvas, shape)
 
-                if (fill) this.__.__isFills ? Paint.fills(this, canvas, fill as ILeafPaint[]) : Paint.fill(this, canvas, fill)
+                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, options)
+                if (innerShadow) Effect.innerShadow(this, canvas, shape)
 
-                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
+                if (stroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, 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 (fill) data.__isFills ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill(fill as string, this, canvas)
                 if (__drawAfterFill) this.__drawAfterFill(canvas, options)
-                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke)
+                if (stroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
 
             }
 
-
         } else {
 
             this.__drawFast(canvas, options)
@@ -79,16 +83,16 @@ export const UIRender: IUIRenderModule = {
     },
 
     __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void {
-        if (!this.__worldOpacity) return
-
-        canvas.setWorld(this.__world, options.matrix)
+        if (this.__worldOpacity) {
+            canvas.setWorld(this.__nowWorld = this.__getNowWorld(options))
 
-        const { fill, stroke } = this.__
+            const { fill, stroke } = this.__
 
-        this.__drawRenderPath(canvas)
+            this.__drawRenderPath(canvas)
 
-        if (fill) Paint.fill(this, canvas, '#000000')
-        if (stroke) Paint.stroke(this, canvas, '#000000')
+            if (fill) this.__.__pixelFill ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill('#000000', this, canvas)
+            if (stroke) this.__.__pixelStroke ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke('#000000', this, canvas)
+        }
     }
 
 }

package/types/index.d.ts

@@ -0,0 +1,7 @@
+import { IUIRenderModule, IRectRenderModule } from '@leafer-ui/interface';
+
+declare const UIRender: IUIRenderModule;
+
+declare const RectRender: IRectRenderModule;
+
+export { RectRender, UIRender };