@d3plus/core 4.10.0 → 4.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/index.js +1 -1
- package/es/internal.js +178 -9
- 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 +176 -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 +101 -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 +192 -0
- package/es/src/charts/ArcDiagram/events.js +148 -0
- package/es/src/charts/ArcDiagram/index.js +217 -0
- package/es/src/charts/BarChart/index.js +12 -7
- 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 +5 -2
- package/es/src/charts/Candlestick/buffer.js +6 -4
- package/es/src/charts/Candlestick/index.js +6 -11
- 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 +160 -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 +137 -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 +206 -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 +6 -4
- package/es/src/charts/LinePlot/index.js +7 -0
- package/es/src/charts/Marimekko/index.js +7 -4
- package/es/src/charts/Matrix/applyLayout.js +20 -9
- package/es/src/charts/Matrix/index.js +19 -1
- package/es/src/charts/Network/applyLayout.js +171 -96
- package/es/src/charts/Network/bundle.js +82 -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 +257 -75
- package/es/src/charts/Network/graph.js +146 -0
- package/es/src/charts/Network/graphFluent.js +81 -0
- package/es/src/charts/Network/index.js +91 -106
- package/es/src/charts/Network/minNodeDistance.js +64 -0
- package/es/src/charts/Network/polygonRows.js +44 -0
- package/es/src/charts/Pack/applyLayout.js +16 -5
- package/es/src/charts/Pack/emit.js +15 -8
- package/es/src/charts/Pack/groupRows.js +61 -0
- package/es/src/charts/Pack/index.js +8 -1
- package/es/src/charts/Pack/neutralPaint.js +20 -0
- package/es/src/charts/Pack/nodeNames.js +35 -0
- package/es/src/charts/ParallelCoordinates/axes.js +22 -22
- package/es/src/charts/ParallelCoordinates/chrome.js +18 -0
- package/es/src/charts/ParallelCoordinates/index.js +3 -1
- package/es/src/charts/ParallelCoordinates/titles.js +17 -9
- 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 +51 -96
- package/es/src/charts/Pie/index.js +74 -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/areaEnter.js +68 -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 +34 -14
- 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 +19 -17
- 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/lineMarkerKeys.js +19 -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 +40 -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/shapeLabelLegend.js +67 -0
- package/es/src/charts/Plot/sharedHover.js +2 -1
- package/es/src/charts/Plot/sharedTooltip.js +13 -3
- 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 +4 -3
- package/es/src/charts/Priestley/applyLayout.js +21 -23
- package/es/src/charts/Priestley/index.js +4 -37
- package/es/src/charts/Priestley/timeAxis.js +103 -0
- package/es/src/charts/Pyramid/gutter.js +52 -16
- package/es/src/charts/Pyramid/index.js +55 -7
- package/es/src/charts/Pyramid/scene.js +4 -4
- package/es/src/charts/Radar/applyLayout.js +31 -33
- package/es/src/charts/Radar/axisDecorations.js +62 -13
- package/es/src/charts/Radar/curvedLabels.js +228 -0
- package/es/src/charts/Radar/emit.js +30 -15
- package/es/src/charts/Radar/index.js +43 -5
- package/es/src/charts/Radar/points.js +85 -0
- package/es/src/charts/RadialBar/curvedLabels.js +111 -0
- package/es/src/charts/RadialBar/emit.js +9 -1
- package/es/src/charts/RadialBar/index.js +26 -9
- package/es/src/charts/RadialBar/trackLayout.js +43 -13
- package/es/src/charts/RadialMatrix/applyLayout.js +115 -31
- package/es/src/charts/RadialMatrix/index.js +18 -9
- package/es/src/charts/Rings/applyLayout.js +39 -161
- package/es/src/charts/Rings/emit.js +219 -63
- package/es/src/charts/Rings/index.js +88 -32
- package/es/src/charts/Rings/ringsCurves.js +156 -0
- 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 +183 -0
- package/es/src/charts/Rings/ringsPlacement.js +152 -0
- package/es/src/charts/Rings/ringsSizing.js +61 -38
- package/es/src/charts/Sankey/applyLayout.js +130 -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 +78 -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 +83 -64
- package/es/src/charts/Sunburst/index.js +16 -4
- package/es/src/charts/Tree/applyLayout.js +44 -14
- package/es/src/charts/Tree/emit.js +5 -5
- package/es/src/charts/Tree/index.js +12 -18
- package/es/src/charts/Tree/keys.js +33 -0
- package/es/src/charts/Tree/nodeLabel.js +15 -0
- package/es/src/charts/Treemap/emitGroupHeaders.js +3 -5
- 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 +14 -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 +10 -25
- 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/zoomActions.js +36 -0
- package/es/src/charts/drawSteps/zoomControls.js +52 -23
- package/es/src/charts/drawSteps/zoomControlsMarkup.js +23 -4
- package/es/src/charts/drawSteps/zoomDrag.js +188 -0
- package/es/src/charts/drawSteps/zoomFit.js +69 -0
- package/es/src/charts/events/click.legend.js +11 -4
- package/es/src/charts/events/click.shape.js +13 -4
- package/es/src/charts/events/mouseenter.js +6 -16
- package/es/src/charts/events/mouseleave.js +9 -2
- package/es/src/charts/events/mousemove.legend.js +28 -32
- package/es/src/charts/events/mousemove.shape.js +45 -42
- 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 +17 -5
- package/es/src/charts/features/axesFinal.js +10 -3
- package/es/src/charts/features/axesMeasure.js +33 -12
- package/es/src/charts/features/axisTooltip.js +138 -0
- package/es/src/charts/features/calloutLayout.js +121 -0
- package/es/src/charts/features/calloutScene.js +155 -0
- package/es/src/charts/features/centerLabel.js +177 -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/colorScaleBivariate.js +83 -0
- package/es/src/charts/features/colorScaleBucket.js +20 -1
- package/es/src/charts/features/colorScaleHover.js +33 -7
- package/es/src/charts/features/colorScaleLimit.js +73 -0
- package/es/src/charts/features/colorScaleTooltip.js +77 -0
- package/es/src/charts/features/colorScaleTop.js +61 -0
- package/es/src/charts/features/colorScaleValue.js +97 -0
- package/es/src/charts/features/curvedArrows.js +191 -0
- package/es/src/charts/features/depthKey.js +26 -0
- package/es/src/charts/features/edgeArrows.js +220 -5
- 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 +75 -20
- package/es/src/charts/features/featuresLegend.js +15 -24
- package/es/src/charts/features/hoverTicks.js +41 -0
- package/es/src/charts/features/idleQueue.js +72 -0
- 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 +364 -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/networkMeasures.js +241 -0
- package/es/src/charts/features/nodeStats.js +309 -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/plotEndLabels.js +28 -7
- package/es/src/charts/features/plotPaint.js +46 -12
- 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 +54 -32
- package/es/src/charts/features/sharedFields.js +15 -2
- package/es/src/charts/features/textHalo.js +30 -0
- package/es/src/charts/index.js +8 -0
- package/es/src/charts/partition/chartFields.js +14 -5
- package/es/src/charts/partition/interaction.js +19 -10
- package/es/src/charts/partition/zoom.js +7 -6
- package/es/src/charts/pipeline/insetPlacement.js +22 -9
- 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/chrome.js +81 -9
- package/es/src/charts/polar/config.js +6 -3
- package/es/src/charts/polar/wedgeLayout.js +2 -1
- package/es/src/charts/viz/Viz.js +61 -49
- package/es/src/charts/viz/VizBase.js +57 -14
- package/es/src/charts/viz/backgroundInk.js +23 -7
- package/es/src/charts/viz/emphasis.js +14 -0
- package/es/src/charts/viz/fillStroke.js +10 -0
- 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/interactionOpacity.js +115 -32
- 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/reportDrawError.js +15 -0
- package/es/src/charts/viz/setCursor.js +29 -0
- package/es/src/charts/viz/tooltipEnabled.js +38 -0
- package/es/src/charts/viz/userClick.js +34 -0
- package/es/src/charts/viz/vizDataPolling.js +8 -4
- package/es/src/charts/viz/vizDefaults.js +28 -57
- package/es/src/charts/viz/vizFields.js +41 -1
- package/es/src/charts/viz/vizRender.js +76 -31
- package/es/src/charts/viz/vizTheme.js +96 -0
- package/es/src/charts/viz/vizVisibility.js +26 -2
- package/es/src/components/Axis/Axis.js +35 -2
- 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 +33 -8
- package/es/src/components/Axis/axisDefaults.js +16 -9
- package/es/src/components/Axis/axisLabelKinds.js +36 -0
- package/es/src/components/Axis/axisLabelLineHeight.js +19 -0
- package/es/src/components/Axis/axisLabelRoom.js +37 -0
- package/es/src/components/Axis/axisLabelSize.js +171 -0
- package/es/src/components/Axis/axisLabelThinning.js +98 -4
- package/es/src/components/Axis/axisLayout.js +71 -46
- package/es/src/components/Axis/axisLayoutLabels.js +82 -140
- package/es/src/components/Axis/axisLayoutScale.js +16 -11
- package/es/src/components/Axis/axisLimit.js +27 -0
- package/es/src/components/Axis/axisMaxSize.js +39 -0
- package/es/src/components/Axis/axisRangeBreaks.js +77 -0
- package/es/src/components/Axis/axisRender.js +20 -8
- package/es/src/components/Axis/axisRounding.js +16 -1
- package/es/src/components/Axis/axisScene.js +11 -2
- package/es/src/components/Axis/axisTitle.js +53 -0
- package/es/src/components/Axis/axisTooltipTargets.js +128 -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 +77 -27
- package/es/src/components/ColorScale/bivariateRender.js +353 -0
- package/es/src/components/ColorScale/bivariateScale.js +150 -0
- package/es/src/components/ColorScale/bucketBounds.js +32 -3
- package/es/src/components/ColorScale/colorScaleHoverMark.js +3 -3
- package/es/src/components/ColorScale/colorScaleRender.js +32 -2
- package/es/src/components/ColorScale/colorScaleScale.js +28 -15
- package/es/src/components/ColorScale/colorScaleSwatchTooltips.js +77 -0
- package/es/src/components/Legend/Legend.js +13 -2
- package/es/src/components/Legend/legendConfig.js +2 -6
- package/es/src/components/Legend/legendCut.js +108 -0
- package/es/src/components/Legend/legendRender.js +38 -13
- package/es/src/components/SizeLegend/SizeLegend.js +1 -0
- package/es/src/components/TextBox.js +34 -67
- 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 +9 -4
- 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 +226 -0
- package/es/src/components/textBoxWords.js +70 -0
- package/es/src/components/textEllipsis.js +7 -0
- package/es/src/components/tooltipDom.js +8 -5
- package/es/src/fluent.js +48 -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 +30 -12
- package/es/src/utils/configPrep.js +2 -1
- package/es/src/utils/configValue.js +9 -0
- 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 +268 -9
- 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 +46 -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 +24 -0
- package/types/src/charts/ArcDiagram/events.d.ts +29 -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 +36 -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/Matrix/applyLayout.d.ts +4 -2
- package/types/src/charts/Network/applyLayout.d.ts +11 -0
- package/types/src/charts/Network/bundle.d.ts +69 -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 +73 -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/Pack/applyLayout.d.ts +2 -0
- package/types/src/charts/Pack/groupRows.d.ts +46 -0
- package/types/src/charts/Pack/index.d.ts +3 -0
- package/types/src/charts/Pack/neutralPaint.d.ts +14 -0
- package/types/src/charts/Pack/nodeNames.d.ts +23 -0
- package/types/src/charts/ParallelCoordinates/chrome.d.ts +12 -0
- package/types/src/charts/ParallelCoordinates/index.d.ts +1 -0
- package/types/src/charts/ParallelCoordinates/titles.d.ts +7 -2
- 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/areaEnter.d.ts +34 -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 +16 -15
- 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/lineMarkerKeys.d.ts +11 -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/shapeLabelLegend.d.ts +19 -0
- package/types/src/charts/Plot/sharedTooltip.d.ts +7 -1
- 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 +79 -0
- package/types/src/charts/Pyramid/gutter.d.ts +28 -6
- package/types/src/charts/Pyramid/scene.d.ts +1 -1
- package/types/src/charts/Radar/applyLayout.d.ts +2 -3
- package/types/src/charts/Radar/axisDecorations.d.ts +12 -4
- package/types/src/charts/Radar/curvedLabels.d.ts +129 -0
- package/types/src/charts/Radar/emit.d.ts +5 -2
- package/types/src/charts/Radar/index.d.ts +7 -2
- package/types/src/charts/Radar/points.d.ts +50 -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/RadialMatrix/applyLayout.d.ts +6 -4
- package/types/src/charts/Rings/emit.d.ts +72 -0
- package/types/src/charts/Rings/index.d.ts +4 -2
- package/types/src/charts/Rings/ringsCurves.d.ts +50 -0
- package/types/src/charts/Rings/ringsGraph.d.ts +39 -7
- package/types/src/charts/Rings/ringsLoops.d.ts +13 -0
- package/types/src/charts/Rings/ringsParallel.d.ts +45 -0
- package/types/src/charts/Rings/ringsPlacement.d.ts +47 -0
- package/types/src/charts/Rings/ringsSizing.d.ts +36 -9
- 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/Tree/applyLayout.d.ts +20 -0
- package/types/src/charts/Tree/keys.d.ts +25 -0
- package/types/src/charts/Tree/nodeLabel.d.ts +11 -0
- package/types/src/charts/definition/ChartDefinition.d.ts +26 -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/zoomActions.d.ts +30 -0
- package/types/src/charts/drawSteps/zoomControls.d.ts +15 -0
- package/types/src/charts/drawSteps/zoomControlsMarkup.d.ts +16 -1
- package/types/src/charts/drawSteps/zoomDrag.d.ts +71 -0
- package/types/src/charts/drawSteps/zoomFit.d.ts +30 -0
- 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/axisTooltip.d.ts +49 -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/centerLabel.d.ts +75 -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/colorScaleBivariate.d.ts +50 -0
- package/types/src/charts/features/colorScaleBucket.d.ts +10 -0
- package/types/src/charts/features/colorScaleHover.d.ts +13 -3
- package/types/src/charts/features/colorScaleLimit.d.ts +60 -0
- package/types/src/charts/features/colorScaleTooltip.d.ts +43 -0
- package/types/src/charts/features/colorScaleTop.d.ts +30 -0
- package/types/src/charts/features/colorScaleValue.d.ts +35 -0
- package/types/src/charts/features/curvedArrows.d.ts +119 -0
- package/types/src/charts/features/depthKey.d.ts +19 -0
- package/types/src/charts/features/edgeArrows.d.ts +103 -4
- 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/hoverTicks.d.ts +30 -0
- package/types/src/charts/features/idleQueue.d.ts +46 -0
- 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 +192 -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/networkMeasures.d.ts +53 -0
- package/types/src/charts/features/nodeStats.d.ts +93 -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/plotEndLabels.d.ts +14 -1
- 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 +15 -0
- package/types/src/charts/index.d.ts +8 -0
- package/types/src/charts/partition/chartFields.d.ts +6 -1
- 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/insetPlacement.d.ts +6 -0
- 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/polar/chrome.d.ts +19 -6
- package/types/src/charts/viz/Viz.d.ts +25 -4
- package/types/src/charts/viz/VizBase.d.ts +37 -8
- package/types/src/charts/viz/backgroundInk.d.ts +19 -4
- package/types/src/charts/viz/emphasis.d.ts +17 -0
- package/types/src/charts/viz/fillStroke.d.ts +7 -0
- 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/reportDrawError.d.ts +12 -0
- package/types/src/charts/viz/setCursor.d.ts +26 -0
- package/types/src/charts/viz/tooltipEnabled.d.ts +31 -0
- package/types/src/charts/viz/userClick.d.ts +35 -0
- package/types/src/charts/viz/vizDefaults.d.ts +0 -9
- package/types/src/charts/viz/vizFields.d.ts +37 -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 +100 -7
- package/types/src/charts/viz/vizVisibility.d.ts +13 -0
- package/types/src/components/Axis/Axis.d.ts +34 -3
- 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 +21 -3
- package/types/src/components/Axis/axisDefaults.d.ts +12 -0
- package/types/src/components/Axis/axisLabelKinds.d.ts +22 -0
- package/types/src/components/Axis/axisLabelLineHeight.d.ts +27 -0
- package/types/src/components/Axis/axisLabelRoom.d.ts +17 -0
- package/types/src/components/Axis/axisLabelSize.d.ts +82 -0
- package/types/src/components/Axis/axisLabelThinning.d.ts +38 -2
- package/types/src/components/Axis/axisLayout.d.ts +9 -2
- package/types/src/components/Axis/axisLayoutLabels.d.ts +28 -33
- package/types/src/components/Axis/axisLayoutScale.d.ts +3 -1
- package/types/src/components/Axis/axisLimit.d.ts +18 -0
- package/types/src/components/Axis/axisMaxSize.d.ts +48 -0
- package/types/src/components/Axis/axisRangeBreaks.d.ts +25 -0
- package/types/src/components/Axis/axisRounding.d.ts +8 -0
- package/types/src/components/Axis/axisTitle.d.ts +30 -0
- package/types/src/components/Axis/axisTooltipTargets.d.ts +82 -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 +22 -11
- package/types/src/components/ColorScale/bivariateRender.d.ts +53 -0
- package/types/src/components/ColorScale/bivariateScale.d.ts +92 -0
- package/types/src/components/ColorScale/bucketBounds.d.ts +15 -1
- package/types/src/components/ColorScale/colorScaleSwatchTooltips.d.ts +48 -0
- package/types/src/components/Legend/Legend.d.ts +6 -0
- package/types/src/components/Legend/legendCut.d.ts +31 -0
- package/types/src/components/Legend/legendRender.d.ts +6 -1
- package/types/src/components/SizeLegend/SizeLegend.d.ts +1 -0
- package/types/src/components/TextBox.d.ts +5 -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/components/textEllipsis.d.ts +6 -0
- package/types/src/fluent.d.ts +18 -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/shapes/emitLabels.d.ts +1 -1
- package/types/src/utils/BaseClass.d.ts +9 -0
- package/types/src/utils/D3plusConfig.d.ts +1093 -266
- package/types/src/utils/configPrep.d.ts +2 -0
- package/types/src/utils/configValue.d.ts +8 -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/types/umd-entry.d.ts +4 -0
- package/umd/d3plus-core.full.js +72239 -41465
- package/umd/d3plus-core.full.min.js +2 -2
- package/umd/d3plus-core.js +46249 -19519
- 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,183 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Rings' parallel links: several links between the same two nodes, in
|
|
3
|
+
either direction. Each node takes one place on its ring however many
|
|
4
|
+
links reach it, and the links fan out as curves bowed either side of
|
|
5
|
+
the line between their nodes (or, along one ring, circle around at
|
|
6
|
+
different distances), so each stays its own mark.
|
|
7
|
+
*/ import { LINK_HIT_WIDTH } from "../features/linkInteraction.js";
|
|
8
|
+
import { applyRingArc } from "./ringsCurves.js";
|
|
9
|
+
/** The node at the other end of `edge` from the node `id`. */ const otherEnd = (edge, id)=>edge.source.id === id ? edge.target : edge.source;
|
|
10
|
+
/** `edges` from the node `id`, keeping only the first to each other node. */ export function firstPerNeighbor(edges, id) {
|
|
11
|
+
const seen = new Set();
|
|
12
|
+
return edges.filter((edge)=>{
|
|
13
|
+
const other = otherEnd(edge, id).id;
|
|
14
|
+
if (seen.has(other)) return false;
|
|
15
|
+
seen.add(other);
|
|
16
|
+
return true;
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
/** The edges among `edges` between the node `id` and the node `otherId`. */ export const edgesBetween = (edges, id, otherId)=>edges.filter((edge)=>otherEnd(edge, id).id === otherId);
|
|
20
|
+
/** How far apart, at their middles, `n` parallel links sit, centered on the line: `[-step/2, step/2]` for two. */ export const parallelOffsets = (n, step)=>Array.from({
|
|
21
|
+
length: n
|
|
22
|
+
}, (_, k)=>(k - (n - 1) / 2) * step);
|
|
23
|
+
/**
|
|
24
|
+
The point on the rim of `node` (centered on `node`, through `p`) moved
|
|
25
|
+
`e` pixels along the unit `normal`, keeping to the side of the center
|
|
26
|
+
`p` is on. It slides at most 90% of the radius out, and a node with no
|
|
27
|
+
radius keeps `p`.
|
|
28
|
+
*/ export function slideOnRim(node, p, normal, e) {
|
|
29
|
+
const vx = p[0] - node.x;
|
|
30
|
+
const vy = p[1] - node.y;
|
|
31
|
+
const r = Math.hypot(vx, vy);
|
|
32
|
+
if (!r) return p;
|
|
33
|
+
const along = [
|
|
34
|
+
normal[1],
|
|
35
|
+
-normal[0]
|
|
36
|
+
];
|
|
37
|
+
const limit = r * 0.9;
|
|
38
|
+
const a = Math.max(-limit, Math.min(limit, vx * normal[0] + vy * normal[1] + e));
|
|
39
|
+
const side = vx * along[0] + vy * along[1] < 0 ? -1 : 1;
|
|
40
|
+
const b = side * Math.sqrt(r * r - a * a);
|
|
41
|
+
return [
|
|
42
|
+
node.x + normal[0] * a + along[0] * b,
|
|
43
|
+
node.y + normal[1] * a + along[1] * b
|
|
44
|
+
];
|
|
45
|
+
}
|
|
46
|
+
/** How far out, as a share of a parallel link's offset, its ends slide along their nodes' rims. */ const END_SHARE = 0.75;
|
|
47
|
+
/** How far `p` sits along the unit `normal` from `q`. */ const offsetAlong = (p, q, n)=>(p[0] - q[0]) * n[0] + (p[1] - q[1]) * n[1];
|
|
48
|
+
/**
|
|
49
|
+
A straight link from `s` to `t` bowed `offset` pixels along the unit
|
|
50
|
+
`normal` at its middle: a cubic across the gap between the two nodes,
|
|
51
|
+
whose ends slide most of that way along each node's rim (see
|
|
52
|
+
`END_SHARE`), and whose control points sit a third and two thirds of
|
|
53
|
+
the way across, out as far as the rest of the bow needs.
|
|
54
|
+
*/ export function bowedEdge(s, t, normal, offset) {
|
|
55
|
+
const len = Math.hypot(t.x - s.x, t.y - s.y) || 1;
|
|
56
|
+
const ux = (t.x - s.x) / len;
|
|
57
|
+
const uy = (t.y - s.y) / len;
|
|
58
|
+
const rs = s.r ?? 0;
|
|
59
|
+
const rt = t.r ?? 0;
|
|
60
|
+
const e = offset * END_SHARE;
|
|
61
|
+
const s0 = [
|
|
62
|
+
s.x + ux * rs,
|
|
63
|
+
s.y + uy * rs
|
|
64
|
+
];
|
|
65
|
+
const t0 = [
|
|
66
|
+
t.x - ux * rt,
|
|
67
|
+
t.y - uy * rt
|
|
68
|
+
];
|
|
69
|
+
const [sourceX, sourceY] = slideOnRim(s, s0, normal, e);
|
|
70
|
+
const [targetX, targetY] = slideOnRim(t, t0, normal, e);
|
|
71
|
+
// The middle sits halfway between the ends, plus 3/4 of the control
|
|
72
|
+
// points' (equal) offset `h`.
|
|
73
|
+
const ends = offsetAlong([
|
|
74
|
+
sourceX,
|
|
75
|
+
sourceY
|
|
76
|
+
], s0, normal) + offsetAlong([
|
|
77
|
+
targetX,
|
|
78
|
+
targetY
|
|
79
|
+
], t0, normal);
|
|
80
|
+
const h = (offset - ends / 2) / 0.75;
|
|
81
|
+
const dx = targetX - sourceX;
|
|
82
|
+
const dy = targetY - sourceY;
|
|
83
|
+
return {
|
|
84
|
+
sourceX,
|
|
85
|
+
sourceY,
|
|
86
|
+
sourceBisectX: sourceX + dx / 3 + normal[0] * h,
|
|
87
|
+
sourceBisectY: sourceY + dy / 3 + normal[1] * h,
|
|
88
|
+
targetBisectX: sourceX + dx * 2 / 3 + normal[0] * h,
|
|
89
|
+
targetBisectY: sourceY + dy * 2 / 3 + normal[1] * h,
|
|
90
|
+
targetX,
|
|
91
|
+
targetY
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
/** Moves a curved link `offset` pixels along the unit `normal` at its middle: its ends most of that way along their rims (see `END_SHARE`), its control points the rest. */ function shiftSpline(edge, normal, offset) {
|
|
95
|
+
const e = offset * END_SHARE;
|
|
96
|
+
const s0 = [
|
|
97
|
+
edge.sourceX,
|
|
98
|
+
edge.sourceY
|
|
99
|
+
];
|
|
100
|
+
const t0 = [
|
|
101
|
+
edge.targetX,
|
|
102
|
+
edge.targetY
|
|
103
|
+
];
|
|
104
|
+
[edge.sourceX, edge.sourceY] = slideOnRim(edge.source, s0, normal, e);
|
|
105
|
+
[edge.targetX, edge.targetY] = slideOnRim(edge.target, t0, normal, e);
|
|
106
|
+
// Each end moves the middle an eighth as far, the control points 3/4 of `h`.
|
|
107
|
+
const ends = offsetAlong([
|
|
108
|
+
edge.sourceX,
|
|
109
|
+
edge.sourceY
|
|
110
|
+
], s0, normal) + offsetAlong([
|
|
111
|
+
edge.targetX,
|
|
112
|
+
edge.targetY
|
|
113
|
+
], t0, normal);
|
|
114
|
+
const h = (offset - ends / 8) / 0.75;
|
|
115
|
+
edge.sourceBisectX += normal[0] * h;
|
|
116
|
+
edge.sourceBisectY += normal[1] * h;
|
|
117
|
+
edge.targetBisectX += normal[0] * h;
|
|
118
|
+
edge.targetBisectY += normal[1] * h;
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
Moves a link along one ring `offset` pixels out from the circle it runs
|
|
122
|
+
around (in, for a negative offset), keeping it clear of its nodes.
|
|
123
|
+
*/ function shiftRingArc(edge, offset) {
|
|
124
|
+
const arc = edge.arc;
|
|
125
|
+
const reach = (n)=>Math.hypot((n.x ?? 0) - arc.cx, (n.y ?? 0) - arc.cy) + (n.r ?? 0);
|
|
126
|
+
const floor = Math.max(reach(edge.source), reach(edge.target)) + 2;
|
|
127
|
+
edge.arc = {
|
|
128
|
+
...arc,
|
|
129
|
+
radius: Math.max(floor, arc.radius + offset)
|
|
130
|
+
};
|
|
131
|
+
applyRingArc(edge);
|
|
132
|
+
}
|
|
133
|
+
const isPlaced = (n)=>typeof n.x === "number" && typeof n.y === "number";
|
|
134
|
+
/**
|
|
135
|
+
Fans out each group of parallel links among `edges` (mutated in place),
|
|
136
|
+
leaving a link with no parallel alone. Their middles sit a hit path's
|
|
137
|
+
width (and a gap) apart, so each can be pointed at. A straight link
|
|
138
|
+
becomes a bowed curve (see `bowedEdge`); a curved one moves to the side
|
|
139
|
+
(see `shiftSpline`); one along a ring circles nearer or farther out (see
|
|
140
|
+
`shiftRingArc`). The side follows the two nodes, not the link's
|
|
141
|
+
direction, so links both ways between them fan apart too.
|
|
142
|
+
*/ export function fanParallelEdges(edges) {
|
|
143
|
+
const groups = new Map();
|
|
144
|
+
for (const edge of edges){
|
|
145
|
+
if (edge.loop || edge.source.id === edge.target.id) continue;
|
|
146
|
+
const ids = [
|
|
147
|
+
String(edge.source.id),
|
|
148
|
+
String(edge.target.id)
|
|
149
|
+
].sort();
|
|
150
|
+
const key = JSON.stringify(ids);
|
|
151
|
+
if (!groups.has(key)) groups.set(key, []);
|
|
152
|
+
groups.get(key).push(edge);
|
|
153
|
+
}
|
|
154
|
+
for (const group of groups.values()){
|
|
155
|
+
if (group.length < 2) continue;
|
|
156
|
+
const first = group[0];
|
|
157
|
+
const [a, b] = String(first.source.id) < String(first.target.id) ? [
|
|
158
|
+
first.source,
|
|
159
|
+
first.target
|
|
160
|
+
] : [
|
|
161
|
+
first.target,
|
|
162
|
+
first.source
|
|
163
|
+
];
|
|
164
|
+
if (!isPlaced(a) || !isPlaced(b)) continue;
|
|
165
|
+
const len = Math.hypot(b.x - a.x, b.y - a.y);
|
|
166
|
+
if (!len) continue;
|
|
167
|
+
const normal = [
|
|
168
|
+
-(b.y - a.y) / len,
|
|
169
|
+
(b.x - a.x) / len
|
|
170
|
+
];
|
|
171
|
+
const widest = Math.max(...group.map((e)=>e.size ?? 1));
|
|
172
|
+
const step = Math.max(LINK_HIT_WIDTH, widest + 4) + 4;
|
|
173
|
+
parallelOffsets(group.length, step).forEach((offset, k)=>{
|
|
174
|
+
const edge = group[k];
|
|
175
|
+
if (edge.arc) shiftRingArc(edge, offset);
|
|
176
|
+
else if (edge.spline && edge.sourceX != null && edge.targetX != null) shiftSpline(edge, normal, offset);
|
|
177
|
+
else {
|
|
178
|
+
Object.assign(edge, bowedEdge(edge.source, edge.target, normal, offset));
|
|
179
|
+
edge.spline = true;
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Rings' node placement: which ring each node sits on, its angle and
|
|
3
|
+
position, and the curves of the links between the rings.
|
|
4
|
+
|
|
5
|
+
@module
|
|
6
|
+
*/ import { max, min } from "d3-array";
|
|
7
|
+
import { edgesBetween, firstPerNeighbor } from "./ringsParallel.js";
|
|
8
|
+
import { curveRingsEdge } from "./ringsCurves.js";
|
|
9
|
+
import { sizeRingsNodes } from "./ringsSizing.js";
|
|
10
|
+
/** The node at the other end of `edge` from the node `id`. */ const otherEnd = (edge, id)=>edge.source.id === id ? edge.target : edge.source;
|
|
11
|
+
/**
|
|
12
|
+
Claims the nodes on each of `hops` rings around `center`, breadth-first,
|
|
13
|
+
so a node reachable by several paths sits once, on its shallowest ring.
|
|
14
|
+
The first ring is the center's neighbors, fewest links first; each later
|
|
15
|
+
ring is, in order, the unclaimed neighbors of each node on the ring
|
|
16
|
+
inside it, which become that node's children.
|
|
17
|
+
*/ export function claimRings(linkMap, center, hops) {
|
|
18
|
+
const claimed = new Set([
|
|
19
|
+
center
|
|
20
|
+
]);
|
|
21
|
+
const children = new Map();
|
|
22
|
+
const first = [];
|
|
23
|
+
(linkMap[center.id] || []).forEach((edge)=>{
|
|
24
|
+
const node = otherEnd(edge, center.id);
|
|
25
|
+
// A node takes one place however many center links reach it.
|
|
26
|
+
if (claimed.has(node)) return;
|
|
27
|
+
claimed.add(node);
|
|
28
|
+
first.push(node);
|
|
29
|
+
});
|
|
30
|
+
first.sort((a, b)=>(linkMap[a.id] || []).length - (linkMap[b.id] || []).length);
|
|
31
|
+
const rings = [
|
|
32
|
+
first
|
|
33
|
+
];
|
|
34
|
+
while(rings.length < hops){
|
|
35
|
+
const inner = rings[rings.length - 1];
|
|
36
|
+
const ring = [];
|
|
37
|
+
inner.forEach((p)=>{
|
|
38
|
+
const kids = firstPerNeighbor((linkMap[p.id] || []).filter((edge)=>!claimed.has(otherEnd(edge, p.id))), p.id).map((edge)=>otherEnd(edge, p.id));
|
|
39
|
+
kids.forEach((k)=>claimed.add(k));
|
|
40
|
+
children.set(p, kids);
|
|
41
|
+
ring.push(...kids);
|
|
42
|
+
});
|
|
43
|
+
rings.push(ring);
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
rings,
|
|
47
|
+
children
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
How many outer-ring slots each node spans: one on the outermost ring (or
|
|
52
|
+
with no children), else the sum of its children's.
|
|
53
|
+
*/ export function ringWeights(tree) {
|
|
54
|
+
const weights = new Map();
|
|
55
|
+
for(let k = tree.rings.length - 1; k >= 0; k--){
|
|
56
|
+
tree.rings[k].forEach((n)=>{
|
|
57
|
+
const kids = tree.children.get(n) ?? [];
|
|
58
|
+
const sum = kids.reduce((total, c)=>total + weights.get(c), 0);
|
|
59
|
+
weights.set(n, sum || 1);
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
return weights;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
Sets each ring node's angle (`radians`) and position on its ring. The
|
|
66
|
+
circle splits into one slot per outer-ring position (`ringWeights`): the
|
|
67
|
+
first ring's nodes take arcs as wide as their slots, the first centered
|
|
68
|
+
at the top, and each node's children split its arc the same way. Returns
|
|
69
|
+
the number of slots.
|
|
70
|
+
*/ export function placeRings(tree, geom) {
|
|
71
|
+
const { width, height, rings: radii } = geom;
|
|
72
|
+
const weights = ringWeights(tree);
|
|
73
|
+
const total = tree.rings[0].reduce((sum, n)=>sum + weights.get(n), 0);
|
|
74
|
+
const tau = Math.PI * 2;
|
|
75
|
+
const s = tau / total;
|
|
76
|
+
const place = (node, angle, ring)=>{
|
|
77
|
+
node.radians = angle;
|
|
78
|
+
node.x = width / 2 + radii[ring] * Math.cos(angle);
|
|
79
|
+
node.y = height / 2 + radii[ring] * Math.sin(angle);
|
|
80
|
+
const kids = tree.children.get(node) ?? [];
|
|
81
|
+
const span = weights.get(node);
|
|
82
|
+
let before = 0;
|
|
83
|
+
kids.forEach((kid)=>{
|
|
84
|
+
const w = weights.get(kid);
|
|
85
|
+
place(kid, angle - s * span / 2 + s * w / 2 + s * before, ring + 1);
|
|
86
|
+
before += w;
|
|
87
|
+
});
|
|
88
|
+
};
|
|
89
|
+
let offset = 0;
|
|
90
|
+
tree.rings[0].forEach((p, i)=>{
|
|
91
|
+
const space = tau / total * weights.get(p);
|
|
92
|
+
if (i === 0) offset -= space / 2;
|
|
93
|
+
place(p, offset + space / 2 - tau / 4, 0);
|
|
94
|
+
offset += space;
|
|
95
|
+
});
|
|
96
|
+
return total;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
Places the center node and `geom.rings.length` rings around it, and sizes
|
|
100
|
+
every node. Returns the placed `nodes` (center first, then ring by ring),
|
|
101
|
+
the `rings`, and the size scale (null when unsized).
|
|
102
|
+
*/ export function placeRingsNodes(v, linkMap, center, geom) {
|
|
103
|
+
const { width, height, baseRing } = geom;
|
|
104
|
+
center.x = width / 2;
|
|
105
|
+
center.y = height / 2;
|
|
106
|
+
center.r = v.schema.sizeMin ? max([
|
|
107
|
+
v.schema.sizeMin,
|
|
108
|
+
baseRing * 0.65
|
|
109
|
+
]) : v.schema.sizeMax ? min([
|
|
110
|
+
v.schema.sizeMax,
|
|
111
|
+
baseRing * 0.65
|
|
112
|
+
]) : baseRing * 0.65;
|
|
113
|
+
const tree = claimRings(linkMap, center, geom.rings.length);
|
|
114
|
+
const slots = placeRings(tree, geom);
|
|
115
|
+
const radius = sizeRingsNodes(v, center, geom, slots, tree.rings);
|
|
116
|
+
const nodes = [
|
|
117
|
+
center,
|
|
118
|
+
...tree.rings.flat()
|
|
119
|
+
];
|
|
120
|
+
return {
|
|
121
|
+
nodes,
|
|
122
|
+
rings: tree.rings,
|
|
123
|
+
radius
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
The links drawn between placed nodes, each once: every link from the
|
|
128
|
+
center to the first ring, and every link from a node on a ring inside the
|
|
129
|
+
outermost to another ring node (curved, see `curveRingsEdge`). With
|
|
130
|
+
`ringLinks`, links between two nodes on the outermost ring draw too.
|
|
131
|
+
*/ export function buildRingsEdges(rings, linkMap, center, geom, ringLinks = false) {
|
|
132
|
+
const edges = [];
|
|
133
|
+
const placed = new Set(rings.flat().map((n)=>n.id));
|
|
134
|
+
rings.forEach((ring, k)=>{
|
|
135
|
+
ring.forEach((p)=>{
|
|
136
|
+
if (k === 0) edgesBetween(linkMap[p.id], p.id, center.id).forEach((edge)=>{
|
|
137
|
+
if (!edges.includes(edge)) edges.push(edge);
|
|
138
|
+
});
|
|
139
|
+
const outermost = k === rings.length - 1;
|
|
140
|
+
if (outermost && !ringLinks) return;
|
|
141
|
+
linkMap[p.id].forEach((edge)=>{
|
|
142
|
+
const other = otherEnd(edge, p.id);
|
|
143
|
+
if (other.id === center.id || !placed.has(other.id)) return;
|
|
144
|
+
// From the outermost ring, only its own links are left to draw.
|
|
145
|
+
if (outermost && other.ring !== p.ring) return;
|
|
146
|
+
curveRingsEdge(edge, geom);
|
|
147
|
+
if (!edges.includes(edge)) edges.push(edge);
|
|
148
|
+
});
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
return edges;
|
|
152
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
Rings' ring geometry and node sizing: where the
|
|
2
|
+
Rings' ring geometry and node sizing: where the rings sit for a chart
|
|
3
3
|
area, each node's radius — fixed per ring, or from a `size` scale shared
|
|
4
4
|
by every node (center included) that the size legend reads back — and
|
|
5
5
|
whether the center's label still fits inside it.
|
|
@@ -9,20 +9,62 @@
|
|
|
9
9
|
import * as scales from "d3-scale";
|
|
10
10
|
import { textWidth } from "@d3plus/dom";
|
|
11
11
|
import { fontFamilyStringify } from "@d3plus/text";
|
|
12
|
-
/**
|
|
12
|
+
/** The number of rings a `hops` value asks for: a whole number, at least 1 (2 when unset or not a number). */ export function ringsHops(hops) {
|
|
13
|
+
const n = Number(hops);
|
|
14
|
+
return hops != null && Number.isFinite(n) ? Math.max(1, Math.floor(n)) : 2;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
Ring geometry for a chart area: the center plus `hops` rings, evenly
|
|
18
|
+
spaced so the last leaves one more spacing of room for its labels.
|
|
19
|
+
*/ export function ringsGeometry(width, height, hops = 2) {
|
|
13
20
|
const radius = (min([
|
|
14
21
|
height,
|
|
15
22
|
width
|
|
16
23
|
]) || 0) / 2;
|
|
17
|
-
const ringWidth = radius /
|
|
24
|
+
const ringWidth = radius / (hops + 1);
|
|
25
|
+
const baseRing = hops === 1 ? radius / 3 : ringWidth;
|
|
26
|
+
const rings = Array.from({
|
|
27
|
+
length: hops
|
|
28
|
+
}, (_, k)=>ringWidth + ringWidth * k);
|
|
18
29
|
return {
|
|
19
30
|
width,
|
|
20
31
|
height,
|
|
21
32
|
ringWidth,
|
|
22
33
|
primaryRing: ringWidth,
|
|
23
|
-
|
|
34
|
+
baseRing,
|
|
35
|
+
rings
|
|
24
36
|
};
|
|
25
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
The largest radius an unsized node may take on each of `count` rings
|
|
40
|
+
`ringWidth` apart, innermost first. Each ring's room halves the one
|
|
41
|
+
inside it, so outer nodes are smaller, and an inner ring's nodes stay
|
|
42
|
+
within half again the size of the ring outside it.
|
|
43
|
+
*/ export function ringNodeRadii(ringWidth, count) {
|
|
44
|
+
const radii = [];
|
|
45
|
+
for(let k = 1; k <= count; k++){
|
|
46
|
+
const room = ringWidth / 2 ** k;
|
|
47
|
+
const floor = k === 1 ? 8 : 4;
|
|
48
|
+
let r = room / 2 - 4;
|
|
49
|
+
if (r < floor) r = min([
|
|
50
|
+
room / 2,
|
|
51
|
+
floor
|
|
52
|
+
]) || 0;
|
|
53
|
+
if (k > 1 && r > ringWidth / 10) r = ringWidth / 10;
|
|
54
|
+
radii.push(r);
|
|
55
|
+
}
|
|
56
|
+
for(let k = 1; k < count; k++)if (radii[k] > radii[k - 1] && radii[k] > 10) radii[k] = radii[k - 1] * 0.75;
|
|
57
|
+
for(let k = count - 2; k >= 0; k--)if (radii[k] > radii[k + 1] * 1.5) radii[k] = radii[k + 1] * 1.5;
|
|
58
|
+
return radii.map((r)=>Math.floor(r));
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
Each ring's unsized node radius, innermost first: the first ring's
|
|
62
|
+
nodes take the two-ring chart's first-ring size for the `baseRing`
|
|
63
|
+
spacing, and every ring past it the second ring's.
|
|
64
|
+
*/ export function ringsNodeRadii(geom) {
|
|
65
|
+
const [first, outer] = ringNodeRadii(geom.baseRing, 2);
|
|
66
|
+
return geom.rings.map((_, k)=>k ? outer : first);
|
|
67
|
+
}
|
|
26
68
|
/** Clamps a radius into `[sizeMin, sizeMax]` (either bound optional). */ function clampRadius(v, r) {
|
|
27
69
|
const lo = v.schema.sizeMin;
|
|
28
70
|
const hi = v.schema.sizeMax;
|
|
@@ -31,17 +73,16 @@ import { fontFamilyStringify } from "@d3plus/text";
|
|
|
31
73
|
/**
|
|
32
74
|
The radius scale for sized Rings: `sizeScale` over every placed node's
|
|
33
75
|
`size` value. Its top radius is capped so neighbors can't overlap — a
|
|
34
|
-
quarter of the
|
|
76
|
+
quarter of the `baseRing` spacing radially, and half the gap between adjacent
|
|
35
77
|
slots around each ring (`slots` is how many evenly spaced positions the
|
|
36
|
-
|
|
78
|
+
rings are divided into) — then by `sizeMax`; its bottom is `sizeMin`,
|
|
37
79
|
held to at most half the top so small values still read smaller.
|
|
38
80
|
*/ function ringsSizeScale(v, geom, slots, values) {
|
|
39
|
-
const {
|
|
81
|
+
const { baseRing, rings } = geom;
|
|
40
82
|
const half = Math.sin(Math.PI / Math.max(slots, 2));
|
|
41
83
|
const cap = Math.max(1, Math.floor(min([
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
secondaryRing * half - 1
|
|
84
|
+
baseRing / 4,
|
|
85
|
+
...rings.map((ring)=>ring * half - 1)
|
|
45
86
|
])));
|
|
46
87
|
const rMax = Math.min(v.schema.sizeMax ?? Infinity, cap);
|
|
47
88
|
const rMin = Math.min(rMax / 2, v.schema.sizeMin ?? 3);
|
|
@@ -53,18 +94,16 @@ import { fontFamilyStringify } from "@d3plus/text";
|
|
|
53
94
|
]);
|
|
54
95
|
}
|
|
55
96
|
/**
|
|
56
|
-
Assigns each ring node its `ring` + `r`, and `center.r`.
|
|
57
|
-
(`size` set) run every node, center included, through one
|
|
58
|
-
`ringsSizeScale`, and return it; unsized charts
|
|
59
|
-
and return null.
|
|
60
|
-
*/ export function sizeRingsNodes(v, center, geom, slots,
|
|
61
|
-
|
|
62
|
-
secondaries.forEach((s)=>s.ring = 2);
|
|
97
|
+
Assigns each ring node its `ring` (1 innermost) + `r`, and `center.r`.
|
|
98
|
+
Sized charts (`size` set) run every node, center included, through one
|
|
99
|
+
`ringsSizeScale`, and return it; unsized charts give each ring its
|
|
100
|
+
`ringsNodeRadii` radius and return null.
|
|
101
|
+
*/ export function sizeRingsNodes(v, center, geom, slots, rings) {
|
|
102
|
+
rings.forEach((ring, k)=>ring.forEach((n)=>n.ring = k + 1));
|
|
63
103
|
if (v._size) {
|
|
64
104
|
const all = [
|
|
65
105
|
center,
|
|
66
|
-
...
|
|
67
|
-
...secondaries
|
|
106
|
+
...rings.flat()
|
|
68
107
|
];
|
|
69
108
|
all.forEach((n)=>n.size = Number(v._size(n.data, n.i)));
|
|
70
109
|
const values = all.map((n)=>n.size).filter((n)=>Number.isFinite(n));
|
|
@@ -74,24 +113,8 @@ import { fontFamilyStringify } from "@d3plus/text";
|
|
|
74
113
|
return radius;
|
|
75
114
|
}
|
|
76
115
|
}
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
const secondaryDistance = ringWidth / 4;
|
|
80
|
-
let primaryMax = primaryDistance / 2 - 4;
|
|
81
|
-
if (primaryDistance / 2 - 4 < 8) primaryMax = min([
|
|
82
|
-
primaryDistance / 2,
|
|
83
|
-
8
|
|
84
|
-
]) || 0;
|
|
85
|
-
let secondaryMax = secondaryDistance / 2 - 4;
|
|
86
|
-
if (secondaryDistance / 2 - 4 < 4) secondaryMax = min([
|
|
87
|
-
secondaryDistance / 2,
|
|
88
|
-
4
|
|
89
|
-
]) || 0;
|
|
90
|
-
if (secondaryMax > ringWidth / 10) secondaryMax = ringWidth / 10;
|
|
91
|
-
if (secondaryMax > primaryMax && secondaryMax > 10) secondaryMax = primaryMax * 0.75;
|
|
92
|
-
if (primaryMax > secondaryMax * 1.5) primaryMax = secondaryMax * 1.5;
|
|
93
|
-
primaries.forEach((p)=>p.r = clampRadius(v, Math.floor(primaryMax)));
|
|
94
|
-
secondaries.forEach((s)=>s.r = clampRadius(v, Math.floor(secondaryMax)));
|
|
116
|
+
const radii = ringsNodeRadii(geom);
|
|
117
|
+
rings.forEach((ring, k)=>ring.forEach((n)=>n.r = clampRadius(v, radii[k])));
|
|
95
118
|
return null;
|
|
96
119
|
}
|
|
97
120
|
/** Smallest font size, in pixels, a center label may shrink to and still sit inside its circle. */ const CENTER_LABEL_MIN_FONT = 9;
|
|
@@ -103,7 +126,7 @@ import { fontFamilyStringify } from "@d3plus/text";
|
|
|
103
126
|
the circle (`inside: false`), where it reads against the background
|
|
104
127
|
rather than the circle's fill.
|
|
105
128
|
*/ export function ringsCenterLabel(v, center, geom, text, fontFamily) {
|
|
106
|
-
const { primaryRing } = geom;
|
|
129
|
+
const { baseRing: primaryRing } = geom;
|
|
107
130
|
if (!v._size) return {
|
|
108
131
|
bounds: {
|
|
109
132
|
x: -primaryRing / 2,
|
|
@@ -4,6 +4,100 @@
|
|
|
4
4
|
`nodeLookup` + `linkLookup` on `viz.ctx`.
|
|
5
5
|
*/ import { groups } from "d3-array";
|
|
6
6
|
import { chartBounds } from "../features/chartGeometry.js";
|
|
7
|
+
import { makeLinkDatum, publishLinkGraph, setLinkValue } from "../features/linkInteraction.js";
|
|
8
|
+
import { warnConfigOnce } from "../../utils/configWarnings.js";
|
|
9
|
+
import { layOutCircular } from "./circularLayout.js";
|
|
10
|
+
import { sankeyNodeValue } from "./circularLinks.js";
|
|
11
|
+
import { sankeyAcyclicLinks } from "./sankeyCycles.js";
|
|
12
|
+
import { sankeyDrawableLinks, sankeyLoopWarning, unlinkedNodeValue } from "./sankeyLinks.js";
|
|
13
|
+
/** A node as a link end. */ const sankeyLinkEnd = (n)=>({
|
|
14
|
+
data: n.data,
|
|
15
|
+
i: n.i,
|
|
16
|
+
id: String(n.id)
|
|
17
|
+
});
|
|
18
|
+
/** One node per distinct source or target value in `links`, in order. */ function nodesFromLinks(links, endKeys) {
|
|
19
|
+
const ids = new Set();
|
|
20
|
+
for (const d of links)for (const key of endKeys)ids.add(d[key]);
|
|
21
|
+
return Array.from(ids, (id)=>({
|
|
22
|
+
id
|
|
23
|
+
}));
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
The nodes a Sankey without `nodes` draws: one per link end, then each
|
|
27
|
+
data row with an id no link uses, so a node without links still draws.
|
|
28
|
+
*/ function nodesFromLinksAndData(v) {
|
|
29
|
+
const nodes = nodesFromLinks(v.schema.links ?? [], [
|
|
30
|
+
v.schema.linksSource,
|
|
31
|
+
v.schema.linksTarget
|
|
32
|
+
]);
|
|
33
|
+
const ids = new Set(nodes.map((n, i)=>String(v.schema.nodeId(n, i))));
|
|
34
|
+
(v._filteredData ?? []).forEach((d, i)=>{
|
|
35
|
+
const id = v.schema.nodeId(d, i);
|
|
36
|
+
if (id === undefined || id === null || ids.has(String(id))) return;
|
|
37
|
+
ids.add(String(id));
|
|
38
|
+
nodes.push(d);
|
|
39
|
+
});
|
|
40
|
+
return nodes;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
Gives each node no drawn link touches a `fixedValue` (see
|
|
44
|
+
`unlinkedNodeValue`), so it draws with a height like the rest.
|
|
45
|
+
*/ function sizeUnlinkedNodes(v, nodes, links) {
|
|
46
|
+
const linked = new Set(links.flatMap((l)=>[
|
|
47
|
+
l.source,
|
|
48
|
+
l.target
|
|
49
|
+
]));
|
|
50
|
+
const values = links.map((l)=>Number(l.value));
|
|
51
|
+
nodes.forEach((n, i)=>{
|
|
52
|
+
if (linked.has(i)) return;
|
|
53
|
+
let own;
|
|
54
|
+
try {
|
|
55
|
+
own = v.schema.value(n.data, n.i);
|
|
56
|
+
} catch {
|
|
57
|
+
// An accessor written for links may not read a node's row.
|
|
58
|
+
own = undefined;
|
|
59
|
+
}
|
|
60
|
+
n.fixedValue = unlinkedNodeValue(own, values);
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
The links whose ends both name a node (a link from a node to itself
|
|
65
|
+
included), each with its datum and value, in the order given.
|
|
66
|
+
*/ function resolveLinks(v, nodes, nodeLookup, hasLinks) {
|
|
67
|
+
const endKeys = [
|
|
68
|
+
v.schema.linksSource,
|
|
69
|
+
v.schema.linksTarget
|
|
70
|
+
];
|
|
71
|
+
const { drawn, selfLinks } = sankeyDrawableLinks(hasLinks ? v.schema.links.map((link, i)=>({
|
|
72
|
+
link,
|
|
73
|
+
i,
|
|
74
|
+
source: nodeLookup[String(link[endKeys[0]])],
|
|
75
|
+
target: nodeLookup[String(link[endKeys[1]])]
|
|
76
|
+
})) : []);
|
|
77
|
+
return [
|
|
78
|
+
...drawn,
|
|
79
|
+
...selfLinks
|
|
80
|
+
].sort((x, y)=>x.i - y.i).map(({ link, i, source, target })=>{
|
|
81
|
+
const datum = makeLinkDatum(link, sankeyLinkEnd(nodes[source]), sankeyLinkEnd(nodes[target]), i, endKeys);
|
|
82
|
+
const value = setLinkValue(datum, v.schema.value(datum, i));
|
|
83
|
+
return {
|
|
84
|
+
source: source,
|
|
85
|
+
target: target,
|
|
86
|
+
value,
|
|
87
|
+
datum,
|
|
88
|
+
i
|
|
89
|
+
};
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
/** Each node's neighbors, by the links between them. */ function linkLookupOf(links) {
|
|
93
|
+
return links.reduce((obj, d)=>{
|
|
94
|
+
if (!obj[d.source]) obj[d.source] = [];
|
|
95
|
+
obj[d.source].push(d.target);
|
|
96
|
+
if (!obj[d.target]) obj[d.target] = [];
|
|
97
|
+
obj[d.target].push(d.source);
|
|
98
|
+
return obj;
|
|
99
|
+
}, {});
|
|
100
|
+
}
|
|
7
101
|
export const applySankeyLayout = ({ viz })=>{
|
|
8
102
|
const v = viz;
|
|
9
103
|
const { width, height } = chartBounds(v);
|
|
@@ -16,28 +110,7 @@ export const applySankeyLayout = ({ viz })=>{
|
|
|
16
110
|
viz
|
|
17
111
|
};
|
|
18
112
|
}
|
|
19
|
-
|
|
20
|
-
if (hasNodes) {
|
|
21
|
-
_nodes = v.schema.nodes;
|
|
22
|
-
} else {
|
|
23
|
-
const seen = new Set();
|
|
24
|
-
const ids = [];
|
|
25
|
-
for (const d of v.schema.links){
|
|
26
|
-
const src = d[v.schema.linksSource];
|
|
27
|
-
if (!seen.has(src)) {
|
|
28
|
-
seen.add(src);
|
|
29
|
-
ids.push(src);
|
|
30
|
-
}
|
|
31
|
-
const tgt = d[v.schema.linksTarget];
|
|
32
|
-
if (!seen.has(tgt)) {
|
|
33
|
-
seen.add(tgt);
|
|
34
|
-
ids.push(tgt);
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
_nodes = ids.map((id)=>({
|
|
38
|
-
id
|
|
39
|
-
}));
|
|
40
|
-
}
|
|
113
|
+
const _nodes = hasNodes ? v.schema.nodes : nodesFromLinksAndData(v);
|
|
41
114
|
const nodes = _nodes.map((n, i)=>({
|
|
42
115
|
__d3plus__: true,
|
|
43
116
|
data: n,
|
|
@@ -51,27 +124,45 @@ export const applySankeyLayout = ({ viz })=>{
|
|
|
51
124
|
return obj;
|
|
52
125
|
}, {});
|
|
53
126
|
v.ctx.nodeLookup = nodeLookup;
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
127
|
+
const resolved = resolveLinks(v, nodes, nodeLookup, hasLinks);
|
|
128
|
+
const { kept: links, looped } = sankeyAcyclicLinks(resolved);
|
|
129
|
+
const circularOn = v.schema.circularLinks !== false;
|
|
130
|
+
if (!circularOn && looped.length) warnConfigOnce(v, "sankeyLoops", sankeyLoopWarning(looped.map((l)=>[
|
|
131
|
+
nodes[l.source].id,
|
|
132
|
+
nodes[l.target].id
|
|
133
|
+
])));
|
|
134
|
+
const circular = circularOn ? looped : [];
|
|
135
|
+
const shown = circular.length ? [
|
|
136
|
+
...links,
|
|
137
|
+
...circular
|
|
138
|
+
].sort((x, y)=>x.i - y.i) : links;
|
|
139
|
+
publishLinkGraph(v, shown.map((l)=>l.datum), nodes.map(sankeyLinkEnd));
|
|
140
|
+
sizeUnlinkedNodes(v, nodes, shown);
|
|
141
|
+
// A node a circular link touches is sized by its returning flow too.
|
|
142
|
+
for (const i of new Set(circular.flatMap((l)=>[
|
|
143
|
+
l.source,
|
|
144
|
+
l.target
|
|
145
|
+
])))nodes[i].fixedValue = sankeyNodeValue(i, shown);
|
|
146
|
+
v.ctx.linkLookup = linkLookupOf(shown);
|
|
147
|
+
const layout = v.ctx.sankey.nodeAlign(v.schema.nodeAlign).nodePadding(v.schema.nodePadding).nodeWidth(v.schema.nodeWidth).nodes(nodes).nodeSort(v.schema.nodeSort).links(links).linkSort(v.schema.linkSort).iterations(v.schema.iterations);
|
|
148
|
+
const laid = layOutCircular({
|
|
149
|
+
run: (extent)=>layout.extent(extent)(),
|
|
150
|
+
nodes: nodes,
|
|
151
|
+
links: links,
|
|
152
|
+
circular,
|
|
67
153
|
width,
|
|
68
|
-
height
|
|
69
|
-
|
|
154
|
+
height,
|
|
155
|
+
padding: v.schema.nodePadding
|
|
156
|
+
});
|
|
70
157
|
const nodeGroups = Array.from(groups(nodes, (d)=>d.shape));
|
|
71
158
|
v.ctx.sankeyCtx = {
|
|
72
|
-
links
|
|
159
|
+
links: [
|
|
160
|
+
...links,
|
|
161
|
+
...laid
|
|
162
|
+
],
|
|
73
163
|
nodeGroups,
|
|
74
|
-
|
|
164
|
+
width,
|
|
165
|
+
height
|
|
75
166
|
};
|
|
76
167
|
return {
|
|
77
168
|
shapeData: nodes
|