fix(pie-plot): fix cr suggestions

Author: xinming

__tests__/unit/plots/pie/index-spec.ts

@@ -3,7 +3,9 @@ import { POSITIVE_NEGATIVE_DATA } from '../../../data/common';
 import { createDiv } from '../../../utils/dom';
 
 describe('pie', () => {
-  const data = POSITIVE_NEGATIVE_DATA.filter((o) => o.value > 0).map((d, idx) => idx === 1 ? { ...d, type: 'item1' } : d);
+  const data = POSITIVE_NEGATIVE_DATA.filter((o) => o.value > 0).map((d, idx) =>
+    idx === 1 ? { ...d, type: 'item1' } : d
+  );
   it('angleField: single color', () => {
     const pie = new Pie(createDiv(), {
       width: 400,
@@ -40,8 +42,29 @@ describe('pie', () => {
     // @ts-ignore
     expect(elements.length).toBe(data.length);
     // 绘图数据
-    expect(elements[0].getModel().style.fill || elements[0].getModel().color).toBe('blue');
-    expect(elements[1].getModel().style.fill || elements[1].getModel().color).toBe('red');
+    expect(elements[0].getModel().style?.fill || elements[0].getModel().color).toBe('blue');
+    expect(elements[1].getModel().style?.fill || elements[1].getModel().color).toBe('red');
+  });
+
+  it('no radius', () => {
+    const pie = new Pie(createDiv(), {
+      width: 400,
+      height: 300,
+      data,
+      angleField: 'value',
+      colorField: 'type',
+    });
+
+    pie.render();
+
+    const coordinate = pie.chart.getCoordinate();
+    const { radius } = coordinate;
+    const polarRadius = coordinate.getRadius();
+    expect(radius).toBeUndefined();
+    expect(polarRadius).toBeGreaterThan(0);
+
+    const geometry = pie.chart.geometries[0];
+    const elements = geometry.elements;
   });
 
   it('innerRadius', () => {
@@ -84,10 +107,10 @@ describe('pie', () => {
 
     const geometry = pie.chart.geometries[0];
     const elements = geometry.elements;
-    expect(elements[0].getModel().style.fill).toBe('red');
-    expect(elements[1].getModel().style.fill).toBe('red');
-    expect(elements[1].getModel().style.lineWidth).toBe(3);
-    expect(elements[1].getModel().style.stroke).toBe('yellow');
+    expect(elements[0].getModel().style?.fill).toBe('red');
+    expect(elements[1].getModel().style?.fill).toBe('red');
+    expect(elements[1].getModel().style?.lineWidth).toBe(3);
+    expect(elements[1].getModel().style?.stroke).toBe('yellow');
   });
 
   it('pieStyle: with callback', () => {
@@ -111,8 +134,8 @@ describe('pie', () => {
 
     const geometry = pie.chart.geometries[0];
     const elements = geometry.elements;
-    expect(elements[0].getModel().style.fill).toBe('red');
-    expect(elements[1].getModel().style.fill).toBe('blue');
-    expect(elements[2].getModel().style.fill).toBe('red');
+    expect(elements[0].getModel().style?.fill).toBe('red');
+    expect(elements[1].getModel().style?.fill).toBe('blue');
+    expect(elements[2].getModel().style?.fill).toBe('red');
   });
 });

src/common/adaptor.ts

@@ -8,7 +8,7 @@ import { Options } from '../types';
  * 通用 tooltip 配置
  * @param params
  */
-function tooltip<O extends Options>(params: Params<O>): Params<O> {
+export function tooltip<O extends Options>(params: Params<O>): Params<O> {
   const { chart, options } = params;
   const { tooltip } = options;
 
@@ -18,6 +18,3 @@ function tooltip<O extends Options>(params: Params<O>): Params<O> {
 
   return params;
 }
-
-
-export { tooltip };

src/core/adaptor.ts

@@ -7,7 +7,6 @@ import { Options } from '../types';
 export type Params<O extends Options> = {
   readonly chart: Chart;
   readonly options: O;
-  readonly geometry?: Geometry;
 };
 
 /**

src/plots/pie/adaptor.ts

@@ -20,7 +20,7 @@ function field(params: Params<PieOptions>): Params<PieOptions> {
     geometry.color(colorField, color);
   }
 
-  return { ...params, geometry };
+  return params;
 }
 
 /**
@@ -46,7 +46,7 @@ function meta(params: Params<PieOptions>): Params<PieOptions> {
  */
 function coord(params: Params<PieOptions>): Params<PieOptions> {
   const { chart, options } = params;
-  const { radius, innerRadius = 0 } = options;
+  const { radius, innerRadius } = options;
 
   chart.coordinate({
     type: 'theta',
@@ -79,10 +79,11 @@ function legend(params: Params<PieOptions>): Params<PieOptions> {
  * @param params
  */
 function style(params: Params<PieOptions>): Params<PieOptions> {
-  const { options, geometry } = params;
-  const { pieStyle = {}, angleField, colorField } = options;
+  const { chart, options } = params;
+  const { pieStyle, angleField, colorField } = options;
 
-  if (geometry) {
+  const geometry = chart.geometries[0];
+  if (pieStyle && geometry) {
     if (isFunction(pieStyle)) {
       // 为了兼容，colorField 放第一位
       geometry.style(colorField ? `${colorField}*${angleField}` : angleField, pieStyle);

src/plots/pie/types.ts

@@ -3,11 +3,11 @@ import { ShapeStyle } from '../../types/style';
 
 export interface PieOptions extends Options {
   /** 角度映射字段 */
-  angleField: string;
-  colorField?: string;
-  radius: number;
-  innerRadius?: number;
+  readonly angleField: string;
+  readonly colorField?: string;
+  readonly radius?: number;
+  readonly innerRadius?: number;
 
   /** 饼图图形样式 */
-  pieStyle?: ShapeStyle | ((...args: string[]) => ShapeStyle);
+  readonly pieStyle?: ShapeStyle | ((...args: string[]) => ShapeStyle);
 }

src/types/style.ts

@@ -1,10 +1,10 @@
 /** G shape style 配置, 按道理应该从 G 中引入 */
-export type ShapeStyle = {
+export type ShapeStyle = Readonly<{
   fill?: string;
   stroke?: string;
   lineWidth?: number;
   lineDash?: number[];
   opacity?: number;
   fillOpacity?: number;
   strokeOpacity?: number;
-};
+}>;