@opendata-ai/openchart-engine 8.0.0-rc.9 → 8.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +175 -12
- package/dist/index.js +917 -168
- package/dist/index.js.map +1 -1
- package/package.json +3 -4
- package/src/__test-fixtures__/specs.ts +0 -182
- package/src/__tests__/__snapshots__/compile-snapshot.test.ts.snap +0 -2401
- package/src/__tests__/annotation-behavior.test.ts +0 -852
- package/src/__tests__/axes.test.ts +0 -1579
- package/src/__tests__/compile-animation.test.ts +0 -161
- package/src/__tests__/compile-chart.test.ts +0 -1303
- package/src/__tests__/compile-footnotes.test.ts +0 -277
- package/src/__tests__/compile-layer.test.ts +0 -969
- package/src/__tests__/compile-snapshot.test.ts +0 -156
- package/src/__tests__/compound-labels.test.ts +0 -147
- package/src/__tests__/dimensions.test.ts +0 -918
- package/src/__tests__/encoding-sugar.test.ts +0 -390
- package/src/__tests__/facet.test.ts +0 -215
- package/src/__tests__/helpers/invariants.ts +0 -299
- package/src/__tests__/known-bugs.test.ts +0 -566
- package/src/__tests__/layout-fuzz.test.ts +0 -358
- package/src/__tests__/layout-invariants.test.ts +0 -535
- package/src/__tests__/legend.test.ts +0 -721
- package/src/__tests__/mark-keys.test.ts +0 -294
- package/src/__tests__/ranking-recipes.test.ts +0 -260
- package/src/__tests__/rotation.test.ts +0 -83
- package/src/__tests__/scales.test.ts +0 -323
- package/src/__tests__/series-search.test.ts +0 -92
- package/src/__tests__/spec-sugar.test.ts +0 -801
- package/src/__tests__/you-draw-it.test.ts +0 -160
- package/src/annotations/__tests__/compute.test.ts +0 -1672
- package/src/annotations/__tests__/geometry.test.ts +0 -66
- package/src/annotations/__tests__/placement-fuzz.test.ts +0 -256
- package/src/annotations/__tests__/placement-invariants.test.ts +0 -345
- package/src/annotations/__tests__/placement.test.ts +0 -316
- package/src/annotations/__tests__/resolve-text.test.ts +0 -788
- package/src/annotations/__tests__/rich-text.test.ts +0 -91
- package/src/annotations/__tests__/thinning.test.ts +0 -285
- package/src/annotations/collisions.ts +0 -326
- package/src/annotations/compute.ts +0 -333
- package/src/annotations/constants.ts +0 -162
- package/src/annotations/geometry.ts +0 -376
- package/src/annotations/move.ts +0 -135
- package/src/annotations/placement.ts +0 -636
- package/src/annotations/position.ts +0 -131
- package/src/annotations/resolve-range.ts +0 -117
- package/src/annotations/resolve-refline.ts +0 -157
- package/src/annotations/resolve-text.ts +0 -545
- package/src/annotations/rich-text.ts +0 -65
- package/src/annotations/thinning.ts +0 -190
- package/src/barlist/__tests__/compile-barlist.test.ts +0 -200
- package/src/barlist/compile-barlist.ts +0 -391
- package/src/barlist/types.ts +0 -28
- package/src/charts/__tests__/post-process.test.ts +0 -237
- package/src/charts/__tests__/registry.test.ts +0 -116
- package/src/charts/__tests__/utils.test.ts +0 -195
- package/src/charts/_shared/__tests__/density-filter.test.ts +0 -32
- package/src/charts/_shared/density-filter.ts +0 -26
- package/src/charts/_shared/format-label-value.ts +0 -16
- package/src/charts/bar/__tests__/compute.test.ts +0 -934
- package/src/charts/bar/__tests__/gradient-orient.test.ts +0 -127
- package/src/charts/bar/__tests__/labels.test.ts +0 -292
- package/src/charts/bar/compute.ts +0 -539
- package/src/charts/bar/index.ts +0 -60
- package/src/charts/bar/labels.ts +0 -311
- package/src/charts/beeswarm/__tests__/compute.test.ts +0 -280
- package/src/charts/beeswarm/__tests__/dodge.test.ts +0 -148
- package/src/charts/beeswarm/compute.ts +0 -203
- package/src/charts/beeswarm/dodge.ts +0 -155
- package/src/charts/beeswarm/index.ts +0 -32
- package/src/charts/builtin.ts +0 -75
- package/src/charts/calendar/__tests__/compute.test.ts +0 -417
- package/src/charts/calendar/compute.ts +0 -319
- package/src/charts/calendar/index.ts +0 -32
- package/src/charts/column/__tests__/compute.test.ts +0 -540
- package/src/charts/column/__tests__/labels.test.ts +0 -179
- package/src/charts/column/compute.ts +0 -493
- package/src/charts/column/index.ts +0 -53
- package/src/charts/column/labels.ts +0 -229
- package/src/charts/dot/__tests__/compute.test.ts +0 -380
- package/src/charts/dot/__tests__/labels.test.ts +0 -98
- package/src/charts/dot/compute.ts +0 -285
- package/src/charts/dot/index.ts +0 -62
- package/src/charts/dot/labels.ts +0 -121
- package/src/charts/line/__tests__/compute.test.ts +0 -1194
- package/src/charts/line/__tests__/curves.test.ts +0 -51
- package/src/charts/line/__tests__/labels.test.ts +0 -94
- package/src/charts/line/__tests__/mark-options.test.ts +0 -175
- package/src/charts/line/area.ts +0 -484
- package/src/charts/line/compute.ts +0 -356
- package/src/charts/line/curves.ts +0 -85
- package/src/charts/line/index.ts +0 -176
- package/src/charts/line/labels.ts +0 -177
- package/src/charts/parliament/__tests__/compute.test.ts +0 -411
- package/src/charts/parliament/compute.ts +0 -313
- package/src/charts/parliament/index.ts +0 -32
- package/src/charts/pie/__tests__/compute.test.ts +0 -384
- package/src/charts/pie/__tests__/labels.test.ts +0 -132
- package/src/charts/pie/compute.ts +0 -324
- package/src/charts/pie/index.ts +0 -49
- package/src/charts/pie/labels.ts +0 -143
- package/src/charts/post-process.ts +0 -229
- package/src/charts/range/__tests__/compute.test.ts +0 -486
- package/src/charts/range/compute.ts +0 -273
- package/src/charts/range/index.ts +0 -82
- package/src/charts/range/labels.ts +0 -169
- package/src/charts/rect/__tests__/compute.test.ts +0 -120
- package/src/charts/rect/index.ts +0 -127
- package/src/charts/registry.ts +0 -72
- package/src/charts/rule/index.ts +0 -139
- package/src/charts/scatter/__tests__/compute.test.ts +0 -488
- package/src/charts/scatter/__tests__/trendline.test.ts +0 -191
- package/src/charts/scatter/compute.ts +0 -192
- package/src/charts/scatter/index.ts +0 -46
- package/src/charts/scatter/trendline.ts +0 -100
- package/src/charts/text/__tests__/compute.test.ts +0 -307
- package/src/charts/text/index.ts +0 -141
- package/src/charts/tick/__tests__/compute.test.ts +0 -75
- package/src/charts/tick/index.ts +0 -99
- package/src/charts/utils.ts +0 -170
- package/src/charts/waffle/__tests__/compute.test.ts +0 -305
- package/src/charts/waffle/compute.ts +0 -197
- package/src/charts/waffle/index.ts +0 -31
- package/src/compile/__tests__/color-scale-range.test.ts +0 -158
- package/src/compile/__tests__/color-scale-reverse.test.ts +0 -89
- package/src/compile/__tests__/data-clip.test.ts +0 -127
- package/src/compile/__tests__/fill-patterns.test.ts +0 -154
- package/src/compile/__tests__/size-scale.test.ts +0 -108
- package/src/compile/__tests__/watermark-obstacle.test.ts +0 -93
- package/src/compile/color-scale-range.ts +0 -101
- package/src/compile/data-clip.ts +0 -48
- package/src/compile/fill-patterns.ts +0 -74
- package/src/compile/layer.ts +0 -630
- package/src/compile/size-scale.ts +0 -141
- package/src/compile/spec-sugar.ts +0 -758
- package/src/compile/watermark-obstacle.ts +0 -54
- package/src/compile/you-draw-it.ts +0 -123
- package/src/compile.ts +0 -1503
- package/src/compiler/__tests__/a11y-warnings.test.ts +0 -148
- package/src/compiler/__tests__/animation.test.ts +0 -177
- package/src/compiler/__tests__/compile.test.ts +0 -87
- package/src/compiler/__tests__/fixtures/vl-parity/axis-null.json +0 -19
- package/src/compiler/__tests__/fixtures/vl-parity/color-value.json +0 -20
- package/src/compiler/__tests__/fixtures/vl-parity/count-aggregate.json +0 -22
- package/src/compiler/__tests__/fixtures/vl-parity/data-values.json +0 -19
- package/src/compiler/__tests__/fixtures/vl-parity/layer-axis-null.json +0 -14
- package/src/compiler/__tests__/fixtures/vl-parity/layer-count.json +0 -34
- package/src/compiler/__tests__/fixtures/vl-parity/layer-data-values.json +0 -22
- package/src/compiler/__tests__/fixtures/vl-parity/layer-legend-null.json +0 -41
- package/src/compiler/__tests__/fixtures/vl-parity/layer-scheme.json +0 -38
- package/src/compiler/__tests__/fixtures/vl-parity/layer-sort.json +0 -28
- package/src/compiler/__tests__/fixtures/vl-parity/layer-theta.json +0 -28
- package/src/compiler/__tests__/fixtures/vl-parity/layer-title.json +0 -30
- package/src/compiler/__tests__/fixtures/vl-parity/layer-value-def.json +0 -29
- package/src/compiler/__tests__/fixtures/vl-parity/legend-null.json +0 -32
- package/src/compiler/__tests__/fixtures/vl-parity/scheme.json +0 -25
- package/src/compiler/__tests__/fixtures/vl-parity/sort-by-value.json +0 -19
- package/src/compiler/__tests__/fixtures/vl-parity/theta-arc.json +0 -19
- package/src/compiler/__tests__/fixtures/vl-parity/title-subtitle.json +0 -21
- package/src/compiler/__tests__/fixtures/vl-parity/width-height.json +0 -23
- package/src/compiler/__tests__/keys.test.ts +0 -83
- package/src/compiler/__tests__/normalize-highlight.test.ts +0 -103
- package/src/compiler/__tests__/normalize.test.ts +0 -399
- package/src/compiler/__tests__/sparkline-defaults.test.ts +0 -153
- package/src/compiler/__tests__/validate-did-you-mean.test.ts +0 -170
- package/src/compiler/__tests__/validate-highlight.test.ts +0 -112
- package/src/compiler/__tests__/validate-near-miss.test.ts +0 -251
- package/src/compiler/__tests__/validate.test.ts +0 -629
- package/src/compiler/__tests__/vl-parity.test.ts +0 -68
- package/src/compiler/a11y-warnings.ts +0 -110
- package/src/compiler/animation.ts +0 -142
- package/src/compiler/index.ts +0 -47
- package/src/compiler/keys.ts +0 -55
- package/src/compiler/normalize.ts +0 -734
- package/src/compiler/sparkline-defaults.ts +0 -138
- package/src/compiler/types.ts +0 -241
- package/src/compiler/validate.ts +0 -2041
- package/src/endpoint-labels/__tests__/compute.test.ts +0 -587
- package/src/endpoint-labels/compute.ts +0 -621
- package/src/endpoint-labels/constants.ts +0 -54
- package/src/endpoint-labels/format.ts +0 -60
- package/src/endpoint-labels/predict.ts +0 -139
- package/src/format/__tests__/field-format.test.ts +0 -164
- package/src/format/field-format.ts +0 -27
- package/src/geo/__tests__/compile-map.test.ts +0 -1128
- package/src/geo/compile-map.ts +0 -1376
- package/src/geo/join.ts +0 -115
- package/src/geo/projections.ts +0 -65
- package/src/geo/types.ts +0 -26
- package/src/graphs/__tests__/community.test.ts +0 -228
- package/src/graphs/__tests__/compile-graph.test.ts +0 -396
- package/src/graphs/__tests__/encoding.test.ts +0 -415
- package/src/graphs/community.ts +0 -92
- package/src/graphs/compile-graph.ts +0 -329
- package/src/graphs/encoding.ts +0 -356
- package/src/graphs/types.ts +0 -106
- package/src/index.ts +0 -177
- package/src/layout/__tests__/metrics.test.ts +0 -97
- package/src/layout/__tests__/scales-highlight.test.ts +0 -192
- package/src/layout/axes/rotation.ts +0 -152
- package/src/layout/axes/thinning.ts +0 -98
- package/src/layout/axes/ticks.ts +0 -409
- package/src/layout/axes.ts +0 -757
- package/src/layout/dimensions.ts +0 -912
- package/src/layout/facet.ts +0 -91
- package/src/layout/gridlines.ts +0 -84
- package/src/layout/metrics.ts +0 -132
- package/src/layout/plan.ts +0 -631
- package/src/layout/scales.ts +0 -1053
- package/src/layout/shared.ts +0 -44
- package/src/legend/__tests__/continuous.test.ts +0 -318
- package/src/legend/__tests__/redundancy.test.ts +0 -108
- package/src/legend/__tests__/size.test.ts +0 -348
- package/src/legend/__tests__/suppression.test.ts +0 -382
- package/src/legend/compute.ts +0 -748
- package/src/legend/continuous.ts +0 -327
- package/src/legend/size.ts +0 -407
- package/src/legend/suppression.ts +0 -226
- package/src/legend/wrap.ts +0 -117
- package/src/sankey/__tests__/compile-sankey.test.ts +0 -458
- package/src/sankey/__tests__/layout.test.ts +0 -165
- package/src/sankey/__tests__/node-label-wrap.test.ts +0 -114
- package/src/sankey/__tests__/node-sort.test.ts +0 -45
- package/src/sankey/compile-sankey.ts +0 -706
- package/src/sankey/layout.ts +0 -184
- package/src/sankey/types.ts +0 -41
- package/src/tables/__tests__/bar-column.test.ts +0 -147
- package/src/tables/__tests__/category-colors.test.ts +0 -230
- package/src/tables/__tests__/compile-table.test.ts +0 -236
- package/src/tables/__tests__/format-cells.test.ts +0 -143
- package/src/tables/__tests__/heatmap.test.ts +0 -148
- package/src/tables/__tests__/pagination.test.ts +0 -78
- package/src/tables/__tests__/search.test.ts +0 -94
- package/src/tables/__tests__/sort.test.ts +0 -107
- package/src/tables/__tests__/sparkline.test.ts +0 -122
- package/src/tables/bar-column.ts +0 -94
- package/src/tables/category-colors.ts +0 -78
- package/src/tables/compile-table.ts +0 -427
- package/src/tables/format-cells.ts +0 -115
- package/src/tables/heatmap.ts +0 -141
- package/src/tables/pagination.ts +0 -46
- package/src/tables/search.ts +0 -66
- package/src/tables/sort.ts +0 -69
- package/src/tables/sparkline.ts +0 -113
- package/src/tables/utils.ts +0 -16
- package/src/tilemap/__tests__/compile-tilemap.test.ts +0 -576
- package/src/tilemap/compile-tilemap.ts +0 -755
- package/src/tilemap/layout.ts +0 -172
- package/src/tilemap/types.ts +0 -33
- package/src/tooltips/__tests__/compute.test.ts +0 -582
- package/src/tooltips/compute.ts +0 -700
- package/src/transforms/__tests__/aggregate.test.ts +0 -159
- package/src/transforms/__tests__/bin.test.ts +0 -88
- package/src/transforms/__tests__/calculate.test.ts +0 -146
- package/src/transforms/__tests__/conditional.test.ts +0 -127
- package/src/transforms/__tests__/filter-relative.test.ts +0 -202
- package/src/transforms/__tests__/filter.test.ts +0 -59
- package/src/transforms/__tests__/fold.test.ts +0 -79
- package/src/transforms/__tests__/index.test.ts +0 -93
- package/src/transforms/__tests__/predicates.test.ts +0 -193
- package/src/transforms/__tests__/timeunit.test.ts +0 -129
- package/src/transforms/__tests__/window.test.ts +0 -286
- package/src/transforms/aggregate.ts +0 -131
- package/src/transforms/bin.ts +0 -87
- package/src/transforms/calculate.ts +0 -60
- package/src/transforms/conditional.ts +0 -46
- package/src/transforms/filter.ts +0 -122
- package/src/transforms/fold.ts +0 -49
- package/src/transforms/index.ts +0 -60
- package/src/transforms/predicates.ts +0 -123
- package/src/transforms/timeunit.ts +0 -88
- package/src/transforms/window.ts +0 -185
|
@@ -1,229 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Mark post-processing: obstacle computation, renderer dispatch, and
|
|
3
|
-
* animation index assignment. These are mark-type-aware operations that
|
|
4
|
-
* run after the chart renderer has produced marks.
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
|
-
import type {
|
|
8
|
-
AreaMark,
|
|
9
|
-
Encoding,
|
|
10
|
-
LineMark,
|
|
11
|
-
Mark,
|
|
12
|
-
MarkDef,
|
|
13
|
-
PointMark,
|
|
14
|
-
RectMark,
|
|
15
|
-
ResolvedAnimation,
|
|
16
|
-
} from '@opendata-ai/openchart-core';
|
|
17
|
-
import type { PlacementObstacle } from '../annotations/placement';
|
|
18
|
-
import { sampleAreaObstacles, samplePolylineObstacles } from '../annotations/placement';
|
|
19
|
-
import type { ResolvedScales } from '../layout/scales';
|
|
20
|
-
|
|
21
|
-
// ---------------------------------------------------------------------------
|
|
22
|
-
// Mark obstacles for annotation collision avoidance
|
|
23
|
-
// ---------------------------------------------------------------------------
|
|
24
|
-
|
|
25
|
-
/**
|
|
26
|
-
* Compute bounding rects from marks to use as obstacles for annotation nudging.
|
|
27
|
-
*
|
|
28
|
-
* For band-scale charts (bar, dot): groups marks by band row and returns
|
|
29
|
-
* a single obstacle per row spanning the full band height and x-range.
|
|
30
|
-
*
|
|
31
|
-
* For other charts (column, scatter): returns individual mark bounds so
|
|
32
|
-
* annotations avoid overlapping any visible data mark.
|
|
33
|
-
*/
|
|
34
|
-
export function computeMarkObstacles(marks: Mark[], scales: ResolvedScales): PlacementObstacle[] {
|
|
35
|
-
// Band-scale y-axis: group marks by row for efficient obstacle computation
|
|
36
|
-
if (scales.y?.type === 'band') {
|
|
37
|
-
return computeBandRowObstacles(marks, scales);
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
const obstacles: PlacementObstacle[] = [];
|
|
41
|
-
for (const mark of marks) {
|
|
42
|
-
if (mark.type === 'rect') {
|
|
43
|
-
const rm = mark as RectMark;
|
|
44
|
-
obstacles.push({ x: rm.x, y: rm.y, width: rm.width, height: rm.height, kind: 'mark' });
|
|
45
|
-
} else if (mark.type === 'point') {
|
|
46
|
-
const pm = mark as PointMark;
|
|
47
|
-
obstacles.push({
|
|
48
|
-
x: pm.cx - pm.r,
|
|
49
|
-
y: pm.cy - pm.r,
|
|
50
|
-
width: pm.r * 2,
|
|
51
|
-
height: pm.r * 2,
|
|
52
|
-
kind: 'mark',
|
|
53
|
-
});
|
|
54
|
-
} else if (mark.type === 'line') {
|
|
55
|
-
const lm = mark as LineMark;
|
|
56
|
-
if (lm.points.length > 0) {
|
|
57
|
-
obstacles.push(...samplePolylineObstacles(lm.points, 'line'));
|
|
58
|
-
}
|
|
59
|
-
} else if (mark.type === 'area') {
|
|
60
|
-
const am = mark as AreaMark;
|
|
61
|
-
if (am.topPoints.length > 0) {
|
|
62
|
-
obstacles.push(...sampleAreaObstacles(am.topPoints, am.bottomPoints));
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
return obstacles;
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
/** Group band-scale marks by row, returning one obstacle per band. */
|
|
70
|
-
function computeBandRowObstacles(marks: Mark[], scales: ResolvedScales): PlacementObstacle[] {
|
|
71
|
-
const rows = new Map<number, { minX: number; maxX: number; bandY: number }>();
|
|
72
|
-
|
|
73
|
-
for (const mark of marks) {
|
|
74
|
-
let cy: number;
|
|
75
|
-
let left: number;
|
|
76
|
-
let right: number;
|
|
77
|
-
|
|
78
|
-
if (mark.type === 'point') {
|
|
79
|
-
const pm = mark as PointMark;
|
|
80
|
-
cy = pm.cy;
|
|
81
|
-
left = pm.cx - pm.r;
|
|
82
|
-
right = pm.cx + pm.r;
|
|
83
|
-
} else if (mark.type === 'rect') {
|
|
84
|
-
const rm = mark as RectMark;
|
|
85
|
-
cy = rm.y + rm.height / 2;
|
|
86
|
-
left = rm.x;
|
|
87
|
-
right = rm.x + rm.width;
|
|
88
|
-
} else {
|
|
89
|
-
continue;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
// Round cy to group marks on the same band
|
|
93
|
-
const key = Math.round(cy);
|
|
94
|
-
const existing = rows.get(key);
|
|
95
|
-
if (existing) {
|
|
96
|
-
existing.minX = Math.min(existing.minX, left);
|
|
97
|
-
existing.maxX = Math.max(existing.maxX, right);
|
|
98
|
-
} else {
|
|
99
|
-
rows.set(key, { minX: left, maxX: right, bandY: cy });
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
// Get bandwidth from the band scale
|
|
104
|
-
const bandScale = scales.y!.scale as { bandwidth?: () => number };
|
|
105
|
-
const bandwidth = bandScale.bandwidth?.() ?? 0;
|
|
106
|
-
if (bandwidth === 0) return [];
|
|
107
|
-
|
|
108
|
-
const obstacles: PlacementObstacle[] = [];
|
|
109
|
-
for (const { minX, maxX, bandY } of rows.values()) {
|
|
110
|
-
obstacles.push({
|
|
111
|
-
x: minX,
|
|
112
|
-
y: bandY - bandwidth / 2,
|
|
113
|
-
width: maxX - minX,
|
|
114
|
-
height: bandwidth,
|
|
115
|
-
kind: 'mark',
|
|
116
|
-
});
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
return obstacles;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
// ---------------------------------------------------------------------------
|
|
123
|
-
// Renderer key dispatch
|
|
124
|
-
// ---------------------------------------------------------------------------
|
|
125
|
-
|
|
126
|
-
/**
|
|
127
|
-
* Resolve the renderer key from mark type, encoding, and mark definition.
|
|
128
|
-
*
|
|
129
|
-
* - 'bar' -> 'bar' (horizontal) or 'bar:vertical' based on encoding axis types
|
|
130
|
-
* - 'arc' -> 'arc' (pie) or 'arc:donut' based on innerRadius
|
|
131
|
-
* - All other mark types pass through unchanged
|
|
132
|
-
*/
|
|
133
|
-
export function resolveRendererKey(
|
|
134
|
-
markType: string,
|
|
135
|
-
encoding: Partial<Encoding>,
|
|
136
|
-
markDef: Partial<MarkDef>,
|
|
137
|
-
): string {
|
|
138
|
-
if (markType === 'bar') {
|
|
139
|
-
const xType = encoding.x?.type;
|
|
140
|
-
const yType = encoding.y?.type;
|
|
141
|
-
const isVertical =
|
|
142
|
-
(xType === 'nominal' || xType === 'ordinal' || xType === 'temporal') &&
|
|
143
|
-
yType === 'quantitative';
|
|
144
|
-
if (isVertical) {
|
|
145
|
-
return 'bar:vertical';
|
|
146
|
-
}
|
|
147
|
-
} else if (markType === 'arc') {
|
|
148
|
-
const innerRadius = markDef.innerRadius;
|
|
149
|
-
if (innerRadius && innerRadius > 0) {
|
|
150
|
-
return 'arc:donut';
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
return markType;
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
// ---------------------------------------------------------------------------
|
|
157
|
-
// Animation index assignment
|
|
158
|
-
// ---------------------------------------------------------------------------
|
|
159
|
-
|
|
160
|
-
/** Extract the primary quantitative value from a mark for value-based stagger ordering. */
|
|
161
|
-
function getMarkPrimaryValue(mark: Mark): number {
|
|
162
|
-
switch (mark.type) {
|
|
163
|
-
case 'rect':
|
|
164
|
-
return mark.height; // bar height is the primary value encoding
|
|
165
|
-
case 'point':
|
|
166
|
-
return mark.cy; // y position for scatter
|
|
167
|
-
case 'arc':
|
|
168
|
-
return mark.endAngle - mark.startAngle; // arc angle extent
|
|
169
|
-
case 'line':
|
|
170
|
-
case 'area':
|
|
171
|
-
return 0; // series marks don't have individual values
|
|
172
|
-
default:
|
|
173
|
-
return 0;
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
/**
|
|
178
|
-
* Assign animation indices to marks for stagger ordering.
|
|
179
|
-
*
|
|
180
|
-
* Two phases:
|
|
181
|
-
* 1. Value-based stagger: sorts marks by primary value, assigns sequential indices.
|
|
182
|
-
* Skips stacked rects since they get group-based indices in phase 2.
|
|
183
|
-
* 2. Stack-based stagger: groups marks by stackGroup, assigns the same index to
|
|
184
|
-
* all segments in a group, and computes stackPos (segment position: 0, 1, 2...).
|
|
185
|
-
* This intentionally overwrites any value-based indices for stacked marks.
|
|
186
|
-
*/
|
|
187
|
-
export function assignAnimationIndices(
|
|
188
|
-
marks: Mark[],
|
|
189
|
-
animation: ResolvedAnimation | undefined,
|
|
190
|
-
): void {
|
|
191
|
-
if (!animation?.enter) return;
|
|
192
|
-
|
|
193
|
-
// Phase 1: Value-based stagger ordering. Skip stacked rects
|
|
194
|
-
// since they get group-based indices below (avoids wasted work that gets overwritten).
|
|
195
|
-
if (animation.enter.staggerOrder === 'value') {
|
|
196
|
-
const indexed = marks.map((m, i) => ({ mark: m, idx: i }));
|
|
197
|
-
indexed.sort((a, b) => {
|
|
198
|
-
const av = getMarkPrimaryValue(a.mark);
|
|
199
|
-
const bv = getMarkPrimaryValue(b.mark);
|
|
200
|
-
return av - bv;
|
|
201
|
-
});
|
|
202
|
-
for (let i = 0; i < indexed.length; i++) {
|
|
203
|
-
const m = indexed[i].mark;
|
|
204
|
-
if (m.type === 'rect' && (m as RectMark).stackGroup) continue;
|
|
205
|
-
m.animationIndex = i;
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
|
|
209
|
-
// Phase 2: For stacked bars/columns, assign the same animationIndex to all segments
|
|
210
|
-
// sharing a stackGroup so they animate as one contiguous bar per category.
|
|
211
|
-
// Also compute stackPos (segment position within each group: 0, 1, 2...)
|
|
212
|
-
// so the renderer can chain segment animations sequentially.
|
|
213
|
-
const groupIndexMap = new Map<string, number>();
|
|
214
|
-
const groupStackPos = new Map<string, number>();
|
|
215
|
-
let nextGroupIndex = 0;
|
|
216
|
-
for (const mark of marks) {
|
|
217
|
-
if (mark.type === 'rect' && (mark as RectMark).stackGroup) {
|
|
218
|
-
const rect = mark as RectMark;
|
|
219
|
-
const group = rect.stackGroup!;
|
|
220
|
-
if (!groupIndexMap.has(group)) {
|
|
221
|
-
groupIndexMap.set(group, nextGroupIndex++);
|
|
222
|
-
}
|
|
223
|
-
rect.animationIndex = groupIndexMap.get(group)!;
|
|
224
|
-
const pos = groupStackPos.get(group) ?? 0;
|
|
225
|
-
rect.stackPos = pos;
|
|
226
|
-
groupStackPos.set(group, pos + 1);
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
}
|