feat: 接入g-lite && 去掉jsx (#1614)

antvis · Oct 13, 2022 · 9232d8e · 9232d8e
1 parent 950b65c
commit 9232d8e
Show file tree

Hide file tree

Showing 79 changed files with 89 additions and 905 deletions.
diff --git a/packages/f2/.fatherrc.js b/packages/f2/.fatherrc.js
@@ -9,15 +9,16 @@ export default process.env.CI
         file: 'index',
         minFile: true,
       },
-      entry: ['src/index.ts', 'src/jsx/jsx-runtime.ts'],
+      // entry: ['src/index.ts', 'src/jsx/jsx-runtime.ts'],
+      entry: ['src/index.ts'],
       overridesByEntry: {
         'src/index.ts': {
           umd: { name: 'F2', file: 'index' },
         },
         // for weixin miniapp
-        'src/jsx/jsx-runtime.ts': {
-          umd: { name: 'F2JSXRuntime', file: 'jsx-runtime' },
-        },
+        // 'src/jsx/jsx-runtime.ts': {
+        //   umd: { name: 'F2JSXRuntime', file: 'jsx-runtime' },
+        // },
       },
       extraRollupPlugins: [...(isBundleVis ? [visualizer()] : [])],
     };

diff --git a/packages/f2/package.json b/packages/f2/package.json
@@ -35,7 +35,7 @@
     "@antv/event-emitter": "^0.1.2",
     "@antv/f-engine": "~0.0.2",
     "@antv/scale": "~0.3.3",
-    "@antv/util": "~2.0.6",
+    "@antv/util": "~3.3.0",
     "@babel/runtime": "^7.12.5",
     "d3-cloud": "~1.2.5"
   },

diff --git a/packages/f2/src/canvas.ts b/packages/f2/src/canvas.ts
diff --git a/packages/f2/src/chart/index.ts b/packages/f2/src/chart/index.ts
@@ -1,10 +1,10 @@
-import { JSX } from '../jsx/jsx-namespace';
+import { JSX } from '../index';
 import { ScaleConfig } from '@antv/scale';
 import { each, findIndex, isArray } from '@antv/util';
 import equal from '../base/equal';
 import { Layout, Component } from '../index';
 import Coord from '../coord';
-import Children from '../children';
+import { Children } from '../index';
 // types
 import LayoutController from '../controller/layout';
 import CoordController from '../controller/coord';

diff --git a/packages/f2/src/children.ts b/packages/f2/src/children.ts
diff --git a/packages/f2/src/components/area/areaView.tsx b/packages/f2/src/components/area/areaView.tsx
@@ -15,8 +15,8 @@ export default (props) => {
           type: 'sector',
           property: ['endAngle'],
           attrs: {
-            x: center.x,
-            y: center.y,
+            x: center.x - left,
+            y: center.y - top,
             startAngle,
             r: radius,
           },
@@ -35,8 +35,6 @@ export default (props) => {
           type: 'rect',
           property: ['width'],
           attrs: {
-            x: left,
-            y: top,
             height: height,
           },
           start: {

diff --git a/packages/f2/src/components/axis/axisView.tsx b/packages/f2/src/components/axis/axisView.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import PolarX from './polar/polar-x';
 import PolarY from './polar/polar-y';
 import Top from './rect/top';

diff --git a/packages/f2/src/components/axis/polar/polar-x.tsx b/packages/f2/src/components/axis/polar/polar-x.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { length as vec2Length } from 'gl-matrix/vec2';
 import type { vec2 } from 'gl-matrix';
 import { PolarProps } from '../types';

diff --git a/packages/f2/src/components/axis/polar/polar-y.tsx b/packages/f2/src/components/axis/polar/polar-y.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { length as vec2Length } from 'gl-matrix/vec2';
 import { PolarProps } from '../types';
 

diff --git a/packages/f2/src/components/axis/rect/bottom.tsx b/packages/f2/src/components/axis/rect/bottom.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { RectProps } from '../types';
 import { TextAttrs } from '../../../types';
 

diff --git a/packages/f2/src/components/axis/rect/left.tsx b/packages/f2/src/components/axis/rect/left.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { RectProps } from '../types';
 
 export default (props: RectProps) => {

diff --git a/packages/f2/src/components/axis/rect/right.tsx b/packages/f2/src/components/axis/rect/right.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { RectProps } from '../types';
 
 export default (props: RectProps) => {

diff --git a/packages/f2/src/components/axis/rect/top.tsx b/packages/f2/src/components/axis/rect/top.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { RectProps } from '../types';
 
 export default (props: RectProps) => {

diff --git a/packages/f2/src/components/axis/withAxis.tsx b/packages/f2/src/components/axis/withAxis.tsx
@@ -1,5 +1,5 @@
 import { deepMix, isFunction, mix, each, clone, isString, isNumber } from '@antv/util';
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import equal from '../../base/equal';
 import { PositionLayout } from '../../chart/index';
 import { Component } from '@antv/f-engine';

diff --git a/packages/f2/src/components/gauge/withGauge.tsx b/packages/f2/src/components/gauge/withGauge.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import { Component } from '@antv/f-engine';
 
 const getPoint = (cener, angle, r) => {

diff --git a/packages/f2/src/components/guide/views/Arc.tsx b/packages/f2/src/components/guide/views/Arc.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { deepMix } from '@antv/util';
 import { Style } from '../../../types';
 

diff --git a/packages/f2/src/components/guide/views/Image.tsx b/packages/f2/src/components/guide/views/Image.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { Style } from '../../../types';
 import { deepMix } from '@antv/util';
 

diff --git a/packages/f2/src/components/guide/views/Line.tsx b/packages/f2/src/components/guide/views/Line.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { isArray, deepMix } from '@antv/util';
 import { Style } from '../../../types';
 

diff --git a/packages/f2/src/components/guide/views/Point.tsx b/packages/f2/src/components/guide/views/Point.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { deepMix } from '@antv/util';
 import { Style } from '../../../types';
 

diff --git a/packages/f2/src/components/guide/views/Rect.tsx b/packages/f2/src/components/guide/views/Rect.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { deepMix } from '@antv/util';
 import { Style } from '../../../types';
 

diff --git a/packages/f2/src/components/guide/views/Text.tsx b/packages/f2/src/components/guide/views/Text.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { deepMix } from '@antv/util';
 import { Style } from '../../../types';
 

diff --git a/packages/f2/src/components/guide/withGuide.tsx b/packages/f2/src/components/guide/withGuide.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import { Component } from '@antv/f-engine';
 import { isString, isNil, isFunction } from '@antv/util';
 import { Ref } from '../../types';
@@ -48,7 +48,7 @@ export default (View) => {
       super.didUpdate();
       const shape = this.triggerRef.current;
       if (!shape || shape.destroyed) return;
-      const { x, y, width, height } = shape.get('attrs');
+      const { x, y, width, height } = shape.getBBox();
       const bbox = {
         minX: x,
         minY: y,

diff --git a/packages/f2/src/components/interval/label/polygonLabel.tsx b/packages/f2/src/components/interval/label/polygonLabel.tsx
@@ -1,5 +1,5 @@
 import { isFunction, mix } from '@antv/util';
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { getMiddlePoint } from '../../../util/coord';
 
 const DEFAULT_LABEL_CFG = {

diff --git a/packages/f2/src/components/interval/view/intervalView.tsx b/packages/f2/src/components/interval/view/intervalView.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import Rect from './rect';
 import Polar from './polar';
 

diff --git a/packages/f2/src/components/interval/view/polar.tsx b/packages/f2/src/components/interval/view/polar.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { deepMix } from '@antv/util';
 
 export default (props) => {

diff --git a/packages/f2/src/components/interval/view/polygonView.tsx b/packages/f2/src/components/interval/view/polygonView.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 import { getMiddlePoint } from '../../../util/coord';
 import { convertToPoints } from '../util';
 

diff --git a/packages/f2/src/components/interval/view/rect.tsx b/packages/f2/src/components/interval/view/rect.tsx
@@ -1,5 +1,5 @@
 import { deepMix } from '@antv/util';
-import { jsx } from '../../../jsx';
+import { jsx } from '../../../index';
 
 export default (props) => {
   const { records, animation, y0, clip } = props;

diff --git a/packages/f2/src/components/legend/legendView.tsx b/packages/f2/src/components/legend/legendView.tsx
@@ -1,5 +1,5 @@
 import { isFunction } from '@antv/util';
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 
 const Marker = ({ type, color }) => {
   if (type === 'square') {

diff --git a/packages/f2/src/components/legend/withLegend.tsx b/packages/f2/src/components/legend/withLegend.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import { Component, renderShape } from '@antv/f-engine';
 import Chart from '../../chart';
 import { find, isFunction } from '@antv/util';
@@ -119,7 +119,7 @@ export default (View) => {
     getMaxItemBox(legendShape) {
       let maxItemWidth = 0;
       let maxItemHeight = 0;
-      (legendShape.getChildren() || []).forEach((child) => {
+      (legendShape.children || []).forEach((child) => {
         const width = child.getAttribute('width');
         const height = child.getAttribute('height');
 
@@ -264,7 +264,7 @@ export default (View) => {
           return;
         }
         // @ts-ignore
-        const dataItem = clickItem.get('data-item');
+        const dataItem = clickItem.config['data-item'];
         if (!dataItem) {
           return;
         }

diff --git a/packages/f2/src/components/line/lineView.tsx b/packages/f2/src/components/line/lineView.tsx
@@ -1,5 +1,5 @@
 import { deepMix, isArray } from '@antv/util';
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import { LineViewProps } from './types';
 
 function concatPoints(children) {
@@ -55,7 +55,7 @@ function AnimationEndView(props) {
           onFrame: function(t) {
             // 这段逻辑有点恶心。。
             const { element } = this;
-            const children = element.getChildren();
+            const children = element.children;
             const point = getPoint(points, t);
             children.forEach((child) => {
               child.moveTo(point.x, point.y);
@@ -82,8 +82,8 @@ export default (props: LineViewProps) => {
           type: 'sector',
           property: ['endAngle'],
           attrs: {
-            x: center.x,
-            y: center.y,
+            x: center.x - left,
+            y: center.y - top,
             startAngle,
             r: radius,
           },
@@ -102,8 +102,8 @@ export default (props: LineViewProps) => {
           type: 'rect',
           property: ['width'],
           attrs: {
-            x: left,
-            y: top,
+            // x: left,
+            // y: top,
             height: height,
           },
           start: {

diff --git a/packages/f2/src/components/line/types.ts b/packages/f2/src/components/line/types.ts
@@ -1,4 +1,4 @@
-import { JSX } from '../../jsx/jsx-namespace';
+import { JSX } from '../../index';
 import { GeometryProps, AdjustConfig } from '../geometry/interface';
 import Coord from '../../coord';
 

diff --git a/packages/f2/src/components/line/withLine.tsx b/packages/f2/src/components/line/withLine.tsx
@@ -1,4 +1,4 @@
-import { jsx } from '../../jsx';
+import { jsx } from '../../index';
 import { isArray } from '@antv/util';
 import Geometry from '../geometry';
 import { LineProps } from './types';