@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
|
@@ -9,14 +9,16 @@
|
|
|
9
9
|
(BarChart / AreaPlot / LinePlot / etc.) inherit defaults + features
|
|
10
10
|
from.
|
|
11
11
|
*/ import { date } from "@d3plus/dom";
|
|
12
|
-
import { merge as d3plusMerge
|
|
12
|
+
import { merge as d3plusMerge } from "@d3plus/data";
|
|
13
13
|
import { extent, groups, min, rollups } from "d3-array";
|
|
14
14
|
import discreteBufferFn from "../plotBuffers/discreteBuffer.js";
|
|
15
|
-
import {
|
|
15
|
+
import { sortedAxisValues } from "./axisValues.js";
|
|
16
|
+
import { applyBarWidths, shareAxis } from "./barWidth.js";
|
|
16
17
|
import { discreteDomainCategories } from "./discreteDomain.js";
|
|
17
18
|
import { extraBandValues } from "./confidenceBands.js";
|
|
18
19
|
import { applySwarmLanes, resolveSwarm } from "./swarm.js";
|
|
19
20
|
import { applyPaddedDomains } from "./facetScales.js";
|
|
21
|
+
import { dropHiddenRows, rangeBreaksTimeAxis } from "./plotRangeBreaks.js";
|
|
20
22
|
import { scaleConstructors } from "./pipelineScales.js";
|
|
21
23
|
import constant from "../../utils/constant.js";
|
|
22
24
|
export { computePlotInitialDomains } from "./pipelineDomains.js";
|
|
@@ -39,20 +41,53 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
39
41
|
no longer widens a domain, stacks as 0, or emits a broken coordinate.
|
|
40
42
|
Resolves d3plus/d3plus#776.
|
|
41
43
|
*/ const isPlottableRow = (d)=>!isBadAxisValue(d.x) && !isBadAxisValue(d.y) && (d.x2 === undefined || !isBadAxisValue(d.x2)) && (d.y2 === undefined || !isBadAxisValue(d.y2));
|
|
44
|
+
/**
|
|
45
|
+
The Line rows `formatPlotData` drops for a value it can't plot, at a
|
|
46
|
+
discrete-axis position it can: the gaps `connectGaps` breaks lines at.
|
|
47
|
+
*/ function missingLineRows(viz, rows, categories) {
|
|
48
|
+
const discrete = viz.schema.discrete === "y" ? "y" : "x";
|
|
49
|
+
return rows.filter((d)=>d.shape === "Line" && !isPlottableRow(d) && d[discrete] !== undefined && !isBadAxisValue(d[discrete]) && (!categories || categories.has(d[viz.schema.discrete])));
|
|
50
|
+
}
|
|
42
51
|
/**
|
|
43
52
|
The bubble radius scale: `sizeScale` over the extent of `sizes`, ranging
|
|
44
53
|
from `sizeMin` (capped at half of `sizeMax`) to `sizeMax`. A single-value
|
|
45
|
-
extent maps everything to `sizeMax`.
|
|
54
|
+
extent maps everything to `sizeMax`. With `sizeZero`, the smallest value's
|
|
55
|
+
radius is where a scale anchored at zero puts it instead (see
|
|
56
|
+
`zeroAnchoredRadius`).
|
|
46
57
|
*/ export function plotSizeScale(viz, sizes) {
|
|
47
58
|
const rExtent = extent(sizes);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
59
|
+
const { sizeMax, sizeMin, sizeScale, sizeZero } = viz.schema;
|
|
60
|
+
const make = scaleConstructors[`scale${sizeScale.charAt(0).toUpperCase()}${sizeScale.slice(1)}`];
|
|
61
|
+
const anchored = sizeZero ? zeroAnchoredRadius(make, rExtent, sizeMax) : NaN;
|
|
62
|
+
return make().domain(rExtent).range([
|
|
63
|
+
rExtent[0] === rExtent[1] ? sizeMax : Number.isFinite(anchored) ? anchored : min([
|
|
64
|
+
sizeMax / 2,
|
|
65
|
+
sizeMin
|
|
52
66
|
]),
|
|
53
|
-
|
|
67
|
+
sizeMax
|
|
54
68
|
]);
|
|
55
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
The radius a size scale anchored at zero (domain `[0, max]`, range
|
|
72
|
+
`[0, sizeMax]`) gives the smallest of `[min, max]`. A scale over
|
|
73
|
+
`[min, max]` starting at this radius draws every value where the anchored
|
|
74
|
+
one does: with a `"sqrt"` scale, each mark's area is proportional to its
|
|
75
|
+
value; with `"linear"`, its radius. NaN when the extent can't be anchored
|
|
76
|
+
at zero (a negative or non-positive extent, or a log scale).
|
|
77
|
+
@param make The size scale's constructor.
|
|
78
|
+
@param extent The size values' `[min, max]`.
|
|
79
|
+
@param sizeMax The largest radius.
|
|
80
|
+
*/ export function zeroAnchoredRadius(make, [lo, hi], sizeMax) {
|
|
81
|
+
if (!(lo >= 0 && hi > 0)) return NaN;
|
|
82
|
+
const r = make().domain([
|
|
83
|
+
0,
|
|
84
|
+
hi
|
|
85
|
+
]).range([
|
|
86
|
+
0,
|
|
87
|
+
sizeMax
|
|
88
|
+
])(lo);
|
|
89
|
+
return Number.isFinite(r) ? r : NaN;
|
|
90
|
+
}
|
|
56
91
|
/**
|
|
57
92
|
Whether rows of `shape` draw as circles sized by `size`, so the size
|
|
58
93
|
legend keys them: `"Circle"` rows, or the shapes a chart names in
|
|
@@ -81,11 +116,17 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
81
116
|
equals that axis's value) and stores the flags on `viz` as
|
|
82
117
|
`_x2Time`/`_xTime`/`_y2Time`/`_yTime`.
|
|
83
118
|
*/ function detectTimeAxes(viz) {
|
|
84
|
-
const
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
const
|
|
88
|
-
|
|
119
|
+
const first = viz._filteredData[0];
|
|
120
|
+
const firstElemTime = viz.schema.time ? viz.schema.time(first, 0) : false;
|
|
121
|
+
// An axis with `rangeBreaks` over dates is a time axis without `time` too.
|
|
122
|
+
const isTime = (axis)=>{
|
|
123
|
+
const value = viz[`_${axis}`](first, 0);
|
|
124
|
+
return Boolean(firstElemTime && value === firstElemTime) || rangeBreaksTimeAxis(viz, axis, value);
|
|
125
|
+
};
|
|
126
|
+
const x2Time = viz._x2Time = isTime("x2");
|
|
127
|
+
const xTime = viz._xTime = isTime("x");
|
|
128
|
+
const y2Time = viz._y2Time = isTime("y2");
|
|
129
|
+
const yTime = viz._yTime = isTime("y");
|
|
89
130
|
return {
|
|
90
131
|
xTime,
|
|
91
132
|
x2Time,
|
|
@@ -153,6 +194,7 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
153
194
|
return {
|
|
154
195
|
plotFormattedData: [],
|
|
155
196
|
plotAxisData: [],
|
|
197
|
+
plotMissingRows: [],
|
|
156
198
|
x2Exists: false,
|
|
157
199
|
y2Exists: false
|
|
158
200
|
};
|
|
@@ -160,8 +202,10 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
160
202
|
const { prepData, stackGroup } = plotRowPrep(viz, detectTimeAxes(viz));
|
|
161
203
|
const categories = discreteDomainCategories(viz);
|
|
162
204
|
const keepRow = (d)=>isPlottableRow(d) && (!categories || categories.has(d[viz.schema.discrete]));
|
|
163
|
-
const
|
|
164
|
-
|
|
205
|
+
const prepped = viz._filteredData.map(prepData);
|
|
206
|
+
// Rows a time axis's `rangeBreaks` hide are left out of the drawing.
|
|
207
|
+
const plotted = dropHiddenRows(viz, prepped.filter(keepRow));
|
|
208
|
+
const [formattedData, axisData] = applyBarWidths(viz, plotted, viz._axisPersist ? dropHiddenRows(viz, viz._data.map(prepData).filter(keepRow)) : plotted);
|
|
165
209
|
viz._formattedData = formattedData;
|
|
166
210
|
const swarm = viz._swarm = resolveSwarm(viz.schema.swarm, axisData);
|
|
167
211
|
if (swarm) {
|
|
@@ -169,14 +213,17 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
169
213
|
if (axisData !== formattedData) applySwarmLanes(axisData, swarm);
|
|
170
214
|
}
|
|
171
215
|
applyPlotSizeScale(viz, axisData);
|
|
172
|
-
|
|
173
|
-
const
|
|
216
|
+
// The width shares draw on a secondary axis when `barWidthShare` is "opposite".
|
|
217
|
+
const share = shareAxis(viz);
|
|
218
|
+
const x2Exists = share === "x2" || axisData.some((d)=>d.x2 !== undefined);
|
|
219
|
+
const y2Exists = share === "y2" || axisData.some((d)=>d.y2 !== undefined);
|
|
174
220
|
return {
|
|
175
221
|
plotFormattedData: formattedData,
|
|
176
222
|
plotAxisData: axisData,
|
|
177
223
|
x2Exists,
|
|
178
224
|
y2Exists,
|
|
179
|
-
plotStackGroup: stackGroup
|
|
225
|
+
plotStackGroup: stackGroup,
|
|
226
|
+
plotMissingRows: missingLineRows(viz, prepped, categories)
|
|
180
227
|
};
|
|
181
228
|
};
|
|
182
229
|
/**
|
|
@@ -207,7 +254,7 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
207
254
|
const aKey = timeData || numericValue ? parseFloat(a[0]) : a[0];
|
|
208
255
|
const bKey = timeData || numericValue ? parseFloat(b[0]) : b[0];
|
|
209
256
|
return aKey - bKey;
|
|
210
|
-
}).map(([key])=>timeData ? date(key) : numericValue ? parseFloat(key) : key) :
|
|
257
|
+
}).map(([key])=>timeData ? date(key) : numericValue ? parseFloat(key) : key) : sortedAxisValues(filteredData, axis, viz.schema[`${axis}Sort`] ? (a, b)=>viz.schema[`${axis}Sort`](a.data, b.data) : undefined);
|
|
211
258
|
if (viz.schema.discrete !== axis.charAt(0) && viz._confidence) {
|
|
212
259
|
if (viz._confidence[0]) myData = myData.concat(localData.map((d)=>d.lci));
|
|
213
260
|
if (viz._confidence[1]) myData = myData.concat(localData.map((d)=>d.hci));
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
Pure compute. No DOM, no side effects on viz.
|
|
15
15
|
*/ import { unique } from "@d3plus/data";
|
|
16
16
|
import { withAxisInk } from "./axisInk.js";
|
|
17
|
+
import { barShareAxisConfig } from "./barWidth.js";
|
|
17
18
|
import { baselineBreakAxisConfig } from "./baselineBreak.js";
|
|
18
19
|
import { hasUserDomain, plotAxisRounding, secondaryAxisRounding } from "./baselineDomain.js";
|
|
19
20
|
import { isSpanAxis, spanEdges } from "./discreteSpan.js";
|
|
@@ -106,6 +107,7 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
106
107
|
...x2Exists ? {
|
|
107
108
|
data: x2Data
|
|
108
109
|
} : defaultConfig,
|
|
110
|
+
...barShareAxisConfig(viz, "x2"),
|
|
109
111
|
baselineBreak: false,
|
|
110
112
|
rounding: secondaryAxisRounding(viz, "x2", xAxisRounding(viz))
|
|
111
113
|
};
|
|
@@ -113,6 +115,7 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
113
115
|
...y2Exists ? {
|
|
114
116
|
data: y2Data
|
|
115
117
|
} : defaultConfig,
|
|
118
|
+
...barShareAxisConfig(viz, "y2"),
|
|
116
119
|
baselineBreak: false,
|
|
117
120
|
rounding: secondaryAxisRounding(viz, "y2", yRounding)
|
|
118
121
|
};
|
|
@@ -126,8 +129,9 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
126
129
|
let barLabelCheck;
|
|
127
130
|
const tickFor = (axis, axisScale)=>{
|
|
128
131
|
if (isSpanAxis(viz, axis)) return spanEdges(viz, axisData);
|
|
132
|
+
if (axisScale !== "Point") return null;
|
|
129
133
|
const ticks = unique(axisData.map((d)=>d[axis]));
|
|
130
|
-
if (
|
|
134
|
+
if (!ticks.every((t)=>barLabels.includes(`${t}`))) return null;
|
|
131
135
|
// The axis measure checks that the bars have room for these labels.
|
|
132
136
|
if (axis === "x" || axis === "y") {
|
|
133
137
|
if (axis === viz.schema.discrete && (axis === "x" ? showX : showY)) barLabelCheck = {
|
|
@@ -24,6 +24,7 @@ import { stampShare } from "../features/shareKey.js";
|
|
|
24
24
|
import { stackedConfidenceValues } from "./barConfidence.js";
|
|
25
25
|
import { isSpanAxis, spanDomain } from "./discreteSpan.js";
|
|
26
26
|
import { orderLast } from "./stackHelpers.js";
|
|
27
|
+
import { plotSeriesIds, stackPositions } from "./stackLegendOrder.js";
|
|
27
28
|
import { trendDomainValues } from "./trendLines.js";
|
|
28
29
|
/**
|
|
29
30
|
Pushes zero-value filler points for any Area series missing from a discrete
|
|
@@ -162,9 +163,20 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
162
163
|
plotInitialDomains: domains,
|
|
163
164
|
plotDiscreteKeys: discreteKeys,
|
|
164
165
|
plotStackData: stackData,
|
|
165
|
-
plotStackKeys: stackKeys
|
|
166
|
+
plotStackKeys: stackKeys,
|
|
167
|
+
plotStackPositions: drawnStackPositions(viz, axisData, stackData, stackKeys)
|
|
166
168
|
};
|
|
167
169
|
}
|
|
170
|
+
/** Where each series sits in the drawn stacks (see `stackLegendOrder.ts`). */ function drawnStackPositions(viz, axisData, stackData, stackKeys) {
|
|
171
|
+
const series = new Map();
|
|
172
|
+
for (const row of axisData){
|
|
173
|
+
const key = `${row.id}`;
|
|
174
|
+
if (series.has(key) || !row.data) continue;
|
|
175
|
+
const ids = plotSeriesIds(viz, row.data, row.i);
|
|
176
|
+
if (ids.length) series.set(key, ids[0]);
|
|
177
|
+
}
|
|
178
|
+
return stackPositions(stackData, stackKeys, (key)=>series.get(key));
|
|
179
|
+
}
|
|
168
180
|
/** Non-stacked branch: data-values-or-extent domains per axis. */ function computeNonStackedDomains(viz, ctx) {
|
|
169
181
|
const { axisData, xData, x2Data, yData, y2Data } = ctx;
|
|
170
182
|
const xTime = viz._xTime, x2Time = viz._x2Time, yTime = viz._yTime, y2Time = viz._y2Time;
|
|
@@ -176,9 +188,10 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
176
188
|
}
|
|
177
189
|
const domains = {
|
|
178
190
|
x: isSpanAxis(viz, "x") ? spanDomain(viz, axisData) : !xTime && viz.schema.discrete === "x" || viz.schema.xSort || viz._swarm?.cross === "x" ? xData : extent(xData),
|
|
179
|
-
|
|
191
|
+
// A variable-width axis's width shares (`barWidthShare`) line up with its bars.
|
|
192
|
+
x2: isSpanAxis(viz, "x") ? spanDomain(viz, axisData) : !x2Time && viz.schema.discrete === "x" || viz.schema.x2Sort ? x2Data : extent(x2Data),
|
|
180
193
|
y: isSpanAxis(viz, "y") ? spanDomain(viz, axisData) : !yTime && viz.schema.discrete === "y" || viz.schema.ySort || viz._swarm?.cross === "y" ? yData : extent(yData),
|
|
181
|
-
y2: !y2Time && viz.schema.discrete === "y" || viz.schema.y2Sort ? y2Data : extent(y2Data)
|
|
194
|
+
y2: isSpanAxis(viz, "y") ? spanDomain(viz, axisData) : !y2Time && viz.schema.discrete === "y" || viz.schema.y2Sort ? y2Data : extent(y2Data)
|
|
182
195
|
};
|
|
183
196
|
return {
|
|
184
197
|
plotInitialDomains: domains,
|
|
@@ -10,14 +10,62 @@
|
|
|
10
10
|
*/ import { groups, max, min } from "d3-array";
|
|
11
11
|
import { textWidth as d3plusTextWidth } from "@d3plus/dom";
|
|
12
12
|
import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
import { axisValue } from "./sharedTooltip.js";
|
|
14
|
+
import { lineLabelText, lineLabelValue, rowLineLabelSides } from "./lineLabelSides.js";
|
|
15
|
+
/**
|
|
16
|
+
Shortens a label to fit `maxWidth`: the name and value when both fit,
|
|
17
|
+
else the name alone, else the name cut short with an ellipsis, else
|
|
18
|
+
`null` (no room for even one letter).
|
|
19
|
+
*/ export function fitLineLabelText(name, value, maxWidth, measure) {
|
|
20
|
+
if (measure(value === undefined ? name : lineLabelText(name, value)) <= maxWidth) return value === undefined ? {
|
|
21
|
+
name
|
|
22
|
+
} : {
|
|
23
|
+
name,
|
|
24
|
+
value
|
|
25
|
+
};
|
|
26
|
+
if (value !== undefined && measure(name) <= maxWidth) return {
|
|
27
|
+
name
|
|
28
|
+
};
|
|
29
|
+
const cut = (n)=>`${name.slice(0, n).trimEnd()}\u2026`;
|
|
30
|
+
let lo = 1, hi = name.length - 1, best = 0;
|
|
31
|
+
while(lo <= hi){
|
|
32
|
+
const mid = lo + hi >> 1;
|
|
33
|
+
if (measure(cut(mid)) <= maxWidth) {
|
|
34
|
+
best = mid;
|
|
35
|
+
lo = mid + 1;
|
|
36
|
+
} else hi = mid - 1;
|
|
37
|
+
}
|
|
38
|
+
return best ? {
|
|
39
|
+
name: cut(best)
|
|
40
|
+
} : null;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
The most room the labels at one end of a line chart may take: a quarter
|
|
44
|
+
of its `width` past its y axis (`yWidth`), so labels at both ends leave
|
|
45
|
+
the plot at least half of that, and labels never crowd the plot out of a
|
|
46
|
+
narrow chart or a small-multiples panel.
|
|
47
|
+
*/ export function lineLabelCap(width, yWidth = 0) {
|
|
48
|
+
return Math.max(0, width - yWidth) / 4;
|
|
49
|
+
}
|
|
50
|
+
/** Unwraps a formatted Plot row to its source datum and that datum's index. */ function sourceRow(row) {
|
|
51
|
+
let d = row;
|
|
16
52
|
let i;
|
|
17
53
|
while(d.__d3plus__ && d.data){
|
|
18
54
|
d = d.data;
|
|
19
55
|
i = d.i;
|
|
20
56
|
}
|
|
57
|
+
return {
|
|
58
|
+
d,
|
|
59
|
+
i
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
Measures one end of a line's label (width, position, overlap coords): its
|
|
64
|
+
right end (`"end"`, the last point across) or its left end (`"start"`).
|
|
65
|
+
*/ export function measureLineLabel([lineKey, lineValues], ctx, side = "end") {
|
|
66
|
+
const { labelFunction, fontColorAccessor, fontSizeAccessor, fontWeightAccessor, fontFamilyAccessor, paddingAccessor, xEstimate, yEstimate } = ctx;
|
|
67
|
+
const end = side === "end";
|
|
68
|
+
const { d, i } = sourceRow(lineValues[end ? lineValues.length - 1 : 0]);
|
|
21
69
|
const label = typeof labelFunction === "function" ? labelFunction(d, i) : labelFunction;
|
|
22
70
|
const fontColor = typeof fontColorAccessor === "function" ? fontColorAccessor(d, i) : fontColorAccessor;
|
|
23
71
|
const fontSize = typeof fontSizeAccessor === "function" ? fontSizeAccessor(d, i) : fontSizeAccessor;
|
|
@@ -25,20 +73,36 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
25
73
|
let fontFamily = typeof fontFamilyAccessor === "function" ? fontFamilyAccessor(d, i) : fontFamilyAccessor;
|
|
26
74
|
if (Array.isArray(fontFamily)) fontFamily = fontFamily.map((f)=>`'${f}'`).join(", ");
|
|
27
75
|
const labelPadding = typeof paddingAccessor === "function" ? paddingAccessor(d, i) : paddingAccessor;
|
|
28
|
-
const labelWidth = d3plusTextWidth(label, {
|
|
29
|
-
"font-size": fontSize,
|
|
30
|
-
"font-family": fontFamily,
|
|
31
|
-
"font-weight": fontWeight
|
|
32
|
-
});
|
|
33
76
|
const coords = lineValues.map((d)=>[
|
|
34
77
|
xEstimate(d.x),
|
|
35
78
|
yEstimate(d.y)
|
|
36
79
|
]);
|
|
37
|
-
// A line always has values, so the
|
|
38
|
-
const
|
|
39
|
-
const
|
|
80
|
+
// A line always has values, so the extent is defined.
|
|
81
|
+
const xs = lineValues.map((d)=>xEstimate(d.x));
|
|
82
|
+
const edgeX = end ? max(xs) : min(xs);
|
|
83
|
+
const edgeRow = lineValues.find((d)=>xEstimate(d.x) === edgeX);
|
|
84
|
+
const labelY = edgeRow.y;
|
|
85
|
+
let valueText = ctx.valueText(labelY, edgeRow);
|
|
86
|
+
const font = {
|
|
87
|
+
"font-size": fontSize,
|
|
88
|
+
"font-family": fontFamily,
|
|
89
|
+
"font-weight": fontWeight
|
|
90
|
+
};
|
|
91
|
+
let labelWidth = d3plusTextWidth(valueText === undefined ? label : lineLabelText(label, valueText), font);
|
|
92
|
+
// A label wider than its room drops its value, then shortens its name.
|
|
93
|
+
let name;
|
|
94
|
+
if (ctx.maxSpace !== undefined && labelWidth + labelPadding * 4 > ctx.maxSpace) {
|
|
95
|
+
const fit = fitLineLabelText(`${label}`, valueText, ctx.maxSpace - labelPadding * 4, (text)=>d3plusTextWidth(text, font));
|
|
96
|
+
if (!fit) return null;
|
|
97
|
+
name = fit.name;
|
|
98
|
+
valueText = fit.value;
|
|
99
|
+
labelWidth = d3plusTextWidth(valueText === undefined ? name : lineLabelText(name, valueText), font);
|
|
100
|
+
}
|
|
40
101
|
return {
|
|
41
102
|
id: lineKey,
|
|
103
|
+
side,
|
|
104
|
+
name,
|
|
105
|
+
valueText,
|
|
42
106
|
labelWidth: labelWidth + labelPadding * 2,
|
|
43
107
|
spaceNeeded: labelWidth + labelPadding * 4,
|
|
44
108
|
value: labelY,
|
|
@@ -46,17 +110,21 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
46
110
|
padding: labelPadding,
|
|
47
111
|
fontSize,
|
|
48
112
|
fontColor,
|
|
49
|
-
|
|
50
|
-
|
|
113
|
+
edgeX,
|
|
114
|
+
// The x value at the labeled end, which the connectors and bumping
|
|
115
|
+
// group by: on a reversed or categorical axis, not the largest x.
|
|
116
|
+
xValue: edgeRow.x,
|
|
51
117
|
coords
|
|
52
118
|
};
|
|
53
119
|
}
|
|
54
120
|
/**
|
|
55
|
-
Whether another line passes through the space `label` would occupy
|
|
56
|
-
right of its
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
const
|
|
121
|
+
Whether another line passes through the space `label` would occupy past
|
|
122
|
+
its line's end: right of its last point, or left of its first point for a
|
|
123
|
+
`"start"` label.
|
|
124
|
+
*/ export function labelOverlapsLine(label, labels) {
|
|
125
|
+
const { fontSize, id, labelWidth, edgeX, side, yEstimate } = label;
|
|
126
|
+
const dir = side === "start" ? -1 : 1;
|
|
127
|
+
const closeLabels = labels.filter((l)=>l.id !== id && l.coords.some((c)=>((c[0] - edgeX) * dir > 0 || c[0] === edgeX && l.edgeX !== edgeX) && (edgeX + labelWidth * dir - c[0]) * dir >= 0 && c[1] <= yEstimate + fontSize * 0.75 && c[1] >= yEstimate - fontSize * 0.75));
|
|
60
128
|
return closeLabels.length !== 0;
|
|
61
129
|
}
|
|
62
130
|
/**
|
|
@@ -91,27 +159,34 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
91
159
|
return test._getPosition.bind(test)(d);
|
|
92
160
|
};
|
|
93
161
|
}
|
|
162
|
+
/** The y-sorted labels for one end of every line, less those another line runs through. */ function measureSide(lineData, ctx, side, yDomain) {
|
|
163
|
+
return lineData.map((entry)=>measureLineLabel(entry, ctx, side)).filter((d)=>d !== null).sort((a, b)=>yDomain[1] > yDomain[0] ? a.value - b.value : b.value - a.value).filter((d, _i, arr)=>!labelOverlapsLine(d, arr));
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
The room the labels at one end of the plot claim: the widest label among
|
|
167
|
+
the lines that end at the x range's `edge`, at most `cap`; 0 when no line
|
|
168
|
+
reaches that edge.
|
|
169
|
+
*/ export function lineLabelSpace(labels, edge, cap) {
|
|
170
|
+
const spaceNeeded = max(labels.filter((d)=>d.edgeX === edge), (d)=>d.spaceNeeded);
|
|
171
|
+
return spaceNeeded ? min([
|
|
172
|
+
spaceNeeded,
|
|
173
|
+
cap
|
|
174
|
+
]) : 0;
|
|
175
|
+
}
|
|
176
|
+
const noLabels = ()=>({
|
|
177
|
+
plotLabelWidths: [],
|
|
178
|
+
plotLargestLabel: undefined,
|
|
179
|
+
plotXRangeMax: undefined,
|
|
180
|
+
plotStartLabelSpace: 0
|
|
181
|
+
});
|
|
94
182
|
export const measurePlotLineLabels = ({ viz, plotFormattedData, plotScales, plotConfigScales, plotTestAxes, plotLineLabelTest, y2Exists })=>{
|
|
95
183
|
const data = plotFormattedData || [];
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
plotXRangeMax: undefined
|
|
101
|
-
};
|
|
102
|
-
}
|
|
103
|
-
const labelData = data.filter((d)=>{
|
|
104
|
-
if (d.shape !== "Line") return false;
|
|
105
|
-
return typeof viz.schema.lineLabels === "function" ? viz.schema.lineLabels(d.data, d.i) : true;
|
|
106
|
-
});
|
|
184
|
+
const setting = viz.schema.lineLabels;
|
|
185
|
+
if (!setting || y2Exists) return noLabels();
|
|
186
|
+
const sidesOf = (d)=>rowLineLabelSides(setting, d.data, d.i);
|
|
187
|
+
const labelData = data.filter((d)=>d.shape === "Line" && sidesOf(d).length > 0);
|
|
107
188
|
const lineData = groups(labelData, (d)=>d.id);
|
|
108
|
-
if (!lineData.length)
|
|
109
|
-
return {
|
|
110
|
-
plotLabelWidths: [],
|
|
111
|
-
plotLargestLabel: undefined,
|
|
112
|
-
plotXRangeMax: undefined
|
|
113
|
-
};
|
|
114
|
-
}
|
|
189
|
+
if (!lineData.length) return noLabels();
|
|
115
190
|
const { testLineShape, testTextBox } = plotLineLabelTest;
|
|
116
191
|
const { xTest, yTest } = plotTestAxes;
|
|
117
192
|
const xDomain = plotScales.x.domain();
|
|
@@ -119,26 +194,43 @@ export const measurePlotLineLabels = ({ viz, plotFormattedData, plotScales, plot
|
|
|
119
194
|
const xConfigScale = plotConfigScales.xConfigScale;
|
|
120
195
|
const yConfigScale = plotConfigScales.yConfigScale;
|
|
121
196
|
const width = viz.schema.width - viz._margin.left - viz._margin.right;
|
|
197
|
+
const config = viz.schema.lineLabelConfig;
|
|
122
198
|
const labelCtx = {
|
|
123
199
|
...lineLabelStyle(viz, testLineShape, testTextBox),
|
|
124
200
|
xEstimate: axisEstimate(xTest, xConfigScale, xDomain),
|
|
125
|
-
yEstimate: axisEstimate(yTest, yConfigScale, yDomain)
|
|
201
|
+
yEstimate: axisEstimate(yTest, yConfigScale, yDomain),
|
|
202
|
+
valueText: (value, row)=>{
|
|
203
|
+
const { d, i } = sourceRow(row);
|
|
204
|
+
return lineLabelValue(config, value, d, i, (v)=>axisValue(viz, "y", v));
|
|
205
|
+
}
|
|
126
206
|
};
|
|
127
|
-
|
|
128
|
-
const
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
207
|
+
// Each end labels the lines whose row at that end asks for it.
|
|
208
|
+
const sideLines = (side)=>lineData.filter(([, values])=>{
|
|
209
|
+
const row = side === "end" ? values[values.length - 1] : values[0];
|
|
210
|
+
return sidesOf(row).includes(side);
|
|
211
|
+
});
|
|
212
|
+
const [startLines, endLines] = [
|
|
213
|
+
sideLines("start"),
|
|
214
|
+
sideLines("end")
|
|
215
|
+
];
|
|
216
|
+
const yBounds = yTest.outerBounds();
|
|
217
|
+
const cap = lineLabelCap(width, yBounds.width ? yBounds.width + yTest.padding() : 0);
|
|
218
|
+
const sideCtx = {
|
|
219
|
+
...labelCtx,
|
|
220
|
+
maxSpace: cap
|
|
221
|
+
};
|
|
222
|
+
const startLabels = measureSide(startLines, sideCtx, "start", yDomain);
|
|
223
|
+
const endLabels = measureSide(endLines, sideCtx, "end", yDomain);
|
|
224
|
+
const [rangeStart, rangeEnd] = xTest._getRange.bind(xTest)();
|
|
225
|
+
const endSpace = lineLabelSpace(endLabels, max(endLabels, (d)=>d.edgeX), cap);
|
|
226
|
+
const startSpace = lineLabelSpace(startLabels, min(startLabels, (d)=>d.edgeX), cap);
|
|
139
227
|
return {
|
|
140
|
-
plotLabelWidths:
|
|
141
|
-
|
|
142
|
-
|
|
228
|
+
plotLabelWidths: [
|
|
229
|
+
...startLabels,
|
|
230
|
+
...endLabels
|
|
231
|
+
],
|
|
232
|
+
plotLargestLabel: max(endLabels.map((d)=>d.labelWidth)),
|
|
233
|
+
plotXRangeMax: endSpace && max(endLabels, (d)=>d.edgeX) === rangeEnd ? width - endSpace : undefined,
|
|
234
|
+
plotStartLabelSpace: startSpace && min(startLabels, (d)=>d.edgeX) === rangeStart ? startSpace : 0
|
|
143
235
|
};
|
|
144
236
|
};
|
|
@@ -9,6 +9,8 @@ import { userDomainBreaksBaseline } from "./baselineBreak.js";
|
|
|
9
9
|
import { configOpenDomain, userAxisDomain } from "./baselineDomain.js";
|
|
10
10
|
import { openEnd } from "./openDomainEnds.js";
|
|
11
11
|
import { isSpanAxis } from "./discreteSpan.js";
|
|
12
|
+
import { widenReferenceDomains } from "./referenceDomains.js";
|
|
13
|
+
import { plotTimeScale } from "./plotRangeBreaks.js";
|
|
12
14
|
/** d3-scale's scale constructors, indexed by the dynamic `scale<Type>` name. */ export const scaleConstructors = scales;
|
|
13
15
|
/**
|
|
14
16
|
A copy of a user `<axis>Domain`. On a time axis its set ends are parsed
|
|
@@ -86,6 +88,12 @@ import { isSpanAxis } from "./discreteSpan.js";
|
|
|
86
88
|
}
|
|
87
89
|
});
|
|
88
90
|
}
|
|
91
|
+
/**
|
|
92
|
+
One plot axis's scale over `d` across `size` pixels. A time axis with
|
|
93
|
+
`rangeBreaks` hides the same time here as on the axis.
|
|
94
|
+
*/ function plotAxisScale(viz, axis, type, d, size) {
|
|
95
|
+
return plotTimeScale(viz, axis, scaleConstructors[`scale${type}`]().domain(d).range(range(0, size + 1, size / (d.length - 1))));
|
|
96
|
+
}
|
|
89
97
|
/**
|
|
90
98
|
`computePlotScales` — fourth stage of Plot's pipeline. Takes the per-axis
|
|
91
99
|
values + the chart's raw `domains` object (computed by the inline
|
|
@@ -126,29 +134,53 @@ import { isSpanAxis } from "./discreteSpan.js";
|
|
|
126
134
|
const y2ConfigScale = autoScale(viz, axisData, "y2", y2Scale).toLowerCase();
|
|
127
135
|
const xConfigScale = autoScale(viz, axisData, "x", xScale).toLowerCase();
|
|
128
136
|
const x2ConfigScale = autoScale(viz, axisData, "x2", x2Scale).toLowerCase();
|
|
137
|
+
const widened = widenReferenceDomains(viz, {
|
|
138
|
+
x: xAutoDomain,
|
|
139
|
+
y: yAutoDomain,
|
|
140
|
+
x2: x2AutoDomain,
|
|
141
|
+
y2: y2AutoDomain
|
|
142
|
+
}, {
|
|
143
|
+
x: {
|
|
144
|
+
type: xScale,
|
|
145
|
+
config: xConfigScale
|
|
146
|
+
},
|
|
147
|
+
y: {
|
|
148
|
+
type: yScale,
|
|
149
|
+
config: yConfigScale
|
|
150
|
+
},
|
|
151
|
+
x2: {
|
|
152
|
+
type: x2Scale,
|
|
153
|
+
config: x2ConfigScale
|
|
154
|
+
},
|
|
155
|
+
y2: {
|
|
156
|
+
type: y2Scale,
|
|
157
|
+
config: y2ConfigScale
|
|
158
|
+
}
|
|
159
|
+
}, user);
|
|
129
160
|
// `.slice()` the fallback so domains.x2 isn't ALIASED to domains.x
|
|
130
161
|
// (and same for y2 ↔ y). Without the slice, later in this function
|
|
131
162
|
// the baseline-extension loop does `domains[o][0] = b` — when `o`
|
|
132
163
|
// is 'y2' aliased to y, that mutation hits domains.y too, silently
|
|
133
164
|
// clobbering the y-axis bottom. Sibling of the d.reverse() fix.
|
|
134
165
|
domains = {
|
|
135
|
-
x:
|
|
136
|
-
x2:
|
|
137
|
-
y:
|
|
138
|
-
y2:
|
|
166
|
+
x: widened.x,
|
|
167
|
+
x2: widened.x2 || widened.x.slice(),
|
|
168
|
+
y: widened.y,
|
|
169
|
+
y2: widened.y2 || widened.y.slice()
|
|
139
170
|
};
|
|
140
171
|
avoidLogZero(viz, domains, data, axisData);
|
|
141
172
|
applyOppDomains(viz, domains, opps, {
|
|
142
173
|
x: xConfigScale,
|
|
143
174
|
y: yConfigScale
|
|
144
175
|
}, user);
|
|
145
|
-
const
|
|
146
|
-
const
|
|
176
|
+
const axisScale = (axis, type, d, size)=>plotAxisScale(viz, axis, type, d, size);
|
|
177
|
+
const x = axisScale("x", xScale, domains.x, width);
|
|
178
|
+
const x2 = axisScale("x2", x2Scale, domains.x2, width);
|
|
147
179
|
// `.slice().reverse()` so the domain object isn't mutated under us if
|
|
148
180
|
// it came from user config (covered by the slice above) OR from
|
|
149
181
|
// domains.y being aliased into the user config via the slice above.
|
|
150
|
-
const y =
|
|
151
|
-
const y2 =
|
|
182
|
+
const y = axisScale("y", yScale, domains.y.slice().reverse(), height);
|
|
183
|
+
const y2 = axisScale("y2", y2Scale, domains.y2.slice().reverse(), height);
|
|
152
184
|
return {
|
|
153
185
|
plotDomains: domains,
|
|
154
186
|
plotScales: {
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import { isSpanAxis } from "./discreteSpan.js";
|
|
9
9
|
import { AXES } from "./facetScales.js";
|
|
10
10
|
import { computePlotAxisValues, computePlotInitialDomains, computePlotScales, extendPlotOppScales, formatPlotData, plotSizeScale } from "./pipeline.js";
|
|
11
|
+
import { poolStackPositions, recordStackLegendOrder } from "./stackLegendOrder.js";
|
|
11
12
|
import { computePlotTrendFits } from "./trendLines.js";
|
|
12
13
|
/** Whether an axis's domain is a list of values (a category axis) rather than an extent. */ export function listAxis(viz, axis) {
|
|
13
14
|
if (viz.schema[`${axis}Sort`]) return true;
|
|
@@ -41,9 +42,18 @@ import { computePlotTrendFits } from "./trendLines.js";
|
|
|
41
42
|
]);
|
|
42
43
|
return {
|
|
43
44
|
formatted: ctx.plotFormattedData || [],
|
|
44
|
-
domains: ctx.plotInitialDomains || {}
|
|
45
|
+
domains: ctx.plotInitialDomains || {},
|
|
46
|
+
positions: ctx.plotStackPositions
|
|
45
47
|
};
|
|
46
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
Orders a stacked chart's legend by every panel's stacks, pooled (see
|
|
51
|
+
`stackLegendOrder.ts`), before the chrome lays the legend out.
|
|
52
|
+
*/ export function plotFacetChrome(viz, panels) {
|
|
53
|
+
if (!viz.schema.stacked) return recordStackLegendOrder(viz, undefined);
|
|
54
|
+
const positions = panels.filter((rows)=>rows.length).map((rows)=>panelDomains(viz, rows).positions).filter((p)=>p !== undefined);
|
|
55
|
+
recordStackLegendOrder(viz, poolStackPositions(positions));
|
|
56
|
+
}
|
|
47
57
|
/**
|
|
48
58
|
The domains (and size scale) that fit every panel's rows: a category axis
|
|
49
59
|
lists every panel's categories, in the order one chart of all the rows
|
|
@@ -158,6 +168,7 @@ import { computePlotTrendFits } from "./trendLines.js";
|
|
|
158
168
|
}
|
|
159
169
|
/** Plot's small-multiple hooks. */ export const plotFacetHooks = {
|
|
160
170
|
aspect: 4 / 3,
|
|
171
|
+
chrome: plotFacetChrome,
|
|
161
172
|
share: sharePlotScales,
|
|
162
173
|
panel: plotFacetPanel,
|
|
163
174
|
insets: plotFacetInsets,
|