@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
|
@@ -1,29 +1,78 @@
|
|
|
1
1
|
/**
|
|
2
2
|
`applyPieLayout` — Pie's chart-specific layout stage. Runs the d3-shape
|
|
3
|
-
pie layout against `viz._filteredData
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
pie layout against `viz._filteredData` over the configured sweep, fits the
|
|
4
|
+
ring's footprint to the chart area, tags each slice with `__d3plus__` +
|
|
5
|
+
index, builds the arc generator from the current schema values, and
|
|
6
|
+
stores `pieData`/`arcData`/`pieSweep`/`pieCenter`/`pieBox` on `viz.ctx`.
|
|
6
7
|
*/ import * as d3Shape from "d3-shape";
|
|
7
8
|
import { chartBounds } from "../features/chartGeometry.js";
|
|
8
9
|
import { stampShare } from "../features/shareKey.js";
|
|
9
|
-
|
|
10
|
+
import { fitRing, pieSweep, ringExtent, ringSizeFor } from "./arcFit.js";
|
|
11
|
+
import { NO_ROOM, PIE_MIN_SCALE, layoutWithLabelRoom } from "./labelRoom.js";
|
|
12
|
+
/** Pie's resolved sweep, from its `startAngle` and `endAngle` settings. */ export function pieSweepOf(viz) {
|
|
13
|
+
return pieSweep(viz.schema.startAngle, viz.schema.endAngle);
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
The outer radius a hole-less ring of this Pie's sweep gets in the chart
|
|
17
|
+
area, before any room is kept for the hover stroke. Donut's default
|
|
18
|
+
`innerRadius` is half of it.
|
|
19
|
+
*/ export function pieBaseRadius(viz) {
|
|
10
20
|
const { width, height } = chartBounds(viz);
|
|
21
|
+
const { start, end } = pieSweepOf(viz);
|
|
22
|
+
return fitRing(width, height, start, end).radius;
|
|
23
|
+
}
|
|
24
|
+
/** The width/height ratio of this Pie's hole-less footprint: 1 for a full circle, 2 for a half ring. */ export function pieAspect(viz) {
|
|
25
|
+
const { start, end } = pieSweepOf(viz);
|
|
26
|
+
const b = ringExtent(start, end);
|
|
27
|
+
const h = b.y1 - b.y0;
|
|
28
|
+
return h > 0 ? (b.x1 - b.x0) / h : 1;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
Reserves room for the hovered/active stroke emphasis (interactionOpacity.ts's
|
|
32
|
+
emphasizeStroke, ×2 hover / ×3 active over the configured base width) so
|
|
33
|
+
it never gets clipped by the chart's own edge — half of the WIDEST
|
|
34
|
+
possible stroke (centered on the wedge's outline) overflows past the
|
|
35
|
+
outer radius. A function-valued strokeWidth can't be resolved without a
|
|
36
|
+
datum, so it falls back to Pie's own default (2) rather than guessing.
|
|
37
|
+
*/ function strokeBufferOf(viz) {
|
|
11
38
|
const sc = viz.schema.shapeConfig ?? {};
|
|
12
|
-
// Reserves room for the hovered/active stroke emphasis (interactionOpacity.ts's
|
|
13
|
-
// emphasizeStroke, ×2 hover / ×3 active over the configured base width) so
|
|
14
|
-
// it never gets clipped by the chart's own edge — half of the WIDEST
|
|
15
|
-
// possible stroke (centered on the wedge's outline) overflows past the
|
|
16
|
-
// outer radius. A function-valued strokeWidth can't be resolved without a
|
|
17
|
-
// datum, so it falls back to Pie's own default (2) rather than guessing.
|
|
18
39
|
const baseStrokeWidth = typeof sc.strokeWidth === "number" ? sc.strokeWidth : 2;
|
|
19
|
-
|
|
20
|
-
|
|
40
|
+
return baseStrokeWidth * 3 / 2;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
Lays the slices out with `room` kept around the ring for labels outside
|
|
44
|
+
it: the ring fits the chart area less that room, its inner radius shrinks
|
|
45
|
+
with it, and it sits within the room left. Stores the layout on
|
|
46
|
+
`viz.ctx` (see `applyPieLayout`) and returns the slices.
|
|
47
|
+
@param viz The chart.
|
|
48
|
+
@param room The room kept on each side.
|
|
49
|
+
*/ export function pieRingLayout(viz, room = NO_ROOM) {
|
|
50
|
+
const { width: chartWidth, height: chartHeight } = chartBounds(viz);
|
|
51
|
+
const width = Math.max(0, chartWidth - room.left - room.right);
|
|
52
|
+
const height = Math.max(0, chartHeight - room.top - room.bottom);
|
|
53
|
+
const strokeBuffer = strokeBufferOf(viz);
|
|
54
|
+
const sweep = pieSweepOf(viz);
|
|
21
55
|
const pie = viz.ctx.pie;
|
|
22
56
|
const padAngle = viz.schema.padAngle ?? 0;
|
|
23
57
|
const padPixel = viz.schema.padPixel ?? 0;
|
|
24
58
|
const sortFn = viz.schema.sort;
|
|
25
59
|
const valueFn = viz.schema.value;
|
|
26
|
-
const
|
|
60
|
+
const layout = (radius)=>pie.startAngle(sweep.start).endAngle(sweep.end).padAngle(padAngle || padPixel / radius).sort(sortFn).value(valueFn)(viz._filteredData);
|
|
61
|
+
// The hole-less fit sizes a first pass, whose slices resolve the inner
|
|
62
|
+
// radius; a hole can let a partial ring grow, so the slices are laid out
|
|
63
|
+
// again at the final radius when it does.
|
|
64
|
+
const baseFit = fitRing(width, height, sweep.start, sweep.end, 0, strokeBuffer);
|
|
65
|
+
// A ring narrowed to leave room for labels keeps its hole in proportion.
|
|
66
|
+
const fullRadius = width < chartWidth || height < chartHeight ? fitRing(chartWidth, chartHeight, sweep.start, sweep.end, 0, strokeBuffer).radius : baseFit.radius;
|
|
67
|
+
const scale = fullRadius > 0 ? baseFit.radius / fullRadius : 1;
|
|
68
|
+
const innerRadius = viz.schema.innerRadius;
|
|
69
|
+
const innerOf = typeof innerRadius === "function" ? innerRadius : ()=>innerRadius;
|
|
70
|
+
const innerFn = (d, i)=>innerOf(d, i) * scale;
|
|
71
|
+
let pieData = layout(baseFit.radius);
|
|
72
|
+
const innerMin = pieData.reduce((m, d, i)=>Math.min(m, Number(innerFn(d, i)) || 0), Infinity);
|
|
73
|
+
const fit = Number.isFinite(innerMin) && innerMin > 0 ? fitRing(width, height, sweep.start, sweep.end, innerMin, strokeBuffer) : baseFit;
|
|
74
|
+
if (fit.radius !== baseFit.radius) pieData = layout(fit.radius);
|
|
75
|
+
const outerRadius = fit.radius;
|
|
27
76
|
const total = pieData.reduce((sum, d)=>sum + d.value, 0);
|
|
28
77
|
pieData.forEach((d, i)=>{
|
|
29
78
|
d.__d3plus__ = true;
|
|
@@ -34,21 +83,31 @@ export const applyPieLayout = ({ viz })=>{
|
|
|
34
83
|
d.share = share;
|
|
35
84
|
stampShare(d.data, share);
|
|
36
85
|
});
|
|
37
|
-
|
|
38
|
-
viz.ctx.arcData = d3Shape.arc().innerRadius(typeof innerRadius === "function" ? innerRadius : ()=>innerRadius).outerRadius(outerRadius);
|
|
86
|
+
viz.ctx.arcData = d3Shape.arc().innerRadius(innerFn).outerRadius(outerRadius);
|
|
39
87
|
viz.ctx.pieData = pieData;
|
|
40
|
-
|
|
41
|
-
//
|
|
42
|
-
//
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
//
|
|
48
|
-
//
|
|
49
|
-
//
|
|
50
|
-
|
|
88
|
+
viz.ctx.pieSweep = sweep;
|
|
89
|
+
// The ring's center within the chart area — chartTransform places the
|
|
90
|
+
// origin here.
|
|
91
|
+
viz.ctx.pieCenter = {
|
|
92
|
+
x: room.left + fit.cx,
|
|
93
|
+
y: room.top + fit.cy
|
|
94
|
+
};
|
|
95
|
+
// The ring's footprint around its center, at the actual (buffer-reduced)
|
|
96
|
+
// radius wedges are drawn at — chartBodyRect (Pie/index.ts) reads this, so
|
|
97
|
+
// the drill-morph's "whole pie" reference box matches the wedges' real
|
|
98
|
+
// extent, not the looser available space.
|
|
99
|
+
viz.ctx.pieBox = fit.box;
|
|
100
|
+
return pieData;
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
Lays the slices out, keeping room around the ring for the labels that
|
|
104
|
+
go outside it (see `layoutWithLabelRoom`).
|
|
105
|
+
*/ export const applyPieLayout = ({ viz })=>{
|
|
106
|
+
const pieData = pieRingLayout(viz);
|
|
107
|
+
const sweep = pieSweepOf(viz);
|
|
108
|
+
const min = ringSizeFor(viz.ctx.arcData.outerRadius()(pieData[0]) * PIE_MIN_SCALE, sweep.start, sweep.end, strokeBufferOf(viz));
|
|
109
|
+
const slices = layoutWithLabelRoom(viz, (room)=>pieRingLayout(viz, room), min);
|
|
51
110
|
return {
|
|
52
|
-
shapeData:
|
|
111
|
+
shapeData: slices
|
|
53
112
|
};
|
|
54
113
|
};
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Pure geometry for a Pie's sweep: the angular range its slices fill, the
|
|
3
|
+
bounding box of the ring they draw, and where that ring sits in the chart
|
|
4
|
+
area. Angles are radians in d3's convention (0 at 12 o'clock, increasing
|
|
5
|
+
clockwise), so a point at angle `a` and radius `r` sits at
|
|
6
|
+
`(r·sin a, −r·cos a)`.
|
|
7
|
+
*/ const TAU = Math.PI * 2;
|
|
8
|
+
const EPSILON = 1e-9;
|
|
9
|
+
/**
|
|
10
|
+
Resolves the `startAngle` and `endAngle` settings (degrees clockwise from
|
|
11
|
+
12 o'clock) to a sweep in radians. An unset `endAngle` makes a full turn
|
|
12
|
+
from `startAngle`, and the sweep never exceeds one turn in either direction.
|
|
13
|
+
*/ export function pieSweep(startAngle, endAngle) {
|
|
14
|
+
const finite = (v)=>typeof v === "number" && Number.isFinite(v);
|
|
15
|
+
const start = finite(startAngle) ? startAngle * Math.PI / 180 : 0;
|
|
16
|
+
const end = finite(endAngle) ? endAngle * Math.PI / 180 : start + TAU;
|
|
17
|
+
const span = Math.max(-TAU, Math.min(TAU, end - start));
|
|
18
|
+
return {
|
|
19
|
+
start,
|
|
20
|
+
end: start + span
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
/** Whether a sweep goes all the way around. */ export function isFullTurn(start, end) {
|
|
24
|
+
return Math.abs(end - start) >= TAU - EPSILON;
|
|
25
|
+
}
|
|
26
|
+
/** Where `angle` falls within the sweep, from 0 at its start to 1 at its end, wrapping around the circle. */ export function sweepFraction(angle, sweep) {
|
|
27
|
+
const span = sweep.end - sweep.start;
|
|
28
|
+
if (!span) return 0;
|
|
29
|
+
let rel = (angle - sweep.start) * Math.sign(span) % TAU;
|
|
30
|
+
if (rel < 0) rel += TAU;
|
|
31
|
+
return rel / Math.abs(span);
|
|
32
|
+
}
|
|
33
|
+
const clean = (v)=>Math.abs(v) < EPSILON ? 0 : v;
|
|
34
|
+
/**
|
|
35
|
+
The bounding box of a ring's slice from `start` to `end`, in units of its
|
|
36
|
+
outer radius: the outer arc's ends, every 12, 3, 6 and 9 o'clock extreme
|
|
37
|
+
it passes, and the inner arc's ends at `inner` (a fraction of the outer
|
|
38
|
+
radius; 0 puts them at the center).
|
|
39
|
+
*/ export function ringExtent(start, end, inner = 0) {
|
|
40
|
+
if (isFullTurn(start, end)) return {
|
|
41
|
+
x0: -1,
|
|
42
|
+
x1: 1,
|
|
43
|
+
y0: -1,
|
|
44
|
+
y1: 1
|
|
45
|
+
};
|
|
46
|
+
const a0 = Math.min(start, end);
|
|
47
|
+
const a1 = Math.max(start, end);
|
|
48
|
+
const r = Math.max(0, Math.min(1, inner));
|
|
49
|
+
const xs = [];
|
|
50
|
+
const ys = [];
|
|
51
|
+
const add = (a, radius)=>{
|
|
52
|
+
xs.push(clean(radius * Math.sin(a)));
|
|
53
|
+
ys.push(clean(-radius * Math.cos(a)));
|
|
54
|
+
};
|
|
55
|
+
add(a0, 1);
|
|
56
|
+
add(a1, 1);
|
|
57
|
+
const quarter = Math.PI / 2;
|
|
58
|
+
for(let q = Math.ceil(a0 / quarter - EPSILON); q * quarter <= a1 + EPSILON; q++)add(q * quarter, 1);
|
|
59
|
+
add(a0, r);
|
|
60
|
+
add(a1, r);
|
|
61
|
+
return {
|
|
62
|
+
x0: Math.min(...xs),
|
|
63
|
+
x1: Math.max(...xs),
|
|
64
|
+
y0: Math.min(...ys),
|
|
65
|
+
y1: Math.max(...ys)
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
/** The ring's footprint in pixels at outer radius `radius`, with its inner arc at `innerRadius` pixels. */ function pixelBox(start, end, radius, innerRadius) {
|
|
69
|
+
const b = ringExtent(start, end, radius > 0 ? innerRadius / radius : 0);
|
|
70
|
+
return {
|
|
71
|
+
x0: b.x0 * radius,
|
|
72
|
+
x1: b.x1 * radius,
|
|
73
|
+
y0: b.y0 * radius,
|
|
74
|
+
y1: b.y1 * radius
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
/** The largest radius at which `box` (in units of the radius) fits `width` × `height`. */ function boxRadius(width, height, box) {
|
|
78
|
+
const w = box.x1 - box.x0;
|
|
79
|
+
const h = box.y1 - box.y0;
|
|
80
|
+
return Math.max(0, Math.min(w > 0 ? width / w : Infinity, h > 0 ? height / h : Infinity));
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
Fits a ring sweeping from `start` to `end` (radians) into `width` ×
|
|
84
|
+
`height`, inset by `pad` on every side: the largest outer radius at which
|
|
85
|
+
the ring's own footprint fits, with an inner radius of `innerRadius`
|
|
86
|
+
pixels. The footprint is centered in any room left over.
|
|
87
|
+
*/ export function fitRing(width, height, start, end, innerRadius = 0, pad = 0) {
|
|
88
|
+
if (isFullTurn(start, end)) {
|
|
89
|
+
const radius = Math.max(0, Math.min(width, height) / 2 - pad);
|
|
90
|
+
return {
|
|
91
|
+
cx: width / 2,
|
|
92
|
+
cy: height / 2,
|
|
93
|
+
radius,
|
|
94
|
+
box: {
|
|
95
|
+
x0: -radius,
|
|
96
|
+
x1: radius,
|
|
97
|
+
y0: -radius,
|
|
98
|
+
y1: radius
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
const w = Math.max(0, width - pad * 2);
|
|
103
|
+
const h = Math.max(0, height - pad * 2);
|
|
104
|
+
const inner = Math.max(0, innerRadius);
|
|
105
|
+
// The hole-less footprint is the largest, so its radius always fits; a hole
|
|
106
|
+
// can only shrink the footprint, letting the ring grow toward the radius
|
|
107
|
+
// that fits its outer arc alone.
|
|
108
|
+
let lo = boxRadius(w, h, ringExtent(start, end, 0));
|
|
109
|
+
if (inner > 0 && Number.isFinite(lo)) {
|
|
110
|
+
let hi = boxRadius(w, h, ringExtent(start, end, 1));
|
|
111
|
+
if (!Number.isFinite(hi)) hi = lo;
|
|
112
|
+
const fits = (r)=>{
|
|
113
|
+
const b = pixelBox(start, end, r, inner);
|
|
114
|
+
return b.x1 - b.x0 <= w + EPSILON && b.y1 - b.y0 <= h + EPSILON;
|
|
115
|
+
};
|
|
116
|
+
for(let k = 0; k < 40 && hi - lo > 1e-6; k++){
|
|
117
|
+
const mid = (lo + hi) / 2;
|
|
118
|
+
if (fits(mid)) lo = mid;
|
|
119
|
+
else hi = mid;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
const radius = Number.isFinite(lo) ? lo : 0;
|
|
123
|
+
const box = pixelBox(start, end, radius, inner);
|
|
124
|
+
const bw = box.x1 - box.x0;
|
|
125
|
+
const bh = box.y1 - box.y0;
|
|
126
|
+
return {
|
|
127
|
+
cx: pad + (w - bw) / 2 - box.x0,
|
|
128
|
+
cy: pad + (h - bh) / 2 - box.y0,
|
|
129
|
+
radius,
|
|
130
|
+
box
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
The size a ring sweeping from `start` to `end` needs for an outer radius
|
|
135
|
+
of `radius`, inset by `pad` on every side (the inverse of `fitRing`, for
|
|
136
|
+
a ring without a hole).
|
|
137
|
+
@param radius The outer radius.
|
|
138
|
+
@param start Where the sweep starts.
|
|
139
|
+
@param end Where it ends.
|
|
140
|
+
@param pad The inset on each side.
|
|
141
|
+
*/ export function ringSizeFor(radius, start, end, pad = 0) {
|
|
142
|
+
const b = isFullTurn(start, end) ? {
|
|
143
|
+
x0: -1,
|
|
144
|
+
x1: 1,
|
|
145
|
+
y0: -1,
|
|
146
|
+
y1: 1
|
|
147
|
+
} : ringExtent(start, end, 0);
|
|
148
|
+
return {
|
|
149
|
+
width: radius * (b.x1 - b.x0) + 2 * pad,
|
|
150
|
+
height: radius * (b.y1 - b.y0) + 2 * pad
|
|
151
|
+
};
|
|
152
|
+
}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Curved slice labels for a Donut, or any Pie with an `innerRadius` (see
|
|
3
|
+
`labelPosition`): a slice's name runs along its arc where that reads
|
|
4
|
+
better than the straight label centered in its slice. A full Pie's wedges
|
|
5
|
+
run to a point at the center, so its labels stay straight. Names follow
|
|
6
|
+
the middle of a wide ring, or the rim of one whose hole is small, where
|
|
7
|
+
a wedge is widest. The share goes on a second, smaller line beneath the
|
|
8
|
+
name when the ring has room for both.
|
|
9
|
+
*/ import { colorContrast } from "@d3plus/color";
|
|
10
|
+
import { resolveAccessor } from "../features/emitHelpers.js";
|
|
11
|
+
import { textLineBoxes } from "../features/linkLabels.js";
|
|
12
|
+
import { clearRingLabels, ringLabelFont, ringLabelNodes, ringTextWidth } from "../features/ringLabelNodes.js";
|
|
13
|
+
import { chooseRingLabel, ringLabelFit, ringLabelPair, ringLabelPosition, textBroken } from "../features/ringLabels.js";
|
|
14
|
+
/** A positive number, or undefined. */ const num = (v)=>typeof v === "number" && Number.isFinite(v) && v > 0 ? v : undefined;
|
|
15
|
+
/** The slice a straight label node names. */ const sliceOf = (node)=>node.datum?.data;
|
|
16
|
+
/**
|
|
17
|
+
The font range curved labels try: the labelConfig's `fontSize` alone,
|
|
18
|
+
else `fontMin` to `fontMax`, 8 to 24 by default.
|
|
19
|
+
@param config The labelConfig.
|
|
20
|
+
*/ export function ringFontRange(config) {
|
|
21
|
+
const size = num(config.fontSize);
|
|
22
|
+
const fontMax = size ?? num(config.fontMax) ?? 24;
|
|
23
|
+
const fontMin = Math.min(fontMax, size ?? num(config.fontMin) ?? 8);
|
|
24
|
+
return {
|
|
25
|
+
fontMin,
|
|
26
|
+
fontMax
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
Whether laid-out lines show all of `text`: every letter, in order, with
|
|
31
|
+
nothing cut short. A word hyphenated across two lines still counts as
|
|
32
|
+
shown whole.
|
|
33
|
+
@param lines The laid-out lines' text.
|
|
34
|
+
@param text The label's text.
|
|
35
|
+
*/ export function textShownWhole(lines, text) {
|
|
36
|
+
const letters = (s)=>s.replace(/[\s\u00ad\u2010-]/g, "");
|
|
37
|
+
const whole = letters(text);
|
|
38
|
+
return whole.length > 0 && letters(lines.join("")) === whole;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
The labels for every slice: each slice's straight label (from
|
|
42
|
+
`straight`) or its curved one, whichever its `labelPosition` and the fit
|
|
43
|
+
choose (see `chooseRingLabel`).
|
|
44
|
+
@param inputs The slices and their geometry, fills, and straight labels.
|
|
45
|
+
*/ export function pieSliceLabels(inputs) {
|
|
46
|
+
const { viz, slices, arcOf, nameOf, shareOf, fillOf, labelConfig } = inputs;
|
|
47
|
+
const bySlice = new Map();
|
|
48
|
+
for (const node of inputs.straight){
|
|
49
|
+
const slice = sliceOf(node);
|
|
50
|
+
if (!slice) continue;
|
|
51
|
+
const list = bySlice.get(slice);
|
|
52
|
+
if (list) list.push(node);
|
|
53
|
+
else bySlice.set(slice, [
|
|
54
|
+
node
|
|
55
|
+
]);
|
|
56
|
+
}
|
|
57
|
+
const font = ringLabelFont(labelConfig);
|
|
58
|
+
const range = ringFontRange(labelConfig);
|
|
59
|
+
const keep = [];
|
|
60
|
+
const curved = [];
|
|
61
|
+
const whole = new Set();
|
|
62
|
+
const curvedWhole = new Map();
|
|
63
|
+
slices.forEach((slice, k)=>{
|
|
64
|
+
const i = slice.i ?? k;
|
|
65
|
+
const name = nameOf(slice);
|
|
66
|
+
const nodes = bySlice.get(slice) ?? [];
|
|
67
|
+
const first = nodes[0];
|
|
68
|
+
const straight = first ? {
|
|
69
|
+
fontSize: first.font?.size ?? 0,
|
|
70
|
+
truncated: textBroken(first.lines.map((l)=>l.text), name)
|
|
71
|
+
} : null;
|
|
72
|
+
const straightWhole = first !== undefined && textShownWhole(first.lines.map((l)=>l.text), name);
|
|
73
|
+
const arc = arcOf(slice);
|
|
74
|
+
// A full Pie keeps its straight labels, whatever its labelPosition.
|
|
75
|
+
if (!(arc.innerRadius > 0)) {
|
|
76
|
+
keep.push(...nodes);
|
|
77
|
+
if (straightWhole) whole.add(slice);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const options = {
|
|
81
|
+
...range,
|
|
82
|
+
// Near a small hole a wedge is narrow, so the curve hugs the rim.
|
|
83
|
+
align: arc.innerRadius >= arc.outerRadius * 0.3 ? "middle" : "outer"
|
|
84
|
+
};
|
|
85
|
+
const width = ringTextWidth(name, font);
|
|
86
|
+
const fit = name ? ringLabelFit(arc, width, options) : null;
|
|
87
|
+
const position = ringLabelPosition(viz, slice.data, i);
|
|
88
|
+
const choice = chooseRingLabel(position, straight, fit);
|
|
89
|
+
if (choice === "straight") {
|
|
90
|
+
keep.push(...nodes);
|
|
91
|
+
if (straightWhole) whole.add(slice);
|
|
92
|
+
}
|
|
93
|
+
if (choice !== "curved" || !fit) return;
|
|
94
|
+
const userColor = resolveAccessor(labelConfig.fontColor, slice.data, i);
|
|
95
|
+
const fill = fillOf(slice);
|
|
96
|
+
const color = typeof userColor === "string" ? userColor : colorContrast(typeof fill === "string" ? fill : "rgb(255, 255, 255)", viz.schema.colorDefaults);
|
|
97
|
+
const share = shareOf(slice);
|
|
98
|
+
const pair = fit.truncated ? null : ringLabelPair(arc, width, ringTextWidth(share, font), options);
|
|
99
|
+
const base = {
|
|
100
|
+
color,
|
|
101
|
+
datum: slice.data,
|
|
102
|
+
index: i
|
|
103
|
+
};
|
|
104
|
+
const key = `pie-label-curved-${viz._ids(slice.data, i).join("-")}`;
|
|
105
|
+
if (!fit.truncated) curvedWhole.set(key, slice);
|
|
106
|
+
if (pair) curved.push({
|
|
107
|
+
...base,
|
|
108
|
+
key,
|
|
109
|
+
text: name,
|
|
110
|
+
fit: pair[0]
|
|
111
|
+
}, {
|
|
112
|
+
...base,
|
|
113
|
+
key: `${key}-share`,
|
|
114
|
+
text: share,
|
|
115
|
+
fit: pair[1]
|
|
116
|
+
});
|
|
117
|
+
else curved.push({
|
|
118
|
+
...base,
|
|
119
|
+
key,
|
|
120
|
+
text: name,
|
|
121
|
+
fit
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
const curvedNodes = clearRingLabels(ringLabelNodes(viz, curved, font), textLineBoxes(keep));
|
|
125
|
+
for (const node of curvedNodes){
|
|
126
|
+
const slice = curvedWhole.get(String(node.key));
|
|
127
|
+
if (slice) whole.add(slice);
|
|
128
|
+
}
|
|
129
|
+
return {
|
|
130
|
+
straight: keep,
|
|
131
|
+
curved: curvedNodes,
|
|
132
|
+
whole
|
|
133
|
+
};
|
|
134
|
+
}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
2
|
`pieEmit` — Path SceneNodes (one per slice) + label TextNodes.
|
|
3
|
-
*/ import {
|
|
4
|
-
import {
|
|
5
|
-
import { largestRect, path2polygon } from "@d3plus/math";
|
|
6
|
-
import { FULL_TURN } from "@d3plus/render";
|
|
7
|
-
import constant from "../../utils/constant.js";
|
|
8
|
-
import { emitLabels } from "../../shapes/emitLabels.js";
|
|
9
|
-
import { userLabelConfig, textureFill, shapeConfigFor, resolveAccessor } from "../features/emitHelpers.js";
|
|
3
|
+
*/ import { FULL_TURN } from "@d3plus/render";
|
|
4
|
+
import { textureFill, shapeConfigFor, resolveAccessor } from "../features/emitHelpers.js";
|
|
10
5
|
import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
|
|
6
|
+
import { sweepFraction } from "./arcFit.js";
|
|
7
|
+
import { pieOutsideLabels } from "./outsideNodes.js";
|
|
8
|
+
import { pieLabelPlan, pieSharePct } from "./pieLabels.js";
|
|
9
|
+
const isDefaultSweep = (s)=>s.start === 0 && s.end === FULL_TURN;
|
|
11
10
|
/**
|
|
12
11
|
Builds one wedge's Path SceneNode — pulled out of `pieEmit` to keep that
|
|
13
12
|
function under the file's max-lines-per-function limit. See `pieEmit`'s
|
|
14
13
|
own comments for what `flipFromArc`/`reunionFromArc` are and why.
|
|
15
14
|
*/ function buildPathNode(d, rank, ctx) {
|
|
16
|
-
const { viz, arcMaker, resolveInnerRadius, resolveOuterRadius, sc, value, sharePct, flipSource, isReunionDraw } = ctx;
|
|
15
|
+
const { viz, arcMaker, resolveInnerRadius, resolveOuterRadius, sc, value, sharePct, flipSource, isReunionDraw, sweep } = ctx;
|
|
17
16
|
const fill = resolveAccessor(sc.fill, d.data, d.i ?? 0);
|
|
18
17
|
const stroke = resolveAccessor(sc.stroke, d.data, d.i ?? 0);
|
|
19
18
|
const strokeWidth = resolveAccessor(sc.strokeWidth, d.data, d.i ?? 0);
|
|
@@ -24,15 +23,17 @@ import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
|
|
|
24
23
|
endAngle: d.endAngle,
|
|
25
24
|
padAngle: d.padAngle
|
|
26
25
|
};
|
|
26
|
+
const span = sweep.end - sweep.start || FULL_TURN;
|
|
27
|
+
const confine = (a, src)=>src.start + (a - sweep.start) / span * src.span;
|
|
27
28
|
const flipFromArc = flipSource ? {
|
|
28
29
|
...arc,
|
|
29
|
-
startAngle:
|
|
30
|
-
endAngle:
|
|
30
|
+
startAngle: confine(d.startAngle, flipSource),
|
|
31
|
+
endAngle: confine(d.endAngle, flipSource)
|
|
31
32
|
} : undefined;
|
|
32
33
|
const reunionFromArc = isReunionDraw ? {
|
|
33
34
|
...arc,
|
|
34
|
-
startAngle:
|
|
35
|
-
endAngle:
|
|
35
|
+
startAngle: sweep.start,
|
|
36
|
+
endAngle: sweep.end
|
|
36
37
|
} : undefined;
|
|
37
38
|
return {
|
|
38
39
|
type: "path",
|
|
@@ -41,6 +42,14 @@ import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
|
|
|
41
42
|
arc,
|
|
42
43
|
flipFromArc,
|
|
43
44
|
reunionFromArc,
|
|
45
|
+
// A wedge entering or leaving without a drill shrinks toward the nearer
|
|
46
|
+
// end of a sweep other than the default full turn from 12 o'clock.
|
|
47
|
+
...isDefaultSweep(sweep) ? {} : {
|
|
48
|
+
sweep: {
|
|
49
|
+
startAngle: sweep.start,
|
|
50
|
+
endAngle: sweep.end
|
|
51
|
+
}
|
|
52
|
+
},
|
|
44
53
|
// Lets the render layer's drill-down morph collapse this wedge to/from
|
|
45
54
|
// an external box (isFlipEligible/collapseTo) — the same mechanism
|
|
46
55
|
// StackedArea's shapeType: "Area" bands use.
|
|
@@ -94,7 +103,7 @@ import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
|
|
|
94
103
|
radius, lands it proportionally in the same spot within the confined
|
|
95
104
|
wedge, exactly mirroring `flipFromArc`'s remap of the wedge's
|
|
96
105
|
start/endAngle. No need to look up the owning slice's angles separately.
|
|
97
|
-
*/ function stampLabelFlip(labelNodes, flipSource) {
|
|
106
|
+
*/ function stampLabelFlip(labelNodes, flipSource, sweep) {
|
|
98
107
|
for (const n of labelNodes){
|
|
99
108
|
const tn = n;
|
|
100
109
|
tn.shapeType = "Label";
|
|
@@ -105,8 +114,7 @@ import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
|
|
|
105
114
|
// d3's angle convention: 0 rad = straight up, increasing clockwise —
|
|
106
115
|
// atan2(x, -y) inverts the x = r·sin(θ), y = -r·cos(θ) used below.
|
|
107
116
|
const angle = Math.atan2(x, -y);
|
|
108
|
-
const
|
|
109
|
-
const mapped = flipSource.start + normalized / FULL_TURN * flipSource.span;
|
|
117
|
+
const mapped = flipSource.start + sweepFraction(angle, sweep) * flipSource.span;
|
|
110
118
|
tn.flipFromTransform = {
|
|
111
119
|
x: radius * Math.sin(mapped),
|
|
112
120
|
y: -radius * Math.cos(mapped)
|
|
@@ -140,9 +148,12 @@ export const pieEmit = ({ viz, shapeData })=>{
|
|
|
140
148
|
// to the one wedge resolveDrillMorph later resolves as the reunion match,
|
|
141
149
|
// so there's no need to know which slice that'll be yet.
|
|
142
150
|
const isReunionDraw = Boolean(viz._pendingExitReunion);
|
|
151
|
+
const sweep = viz.ctx.pieSweep ?? {
|
|
152
|
+
start: 0,
|
|
153
|
+
end: FULL_TURN
|
|
154
|
+
};
|
|
143
155
|
const value = viz.schema.value;
|
|
144
|
-
const
|
|
145
|
-
const sharePct = (d)=>`${formatAbbreviate((d.share ?? 0) * 100, locale)}%`;
|
|
156
|
+
const sharePct = pieSharePct(viz);
|
|
146
157
|
const pathCtx = {
|
|
147
158
|
viz,
|
|
148
159
|
arcMaker,
|
|
@@ -152,87 +163,21 @@ export const pieEmit = ({ viz, shapeData })=>{
|
|
|
152
163
|
value,
|
|
153
164
|
sharePct,
|
|
154
165
|
flipSource,
|
|
155
|
-
isReunionDraw
|
|
166
|
+
isReunionDraw,
|
|
167
|
+
sweep
|
|
156
168
|
};
|
|
157
169
|
const pathNodes = slices.map((d, rank)=>buildPathNode(d, rank, pathCtx));
|
|
158
|
-
// Each
|
|
159
|
-
//
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
const
|
|
164
|
-
const
|
|
165
|
-
|
|
166
|
-
nTries: 40
|
|
167
|
-
});
|
|
168
|
-
if (!r) return false;
|
|
169
|
-
const x = r.cx - r.width / 2;
|
|
170
|
-
const y = r.cy - r.height / 2;
|
|
171
|
-
if (r.height < 50) return [
|
|
172
|
-
{
|
|
173
|
-
angle: r.angle,
|
|
174
|
-
width: r.width,
|
|
175
|
-
height: r.height,
|
|
176
|
-
x,
|
|
177
|
-
y
|
|
178
|
-
}
|
|
179
|
-
];
|
|
180
|
-
const padding = 5;
|
|
181
|
-
const band = Math.min(32, (r.height - padding * 2) * 0.3) + padding * 2;
|
|
182
|
-
return [
|
|
183
|
-
{
|
|
184
|
-
angle: r.angle,
|
|
185
|
-
width: r.width,
|
|
186
|
-
height: r.height - band,
|
|
187
|
-
x,
|
|
188
|
-
y
|
|
189
|
-
},
|
|
190
|
-
{
|
|
191
|
-
angle: r.angle,
|
|
192
|
-
width: r.width,
|
|
193
|
-
height: band,
|
|
194
|
-
x,
|
|
195
|
-
y: y + r.height - band
|
|
196
|
-
}
|
|
197
|
-
];
|
|
198
|
-
});
|
|
199
|
-
const labelNodes = emitLabels({
|
|
200
|
-
data: slices,
|
|
201
|
-
label: (_d, i)=>{
|
|
202
|
-
const name = viz._drawLabel(slices[i].data, slices[i].i ?? i);
|
|
203
|
-
const box = labelBoxes[i];
|
|
204
|
-
return box && box.length > 1 ? [
|
|
205
|
-
name,
|
|
206
|
-
sharePct(slices[i])
|
|
207
|
-
] : [
|
|
208
|
-
name
|
|
209
|
-
];
|
|
210
|
-
},
|
|
211
|
-
// The largest inscribed rectangle is in chart-centered path coordinates,
|
|
212
|
-
// so the anchor is the origin and labelBounds carries the absolute box.
|
|
213
|
-
x: ()=>0,
|
|
214
|
-
y: ()=>0,
|
|
215
|
-
aes: ()=>({}),
|
|
216
|
-
rotate: constant(0),
|
|
217
|
-
id: (_d, i)=>`pie-label-${i}`,
|
|
218
|
-
labelBounds: (_d, i)=>labelBoxes[i],
|
|
219
|
-
labelConfig: {
|
|
220
|
-
fontColor: (d)=>{
|
|
221
|
-
const slice = d.data ?? d;
|
|
222
|
-
const fill = resolveAccessor(sc.fill, slice.data, slice.i ?? 0);
|
|
223
|
-
return colorContrast(typeof fill === "string" ? fill : "rgb(255, 255, 255)", viz.schema.colorDefaults);
|
|
224
|
-
},
|
|
225
|
-
fontResize: true,
|
|
226
|
-
textAnchor: "middle",
|
|
227
|
-
verticalAlign: (d)=>{
|
|
228
|
-
if (d && d.l === 1) return "top";
|
|
229
|
-
const box = d && d.data ? labelBoxes[slices.indexOf(d.data)] : false;
|
|
230
|
-
return box && box.length > 1 ? "bottom" : "middle";
|
|
231
|
-
},
|
|
232
|
-
...userLabelConfig(viz, "Path")
|
|
233
|
-
}
|
|
170
|
+
// Each slice keeps its label inside the ring (straight, or curved along
|
|
171
|
+
// its arc), or takes one outside it when that leaves its name whole.
|
|
172
|
+
const plan = pieLabelPlan(viz, slices);
|
|
173
|
+
const outside = pieOutsideLabels(viz, slices);
|
|
174
|
+
const named = new Set(Array.from(outside.named, (d)=>d.data));
|
|
175
|
+
const straight = plan.straight.filter((n)=>{
|
|
176
|
+
const slice = n.datum?.data;
|
|
177
|
+
return !slice || !outside.named.has(slice);
|
|
234
178
|
});
|
|
235
|
-
|
|
179
|
+
const curved = plan.curved.filter((n)=>!named.has(n.datum));
|
|
180
|
+
stampLabelFlip(straight, flipSource, sweep);
|
|
236
181
|
const imageNodes = backgroundImageNodes(sc, pathNodes, (k)=>[
|
|
237
182
|
slices[k].data,
|
|
238
183
|
slices[k].i ?? 0
|
|
@@ -240,6 +185,8 @@ export const pieEmit = ({ viz, shapeData })=>{
|
|
|
240
185
|
return [
|
|
241
186
|
...pathNodes,
|
|
242
187
|
...imageNodes,
|
|
243
|
-
...
|
|
188
|
+
...straight,
|
|
189
|
+
...curved,
|
|
190
|
+
...outside.nodes
|
|
244
191
|
];
|
|
245
192
|
};
|