zrender-nightly 5.4.4-dev.20230925 → 5.4.4-dev.20230926

package/lib/core/matrix.d.ts

@@ -5,7 +5,7 @@ export declare function identity(out: MatrixArray): MatrixArray;
 export declare function copy(out: MatrixArray, m: MatrixArray): MatrixArray;
 export declare function mul(out: MatrixArray, m1: MatrixArray, m2: MatrixArray): MatrixArray;
 export declare function translate(out: MatrixArray, a: MatrixArray, v: VectorArray): MatrixArray;
-export declare function rotate(out: MatrixArray, a: MatrixArray, rad: number): MatrixArray;
+export declare function rotate(out: MatrixArray, a: MatrixArray, rad: number, pivot?: VectorArray): MatrixArray;
 export declare function scale(out: MatrixArray, a: MatrixArray, v: VectorArray): MatrixArray;
 export declare function invert(out: MatrixArray, a: MatrixArray): MatrixArray | null;
 export declare function clone(a: MatrixArray): MatrixArray;

package/lib/core/matrix.js

@@ -43,7 +43,8 @@ export function translate(out, a, v) {
     out[5] = a[5] + v[1];
     return out;
 }
-export function rotate(out, a, rad) {
+export function rotate(out, a, rad, pivot) {
+    if (pivot === void 0) { pivot = [0, 0]; }
     var aa = a[0];
     var ac = a[2];
     var atx = a[4];
@@ -56,8 +57,8 @@ export function rotate(out, a, rad) {
     out[1] = -aa * st + ab * ct;
     out[2] = ac * ct + ad * st;
     out[3] = -ac * st + ct * ad;
-    out[4] = ct * atx + st * aty;
-    out[5] = ct * aty - st * atx;
+    out[4] = ct * (atx - pivot[0]) + st * (aty - pivot[1]) + pivot[0];
+    out[5] = ct * (aty - pivot[1]) - st * (atx - pivot[0]) + pivot[1];
     return out;
 }
 export function scale(out, a, v) {

package/lib/tool/parseSVG.js

@@ -554,7 +554,10 @@ function parseTransformAttribute(xmlNode, node) {
                     matrix.scale(mt, mt, [parseFloat(valueArr[0]), parseFloat(valueArr[1] || valueArr[0])]);
                     break;
                 case 'rotate':
-                    matrix.rotate(mt, mt, -parseFloat(valueArr[0]) * DEGREE_TO_ANGLE);
+                    matrix.rotate(mt, mt, -parseFloat(valueArr[0]) * DEGREE_TO_ANGLE, [
+                        parseFloat(valueArr[1] || '0'),
+                        parseFloat(valueArr[2] || '0')
+                    ]);
                     break;
                 case 'skewX':
                     var sx = Math.tan(parseFloat(valueArr[0]) * DEGREE_TO_ANGLE);

package/lib/zrender.d.ts

@@ -84,7 +84,7 @@ export declare function dispose(zr: ZRender): void;
 export declare function disposeAll(): void;
 export declare function getInstance(id: number): ZRender;
 export declare function registerPainter(name: string, Ctor: PainterBaseCtor): void;
-export declare const version = "5.4.4-dev.20230925";
+export declare const version = "5.4.4-dev.20230926";
 export interface ZRenderType extends ZRender {
 }
 export {};

package/lib/zrender.js

@@ -261,5 +261,5 @@ export function getInstance(id) {
 export function registerPainter(name, Ctor) {
     painterCtors[name] = Ctor;
 }
-export var version = '5.4.4-dev.20230925';
+export var version = '5.4.4-dev.20230926';
 ;

package/package.json

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

package/src/core/matrix.ts

@@ -79,7 +79,12 @@ export function translate(out: MatrixArray, a: MatrixArray, v: VectorArray): Mat
 /**
  * 旋转变换
  */
-export function rotate(out: MatrixArray, a: MatrixArray, rad: number): MatrixArray {
+export function rotate(
+    out: MatrixArray,
+    a: MatrixArray,
+    rad: number,
+    pivot: VectorArray = [0, 0]
+): MatrixArray {
     const aa = a[0];
     const ac = a[2];
     const atx = a[4];
@@ -93,8 +98,8 @@ export function rotate(out: MatrixArray, a: MatrixArray, rad: number): MatrixArr
     out[1] = -aa * st + ab * ct;
     out[2] = ac * ct + ad * st;
     out[3] = -ac * st + ct * ad;
-    out[4] = ct * atx + st * aty;
-    out[5] = ct * aty - st * atx;
+    out[4] = ct * (atx - pivot[0]) + st * (aty - pivot[1]) + pivot[0];
+    out[5] = ct * (aty - pivot[1]) - st * (atx - pivot[0]) + pivot[1];
     return out;
 }
 

package/src/tool/parseSVG.ts

@@ -845,7 +845,10 @@ function parseTransformAttribute(xmlNode: SVGElement, node: Element): void {
                     break;
                 case 'rotate':
                     // TODO: zrender use different hand in coordinate system.
-                    matrix.rotate(mt, mt, -parseFloat(valueArr[0]) * DEGREE_TO_ANGLE);
+                    matrix.rotate(mt, mt, -parseFloat(valueArr[0]) * DEGREE_TO_ANGLE, [
+                        parseFloat(valueArr[1] || '0'),
+                        parseFloat(valueArr[2] || '0')
+                    ]);
                     break;
                 case 'skewX':
                     const sx = Math.tan(parseFloat(valueArr[0]) * DEGREE_TO_ANGLE);

package/src/zrender.ts

@@ -485,7 +485,7 @@ export function registerPainter(name: string, Ctor: PainterBaseCtor) {
 /**
  * @type {string}
  */
-export const version = '5.4.4-dev.20230925';
+export const version = '5.4.4-dev.20230926';
 
 
 export interface ZRenderType extends ZRender {};