@leafer-ui/effect 1.0.0-rc.8 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/effect",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.0",
   "description": "@leafer-ui/effect",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,17 +15,17 @@
     "type": "git",
     "url": "https://github.com/leaferjs/ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/effect",
+  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/partner/effect",
   "bugs": "https://github.com/leaferjs/ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.8"
+    "@leafer/core": "1.0.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.8",
-    "@leafer-ui/interface": "1.0.0-rc.8"
+    "@leafer/interface": "1.0.0",
+    "@leafer-ui/interface": "1.0.0"
   }
 }

package/src/BackgroundBlur.ts

@@ -0,0 +1,6 @@
+import { ILeaferCanvas } from '@leafer/interface'
+import { IUI, ICachedShape } from '@leafer-ui/interface'
+
+export function backgroundBlur(_ui: IUI, _current: ILeaferCanvas, _shape: ICachedShape): void {
+
+}

package/src/Blur.ts

@@ -4,7 +4,7 @@ import { IUI } from '@leafer-ui/interface'
 
 export function blur(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas): void {
     const { blur } = ui.__
-    origin.setWorldBlur(blur * ui.__world.a)
-    origin.copyWorldToInner(current, ui.__world, ui.__layout.renderBounds)
+    origin.setWorldBlur(blur * ui.__nowWorld.a)
+    origin.copyWorldToInner(current, ui.__nowWorld, ui.__layout.renderBounds)
     origin.filter = 'none'
 }

package/src/InnerShadow.ts

@@ -1,4 +1,4 @@
-import { IBoundsData, ILeaferCanvas, IMatrixWithBoundsData, IOffsetBoundsData, IRenderOptions } from '@leafer/interface'
+import { IBoundsData, ILeaferCanvas, IMatrixWithBoundsData, IOffsetBoundsData } from '@leafer/interface'
 import { BoundsHelper } from '@leafer/core'
 
 import { IUI, ICachedShape } from '@leafer-ui/interface'
@@ -9,11 +9,11 @@ import { drawWorldShadow } from './Shadow'
 const { toOffsetOutBounds } = BoundsHelper
 const offsetOutBounds = {} as IOffsetBoundsData
 
-export function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void {
+export function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void {
 
     let copyBounds: IBoundsData, spreadScale: number
 
-    const { __world, __layout: __layout } = ui
+    const { __nowWorld: nowWorld, __layout: __layout } = ui
     const { innerShadow } = ui.__
     const { worldCanvas, bounds, shapeBounds, scaleX, scaleY } = shape
 
@@ -35,9 +35,9 @@ export function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape
         other.restore()
 
         if (worldCanvas) {
-            other.copyWorld(other, bounds, __world, 'copy')
-            other.copyWorld(worldCanvas, __world, __world, 'source-out')
-            copyBounds = __world
+            other.copyWorld(other, bounds, nowWorld, 'copy')
+            other.copyWorld(worldCanvas, nowWorld, nowWorld, 'source-out')
+            copyBounds = nowWorld
         } else {
             other.copyWorld(shape.canvas, shapeBounds, bounds, 'source-out')
             copyBounds = bounds
@@ -45,17 +45,17 @@ export function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape
 
         other.fillWorld(copyBounds, item.color, 'source-in')
 
-        if (ui.__worldFlipped || renderOptions.matrix) {
-            current.copyWorldByReset(other, copyBounds, __world, item.blendMode)
+        if (ui.__worldFlipped) {
+            current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode)
         } else {
             current.copyWorldToInner(other, copyBounds as IMatrixWithBoundsData, __layout.renderBounds, item.blendMode)
         }
 
-        if (end && index < end) other.clear()
+        if (end && index < end) other.clearWorld(copyBounds, true)
 
     })
 
-    other.recycle()
+    other.recycle(copyBounds)
 
 }
 

package/src/Shadow.ts

@@ -1,4 +1,4 @@
-import { IBoundsData, ILeaferCanvas, IMatrixWithBoundsData, IOffsetBoundsData, IRenderOptions } from '@leafer/interface'
+import { IBoundsData, ILeaferCanvas, IMatrixWithBoundsData, IOffsetBoundsData } from '@leafer/interface'
 import { BoundsHelper, Platform } from '@leafer/core'
 
 import { IUI, ICachedShape } from '@leafer-ui/interface'
@@ -8,11 +8,11 @@ const { copy, toOffsetOutBounds } = BoundsHelper
 const tempBounds = {} as IBoundsData
 const offsetOutBounds = {} as IOffsetBoundsData
 
-export function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void {
+export function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void {
 
     let copyBounds: IBoundsData, spreadScale: number
 
-    const { __world, __layout } = ui
+    const { __nowWorld: nowWorld, __layout } = ui
     const { shadow } = ui.__
     const { worldCanvas, bounds, shapeBounds, scaleX, scaleY } = shape
 
@@ -33,27 +33,27 @@ export function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, ren
 
         if (item.box) {
 
-            other.restore()
+            other.restore() // remove shadow style
             other.save()
 
             if (worldCanvas) {
-                other.copyWorld(other, bounds, __world, 'copy')
-                copyBounds = __world
+                other.copyWorld(other, bounds, nowWorld, 'copy')
+                copyBounds = nowWorld
             }
 
-            worldCanvas ? other.copyWorld(worldCanvas, __world, __world, 'destination-out') : other.copyWorld(shape.canvas, shapeBounds, bounds, 'destination-out')
+            worldCanvas ? other.copyWorld(worldCanvas, nowWorld, nowWorld, 'destination-out') : other.copyWorld(shape.canvas, shapeBounds, bounds, 'destination-out')
         }
 
-        if (ui.__worldFlipped || renderOptions.matrix) {
-            current.copyWorldByReset(other, copyBounds, __world, item.blendMode)
+        if (ui.__worldFlipped) {
+            current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode)
         } else {
             current.copyWorldToInner(other, copyBounds as IMatrixWithBoundsData, __layout.renderBounds, item.blendMode)
         }
 
-        if (end && index < end) other.clear()
+        if (end && index < end) other.clearWorld(copyBounds, true)
     })
 
-    other.recycle()
+    other.recycle(copyBounds)
 
 }
 

package/src/index.ts

@@ -1,3 +1,14 @@
-export { shadow } from './Shadow'
-export { innerShadow } from './InnerShadow'
-export { blur } from './Blur'
+import { IEffectModule } from '@leafer-ui/interface'
+
+import { shadow } from './Shadow'
+import { innerShadow } from './InnerShadow'
+import { blur } from './Blur'
+import { backgroundBlur } from './BackgroundBlur'
+
+
+export const EffectModule: IEffectModule = {
+    shadow,
+    innerShadow,
+    blur,
+    backgroundBlur
+}

package/types/index.d.ts

@@ -1,10 +1,5 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface';
-import { IUI, ICachedShape } from '@leafer-ui/interface';
+import { IEffectModule } from '@leafer-ui/interface';
 
-declare function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void;
+declare const EffectModule: IEffectModule;
 
-declare function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void;
-
-declare function blur(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas): void;
-
-export { blur, innerShadow, shadow };
+export { EffectModule };