@d3plus/core 4.10.0 → 4.11.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/es/index.js +1 -1
- package/es/internal.js +167 -8
- package/es/src/charts/Alluvial/aggregate.js +145 -0
- package/es/src/charts/Alluvial/applyLayout.js +125 -0
- package/es/src/charts/Alluvial/dimensions.js +56 -0
- package/es/src/charts/Alluvial/emit.js +73 -0
- package/es/src/charts/Alluvial/hover.js +101 -0
- package/es/src/charts/Alluvial/index.js +170 -0
- package/es/src/charts/Alluvial/layout.js +137 -0
- package/es/src/charts/Alluvial/meta.js +57 -0
- package/es/src/charts/Alluvial/titles.js +81 -0
- package/es/src/charts/ArcDiagram/applyLayout.js +386 -0
- package/es/src/charts/ArcDiagram/arcGeometry.js +275 -0
- package/es/src/charts/ArcDiagram/arcLabels.js +171 -0
- package/es/src/charts/ArcDiagram/arcLoops.js +78 -0
- package/es/src/charts/ArcDiagram/emit.js +178 -0
- package/es/src/charts/ArcDiagram/events.js +144 -0
- package/es/src/charts/ArcDiagram/index.js +215 -0
- package/es/src/charts/BarChart/index.js +14 -2
- package/es/src/charts/BoxWhisker/index.js +22 -0
- package/es/src/charts/BubbleChart/emit.js +31 -0
- package/es/src/charts/BubbleChart/index.js +54 -0
- package/es/src/charts/Calendar/emit.js +1 -1
- package/es/src/charts/Calendar/index.js +3 -2
- package/es/src/charts/Candlestick/buffer.js +6 -4
- package/es/src/charts/Candlestick/index.js +2 -1
- package/es/src/charts/Chord/applyLayout.js +56 -69
- package/es/src/charts/Chord/emit.js +55 -24
- package/es/src/charts/Chord/index.js +14 -10
- package/es/src/charts/Chord/labels.js +105 -0
- package/es/src/charts/Donut/index.js +5 -11
- package/es/src/charts/Dumbbell/index.js +2 -4
- package/es/src/charts/Gantt/applyLayout.js +162 -0
- package/es/src/charts/Gantt/emit.js +142 -0
- package/es/src/charts/Gantt/ganttDecor.js +207 -0
- package/es/src/charts/Gantt/ganttGeometry.js +107 -0
- package/es/src/charts/Gantt/ganttLabels.js +85 -0
- package/es/src/charts/Gantt/ganttRows.js +111 -0
- package/es/src/charts/Gantt/ganttTooltip.js +136 -0
- package/es/src/charts/Gantt/index.js +219 -0
- package/es/src/charts/Geomap/applyLayout.js +90 -49
- package/es/src/charts/Geomap/basemapTheme.js +3 -48
- package/es/src/charts/Geomap/emit.js +19 -2
- package/es/src/charts/Geomap/flowEmit.js +132 -0
- package/es/src/charts/Geomap/flowEvents.js +86 -0
- package/es/src/charts/Geomap/flowFields.js +91 -0
- package/es/src/charts/Geomap/flowGeometry.js +225 -0
- package/es/src/charts/Geomap/flowLinks.js +239 -0
- package/es/src/charts/Geomap/geoCache.js +180 -0
- package/es/src/charts/Geomap/globeKeys.js +131 -0
- package/es/src/charts/Geomap/globeRotate.js +208 -0
- package/es/src/charts/Geomap/index.js +51 -16
- package/es/src/charts/Geomap/pointLabels.js +107 -0
- package/es/src/charts/Hexbin/binning.js +103 -0
- package/es/src/charts/Hexbin/buffer.js +33 -0
- package/es/src/charts/Hexbin/contourLabels.js +234 -0
- package/es/src/charts/Hexbin/contours.js +48 -0
- package/es/src/charts/Hexbin/emit.js +142 -0
- package/es/src/charts/Hexbin/index.js +204 -0
- package/es/src/charts/Hexbin/layers.js +212 -0
- package/es/src/charts/Hexbin/settings.js +86 -0
- package/es/src/charts/Hexbin/tooltip.js +77 -0
- package/es/src/charts/Histogram/binData.js +31 -4
- package/es/src/charts/Histogram/index.js +32 -15
- package/es/src/charts/Histogram/labels.js +18 -0
- package/es/src/charts/Icicle/index.js +3 -3
- package/es/src/charts/LinePlot/index.js +7 -0
- package/es/src/charts/Marimekko/index.js +7 -4
- package/es/src/charts/Network/applyLayout.js +138 -94
- package/es/src/charts/Network/bundle.js +81 -0
- package/es/src/charts/Network/clusterLabels.js +423 -0
- package/es/src/charts/Network/clusters.js +290 -0
- package/es/src/charts/Network/emit.js +253 -70
- package/es/src/charts/Network/graph.js +117 -0
- package/es/src/charts/Network/graphFluent.js +79 -0
- package/es/src/charts/Network/index.js +86 -106
- package/es/src/charts/Network/minNodeDistance.js +64 -0
- package/es/src/charts/Network/polygonRows.js +44 -0
- package/es/src/charts/Pack/index.js +5 -1
- package/es/src/charts/Pie/applyLayout.js +86 -27
- package/es/src/charts/Pie/arcFit.js +152 -0
- package/es/src/charts/Pie/curvedLabels.js +134 -0
- package/es/src/charts/Pie/emit.js +43 -96
- package/es/src/charts/Pie/index.js +64 -31
- package/es/src/charts/Pie/labelRoom.js +154 -0
- package/es/src/charts/Pie/outsideLabels.js +224 -0
- package/es/src/charts/Pie/outsideNodes.js +267 -0
- package/es/src/charts/Pie/pieLabels.js +137 -0
- package/es/src/charts/Pie/sectorBox.js +223 -0
- package/es/src/charts/Pie/straightLabels.js +96 -0
- package/es/src/charts/Pie/straightLayout.js +215 -0
- package/es/src/charts/Plot/alongLegend.js +76 -0
- package/es/src/charts/Plot/areaLabelsAlong.js +333 -0
- package/es/src/charts/Plot/axisHoverScene.js +2 -1
- package/es/src/charts/Plot/axisValues.js +43 -0
- package/es/src/charts/Plot/barWidth.js +59 -11
- package/es/src/charts/Plot/circleLabels.js +98 -0
- package/es/src/charts/Plot/connectGaps.js +237 -0
- package/es/src/charts/Plot/connectGapsScene.js +188 -0
- package/es/src/charts/Plot/draw.js +8 -2
- package/es/src/charts/Plot/fillBetween.js +2 -1
- package/es/src/charts/Plot/forecastScene.js +3 -4
- package/es/src/charts/Plot/index.js +18 -10
- package/es/src/charts/Plot/labelPlacement.js +1 -1
- package/es/src/charts/Plot/lineLabelEmit.js +82 -0
- package/es/src/charts/Plot/lineLabelSides.js +51 -0
- package/es/src/charts/Plot/lineLabelSpread.js +65 -0
- package/es/src/charts/Plot/lineLabelsAlong.js +282 -0
- package/es/src/charts/Plot/pipeline.js +66 -19
- package/es/src/charts/Plot/pipelineAxisLayout.js +5 -1
- package/es/src/charts/Plot/pipelineDomains.js +16 -3
- package/es/src/charts/Plot/pipelineLineLabels.js +144 -52
- package/es/src/charts/Plot/pipelineScales.js +40 -8
- package/es/src/charts/Plot/plotFacet.js +12 -1
- package/es/src/charts/Plot/plotInit.js +34 -5
- package/es/src/charts/Plot/plotRangeBreaks.js +85 -0
- package/es/src/charts/Plot/referenceDomains.js +133 -0
- package/es/src/charts/Plot/shapeDefaults.js +10 -5
- package/es/src/charts/Plot/stackLegendOrder.js +176 -0
- package/es/src/charts/Plot/trendLabels.js +183 -0
- package/es/src/charts/Plot/trendLines.js +1 -0
- package/es/src/charts/Plot/trendScene.js +6 -3
- package/es/src/charts/Plot/trendTooltip.js +5 -1
- package/es/src/charts/PolarArea/index.js +2 -2
- package/es/src/charts/Priestley/applyLayout.js +14 -20
- package/es/src/charts/Priestley/index.js +4 -35
- package/es/src/charts/Priestley/timeAxis.js +100 -0
- package/es/src/charts/Radar/axisDecorations.js +49 -12
- package/es/src/charts/Radar/curvedLabels.js +187 -0
- package/es/src/charts/Radar/index.js +2 -3
- package/es/src/charts/RadialBar/curvedLabels.js +111 -0
- package/es/src/charts/RadialBar/emit.js +4 -1
- package/es/src/charts/RadialBar/index.js +16 -9
- package/es/src/charts/RadialBar/trackLayout.js +43 -13
- package/es/src/charts/RadialMatrix/index.js +3 -7
- package/es/src/charts/Rings/applyLayout.js +41 -24
- package/es/src/charts/Rings/emit.js +174 -58
- package/es/src/charts/Rings/index.js +61 -28
- package/es/src/charts/Rings/ringsGraph.js +28 -9
- package/es/src/charts/Rings/ringsLoops.js +73 -0
- package/es/src/charts/Rings/ringsParallel.js +166 -0
- package/es/src/charts/Sankey/applyLayout.js +116 -39
- package/es/src/charts/Sankey/circularLayout.js +208 -0
- package/es/src/charts/Sankey/circularLinks.js +301 -0
- package/es/src/charts/Sankey/emit.js +164 -94
- package/es/src/charts/Sankey/index.js +72 -75
- package/es/src/charts/Sankey/labels.js +80 -0
- package/es/src/charts/Sankey/ribbons.js +88 -0
- package/es/src/charts/Sankey/sankeyCycles.js +117 -0
- package/es/src/charts/Sankey/sankeyLayout.js +8 -3
- package/es/src/charts/Sankey/sankeyLinks.js +47 -0
- package/es/src/charts/Scatter/index.js +25 -0
- package/es/src/charts/SlopeChart/index.js +116 -0
- package/es/src/charts/SlopeChart/slope.js +95 -0
- package/es/src/charts/Streamgraph/index.js +51 -0
- package/es/src/charts/Sunburst/curvedLabels.js +74 -0
- package/es/src/charts/Sunburst/emit.js +74 -63
- package/es/src/charts/Sunburst/index.js +3 -3
- package/es/src/charts/Tree/index.js +2 -6
- package/es/src/charts/Treemap/index.js +2 -5
- package/es/src/charts/Violin/inner.js +3 -5
- package/es/src/charts/definition/makeChart.js +10 -2
- package/es/src/charts/drawSteps/backControl.js +17 -5
- package/es/src/charts/drawSteps/gestureHover.js +79 -0
- package/es/src/charts/drawSteps/minimap.js +6 -5
- package/es/src/charts/drawSteps/minimapMarkup.js +25 -9
- package/es/src/charts/drawSteps/searchControls.js +2 -1
- package/es/src/charts/drawSteps/searchControlsMarkup.js +11 -2
- package/es/src/charts/drawSteps/tableViewMarkup.js +17 -10
- package/es/src/charts/drawSteps/zoomControls.js +21 -5
- package/es/src/charts/events/click.legend.js +7 -2
- package/es/src/charts/events/click.shape.js +8 -1
- package/es/src/charts/events/mousemove.shape.js +5 -2
- package/es/src/charts/facet/drawFacets.js +14 -5
- package/es/src/charts/features/annotationFrame.js +179 -0
- package/es/src/charts/features/annotationText.js +83 -0
- package/es/src/charts/features/annotationTypes.js +10 -0
- package/es/src/charts/features/attributionFeature.js +6 -11
- package/es/src/charts/features/axes.js +2 -1
- package/es/src/charts/features/axesFinal.js +3 -1
- package/es/src/charts/features/axesMeasure.js +7 -4
- package/es/src/charts/features/calloutLayout.js +121 -0
- package/es/src/charts/features/calloutScene.js +155 -0
- package/es/src/charts/features/chartGeometry.js +1 -1
- package/es/src/charts/features/circleLabelPlacement.js +297 -0
- package/es/src/charts/features/circleLabels.js +207 -0
- package/es/src/charts/features/colorScaleBucket.js +2 -1
- package/es/src/charts/features/colorScaleHover.js +3 -2
- package/es/src/charts/features/colorScaleValue.js +97 -0
- package/es/src/charts/features/curvedArrows.js +158 -0
- package/es/src/charts/features/edgeArrows.js +160 -4
- package/es/src/charts/features/edgeBundling.js +442 -0
- package/es/src/charts/features/edgeBundlingSmooth.js +117 -0
- package/es/src/charts/features/ensureZoomDom.js +32 -8
- package/es/src/charts/features/features.js +32 -14
- package/es/src/charts/features/featuresColorScale.js +20 -6
- package/es/src/charts/features/featuresLegend.js +15 -24
- package/es/src/charts/features/legendKeys.js +64 -0
- package/es/src/charts/features/lineLabels.js +55 -46
- package/es/src/charts/features/linkBundle.js +19 -0
- package/es/src/charts/features/linkColor.js +72 -0
- package/es/src/charts/features/linkFields.js +86 -0
- package/es/src/charts/features/linkFocus.js +118 -0
- package/es/src/charts/features/linkInteraction.js +312 -0
- package/es/src/charts/features/linkKeys.js +20 -0
- package/es/src/charts/features/linkLabelGeometry.js +209 -0
- package/es/src/charts/features/linkLabelPath.js +162 -0
- package/es/src/charts/features/linkLabels.js +340 -0
- package/es/src/charts/features/linkWidths.js +32 -0
- package/es/src/charts/features/pathLabelGeometry.js +232 -0
- package/es/src/charts/features/pathLabels.js +50 -0
- package/es/src/charts/features/plotAnnotations.js +68 -17
- package/es/src/charts/features/plotPaint.js +38 -11
- package/es/src/charts/features/polyline.js +129 -0
- package/es/src/charts/features/referenceAnnotations.js +403 -0
- package/es/src/charts/features/referenceLabelPlacement.js +106 -0
- package/es/src/charts/features/ringLabelNodes.js +93 -0
- package/es/src/charts/features/ringLabels.js +222 -0
- package/es/src/charts/features/sceneBounds.js +26 -6
- package/es/src/charts/features/selfLoops.js +306 -0
- package/es/src/charts/features/shapeEmit.js +47 -31
- package/es/src/charts/features/sharedFields.js +15 -2
- package/es/src/charts/features/textHalo.js +29 -0
- package/es/src/charts/index.js +8 -0
- package/es/src/charts/partition/chartFields.js +2 -2
- package/es/src/charts/partition/interaction.js +9 -5
- package/es/src/charts/partition/zoom.js +7 -6
- package/es/src/charts/pipeline/insetPlacement.js +14 -6
- package/es/src/charts/pipeline/preDrawData.js +46 -3
- package/es/src/charts/pipeline/runVizPipeline.js +5 -0
- package/es/src/charts/pipeline/vizPreDraw.js +5 -3
- package/es/src/charts/plotBuffers/discreteBuffer.js +7 -4
- package/es/src/charts/polar/config.js +2 -3
- package/es/src/charts/viz/Viz.js +39 -36
- package/es/src/charts/viz/VizBase.js +18 -10
- package/es/src/charts/viz/backgroundInk.js +13 -7
- package/es/src/charts/viz/focusRing.js +104 -0
- package/es/src/charts/viz/focusTargets.js +208 -0
- package/es/src/charts/viz/history.js +74 -0
- package/es/src/charts/viz/keyboardNav.js +297 -0
- package/es/src/charts/viz/keyboardNavHost.js +95 -0
- package/es/src/charts/viz/loaderFormat.js +114 -0
- package/es/src/charts/viz/missingFields.js +2 -1
- package/es/src/charts/viz/mountTarget.js +9 -0
- package/es/src/charts/viz/nearestHover.js +183 -0
- package/es/src/charts/viz/nearestHoverSurface.js +92 -0
- package/es/src/charts/viz/ordinalColor.js +14 -12
- package/es/src/charts/viz/pageTheme.js +83 -0
- package/es/src/charts/viz/pointTooltipAnchor.js +59 -0
- package/es/src/charts/viz/pointVoronoi.js +124 -0
- package/es/src/charts/viz/reducedMotion.js +27 -0
- package/es/src/charts/viz/vizDataPolling.js +8 -3
- package/es/src/charts/viz/vizDefaults.js +15 -23
- package/es/src/charts/viz/vizFields.js +35 -0
- package/es/src/charts/viz/vizRender.js +43 -28
- package/es/src/charts/viz/vizTheme.js +96 -0
- package/es/src/charts/viz/vizVisibility.js +14 -0
- package/es/src/components/Axis/Axis.js +6 -0
- package/es/src/components/Axis/AxisBottom.js +1 -0
- package/es/src/components/Axis/AxisLeft.js +1 -0
- package/es/src/components/Axis/AxisRight.js +1 -0
- package/es/src/components/Axis/AxisTop.js +1 -0
- package/es/src/components/Axis/axisBreak.js +4 -1
- package/es/src/components/Axis/axisDefaults.js +5 -9
- package/es/src/components/Axis/axisLayoutScale.js +7 -1
- package/es/src/components/Axis/axisRangeBreaks.js +77 -0
- package/es/src/components/Axis/brokenTimeScale.js +196 -0
- package/es/src/components/Axis/rangeBreaks.js +201 -0
- package/es/src/components/Axis/timeValues.js +19 -4
- package/es/src/components/ColorScale/ColorScale.js +15 -9
- package/es/src/components/ColorScale/bucketBounds.js +32 -3
- package/es/src/components/ColorScale/colorScaleHoverMark.js +3 -3
- package/es/src/components/ColorScale/colorScaleScale.js +28 -15
- package/es/src/components/Legend/Legend.js +3 -0
- package/es/src/components/Legend/legendConfig.js +2 -6
- package/es/src/components/SizeLegend/SizeLegend.js +1 -0
- package/es/src/components/TextBox.js +29 -65
- package/es/src/components/Timeline/Timeline.js +12 -3
- package/es/src/components/Timeline/timelineConfig.js +20 -10
- package/es/src/components/Timeline/timelineMode.js +26 -0
- package/es/src/components/Timeline/timelineRender.js +7 -3
- package/es/src/components/Tooltip.js +15 -5
- package/es/src/components/fontStack.js +20 -0
- package/es/src/components/textBoxLayout.js +58 -21
- package/es/src/components/textBoxPath.js +73 -0
- package/es/src/components/textBoxScene.js +223 -0
- package/es/src/components/textBoxWords.js +70 -0
- package/es/src/shapes/Area.js +1 -0
- package/es/src/shapes/Bar.js +1 -0
- package/es/src/shapes/Box.js +1 -0
- package/es/src/shapes/Circle.js +1 -0
- package/es/src/shapes/Line.js +1 -0
- package/es/src/shapes/Path.js +1 -0
- package/es/src/shapes/Rect.js +1 -0
- package/es/src/shapes/Shape.js +1 -0
- package/es/src/shapes/Whisker.js +1 -0
- package/es/src/utils/BaseClass.js +25 -12
- package/es/src/utils/configPrep.js +2 -1
- package/es/src/utils/constant.js +13 -1
- package/es/src/utils/displayName.js +12 -0
- package/es/src/utils/theme.js +190 -0
- package/es/src/utils/themeInk.js +68 -0
- package/package.json +14 -11
- package/types/index.d.ts +6 -2
- package/types/internal.d.ts +250 -8
- package/types/src/charts/Alluvial/aggregate.d.ts +98 -0
- package/types/src/charts/Alluvial/applyLayout.d.ts +67 -0
- package/types/src/charts/Alluvial/dimensions.d.ts +40 -0
- package/types/src/charts/Alluvial/emit.d.ts +9 -0
- package/types/src/charts/Alluvial/hover.d.ts +31 -0
- package/types/src/charts/Alluvial/index.d.ts +27 -0
- package/types/src/charts/Alluvial/layout.d.ts +70 -0
- package/types/src/charts/Alluvial/meta.d.ts +54 -0
- package/types/src/charts/Alluvial/titles.d.ts +33 -0
- package/types/src/charts/ArcDiagram/applyLayout.d.ts +70 -0
- package/types/src/charts/ArcDiagram/arcGeometry.d.ts +150 -0
- package/types/src/charts/ArcDiagram/arcLabels.d.ts +89 -0
- package/types/src/charts/ArcDiagram/arcLoops.d.ts +48 -0
- package/types/src/charts/ArcDiagram/emit.d.ts +23 -0
- package/types/src/charts/ArcDiagram/events.d.ts +28 -0
- package/types/src/charts/ArcDiagram/index.d.ts +28 -0
- package/types/src/charts/BubbleChart/emit.d.ts +20 -0
- package/types/src/charts/BubbleChart/index.d.ts +16 -0
- package/types/src/charts/Chord/applyLayout.d.ts +3 -0
- package/types/src/charts/Chord/labels.d.ts +66 -0
- package/types/src/charts/Donut/index.d.ts +2 -1
- package/types/src/charts/Gantt/applyLayout.d.ts +64 -0
- package/types/src/charts/Gantt/emit.d.ts +17 -0
- package/types/src/charts/Gantt/ganttDecor.d.ts +41 -0
- package/types/src/charts/Gantt/ganttGeometry.d.ts +57 -0
- package/types/src/charts/Gantt/ganttLabels.d.ts +41 -0
- package/types/src/charts/Gantt/ganttRows.d.ts +84 -0
- package/types/src/charts/Gantt/ganttTooltip.d.ts +57 -0
- package/types/src/charts/Gantt/index.d.ts +36 -0
- package/types/src/charts/Geomap/applyLayout.d.ts +8 -0
- package/types/src/charts/Geomap/basemapTheme.d.ts +2 -19
- package/types/src/charts/Geomap/emit.d.ts +2 -2
- package/types/src/charts/Geomap/flowEmit.d.ts +35 -0
- package/types/src/charts/Geomap/flowEvents.d.ts +20 -0
- package/types/src/charts/Geomap/flowFields.d.ts +7 -0
- package/types/src/charts/Geomap/flowGeometry.d.ts +91 -0
- package/types/src/charts/Geomap/flowLinks.d.ts +97 -0
- package/types/src/charts/Geomap/geoCache.d.ts +47 -0
- package/types/src/charts/Geomap/globeKeys.d.ts +41 -0
- package/types/src/charts/Geomap/globeRotate.d.ts +70 -0
- package/types/src/charts/Geomap/index.d.ts +3 -0
- package/types/src/charts/Geomap/pointLabels.d.ts +24 -0
- package/types/src/charts/Hexbin/binning.d.ts +64 -0
- package/types/src/charts/Hexbin/buffer.d.ts +18 -0
- package/types/src/charts/Hexbin/contourLabels.d.ts +95 -0
- package/types/src/charts/Hexbin/contours.d.ts +48 -0
- package/types/src/charts/Hexbin/emit.d.ts +23 -0
- package/types/src/charts/Hexbin/index.d.ts +25 -0
- package/types/src/charts/Hexbin/layers.d.ts +94 -0
- package/types/src/charts/Hexbin/settings.d.ts +122 -0
- package/types/src/charts/Hexbin/tooltip.d.ts +26 -0
- package/types/src/charts/Histogram/binData.d.ts +20 -1
- package/types/src/charts/Histogram/index.d.ts +3 -2
- package/types/src/charts/Histogram/labels.d.ts +7 -0
- package/types/src/charts/Marimekko/index.d.ts +2 -1
- package/types/src/charts/Network/bundle.d.ts +67 -0
- package/types/src/charts/Network/clusterLabels.d.ts +112 -0
- package/types/src/charts/Network/clusters.d.ts +115 -0
- package/types/src/charts/Network/graph.d.ts +65 -0
- package/types/src/charts/Network/graphFluent.d.ts +20 -0
- package/types/src/charts/Network/minNodeDistance.d.ts +18 -0
- package/types/src/charts/Network/polygonRows.d.ts +29 -0
- package/types/src/charts/Pie/applyLayout.d.ts +31 -3
- package/types/src/charts/Pie/arcFit.d.ts +63 -0
- package/types/src/charts/Pie/curvedLabels.d.ts +57 -0
- package/types/src/charts/Pie/labelRoom.d.ts +83 -0
- package/types/src/charts/Pie/outsideLabels.d.ts +119 -0
- package/types/src/charts/Pie/outsideNodes.d.ts +93 -0
- package/types/src/charts/Pie/pieLabels.d.ts +85 -0
- package/types/src/charts/Pie/sectorBox.d.ts +95 -0
- package/types/src/charts/Pie/straightLabels.d.ts +24 -0
- package/types/src/charts/Pie/straightLayout.d.ts +88 -0
- package/types/src/charts/Plot/alongLegend.d.ts +42 -0
- package/types/src/charts/Plot/areaLabelsAlong.d.ts +119 -0
- package/types/src/charts/Plot/axisValues.d.ts +24 -0
- package/types/src/charts/Plot/barWidth.d.ts +38 -4
- package/types/src/charts/Plot/circleLabels.d.ts +29 -0
- package/types/src/charts/Plot/connectGaps.d.ts +99 -0
- package/types/src/charts/Plot/connectGapsScene.d.ts +55 -0
- package/types/src/charts/Plot/forecastScene.d.ts +5 -0
- package/types/src/charts/Plot/index.d.ts +15 -8
- package/types/src/charts/Plot/lineLabelEmit.d.ts +48 -0
- package/types/src/charts/Plot/lineLabelSides.d.ts +50 -0
- package/types/src/charts/Plot/lineLabelSpread.d.ts +15 -0
- package/types/src/charts/Plot/lineLabelsAlong.d.ts +116 -0
- package/types/src/charts/Plot/pipeline.d.ts +15 -1
- package/types/src/charts/Plot/pipelineLineLabels.d.ts +68 -0
- package/types/src/charts/Plot/plotFacet.d.ts +5 -0
- package/types/src/charts/Plot/plotInit.d.ts +14 -0
- package/types/src/charts/Plot/plotRangeBreaks.d.ts +35 -0
- package/types/src/charts/Plot/referenceDomains.d.ts +49 -0
- package/types/src/charts/Plot/stackLegendOrder.d.ts +83 -0
- package/types/src/charts/Plot/trendLabels.d.ts +73 -0
- package/types/src/charts/Plot/trendTooltip.d.ts +6 -0
- package/types/src/charts/Priestley/timeAxis.d.ts +76 -0
- package/types/src/charts/Radar/axisDecorations.d.ts +7 -2
- package/types/src/charts/Radar/curvedLabels.d.ts +94 -0
- package/types/src/charts/RadialBar/curvedLabels.d.ts +31 -0
- package/types/src/charts/RadialBar/trackLayout.d.ts +34 -3
- package/types/src/charts/Rings/emit.d.ts +50 -0
- package/types/src/charts/Rings/ringsGraph.d.ts +10 -2
- package/types/src/charts/Rings/ringsLoops.d.ts +13 -0
- package/types/src/charts/Rings/ringsParallel.d.ts +43 -0
- package/types/src/charts/Sankey/circularLayout.d.ts +103 -0
- package/types/src/charts/Sankey/circularLinks.d.ts +178 -0
- package/types/src/charts/Sankey/emit.d.ts +58 -0
- package/types/src/charts/Sankey/labels.d.ts +19 -0
- package/types/src/charts/Sankey/ribbons.d.ts +36 -0
- package/types/src/charts/Sankey/sankeyCycles.d.ts +24 -0
- package/types/src/charts/Sankey/sankeyLayout.d.ts +6 -0
- package/types/src/charts/Sankey/sankeyLinks.d.ts +36 -0
- package/types/src/charts/Scatter/index.d.ts +15 -0
- package/types/src/charts/SlopeChart/index.d.ts +43 -0
- package/types/src/charts/SlopeChart/slope.d.ts +43 -0
- package/types/src/charts/Streamgraph/index.d.ts +28 -0
- package/types/src/charts/Sunburst/curvedLabels.d.ts +56 -0
- package/types/src/charts/definition/ChartDefinition.d.ts +13 -0
- package/types/src/charts/definition/makeChart.d.ts +3 -2
- package/types/src/charts/drawSteps/backControl.d.ts +7 -22
- package/types/src/charts/drawSteps/gestureHover.d.ts +33 -0
- package/types/src/charts/drawSteps/minimapMarkup.d.ts +5 -4
- package/types/src/charts/drawSteps/tableViewMarkup.d.ts +3 -1
- package/types/src/charts/drawSteps/zoomGesture.d.ts +32 -0
- package/types/src/charts/events/click.legend.d.ts +2 -1
- package/types/src/charts/facet/facetConfig.d.ts +4 -2
- package/types/src/charts/features/annotationFrame.d.ts +108 -0
- package/types/src/charts/features/annotationText.d.ts +57 -0
- package/types/src/charts/features/annotationTypes.d.ts +161 -0
- package/types/src/charts/features/axesMeasure.d.ts +4 -0
- package/types/src/charts/features/calloutLayout.d.ts +78 -0
- package/types/src/charts/features/calloutScene.d.ts +40 -0
- package/types/src/charts/features/chartGeometry.d.ts +1 -1
- package/types/src/charts/features/circleLabelPlacement.d.ts +97 -0
- package/types/src/charts/features/circleLabels.d.ts +130 -0
- package/types/src/charts/features/colorScaleValue.d.ts +35 -0
- package/types/src/charts/features/curvedArrows.d.ts +105 -0
- package/types/src/charts/features/edgeArrows.d.ts +74 -2
- package/types/src/charts/features/edgeBundling.d.ts +86 -0
- package/types/src/charts/features/edgeBundlingSmooth.d.ts +29 -0
- package/types/src/charts/features/ensureZoomDom.d.ts +19 -1
- package/types/src/charts/features/featuresLegend.d.ts +4 -3
- package/types/src/charts/features/legendKeys.d.ts +34 -0
- package/types/src/charts/features/lineLabels.d.ts +15 -12
- package/types/src/charts/features/linkBundle.d.ts +16 -0
- package/types/src/charts/features/linkColor.d.ts +48 -0
- package/types/src/charts/features/linkFields.d.ts +16 -0
- package/types/src/charts/features/linkFocus.d.ts +51 -0
- package/types/src/charts/features/linkInteraction.d.ts +183 -0
- package/types/src/charts/features/linkKeys.d.ts +11 -0
- package/types/src/charts/features/linkLabelGeometry.d.ts +67 -0
- package/types/src/charts/features/linkLabelPath.d.ts +85 -0
- package/types/src/charts/features/linkLabels.d.ts +77 -0
- package/types/src/charts/features/linkWidths.d.ts +19 -0
- package/types/src/charts/features/pathLabelGeometry.d.ts +99 -0
- package/types/src/charts/features/pathLabels.d.ts +41 -0
- package/types/src/charts/features/plotAnnotations.d.ts +23 -8
- package/types/src/charts/features/plotPaint.d.ts +17 -0
- package/types/src/charts/features/polyline.d.ts +32 -0
- package/types/src/charts/features/referenceAnnotations.d.ts +130 -0
- package/types/src/charts/features/referenceLabelPlacement.d.ts +58 -0
- package/types/src/charts/features/ringLabelNodes.d.ts +63 -0
- package/types/src/charts/features/ringLabels.d.ts +164 -0
- package/types/src/charts/features/sceneBounds.d.ts +6 -0
- package/types/src/charts/features/selfLoops.d.ts +165 -0
- package/types/src/charts/features/shapeEmit.d.ts +3 -1
- package/types/src/charts/features/sharedFields.d.ts +11 -2
- package/types/src/charts/features/textHalo.d.ts +14 -0
- package/types/src/charts/index.d.ts +8 -0
- package/types/src/charts/partition/interaction.d.ts +6 -3
- package/types/src/charts/partition/zoom.d.ts +4 -4
- package/types/src/charts/pipeline/preDrawData.d.ts +14 -1
- package/types/src/charts/pipeline/stages.d.ts +7 -0
- package/types/src/charts/plotBuffers/discreteBuffer.d.ts +0 -5
- package/types/src/charts/viz/Viz.d.ts +16 -2
- package/types/src/charts/viz/VizBase.d.ts +6 -6
- package/types/src/charts/viz/backgroundInk.d.ts +11 -4
- package/types/src/charts/viz/focusRing.d.ts +25 -0
- package/types/src/charts/viz/focusTargets.d.ts +56 -0
- package/types/src/charts/viz/history.d.ts +35 -0
- package/types/src/charts/viz/keyboardNav.d.ts +55 -0
- package/types/src/charts/viz/keyboardNavHost.d.ts +53 -0
- package/types/src/charts/viz/loaderFormat.d.ts +78 -0
- package/types/src/charts/viz/mountTarget.d.ts +7 -0
- package/types/src/charts/viz/nearestHover.d.ts +75 -0
- package/types/src/charts/viz/nearestHoverSurface.d.ts +21 -0
- package/types/src/charts/viz/ordinalColor.d.ts +10 -8
- package/types/src/charts/viz/pageTheme.d.ts +34 -0
- package/types/src/charts/viz/pointTooltipAnchor.d.ts +36 -0
- package/types/src/charts/viz/pointVoronoi.d.ts +65 -0
- package/types/src/charts/viz/reducedMotion.d.ts +25 -0
- package/types/src/charts/viz/vizDefaults.d.ts +0 -9
- package/types/src/charts/viz/vizFields.d.ts +32 -0
- package/types/src/charts/viz/vizRender.d.ts +2 -1
- package/types/src/charts/viz/vizTheme.d.ts +40 -0
- package/types/src/charts/viz/vizTypes.d.ts +84 -7
- package/types/src/charts/viz/vizVisibility.d.ts +6 -0
- package/types/src/components/Axis/Axis.d.ts +1 -0
- package/types/src/components/Axis/AxisBottom.d.ts +1 -0
- package/types/src/components/Axis/AxisLeft.d.ts +1 -0
- package/types/src/components/Axis/AxisRight.d.ts +1 -0
- package/types/src/components/Axis/AxisTop.d.ts +1 -0
- package/types/src/components/Axis/axisBreak.d.ts +2 -0
- package/types/src/components/Axis/axisRangeBreaks.d.ts +25 -0
- package/types/src/components/Axis/brokenTimeScale.d.ts +51 -0
- package/types/src/components/Axis/rangeBreaks.d.ts +82 -0
- package/types/src/components/Axis/timeValues.d.ts +1 -1
- package/types/src/components/ColorScale/ColorScale.d.ts +1 -0
- package/types/src/components/ColorScale/bucketBounds.d.ts +15 -1
- package/types/src/components/Legend/Legend.d.ts +1 -0
- package/types/src/components/SizeLegend/SizeLegend.d.ts +1 -0
- package/types/src/components/TextBox.d.ts +1 -0
- package/types/src/components/Timeline/Timeline.d.ts +1 -0
- package/types/src/components/Timeline/timelineConfig.d.ts +5 -0
- package/types/src/components/Timeline/timelineMode.d.ts +17 -0
- package/types/src/components/Tooltip.d.ts +4 -3
- package/types/src/components/fontStack.d.ts +10 -0
- package/types/src/components/textBoxLayout.d.ts +18 -9
- package/types/src/components/textBoxPath.d.ts +59 -0
- package/types/src/components/textBoxScene.d.ts +51 -0
- package/types/src/components/textBoxWords.d.ts +33 -0
- package/types/src/shapes/Area.d.ts +1 -0
- package/types/src/shapes/Bar.d.ts +1 -0
- package/types/src/shapes/Box.d.ts +1 -0
- package/types/src/shapes/Circle.d.ts +1 -0
- package/types/src/shapes/Line.d.ts +1 -0
- package/types/src/shapes/Path.d.ts +1 -0
- package/types/src/shapes/Rect.d.ts +1 -0
- package/types/src/shapes/Shape.d.ts +1 -0
- package/types/src/shapes/Whisker.d.ts +1 -0
- package/types/src/utils/BaseClass.d.ts +9 -0
- package/types/src/utils/D3plusConfig.d.ts +981 -30
- package/types/src/utils/configPrep.d.ts +2 -0
- package/types/src/utils/constant.d.ts +8 -0
- package/types/src/utils/displayName.d.ts +10 -0
- package/types/src/utils/index.d.ts +1 -1
- package/types/src/utils/theme.d.ts +170 -0
- package/types/src/utils/themeInk.d.ts +56 -0
- package/umd/d3plus-core.full.js +86811 -61031
- package/umd/d3plus-core.full.min.js +2 -2
- package/umd/d3plus-core.js +28392 -6498
- package/umd/d3plus-core.min.js +2 -2
- package/es/src/components/Axis/gridStroke.js +0 -10
- package/types/src/components/Axis/gridStroke.d.ts +0 -8
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Pure helpers behind a Plot's `lineLabels` and `lineLabelConfig`: which
|
|
3
|
+
ends of a line take a label, and the value text a label can carry.
|
|
4
|
+
|
|
5
|
+
@module
|
|
6
|
+
*/ /**
|
|
7
|
+
The ends a `lineLabels` value labels, left end first: `true` and `"end"`
|
|
8
|
+
label the right end, `"start"` the left end, `"both"` both, and
|
|
9
|
+
`"along"` (a label along the line) or anything falsy neither.
|
|
10
|
+
*/ export function lineLabelSides(value) {
|
|
11
|
+
if (value === "along") return [];
|
|
12
|
+
if (value === "both") return [
|
|
13
|
+
"start",
|
|
14
|
+
"end"
|
|
15
|
+
];
|
|
16
|
+
if (value === "start") return [
|
|
17
|
+
"start"
|
|
18
|
+
];
|
|
19
|
+
return value ? [
|
|
20
|
+
"end"
|
|
21
|
+
] : [];
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
The ends `setting` labels for row `d` (index `i`): a function setting is
|
|
25
|
+
called with the row, any other setting applies to every row.
|
|
26
|
+
*/ export function rowLineLabelSides(setting, d, i) {
|
|
27
|
+
return lineLabelSides(typeof setting === "function" ? setting(d, i) : setting);
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
Whether `setting` runs row `d`'s series name along its line (`"along"`)
|
|
31
|
+
instead of at an end.
|
|
32
|
+
*/ export function rowLabelsAlong(setting, d, i) {
|
|
33
|
+
return (typeof setting === "function" ? setting(d, i) : setting) === "along";
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
A line label's value text, or `undefined` when `config` leaves values
|
|
37
|
+
off: `valueFormat` when set, else `format` (the y axis's own).
|
|
38
|
+
*/ export function lineLabelValue(config, value, d, i, format) {
|
|
39
|
+
if (!config?.value || value === undefined || value === null) return undefined;
|
|
40
|
+
const text = config.valueFormat ? config.valueFormat(value, d, i) : format(value);
|
|
41
|
+
return text === undefined || text === null || text === "" ? undefined : `${text}`;
|
|
42
|
+
}
|
|
43
|
+
/** A line label's text: the series name, followed by its value when there is one. */ export function lineLabelText(name, value) {
|
|
44
|
+
return value === undefined ? `${name}` : `${name} ${value}`;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
The key a label's bumped position is stored under: the series id for the
|
|
48
|
+
right end, prefixed for the left end so the two ends never share one.
|
|
49
|
+
*/ export function lineLabelKey(side, id) {
|
|
50
|
+
return side === "start" ? `start:${id}` : `${id}`;
|
|
51
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Spreads a column of labels apart so none overlap, each as close to the
|
|
3
|
+
position it labels as the others allow.
|
|
4
|
+
|
|
5
|
+
@module
|
|
6
|
+
*/ /** A run of labels that touch, placed as one. */ /**
|
|
7
|
+
Positions for labels centered on `desired` (sorted top to bottom), each
|
|
8
|
+
`sizes[i]` tall, so that no two overlap and every label stays within
|
|
9
|
+
`bounds` (the range its center may take). Touching labels move as a
|
|
10
|
+
group, centered on where they want to be, so each moves as little as the
|
|
11
|
+
others allow. Labels that need more room than `bounds` holds are packed
|
|
12
|
+
from its top and run past its bottom.
|
|
13
|
+
*/ export function spreadLabelPositions(desired, sizes, bounds) {
|
|
14
|
+
const n = desired.length;
|
|
15
|
+
if (!n) return [];
|
|
16
|
+
// offsets[i]: label i's center below the first label's, packed tight.
|
|
17
|
+
const offsets = [
|
|
18
|
+
0
|
|
19
|
+
];
|
|
20
|
+
for(let i = 1; i < n; i++)offsets.push(offsets[i - 1] + (sizes[i - 1] + sizes[i]) / 2);
|
|
21
|
+
const offsetFrom = (c, i)=>offsets[i] - offsets[c.start];
|
|
22
|
+
const bestTop = (c)=>{
|
|
23
|
+
let sum = 0;
|
|
24
|
+
for(let i = c.start; i <= c.end; i++)sum += desired[i] - offsetFrom(c, i);
|
|
25
|
+
return sum / (c.end - c.start + 1);
|
|
26
|
+
};
|
|
27
|
+
const clusters = [];
|
|
28
|
+
for(let i = 0; i < n; i++){
|
|
29
|
+
let c = {
|
|
30
|
+
start: i,
|
|
31
|
+
end: i,
|
|
32
|
+
top: desired[i]
|
|
33
|
+
};
|
|
34
|
+
for(;;){
|
|
35
|
+
const prev = clusters[clusters.length - 1];
|
|
36
|
+
if (!prev) break;
|
|
37
|
+
const prevBottom = prev.top + offsetFrom(prev, prev.end);
|
|
38
|
+
const gap = (sizes[prev.end] + sizes[c.start]) / 2;
|
|
39
|
+
if (c.top >= prevBottom + gap) break;
|
|
40
|
+
clusters.pop();
|
|
41
|
+
c = {
|
|
42
|
+
start: prev.start,
|
|
43
|
+
end: c.end,
|
|
44
|
+
top: 0
|
|
45
|
+
};
|
|
46
|
+
c.top = bestTop(c);
|
|
47
|
+
}
|
|
48
|
+
clusters.push(c);
|
|
49
|
+
}
|
|
50
|
+
const out = [];
|
|
51
|
+
for (const c of clusters)for(let i = c.start; i <= c.end; i++)out.push(c.top + offsetFrom(c, i));
|
|
52
|
+
// Keep the column inside the bounds: push down from the top, then up from
|
|
53
|
+
// the bottom, then down again, so a column too tall to fit starts at the top.
|
|
54
|
+
const [lo, hi] = [
|
|
55
|
+
Math.min(...bounds),
|
|
56
|
+
Math.max(...bounds)
|
|
57
|
+
];
|
|
58
|
+
out[0] = Math.max(out[0], lo);
|
|
59
|
+
for(let i = 1; i < n; i++)out[i] = Math.max(out[i], out[i - 1] + (sizes[i - 1] + sizes[i]) / 2);
|
|
60
|
+
out[n - 1] = Math.min(out[n - 1], hi);
|
|
61
|
+
for(let i = n - 2; i >= 0; i--)out[i] = Math.min(out[i], out[i + 1] - (sizes[i] + sizes[i + 1]) / 2);
|
|
62
|
+
out[0] = Math.max(out[0], lo);
|
|
63
|
+
for(let i = 1; i < n; i++)out[i] = Math.max(out[i], out[i - 1] + (sizes[i - 1] + sizes[i]) / 2);
|
|
64
|
+
return out;
|
|
65
|
+
}
|
|
@@ -0,0 +1,282 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Line labels along their lines (`lineLabels: "along"`): each series' name
|
|
3
|
+
runs along its own line, following its curve, on the stretch a scored
|
|
4
|
+
search finds flattest and clearest of the other lines and labels. The
|
|
5
|
+
text reads upright, and a series with no clear stretch goes unlabeled.
|
|
6
|
+
*/ import { fontExists, textWidth } from "@d3plus/dom";
|
|
7
|
+
import { fontFamily as defaultFontFamily } from "@d3plus/text";
|
|
8
|
+
import { samplePath } from "@d3plus/render";
|
|
9
|
+
import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
10
|
+
import { offsetPolyline, polylineD, PolylineRuler, uprightPoints } from "../features/pathLabelGeometry.js";
|
|
11
|
+
import { PATH_LABEL_FONT_SIZE, pathLabelNodes } from "../features/pathLabels.js";
|
|
12
|
+
import { rowLabelsAlong } from "./lineLabelSides.js";
|
|
13
|
+
/**
|
|
14
|
+
Obstacle points, bucketed by cell for nearest-distance lookups. Each
|
|
15
|
+
point may carry a tag, so a lookup can ignore the points of the line a
|
|
16
|
+
label sits on.
|
|
17
|
+
*/ export class PointGrid {
|
|
18
|
+
cell;
|
|
19
|
+
cells = new Map();
|
|
20
|
+
/** @param cell The cell size: lookups see obstacles this far away. */ constructor(cell){
|
|
21
|
+
this.cell = cell;
|
|
22
|
+
}
|
|
23
|
+
/** A cell's key: its column and row, packed into one number. */ static key(cx, cy) {
|
|
24
|
+
return cx * 1048576 + cy;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
Adds obstacle points.
|
|
28
|
+
@param points The points.
|
|
29
|
+
@param tag A tag `nearest` can ignore them by.
|
|
30
|
+
*/ add(points, tag = -1) {
|
|
31
|
+
for (const [x, y] of points){
|
|
32
|
+
const k = PointGrid.key(Math.floor(x / this.cell), Math.floor(y / this.cell));
|
|
33
|
+
const list = this.cells.get(k);
|
|
34
|
+
if (list) list.push([
|
|
35
|
+
x,
|
|
36
|
+
y,
|
|
37
|
+
tag
|
|
38
|
+
]);
|
|
39
|
+
else this.cells.set(k, [
|
|
40
|
+
[
|
|
41
|
+
x,
|
|
42
|
+
y,
|
|
43
|
+
tag
|
|
44
|
+
]
|
|
45
|
+
]);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
The distance from `p` to its nearest obstacle within one cell, or `Infinity`.
|
|
50
|
+
@param p The point.
|
|
51
|
+
@param ignore A tag whose points are left out.
|
|
52
|
+
*/ nearest(p, ignore) {
|
|
53
|
+
const cx = Math.floor(p[0] / this.cell), cy = Math.floor(p[1] / this.cell);
|
|
54
|
+
let best = Infinity;
|
|
55
|
+
for(let dx = -1; dx <= 1; dx++)for(let dy = -1; dy <= 1; dy++){
|
|
56
|
+
const list = this.cells.get(PointGrid.key(cx + dx, cy + dy));
|
|
57
|
+
if (!list) continue;
|
|
58
|
+
for (const [x, y, tag] of list){
|
|
59
|
+
if (tag !== -1 && tag === ignore) continue;
|
|
60
|
+
const ex = p[0] - x, ey = p[1] - y;
|
|
61
|
+
const d = ex * ex + ey * ey;
|
|
62
|
+
if (d < best) best = d;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return Math.sqrt(best);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
Points every `step` pixels along a polyline.
|
|
70
|
+
@param points The polyline.
|
|
71
|
+
@param step The spacing.
|
|
72
|
+
*/ export function resample(points, step) {
|
|
73
|
+
const ruler = new PolylineRuler(points);
|
|
74
|
+
const out = [];
|
|
75
|
+
for(let s = 0; s <= ruler.length; s += step){
|
|
76
|
+
const p = ruler.at(s);
|
|
77
|
+
if (p) out.push(p);
|
|
78
|
+
}
|
|
79
|
+
return out;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
How much a stretch bends: the sum of its turns, in radians.
|
|
83
|
+
@param points The stretch.
|
|
84
|
+
*/ export function curvature(points) {
|
|
85
|
+
let total = 0;
|
|
86
|
+
let prev = null;
|
|
87
|
+
for(let i = 1; i < points.length; i++){
|
|
88
|
+
const dx = points[i][0] - points[i - 1][0], dy = points[i][1] - points[i - 1][1];
|
|
89
|
+
if (!dx && !dy) continue;
|
|
90
|
+
const angle = Math.atan2(dy, dx);
|
|
91
|
+
if (prev !== null) {
|
|
92
|
+
let turn = Math.abs(angle - prev);
|
|
93
|
+
if (turn > Math.PI) turn = 2 * Math.PI - turn;
|
|
94
|
+
total += turn;
|
|
95
|
+
}
|
|
96
|
+
prev = angle;
|
|
97
|
+
}
|
|
98
|
+
return total;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
The points a label along `points` would cover: its baseline and two rows
|
|
102
|
+
above it, up to its letters' height.
|
|
103
|
+
@param points The upright stretch.
|
|
104
|
+
@param ctx The font size and lift.
|
|
105
|
+
*/ export function labelBand(points, ctx) {
|
|
106
|
+
return BAND_ROWS.flatMap((f)=>bandRow(points, ctx, f));
|
|
107
|
+
}
|
|
108
|
+
/** The rows of a label's band, as fractions of its font size above its baseline. */ const BAND_ROWS = [
|
|
109
|
+
0,
|
|
110
|
+
0.35,
|
|
111
|
+
0.7
|
|
112
|
+
];
|
|
113
|
+
/** One row of a label's band (see `labelBand`). */ function bandRow(points, ctx, f) {
|
|
114
|
+
const step = Math.max(2, ctx.fontSize / 2);
|
|
115
|
+
return resample(offsetPolyline(points, ctx.lift + f * ctx.fontSize), step);
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
A stretch's score, lower being better: how much it bends and slopes, less
|
|
119
|
+
a bonus for room around its label (up to `roomReach`, weighted by
|
|
120
|
+
`roomWeight`); null when its label would leave the
|
|
121
|
+
plot or come within `minClearance` of an obstacle (another line or
|
|
122
|
+
label, or the edges of the band it runs in).
|
|
123
|
+
@param points The upright stretch.
|
|
124
|
+
@param ctx The obstacles, plot area, and font.
|
|
125
|
+
*/ export function scoreStretch(points, ctx) {
|
|
126
|
+
const { rect, minClearance = 2 } = ctx;
|
|
127
|
+
let clearance = Infinity;
|
|
128
|
+
// Row by row, so a blocked stretch stops at its first blocked row.
|
|
129
|
+
for (const f of BAND_ROWS)for (const p of bandRow(points, ctx, f)){
|
|
130
|
+
if (p[0] < rect.x0 || p[0] > rect.x1 || p[1] < rect.y0 || p[1] > rect.y1) return null;
|
|
131
|
+
clearance = Math.min(clearance, ctx.grid.nearest(p, ctx.ignore));
|
|
132
|
+
if (clearance < minClearance) return null;
|
|
133
|
+
}
|
|
134
|
+
const [x0, y0] = points[0];
|
|
135
|
+
const [x1, y1] = points[points.length - 1];
|
|
136
|
+
const slope = Math.abs(Math.atan2(y1 - y0, x1 - x0));
|
|
137
|
+
const { roomReach = ctx.fontSize, roomWeight = 0.5 } = ctx;
|
|
138
|
+
const room = Math.min(clearance, roomReach) / roomReach;
|
|
139
|
+
return curvature(points) * 2 + slope * 0.5 - room * roomWeight;
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
The best-scoring stretch of `length` pixels along any of a line's
|
|
143
|
+
pieces, upright, with where it lies, or null when every stretch is
|
|
144
|
+
blocked or too bent.
|
|
145
|
+
@param pieces The line's pieces (where its data has gaps), in pixels.
|
|
146
|
+
@param length The stretch's length.
|
|
147
|
+
@param ctx The obstacles, plot area, and font.
|
|
148
|
+
@param allow Which stretches may be taken, by their piece and start.
|
|
149
|
+
*/ export function bestStretchAt(pieces, length, ctx, allow) {
|
|
150
|
+
let best = null;
|
|
151
|
+
let bestScore = Infinity;
|
|
152
|
+
const step = Math.max(4, ctx.fontSize / 2);
|
|
153
|
+
const maxTurn = ctx.maxTurn ?? Math.PI / 2;
|
|
154
|
+
for(let index = 0; index < pieces.length; index++){
|
|
155
|
+
const ruler = new PolylineRuler(pieces[index]);
|
|
156
|
+
for(let from = 0; from + length <= ruler.length; from += step){
|
|
157
|
+
if (allow && !allow(from, index)) continue;
|
|
158
|
+
const stretch = uprightPoints(ruler.trim(from, from + length), ctx.steep);
|
|
159
|
+
// A label can't follow a line that doubles back under it.
|
|
160
|
+
if (curvature(stretch) > maxTurn) continue;
|
|
161
|
+
const score = scoreStretch(stretch, ctx);
|
|
162
|
+
if (score !== null && score < bestScore) {
|
|
163
|
+
bestScore = score;
|
|
164
|
+
best = {
|
|
165
|
+
points: stretch,
|
|
166
|
+
piece: index,
|
|
167
|
+
from
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
return best;
|
|
173
|
+
}
|
|
174
|
+
/**
|
|
175
|
+
The best-scoring stretch of `length` pixels along any of a line's
|
|
176
|
+
pieces, upright, or null when every stretch is blocked or too bent.
|
|
177
|
+
@param pieces The line's pieces (where its data has gaps), in pixels.
|
|
178
|
+
@param length The stretch's length.
|
|
179
|
+
@param ctx The obstacles, plot area, and font.
|
|
180
|
+
*/ export function bestStretch(pieces, length, ctx) {
|
|
181
|
+
return bestStretchAt(pieces, length, ctx)?.points ?? null;
|
|
182
|
+
}
|
|
183
|
+
/** Every drawn Line's pieces, sampled into points, with the offsets of the groups around it. */ function seriesLines(nodes) {
|
|
184
|
+
const out = [];
|
|
185
|
+
const visit = (node, ox, oy)=>{
|
|
186
|
+
const t = node.transform ?? {};
|
|
187
|
+
const x = ox + (t.x ?? 0), y = oy + (t.y ?? 0);
|
|
188
|
+
if (node.type === "group") node.children.forEach((c)=>visit(c, x, y));
|
|
189
|
+
const row = node.datum;
|
|
190
|
+
if (node.type !== "path" || node.shapeType !== "Line" || `${node.key}`.endsWith("::hit") || row?.shape !== "Line") return;
|
|
191
|
+
// Each moveto starts a piece of its own (a gap in the data).
|
|
192
|
+
const pieces = (node.d.match(/M[^M]*/g) ?? []).map((d)=>samplePath(d).points.map(([px, py])=>[
|
|
193
|
+
px + x,
|
|
194
|
+
py + y
|
|
195
|
+
])).filter((points)=>points.length > 1);
|
|
196
|
+
const stroke = node.paint?.stroke;
|
|
197
|
+
out.push({
|
|
198
|
+
row,
|
|
199
|
+
key: `${node.key}`,
|
|
200
|
+
color: `${stroke ?? "#444"}`,
|
|
201
|
+
pieces
|
|
202
|
+
});
|
|
203
|
+
};
|
|
204
|
+
nodes.forEach((n)=>visit(n, 0, 0));
|
|
205
|
+
return out;
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
The label font a shape's labelConfig sets, as plain values.
|
|
209
|
+
@param viz The chart.
|
|
210
|
+
@param shape The shape whose labelConfig to read.
|
|
211
|
+
*/ export function labelFont(viz, shape = "Line") {
|
|
212
|
+
const config = shapeConfigFor(viz, shape).labelConfig ?? {};
|
|
213
|
+
const out = {};
|
|
214
|
+
for (const key of [
|
|
215
|
+
"fontFamily",
|
|
216
|
+
"fontSize",
|
|
217
|
+
"fontWeight"
|
|
218
|
+
])if (config[key] !== undefined && typeof config[key] !== "function") out[key] = config[key];
|
|
219
|
+
return out;
|
|
220
|
+
}
|
|
221
|
+
/**
|
|
222
|
+
The labels for every series `lineLabels` runs along its line, placed one
|
|
223
|
+
by one so each stays clear of the lines and the labels before it. A
|
|
224
|
+
plot (or panel) with a single line labels none. Counts the lines and
|
|
225
|
+
labels into `viz._alongStats`, for the legend (see `alongLegend.ts`).
|
|
226
|
+
@param viz The chart.
|
|
227
|
+
@param marks The plot's drawn marks, its Lines among them.
|
|
228
|
+
@param rect The plot area.
|
|
229
|
+
*/ export function emitAlongLabels(viz, marks, rect) {
|
|
230
|
+
const setting = viz.schema.lineLabels;
|
|
231
|
+
if (!setting) return [];
|
|
232
|
+
const lines = seriesLines(marks);
|
|
233
|
+
const along = lines.filter((l)=>rowLabelsAlong(setting, l.row.data ?? l.row, l.row.i ?? 0));
|
|
234
|
+
const stats = viz._alongStats;
|
|
235
|
+
if (stats) {
|
|
236
|
+
stats.series += lines.length;
|
|
237
|
+
stats.requested += along.length;
|
|
238
|
+
}
|
|
239
|
+
// A lone line needs no name.
|
|
240
|
+
if (!along.length || lines.length < 2) return [];
|
|
241
|
+
const font = labelFont(viz);
|
|
242
|
+
const fontSize = font.fontSize ?? PATH_LABEL_FONT_SIZE;
|
|
243
|
+
const style = {
|
|
244
|
+
"font-family": fontExists(font.fontFamily ?? defaultFontFamily),
|
|
245
|
+
"font-size": fontSize,
|
|
246
|
+
"font-weight": font.fontWeight ?? 600
|
|
247
|
+
};
|
|
248
|
+
const grid = new PointGrid(fontSize);
|
|
249
|
+
for (const line of lines)for (const piece of line.pieces)grid.add(resample(piece, 2));
|
|
250
|
+
const ctx = {
|
|
251
|
+
grid,
|
|
252
|
+
rect,
|
|
253
|
+
fontSize,
|
|
254
|
+
lift: 3.5
|
|
255
|
+
};
|
|
256
|
+
// A series drawn as several lines (observed and predicted, say) is named
|
|
257
|
+
// once: its later lines count as named when an earlier one was.
|
|
258
|
+
const named = new Set();
|
|
259
|
+
const labels = along.flatMap((line)=>{
|
|
260
|
+
const text = `${viz._drawLabel(line.row, line.row.i ?? 0)}`;
|
|
261
|
+
if (named.has(text)) {
|
|
262
|
+
if (stats) stats.placed++;
|
|
263
|
+
return [];
|
|
264
|
+
}
|
|
265
|
+
const length = textWidth(text, style) + fontSize;
|
|
266
|
+
const stretch = bestStretch(line.pieces, length, ctx);
|
|
267
|
+
if (!stretch) return [];
|
|
268
|
+
grid.add(labelBand(stretch, ctx));
|
|
269
|
+
named.add(text);
|
|
270
|
+
if (stats) stats.placed++;
|
|
271
|
+
return [
|
|
272
|
+
{
|
|
273
|
+
key: `line-label-along-${line.key}`,
|
|
274
|
+
text,
|
|
275
|
+
d: polylineD(offsetPolyline(stretch, ctx.lift)),
|
|
276
|
+
color: line.color,
|
|
277
|
+
anchor: "middle"
|
|
278
|
+
}
|
|
279
|
+
];
|
|
280
|
+
});
|
|
281
|
+
return pathLabelNodes(viz, labels, font);
|
|
282
|
+
}
|
|
@@ -9,14 +9,16 @@
|
|
|
9
9
|
(BarChart / AreaPlot / LinePlot / etc.) inherit defaults + features
|
|
10
10
|
from.
|
|
11
11
|
*/ import { date } from "@d3plus/dom";
|
|
12
|
-
import { merge as d3plusMerge
|
|
12
|
+
import { merge as d3plusMerge } from "@d3plus/data";
|
|
13
13
|
import { extent, groups, min, rollups } from "d3-array";
|
|
14
14
|
import discreteBufferFn from "../plotBuffers/discreteBuffer.js";
|
|
15
|
-
import {
|
|
15
|
+
import { sortedAxisValues } from "./axisValues.js";
|
|
16
|
+
import { applyBarWidths, shareAxis } from "./barWidth.js";
|
|
16
17
|
import { discreteDomainCategories } from "./discreteDomain.js";
|
|
17
18
|
import { extraBandValues } from "./confidenceBands.js";
|
|
18
19
|
import { applySwarmLanes, resolveSwarm } from "./swarm.js";
|
|
19
20
|
import { applyPaddedDomains } from "./facetScales.js";
|
|
21
|
+
import { dropHiddenRows, rangeBreaksTimeAxis } from "./plotRangeBreaks.js";
|
|
20
22
|
import { scaleConstructors } from "./pipelineScales.js";
|
|
21
23
|
import constant from "../../utils/constant.js";
|
|
22
24
|
export { computePlotInitialDomains } from "./pipelineDomains.js";
|
|
@@ -39,20 +41,53 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
39
41
|
no longer widens a domain, stacks as 0, or emits a broken coordinate.
|
|
40
42
|
Resolves d3plus/d3plus#776.
|
|
41
43
|
*/ const isPlottableRow = (d)=>!isBadAxisValue(d.x) && !isBadAxisValue(d.y) && (d.x2 === undefined || !isBadAxisValue(d.x2)) && (d.y2 === undefined || !isBadAxisValue(d.y2));
|
|
44
|
+
/**
|
|
45
|
+
The Line rows `formatPlotData` drops for a value it can't plot, at a
|
|
46
|
+
discrete-axis position it can: the gaps `connectGaps` breaks lines at.
|
|
47
|
+
*/ function missingLineRows(viz, rows, categories) {
|
|
48
|
+
const discrete = viz.schema.discrete === "y" ? "y" : "x";
|
|
49
|
+
return rows.filter((d)=>d.shape === "Line" && !isPlottableRow(d) && d[discrete] !== undefined && !isBadAxisValue(d[discrete]) && (!categories || categories.has(d[viz.schema.discrete])));
|
|
50
|
+
}
|
|
42
51
|
/**
|
|
43
52
|
The bubble radius scale: `sizeScale` over the extent of `sizes`, ranging
|
|
44
53
|
from `sizeMin` (capped at half of `sizeMax`) to `sizeMax`. A single-value
|
|
45
|
-
extent maps everything to `sizeMax`.
|
|
54
|
+
extent maps everything to `sizeMax`. With `sizeZero`, the smallest value's
|
|
55
|
+
radius is where a scale anchored at zero puts it instead (see
|
|
56
|
+
`zeroAnchoredRadius`).
|
|
46
57
|
*/ export function plotSizeScale(viz, sizes) {
|
|
47
58
|
const rExtent = extent(sizes);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
59
|
+
const { sizeMax, sizeMin, sizeScale, sizeZero } = viz.schema;
|
|
60
|
+
const make = scaleConstructors[`scale${sizeScale.charAt(0).toUpperCase()}${sizeScale.slice(1)}`];
|
|
61
|
+
const anchored = sizeZero ? zeroAnchoredRadius(make, rExtent, sizeMax) : NaN;
|
|
62
|
+
return make().domain(rExtent).range([
|
|
63
|
+
rExtent[0] === rExtent[1] ? sizeMax : Number.isFinite(anchored) ? anchored : min([
|
|
64
|
+
sizeMax / 2,
|
|
65
|
+
sizeMin
|
|
52
66
|
]),
|
|
53
|
-
|
|
67
|
+
sizeMax
|
|
54
68
|
]);
|
|
55
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
The radius a size scale anchored at zero (domain `[0, max]`, range
|
|
72
|
+
`[0, sizeMax]`) gives the smallest of `[min, max]`. A scale over
|
|
73
|
+
`[min, max]` starting at this radius draws every value where the anchored
|
|
74
|
+
one does: with a `"sqrt"` scale, each mark's area is proportional to its
|
|
75
|
+
value; with `"linear"`, its radius. NaN when the extent can't be anchored
|
|
76
|
+
at zero (a negative or non-positive extent, or a log scale).
|
|
77
|
+
@param make The size scale's constructor.
|
|
78
|
+
@param extent The size values' `[min, max]`.
|
|
79
|
+
@param sizeMax The largest radius.
|
|
80
|
+
*/ export function zeroAnchoredRadius(make, [lo, hi], sizeMax) {
|
|
81
|
+
if (!(lo >= 0 && hi > 0)) return NaN;
|
|
82
|
+
const r = make().domain([
|
|
83
|
+
0,
|
|
84
|
+
hi
|
|
85
|
+
]).range([
|
|
86
|
+
0,
|
|
87
|
+
sizeMax
|
|
88
|
+
])(lo);
|
|
89
|
+
return Number.isFinite(r) ? r : NaN;
|
|
90
|
+
}
|
|
56
91
|
/**
|
|
57
92
|
Whether rows of `shape` draw as circles sized by `size`, so the size
|
|
58
93
|
legend keys them: `"Circle"` rows, or the shapes a chart names in
|
|
@@ -81,11 +116,17 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
81
116
|
equals that axis's value) and stores the flags on `viz` as
|
|
82
117
|
`_x2Time`/`_xTime`/`_y2Time`/`_yTime`.
|
|
83
118
|
*/ function detectTimeAxes(viz) {
|
|
84
|
-
const
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
const
|
|
88
|
-
|
|
119
|
+
const first = viz._filteredData[0];
|
|
120
|
+
const firstElemTime = viz.schema.time ? viz.schema.time(first, 0) : false;
|
|
121
|
+
// An axis with `rangeBreaks` over dates is a time axis without `time` too.
|
|
122
|
+
const isTime = (axis)=>{
|
|
123
|
+
const value = viz[`_${axis}`](first, 0);
|
|
124
|
+
return Boolean(firstElemTime && value === firstElemTime) || rangeBreaksTimeAxis(viz, axis, value);
|
|
125
|
+
};
|
|
126
|
+
const x2Time = viz._x2Time = isTime("x2");
|
|
127
|
+
const xTime = viz._xTime = isTime("x");
|
|
128
|
+
const y2Time = viz._y2Time = isTime("y2");
|
|
129
|
+
const yTime = viz._yTime = isTime("y");
|
|
89
130
|
return {
|
|
90
131
|
xTime,
|
|
91
132
|
x2Time,
|
|
@@ -153,6 +194,7 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
153
194
|
return {
|
|
154
195
|
plotFormattedData: [],
|
|
155
196
|
plotAxisData: [],
|
|
197
|
+
plotMissingRows: [],
|
|
156
198
|
x2Exists: false,
|
|
157
199
|
y2Exists: false
|
|
158
200
|
};
|
|
@@ -160,8 +202,10 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
160
202
|
const { prepData, stackGroup } = plotRowPrep(viz, detectTimeAxes(viz));
|
|
161
203
|
const categories = discreteDomainCategories(viz);
|
|
162
204
|
const keepRow = (d)=>isPlottableRow(d) && (!categories || categories.has(d[viz.schema.discrete]));
|
|
163
|
-
const
|
|
164
|
-
|
|
205
|
+
const prepped = viz._filteredData.map(prepData);
|
|
206
|
+
// Rows a time axis's `rangeBreaks` hide are left out of the drawing.
|
|
207
|
+
const plotted = dropHiddenRows(viz, prepped.filter(keepRow));
|
|
208
|
+
const [formattedData, axisData] = applyBarWidths(viz, plotted, viz._axisPersist ? dropHiddenRows(viz, viz._data.map(prepData).filter(keepRow)) : plotted);
|
|
165
209
|
viz._formattedData = formattedData;
|
|
166
210
|
const swarm = viz._swarm = resolveSwarm(viz.schema.swarm, axisData);
|
|
167
211
|
if (swarm) {
|
|
@@ -169,14 +213,17 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
169
213
|
if (axisData !== formattedData) applySwarmLanes(axisData, swarm);
|
|
170
214
|
}
|
|
171
215
|
applyPlotSizeScale(viz, axisData);
|
|
172
|
-
|
|
173
|
-
const
|
|
216
|
+
// The width shares draw on a secondary axis when `barWidthShare` is "opposite".
|
|
217
|
+
const share = shareAxis(viz);
|
|
218
|
+
const x2Exists = share === "x2" || axisData.some((d)=>d.x2 !== undefined);
|
|
219
|
+
const y2Exists = share === "y2" || axisData.some((d)=>d.y2 !== undefined);
|
|
174
220
|
return {
|
|
175
221
|
plotFormattedData: formattedData,
|
|
176
222
|
plotAxisData: axisData,
|
|
177
223
|
x2Exists,
|
|
178
224
|
y2Exists,
|
|
179
|
-
plotStackGroup: stackGroup
|
|
225
|
+
plotStackGroup: stackGroup,
|
|
226
|
+
plotMissingRows: missingLineRows(viz, prepped, categories)
|
|
180
227
|
};
|
|
181
228
|
};
|
|
182
229
|
/**
|
|
@@ -207,7 +254,7 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
207
254
|
const aKey = timeData || numericValue ? parseFloat(a[0]) : a[0];
|
|
208
255
|
const bKey = timeData || numericValue ? parseFloat(b[0]) : b[0];
|
|
209
256
|
return aKey - bKey;
|
|
210
|
-
}).map(([key])=>timeData ? date(key) : numericValue ? parseFloat(key) : key) :
|
|
257
|
+
}).map(([key])=>timeData ? date(key) : numericValue ? parseFloat(key) : key) : sortedAxisValues(filteredData, axis, viz.schema[`${axis}Sort`] ? (a, b)=>viz.schema[`${axis}Sort`](a.data, b.data) : undefined);
|
|
211
258
|
if (viz.schema.discrete !== axis.charAt(0) && viz._confidence) {
|
|
212
259
|
if (viz._confidence[0]) myData = myData.concat(localData.map((d)=>d.lci));
|
|
213
260
|
if (viz._confidence[1]) myData = myData.concat(localData.map((d)=>d.hci));
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
Pure compute. No DOM, no side effects on viz.
|
|
15
15
|
*/ import { unique } from "@d3plus/data";
|
|
16
16
|
import { withAxisInk } from "./axisInk.js";
|
|
17
|
+
import { barShareAxisConfig } from "./barWidth.js";
|
|
17
18
|
import { baselineBreakAxisConfig } from "./baselineBreak.js";
|
|
18
19
|
import { hasUserDomain, plotAxisRounding, secondaryAxisRounding } from "./baselineDomain.js";
|
|
19
20
|
import { isSpanAxis, spanEdges } from "./discreteSpan.js";
|
|
@@ -106,6 +107,7 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
106
107
|
...x2Exists ? {
|
|
107
108
|
data: x2Data
|
|
108
109
|
} : defaultConfig,
|
|
110
|
+
...barShareAxisConfig(viz, "x2"),
|
|
109
111
|
baselineBreak: false,
|
|
110
112
|
rounding: secondaryAxisRounding(viz, "x2", xAxisRounding(viz))
|
|
111
113
|
};
|
|
@@ -113,6 +115,7 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
113
115
|
...y2Exists ? {
|
|
114
116
|
data: y2Data
|
|
115
117
|
} : defaultConfig,
|
|
118
|
+
...barShareAxisConfig(viz, "y2"),
|
|
116
119
|
baselineBreak: false,
|
|
117
120
|
rounding: secondaryAxisRounding(viz, "y2", yRounding)
|
|
118
121
|
};
|
|
@@ -126,8 +129,9 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
126
129
|
let barLabelCheck;
|
|
127
130
|
const tickFor = (axis, axisScale)=>{
|
|
128
131
|
if (isSpanAxis(viz, axis)) return spanEdges(viz, axisData);
|
|
132
|
+
if (axisScale !== "Point") return null;
|
|
129
133
|
const ticks = unique(axisData.map((d)=>d[axis]));
|
|
130
|
-
if (
|
|
134
|
+
if (!ticks.every((t)=>barLabels.includes(`${t}`))) return null;
|
|
131
135
|
// The axis measure checks that the bars have room for these labels.
|
|
132
136
|
if (axis === "x" || axis === "y") {
|
|
133
137
|
if (axis === viz.schema.discrete && (axis === "x" ? showX : showY)) barLabelCheck = {
|
|
@@ -24,6 +24,7 @@ import { stampShare } from "../features/shareKey.js";
|
|
|
24
24
|
import { stackedConfidenceValues } from "./barConfidence.js";
|
|
25
25
|
import { isSpanAxis, spanDomain } from "./discreteSpan.js";
|
|
26
26
|
import { orderLast } from "./stackHelpers.js";
|
|
27
|
+
import { plotSeriesIds, stackPositions } from "./stackLegendOrder.js";
|
|
27
28
|
import { trendDomainValues } from "./trendLines.js";
|
|
28
29
|
/**
|
|
29
30
|
Pushes zero-value filler points for any Area series missing from a discrete
|
|
@@ -162,9 +163,20 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
162
163
|
plotInitialDomains: domains,
|
|
163
164
|
plotDiscreteKeys: discreteKeys,
|
|
164
165
|
plotStackData: stackData,
|
|
165
|
-
plotStackKeys: stackKeys
|
|
166
|
+
plotStackKeys: stackKeys,
|
|
167
|
+
plotStackPositions: drawnStackPositions(viz, axisData, stackData, stackKeys)
|
|
166
168
|
};
|
|
167
169
|
}
|
|
170
|
+
/** Where each series sits in the drawn stacks (see `stackLegendOrder.ts`). */ function drawnStackPositions(viz, axisData, stackData, stackKeys) {
|
|
171
|
+
const series = new Map();
|
|
172
|
+
for (const row of axisData){
|
|
173
|
+
const key = `${row.id}`;
|
|
174
|
+
if (series.has(key) || !row.data) continue;
|
|
175
|
+
const ids = plotSeriesIds(viz, row.data, row.i);
|
|
176
|
+
if (ids.length) series.set(key, ids[0]);
|
|
177
|
+
}
|
|
178
|
+
return stackPositions(stackData, stackKeys, (key)=>series.get(key));
|
|
179
|
+
}
|
|
168
180
|
/** Non-stacked branch: data-values-or-extent domains per axis. */ function computeNonStackedDomains(viz, ctx) {
|
|
169
181
|
const { axisData, xData, x2Data, yData, y2Data } = ctx;
|
|
170
182
|
const xTime = viz._xTime, x2Time = viz._x2Time, yTime = viz._yTime, y2Time = viz._y2Time;
|
|
@@ -176,9 +188,10 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
176
188
|
}
|
|
177
189
|
const domains = {
|
|
178
190
|
x: isSpanAxis(viz, "x") ? spanDomain(viz, axisData) : !xTime && viz.schema.discrete === "x" || viz.schema.xSort || viz._swarm?.cross === "x" ? xData : extent(xData),
|
|
179
|
-
|
|
191
|
+
// A variable-width axis's width shares (`barWidthShare`) line up with its bars.
|
|
192
|
+
x2: isSpanAxis(viz, "x") ? spanDomain(viz, axisData) : !x2Time && viz.schema.discrete === "x" || viz.schema.x2Sort ? x2Data : extent(x2Data),
|
|
180
193
|
y: isSpanAxis(viz, "y") ? spanDomain(viz, axisData) : !yTime && viz.schema.discrete === "y" || viz.schema.ySort || viz._swarm?.cross === "y" ? yData : extent(yData),
|
|
181
|
-
y2: !y2Time && viz.schema.discrete === "y" || viz.schema.y2Sort ? y2Data : extent(y2Data)
|
|
194
|
+
y2: isSpanAxis(viz, "y") ? spanDomain(viz, axisData) : !y2Time && viz.schema.discrete === "y" || viz.schema.y2Sort ? y2Data : extent(y2Data)
|
|
182
195
|
};
|
|
183
196
|
return {
|
|
184
197
|
plotInitialDomains: domains,
|