fix: donut statistic auto size Closes #850

antvis · Mar 26, 2020 · 6ce2a11 · 6ce2a11
1 parent a3f0103
commit 6ce2a11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/plots/donut/component/ring-statistic.ts b/src/plots/donut/component/ring-statistic.ts
@@ -107,9 +107,11 @@ export default class RingStatistic extends StatisticHtml {
   }
 
   private getStatisticSize() {
-    const radius = (this.view.getCoordinate() as any).getRadius();
-    const { radius: radiusCfg, innerRadius: innerRadiusCfg } = this.plot.options;
-    return (radius / radiusCfg) * innerRadiusCfg * 2;
+    const viewRange = this.plot.view.coordinateBBox;
+    const { radius, innerRadius } = this.plot.options;
+    const minContainerSize = Math.min(viewRange.width, viewRange.height);
+    const size = minContainerSize * radius * innerRadius;
+    return size;
   }
 
   private getStatisticHtmlString(data): string {

diff --git a/src/plots/donut/component/statistic.ts b/src/plots/donut/component/statistic.ts
@@ -1,15 +1,15 @@
-import { each, deepMix, clone, find, isElement } from '@antv/util';
+import { deepMix, isElement } from '@antv/util';
 import { createDom, modifyCSS, getOuterWidth, getOuterHeight } from '@antv/dom-util';
 
 export interface IStaticticHtml {
   x?: number;
   y?: number;
   html?: string;
-  [key: string]: any;
   alignX?: string;
   alignY?: string;
   container?: any;
   statisticClass?: string;
+  [key: string]: any;
 }
 
 export default class StatisticHtml {
@@ -47,6 +47,8 @@ export default class StatisticHtml {
   }
 
   public updatePosition(x, y) {
+    this.x = x;
+    this.y = y;
     this.setDomPosition(x, y);
   }
 
@@ -58,6 +60,8 @@ export default class StatisticHtml {
     return {
       x: 0,
       y: 0,
+      width: 0,
+      height: 0,
       html: '',
       container: null,
       alignX: 'middle',