From a28ba3b069020371ec5ee60ecfe37b7dc19da490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AF=B8=E5=B2=B3?= <dengfuping_develop@163.com>
Date: Fri, 8 May 2020 10:58:18 +0800
Subject: [PATCH] Revert "chore(deps): bump @antv/matrix-util from 2.0.4 to
 3.0.2 (#508)"

This reverts commit 1e5869b1eeae20e84150aca702edc39f7b2c29c9.
---
 packages/g-base/package.json                    |  2 +-
 packages/g-base/src/abstract/element.ts         | 12 ++++++------
 packages/g-canvas/tests/bugs/issue-drag-spec.js |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/g-base/package.json b/packages/g-base/package.json
index 2f6ca96f9..202430734 100644
--- a/packages/g-base/package.json
+++ b/packages/g-base/package.json
@@ -54,7 +54,7 @@
   "dependencies": {
     "@antv/event-emitter": "^0.1.1",
     "@antv/g-math": "^0.1.3",
-    "@antv/matrix-util": "^3.0.2",
+    "@antv/matrix-util": "^2.0.4",
     "@antv/path-util": "~2.0.5",
     "@antv/util": "~2.0.0",
     "@types/d3-timer": "^1.0.9",
diff --git a/packages/g-base/src/abstract/element.ts b/packages/g-base/src/abstract/element.ts
index 95cbd7a71..ad8e56509 100644
--- a/packages/g-base/src/abstract/element.ts
+++ b/packages/g-base/src/abstract/element.ts
@@ -1,5 +1,5 @@
 import { each, isEqual, isFunction, isNumber, isObject, isArray, noop, mix, upperFirst, uniqueId } from '@antv/util';
-import * as mat3 from '@antv/matrix-util/lib/mat3';
+import { transform } from '@antv/matrix-util';
 import { IElement, IShape, IGroup, ICanvas, ICtor } from '../interfaces';
 import { ClipCfg, ChangeType, OnFrame, ShapeAttrs, AnimateCfg, Animation, BBox, ShapeBase } from '../types';
 import { removeFromArray, isParent } from '../util/util';
@@ -658,7 +658,7 @@ abstract class Element extends Base implements IElement {
    */
   translate(translateX: number = 0, translateY: number = 0) {
     const matrix = this.getMatrix();
-    const newMatrix = mat3.transform(matrix, [['t', translateX, translateY]]);
+    const newMatrix = transform(matrix, [['t', translateX, translateY]]);
     this.setMatrix(newMatrix);
     return this;
   }
@@ -694,7 +694,7 @@ abstract class Element extends Base implements IElement {
    */
   scale(ratioX: number, ratioY?: number) {
     const matrix = this.getMatrix();
-    const newMatrix = mat3.transform(matrix, [['s', ratioX, ratioY || ratioX]]);
+    const newMatrix = transform(matrix, [['s', ratioX, ratioY || ratioX]]);
     this.setMatrix(newMatrix);
     return this;
   }
@@ -706,7 +706,7 @@ abstract class Element extends Base implements IElement {
    */
   rotate(radian: number) {
     const matrix = this.getMatrix();
-    const newMatrix = mat3.transform(matrix, [['r', radian]]);
+    const newMatrix = transform(matrix, [['r', radian]]);
     this.setMatrix(newMatrix);
     return this;
   }
@@ -719,7 +719,7 @@ abstract class Element extends Base implements IElement {
   rotateAtStart(rotate: number): IElement {
     const { x, y } = this.attr();
     const matrix = this.getMatrix();
-    const newMatrix = mat3.transform(matrix, [
+    const newMatrix = transform(matrix, [
       ['t', -x, -y],
       ['r', rotate],
       ['t', x, y],
@@ -735,7 +735,7 @@ abstract class Element extends Base implements IElement {
    */
   rotateAtPoint(x: number, y: number, rotate: number): IElement {
     const matrix = this.getMatrix();
-    const newMatrix = mat3.transform(matrix, [
+    const newMatrix = transform(matrix, [
       ['t', -x, -y],
       ['r', rotate],
       ['t', x, y],
diff --git a/packages/g-canvas/tests/bugs/issue-drag-spec.js b/packages/g-canvas/tests/bugs/issue-drag-spec.js
index 968546423..9acda3cd9 100644
--- a/packages/g-canvas/tests/bugs/issue-drag-spec.js
+++ b/packages/g-canvas/tests/bugs/issue-drag-spec.js
@@ -1,6 +1,7 @@
 const expect = require('chai').expect;
 import Canvas from '../../src/canvas';
-
+// import { transform } from '@antv/matrix-util';
+// import { getColor } from '../get-color';
 function simulateMouseEvent(dom, type, cfg) {
   const event = new MouseEvent(type, cfg);
   dom.dispatchEvent(event);