fix: avoid overriding defXY when parsing path #1404

antvis · Jul 6, 2023 · adf9b3a · adf9b3a
1 parent 7199054
commit adf9b3a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/packages/g-lite/src/css/StyleValueRegistry.ts b/packages/g-lite/src/css/StyleValueRegistry.ts
@@ -757,8 +757,10 @@ export class DefaultStyleValueRegistry implements StyleValueRegistry {
         object.parsedStyle.path = parsePath(
           // @ts-ignore
           attributes.path,
-          object,
         );
+
+        object.parsedStyle.defX = object.parsedStyle.path.rect.x;
+        object.parsedStyle.defY = object.parsedStyle.path.rect.y;
       }
       // Text
       if (attributes.textTransform) {

diff --git a/packages/g-lite/src/css/parser/path.ts b/packages/g-lite/src/css/parser/path.ts
@@ -9,10 +9,7 @@ import {
   path2Curve,
   reverseCurve,
 } from '@antv/util';
-import type {
-  DisplayObject,
-  ParsedPathStyleProps,
-} from '../../display-objects';
+import type { ParsedPathStyleProps } from '../../display-objects';
 import type { IElement } from '../../dom';
 import { memoize } from '../../utils/memoize';
 import {
@@ -82,18 +79,10 @@ const memoizedParsePath = memoize(internalParsePath);
 
 export function parsePath(
   path: string | PathArray,
-  object?: DisplayObject,
 ): ParsedPathStyleProps['path'] {
-  const result = (
+  return (
     isString(path) ? memoizedParsePath(path) : internalParsePath(path)
   ) as ParsedPathStyleProps['path'];
-
-  if (object) {
-    object.parsedStyle.defX = result.rect.x;
-    object.parsedStyle.defY = result.rect.y;
-  }
-
-  return result;
 }
 
 export function mergePaths(

diff --git a/packages/g-lite/src/css/properties/CSSPropertyPath.ts b/packages/g-lite/src/css/properties/CSSPropertyPath.ts
@@ -48,6 +48,9 @@ export class CSSPropertyPath
    * update local position
    */
   postProcessor(object: DisplayObject, attributes: string[]) {
+    object.parsedStyle.defX = object.parsedStyle.path.rect.x;
+    object.parsedStyle.defY = object.parsedStyle.path.rect.y;
+
     if (
       object.nodeName === Shape.PATH &&
       attributes.indexOf('transform') === -1

diff --git a/packages/g-plugin-device-renderer/src/meshes/Line.ts b/packages/g-plugin-device-renderer/src/meshes/Line.ts
@@ -484,10 +484,7 @@ export function updateBuffer(
   ) {
     let path: ParsedPathStyleProps['path'];
     if (object.nodeName !== Shape.PATH) {
-      path = parsePath(
-        convertToPath(object, mat4.identity(mat4.create())),
-        object,
-      );
+      path = parsePath(convertToPath(object, mat4.identity(mat4.create())));
       defX = path.rect.x;
       defY = path.rect.y;