fix: 修改 FEngine layout 的命名 (#1647)

antvis · Nov 16, 2022 · ec28248 · ec28248
1 parent 2a5fa21
commit ec28248
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 33 deletions.
diff --git a/packages/f2/src/chart/index.ts b/packages/f2/src/chart/index.ts
@@ -69,9 +69,9 @@ class Chart extends Component<ChartProps, ChartState> {
   }
 
   private getStyle(props: ChartProps) {
-    const { context, style } = this;
+    const { context, layout } = this;
     const { theme, px2hd } = context;
-    const { left, top, width, height } = style;
+    const { left, top, width, height } = layout;
     const { style: customStyle } = props;
     return px2hd({
       left,

diff --git a/packages/f2/src/components/area/withArea.tsx b/packages/f2/src/components/area/withArea.tsx
@@ -1,6 +1,6 @@
 import withLine from '../line/withLine';
 
-export default (View) => {
+export default (View): any => {
   return class Area extends withLine(View) {
     getDefaultCfg() {
       return {

diff --git a/packages/f2/src/components/gauge/withGauge.tsx b/packages/f2/src/components/gauge/withGauge.tsx
@@ -34,10 +34,12 @@ export interface GuageProps {
   startAngle?: number;
   endAngle?: number;
   tickCount?: number;
-  tickOffset?: number;
-  tickLength?: number;
-  r?: number;
+  tickOffset?: number | string;
+  tickLength?: number | string;
+  r?: number | string;
+  r0?: number | string;
   center?: { x: number; y: number };
+  percent?: number;
 }
 
 export default (View: ComponentType): ClassComponent<GuageProps> => {

diff --git a/packages/f2/src/components/sunburst/withSunburst.tsx b/packages/f2/src/components/sunburst/withSunburst.tsx
@@ -34,17 +34,16 @@ export default (View): ClassComponent<any> => {
     }
 
     willMount() {
-      const { props, coord, style } = this;
+      const { props, coord, layout } = this;
       const { coord: coordOption } = props;
-      coord.updateLayout(style);
+      coord.updateLayout(layout);
 
       coord.create(coordOption);
     }
 
     didMount() {
-      const { props, container, context } = this;
+      const { props, context } = this;
       const { onClick } = props;
-      const { canvas } = context;
       this.triggerRef = [];
 
       context.gesture.on('click', (ev) => {

diff --git a/packages/f2/src/components/treemap/withTreemap.tsx b/packages/f2/src/components/treemap/withTreemap.tsx
@@ -22,9 +22,9 @@ export default (View): ClassComponent<any> => {
     }
 
     willMount() {
-      const { props, coord, style } = this;
+      const { props, coord, layout } = this;
       const { coord: coordOption } = props;
-      coord.updateLayout(style);
+      coord.updateLayout(layout);
 
       coord.create(coordOption);
     }

diff --git a/packages/f2/src/coord/base.ts b/packages/f2/src/coord/base.ts
@@ -1,6 +1,5 @@
-import { Layout } from '../index';
 import { Range, Point, Option } from './types';
-import { isArray } from '@antv/util';
+import { isArray, mix } from '@antv/util';
 
 function transposedRect({ xMin, xMax, yMin, yMax }) {
   return { xMin: yMin, xMax: yMax, yMin: xMin, yMax: xMax };
@@ -55,7 +54,14 @@ interface Rect {
  * convert相关的方法，涉及将标准坐标系映射到实际坐标系内
  * transform相关的方法，是仅将某一种关键点转换成另一种关键点 (比如将x/y/size/y0转换成yMin/yMax/..)
  */
-class Base extends Layout {
+class Base {
+  left = 0;
+  top = 0;
+  width = 0;
+  height = 0;
+  right: number;
+  bottom: number;
+
   type: string;
   // 用来特殊标识是否是极坐标
   isPolar: boolean;
@@ -70,14 +76,15 @@ class Base extends Layout {
   y: Range = [0, 1];
 
   constructor(option: Option) {
-    super(option);
     this.update(option);
   }
 
   update(option: Option) {
-    super.update(option);
-
+    mix(this, option);
     const { left, top, width, height } = this;
+
+    this.right = left + width;
+    this.bottom = top + height;
     this.center = {
       x: left + width / 2,
       y: top + height / 2,

diff --git a/packages/f2/src/deps/f2-scale/src/index.ts b/packages/f2/src/deps/f2-scale/src/index.ts
@@ -12,17 +12,6 @@ import Identity from './identity/index';
 import { getTickMethod, registerTickMethod } from './tick-method/index';
 import { ScaleConfig, Tick } from './types';
 
-registerScale('cat', Category);
-registerScale('category', Category);
-registerScale('identity', Identity);
-registerScale('linear', Linear);
-registerScale('log', Log);
-registerScale('pow', Pow);
-registerScale('time', Time);
-registerScale('timeCat', TimeCat);
-registerScale('quantize', Quantize);
-registerScale('quantile', Quantile);
-
 export {
   Category,
   Identity,

diff --git a/packages/f2/src/index.ts b/packages/f2/src/index.ts
@@ -9,8 +9,6 @@ import {
   createRef,
   Component,
   Children,
-  Layout,
-  LayoutProps,
   computeLayout,
   Theme,
 } from '@antv/f-engine';
@@ -31,8 +29,6 @@ export {
   Component,
   Timeline,
   Chart,
-  Layout,
-  LayoutProps,
   computeLayout,
   CanvasRenderer,
 };