Skip to content

Commit 510f6a5

Browse files
hustccBBSQQ
authored andcommitted
refactor(common-helper): 将 common helper 移动到 utils 目录中 (#1430)
1 parent 69e2682 commit 510f6a5

File tree

9 files changed

+32
-6
lines changed

9 files changed

+32
-6
lines changed

__tests__/unit/utils/geometry-spec.ts

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { Chart } from '@antv/g2';
2+
import { findGeometry } from '../../../src/utils';
3+
import { createDiv } from '../../utils/dom';
4+
5+
const div = createDiv();
6+
7+
describe('geometry', () => {
8+
it('findGeometry', () => {
9+
const chart = new Chart({
10+
container: div,
11+
});
12+
13+
chart.data([
14+
{ x: 1, y: 1 },
15+
{ x: 2, y: 2 },
16+
]);
17+
18+
const line = chart.line().position('x*y');
19+
const interval = chart.interval().position('x*y');
20+
21+
expect(findGeometry(chart, 'line')).toBe(line);
22+
expect(findGeometry(chart, 'interval')).toBe(interval);
23+
expect(findGeometry(chart, 'point')).toBe(undefined);
24+
});
25+
});

src/plots/area/adaptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Geometry } from '@antv/g2';
22
import { deepMix, each } from '@antv/util';
33
import { tooltip, interaction, animation, theme } from '../../adaptor/common';
4-
import { findGeometry } from '../../common/helper';
4+
import { findGeometry } from '../../utils';
55
import { Params } from '../../core/adaptor';
66
import { area, point, line } from '../../adaptor/geometries';
77
import { flow } from '../../utils';

src/plots/column/adaptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { deepMix } from '@antv/util';
22
import { Params } from '../../core/adaptor';
3-
import { findGeometry } from '../../common/helper';
3+
import { findGeometry } from '../../utils';
44
import { tooltip, interaction, animation, theme } from '../../adaptor/common';
55
import { interval } from '../../adaptor/geometries';
66
import { flow, pick } from '../../utils';

src/plots/heatmap/adaptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { deepMix, isFunction, isObject } from '@antv/util';
22
import { Params } from '../../core/adaptor';
3-
import { findGeometry } from '../../common/helper';
3+
import { findGeometry } from '../../utils';
44
import { flow, pick } from '../../utils';
55
import { AXIS_META_CONFIG_KEYS, DEFAULT_COLORS } from '../../constant';
66
import { tooltip, interaction, animation, theme } from '../../adaptor/common';

src/plots/histogram/adaptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import DataSet from '@antv/data-set';
22
import { deepMix, isFunction } from '@antv/util';
33
import { Params } from '../../core/adaptor';
44
import { tooltip, interaction, animation, theme } from '../../adaptor/common';
5-
import { findGeometry } from '../../common/helper';
5+
import { findGeometry } from '../../utils';
66
import { flow, pick } from '../../utils';
77
import { AXIS_META_CONFIG_KEYS } from '../../constant';
88
import { HistogramOptions } from './types';

src/plots/line/adaptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { deepMix } from '@antv/util';
22
import { Params } from '../../core/adaptor';
33
import { tooltip, interaction, animation, theme } from '../../adaptor/common';
4-
import { findGeometry } from '../../common/helper';
4+
import { findGeometry } from '../../utils';
55
import { AXIS_META_CONFIG_KEYS } from '../../constant';
66
import { point, line } from '../../adaptor/geometries';
77
import { flow, pick } from '../../utils';

src/plots/scatter/adaptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Params } from '../../core/adaptor';
33
import { flow, pick, log, LEVEL } from '../../utils';
44
import { ScatterOptions } from './types';
55
import { tooltip, interaction, animation, theme } from '../../adaptor/common';
6-
import { findGeometry } from '../../common/helper';
6+
import { findGeometry } from '../../utils';
77
import { AXIS_META_CONFIG_KEYS } from '../../constant';
88
import { REFLECTS } from './reflect';
99

File renamed without changes.

src/utils/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ export { pick } from './pick';
33
export { template } from './template';
44
export { log, invariant, LEVEL } from './invariant';
55
export { getContainerSize } from './dom';
6+
export { findGeometry } from './geometry';

0 commit comments

Comments
 (0)