@leafer-ui/effect 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/effect",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "@leafer-ui/effect",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.7.0",
-    "@leafer-ui/draw": "1.7.0"
+    "@leafer/core": "1.9.0",
+    "@leafer-ui/draw": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.7.0",
-    "@leafer-ui/interface": "1.7.0"
+    "@leafer/interface": "1.9.0",
+    "@leafer-ui/interface": "1.9.0"
   }
 }

package/src/InnerShadow.ts

@@ -1,5 +1,5 @@
-import { IBoundsData, ILeaferCanvas, IMatrixWithBoundsData, IOffsetBoundsData } from '@leafer/interface'
-import { BoundsHelper } from '@leafer/core'
+import { IBoundsData, ILeaferCanvas, IOffsetBoundsData } from '@leafer/interface'
+import { BoundsHelper, LeafHelper } from '@leafer/core'
 
 import { IUI, ICachedShape } from '@leafer-ui/interface'
 import { ColorConvert } from '@leafer-ui/draw'
@@ -25,11 +25,18 @@ export function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape
 
     innerShadow.forEach((item, index) => {
 
+        let otherScale = 1 // 关联 scaleFixed 逻辑
+
+        if (item.scaleFixed) {
+            const sx = Math.abs(nowWorld.scaleX)
+            if (sx > 1) otherScale = 1 / sx
+        }
+
         other.save()
 
-        other.setWorldShadow((offsetOutBounds.offsetX + item.x * scaleX), (offsetOutBounds.offsetY + item.y * scaleY), item.blur * scaleX)
+        other.setWorldShadow((offsetOutBounds.offsetX + item.x * scaleX * otherScale), (offsetOutBounds.offsetY + item.y * scaleY * otherScale), item.blur * scaleX * otherScale)
 
-        spreadScale = item.spread ? 1 - item.spread * 2 / (__layout.boxBounds.width + (__layout.strokeBoxSpread || 0) * 2) : 0
+        spreadScale = item.spread ? 1 - item.spread * 2 / (__layout.boxBounds.width + (__layout.strokeBoxSpread || 0) * 2) * otherScale : 0
 
         drawWorldShadow(other, offsetOutBounds, spreadScale, shape)
 
@@ -46,8 +53,7 @@ export function innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape
 
         other.fillWorld(copyBounds, ColorConvert.string(item.color), 'source-in')
 
-        if (ui.__worldFlipped) current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode)
-        else current.copyWorldToInner(other, copyBounds as IMatrixWithBoundsData, __layout.renderBounds, item.blendMode)
+        LeafHelper.copyCanvasByWorld(ui, current, other, copyBounds, item.blendMode)
 
         if (end && index < end) other.clearWorld(copyBounds, true)
 

package/src/Shadow.ts

@@ -1,5 +1,5 @@
-import { IBoundsData, ILeaferCanvas, IMatrixWithBoundsData, IOffsetBoundsData } from '@leafer/interface'
-import { BoundsHelper, Platform } from '@leafer/core'
+import { IBoundsData, ILeaferCanvas, IOffsetBoundsData } from '@leafer/interface'
+import { BoundsHelper, LeafHelper, Platform } from '@leafer/core'
 
 import { IUI, ICachedShape } from '@leafer-ui/interface'
 import { ColorConvert } from '@leafer-ui/draw'
@@ -24,9 +24,16 @@ export function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): vo
 
     shadow.forEach((item, index) => {
 
-        other.setWorldShadow((offsetOutBounds.offsetX + item.x * scaleX), (offsetOutBounds.offsetY + item.y * scaleY), item.blur * scaleX, ColorConvert.string(item.color))
+        let otherScale = 1 // 关联 scaleFixed 逻辑
 
-        spreadScale = item.spread ? 1 + item.spread * 2 / (__layout.boxBounds.width + (__layout.strokeBoxSpread || 0) * 2) : 0
+        if (item.scaleFixed) {
+            const sx = Math.abs(nowWorld.scaleX)
+            if (sx > 1) otherScale = 1 / sx
+        }
+
+        other.setWorldShadow((offsetOutBounds.offsetX + item.x * scaleX * otherScale), (offsetOutBounds.offsetY + item.y * scaleY * otherScale), item.blur * scaleX * otherScale, ColorConvert.string(item.color))
+
+        spreadScale = item.spread ? 1 + item.spread * 2 / (__layout.boxBounds.width + (__layout.strokeBoxSpread || 0) * 2) * otherScale : 0
 
         drawWorldShadow(other, offsetOutBounds, spreadScale, shape)
 
@@ -45,8 +52,7 @@ export function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): vo
             worldCanvas ? other.copyWorld(worldCanvas, nowWorld, nowWorld, 'destination-out') : other.copyWorld(shape.canvas, shapeBounds, bounds, 'destination-out')
         }
 
-        if (ui.__worldFlipped) current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode)
-        else current.copyWorldToInner(other, copyBounds as IMatrixWithBoundsData, __layout.renderBounds, item.blendMode)
+        LeafHelper.copyCanvasByWorld(ui, current, other, copyBounds, item.blendMode)
 
         if (end && index < end) other.clearWorld(copyBounds, true)
     })
@@ -56,7 +62,7 @@ export function shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): vo
 }
 
 
-export function drawWorldShadow(canvas: ILeaferCanvas, outBounds: IBoundsData, spreadScale: number, shape: ICachedShape,): void {
+export function drawWorldShadow(canvas: ILeaferCanvas, outBounds: IBoundsData, spreadScale: number, shape: ICachedShape): void {
 
     const { bounds, shapeBounds } = shape
 
@@ -67,9 +73,9 @@ export function drawWorldShadow(canvas: ILeaferCanvas, outBounds: IBoundsData, s
         tempBounds.y += (outBounds.y - shapeBounds.y)
 
         if (spreadScale) {
-            const { matrix } = shape
-            tempBounds.x -= (bounds.x + (matrix ? matrix.e : 0) + bounds.width / 2) * (spreadScale - 1)
-            tempBounds.y -= (bounds.y + (matrix ? matrix.f : 0) + bounds.height / 2) * (spreadScale - 1)
+            const { fitMatrix } = shape
+            tempBounds.x -= (bounds.x + (fitMatrix ? fitMatrix.e : 0) + bounds.width / 2) * (spreadScale - 1)
+            tempBounds.y -= (bounds.y + (fitMatrix ? fitMatrix.f : 0) + bounds.height / 2) * (spreadScale - 1)
             tempBounds.width *= spreadScale
             tempBounds.height *= spreadScale
         }