zrender-nightly 5.7.0-dev.20250620 → 5.7.0-dev.20250622

package/src/tool/parseSVG.ts

@@ -19,6 +19,7 @@ import RadialGradient, { RadialGradientObject } from '../graphic/RadialGradient'
 import Gradient, { GradientObject } from '../graphic/Gradient';
 import TSpan, { TSpanStyleProps } from '../graphic/TSpan';
 import { parseXML } from './parseXML';
+import * as colorTool from './color';
 
 
 interface SVGParserOption {
@@ -627,9 +628,19 @@ function parseGradientColorStops(xmlNode: SVGElement, gradient: GradientObject):
             // <stop stop-color="red"/>
             const styleVals = {} as Dictionary<string>;
             parseInlineStyle(stop, styleVals, styleVals);
-            const stopColor = styleVals.stopColor
+            let stopColor = styleVals.stopColor
                 || stop.getAttribute('stop-color')
                 || '#000000';
+            const stopOpacity = styleVals.stopOpacity
+                || stop.getAttribute('stop-opacity');
+            if (stopOpacity) {
+                const rgba = colorTool.parse(stopColor);
+                const stopColorOpacity = rgba && rgba[3];
+                if (stopColorOpacity) {
+                    rgba[3] *= colorTool.parseCssFloat(stopOpacity);
+                    stopColor = colorTool.stringify(rgba, 'rgba');
+                }
+            }
 
             gradient.colorStops.push({
                 offset: offset,

package/src/tool/path.ts

@@ -383,13 +383,16 @@ class SVGPath extends Path {
 function isPathProxy(path: PathProxy | CanvasRenderingContext2D): path is PathProxy {
     return (path as PathProxy).setData != null;
 }
+
 // TODO Optimize double memory cost problem
 function createPathOptions(str: string, opts: SVGPathOption): InnerSVGPathOption {
     const pathProxy = createPathProxyFromString(str);
     const innerOpts: InnerSVGPathOption = extend({}, opts);
     innerOpts.buildPath = function (path: PathProxy | CanvasRenderingContext2D) {
-        if (isPathProxy(path)) {
-            path.setData(pathProxy.data);
+        const beProxy = isPathProxy(path);
+        if (beProxy && path.canSave()) {
+            // path.setData(pathProxy.data);
+            path.appendPath(pathProxy);
             // Svg and vml renderer don't have context
             const ctx = path.getContext();
             if (ctx) {
@@ -397,8 +400,10 @@ function createPathOptions(str: string, opts: SVGPathOption): InnerSVGPathOption
             }
         }
         else {
-            const ctx = path;
-            pathProxy.rebuildPath(ctx, 1);
+            const ctx = beProxy ? path.getContext() : path;
+            if (ctx) {
+                pathProxy.rebuildPath(ctx, 1);
+            }
         }
     };
 

package/src/zrender.ts

@@ -556,7 +556,7 @@ export function registerSSRDataGetter<T>(getter: ElementSSRDataGetter<T>) {
 /**
  * @type {string}
  */
-export const version = '5.7.0-dev.20250620';
+export const version = '5.7.0-dev.20250622';
 
 
 export interface ZRenderType extends ZRender {};