@opendata-ai/openchart-engine 8.0.0-rc.8 → 8.0.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 +149 -12
- package/dist/index.js +894 -171
- 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 -2339
- 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 -626
- 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 -1450
- 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 -1004
- package/src/geo/compile-map.ts +0 -1341
- package/src/geo/join.ts +0 -115
- package/src/geo/projections.ts +0 -45
- 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 -747
- 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
package/src/charts/line/area.ts
DELETED
|
@@ -1,484 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Area chart mark computation.
|
|
3
|
-
*
|
|
4
|
-
* Uses D3 area() generator to produce AreaMark[] with top/bottom
|
|
5
|
-
* boundary points and SVG path strings.
|
|
6
|
-
*
|
|
7
|
-
* Multi-series behavior (v8: VL-aligned defaults):
|
|
8
|
-
* - Default for multi-series with `color` is **stacked** from a zero baseline.
|
|
9
|
-
* - Overlap rendering is opt-out via `encoding.y.stack: null | false`.
|
|
10
|
-
* - Single series always renders one gradient-filled area.
|
|
11
|
-
*/
|
|
12
|
-
|
|
13
|
-
import type { AreaMark, DataRow, Encoding, MarkAria, Rect } from '@opendata-ai/openchart-core';
|
|
14
|
-
import { getRepresentativeColor, isGradientDef } from '@opendata-ai/openchart-core';
|
|
15
|
-
import type { ScaleLinear } from 'd3-scale';
|
|
16
|
-
import {
|
|
17
|
-
area,
|
|
18
|
-
line,
|
|
19
|
-
stack,
|
|
20
|
-
stackOffsetExpand,
|
|
21
|
-
stackOffsetNone,
|
|
22
|
-
stackOffsetSilhouette,
|
|
23
|
-
stackOrderNone,
|
|
24
|
-
} from 'd3-shape';
|
|
25
|
-
|
|
26
|
-
import { dedupeKeys, serializeKeyValue } from '../../compiler/keys';
|
|
27
|
-
import type { NormalizedChartSpec } from '../../compiler/types';
|
|
28
|
-
import type { ResolvedScales } from '../../layout/scales';
|
|
29
|
-
import { getColor, scaleValue, sortByField } from '../utils';
|
|
30
|
-
import { resolveCurve } from './curves';
|
|
31
|
-
|
|
32
|
-
// ---------------------------------------------------------------------------
|
|
33
|
-
// Constants
|
|
34
|
-
// ---------------------------------------------------------------------------
|
|
35
|
-
|
|
36
|
-
const DEFAULT_FILL_OPACITY = 0.15;
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
* Resolve `encoding.y.stack` to a boolean: should we stack this area chart?
|
|
40
|
-
*
|
|
41
|
-
* Vega-Lite-aligned semantics:
|
|
42
|
-
* - undefined | true | 'zero' | 'normalize' | 'center' -> stacked (default)
|
|
43
|
-
* - null | false -> overlap (opt-out)
|
|
44
|
-
*/
|
|
45
|
-
function isStacked(stackProp: unknown): boolean {
|
|
46
|
-
return stackProp !== null && stackProp !== false;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
// Gradient stops calibrated by series count. Solo areas can carry richer fills
|
|
50
|
-
// because there's no overlap to manage; multi-series overlap needs lighter
|
|
51
|
-
// stops so layered bands stay legible.
|
|
52
|
-
const SOLO_GRADIENT_STOPS = [
|
|
53
|
-
{ offset: 0, opacity: 0.42 },
|
|
54
|
-
{ offset: 0.6, opacity: 0.1 },
|
|
55
|
-
{ offset: 1, opacity: 0 },
|
|
56
|
-
];
|
|
57
|
-
|
|
58
|
-
const OVERLAP_GRADIENT_STOPS = [
|
|
59
|
-
{ offset: 0, opacity: 0.22 },
|
|
60
|
-
{ offset: 0.7, opacity: 0.04 },
|
|
61
|
-
{ offset: 1, opacity: 0 },
|
|
62
|
-
];
|
|
63
|
-
|
|
64
|
-
// Stacked layers sit on top of each other and need higher opacity so each
|
|
65
|
-
// band reads as a distinct quantity. A gentle top-to-bottom gradient adds
|
|
66
|
-
// depth without losing the categorical color identity.
|
|
67
|
-
const STACKED_GRADIENT_STOPS = [
|
|
68
|
-
{ offset: 0, opacity: 0.65 },
|
|
69
|
-
{ offset: 1, opacity: 0.35 },
|
|
70
|
-
];
|
|
71
|
-
|
|
72
|
-
// Light-mode stacked areas: bottom out at opacity 0 rather than 0.35 to avoid
|
|
73
|
-
// the muddy color wash at the base of each band on white/light backgrounds.
|
|
74
|
-
const STACKED_GRADIENT_STOPS_LIGHT = [
|
|
75
|
-
{ offset: 0, opacity: 0.65 },
|
|
76
|
-
{ offset: 1, opacity: 0 },
|
|
77
|
-
];
|
|
78
|
-
|
|
79
|
-
function buildGradientFill(
|
|
80
|
-
colorStr: string,
|
|
81
|
-
stops: ReadonlyArray<{ offset: number; opacity: number }>,
|
|
82
|
-
): import('@opendata-ai/openchart-core').GradientDef {
|
|
83
|
-
return {
|
|
84
|
-
gradient: 'linear',
|
|
85
|
-
x1: 0,
|
|
86
|
-
y1: 0,
|
|
87
|
-
x2: 0,
|
|
88
|
-
y2: 1,
|
|
89
|
-
stops: stops.map((s) => ({ offset: s.offset, color: colorStr, opacity: s.opacity })),
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
// ---------------------------------------------------------------------------
|
|
94
|
-
// Single / overlap area (non-stacked)
|
|
95
|
-
// ---------------------------------------------------------------------------
|
|
96
|
-
|
|
97
|
-
/**
|
|
98
|
-
* Compute area marks for non-stacked rendering.
|
|
99
|
-
*
|
|
100
|
-
* - With no `color` field: emits a single area with the solo gradient.
|
|
101
|
-
* - With a `color` field (overlap mode): emits one area per series, each
|
|
102
|
-
* anchored at the y-domain baseline and using the lighter overlap gradient.
|
|
103
|
-
*/
|
|
104
|
-
function computeSingleArea(
|
|
105
|
-
spec: NormalizedChartSpec,
|
|
106
|
-
scales: ResolvedScales,
|
|
107
|
-
_chartArea: Rect,
|
|
108
|
-
): AreaMark[] {
|
|
109
|
-
const encoding = spec.encoding as Encoding;
|
|
110
|
-
const xChannel = encoding.x;
|
|
111
|
-
const yChannel = encoding.y;
|
|
112
|
-
|
|
113
|
-
if (!xChannel || !yChannel || !scales.x || !scales.y) return [];
|
|
114
|
-
|
|
115
|
-
const yScale = scales.y.scale as ScaleLinear<number, number>;
|
|
116
|
-
// Use the domain minimum as the baseline so the area fill doesn't drop
|
|
117
|
-
// below the visible scale range when zero: false excludes 0 from the domain.
|
|
118
|
-
const domain = yScale.domain();
|
|
119
|
-
const baselineY = yScale(Math.min(domain[0], domain[1]));
|
|
120
|
-
|
|
121
|
-
// Group by color field
|
|
122
|
-
const colorField = encoding.color && 'field' in encoding.color ? encoding.color.field : undefined;
|
|
123
|
-
const groups = new Map<string, DataRow[]>();
|
|
124
|
-
|
|
125
|
-
if (!colorField) {
|
|
126
|
-
groups.set('__default__', spec.data);
|
|
127
|
-
} else {
|
|
128
|
-
for (const row of spec.data) {
|
|
129
|
-
const key = String(row[colorField] ?? '__default__');
|
|
130
|
-
const existing = groups.get(key);
|
|
131
|
-
if (existing) {
|
|
132
|
-
existing.push(row);
|
|
133
|
-
} else {
|
|
134
|
-
groups.set(key, [row]);
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
const isMultiSeries = colorField !== undefined && groups.size > 1;
|
|
140
|
-
const defaultGradientStops = isMultiSeries ? OVERLAP_GRADIENT_STOPS : SOLO_GRADIENT_STOPS;
|
|
141
|
-
|
|
142
|
-
const marks: AreaMark[] = [];
|
|
143
|
-
|
|
144
|
-
for (const [seriesKey, rows] of groups) {
|
|
145
|
-
const color = getColor(scales, seriesKey);
|
|
146
|
-
|
|
147
|
-
// Sort rows by x-axis field so areas draw left-to-right.
|
|
148
|
-
// For nominal/ordinal axes, preserve data order.
|
|
149
|
-
const sortedRows =
|
|
150
|
-
xChannel.type === 'nominal' || xChannel.type === 'ordinal'
|
|
151
|
-
? rows
|
|
152
|
-
: sortByField(rows, xChannel.field);
|
|
153
|
-
|
|
154
|
-
// Compute points, filtering out null values
|
|
155
|
-
const validPoints: { x: number; yTop: number; yBottom: number; row: DataRow }[] = [];
|
|
156
|
-
|
|
157
|
-
// Check for y2 channel (band between y and y2)
|
|
158
|
-
const y2Channel = (encoding as Encoding & { y2?: { field: string; type: string } }).y2;
|
|
159
|
-
|
|
160
|
-
for (const row of sortedRows) {
|
|
161
|
-
const xVal = scaleValue(scales.x.scale, scales.x.type, row[xChannel.field]);
|
|
162
|
-
const yVal = scaleValue(scales.y.scale, scales.y.type, row[yChannel.field]);
|
|
163
|
-
|
|
164
|
-
if (xVal === null || yVal === null) continue;
|
|
165
|
-
|
|
166
|
-
const yBottomVal =
|
|
167
|
-
y2Channel && row[y2Channel.field] != null
|
|
168
|
-
? scaleValue(scales.y.scale, scales.y.type, row[y2Channel.field])
|
|
169
|
-
: null;
|
|
170
|
-
|
|
171
|
-
validPoints.push({
|
|
172
|
-
x: xVal,
|
|
173
|
-
yTop: yVal,
|
|
174
|
-
yBottom: yBottomVal ?? baselineY,
|
|
175
|
-
row,
|
|
176
|
-
});
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
if (validPoints.length === 0) continue;
|
|
180
|
-
|
|
181
|
-
// Build the area path with configured interpolation
|
|
182
|
-
const curve = resolveCurve(spec.markDef.interpolate);
|
|
183
|
-
const areaGenerator = area<{ x: number; yTop: number; yBottom: number }>()
|
|
184
|
-
.x((d) => d.x)
|
|
185
|
-
.y0((d) => d.yBottom)
|
|
186
|
-
.y1((d) => d.yTop)
|
|
187
|
-
.curve(curve);
|
|
188
|
-
|
|
189
|
-
const pathStr = areaGenerator(validPoints) ?? '';
|
|
190
|
-
|
|
191
|
-
// Top-line path for stroking only the data line (not the baseline)
|
|
192
|
-
const topLineGenerator = line<{ x: number; yTop: number }>()
|
|
193
|
-
.x((d) => d.x)
|
|
194
|
-
.y((d) => d.yTop)
|
|
195
|
-
.curve(curve);
|
|
196
|
-
const topPathStr = topLineGenerator(validPoints) ?? '';
|
|
197
|
-
|
|
198
|
-
const topPoints = validPoints.map((p) => ({ x: p.x, y: p.yTop }));
|
|
199
|
-
const bottomPoints = validPoints.map((p) => ({ x: p.x, y: p.yBottom }));
|
|
200
|
-
|
|
201
|
-
const ariaLabel =
|
|
202
|
-
seriesKey === '__default__'
|
|
203
|
-
? `Area with ${validPoints.length} data points`
|
|
204
|
-
: `${seriesKey}: area with ${validPoints.length} data points`;
|
|
205
|
-
|
|
206
|
-
const aria: MarkAria = { label: ariaLabel };
|
|
207
|
-
|
|
208
|
-
// Allow markDef.fill to override color with a gradient.
|
|
209
|
-
// When a gradient is provided, set fillOpacity=1 so gradient stop-opacity controls the fade.
|
|
210
|
-
// When no fill is provided, auto-generate a top-to-bottom fade gradient
|
|
211
|
-
// tuned to series count (lighter for overlap).
|
|
212
|
-
const markFill = spec.markDef.fill;
|
|
213
|
-
let fillValue: string | import('@opendata-ai/openchart-core').GradientDef;
|
|
214
|
-
let fillOpacity: number;
|
|
215
|
-
|
|
216
|
-
if (markFill != null) {
|
|
217
|
-
fillValue = markFill;
|
|
218
|
-
fillOpacity = isGradientDef(markFill)
|
|
219
|
-
? 1
|
|
220
|
-
: (spec.markDef.opacity ?? (y2Channel ? 0.25 : DEFAULT_FILL_OPACITY));
|
|
221
|
-
} else {
|
|
222
|
-
const colorStr = getRepresentativeColor(color);
|
|
223
|
-
fillValue = buildGradientFill(colorStr, defaultGradientStops);
|
|
224
|
-
fillOpacity = 1;
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
const keyField = encoding.key && 'field' in encoding.key ? encoding.key.field : undefined;
|
|
228
|
-
const rawPointKeys = validPoints.map((p) =>
|
|
229
|
-
keyField ? serializeKeyValue(p.row[keyField]) : serializeKeyValue(p.row[xChannel.field]),
|
|
230
|
-
);
|
|
231
|
-
|
|
232
|
-
marks.push({
|
|
233
|
-
type: 'area',
|
|
234
|
-
key: seriesKey === '__default__' ? 'area' : seriesKey,
|
|
235
|
-
pointKeys: dedupeKeys(rawPointKeys),
|
|
236
|
-
interpolate: spec.markDef.interpolate ?? 'monotone',
|
|
237
|
-
topPoints,
|
|
238
|
-
bottomPoints,
|
|
239
|
-
path: pathStr,
|
|
240
|
-
topPath: topPathStr,
|
|
241
|
-
fill: fillValue,
|
|
242
|
-
fillOpacity: fillOpacity,
|
|
243
|
-
stroke:
|
|
244
|
-
spec.markDef.stroke ?? getRepresentativeColor(isGradientDef(fillValue) ? color : fillValue),
|
|
245
|
-
strokeWidth: spec.markDef.strokeWidth ?? 1.5,
|
|
246
|
-
seriesKey: seriesKey === '__default__' ? undefined : seriesKey,
|
|
247
|
-
data: validPoints.map((p) => p.row),
|
|
248
|
-
dataPoints: validPoints.map((p) => ({ x: p.x, y: p.yTop, datum: p.row })),
|
|
249
|
-
aria,
|
|
250
|
-
});
|
|
251
|
-
}
|
|
252
|
-
|
|
253
|
-
return marks;
|
|
254
|
-
}
|
|
255
|
-
|
|
256
|
-
// ---------------------------------------------------------------------------
|
|
257
|
-
// Stacked area
|
|
258
|
-
// ---------------------------------------------------------------------------
|
|
259
|
-
|
|
260
|
-
function computeStackedArea(
|
|
261
|
-
spec: NormalizedChartSpec,
|
|
262
|
-
scales: ResolvedScales,
|
|
263
|
-
chartArea: Rect,
|
|
264
|
-
darkMode?: boolean,
|
|
265
|
-
): AreaMark[] {
|
|
266
|
-
const encoding = spec.encoding as Encoding;
|
|
267
|
-
const xChannel = encoding.x;
|
|
268
|
-
const yChannel = encoding.y;
|
|
269
|
-
const colorField = encoding.color && 'field' in encoding.color ? encoding.color.field : undefined;
|
|
270
|
-
|
|
271
|
-
if (!xChannel || !yChannel || !scales.x || !scales.y || !colorField) {
|
|
272
|
-
// If no color field, can't stack -- fall back to single area
|
|
273
|
-
return computeSingleArea(spec, scales, chartArea);
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
// Sort data by x field so stacked areas render left-to-right.
|
|
277
|
-
// For nominal/ordinal axes, preserve data order.
|
|
278
|
-
const sortedData =
|
|
279
|
-
xChannel.type === 'nominal' || xChannel.type === 'ordinal'
|
|
280
|
-
? spec.data
|
|
281
|
-
: sortByField(spec.data, xChannel.field);
|
|
282
|
-
|
|
283
|
-
// Collect unique series keys and x values, and build a lookup from
|
|
284
|
-
// (x-value, series-key) -> original data row so stacked area marks
|
|
285
|
-
// get original rows instead of pivot rows.
|
|
286
|
-
const seriesKeys = new Set<string>();
|
|
287
|
-
const xValueSet = new Set<string>();
|
|
288
|
-
const rowsByXSeries = new Map<string, DataRow>();
|
|
289
|
-
const rowsByX = new Map<string, DataRow[]>();
|
|
290
|
-
|
|
291
|
-
for (const row of sortedData) {
|
|
292
|
-
const xStr = String(row[xChannel.field]);
|
|
293
|
-
const series = String(row[colorField]);
|
|
294
|
-
seriesKeys.add(series);
|
|
295
|
-
xValueSet.add(xStr);
|
|
296
|
-
rowsByXSeries.set(`${xStr}::${series}`, row);
|
|
297
|
-
|
|
298
|
-
const existing = rowsByX.get(xStr);
|
|
299
|
-
if (existing) {
|
|
300
|
-
existing.push(row);
|
|
301
|
-
} else {
|
|
302
|
-
rowsByX.set(xStr, [row]);
|
|
303
|
-
}
|
|
304
|
-
}
|
|
305
|
-
|
|
306
|
-
const keys = Array.from(seriesKeys);
|
|
307
|
-
const xValues = Array.from(xValueSet);
|
|
308
|
-
|
|
309
|
-
// Build a pivot table: one row per x value, one column per series
|
|
310
|
-
const pivotData: Record<string, unknown>[] = xValues.map((xVal) => {
|
|
311
|
-
const pivot: Record<string, unknown> = { __x__: xVal };
|
|
312
|
-
for (const key of keys) {
|
|
313
|
-
pivot[key] = 0;
|
|
314
|
-
}
|
|
315
|
-
// Fill in actual values from pre-grouped data
|
|
316
|
-
const xRows = rowsByX.get(xVal);
|
|
317
|
-
if (xRows) {
|
|
318
|
-
for (const row of xRows) {
|
|
319
|
-
const series = String(row[colorField]);
|
|
320
|
-
pivot[series] = row[yChannel.field] ?? 0;
|
|
321
|
-
}
|
|
322
|
-
}
|
|
323
|
-
return pivot;
|
|
324
|
-
});
|
|
325
|
-
|
|
326
|
-
// Resolve stack offset from the y channel's stack property
|
|
327
|
-
const stackProp = yChannel.stack;
|
|
328
|
-
const offsetFn =
|
|
329
|
-
stackProp === 'normalize'
|
|
330
|
-
? stackOffsetExpand
|
|
331
|
-
: stackProp === 'center'
|
|
332
|
-
? stackOffsetSilhouette
|
|
333
|
-
: stackOffsetNone;
|
|
334
|
-
|
|
335
|
-
// Use d3 stack to compute the stacked layout
|
|
336
|
-
const stackGenerator = stack<Record<string, unknown>>()
|
|
337
|
-
.keys(keys)
|
|
338
|
-
.order(stackOrderNone)
|
|
339
|
-
.offset(offsetFn);
|
|
340
|
-
|
|
341
|
-
const stackedData = stackGenerator(pivotData);
|
|
342
|
-
const yScale = scales.y.scale as ScaleLinear<number, number>;
|
|
343
|
-
const marks: AreaMark[] = [];
|
|
344
|
-
|
|
345
|
-
for (const layer of stackedData) {
|
|
346
|
-
const seriesKey = layer.key;
|
|
347
|
-
const color = getColor(scales, seriesKey);
|
|
348
|
-
|
|
349
|
-
const validPoints: { x: number; yTop: number; yBottom: number }[] = [];
|
|
350
|
-
|
|
351
|
-
for (const d of layer) {
|
|
352
|
-
const xVal = scaleValue(scales.x.scale, scales.x.type, d.data.__x__);
|
|
353
|
-
|
|
354
|
-
if (xVal === null) continue;
|
|
355
|
-
|
|
356
|
-
const yTop = yScale(d[1] as number);
|
|
357
|
-
const yBottom = yScale(d[0] as number);
|
|
358
|
-
|
|
359
|
-
validPoints.push({ x: xVal, yTop, yBottom });
|
|
360
|
-
}
|
|
361
|
-
|
|
362
|
-
if (validPoints.length === 0) continue;
|
|
363
|
-
|
|
364
|
-
const stackCurve = resolveCurve(spec.markDef.interpolate);
|
|
365
|
-
const areaGenerator = area<{ x: number; yTop: number; yBottom: number }>()
|
|
366
|
-
.x((p) => p.x)
|
|
367
|
-
.y0((p) => p.yBottom)
|
|
368
|
-
.y1((p) => p.yTop)
|
|
369
|
-
.curve(stackCurve);
|
|
370
|
-
|
|
371
|
-
const pathStr = areaGenerator(validPoints) ?? '';
|
|
372
|
-
|
|
373
|
-
const topLineGenerator = line<{ x: number; yTop: number }>()
|
|
374
|
-
.x((p) => p.x)
|
|
375
|
-
.y((p) => p.yTop)
|
|
376
|
-
.curve(stackCurve);
|
|
377
|
-
const topPathStr = topLineGenerator(validPoints) ?? '';
|
|
378
|
-
|
|
379
|
-
const topPoints = validPoints.map((p) => ({ x: p.x, y: p.yTop }));
|
|
380
|
-
const bottomPoints = validPoints.map((p) => ({ x: p.x, y: p.yBottom }));
|
|
381
|
-
|
|
382
|
-
const aria: MarkAria = {
|
|
383
|
-
label: `${seriesKey}: stacked area with ${validPoints.length} data points`,
|
|
384
|
-
};
|
|
385
|
-
|
|
386
|
-
// Per-layer top-to-bottom gradient. User-supplied markDef.fill (string or
|
|
387
|
-
// gradient) overrides the auto gradient just like in single-area mode.
|
|
388
|
-
const markFill = spec.markDef.fill;
|
|
389
|
-
let fillValue: string | import('@opendata-ai/openchart-core').GradientDef;
|
|
390
|
-
let fillOpacity: number;
|
|
391
|
-
|
|
392
|
-
if (markFill != null) {
|
|
393
|
-
fillValue = markFill;
|
|
394
|
-
fillOpacity = isGradientDef(markFill) ? 1 : (spec.markDef.opacity ?? 0.7);
|
|
395
|
-
} else {
|
|
396
|
-
const colorStr = getRepresentativeColor(color);
|
|
397
|
-
const stackedStops = darkMode ? STACKED_GRADIENT_STOPS : STACKED_GRADIENT_STOPS_LIGHT;
|
|
398
|
-
fillValue = buildGradientFill(colorStr, stackedStops);
|
|
399
|
-
fillOpacity = 1;
|
|
400
|
-
}
|
|
401
|
-
|
|
402
|
-
const rawPointKeys = validPoints.map((_p, idx) => serializeKeyValue(layer[idx]?.data.__x__));
|
|
403
|
-
|
|
404
|
-
marks.push({
|
|
405
|
-
type: 'area',
|
|
406
|
-
key: seriesKey,
|
|
407
|
-
pointKeys: dedupeKeys(rawPointKeys),
|
|
408
|
-
interpolate: spec.markDef.interpolate ?? 'monotone',
|
|
409
|
-
topPoints,
|
|
410
|
-
bottomPoints,
|
|
411
|
-
path: pathStr,
|
|
412
|
-
topPath: topPathStr,
|
|
413
|
-
fill: fillValue,
|
|
414
|
-
fillOpacity,
|
|
415
|
-
stroke: getRepresentativeColor(color),
|
|
416
|
-
strokeWidth: 1,
|
|
417
|
-
seriesKey,
|
|
418
|
-
data: layer.map((d) => {
|
|
419
|
-
const xStr = String(d.data.__x__);
|
|
420
|
-
return (rowsByXSeries.get(`${xStr}::${seriesKey}`) ?? d.data) as Record<string, unknown>;
|
|
421
|
-
}),
|
|
422
|
-
dataPoints: validPoints.map((p, idx) => {
|
|
423
|
-
const xStr = String(layer[idx]?.data.__x__);
|
|
424
|
-
const datum = (rowsByXSeries.get(`${xStr}::${seriesKey}`) ??
|
|
425
|
-
layer[idx]?.data ??
|
|
426
|
-
{}) as Record<string, unknown>;
|
|
427
|
-
return { x: p.x, y: p.yTop, datum };
|
|
428
|
-
}),
|
|
429
|
-
aria,
|
|
430
|
-
});
|
|
431
|
-
}
|
|
432
|
-
|
|
433
|
-
return marks;
|
|
434
|
-
}
|
|
435
|
-
|
|
436
|
-
// ---------------------------------------------------------------------------
|
|
437
|
-
// Public API
|
|
438
|
-
// ---------------------------------------------------------------------------
|
|
439
|
-
|
|
440
|
-
/**
|
|
441
|
-
* Compute area marks from a normalized chart spec.
|
|
442
|
-
*
|
|
443
|
-
* Behavior depends on `encoding.y.stack` (Vega-Lite aligned):
|
|
444
|
-
* - `undefined | true | 'zero' | 'normalize' | 'center'` -> stacked (default for multi-series)
|
|
445
|
-
* - `null | false` -> overlap
|
|
446
|
-
*
|
|
447
|
-
* Single-series specs always render one gradient-filled area; the `stack`
|
|
448
|
-
* branch only matters when a `color` encoding is present.
|
|
449
|
-
*/
|
|
450
|
-
export function computeAreaMarks(
|
|
451
|
-
spec: NormalizedChartSpec,
|
|
452
|
-
scales: ResolvedScales,
|
|
453
|
-
chartArea: Rect,
|
|
454
|
-
darkMode?: boolean,
|
|
455
|
-
): AreaMark[] {
|
|
456
|
-
const encoding = spec.encoding as Encoding;
|
|
457
|
-
const yChannel = encoding.y;
|
|
458
|
-
|
|
459
|
-
let marks: AreaMark[];
|
|
460
|
-
if (yChannel && isStacked(yChannel.stack)) {
|
|
461
|
-
marks = computeStackedArea(spec, scales, chartArea, darkMode);
|
|
462
|
-
} else {
|
|
463
|
-
marks = computeSingleArea(spec, scales, chartArea);
|
|
464
|
-
}
|
|
465
|
-
|
|
466
|
-
// Dedupe area mark keys
|
|
467
|
-
const areaKeys = dedupeKeys(marks.map((m) => m.key!));
|
|
468
|
-
marks.forEach((m, i) => {
|
|
469
|
-
m.key = areaKeys[i];
|
|
470
|
-
});
|
|
471
|
-
|
|
472
|
-
const highlight = spec.highlight ?? [];
|
|
473
|
-
if (highlight.length > 0) {
|
|
474
|
-
const highlightSet = new Set(highlight);
|
|
475
|
-
marks.sort((a, b) => {
|
|
476
|
-
const aMuted = a.seriesKey != null && !highlightSet.has(a.seriesKey);
|
|
477
|
-
const bMuted = b.seriesKey != null && !highlightSet.has(b.seriesKey);
|
|
478
|
-
if (aMuted === bMuted) return 0;
|
|
479
|
-
return aMuted ? -1 : 1;
|
|
480
|
-
});
|
|
481
|
-
}
|
|
482
|
-
|
|
483
|
-
return marks;
|
|
484
|
-
}
|