@d3plus/core 4.9.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 +170 -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 +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 +95 -4
- package/es/src/charts/BoxWhisker/outliers.js +68 -0
- package/es/src/charts/BoxWhisker/summary.js +83 -0
- package/es/src/charts/BoxWhisker/tooltip.js +122 -0
- package/es/src/charts/BubbleChart/emit.js +31 -0
- package/es/src/charts/BubbleChart/index.js +54 -0
- package/es/src/charts/Bullet/index.js +2 -1
- package/es/src/charts/BumpChart/index.js +5 -0
- package/es/src/charts/Calendar/emit.js +1 -1
- package/es/src/charts/Calendar/index.js +5 -3
- package/es/src/charts/Candlestick/aggregate.js +11 -1
- package/es/src/charts/Candlestick/buffer.js +6 -4
- package/es/src/charts/Candlestick/index.js +7 -6
- 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 +17 -12
- 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/Funnel/index.js +2 -1
- 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/Gauge/index.js +2 -1
- 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 +60 -19
- 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 +37 -16
- 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/Matrix/index.js +3 -2
- 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 +93 -108
- 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 +7 -2
- 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 +66 -32
- 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/axisHover.js +180 -0
- package/es/src/charts/Plot/axisHoverAnchors.js +174 -0
- package/es/src/charts/Plot/axisHoverScene.js +203 -0
- package/es/src/charts/Plot/axisValues.js +43 -0
- package/es/src/charts/Plot/barHitArea.js +81 -0
- package/es/src/charts/Plot/barLabelFit.js +123 -0
- package/es/src/charts/Plot/barWidth.js +61 -13
- package/es/src/charts/Plot/circleLabels.js +98 -0
- package/es/src/charts/Plot/confidenceConfig.js +2 -2
- 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 +14 -4
- 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 +42 -15
- package/es/src/charts/Plot/labelPlacement.js +10 -2
- 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/openDomainEnds.js +2 -5
- package/es/src/charts/Plot/pipeline.js +71 -22
- package/es/src/charts/Plot/pipelineAxisLayout.js +42 -8
- package/es/src/charts/Plot/pipelineDomains.js +23 -6
- package/es/src/charts/Plot/pipelineLineLabels.js +145 -53
- 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 +49 -5
- package/es/src/charts/Plot/plotRangeBreaks.js +85 -0
- package/es/src/charts/Plot/plotZoom.js +15 -6
- package/es/src/charts/Plot/referenceDomains.js +133 -0
- package/es/src/charts/Plot/shapeDefaults.js +14 -9
- package/es/src/charts/Plot/sharedHoverScene.js +50 -31
- package/es/src/charts/Plot/sharedTooltip.js +19 -7
- package/es/src/charts/Plot/stackHelpers.js +13 -1
- package/es/src/charts/Plot/stackLegendOrder.js +176 -0
- package/es/src/charts/Plot/stackShareTooltip.js +9 -4
- package/es/src/charts/Plot/stackThreshold.js +154 -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 +5 -4
- package/es/src/charts/Priestley/applyLayout.js +14 -20
- package/es/src/charts/Priestley/index.js +4 -34
- package/es/src/charts/Priestley/timeAxis.js +100 -0
- package/es/src/charts/Pyramid/index.js +4 -2
- 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 +5 -5
- 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 +18 -10
- package/es/src/charts/RadialBar/trackLayout.js +43 -13
- package/es/src/charts/RadialMatrix/index.js +6 -9
- 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 +65 -30
- 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 +75 -77
- 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/applyLayout.js +14 -1
- package/es/src/charts/Treemap/emit.js +8 -2
- package/es/src/charts/Treemap/emitGroupHeaders.js +104 -0
- package/es/src/charts/Treemap/groupHeaders.js +95 -0
- package/es/src/charts/Treemap/index.js +17 -7
- package/es/src/charts/Treemap/thresholdFunction.js +11 -9
- package/es/src/charts/Violin/inner.js +3 -5
- package/es/src/charts/Waffle/index.js +4 -2
- package/es/src/charts/Waffle/tooltip.js +6 -2
- package/es/src/charts/Waterfall/index.js +4 -2
- package/es/src/charts/definition/makeChart.js +20 -5
- 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/saveChart.js +176 -0
- package/es/src/charts/drawSteps/saveControl.js +148 -0
- package/es/src/charts/drawSteps/saveControlMarkup.js +104 -0
- 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 +18 -11
- package/es/src/charts/drawSteps/topLeftControls.js +3 -1
- package/es/src/charts/drawSteps/topLeftControlsMarkup.js +1 -1
- 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 +38 -2
- package/es/src/charts/events/mouseenter.js +9 -0
- package/es/src/charts/events/mousemove.legend.js +3 -0
- package/es/src/charts/events/mousemove.shape.js +12 -4
- package/es/src/charts/facet/drawFacets.js +14 -5
- package/es/src/charts/facet/facetConfig.js +2 -2
- package/es/src/charts/facet/facetData.js +2 -2
- 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 +9 -7
- package/es/src/charts/features/axesFinal.js +26 -4
- package/es/src/charts/features/axesMeasure.js +61 -6
- 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 +19 -1
- package/es/src/charts/features/colorScaleHover.js +70 -0
- 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 +45 -15
- package/es/src/charts/features/featuresColorScale.js +62 -8
- package/es/src/charts/features/featuresLegend.js +21 -32
- 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 +42 -15
- 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 +67 -30
- package/es/src/charts/features/shareKey.js +15 -0
- package/es/src/charts/features/sharedFields.js +15 -2
- package/es/src/charts/features/textHalo.js +29 -0
- package/es/src/charts/features/thresholdMembers.js +71 -0
- package/es/src/charts/helpers/densityChart.js +3 -1
- package/es/src/charts/helpers/valueTitle.js +6 -3
- package/es/src/charts/index.js +8 -0
- package/es/src/charts/partition/chartFields.js +6 -5
- package/es/src/charts/partition/hierarchy.js +2 -0
- 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 +77 -13
- package/es/src/charts/pipeline/runVizPipeline.js +5 -0
- package/es/src/charts/pipeline/vizDraw.js +40 -29
- package/es/src/charts/pipeline/vizPreDraw.js +29 -18
- 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 +82 -44
- package/es/src/charts/viz/VizBase.js +47 -19
- package/es/src/charts/viz/backgroundInk.js +13 -7
- package/es/src/charts/viz/dataPoller.js +52 -0
- package/es/src/charts/viz/focusRing.js +104 -0
- package/es/src/charts/viz/focusTargets.js +208 -0
- package/es/src/charts/viz/groupRow.js +35 -0
- package/es/src/charts/viz/history.js +74 -0
- package/es/src/charts/viz/interactionOpacity.js +19 -5
- 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 +123 -0
- 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/reportHandlerError.js +10 -0
- package/es/src/charts/viz/shapeClassTargets.js +18 -2
- package/es/src/charts/viz/simpleHover.js +2 -0
- package/es/src/charts/viz/vizClassName.js +31 -0
- package/es/src/charts/viz/vizDataPolling.js +172 -0
- package/es/src/charts/viz/vizDefaults.js +81 -23
- package/es/src/charts/viz/vizFields.js +53 -2
- package/es/src/charts/viz/vizRender.js +49 -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 +34 -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 +8 -10
- package/es/src/components/Axis/axisLabelAngle.js +175 -0
- package/es/src/components/Axis/axisLabelThinning.js +13 -4
- package/es/src/components/Axis/axisLayout.js +86 -19
- package/es/src/components/Axis/axisLayoutLabels.js +66 -13
- package/es/src/components/Axis/axisLayoutScale.js +10 -1
- package/es/src/components/Axis/axisRangeBreaks.js +77 -0
- package/es/src/components/Axis/axisRender.js +38 -9
- package/es/src/components/Axis/axisRounding.js +15 -4
- package/es/src/components/Axis/axisSlantWrap.js +39 -0
- package/es/src/components/Axis/brokenTimeScale.js +196 -0
- package/es/src/components/Axis/powTicks.js +73 -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 +42 -36
- package/es/src/components/ColorScale/bucketBounds.js +64 -0
- package/es/src/components/ColorScale/colorScaleHoverMark.js +327 -0
- package/es/src/components/ColorScale/colorScaleRender.js +25 -1
- package/es/src/components/ColorScale/colorScaleScale.js +43 -24
- package/es/src/components/ColorScale/colorScaleType.js +26 -0
- 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 +31 -65
- package/es/src/components/Timeline/Timeline.js +54 -54
- package/es/src/components/Timeline/brushSpan.js +78 -0
- package/es/src/components/Timeline/timelineConfig.js +27 -10
- package/es/src/components/Timeline/timelineMode.js +26 -0
- package/es/src/components/Timeline/timelineRender.js +51 -9
- package/es/src/components/Tooltip.js +28 -13
- 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 +67 -79
- 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/shapes/boxOutlierShape.js +19 -0
- package/es/src/shapes/boxStats.js +35 -0
- package/es/src/shapes/boxStyle.js +78 -0
- package/es/src/shapes/boxSummary.js +174 -0
- package/es/src/shapes/shapeStandalone.js +2 -0
- package/es/src/utils/BaseClass.js +44 -12
- package/es/src/utils/className.js +78 -0
- package/es/src/utils/configPrep.js +2 -1
- package/es/src/utils/configWarnings.js +25 -0
- package/es/src/utils/constant.js +13 -1
- package/es/src/utils/displayName.js +12 -0
- package/es/src/utils/fieldAccessor.js +31 -0
- package/es/src/utils/paintComponentScene.js +2 -0
- package/es/src/utils/theme.js +190 -0
- package/es/src/utils/themeInk.js +68 -0
- package/package.json +14 -10
- package/types/index.d.ts +8 -2
- package/types/internal.d.ts +253 -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 +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/BoxWhisker/index.d.ts +3 -1
- package/types/src/charts/BoxWhisker/outliers.d.ts +25 -0
- package/types/src/charts/BoxWhisker/summary.d.ts +39 -0
- package/types/src/charts/BoxWhisker/tooltip.d.ts +36 -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/Candlestick/aggregate.d.ts +6 -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/axisHover.d.ts +68 -0
- package/types/src/charts/Plot/axisHoverAnchors.d.ts +88 -0
- package/types/src/charts/Plot/axisHoverScene.d.ts +88 -0
- package/types/src/charts/Plot/axisValues.d.ts +24 -0
- package/types/src/charts/Plot/barHitArea.d.ts +59 -0
- package/types/src/charts/Plot/barLabelFit.d.ts +81 -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 +28 -8
- package/types/src/charts/Plot/labelPlacement.d.ts +5 -0
- 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 +23 -2
- package/types/src/charts/Plot/plotRangeBreaks.d.ts +35 -0
- package/types/src/charts/Plot/plotZoom.d.ts +2 -0
- package/types/src/charts/Plot/referenceDomains.d.ts +49 -0
- package/types/src/charts/Plot/sharedHoverScene.d.ts +3 -3
- package/types/src/charts/Plot/sharedTooltip.d.ts +11 -4
- package/types/src/charts/Plot/stackHelpers.d.ts +5 -0
- package/types/src/charts/Plot/stackLegendOrder.d.ts +83 -0
- package/types/src/charts/Plot/stackThreshold.d.ts +75 -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/Treemap/emit.d.ts +2 -1
- package/types/src/charts/Treemap/emitGroupHeaders.d.ts +16 -0
- package/types/src/charts/Treemap/groupHeaders.d.ts +91 -0
- package/types/src/charts/Treemap/index.d.ts +2 -0
- package/types/src/charts/Treemap/thresholdFunction.d.ts +5 -2
- package/types/src/charts/definition/ChartDefinition.d.ts +27 -2
- package/types/src/charts/definition/makeChart.d.ts +5 -3
- 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/saveChart.d.ts +47 -0
- package/types/src/charts/drawSteps/saveControl.d.ts +9 -0
- package/types/src/charts/drawSteps/saveControlMarkup.d.ts +44 -0
- package/types/src/charts/drawSteps/tableViewMarkup.d.ts +4 -1
- package/types/src/charts/drawSteps/topLeftControls.d.ts +1 -1
- package/types/src/charts/drawSteps/topLeftControlsMarkup.d.ts +1 -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/facet/facetData.d.ts +1 -1
- 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 +13 -1
- 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/colorScaleBucket.d.ts +9 -0
- package/types/src/charts/features/colorScaleHover.d.ts +32 -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/features.d.ts +8 -0
- 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 +19 -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 +5 -1
- package/types/src/charts/features/shareKey.d.ts +9 -0
- package/types/src/charts/features/sharedFields.d.ts +11 -2
- package/types/src/charts/features/textHalo.d.ts +14 -0
- package/types/src/charts/features/thresholdMembers.d.ts +38 -0
- package/types/src/charts/helpers/valueTitle.d.ts +4 -2
- 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 +9 -0
- package/types/src/charts/pipeline/vizDraw.d.ts +8 -3
- package/types/src/charts/pipeline/vizPreDraw.d.ts +3 -2
- package/types/src/charts/plotBuffers/discreteBuffer.d.ts +0 -5
- package/types/src/charts/viz/Viz.d.ts +44 -6
- package/types/src/charts/viz/VizBase.d.ts +16 -7
- package/types/src/charts/viz/backgroundInk.d.ts +11 -4
- package/types/src/charts/viz/dataPoller.d.ts +28 -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/groupRow.d.ts +24 -0
- package/types/src/charts/viz/history.d.ts +35 -0
- package/types/src/charts/viz/interactionOpacity.d.ts +3 -1
- 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/missingFields.d.ts +57 -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/reportHandlerError.d.ts +7 -0
- package/types/src/charts/viz/shapeClassTargets.d.ts +6 -0
- package/types/src/charts/viz/simpleHover.d.ts +2 -1
- package/types/src/charts/viz/vizClassName.d.ts +23 -0
- package/types/src/charts/viz/vizDataPolling.d.ts +48 -0
- package/types/src/charts/viz/vizDefaults.d.ts +49 -9
- package/types/src/charts/viz/vizFields.d.ts +47 -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 +117 -8
- package/types/src/charts/viz/vizVisibility.d.ts +6 -0
- package/types/src/components/Axis/Axis.d.ts +37 -8
- 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/axisLabelAngle.d.ts +110 -0
- package/types/src/components/Axis/axisLabelThinning.d.ts +3 -7
- package/types/src/components/Axis/axisLayout.d.ts +5 -0
- package/types/src/components/Axis/axisLayoutLabels.d.ts +13 -0
- package/types/src/components/Axis/axisRangeBreaks.d.ts +25 -0
- package/types/src/components/Axis/axisRounding.d.ts +6 -3
- package/types/src/components/Axis/axisSlantWrap.d.ts +22 -0
- package/types/src/components/Axis/brokenTimeScale.d.ts +51 -0
- package/types/src/components/Axis/powTicks.d.ts +29 -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 +14 -0
- package/types/src/components/ColorScale/bucketBounds.d.ts +28 -0
- package/types/src/components/ColorScale/colorScaleHoverMark.d.ts +86 -0
- package/types/src/components/ColorScale/colorScaleScale.d.ts +3 -0
- package/types/src/components/ColorScale/colorScaleType.d.ts +17 -0
- 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/brushSpan.d.ts +41 -0
- package/types/src/components/Timeline/timelineConfig.d.ts +11 -0
- package/types/src/components/Timeline/timelineMode.d.ts +17 -0
- package/types/src/components/Timeline/timelineRender.d.ts +8 -0
- package/types/src/components/Tooltip.d.ts +12 -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 +2 -8
- 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/boxOutlierShape.d.ts +9 -0
- package/types/src/shapes/boxStats.d.ts +19 -0
- package/types/src/shapes/boxStyle.d.ts +25 -0
- package/types/src/shapes/boxSummary.d.ts +66 -0
- package/types/src/shapes/emitLabels.d.ts +1 -1
- package/types/src/shapes/shapeConfig.d.ts +42 -4
- package/types/src/utils/BaseClass.d.ts +32 -0
- package/types/src/utils/D3Scale.d.ts +3 -0
- package/types/src/utils/D3plusConfig.d.ts +1240 -33
- package/types/src/utils/className.d.ts +64 -0
- package/types/src/utils/configPrep.d.ts +2 -0
- package/types/src/utils/configWarnings.d.ts +21 -2
- package/types/src/utils/constant.d.ts +8 -0
- package/types/src/utils/displayName.d.ts +10 -0
- package/types/src/utils/fieldAccessor.d.ts +24 -0
- package/types/src/utils/index.d.ts +1 -1
- package/types/src/utils/paintComponentScene.d.ts +3 -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 +87388 -56271
- package/umd/d3plus-core.full.min.js +2 -2
- package/umd/d3plus-core.js +37988 -11768
- 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
|
@@ -8,13 +8,10 @@ import { facetKey, toFacetValue } from "../facet/facetData.js";
|
|
|
8
8
|
import { makeChart } from "../definition/makeChart.js";
|
|
9
9
|
import { computeTimeFilter } from "../pipeline/preDrawData.js";
|
|
10
10
|
import Plot from "../Plot/index.js";
|
|
11
|
+
import { fieldAccessor } from "../../utils/fieldAccessor.js";
|
|
11
12
|
import { autoTitle, keyedAccessor, valueKeyOf } from "../helpers/valueTitle.js";
|
|
12
|
-
import binData from "./binData.js";
|
|
13
|
-
|
|
14
|
-
count: "Count",
|
|
15
|
-
density: "Density",
|
|
16
|
-
relative: "Relative Frequency"
|
|
17
|
-
};
|
|
13
|
+
import binData, { cumulativeNormalize } from "./binData.js";
|
|
14
|
+
import { heightLabel } from "./labels.js";
|
|
18
15
|
/** Walks Plot's `__d3plus__` wrappers down to the bin row. */ function binRow(d) {
|
|
19
16
|
while(d && d.__d3plus__ && d.data)d = d.data;
|
|
20
17
|
return d;
|
|
@@ -41,6 +38,7 @@ const yTitles = {
|
|
|
41
38
|
*/ function binBeforePreDraw(viz) {
|
|
42
39
|
const state = viz.ctx.histogram;
|
|
43
40
|
if (viz._data !== state.bins) state.raw = viz._data;
|
|
41
|
+
viz._sourceData = state.raw;
|
|
44
42
|
const timeFilter = drawnTimeFilter(viz, state.raw);
|
|
45
43
|
const filter = viz.schema.filter;
|
|
46
44
|
const period = timeFilter ? state.raw.filter(timeFilter) : state.raw;
|
|
@@ -56,7 +54,8 @@ const yTitles = {
|
|
|
56
54
|
thresholds: viz.schema.binThresholds,
|
|
57
55
|
domain: viz.schema.binDomain,
|
|
58
56
|
width: viz.schema.binWidth,
|
|
59
|
-
normalize: viz.schema.binNormalize
|
|
57
|
+
normalize: viz.schema.binNormalize,
|
|
58
|
+
cumulative: viz.schema.cumulative
|
|
60
59
|
});
|
|
61
60
|
// Ungrouped observations become one series named after the value, so it
|
|
62
61
|
// colors and labels like any other series.
|
|
@@ -74,7 +73,7 @@ const yTitles = {
|
|
|
74
73
|
...offstage
|
|
75
74
|
] : bins;
|
|
76
75
|
state.binned = new Set(bins);
|
|
77
|
-
const yTitle = viz.schema.translate(
|
|
76
|
+
const yTitle = viz.schema.translate(heightLabel(viz.schema.binNormalize, viz.schema.cumulative));
|
|
78
77
|
autoTitle(viz._yConfig, state.yTitle, yTitle);
|
|
79
78
|
state.yTitle = yTitle;
|
|
80
79
|
autoTitle(viz._xConfig, state.xTitle, valueKey);
|
|
@@ -83,6 +82,8 @@ const yTitles = {
|
|
|
83
82
|
export const histogramDef = {
|
|
84
83
|
name: "Histogram",
|
|
85
84
|
paintDriven: true,
|
|
85
|
+
// Its stacks are bins, not series, so `threshold` folds nothing.
|
|
86
|
+
thresholdFunction: (_viz, data)=>data,
|
|
86
87
|
defaults: {
|
|
87
88
|
groupPadding: 1
|
|
88
89
|
},
|
|
@@ -168,6 +169,19 @@ export const histogramDef = {
|
|
|
168
169
|
key: "binNormalize",
|
|
169
170
|
default: "count"
|
|
170
171
|
},
|
|
172
|
+
/**
|
|
173
|
+
Accumulates each bar's height across the bins: `true` shows, at each
|
|
174
|
+
bin, everything up to that bin's end (a running count, or with
|
|
175
|
+
`binNormalize("relative")` an empirical CDF that ends at 1), and
|
|
176
|
+
`"reverse"` everything from that bin's start up (a survival curve).
|
|
177
|
+
A cumulative `"density"` is the running share of observations, so it
|
|
178
|
+
draws like `"relative"`. Each `groupBy` series accumulates its own
|
|
179
|
+
counts, so stacked bars show the running total of every series.
|
|
180
|
+
@type {boolean | "reverse"}
|
|
181
|
+
*/ {
|
|
182
|
+
key: "cumulative",
|
|
183
|
+
default: false
|
|
184
|
+
},
|
|
171
185
|
{
|
|
172
186
|
key: "discrete",
|
|
173
187
|
default: "x"
|
|
@@ -195,24 +209,30 @@ export const histogramDef = {
|
|
|
195
209
|
title: (d, i)=>hasGroups(d, i) ? viz._drawLabel(binRow(d), i) : range(d),
|
|
196
210
|
tbody: (d, i)=>{
|
|
197
211
|
const b = binRow(d);
|
|
212
|
+
const t = viz.schema.translate;
|
|
198
213
|
const rows = [];
|
|
199
214
|
if (isSeries(b)) return [
|
|
200
215
|
[
|
|
201
|
-
|
|
216
|
+
t("Count"),
|
|
202
217
|
fmt(b.count)
|
|
203
218
|
]
|
|
204
219
|
];
|
|
205
220
|
if (hasGroups(d, i)) rows.push([
|
|
206
|
-
|
|
221
|
+
t("Range"),
|
|
207
222
|
range(d)
|
|
208
223
|
]);
|
|
209
224
|
rows.push([
|
|
210
|
-
|
|
225
|
+
t("Count"),
|
|
211
226
|
fmt(b.count)
|
|
212
227
|
]);
|
|
228
|
+
const cumulative = viz.schema.cumulative;
|
|
229
|
+
if (cumulative) rows.push([
|
|
230
|
+
t("Cumulative Count"),
|
|
231
|
+
fmt(Number(b.cumulativeCount))
|
|
232
|
+
]);
|
|
213
233
|
const normalize = viz.schema.binNormalize;
|
|
214
|
-
if (normalize !== "count") rows.push([
|
|
215
|
-
|
|
234
|
+
if (cumulativeNormalize(normalize, cumulative) !== "count") rows.push([
|
|
235
|
+
t(heightLabel(normalize, cumulative)),
|
|
216
236
|
fmt(b.y)
|
|
217
237
|
]);
|
|
218
238
|
return rows;
|
|
@@ -226,13 +246,14 @@ export const histogramDef = {
|
|
|
226
246
|
*/ {
|
|
227
247
|
key: "value",
|
|
228
248
|
default: keyedAccessor("value"),
|
|
229
|
-
coerce: (v)=>typeof v === "string" ?
|
|
249
|
+
coerce: (v)=>typeof v === "string" ? fieldAccessor(v) : typeof v === "function" ? v : constant(v)
|
|
230
250
|
}
|
|
231
251
|
]
|
|
232
252
|
};
|
|
233
253
|
/**
|
|
234
254
|
Creates a histogram from an array of raw observations: the `value` of each
|
|
235
255
|
row is binned along a linear x axis, and bar heights show each bin's
|
|
236
|
-
count (or density / relative frequency via `binNormalize
|
|
237
|
-
`groupBy` share bin edges and are
|
|
256
|
+
count (or density / relative frequency via `binNormalize`, and running
|
|
257
|
+
totals via `cumulative`). Series set by `groupBy` share bin edges and are
|
|
258
|
+
stacked.
|
|
238
259
|
*/ export default makeChart(histogramDef, Plot);
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/** The English labels Histogram translates for its y axis and tooltip rows. */ import { cumulativeNormalize } from "./binData.js";
|
|
2
|
+
const labels = {
|
|
3
|
+
count: "Count",
|
|
4
|
+
density: "Density",
|
|
5
|
+
relative: "Relative Frequency"
|
|
6
|
+
};
|
|
7
|
+
const cumulativeLabels = {
|
|
8
|
+
count: "Cumulative Count",
|
|
9
|
+
density: "Cumulative Relative Frequency",
|
|
10
|
+
relative: "Cumulative Relative Frequency"
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
The (untranslated) label for what a bar's height measures under
|
|
14
|
+
`binNormalize` and `cumulative`, used as the default y-axis title.
|
|
15
|
+
*/ export function heightLabel(normalize = "count", cumulative = false) {
|
|
16
|
+
const n = cumulativeNormalize(labels[normalize] ? normalize : "count", cumulative);
|
|
17
|
+
return (cumulative ? cumulativeLabels : labels)[n];
|
|
18
|
+
}
|
|
@@ -12,8 +12,7 @@
|
|
|
12
12
|
- `enterStagger.ts` — where and when entering rectangles grow in.
|
|
13
13
|
- `interaction.ts` — the zoom origin and node lookup for the shared
|
|
14
14
|
partition interaction.
|
|
15
|
-
*/ import
|
|
16
|
-
import accessor from "../../utils/accessor.js";
|
|
15
|
+
*/ import accessor from "../../utils/accessor.js";
|
|
17
16
|
import { makeChart } from "../definition/makeChart.js";
|
|
18
17
|
import { rowLegend, shareRow } from "../features/sharedFields.js";
|
|
19
18
|
import { partitionDefaultSort, partitionLegendSort, partitionSetup, partitionSortDecorate, partitionSumCoerce, partitionSumOnSet, partitionThreshold } from "../partition/chartFields.js";
|
|
@@ -21,6 +20,7 @@ import { partitionShadeDefaults } from "../partition/shade.js";
|
|
|
21
20
|
import { applyIcicleLayout } from "./applyLayout.js";
|
|
22
21
|
import { icicleEmit } from "./emit.js";
|
|
23
22
|
import { icicleInteraction } from "./interaction.js";
|
|
23
|
+
import { chartBackground } from "../viz/backgroundInk.js";
|
|
24
24
|
export const icicleDef = {
|
|
25
25
|
name: "Icicle",
|
|
26
26
|
layoutStage: applyIcicleLayout,
|
|
@@ -91,7 +91,7 @@ export const icicleDef = {
|
|
|
91
91
|
},
|
|
92
92
|
// A thin outline in the chart's background color separates
|
|
93
93
|
// neighboring rectangles and levels by the same width everywhere.
|
|
94
|
-
stroke: ()=>
|
|
94
|
+
stroke: ()=>chartBackground(viz),
|
|
95
95
|
strokeWidth: 1
|
|
96
96
|
})
|
|
97
97
|
},
|
|
@@ -12,6 +12,13 @@ export const linePlotDef = {
|
|
|
12
12
|
key: "discrete",
|
|
13
13
|
default: "x"
|
|
14
14
|
},
|
|
15
|
+
/**
|
|
16
|
+
LinePlot names each series along its own line by default (see
|
|
17
|
+
`lineLabels`), and its legend hides when every line got a name.
|
|
18
|
+
*/ {
|
|
19
|
+
key: "lineLabels",
|
|
20
|
+
default: "along"
|
|
21
|
+
},
|
|
15
22
|
{
|
|
16
23
|
key: "shape",
|
|
17
24
|
default: constant("Line"),
|
|
@@ -47,13 +47,15 @@ export const marimekkoDef = {
|
|
|
47
47
|
factory: barTotal
|
|
48
48
|
},
|
|
49
49
|
/**
|
|
50
|
-
Marimekko shows the shares by default ("
|
|
51
|
-
|
|
50
|
+
Marimekko shows the shares above the bars by default (`"opposite"`),
|
|
51
|
+
leaving the names alone beneath them; `true` puts each share
|
|
52
|
+
beneath its name ("Retail" over "50%"), and `false` shows the name
|
|
53
|
+
alone. The tooltip always shows the share. In small
|
|
52
54
|
multiples (`facet`), each panel's shares add to 100%, even when
|
|
53
55
|
shared scales (the default) draw a smaller panel narrower.
|
|
54
56
|
*/ {
|
|
55
57
|
key: "barWidthShare",
|
|
56
|
-
default:
|
|
58
|
+
default: "opposite"
|
|
57
59
|
},
|
|
58
60
|
{
|
|
59
61
|
key: "stacked",
|
|
@@ -70,7 +72,8 @@ export const marimekkoDef = {
|
|
|
70
72
|
Creates a Marimekko (mosaic) chart from an array of data: one bar per
|
|
71
73
|
discrete value (`x`), as wide as its `barWidth` (by default its total),
|
|
72
74
|
with the bar's `groupBy` segments stacked to 100% of its height. Each
|
|
73
|
-
category
|
|
75
|
+
category is named beneath its bar, with the bar's share of the total
|
|
76
|
+
width above it (see `barWidthShare`), and tooltips
|
|
74
77
|
show each segment's value, its share of the bar, and the bar's width and
|
|
75
78
|
share of the total width. Set `stackOffset("none")` to stack absolute
|
|
76
79
|
values instead.
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
- `applyLayout.ts` — `TransformStage` that runs the row+column axes.
|
|
6
6
|
- `emit.ts` — Rect cells positioned by the stashed scales.
|
|
7
7
|
*/ import accessor from "../../utils/accessor.js";
|
|
8
|
+
import { fieldAccessor } from "../../utils/fieldAccessor.js";
|
|
8
9
|
import { Axis } from "../../components/index.js";
|
|
9
10
|
import { colorScaleBucketOf } from "../features/colorScaleBucket.js";
|
|
10
11
|
import { getProp } from "../../utils/index.js";
|
|
@@ -68,7 +69,7 @@ export const matrixDef = {
|
|
|
68
69
|
*/ {
|
|
69
70
|
key: "column",
|
|
70
71
|
default: accessor("column"),
|
|
71
|
-
coerce: (v)=>typeof v === "function" ? v :
|
|
72
|
+
coerce: (v)=>typeof v === "function" ? v : fieldAccessor(v)
|
|
72
73
|
},
|
|
73
74
|
/**
|
|
74
75
|
The row each data point falls in: a key present in every data point,
|
|
@@ -78,7 +79,7 @@ export const matrixDef = {
|
|
|
78
79
|
*/ {
|
|
79
80
|
key: "row",
|
|
80
81
|
default: accessor("row"),
|
|
81
|
-
coerce: (v)=>typeof v === "function" ? v :
|
|
82
|
+
coerce: (v)=>typeof v === "function" ? v : fieldAccessor(v)
|
|
82
83
|
},
|
|
83
84
|
/**
|
|
84
85
|
A manual list of column values to draw, in place of the unique
|
|
@@ -5,73 +5,22 @@
|
|
|
5
5
|
d3-force simulation only when fx/fy coords are missing), normalizes
|
|
6
6
|
link stroke sizes, and stashes `networkCtx` + node/link lookups on
|
|
7
7
|
`viz.ctx` for the click/hover handlers installed by `setup`.
|
|
8
|
-
*/ import { extent, max, min,
|
|
8
|
+
*/ import { extent, max, min, groups } from "d3-array";
|
|
9
9
|
import { forceLink, forceManyBody, forceSimulation } from "d3-force";
|
|
10
10
|
import { polygonHull } from "d3-polygon";
|
|
11
11
|
import * as scales from "d3-scale";
|
|
12
|
-
import { largestRect,
|
|
12
|
+
import { largestRect, pointRotate } from "@d3plus/math";
|
|
13
13
|
import { chartBounds } from "../features/chartGeometry.js";
|
|
14
14
|
import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
let rawNodes = v.schema.nodes.reduce((obj, d, i)=>{
|
|
25
|
-
obj[nodeId(d, i)] = d;
|
|
26
|
-
return obj;
|
|
27
|
-
}, {});
|
|
28
|
-
const nodes = Array.from(new Set(Object.keys(data).concat(Object.keys(rawNodes)))).map((id, i)=>{
|
|
29
|
-
const d = data[id];
|
|
30
|
-
const n = rawNodes[id];
|
|
31
|
-
if (n === undefined) return false;
|
|
32
|
-
const pickFrom = (accessor, validate = (vv)=>vv !== undefined)=>d !== undefined && validate(accessor(d)) ? accessor(d) : accessor(n);
|
|
33
|
-
return {
|
|
34
|
-
__d3plus__: true,
|
|
35
|
-
data: d || n,
|
|
36
|
-
i,
|
|
37
|
-
id,
|
|
38
|
-
fx: pickFrom(v._x, (val)=>!isNaN(val)),
|
|
39
|
-
fy: pickFrom(v._y, (val)=>!isNaN(val)),
|
|
40
|
-
node: n,
|
|
41
|
-
r: v._size ? pickFrom(v._size) : v.schema.sizeMin,
|
|
42
|
-
shape: pickFrom(v.schema.shape)
|
|
43
|
-
};
|
|
44
|
-
}).filter((n)=>!!n);
|
|
45
|
-
// rawNodes was used above; drop to avoid retention.
|
|
46
|
-
rawNodes = {};
|
|
47
|
-
void rawNodes;
|
|
48
|
-
return nodes;
|
|
49
|
-
}
|
|
50
|
-
/** Resolves schema links against nodes, stashing nodeLookup + linkLookup on ctx. */ function buildNetworkLinks(v, nodes) {
|
|
51
|
-
const nodeLookup = nodes.reduce((obj, d)=>{
|
|
52
|
-
obj[d.id] = d;
|
|
53
|
-
return obj;
|
|
54
|
-
}, {});
|
|
55
|
-
v.ctx.nodeLookup = nodeLookup;
|
|
56
|
-
const nodeByOriginal = new Map();
|
|
57
|
-
for (const n of nodes)nodeByOriginal.set(n.node, n);
|
|
58
|
-
const links = v.schema.links.map((l)=>{
|
|
59
|
-
const referenceType = typeof l.source;
|
|
60
|
-
return {
|
|
61
|
-
size: v.schema.linkSize(l),
|
|
62
|
-
source: referenceType === "number" ? nodeByOriginal.get(v.schema.nodes[l.source]) : referenceType === "string" ? nodeLookup[l.source] : nodeLookup[l.source.id],
|
|
63
|
-
target: referenceType === "number" ? nodeByOriginal.get(v.schema.nodes[l.target]) : referenceType === "string" ? nodeLookup[l.target] : nodeLookup[l.target.id]
|
|
64
|
-
};
|
|
65
|
-
});
|
|
66
|
-
v.ctx.linkLookup = links.reduce((obj, d)=>{
|
|
67
|
-
if (!obj[d.source.id]) obj[d.source.id] = [];
|
|
68
|
-
obj[d.source.id].push(d.target);
|
|
69
|
-
if (!obj[d.target.id]) obj[d.target.id] = [];
|
|
70
|
-
obj[d.target.id].push(d.source);
|
|
71
|
-
return obj;
|
|
72
|
-
}, {});
|
|
73
|
-
return links;
|
|
74
|
-
}
|
|
15
|
+
import { publishLinkGraph } from "../features/linkInteraction.js";
|
|
16
|
+
import { linkWidthRange } from "../features/linkWidths.js";
|
|
17
|
+
import { polylinePath } from "../features/polyline.js";
|
|
18
|
+
import { awayFromAngle, isSelfLoop, layoutSelfLoops, selfLoopReach, widestGapAngle } from "../features/selfLoops.js";
|
|
19
|
+
import { bundleNetworkLinks } from "./bundle.js";
|
|
20
|
+
import { minNodeDistance } from "./minNodeDistance.js";
|
|
21
|
+
import { graphLinkEnd, resolveGraphLinks, resolveGraphNodes } from "./graph.js";
|
|
22
|
+
const buildNetworkNodes = (v)=>resolveGraphNodes(v);
|
|
23
|
+
const buildNetworkLinks = resolveGraphLinks;
|
|
75
24
|
/** Runs the d3-force simulation, rotating results to the largest fitting rect. */ function runForceLayout(nodes, links) {
|
|
76
25
|
const linkStrength = scales.scaleLinear().domain(extent(links, (d)=>d.size)).range([
|
|
77
26
|
0.1,
|
|
@@ -119,10 +68,13 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
119
68
|
Gives every node an `fx`/`fy`: its own x/y, or — when any node lacks
|
|
120
69
|
them — a force-simulated position. The simulation depends only on the
|
|
121
70
|
node ids and links, so its result is cached on `v.ctx` and reused by the
|
|
122
|
-
size legend's pre-layout estimate and the layout that follows it.
|
|
71
|
+
size legend's pre-layout estimate and the layout that follows it. Links
|
|
72
|
+
from a node to itself don't take part.
|
|
123
73
|
*/ function positionNetworkNodes(v, nodes, links) {
|
|
124
74
|
if (!nodes.some((n)=>n.fx === undefined || n.fy === undefined)) return;
|
|
125
|
-
|
|
75
|
+
// Only links between two resolved, distinct nodes pull on the layout.
|
|
76
|
+
const pulling = links.filter((l)=>l.source && l.target && !isSelfLoop(l));
|
|
77
|
+
const key = `${nodes.map((n)=>n.id).join("\u0000")}|${pulling.map((l)=>`${l.source.id}>${l.target.id}:${l.size}`).join("\u0000")}`;
|
|
126
78
|
const cache = v.ctx.networkForceCache;
|
|
127
79
|
if (cache && cache.key === key) {
|
|
128
80
|
nodes.forEach((n, i)=>{
|
|
@@ -131,7 +83,7 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
131
83
|
});
|
|
132
84
|
return;
|
|
133
85
|
}
|
|
134
|
-
runForceLayout(nodes,
|
|
86
|
+
runForceLayout(nodes, pulling);
|
|
135
87
|
v.ctx.networkForceCache = {
|
|
136
88
|
key,
|
|
137
89
|
positions: nodes.map((n)=>[
|
|
@@ -155,9 +107,54 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
155
107
|
v.ctx.nodeLookup = nodeLookup;
|
|
156
108
|
v.ctx.linkLookup = linkLookup;
|
|
157
109
|
positionNetworkNodes(v, nodes, links);
|
|
158
|
-
return scaleNetworkNodes(v, nodes, width, height);
|
|
110
|
+
return scaleNetworkNodes(v, nodes, width, height, links);
|
|
159
111
|
}
|
|
160
|
-
/**
|
|
112
|
+
/**
|
|
113
|
+
The scale from a link's `size` to its stroke width, on the
|
|
114
|
+
linkSizeScale between the widths `linkWidthRange` gives for nodes no
|
|
115
|
+
smaller than `rMin`, or none when every link is the same size (and
|
|
116
|
+
keeps it).
|
|
117
|
+
*/ function linkStrokeScale(v, links, rMin) {
|
|
118
|
+
const strokeExtent = extent(links, (d)=>d.size);
|
|
119
|
+
if (strokeExtent[0] === strokeExtent[1]) return null;
|
|
120
|
+
return scales[`scale${v.schema.linkSizeScale.charAt(0).toUpperCase()}${v.schema.linkSizeScale.slice(1)}`]().domain(strokeExtent).range(linkWidthRange(v.schema.linkSizeMin, v.schema.linkSizeMax, rMin));
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
The boxes (in pixels, at the radii `r` gives) the nodes and their loops
|
|
124
|
+
cover. Loops are laid out as they will draw, at the widest their strokes
|
|
125
|
+
can be before the nodes shrink to fit.
|
|
126
|
+
*/ function nodeBoxes(v, nodes, links, r) {
|
|
127
|
+
const sized = new Map(nodes.map((n)=>[
|
|
128
|
+
n.id,
|
|
129
|
+
{
|
|
130
|
+
id: n.id,
|
|
131
|
+
x: n.x ?? 0,
|
|
132
|
+
y: n.y ?? 0,
|
|
133
|
+
r: r(n.r)
|
|
134
|
+
}
|
|
135
|
+
]));
|
|
136
|
+
const boxes = [
|
|
137
|
+
...sized.values()
|
|
138
|
+
].map((n)=>[
|
|
139
|
+
[
|
|
140
|
+
n.x - n.r,
|
|
141
|
+
n.y - n.r
|
|
142
|
+
],
|
|
143
|
+
[
|
|
144
|
+
n.x + n.r,
|
|
145
|
+
n.y + n.r
|
|
146
|
+
]
|
|
147
|
+
]);
|
|
148
|
+
const stroke = linkStrokeScale(v, links, r.range()[0]);
|
|
149
|
+
const loops = networkLoops(nodes, links, (n)=>sized.get(n.id), (l)=>stroke ? stroke(l.size) : l.size);
|
|
150
|
+
for (const { box } of loops.values())boxes.push(box);
|
|
151
|
+
return boxes;
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
Positions nodes within bounds and assigns final r/width/height via a
|
|
155
|
+
fitted radius scale. Nodes with a link in `links` to themselves keep
|
|
156
|
+
room for their loops, strokes included.
|
|
157
|
+
*/ function scaleNetworkNodes(v, nodes, width, height, links = []) {
|
|
161
158
|
const xExtent = extent(nodes.map((n)=>n.fx));
|
|
162
159
|
const yExtent = extent(nodes.map((n)=>n.fy));
|
|
163
160
|
const x = scales.scaleLinear().domain(xExtent).range([
|
|
@@ -190,13 +187,7 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
190
187
|
const rExtent = extent(nodes.map((n)=>n.r));
|
|
191
188
|
let rMax = v.schema.sizeMax || max([
|
|
192
189
|
1,
|
|
193
|
-
|
|
194
|
-
n1.x ?? 0,
|
|
195
|
-
n1.y ?? 0
|
|
196
|
-
], [
|
|
197
|
-
n2.x ?? 0,
|
|
198
|
-
n2.y ?? 0
|
|
199
|
-
]))))) / 2
|
|
190
|
+
minNodeDistance(nodes) / 2
|
|
200
191
|
]);
|
|
201
192
|
const r = scales[`scale${v.schema.sizeScale.charAt(0).toUpperCase()}${v.schema.sizeScale.slice(1)}`]().domain(rExtent).range([
|
|
202
193
|
rExtent[0] === rExtent[1] ? rMax : min([
|
|
@@ -213,15 +204,12 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
213
204
|
// the outline up to ~3×) isn't clipped by the container edge — a node sitting
|
|
214
205
|
// flush against the bottom/side would otherwise lose a pixel or two of stroke.
|
|
215
206
|
const strokePad = 3;
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
if (yDomain[0] > y.invert(ny - size)) yDomain[0] = y.invert(ny - size);
|
|
223
|
-
if (yDomain[1] < y.invert(ny + size)) yDomain[1] = y.invert(ny + size);
|
|
224
|
-
});
|
|
207
|
+
for (const [[x0, y0], [x1, y1]] of nodeBoxes(v, nodes, links, r)){
|
|
208
|
+
xDomain[0] = Math.min(xDomain[0], x.invert(x0 - strokePad));
|
|
209
|
+
xDomain[1] = Math.max(xDomain[1], x.invert(x1 + strokePad));
|
|
210
|
+
yDomain[0] = Math.min(yDomain[0], y.invert(y0 - strokePad));
|
|
211
|
+
yDomain[1] = Math.max(yDomain[1], y.invert(y1 + strokePad));
|
|
212
|
+
}
|
|
225
213
|
const xNewSize = xDomain[1] - xDomain[0];
|
|
226
214
|
const yNewSize = yDomain[1] - yDomain[0];
|
|
227
215
|
rMax *= min([
|
|
@@ -250,16 +238,67 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
250
238
|
return r;
|
|
251
239
|
}
|
|
252
240
|
/** Normalizes link stroke sizes onto the linkSizeScale, mutating each link's size. */ function normalizeLinkStrokes(v, links, r) {
|
|
253
|
-
const
|
|
254
|
-
if (
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
241
|
+
const strokeScale = linkStrokeScale(v, links, r.range()[0]);
|
|
242
|
+
if (strokeScale) links.forEach((link)=>{
|
|
243
|
+
link.size = strokeScale(link.size);
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
/**
|
|
247
|
+
The loops for each link from a node to itself, pointing into the widest
|
|
248
|
+
gap between the node's other links, or away from the middle of the
|
|
249
|
+
network when it has none. A node's loops fan out side by side.
|
|
250
|
+
@param at A node's position and radius.
|
|
251
|
+
@param strokeWidth A loop's stroke width.
|
|
252
|
+
*/ function networkLoops(nodes, links, at, strokeWidth) {
|
|
253
|
+
const loops = links.filter((l)=>l.datum && isSelfLoop(l));
|
|
254
|
+
if (!loops.length) return new Map();
|
|
255
|
+
const neighbors = new Map();
|
|
256
|
+
for (const l of links){
|
|
257
|
+
if (!l.source || !l.target || isSelfLoop(l)) continue;
|
|
258
|
+
for (const [a, b] of [
|
|
259
|
+
[
|
|
260
|
+
l.source,
|
|
261
|
+
l.target
|
|
262
|
+
],
|
|
263
|
+
[
|
|
264
|
+
l.target,
|
|
265
|
+
l.source
|
|
266
|
+
]
|
|
267
|
+
]){
|
|
268
|
+
if (!neighbors.has(a.id)) neighbors.set(a.id, []);
|
|
269
|
+
const p = at(b);
|
|
270
|
+
neighbors.get(a.id).push([
|
|
271
|
+
p.x,
|
|
272
|
+
p.y
|
|
273
|
+
]);
|
|
274
|
+
}
|
|
262
275
|
}
|
|
276
|
+
const points = nodes.map(at);
|
|
277
|
+
const center = [
|
|
278
|
+
points.reduce((sum, n)=>sum + n.x, 0) / points.length,
|
|
279
|
+
points.reduce((sum, n)=>sum + n.y, 0) / points.length
|
|
280
|
+
];
|
|
281
|
+
return layoutSelfLoops(loops, {
|
|
282
|
+
node: (l)=>at(l.source),
|
|
283
|
+
angle: (n)=>widestGapAngle([
|
|
284
|
+
n.x,
|
|
285
|
+
n.y
|
|
286
|
+
], neighbors.get(n.id) ?? [], awayFromAngle([
|
|
287
|
+
n.x,
|
|
288
|
+
n.y
|
|
289
|
+
], center)),
|
|
290
|
+
reach: (l)=>selfLoopReach(at(l.source).r),
|
|
291
|
+
strokeWidth
|
|
292
|
+
});
|
|
293
|
+
}
|
|
294
|
+
/** Shapes each link from a node to itself as a loop (see `networkLoops`). */ function placeNetworkLoops(nodes, links) {
|
|
295
|
+
const placed = networkLoops(nodes, links, (n)=>({
|
|
296
|
+
id: n.id,
|
|
297
|
+
x: n.x ?? NaN,
|
|
298
|
+
y: n.y ?? NaN,
|
|
299
|
+
r: n.r ?? 0
|
|
300
|
+
}), (l)=>l.size);
|
|
301
|
+
for (const [link, loop] of placed)link.loop = loop;
|
|
263
302
|
}
|
|
264
303
|
export const applyNetworkLayout = ({ viz })=>{
|
|
265
304
|
const v = viz;
|
|
@@ -269,16 +308,21 @@ export const applyNetworkLayout = ({ viz })=>{
|
|
|
269
308
|
if (!Array.isArray(v.schema.links)) v.schema.links = [];
|
|
270
309
|
const nodes = buildNetworkNodes(v);
|
|
271
310
|
const links = buildNetworkLinks(v, nodes);
|
|
311
|
+
publishLinkGraph(v, links.flatMap((l)=>l.datum ? [
|
|
312
|
+
l.datum
|
|
313
|
+
] : []), nodes.map(graphLinkEnd));
|
|
272
314
|
positionNetworkNodes(v, nodes, links);
|
|
273
|
-
const r = scaleNetworkNodes(v, nodes, width, height);
|
|
315
|
+
const r = scaleNetworkNodes(v, nodes, width, height, links);
|
|
274
316
|
v._sizeLegendFinal = v._size ? r : null;
|
|
275
317
|
normalizeLinkStrokes(v, links, r);
|
|
318
|
+
placeNetworkLoops(nodes, links);
|
|
319
|
+
bundleNetworkLinks(v, links);
|
|
276
320
|
const linkConfig = shapeConfigFor(v, "Path", v.schema.shapeConfig, "edge");
|
|
277
321
|
delete linkConfig.on;
|
|
278
322
|
const nodeShapeConfig = {
|
|
279
323
|
label: (d)=>nodes.length <= v.schema.dataCutoff || v._hover && v._hover(d) || v._active && v._active(d) ? v._drawLabel(d.data || d.node, d.i) : false
|
|
280
324
|
};
|
|
281
|
-
const linkD = (d)
|
|
325
|
+
const linkD = (d)=>d.loop ? d.loop.d : d.points ? polylinePath(d.points) : `M${d.source.x},${d.source.y} ${d.target.x},${d.target.y}`;
|
|
282
326
|
const nodeGroups = Array.from(groups(nodes, (d)=>d.shape));
|
|
283
327
|
v.ctx.networkCtx = {
|
|
284
328
|
links,
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Network's `linkBundle`: each link between two distinct nodes takes a
|
|
3
|
+
bundled path (`points`, from its source's center to its target's), and
|
|
4
|
+
these helpers draw it: the visible stroke ending inside its arrowheads,
|
|
5
|
+
the heads aimed along the curve where it leaves each node, the label
|
|
6
|
+
anchor, and the box a click focus zooms to.
|
|
7
|
+
*/ import { chordArrowNodes, polylineArrowEdge } from "../features/curvedArrows.js";
|
|
8
|
+
import { edgeArrowTrims } from "../features/edgeArrows.js";
|
|
9
|
+
import { bundleLinkPaths } from "../features/linkBundle.js";
|
|
10
|
+
import { polylineMidpoint, polylineReach, trimPolyline } from "../features/polyline.js";
|
|
11
|
+
import { isSelfLoop } from "../features/selfLoops.js";
|
|
12
|
+
/**
|
|
13
|
+
Gives each link between two distinct, placed nodes its bundled path
|
|
14
|
+
when `linkBundle` is on. Loops keep their own shape.
|
|
15
|
+
*/ export function bundleNetworkLinks(viz, links) {
|
|
16
|
+
if (!viz.schema.linkBundle) return;
|
|
17
|
+
const bundled = links.filter((l)=>l.source && l.target && !l.loop && !isSelfLoop(l) && Number.isFinite(l.source.x) && Number.isFinite(l.source.y) && Number.isFinite(l.target.x) && Number.isFinite(l.target.y));
|
|
18
|
+
if (!bundled.length) return;
|
|
19
|
+
const paths = bundleLinkPaths(viz, bundled.map((l)=>[
|
|
20
|
+
[
|
|
21
|
+
l.source.x,
|
|
22
|
+
l.source.y
|
|
23
|
+
],
|
|
24
|
+
[
|
|
25
|
+
l.target.x,
|
|
26
|
+
l.target.y
|
|
27
|
+
]
|
|
28
|
+
]));
|
|
29
|
+
bundled.forEach((l, k)=>{
|
|
30
|
+
l.points = paths[k];
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
How far along a bundled path each end's arrow tip sits: where the path
|
|
35
|
+
leaves a circle a pixel wider than the node at that end.
|
|
36
|
+
*/ export function bundledTipBack(points, rSource = 0, rTarget = 0) {
|
|
37
|
+
return {
|
|
38
|
+
source: polylineReach(points, rSource + 1),
|
|
39
|
+
target: polylineReach([
|
|
40
|
+
...points
|
|
41
|
+
].reverse(), rTarget + 1)
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
/** A bundled link's arrowhead ends, size, and stroke trims. */ function bundledTrims(viz, datum, i, strokeWidth) {
|
|
45
|
+
return edgeArrowTrims({
|
|
46
|
+
arrows: viz.schema.arrows,
|
|
47
|
+
arrowSize: viz.schema.arrowSize,
|
|
48
|
+
strokeWidth: typeof strokeWidth === "number" ? strokeWidth : undefined,
|
|
49
|
+
datum,
|
|
50
|
+
i
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
A bundled link's visible stroke and arrowheads: the stroke follows the
|
|
55
|
+
path and ends inside each head, and each head's tip sits a pixel off its
|
|
56
|
+
node, aimed along the path (see `polylineArrowEdge`).
|
|
57
|
+
*/ export function bundledLinkEdge(viz, link, opts) {
|
|
58
|
+
const trims = bundledTrims(viz, opts.datum, opts.i, opts.strokeWidth);
|
|
59
|
+
const tipBack = bundledTipBack(link.points, link.source?.r ?? 0, link.target?.r ?? 0);
|
|
60
|
+
const { d, source, target } = polylineArrowEdge(link.points, trims, tipBack);
|
|
61
|
+
return {
|
|
62
|
+
d,
|
|
63
|
+
arrows: chordArrowNodes({
|
|
64
|
+
ends: {
|
|
65
|
+
source,
|
|
66
|
+
target
|
|
67
|
+
},
|
|
68
|
+
size: trims.size,
|
|
69
|
+
datum: opts.datum,
|
|
70
|
+
keyPrefix: opts.keyPrefix,
|
|
71
|
+
fill: opts.fill
|
|
72
|
+
})
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
/** A bundled link's run between the edges of its two nodes. */ export function bundledLinkPath(link) {
|
|
76
|
+
const { source, target } = bundledTipBack(link.points, (link.source?.r ?? 0) - 1, (link.target?.r ?? 0) - 1);
|
|
77
|
+
return trimPolyline(link.points, source, target);
|
|
78
|
+
}
|
|
79
|
+
/** The middle of a bundled link's run between the edges of its two nodes. */ export function bundledLinkAnchor(link) {
|
|
80
|
+
return polylineMidpoint(bundledLinkPath(link));
|
|
81
|
+
}
|