fix(coordinate): layout (#5447)

antvis · Aug 23, 2023 · 9607f1d · 9607f1d
1 parent c98e176
commit 9607f1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/runtime/coordinate.ts b/src/runtime/coordinate.ts
@@ -21,8 +21,6 @@ export function createCoordinate(
     insetTop,
     insetRight,
     insetBottom,
-    marginLeft,
-    marginTop,
   } = layout;
   const { coordinates: partialTransform = [] } = partialOptions;
   const transform = inferCoordinate(partialTransform);
@@ -32,11 +30,11 @@ export function createCoordinate(
     // @todo Find a better solution.
     // Store more layout information for component.
     ...layout,
-    x: insetLeft + marginLeft,
-    y: insetTop + marginTop,
+    x: insetLeft,
+    y: insetTop,
     width: innerWidth - insetLeft - insetRight,
     height: innerHeight - insetBottom - insetTop,
-    transformations: transform.map(useCoordinate).flat(),
+    transformations: transform.flatMap(useCoordinate),
   };
 
   const coordinate = isCartesian3D

diff --git a/src/runtime/plot.ts b/src/runtime/plot.ts
@@ -1560,8 +1560,8 @@ async function applyTransform<T extends G2ViewTree>(
 
 function updateBBox(selection: Selection) {
   selection
-    .style('x', (d) => d.paddingLeft)
-    .style('y', (d) => d.paddingTop)
+    .style('x', (d) => d.paddingLeft + d.marginLeft)
+    .style('y', (d) => d.paddingTop + d.marginTop)
     .style('width', (d) => d.innerWidth)
     .style('height', (d) => d.innerHeight);
 }