chore: merge master into next

README.md

@@ -41,3 +41,7 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Notice
+
+The Apache Software Foundation [Apache ECharts, ECharts](https://echarts.apache.org/), Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the [Apache Software Foundation](https://www.apache.org/).

dist/zrender.js

@@ -125,7 +125,7 @@
  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) {
@@ -7338,7 +7338,7 @@
  function registerSSRDataGetter(getter) {
  ssrDataGetter = getter;
  }
- var version = '5.5.0';
+ var version = '5.6.0';
 
  var STYLE_MAGIC_KEY = '__zr_style_' + Math.round((Math.random() * 10));
  var DEFAULT_COMMON_STYLE = {

package.json

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

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;

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];
  }
  }
-}
+}

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[] = [];
 

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 {

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);

src/zrender.ts

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