Commit f1c04b6
the spec ALREADY models a combo chart, per-series, and its own field comment
says so — `ChartSeries.type`, "Series type override (combo charts)" — exactly as
it models stacking with `ChartSeries.stack` rather than a `stacked-bar` family.
So `combo` is not a name an author should reach for; it is what "the series
disagree about their family" looks like from the renderer's side.
`effectiveChartFamily` derives it.
Chasing that turned up two live bugs, both silent, on the path a spec author
takes.
1. The per-series override was parsed, carried, and then DROPPED. Only the
`chartType === 'combo'` branch read `series[].chartType`, so
`{ type: 'bar', series: [{ name: 'revenue' }, { name: 'margin', type: 'line' }] }`
drew `margin` as a bar. A unit test even asserted the value was carried.
2. A spec-shape `series` rendered NOTHING AT ALL. `series` is the one binding
both shapes spell alike, so ChartRenderer's blanket "internal props win" rule
let the author's `[{ name }]` shadow the normalized `[{ dataKey }]` and reach
a renderer that reads `dataKey`. Every other spec binding has a distinct name
(`xAxis` vs `xAxisKey`), which is why only this one broke — and why the
isolated normalization tests all passed over a dead path.
(2) is fixed here rather than filed, because (1) alone would have been a fix no
spec author could reach. `ChartRendererProps.series` now accepts both shapes
too: it was typed internal-only, so writing the protocol correctly was a type
error on code that works.
Also found in passing: the combo branch had an `area` arm inside a `BarChart`
container, and Recharts draws an `<Area>` child of `BarChart` as nothing — so an
authored combo with an `area` series rendered a blank series. The container is
now `ComposedChart`, which is what Recharts provides for mixed marks.
Widening only. One family stays one family, an explicit `combo` is untouched,
and a family with no per-series meaning (`pie`, `horizontal-bar`) is never
widened. A derived combo binds to the left axis unless a series asks for
`yAxis: 'right'` — the spec's own default — so widening changes the mark and not
the scale; the bar→left/line→right guess is kept for an authored `combo`, where
it was the only way to reach a second axis.
Guards: the two helpers are unit-tested over the family matrix; the DOM tests
assert the MARKS rather than the derived family, since the carry was already
covered and the drawing was what broke; and `spec-derived-unions.test.ts`
asserts `combo` is absent from the spec's `ChartTypeSchema`, so the day it is
adopted upstream the derivation is named as the thing to retire.
Co-authored-by: Jack Zhuang <277994282+os-zhuang@users.noreply.github.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
1 parent d10f526 commit f1c04b6
9 files changed
Lines changed: 627 additions & 25 deletions
File tree
- .changeset
- docs/audits
- packages
- plugin-charts/src
- types/src/__tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| |||
358 | 358 | | |
359 | 359 | | |
360 | 360 | | |
361 | | - | |
| 361 | + | |
362 | 362 | | |
363 | 363 | | |
364 | 364 | | |
| |||
385 | 385 | | |
386 | 386 | | |
387 | 387 | | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
388 | 410 | | |
389 | 411 | | |
390 | 412 | | |
| |||
394 | 416 | | |
395 | 417 | | |
396 | 418 | | |
397 | | - | |
| 419 | + | |
| 420 | + | |
398 | 421 | | |
399 | 422 | | |
400 | 423 | | |
| |||
Lines changed: 155 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
50 | | - | |
| 51 | + | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
| |||
96 | 97 | | |
97 | 98 | | |
98 | 99 | | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
99 | 105 | | |
100 | 106 | | |
101 | 107 | | |
| |||
266 | 272 | | |
267 | 273 | | |
268 | 274 | | |
269 | | - | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
270 | 283 | | |
271 | 284 | | |
272 | 285 | | |
| |||
364 | 377 | | |
365 | 378 | | |
366 | 379 | | |
367 | | - | |
368 | | - | |
369 | | - | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
370 | 383 | | |
371 | 384 | | |
372 | 385 | | |
| |||
877 | 890 | | |
878 | 891 | | |
879 | 892 | | |
880 | | - | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
881 | 896 | | |
882 | 897 | | |
883 | 898 | | |
884 | 899 | | |
885 | | - | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
886 | 905 | | |
887 | 906 | | |
888 | 907 | | |
| |||
898 | 917 | | |
899 | 918 | | |
900 | 919 | | |
901 | | - | |
902 | | - | |
903 | | - | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
904 | 930 | | |
905 | 931 | | |
906 | | - | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
907 | 935 | | |
908 | 936 | | |
909 | 937 | | |
| |||
928 | 956 | | |
929 | 957 | | |
930 | 958 | | |
931 | | - | |
| 959 | + | |
932 | 960 | | |
933 | 961 | | |
934 | 962 | | |
| |||
0 commit comments