zrender-nightly 5.6.0-dev.20240629 → 5.6.1-dev.20240629

package/lib/core/env.js

@@ -32,8 +32,9 @@ if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
 else if (typeof document === 'undefined' && typeof self !== 'undefined') {
     env.worker = true;
 }
-else if (typeof navigator === 'undefined'
-    || navigator.userAgent.indexOf('Node.js') === 0) {
+else if ((typeof process !== 'undefined' && typeof process.version === 'string')
+    || (typeof navigator === 'undefined' || typeof navigator.userAgent === 'undefined')
+    || (env.hasGlobalWindow && 'Deno' in window)) {
     env.node = true;
     env.svgSupported = true;
 }

package/lib/core/platform.js

@@ -39,7 +39,7 @@ export var platformApi = {
             else {
                 text = text || '';
                 font = font || DEFAULT_FONT;
-                var res = /(\d+)px/.exec(font);
+                var res = /((?:\d+)?\.?\d*)px/.exec(font);
                 var fontSize = res && +res[1] || DEFAULT_FONT_SIZE;
                 var width = 0;
                 if (font.indexOf('mono') >= 0) {

package/lib/svg/Painter.js

@@ -66,6 +66,7 @@ var SVGPainter = (function () {
         scope.willUpdate = opts.willUpdate;
         scope.compress = opts.compress;
         scope.emphasis = opts.emphasis;
+        scope.ssr = this._opts.ssr;
         var children = [];
         var bgVNode = this._bgVNode = createBackgroundVNode(width, height, this._backgroundColor, scope);
         bgVNode && children.push(bgVNode);

package/lib/svg/core.d.ts

@@ -41,6 +41,7 @@ export interface BrushScope {
     emphasis?: boolean;
     willUpdate?: boolean;
     compress?: boolean;
+    ssr?: boolean;
 }
 export declare function createBrushScope(zrId: string): BrushScope;
 export declare function createSVGVNode(width: number | string, height: number | string, children?: SVGVNode[], useViewBox?: boolean): SVGVNode;

package/lib/svg/graphic.js

@@ -29,12 +29,12 @@ function setStyleAttrs(attrs, style, el, scope) {
         else if (isFillStroke && isPattern(val)) {
             setPattern(el, attrs, key, scope);
         }
-        else if (isFillStroke && val === 'none') {
-            attrs[key] = 'transparent';
-        }
         else {
             attrs[key] = val;
         }
+        if (isFillStroke && scope.ssr && val === 'none') {
+            attrs['pointer-events'] = 'visible';
+        }
     }, style, el, false);
     setShadow(el, attrs, scope);
 }

package/lib/zrender.d.ts

@@ -90,7 +90,7 @@ export declare type ElementSSRData = zrUtil.HashMap<unknown>;
 export declare type ElementSSRDataGetter<T> = (el: Element) => zrUtil.HashMap<T>;
 export declare function getElementSSRData(el: Element): ElementSSRData;
 export declare function registerSSRDataGetter<T>(getter: ElementSSRDataGetter<T>): void;
-export declare const version = "5.6.0-dev.20240629";
+export declare const version = "5.6.1-dev.20240629";
 export interface ZRenderType extends ZRender {
 }
 export {};

package/lib/zrender.js

@@ -324,5 +324,5 @@ export function getElementSSRData(el) {
 export function registerSSRDataGetter(getter) {
     ssrDataGetter = getter;
 }
-export var version = '5.6.0-dev.20240629';
+export var version = '5.6.1-dev.20240629';
 ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zrender-nightly",
-  "version": "5.6.0-dev.20240629",
+  "version": "5.6.1-dev.20240629",
   "description": "A lightweight graphic library providing 2d draw for Apache ECharts",
   "keywords": [
     "canvas",

package/src/core/env.ts

@@ -38,8 +38,9 @@ else if (typeof document === 'undefined' && typeof self !== 'undefined') {
     env.worker = true;
 }
 else if (
-    typeof navigator === 'undefined'
-    || navigator.userAgent.indexOf('Node.js') === 0
+    (typeof process !== 'undefined' && typeof process.version === 'string')
+    || (typeof navigator === 'undefined' || typeof navigator.userAgent === 'undefined')
+    || (env.hasGlobalWindow && 'Deno' in window)
 ) {
     // In node
     env.node = true;

package/src/core/platform.ts

@@ -75,7 +75,7 @@ export const platformApi: Platform = {
                 text = text || '';
                 font = font || DEFAULT_FONT;
                 // Use font size if there is no other method can be used.
-                const res = /(\d+)px/.exec(font);
+                const res = /((?:\d+)?\.?\d*)px/.exec(font);
                 const fontSize = res && +res[1] || DEFAULT_FONT_SIZE;
                 let width = 0;
                 if (font.indexOf('mono') >= 0) {   // is monospace
@@ -108,4 +108,4 @@ export function setPlatformAPI(newPlatformApis: Partial<Platform>) {
             (platformApi as any)[key] = (newPlatformApis as any)[key];
         }
     }
-}
+}

package/src/svg/Painter.ts

@@ -142,6 +142,7 @@ class SVGPainter implements PainterBase {
         scope.willUpdate = opts.willUpdate;
         scope.compress = opts.compress;
         scope.emphasis = opts.emphasis;
+        scope.ssr = this._opts.ssr;
 
         const children: SVGVNode[] = [];
 

package/src/svg/core.ts

@@ -159,6 +159,8 @@ export interface BrushScope {
      * If compress the output string.
      */
     compress?: boolean
+
+    ssr?: boolean
 }
 
 export function createBrushScope(zrId: string): BrushScope {

package/src/svg/graphic.ts

@@ -63,13 +63,15 @@ function setStyleAttrs(attrs: SVGVNodeAttrs, style: AllStyleOption, el: Path | T
         else if (isFillStroke && isPattern(val)) {
             setPattern(el, attrs, key, scope);
         }
-        else if (isFillStroke && val === 'none') {
-            // When is none, it cannot be interacted when ssr
-            attrs[key] = 'transparent';
-        }
         else {
             attrs[key] = val;
         }
+        if (isFillStroke && scope.ssr && val === 'none') {
+            // When is none, it cannot be interacted when ssr
+            // Setting `pointer-events` as `visible` to make it responding
+            // See also https://www.w3.org/TR/SVG/interact.html#PointerEventsProperty
+            attrs['pointer-events'] = 'visible';
+        }
     }, style, el, false);
 
     setShadow(el, attrs, scope);

package/src/zrender.ts

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