@d3plus/core 4.11.0 → 4.12.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.
Files changed (287) hide show
  1. package/es/internal.js +15 -5
  2. package/es/src/charts/Alluvial/emit.js +2 -2
  3. package/es/src/charts/Alluvial/index.js +7 -1
  4. package/es/src/charts/Alluvial/titles.js +24 -4
  5. package/es/src/charts/ArcDiagram/emit.js +27 -13
  6. package/es/src/charts/ArcDiagram/events.js +6 -2
  7. package/es/src/charts/ArcDiagram/index.js +2 -0
  8. package/es/src/charts/BarChart/index.js +3 -10
  9. package/es/src/charts/Calendar/index.js +2 -0
  10. package/es/src/charts/Candlestick/index.js +4 -10
  11. package/es/src/charts/Gantt/applyLayout.js +2 -4
  12. package/es/src/charts/Geomap/flowEmit.js +11 -6
  13. package/es/src/charts/Hexbin/index.js +2 -0
  14. package/es/src/charts/Icicle/index.js +3 -1
  15. package/es/src/charts/Matrix/applyLayout.js +20 -9
  16. package/es/src/charts/Matrix/index.js +19 -1
  17. package/es/src/charts/Network/applyLayout.js +36 -5
  18. package/es/src/charts/Network/bundle.js +5 -4
  19. package/es/src/charts/Network/emit.js +39 -40
  20. package/es/src/charts/Network/graph.js +34 -5
  21. package/es/src/charts/Network/graphFluent.js +5 -3
  22. package/es/src/charts/Network/index.js +6 -1
  23. package/es/src/charts/Pack/applyLayout.js +16 -5
  24. package/es/src/charts/Pack/emit.js +15 -8
  25. package/es/src/charts/Pack/groupRows.js +61 -0
  26. package/es/src/charts/Pack/index.js +3 -0
  27. package/es/src/charts/Pack/neutralPaint.js +20 -0
  28. package/es/src/charts/Pack/nodeNames.js +35 -0
  29. package/es/src/charts/ParallelCoordinates/axes.js +22 -22
  30. package/es/src/charts/ParallelCoordinates/chrome.js +18 -0
  31. package/es/src/charts/ParallelCoordinates/index.js +3 -1
  32. package/es/src/charts/ParallelCoordinates/titles.js +17 -9
  33. package/es/src/charts/Pie/emit.js +9 -1
  34. package/es/src/charts/Pie/index.js +10 -0
  35. package/es/src/charts/Plot/areaEnter.js +68 -0
  36. package/es/src/charts/Plot/draw.js +26 -12
  37. package/es/src/charts/Plot/index.js +4 -10
  38. package/es/src/charts/Plot/lineMarkerKeys.js +19 -0
  39. package/es/src/charts/Plot/plotInit.js +6 -0
  40. package/es/src/charts/Plot/shapeLabelLegend.js +67 -0
  41. package/es/src/charts/Plot/sharedHover.js +2 -1
  42. package/es/src/charts/Plot/sharedTooltip.js +13 -3
  43. package/es/src/charts/PolarArea/index.js +2 -1
  44. package/es/src/charts/Priestley/applyLayout.js +11 -7
  45. package/es/src/charts/Priestley/index.js +0 -2
  46. package/es/src/charts/Priestley/timeAxis.js +11 -8
  47. package/es/src/charts/Pyramid/gutter.js +52 -16
  48. package/es/src/charts/Pyramid/index.js +55 -7
  49. package/es/src/charts/Pyramid/scene.js +4 -4
  50. package/es/src/charts/Radar/applyLayout.js +31 -33
  51. package/es/src/charts/Radar/axisDecorations.js +29 -17
  52. package/es/src/charts/Radar/curvedLabels.js +43 -2
  53. package/es/src/charts/Radar/emit.js +30 -15
  54. package/es/src/charts/Radar/index.js +41 -2
  55. package/es/src/charts/Radar/points.js +85 -0
  56. package/es/src/charts/RadialBar/emit.js +6 -1
  57. package/es/src/charts/RadialBar/index.js +10 -0
  58. package/es/src/charts/RadialMatrix/applyLayout.js +115 -31
  59. package/es/src/charts/RadialMatrix/index.js +15 -2
  60. package/es/src/charts/Rings/applyLayout.js +11 -150
  61. package/es/src/charts/Rings/emit.js +80 -40
  62. package/es/src/charts/Rings/index.js +27 -4
  63. package/es/src/charts/Rings/ringsCurves.js +156 -0
  64. package/es/src/charts/Rings/ringsParallel.js +20 -3
  65. package/es/src/charts/Rings/ringsPlacement.js +152 -0
  66. package/es/src/charts/Rings/ringsSizing.js +61 -38
  67. package/es/src/charts/Sankey/applyLayout.js +18 -4
  68. package/es/src/charts/Sankey/index.js +7 -1
  69. package/es/src/charts/Sunburst/emit.js +9 -1
  70. package/es/src/charts/Sunburst/index.js +13 -1
  71. package/es/src/charts/Tree/applyLayout.js +44 -14
  72. package/es/src/charts/Tree/emit.js +5 -5
  73. package/es/src/charts/Tree/index.js +10 -12
  74. package/es/src/charts/Tree/keys.js +33 -0
  75. package/es/src/charts/Tree/nodeLabel.js +15 -0
  76. package/es/src/charts/Treemap/emitGroupHeaders.js +3 -5
  77. package/es/src/charts/definition/makeChart.js +6 -2
  78. package/es/src/charts/drawSteps/minimap.js +4 -20
  79. package/es/src/charts/drawSteps/zoomActions.js +36 -0
  80. package/es/src/charts/drawSteps/zoomControls.js +31 -18
  81. package/es/src/charts/drawSteps/zoomControlsMarkup.js +23 -4
  82. package/es/src/charts/drawSteps/zoomDrag.js +188 -0
  83. package/es/src/charts/drawSteps/zoomFit.js +69 -0
  84. package/es/src/charts/events/click.legend.js +4 -2
  85. package/es/src/charts/events/click.shape.js +5 -3
  86. package/es/src/charts/events/mouseenter.js +6 -16
  87. package/es/src/charts/events/mouseleave.js +9 -2
  88. package/es/src/charts/events/mousemove.legend.js +28 -32
  89. package/es/src/charts/events/mousemove.shape.js +44 -44
  90. package/es/src/charts/features/axes.js +15 -4
  91. package/es/src/charts/features/axesFinal.js +7 -2
  92. package/es/src/charts/features/axesMeasure.js +26 -8
  93. package/es/src/charts/features/axisTooltip.js +138 -0
  94. package/es/src/charts/features/centerLabel.js +177 -0
  95. package/es/src/charts/features/colorScaleBivariate.js +83 -0
  96. package/es/src/charts/features/colorScaleBucket.js +18 -0
  97. package/es/src/charts/features/colorScaleHover.js +30 -5
  98. package/es/src/charts/features/colorScaleLimit.js +73 -0
  99. package/es/src/charts/features/colorScaleTooltip.js +77 -0
  100. package/es/src/charts/features/colorScaleTop.js +61 -0
  101. package/es/src/charts/features/curvedArrows.js +33 -0
  102. package/es/src/charts/features/depthKey.js +26 -0
  103. package/es/src/charts/features/edgeArrows.js +61 -2
  104. package/es/src/charts/features/featuresColorScale.js +57 -16
  105. package/es/src/charts/features/hoverTicks.js +41 -0
  106. package/es/src/charts/features/idleQueue.js +72 -0
  107. package/es/src/charts/features/linkInteraction.js +59 -7
  108. package/es/src/charts/features/networkMeasures.js +241 -0
  109. package/es/src/charts/features/nodeStats.js +309 -0
  110. package/es/src/charts/features/plotEndLabels.js +28 -7
  111. package/es/src/charts/features/plotPaint.js +9 -2
  112. package/es/src/charts/features/shapeEmit.js +7 -1
  113. package/es/src/charts/features/textHalo.js +3 -2
  114. package/es/src/charts/partition/chartFields.js +12 -3
  115. package/es/src/charts/partition/interaction.js +10 -5
  116. package/es/src/charts/pipeline/insetPlacement.js +8 -3
  117. package/es/src/charts/polar/chrome.js +81 -9
  118. package/es/src/charts/polar/config.js +4 -0
  119. package/es/src/charts/polar/wedgeLayout.js +2 -1
  120. package/es/src/charts/viz/Viz.js +24 -15
  121. package/es/src/charts/viz/VizBase.js +39 -4
  122. package/es/src/charts/viz/backgroundInk.js +10 -0
  123. package/es/src/charts/viz/emphasis.js +14 -0
  124. package/es/src/charts/viz/fillStroke.js +10 -0
  125. package/es/src/charts/viz/interactionOpacity.js +115 -32
  126. package/es/src/charts/viz/reportDrawError.js +15 -0
  127. package/es/src/charts/viz/setCursor.js +29 -0
  128. package/es/src/charts/viz/tooltipEnabled.js +38 -0
  129. package/es/src/charts/viz/userClick.js +34 -0
  130. package/es/src/charts/viz/vizDataPolling.js +0 -1
  131. package/es/src/charts/viz/vizDefaults.js +13 -34
  132. package/es/src/charts/viz/vizFields.js +6 -1
  133. package/es/src/charts/viz/vizRender.js +35 -5
  134. package/es/src/charts/viz/vizVisibility.js +12 -2
  135. package/es/src/components/Axis/Axis.js +29 -2
  136. package/es/src/components/Axis/axisBreak.js +29 -7
  137. package/es/src/components/Axis/axisDefaults.js +11 -0
  138. package/es/src/components/Axis/axisLabelKinds.js +36 -0
  139. package/es/src/components/Axis/axisLabelLineHeight.js +19 -0
  140. package/es/src/components/Axis/axisLabelRoom.js +37 -0
  141. package/es/src/components/Axis/axisLabelSize.js +171 -0
  142. package/es/src/components/Axis/axisLabelThinning.js +98 -4
  143. package/es/src/components/Axis/axisLayout.js +71 -46
  144. package/es/src/components/Axis/axisLayoutLabels.js +82 -140
  145. package/es/src/components/Axis/axisLayoutScale.js +9 -10
  146. package/es/src/components/Axis/axisLimit.js +27 -0
  147. package/es/src/components/Axis/axisMaxSize.js +39 -0
  148. package/es/src/components/Axis/axisRender.js +20 -8
  149. package/es/src/components/Axis/axisRounding.js +16 -1
  150. package/es/src/components/Axis/axisScene.js +11 -2
  151. package/es/src/components/Axis/axisTitle.js +53 -0
  152. package/es/src/components/Axis/axisTooltipTargets.js +128 -0
  153. package/es/src/components/ColorScale/ColorScale.js +62 -18
  154. package/es/src/components/ColorScale/bivariateRender.js +353 -0
  155. package/es/src/components/ColorScale/bivariateScale.js +150 -0
  156. package/es/src/components/ColorScale/colorScaleRender.js +32 -2
  157. package/es/src/components/ColorScale/colorScaleSwatchTooltips.js +77 -0
  158. package/es/src/components/Legend/Legend.js +10 -2
  159. package/es/src/components/Legend/legendCut.js +108 -0
  160. package/es/src/components/Legend/legendRender.js +38 -13
  161. package/es/src/components/TextBox.js +5 -2
  162. package/es/src/components/Timeline/timelineRender.js +2 -1
  163. package/es/src/components/textBoxScene.js +3 -0
  164. package/es/src/components/textEllipsis.js +7 -0
  165. package/es/src/components/tooltipDom.js +8 -5
  166. package/es/src/fluent.js +48 -0
  167. package/es/src/utils/BaseClass.js +7 -2
  168. package/es/src/utils/configValue.js +9 -0
  169. package/package.json +10 -10
  170. package/types/index.d.ts +1 -1
  171. package/types/internal.d.ts +22 -5
  172. package/types/src/charts/Alluvial/titles.d.ts +16 -3
  173. package/types/src/charts/ArcDiagram/emit.d.ts +3 -2
  174. package/types/src/charts/ArcDiagram/events.d.ts +2 -1
  175. package/types/src/charts/Geomap/flowEmit.d.ts +3 -2
  176. package/types/src/charts/Matrix/applyLayout.d.ts +4 -2
  177. package/types/src/charts/Network/applyLayout.d.ts +11 -0
  178. package/types/src/charts/Network/bundle.d.ts +3 -1
  179. package/types/src/charts/Network/graph.d.ts +12 -4
  180. package/types/src/charts/Pack/applyLayout.d.ts +2 -0
  181. package/types/src/charts/Pack/groupRows.d.ts +46 -0
  182. package/types/src/charts/Pack/index.d.ts +3 -0
  183. package/types/src/charts/Pack/neutralPaint.d.ts +14 -0
  184. package/types/src/charts/Pack/nodeNames.d.ts +23 -0
  185. package/types/src/charts/ParallelCoordinates/chrome.d.ts +12 -0
  186. package/types/src/charts/ParallelCoordinates/index.d.ts +1 -0
  187. package/types/src/charts/ParallelCoordinates/titles.d.ts +7 -2
  188. package/types/src/charts/Plot/areaEnter.d.ts +34 -0
  189. package/types/src/charts/Plot/index.d.ts +4 -10
  190. package/types/src/charts/Plot/lineMarkerKeys.d.ts +11 -0
  191. package/types/src/charts/Plot/shapeLabelLegend.d.ts +19 -0
  192. package/types/src/charts/Plot/sharedTooltip.d.ts +7 -1
  193. package/types/src/charts/Priestley/timeAxis.d.ts +7 -4
  194. package/types/src/charts/Pyramid/gutter.d.ts +28 -6
  195. package/types/src/charts/Pyramid/scene.d.ts +1 -1
  196. package/types/src/charts/Radar/applyLayout.d.ts +2 -3
  197. package/types/src/charts/Radar/axisDecorations.d.ts +5 -2
  198. package/types/src/charts/Radar/curvedLabels.d.ts +35 -0
  199. package/types/src/charts/Radar/emit.d.ts +5 -2
  200. package/types/src/charts/Radar/index.d.ts +7 -2
  201. package/types/src/charts/Radar/points.d.ts +50 -0
  202. package/types/src/charts/RadialMatrix/applyLayout.d.ts +6 -4
  203. package/types/src/charts/Rings/emit.d.ts +24 -2
  204. package/types/src/charts/Rings/index.d.ts +4 -2
  205. package/types/src/charts/Rings/ringsCurves.d.ts +50 -0
  206. package/types/src/charts/Rings/ringsGraph.d.ts +29 -5
  207. package/types/src/charts/Rings/ringsParallel.d.ts +4 -2
  208. package/types/src/charts/Rings/ringsPlacement.d.ts +47 -0
  209. package/types/src/charts/Rings/ringsSizing.d.ts +36 -9
  210. package/types/src/charts/Tree/applyLayout.d.ts +20 -0
  211. package/types/src/charts/Tree/keys.d.ts +25 -0
  212. package/types/src/charts/Tree/nodeLabel.d.ts +11 -0
  213. package/types/src/charts/definition/ChartDefinition.d.ts +13 -0
  214. package/types/src/charts/definition/makeChart.d.ts +2 -2
  215. package/types/src/charts/drawSteps/zoomActions.d.ts +30 -0
  216. package/types/src/charts/drawSteps/zoomControls.d.ts +15 -0
  217. package/types/src/charts/drawSteps/zoomControlsMarkup.d.ts +16 -1
  218. package/types/src/charts/drawSteps/zoomDrag.d.ts +71 -0
  219. package/types/src/charts/drawSteps/zoomFit.d.ts +30 -0
  220. package/types/src/charts/features/axisTooltip.d.ts +49 -0
  221. package/types/src/charts/features/centerLabel.d.ts +75 -0
  222. package/types/src/charts/features/colorScaleBivariate.d.ts +50 -0
  223. package/types/src/charts/features/colorScaleBucket.d.ts +10 -0
  224. package/types/src/charts/features/colorScaleHover.d.ts +13 -3
  225. package/types/src/charts/features/colorScaleLimit.d.ts +60 -0
  226. package/types/src/charts/features/colorScaleTooltip.d.ts +43 -0
  227. package/types/src/charts/features/colorScaleTop.d.ts +30 -0
  228. package/types/src/charts/features/curvedArrows.d.ts +14 -0
  229. package/types/src/charts/features/depthKey.d.ts +19 -0
  230. package/types/src/charts/features/edgeArrows.d.ts +29 -2
  231. package/types/src/charts/features/hoverTicks.d.ts +30 -0
  232. package/types/src/charts/features/idleQueue.d.ts +46 -0
  233. package/types/src/charts/features/linkInteraction.d.ts +13 -4
  234. package/types/src/charts/features/networkMeasures.d.ts +53 -0
  235. package/types/src/charts/features/nodeStats.d.ts +93 -0
  236. package/types/src/charts/features/plotEndLabels.d.ts +14 -1
  237. package/types/src/charts/features/textHalo.d.ts +4 -3
  238. package/types/src/charts/partition/chartFields.d.ts +6 -1
  239. package/types/src/charts/pipeline/insetPlacement.d.ts +6 -0
  240. package/types/src/charts/polar/chrome.d.ts +19 -6
  241. package/types/src/charts/viz/Viz.d.ts +10 -3
  242. package/types/src/charts/viz/VizBase.d.ts +31 -2
  243. package/types/src/charts/viz/backgroundInk.d.ts +8 -0
  244. package/types/src/charts/viz/emphasis.d.ts +17 -0
  245. package/types/src/charts/viz/fillStroke.d.ts +7 -0
  246. package/types/src/charts/viz/reportDrawError.d.ts +12 -0
  247. package/types/src/charts/viz/setCursor.d.ts +26 -0
  248. package/types/src/charts/viz/tooltipEnabled.d.ts +31 -0
  249. package/types/src/charts/viz/userClick.d.ts +35 -0
  250. package/types/src/charts/viz/vizFields.d.ts +5 -0
  251. package/types/src/charts/viz/vizTypes.d.ts +16 -0
  252. package/types/src/charts/viz/vizVisibility.d.ts +7 -0
  253. package/types/src/components/Axis/Axis.d.ts +33 -3
  254. package/types/src/components/Axis/axisBreak.d.ts +19 -3
  255. package/types/src/components/Axis/axisDefaults.d.ts +12 -0
  256. package/types/src/components/Axis/axisLabelKinds.d.ts +22 -0
  257. package/types/src/components/Axis/axisLabelLineHeight.d.ts +27 -0
  258. package/types/src/components/Axis/axisLabelRoom.d.ts +17 -0
  259. package/types/src/components/Axis/axisLabelSize.d.ts +82 -0
  260. package/types/src/components/Axis/axisLabelThinning.d.ts +38 -2
  261. package/types/src/components/Axis/axisLayout.d.ts +9 -2
  262. package/types/src/components/Axis/axisLayoutLabels.d.ts +28 -33
  263. package/types/src/components/Axis/axisLayoutScale.d.ts +3 -1
  264. package/types/src/components/Axis/axisLimit.d.ts +18 -0
  265. package/types/src/components/Axis/axisMaxSize.d.ts +48 -0
  266. package/types/src/components/Axis/axisRounding.d.ts +8 -0
  267. package/types/src/components/Axis/axisTitle.d.ts +30 -0
  268. package/types/src/components/Axis/axisTooltipTargets.d.ts +82 -0
  269. package/types/src/components/ColorScale/ColorScale.d.ts +21 -11
  270. package/types/src/components/ColorScale/bivariateRender.d.ts +53 -0
  271. package/types/src/components/ColorScale/bivariateScale.d.ts +92 -0
  272. package/types/src/components/ColorScale/colorScaleSwatchTooltips.d.ts +48 -0
  273. package/types/src/components/Legend/Legend.d.ts +5 -0
  274. package/types/src/components/Legend/legendCut.d.ts +31 -0
  275. package/types/src/components/Legend/legendRender.d.ts +6 -1
  276. package/types/src/components/TextBox.d.ts +4 -0
  277. package/types/src/components/textEllipsis.d.ts +6 -0
  278. package/types/src/fluent.d.ts +18 -0
  279. package/types/src/shapes/emitLabels.d.ts +1 -1
  280. package/types/src/utils/D3plusConfig.d.ts +485 -609
  281. package/types/src/utils/configValue.d.ts +8 -0
  282. package/types/src/utils/index.d.ts +1 -1
  283. package/types/umd-entry.d.ts +4 -0
  284. package/umd/d3plus-core.full.js +22930 -17936
  285. package/umd/d3plus-core.full.min.js +2 -2
  286. package/umd/d3plus-core.js +21240 -16404
  287. package/umd/d3plus-core.min.js +2 -2
@@ -5,6 +5,7 @@
5
5
  inner edges, and the stack offset starts each side at its own edge.
6
6
  */ import { textWidth } from "@d3plus/dom";
7
7
  import { fontFamily as d3plusFontFamily, fontFamilyStringify } from "@d3plus/text";
8
+ import { inertAxis, stampTickTooltips, tickRank } from "../../components/Axis/axisTooltipTargets.js";
8
9
  import { stackOffsetDiverging } from "../Plot/stackHelpers.js";
9
10
  import { backgroundInk } from "../viz/backgroundInk.js";
10
11
  import { bandStep } from "./scene.js";
@@ -59,6 +60,17 @@ import { bandStep } from "./scene.js";
59
60
  });
60
61
  return Math.ceil(widest + padding * 2);
61
62
  }
63
+ /** The least room a gutter label gets, in multiples of its font size. */ const MIN_LABEL_EMS = 5;
64
+ /**
65
+ The narrowest the gutter shrinks to on a chart too narrow for `width`
66
+ (see `gutterWidth`): room for a few characters of the largest font plus
67
+ its padding on both sides, or `width` itself when that is narrower.
68
+ */ export function gutterMinWidth(width, fonts) {
69
+ if (!fonts.length) return width;
70
+ const size = Math.max(...fonts.map((f)=>f.size));
71
+ const padding = Math.max(...fonts.map((f)=>f.padding));
72
+ return Math.min(width, Math.ceil(size * MIN_LABEL_EMS + padding * 2));
73
+ }
62
74
  /**
63
75
  Which band labels fit: keeps the first label, each next one that clears
64
76
  the last kept one, and always the last label (dropping kept neighbors it
@@ -80,23 +92,34 @@ import { bandStep } from "./scene.js";
80
92
  }
81
93
  return keep;
82
94
  }
83
- /** Lays out the gutter labels as scene text nodes. */ export function gutterLabelNodes(box, labels, color) {
95
+ /**
96
+ Lays out the gutter labels as scene text nodes, chrome as an axis's are:
97
+ a label takes the pointer only when it has an axis tooltip to show.
98
+ @param box The TextBox that lays the labels out.
99
+ @param labels The labels and their boxes.
100
+ @param color The labels' ink.
101
+ @param tickTooltip The category axis's `tickTooltip`.
102
+ @param rank Each category's place along the category axis (see `tickRank`).
103
+ */ export function gutterLabelNodes(box, labels, color, tickTooltip, rank) {
84
104
  box.renderMode("compute").select(undefined).data(labels).config({
85
105
  fontColor: color,
86
106
  fontFamily: (d)=>d.font.family,
87
107
  fontSize: (d)=>d.font.size,
88
108
  fontWeight: (d)=>d.font.weight,
89
109
  textAnchor: "middle",
90
- verticalAlign: "middle"
110
+ verticalAlign: "middle",
111
+ // A label too long for the gutter wraps, and is cut short with an
112
+ // ellipsis (mid-word when even its first word is too wide).
113
+ truncateWord: true
91
114
  }).render();
92
- const group = box.toScene();
115
+ const children = box.toScene().children ?? [];
116
+ stampTickTooltips(children, tickTooltip, rank);
93
117
  return [
94
- {
118
+ inertAxis({
95
119
  type: "group",
96
120
  key: "pyramid-categories",
97
- interactionGroup: "axis",
98
- children: group.children ?? []
99
- }
121
+ children
122
+ })
100
123
  ];
101
124
  }
102
125
  /** The category axis's label config: its own defaults under the user's `yConfig` labels. */ export function categoryLabelConfig(viz) {
@@ -118,7 +141,8 @@ import { bandStep } from "./scene.js";
118
141
  /** A label's height for thinning: one line plus its padding above and below. */ export const labelHeight = (font)=>font.size * 1.2 + font.padding * 2;
119
142
  /**
120
143
  The category labels centered in the gutter between `edges` (pixels), one
121
- per band that has room, as scene nodes.
144
+ per band that has room, as scene nodes. Each takes the category axis's
145
+ `tickTooltip`, with the index its tick has on that axis.
122
146
  */ export function gutterLabels(viz, box, edges) {
123
147
  const y = viz._yFunc;
124
148
  const [left, right] = edges;
@@ -133,20 +157,28 @@ import { bandStep } from "./scene.js";
133
157
  if (!keep[i]) return [];
134
158
  // The box must be taller than one line for TextBox to fill it.
135
159
  const height = Math.max(step, fonts[i].size * 1.5);
160
+ const text = categoryText(viz, c);
161
+ // Inside its padding, so a label cut to a narrow gutter clears the bars.
162
+ const { padding } = fonts[i];
136
163
  return [
137
164
  {
138
165
  id: `pyramid-category-${i}`,
139
- text: categoryText(viz, c),
140
- x: left,
166
+ text,
167
+ x: left + padding,
141
168
  y: positions[i] - height / 2,
142
- width: right - left,
169
+ width: Math.max(0, right - left - padding * 2),
143
170
  height,
144
- font: fonts[i]
171
+ font: fonts[i],
172
+ data: {
173
+ id: c,
174
+ text,
175
+ tick: true
176
+ }
145
177
  }
146
178
  ];
147
179
  });
148
180
  const color = typeof config.fontColor === "string" ? config.fontColor : backgroundInk(viz);
149
- return gutterLabelNodes(box, labels, color);
181
+ return gutterLabelNodes(box, labels, color, viz._yAxis.schema.tickTooltip, tickRank(viz._yAxis));
150
182
  }
151
183
  /** Captures the axes' own styles before the center layout changes them. */ export function captureAxisStyles(viz) {
152
184
  return {
@@ -156,8 +188,10 @@ import { bandStep } from "./scene.js";
156
188
  },
157
189
  tickSize: viz._yAxis.tickSize()
158
190
  },
191
+ // `spaceMin` is no axis default, so it is captured as unset.
159
192
  x: {
160
193
  breakConfig: {
194
+ spaceMin: undefined,
161
195
  ...viz._xAxis.breakConfig()
162
196
  }
163
197
  }
@@ -165,9 +199,10 @@ import { bandStep } from "./scene.js";
165
199
  }
166
200
  /**
167
201
  The chart's own axis config for a layout: in the center layout, the value
168
- axis breaks around zero to make the gutter (`width` pixels, the axis line
169
- gapped, no break marks or lines) and the category axis draws nothing.
170
- */ export function gutterAxisDefaults(position, inset, width, userBreak, restore) {
202
+ axis breaks around zero to make the gutter (`width` pixels, shrinking to
203
+ `minWidth` on an axis too short for it; the axis line gapped, no break
204
+ marks or lines) and the category axis draws nothing.
205
+ */ export function gutterAxisDefaults(position, inset, width, userBreak, restore, minWidth = width) {
171
206
  if (position !== "center") return {
172
207
  x: {
173
208
  ...restore.x
@@ -194,6 +229,7 @@ import { bandStep } from "./scene.js";
194
229
  mask: false,
195
230
  size: 0,
196
231
  space: width,
232
+ spaceMin: minWidth,
197
233
  stroke: "transparent"
198
234
  }
199
235
  },
@@ -4,6 +4,7 @@
4
4
  category (e.g. age band). Values stay positive; the left side is mirrored
5
5
  internally and the value axis reads magnitudes on both halves.
6
6
  */ import { formatAbbreviate } from "@d3plus/format";
7
+ import { fitBreakSpace } from "../../components/Axis/axisBreak.js";
7
8
  import TextBox from "../../components/TextBox.js";
8
9
  import { fieldAccessor } from "../../utils/fieldAccessor.js";
9
10
  import { makeChart } from "../definition/makeChart.js";
@@ -11,7 +12,7 @@ import BarChart from "../BarChart/index.js";
11
12
  import { hasUserDomain } from "../Plot/baselineDomain.js";
12
13
  import { backgroundInk } from "../viz/backgroundInk.js";
13
14
  import { absoluteFormat, finite, frameTotals, pyramidExtent, pyramidSides, pyramidTotal, sideSign, symmetricDomain } from "./pyramidData.js";
14
- import { allCategories, captureAxisStyles, categoryLabelConfig, categoryText, gutterAxisDefaults, gutterInset, gutterLabels, gutterStackOffset, gutterWidth, labelFont } from "./gutter.js";
15
+ import { allCategories, captureAxisStyles, categoryLabelConfig, categoryText, gutterAxisDefaults, gutterInset, gutterLabels, gutterStackOffset, gutterMinWidth, gutterWidth, labelFont } from "./gutter.js";
15
16
  import { pyramidPanelScene, pyramidScene } from "./scene.js";
16
17
  import { pyramidStackOrder } from "./stackOrder.js";
17
18
  /** Data keys behind string `comparison` accessors, for tooltip labels. */ const comparisonKeys = new WeakMap();
@@ -109,20 +110,62 @@ const pyramidState = (viz)=>viz.ctx.pyramid;
109
110
  }
110
111
  /**
111
112
  Lays out the center gutter: each side starts `inset` from zero, and the
112
- value axis breaks there as wide as the widest category label.
113
- */ function syncGutter(viz, state, extent) {
114
- const position = viz.schema.categoryPosition;
113
+ value axis breaks there as wide as the widest category label (or as
114
+ wide as the axis can hold, down to a minimum).
115
+ */ function syncGutter(viz, state, extent, position = viz.schema.categoryPosition) {
115
116
  state.restore ??= captureAxisStyles(viz);
116
117
  const center = position === "center";
117
118
  state.inset = center ? gutterInset(extent) : 0;
118
119
  let width = 0;
120
+ let min = 0;
119
121
  if (center) {
120
122
  const categories = allCategories(viz);
121
123
  const config = categoryLabelConfig(viz);
122
124
  const fonts = categories.map((c, i)=>labelFont(config, c, i));
123
125
  width = gutterWidth(categories.map((c)=>categoryText(viz, c)), fonts);
126
+ min = gutterMinWidth(width, fonts);
124
127
  }
125
- viz._plotAxisDefaults = gutterAxisDefaults(position, state.inset, width, viz.schema.xBreak, state.restore);
128
+ const defaults = gutterAxisDefaults(position, state.inset, width, viz.schema.xBreak, state.restore, min);
129
+ viz._plotAxisDefaults = defaults;
130
+ state.gutter = center ? {
131
+ width,
132
+ min,
133
+ breaks: defaults.x.break.length
134
+ } : undefined;
135
+ }
136
+ /**
137
+ Whether the plot just drawn is too narrow for even the narrowest center
138
+ gutter, so the value axis dropped it (see `fitBreakSpace`).
139
+ */ function gutterDropped(viz, state) {
140
+ const { gutter } = state;
141
+ if (!gutter || viz._facetStep === "chrome" || !viz._filteredData?.length) return false;
142
+ const range = viz._xAxis?._getRange() ?? [];
143
+ if (range.length < 2 || !range.every(Number.isFinite)) return false;
144
+ const length = Math.abs(range[range.length - 1] - range[0]);
145
+ return fitBreakSpace(length, gutter.breaks, gutter.width, gutter.min) === null;
146
+ }
147
+ /**
148
+ Draws the chart, falling back to the left layout (drawn again from the
149
+ same margins) when the plot is too narrow for the center gutter.
150
+ */ function drawPyramid(viz, draw) {
151
+ return (callback)=>{
152
+ const state = pyramidState(viz);
153
+ const start = {
154
+ margin: {
155
+ ...viz._margin
156
+ },
157
+ padding: {
158
+ ...viz._padding
159
+ }
160
+ };
161
+ draw(callback);
162
+ if (!gutterDropped(viz, state)) return;
163
+ syncGutter(viz, state, state.extent, "left");
164
+ syncDomain(viz, state, state.extent);
165
+ viz._margin = start.margin;
166
+ viz._padding = start.padding;
167
+ draw(callback);
168
+ };
126
169
  }
127
170
  /** In percent mode, titles the value axis "Percent of Total" unless the user titled it. */ function syncTitle(viz, state) {
128
171
  const config = viz._xConfig;
@@ -152,7 +195,7 @@ const pyramidState = (viz)=>viz.ctx.pyramid;
152
195
  const comparison = viz.schema.comparison;
153
196
  state.comparisonTotal = comparison ? pyramidTotal(frame, comparison) : 0;
154
197
  syncTickFormat(viz, state);
155
- const extent = valueExtent(viz, state);
198
+ const extent = state.extent = valueExtent(viz, state);
156
199
  syncGutter(viz, state, extent);
157
200
  syncDomain(viz, state, extent);
158
201
  syncTitle(viz, state);
@@ -225,6 +268,7 @@ export const pyramidDef = {
225
268
  wrapped: new WeakSet(),
226
269
  titleBox: new TextBox(),
227
270
  inset: 0,
271
+ extent: 0,
228
272
  labelBox: new TextBox()
229
273
  };
230
274
  interceptValue(viz);
@@ -254,6 +298,7 @@ export const pyramidDef = {
254
298
  preDraw();
255
299
  preparePyramid(viz);
256
300
  };
301
+ viz._draw = drawPyramid(viz, viz._draw.bind(viz));
257
302
  },
258
303
  // Small multiples add these to each panel as it draws (see `facet` below).
259
304
  decorateScene: (viz, scene)=>viz._facetPanels ? scene : pyramidScene(viz, scene, sceneInput(viz)),
@@ -273,7 +318,10 @@ export const pyramidDef = {
273
318
  Where the category labels (e.g. age bands) are drawn: `"center"`
274
319
  (default) down a gutter between the two halves, as wide as the widest
275
320
  label, with each half reading outward from zero at its edge; or
276
- `"left"`, on a regular category axis beside the chart.
321
+ `"left"`, on a regular category axis beside the chart. On a narrow
322
+ chart the gutter narrows (to a few characters at least), wrapping
323
+ its labels and cutting them short with an ellipsis; a chart too
324
+ narrow even for that draws its labels at the left.
277
325
  @type {"center" | "left"}
278
326
  */ {
279
327
  key: "categoryPosition",
@@ -2,6 +2,7 @@
2
2
  Pyramid's own scene chrome, layered onto the Plot scene: a title above
3
3
  each half, and the comparison outline traced around each side's bars.
4
4
  */ import { clamp } from "@d3plus/math";
5
+ import { inertAxis } from "../../components/Axis/axisTooltipTargets.js";
5
6
  import { PLOT_ZOOM_CONTENT_KEY } from "../features/plotPaint.js";
6
7
  import { finite, sideSign } from "./pyramidData.js";
7
8
  /**
@@ -113,19 +114,18 @@ import { finite, sideSign } from "./pyramidData.js";
113
114
  height
114
115
  }));
115
116
  }
116
- /** Lays out the side titles as scene text nodes. */ export function sideTitleNodes(box, titles, config) {
117
+ /** Lays out the side titles as scene text nodes, chrome as an axis's are. */ export function sideTitleNodes(box, titles, config) {
117
118
  box.renderMode("compute").select(undefined).data(titles.map((t, i)=>({
118
119
  ...t,
119
120
  id: `pyramid-side-${i}`
120
121
  }))).config(config).render();
121
122
  const group = box.toScene();
122
123
  return [
123
- {
124
+ inertAxis({
124
125
  type: "group",
125
126
  key: "pyramid-side-titles",
126
- interactionGroup: "axis",
127
127
  children: group.children ?? []
128
- }
128
+ })
129
129
  ];
130
130
  }
131
131
  /**
@@ -2,38 +2,18 @@
2
2
  `applyRadarLayout` — Radar's chart-specific layout stage. Computes per-
3
3
  axis angular positions and the web radius (sized to the metric labels,
4
4
  see `axisLabels.ts`), the radial value domain + level rings (see
5
- `levels.ts`), per-group polygon vertices, and the per-polygon
6
- `pathConfig` (with event-handler wrappers that translate cursor →
7
- nearest vertex). Emits the chrome (rings, metric labels, spokes, level
5
+ `levels.ts`), per-group polygon vertices, and the polygons'
6
+ `pathConfig`. Emits the chrome (rings, metric labels, spokes, level
8
7
  value labels — see `axisDecorations.ts`) into `_chartScene`, beneath the
9
8
  polygons. Stashes `groupData` + `pathConfig` on `viz.ctx`.
10
- */ import { groups, min, sum } from "d3-array";
11
- import { pointer } from "d3-selection";
9
+ */ import { groups, sum } from "d3-array";
12
10
  import { merge } from "@d3plus/data";
13
11
  import { shapeConfigFor } from "../features/emitHelpers.js";
14
12
  import { chartBounds } from "../features/chartGeometry.js";
15
13
  import { radarAxisNodes, radarLevelLabelNodes, radarPolarAxis, radarRingNodes } from "./axisDecorations.js";
16
14
  import { radarLevels, radarRadius } from "./levels.js";
15
+ import { registerRadarPoint } from "./points.js";
17
16
  const TAU = Math.PI * 2;
18
- /** Builds the polygon `pathConfig`, wrapping handlers to resolve cursor → nearest vertex. */ const buildPathConfig = (viz, width, height)=>{
19
- const pathConfig = shapeConfigFor(viz, "Path");
20
- // Event-handler wrappers: cursor → nearest polygon vertex resolution.
21
- const eventNames = Object.keys(pathConfig.on ?? {});
22
- pathConfig.on = {};
23
- for (const eventName of eventNames){
24
- pathConfig.on[eventName] = (d, i, s, evt)=>{
25
- const xs = d.points.map((p)=>p.x + width / 2);
26
- const ys = d.points.map((p)=>p.y + height / 2);
27
- const cursor = pointer(evt, viz._select.node());
28
- const xDist = xs.map((p)=>Math.abs(p - cursor[0]));
29
- const yDist = ys.map((p)=>Math.abs(p - cursor[1]));
30
- const dists = xDist.map((dd, ii)=>dd + yDist[ii]);
31
- const handler = viz.schema.on[eventName];
32
- handler.call(viz, d.arr[dists.indexOf(min(dists))], i, s, evt);
33
- };
34
- }
35
- return pathConfig;
36
- };
37
17
  export const applyRadarLayout = ({ viz })=>{
38
18
  const { width, height } = chartBounds(viz);
39
19
  const metricFn = viz.schema.metric;
@@ -57,11 +37,18 @@ export const applyRadarLayout = ({ viz })=>{
57
37
  const chartScene = Array.isArray(viz._chartScene) ? viz._chartScene : viz._chartScene = [];
58
38
  chartScene.push(...radarRingNodes(viz, levels, radius), ...radarAxisNodes(viz, polarAxis), ...radarLevelLabelNodes(viz, levels, radius));
59
39
  const totalAxis = nestedAxisData.length;
60
- const groupData = nestedGroupData.map(([hKey, innerEntries])=>{
61
- const q = innerEntries.map(([, vals], i)=>{
62
- const value = sum(vals, (x, ii)=>valueFn(x, ii));
63
- const r = radarRadius(value, domain, radius);
64
- const radians = TAU / totalAxis * i;
40
+ const spokeOf = new Map(nestedAxisData.map(([key], i)=>[
41
+ key,
42
+ i
43
+ ]));
44
+ const groupData = nestedGroupData.map(([hKey, entries])=>{
45
+ // Each vertex sits on its own metric's spoke, in spoke order; a
46
+ // metric the group has no value for has no vertex.
47
+ const innerEntries = entries.slice().sort((a, b)=>spokeOf.get(a[0]) - spokeOf.get(b[0]));
48
+ const values = innerEntries.map(([, vals])=>sum(vals, (x, ii)=>valueFn(x, ii)));
49
+ const q = innerEntries.map(([metric], k)=>{
50
+ const r = radarRadius(values[k], domain, radius);
51
+ const radians = TAU / totalAxis * spokeOf.get(metric);
65
52
  return {
66
53
  x: r * Math.cos(radians),
67
54
  y: r * Math.sin(radians)
@@ -69,18 +56,29 @@ export const applyRadarLayout = ({ viz })=>{
69
56
  });
70
57
  const pathD = `M ${q[0].x} ${q[0].y} ${q.map((l)=>`L ${l.x} ${l.y}`).join(" ")} L ${q[0].x} ${q[0].y}`;
71
58
  const aggs = viz.schema.aggs;
59
+ const metrics = innerEntries.map(([metric])=>metric);
60
+ // Each vertex's row: the datum of its dot (see `points.ts`).
61
+ const arr = innerEntries.map(([, vals], k)=>{
62
+ const row = merge(vals, aggs);
63
+ registerRadarPoint(row, {
64
+ metric: metrics[k],
65
+ value: values[k]
66
+ });
67
+ return row;
68
+ });
72
69
  return {
73
70
  __d3plus__: true,
74
- arr: innerEntries.map(([, vals])=>merge(vals, aggs)),
71
+ arr,
75
72
  id: hKey,
73
+ metrics,
74
+ values,
76
75
  points: q,
77
76
  d: pathD,
78
- data: merge(innerEntries.map(([, vals])=>merge(vals, aggs)), aggs)
77
+ data: merge(arr, aggs)
79
78
  };
80
79
  });
81
- const pathConfig = buildPathConfig(viz, width, height);
82
80
  viz.ctx.groupData = groupData;
83
- viz.ctx.pathConfig = pathConfig;
81
+ viz.ctx.pathConfig = shapeConfigFor(viz, "Path");
84
82
  return {
85
83
  shapeData: groupData
86
84
  };
@@ -8,21 +8,24 @@ import { formatAbbreviate } from "@d3plus/format";
8
8
  import { fontFamily as defaultFontFamily, fontFamilyStringify, textWrap } from "@d3plus/text";
9
9
  import TextBox from "../../components/TextBox.js";
10
10
  import { emitLabels, shapeLabelDefaults } from "../../shapes/emitLabels.js";
11
- import { paintFromShapeConfig, resolveAccessor, shapeConfigFor } from "../features/emitHelpers.js";
11
+ import { paintFromShapeConfig, shapeConfigFor } from "../features/emitHelpers.js";
12
12
  import { textLineBoxes } from "../features/linkLabels.js";
13
- import { clearRingLabels, ringLabelFont, ringLabelNodes } from "../features/ringLabelNodes.js";
13
+ import { clearRingLabels } from "../features/ringLabelNodes.js";
14
14
  import { ringLabelPosition } from "../features/ringLabels.js";
15
15
  import { backgroundInk } from "../viz/backgroundInk.js";
16
16
  import { RADAR_EDGE_GAP, RADAR_LABEL_MAX_LINES, RADAR_LABEL_PADDING, radarAxisLabelLayout } from "./axisLabels.js";
17
- import { radarCurveLines, radarCurvedLayout, radarCurves } from "./curvedLabels.js";
17
+ import { radarCurveNodes, radarCurvedLayout, radarCurvesAt } from "./curvedLabels.js";
18
18
  import { emitRadarLevelLabels, radarLevelLabels, radarRadius } from "./levels.js";
19
19
  import { emitRadarRings, radarRingStyle } from "./rings.js";
20
20
  const TAU = Math.PI * 2;
21
- /** Resolves the font a metric label renders with, the way its TextBox will. */ export const labelFont = (viz, text, datum, i)=>{
21
+ /**
22
+ Resolves the font a metric label renders with, the way its TextBox will:
23
+ from `labelConfig`, else `axisConfig.shapeConfig.labelConfig`.
24
+ */ export const labelFont = (viz, text, datum, i, labelConfig)=>{
22
25
  const axisConfig = viz.schema.axisConfig;
23
26
  const tb = new TextBox().config({
24
27
  ...shapeLabelDefaults,
25
- ...axisConfig.shapeConfig?.labelConfig ?? {}
28
+ ...labelConfig ?? axisConfig.shapeConfig?.labelConfig ?? {}
26
29
  });
27
30
  const s = tb.schema;
28
31
  const record = {
@@ -88,8 +91,7 @@ const TAU = Math.PI * 2;
88
91
  radius = layout.radius;
89
92
  boxes = layout.labels;
90
93
  }
91
- const lines = radarCurveLines(inputs, radius, room);
92
- curves ??= lines ? radarCurves(viz, inputs, radius, lines) : inputs.map(()=>null);
94
+ curves ??= radarCurvesAt(viz, inputs, radius, room);
93
95
  const polarAxis = inputs.map(({ key, data, font, angle: radians }, i)=>{
94
96
  const hh = font.lineHeight * RADAR_LABEL_MAX_LINES;
95
97
  const ww = boxes[i].wrapWidth;
@@ -136,16 +138,18 @@ const TAU = Math.PI * 2;
136
138
  */ function radarAxisLabels(viz, polarAxis) {
137
139
  const axisConfig = viz.schema.axisConfig;
138
140
  const labelConfig = axisConfig.shapeConfig?.labelConfig ?? {};
139
- const colorOf = (p)=>{
140
- const color = resolveAccessor(labelConfig.fontColor, p.data, p.i);
141
- return typeof color === "string" ? color : backgroundInk(viz);
142
- };
143
- const curved = ringLabelNodes(viz, polarAxis.flatMap((p)=>(p.labelCurve?.lines ?? []).map((line, k)=>({
144
- key: `radar-axis-label-${p.id}${k ? `-${k}` : ""}`,
145
- text: line.text,
146
- fit: line.fit,
147
- color: colorOf(p)
148
- }))), ringLabelFont(labelConfig));
141
+ const curved = radarCurveNodes(viz, polarAxis.flatMap((p)=>p.labelCurve ? [
142
+ {
143
+ key: `radar-axis-label-${p.id}`,
144
+ data: p.data,
145
+ i: p.i,
146
+ curve: p.labelCurve,
147
+ hoverMatch: {
148
+ field: "metric",
149
+ value: p.key
150
+ }
151
+ }
152
+ ] : []), labelConfig);
149
153
  const straight = emitLabels({
150
154
  data: polarAxis.filter((p)=>!p.labelCurve && ringLabelPosition(viz, p.data, p.i) !== "along"),
151
155
  label: (d)=>d.id,
@@ -157,6 +161,14 @@ const TAU = Math.PI * 2;
157
161
  labelBounds: (d)=>d.labelBounds,
158
162
  labelConfig
159
163
  });
164
+ // Each label follows the hover of the polygons with a value for it.
165
+ for (const n of straight){
166
+ const metric = n.datum?.data?.key;
167
+ if (metric !== undefined) n.hoverMatch = {
168
+ field: "metric",
169
+ value: metric
170
+ };
171
+ }
160
172
  return [
161
173
  ...curved,
162
174
  ...clearRingLabels(straight, textLineBoxes(curved))
@@ -7,8 +7,10 @@
7
7
  into the band the spoke labels would need.
8
8
  */ import { fontExists } from "@d3plus/dom";
9
9
  import { fontFamily as defaultFontFamily, textWrap } from "@d3plus/text";
10
- import { ringTextWidth } from "../features/ringLabelNodes.js";
10
+ import { resolveAccessor } from "../features/emitHelpers.js";
11
+ import { ringLabelFont, ringLabelNodes, ringTextWidth } from "../features/ringLabelNodes.js";
11
12
  import { ringLabelEnd, ringLabelFit, ringLabelPosition } from "../features/ringLabels.js";
13
+ import { backgroundInk } from "../viz/backgroundInk.js";
12
14
  /** The gap (px) between the outer ring and a curved metric label. */ export const RADAR_CURVE_PADDING = 5;
13
15
  /** The lines a curved metric label may wrap onto. */ export const RADAR_CURVE_MAX_LINES = 2;
14
16
  /** A label's line height: its font's, else 1.2em. */ const lineHeightOf = (l)=>l.font.lineHeight ?? l.font.fontSize * 1.2;
@@ -24,7 +26,7 @@ import { ringLabelEnd, ringLabelFit, ringLabelPosition } from "../features/ringL
24
26
  return size + (lines - 1) * lh + RADAR_CURVE_PADDING * 2;
25
27
  }
26
28
  /** The ring segment a label's `j`th line (0 nearest the web) curves along. */ function lineArc(label, radius, j, n) {
27
- const half = Math.PI / Math.max(1, n);
29
+ const half = (label.span ?? Math.PI * 2 / Math.max(1, n)) / 2;
28
30
  // Ring angles run clockwise from 12 o'clock, a spoke's from 3 o'clock.
29
31
  const mid = label.angle + Math.PI / 2;
30
32
  const inner = radius + j * lineHeightOf(label);
@@ -165,6 +167,17 @@ import { ringLabelEnd, ringLabelFit, ringLabelPosition } from "../features/ringL
165
167
  for(let lines = RADAR_CURVE_MAX_LINES; lines > 0; lines--)if (radius + radarCurveBand(labels, lines) <= room) return lines;
166
168
  return 0;
167
169
  }
170
+ /**
171
+ Each label's curve at `radius`, on as many lines as the room around the
172
+ web holds (see `radarCurveLines`), or null where it doesn't curve.
173
+ @param viz The chart.
174
+ @param labels The metric labels, in spoke order.
175
+ @param radius The web's radius.
176
+ @param room The room from the center to the area's nearest edge.
177
+ */ export function radarCurvesAt(viz, labels, radius, room) {
178
+ const lines = radarCurveLines(labels, radius, room);
179
+ return lines ? radarCurves(viz, labels, radius, lines) : labels.map(()=>null);
180
+ }
168
181
  /**
169
182
  The web's radius and every metric's curved label when every name fits
170
183
  along the web, which leaves the web the most room: on one line when
@@ -185,3 +198,31 @@ import { ringLabelEnd, ringLabelFit, ringLabelPosition } from "../features/ringL
185
198
  }
186
199
  return null;
187
200
  }
201
+ /**
202
+ The text nodes for curved labels, one per line, in `labelConfig`'s font
203
+ and color (the chart's ink by default).
204
+ @param viz The chart.
205
+ @param labels The labels.
206
+ @param labelConfig Their label config.
207
+ */ export function radarCurveNodes(viz, labels, labelConfig) {
208
+ const colorOf = (l)=>{
209
+ const color = resolveAccessor(labelConfig.fontColor, l.data, l.i);
210
+ return typeof color === "string" ? color : backgroundInk(viz);
211
+ };
212
+ const matches = new Map();
213
+ const nodes = ringLabelNodes(viz, labels.flatMap((l)=>l.curve.lines.map((line, k)=>{
214
+ const key = `${l.key}${k ? `-${k}` : ""}`;
215
+ matches.set(key, l.hoverMatch);
216
+ return {
217
+ key,
218
+ text: line.text,
219
+ fit: line.fit,
220
+ color: colorOf(l)
221
+ };
222
+ })), ringLabelFont(labelConfig));
223
+ for (const node of nodes){
224
+ const match = matches.get(`${node.key}`);
225
+ if (match) node.hoverMatch = match;
226
+ }
227
+ return nodes;
228
+ }
@@ -1,35 +1,50 @@
1
1
  /**
2
2
  `radarEmit` — Path SceneNodes for each radar polygon, using
3
- `groupData` + `pathConfig` stashed on `viz.ctx`. Emits flat SceneNodes
4
- directly (no transient Shape compute pass).
5
- */ import { paintFromShapeConfig } from "../features/emitHelpers.js";
6
- import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
3
+ `groupData` + `pathConfig` stashed on `viz.ctx`, each followed by its
4
+ background image and a Circle on each of its vertices (see
5
+ `points.ts`), so a later polygon covers an earlier one's dots as it
6
+ covers its fill. The dots, not the polygons, answer the pointer. Emits
7
+ flat SceneNodes directly (no transient Shape compute pass).
8
+ */ import { paintFromShapeConfig, resolveAccessor, shapeConfigFor } from "../features/emitHelpers.js";
9
+ import { backgroundImageNode } from "../features/backgroundImageEmit.js";
10
+ import { radarGroupPointNodes } from "./points.js";
7
11
  export const radarEmit = ({ viz })=>{
8
12
  const groupData = viz.ctx.groupData;
9
13
  const pathConfig = viz.ctx.pathConfig;
10
14
  if (!groupData || !pathConfig || !groupData.length) return [];
15
+ const circleConfig = shapeConfigFor(viz, "Circle");
11
16
  const out = [];
12
17
  for(let i = 0; i < groupData.length; i++){
13
18
  const g = groupData[i];
14
19
  const datum = g.data ?? g;
15
- const paint = paintFromShapeConfig(pathConfig, datum, i);
16
- out.push({
20
+ const fillOpacity = resolveAccessor(pathConfig.fillOpacity, datum, i);
21
+ const paint = {
22
+ ...paintFromShapeConfig(pathConfig, datum, i),
23
+ ...typeof fillOpacity === "number" ? {
24
+ fillOpacity
25
+ } : {}
26
+ };
27
+ const dots = radarGroupPointNodes(viz, g, i, circleConfig);
28
+ const path = {
17
29
  type: "path",
18
30
  key: `radar-${g.id}`,
19
31
  d: g.d,
20
32
  datum,
33
+ // The labels of the metrics it has a value for stay bright on hover.
34
+ hoverKeys: {
35
+ metric: g.metrics ?? []
36
+ },
21
37
  paint,
38
+ // Its dots take the pointer; without them, the polygon does.
39
+ interactive: !dots.length,
22
40
  aria: {
23
41
  label: `${viz._drawLabel(datum, i)}.`
24
42
  }
25
- });
43
+ };
44
+ out.push(path);
45
+ const image = pathConfig.backgroundImage ? backgroundImageNode(pathConfig, path, datum, i) : null;
46
+ if (image) out.push(image);
47
+ out.push(...dots);
26
48
  }
27
- const images = backgroundImageNodes(pathConfig, out, (k)=>[
28
- groupData[k].data ?? groupData[k],
29
- k
30
- ]);
31
- return [
32
- ...out,
33
- ...images
34
- ];
49
+ return out;
35
50
  };