@leafer-ui/gradient 1.6.2 → 1.6.4

package/package.json

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

package/src/conic.ts

@@ -15,18 +15,18 @@ const realTo = {} as IPointData
 
 export function conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint {
 
-    let { from, to, type, opacity, blendMode, stretch } = paint
+    let { from, to, type, opacity, stretch } = paint
 
     toPoint(from || 'center', box, realFrom)
     toPoint(to || 'bottom', box, realTo)
 
     const style = Platform.conicGradientSupport ? Platform.canvas.createConicGradient(0, realFrom.x, realFrom.y) : Platform.canvas.createRadialGradient(realFrom.x, realFrom.y, 0, realFrom.x, realFrom.y, getDistance(realFrom, realTo))
-    applyStops(style, paint.stops, opacity)
-
     const data: ILeafPaint = { type, style }
+
+    applyStops(data, style, paint.stops, opacity)
+
     const transform = getTransform(box, realFrom, realTo, stretch || 1, Platform.conicGradientRotate90)
     if (transform) data.transform = transform
-    if (blendMode) data.blendMode = blendMode
 
     return data
 

package/src/linear.ts

@@ -5,36 +5,36 @@ import { IGradientPaint, ILeafPaint, IColorStop, IColorString } from '@leafer-ui
 import { ColorConvert } from '@leafer-ui/draw'
 
 
-const { toPoint } = AroundHelper
+const { toPoint } = AroundHelper, { hasTransparent } = ColorConvert
 const realFrom = {} as IPointData
 const realTo = {} as IPointData
 
 export function linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint {
 
-    let { from, to, type, blendMode, opacity } = paint
+    let { from, to, type, opacity } = paint
 
     toPoint(from || 'top', box, realFrom)
     toPoint(to || 'bottom', box, realTo)
 
     const style = Platform.canvas.createLinearGradient(realFrom.x, realFrom.y, realTo.x, realTo.y)
-    applyStops(style, paint.stops, opacity)
-
     const data: ILeafPaint = { type, style }
-    if (blendMode) data.blendMode = blendMode
+
+    applyStops(data, style, paint.stops, opacity)
+
     return data
 
 }
 
-export function applyStops(gradient: IObject, stops: IColorStop[] | IColorString[], opacity: number): void {
+export function applyStops(data: ILeafPaint, gradient: IObject, stops: IColorStop[] | IColorString[], opacity: number): void {
     if (stops) {
-        let stop: IColorStop | string
+        let stop: IColorStop | string, color: string, offset: number, isTransparent: boolean
         for (let i = 0, len = stops.length; i < len; i++) {
             stop = stops[i]
-            if (typeof stop === 'string') {
-                gradient.addColorStop(i / (len - 1), ColorConvert.string(stop, opacity))
-            } else {
-                gradient.addColorStop(stop.offset, ColorConvert.string(stop.color, opacity))
-            }
+            if (typeof stop === 'string') offset = i / (len - 1), color = ColorConvert.string(stop, opacity)
+            else offset = stop.offset, color = ColorConvert.string(stop.color, opacity)
+            gradient.addColorStop(offset, color)
+            if (!isTransparent && hasTransparent(color)) isTransparent = true
         }
+        if (isTransparent) data.isTransparent = true
     }
 }

package/src/radial.ts

@@ -15,18 +15,18 @@ const realTo = {} as IPointData
 
 export function radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint {
 
-    let { from, to, type, opacity, blendMode, stretch } = paint
+    let { from, to, type, opacity, stretch } = paint
 
     toPoint(from || 'center', box, realFrom)
     toPoint(to || 'bottom', box, realTo)
 
     const style = Platform.canvas.createRadialGradient(realFrom.x, realFrom.y, 0, realFrom.x, realFrom.y, getDistance(realFrom, realTo))
-    applyStops(style, paint.stops, opacity)
-
     const data: ILeafPaint = { type, style }
+
+    applyStops(data, style, paint.stops, opacity)
+
     const transform = getTransform(box, realFrom, realTo, stretch, true)
     if (transform) data.transform = transform
-    if (blendMode) data.blendMode = blendMode
 
     return data