@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,7 +8,7 @@
|
|
|
8
8
|
rounded. Time axes aren't rounded either way.
|
|
9
9
|
|
|
10
10
|
@module
|
|
11
|
-
*/ import { roundedDomain } from "../../components/Axis/axisRounding.js";
|
|
11
|
+
*/ import { roundedDomain, roundingScales } from "../../components/Axis/axisRounding.js";
|
|
12
12
|
import { isOneSided } from "./baselineDomain.js";
|
|
13
13
|
/**
|
|
14
14
|
The open end of an axis's user domain, when it leaves one: which end the
|
|
@@ -75,10 +75,7 @@ import { isOneSided } from "./baselineDomain.js";
|
|
|
75
75
|
const open = plotOpenEnds[axis];
|
|
76
76
|
const scale = plotConfigScales[`${axis}ConfigScale`];
|
|
77
77
|
const rounding = axisRounding(viz, axis);
|
|
78
|
-
if (!open || !
|
|
79
|
-
"linear",
|
|
80
|
-
"log"
|
|
81
|
-
].includes(scale) || rounding === "none") continue;
|
|
78
|
+
if (!open || !roundingScales.includes(scale) || rounding === "none") continue;
|
|
82
79
|
const current = scales[axis];
|
|
83
80
|
// The y scale runs high to low.
|
|
84
81
|
const flip = (d)=>axis === "y" ? d.slice().reverse() : d;
|
|
@@ -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
|
/**
|
|
@@ -192,26 +239,28 @@ export { preparePlotAxisLayout } from "./pipelineAxisLayout.js";
|
|
|
192
239
|
const axisData = plotAxisData || [];
|
|
193
240
|
function getAxisValues(axis) {
|
|
194
241
|
const timeData = viz[`_${axis}Time`];
|
|
195
|
-
const
|
|
242
|
+
const rows = timeData ? data : axisData;
|
|
243
|
+
const localData = viz._plotAxisRows ? viz._plotAxisRows(rows, axis) : rows;
|
|
196
244
|
const filteredData = localData.filter((d)=>![
|
|
197
245
|
NaN,
|
|
198
246
|
undefined,
|
|
199
247
|
false
|
|
200
248
|
].includes(d[axis]));
|
|
201
|
-
|
|
249
|
+
const extra = viz._plotAxisValues ? viz._plotAxisValues(localData, axis) : [];
|
|
250
|
+
if (!filteredData.length) return extra;
|
|
202
251
|
const numericValue = typeof filteredData[0][axis] === "number";
|
|
203
252
|
let myData = viz.schema.discrete === axis ? rollups(filteredData, (leaves)=>leaves.length === 1 ? leaves[0].data : d3plusMerge(leaves.map((d)=>d.data), viz.schema.aggs), (d)=>d[axis]).sort((a, b)=>{
|
|
204
253
|
if (viz.schema[`${axis}Sort`]) return viz.schema[`${axis}Sort`](a[1], b[1]);
|
|
205
254
|
const aKey = timeData || numericValue ? parseFloat(a[0]) : a[0];
|
|
206
255
|
const bKey = timeData || numericValue ? parseFloat(b[0]) : b[0];
|
|
207
256
|
return aKey - bKey;
|
|
208
|
-
}).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);
|
|
209
258
|
if (viz.schema.discrete !== axis.charAt(0) && viz._confidence) {
|
|
210
259
|
if (viz._confidence[0]) myData = myData.concat(localData.map((d)=>d.lci));
|
|
211
260
|
if (viz._confidence[1]) myData = myData.concat(localData.map((d)=>d.hci));
|
|
212
261
|
myData = myData.concat(extraBandValues(viz, localData));
|
|
213
262
|
}
|
|
214
|
-
return myData;
|
|
263
|
+
return extra.length ? myData.concat(extra) : myData;
|
|
215
264
|
}
|
|
216
265
|
return {
|
|
217
266
|
xData: getAxisValues("x"),
|
|
@@ -8,10 +8,13 @@
|
|
|
8
8
|
- `barLabels` (used to suppress redundant ticks)
|
|
9
9
|
- `xTicks`/`yTicks`/`x2Ticks`/`y2Ticks` (null when ticks should display,
|
|
10
10
|
empty array when ticks are redundant with bar labels)
|
|
11
|
+
- `barLabelCheck` (the category labels the bars carry in place of the
|
|
12
|
+
axis's ticks, which the axis measure checks they have room for)
|
|
11
13
|
|
|
12
14
|
Pure compute. No DOM, no side effects on viz.
|
|
13
15
|
*/ import { unique } from "@d3plus/data";
|
|
14
16
|
import { withAxisInk } from "./axisInk.js";
|
|
17
|
+
import { barShareAxisConfig } from "./barWidth.js";
|
|
15
18
|
import { baselineBreakAxisConfig } from "./baselineBreak.js";
|
|
16
19
|
import { hasUserDomain, plotAxisRounding, secondaryAxisRounding } from "./baselineDomain.js";
|
|
17
20
|
import { isSpanAxis, spanEdges } from "./discreteSpan.js";
|
|
@@ -64,10 +67,23 @@ import { xAxisRounding } from "../features/xAxisConfig.js";
|
|
|
64
67
|
}
|
|
65
68
|
return yC;
|
|
66
69
|
}
|
|
67
|
-
/** The Bar labels drawn for the rows, as strings
|
|
70
|
+
/** The Bar labels drawn for the rows, as strings, with the rows they label. */ function plotBarLabels(viz, axisData) {
|
|
68
71
|
const barConfig = shapeConfigFor(viz, "Bar");
|
|
69
72
|
const barLabelFunction = barConfig.label !== undefined ? typeof barConfig.label === "function" ? barConfig.label : ()=>barConfig.label : viz._drawLabel;
|
|
70
|
-
|
|
73
|
+
const labels = [];
|
|
74
|
+
const rows = [];
|
|
75
|
+
// A Box draws no label, so its rows never make a tick redundant.
|
|
76
|
+
for (const d of axisData){
|
|
77
|
+
if (d.shape === "Box") continue;
|
|
78
|
+
const label = barLabelFunction(d.data, d.i);
|
|
79
|
+
if (typeof label !== "number" && !label) continue;
|
|
80
|
+
labels.push(String(label));
|
|
81
|
+
rows.push(d);
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
labels,
|
|
85
|
+
rows
|
|
86
|
+
};
|
|
71
87
|
}
|
|
72
88
|
export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists, y2Exists, x2Data, y2Data, yData })=>{
|
|
73
89
|
const axisData = plotAxisData || [];
|
|
@@ -91,6 +107,7 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
91
107
|
...x2Exists ? {
|
|
92
108
|
data: x2Data
|
|
93
109
|
} : defaultConfig,
|
|
110
|
+
...barShareAxisConfig(viz, "x2"),
|
|
94
111
|
baselineBreak: false,
|
|
95
112
|
rounding: secondaryAxisRounding(viz, "x2", xAxisRounding(viz))
|
|
96
113
|
};
|
|
@@ -98,6 +115,7 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
98
115
|
...y2Exists ? {
|
|
99
116
|
data: y2Data
|
|
100
117
|
} : defaultConfig,
|
|
118
|
+
...barShareAxisConfig(viz, "y2"),
|
|
101
119
|
baselineBreak: false,
|
|
102
120
|
rounding: secondaryAxisRounding(viz, "y2", yRounding)
|
|
103
121
|
};
|
|
@@ -106,12 +124,27 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
106
124
|
showX,
|
|
107
125
|
showY
|
|
108
126
|
});
|
|
109
|
-
const
|
|
127
|
+
const bar = plotBarLabels(viz, axisData);
|
|
128
|
+
const barLabels = bar.labels;
|
|
129
|
+
let barLabelCheck;
|
|
110
130
|
const tickFor = (axis, axisScale)=>{
|
|
111
131
|
if (isSpanAxis(viz, axis)) return spanEdges(viz, axisData);
|
|
132
|
+
if (axisScale !== "Point") return null;
|
|
112
133
|
const ticks = unique(axisData.map((d)=>d[axis]));
|
|
113
|
-
|
|
134
|
+
if (!ticks.every((t)=>barLabels.includes(`${t}`))) return null;
|
|
135
|
+
// The axis measure checks that the bars have room for these labels.
|
|
136
|
+
if (axis === "x" || axis === "y") {
|
|
137
|
+
if (axis === viz.schema.discrete && (axis === "x" ? showX : showY)) barLabelCheck = {
|
|
138
|
+
axis,
|
|
139
|
+
...bar
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
return [];
|
|
114
143
|
};
|
|
144
|
+
const xTicks = tickFor("x", xScale);
|
|
145
|
+
const x2Ticks = tickFor("x2", x2Scale);
|
|
146
|
+
const yTicks = tickFor("y", yScale);
|
|
147
|
+
const y2Ticks = tickFor("y2", y2Scale);
|
|
115
148
|
return {
|
|
116
149
|
plotDefaultConfig: defaultConfig,
|
|
117
150
|
plotDefaultX2Config: withAxisInk(viz, defaultX2Config),
|
|
@@ -120,10 +153,11 @@ export const preparePlotAxisLayout = ({ viz, plotAxisData, plotScales, x2Exists,
|
|
|
120
153
|
plotShowY: showY,
|
|
121
154
|
plotYC: withAxisInk(viz, yC),
|
|
122
155
|
plotBarLabels: barLabels,
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
156
|
+
plotBarLabelCheck: barLabelCheck,
|
|
157
|
+
plotXTicks: xTicks,
|
|
158
|
+
plotX2Ticks: x2Ticks,
|
|
159
|
+
plotYTicks: yTicks,
|
|
160
|
+
plotY2Ticks: y2Ticks,
|
|
127
161
|
plotXDomain: xDomain,
|
|
128
162
|
plotX2Domain: x2Domain,
|
|
129
163
|
plotYDomain: yDomain,
|
|
@@ -23,6 +23,8 @@ import * as d3Shape from "d3-shape";
|
|
|
23
23
|
import { stampShare } from "../features/shareKey.js";
|
|
24
24
|
import { stackedConfidenceValues } from "./barConfidence.js";
|
|
25
25
|
import { isSpanAxis, spanDomain } from "./discreteSpan.js";
|
|
26
|
+
import { orderLast } from "./stackHelpers.js";
|
|
27
|
+
import { plotSeriesIds, stackPositions } from "./stackLegendOrder.js";
|
|
26
28
|
import { trendDomainValues } from "./trendLines.js";
|
|
27
29
|
/**
|
|
28
30
|
Pushes zero-value filler points for any Area series missing from a discrete
|
|
@@ -101,16 +103,18 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
101
103
|
/**
|
|
102
104
|
Runs d3-stack over the discrete groups with the configured order and
|
|
103
105
|
offset. Sorts `stackKeys` in place when the order is an explicit key array.
|
|
104
|
-
|
|
106
|
+
A threshold bucket (see `stackThreshold.ts`) stacks last, on top.
|
|
107
|
+
*/ function runStack(viz, stackKeys, stackGroupsData, opp, bucketKeys) {
|
|
105
108
|
const order = viz._stackOrder;
|
|
106
109
|
// An explicit key array orders `stackKeys` directly (then d3-stack keeps
|
|
107
110
|
// that order via `stackOrderNone`); every other order is a comparator that
|
|
108
111
|
// reranks the series d3-stack builds, so `stackKeys` is left in input order.
|
|
109
112
|
if (Array.isArray(order)) stackKeys.sort((a, b)=>order.indexOf(a) - order.indexOf(b));
|
|
113
|
+
const stackOrder = Array.isArray(order) ? d3Shape.stackOrderNone : order;
|
|
110
114
|
// d3-stack's generics don't model d3plus's dynamically-keyed rows; the
|
|
111
115
|
// order/offset/value accessors are cast (`as never`) at the boundary, and
|
|
112
116
|
// the configured stack is invoked as a `Row[][] -> number[][][]` function.
|
|
113
|
-
return d3Shape.stack().keys(stackKeys).offset(viz._stackOffset).order(
|
|
117
|
+
return d3Shape.stack().keys(stackKeys).offset(viz._stackOffset).order(bucketKeys.size ? orderLast(stackOrder, bucketKeys) : stackOrder).value((group, key)=>{
|
|
114
118
|
const d = group.filter((g)=>g.id === key);
|
|
115
119
|
return d.length ? d[0][opp] : 0;
|
|
116
120
|
})(stackGroupsData);
|
|
@@ -135,7 +139,8 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
135
139
|
} else {
|
|
136
140
|
data.sort((a, b)=>a[viz.schema.discrete] - b[viz.schema.discrete]);
|
|
137
141
|
}
|
|
138
|
-
const
|
|
142
|
+
const bucketKeys = new Set(axisData.filter((d)=>d.data?._isAggregation).map((d)=>d.id));
|
|
143
|
+
const stackData = runStack(viz, stackKeys, stackGroupsData, opp, bucketKeys);
|
|
139
144
|
const discreteData = viz.schema.discrete === "x" ? xData : yData;
|
|
140
145
|
// Trend fits and bar error bars (on their stacked ends) widen the stack's extent.
|
|
141
146
|
const widen = trendDomainValues(viz._trendFits || []);
|
|
@@ -158,9 +163,20 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
158
163
|
plotInitialDomains: domains,
|
|
159
164
|
plotDiscreteKeys: discreteKeys,
|
|
160
165
|
plotStackData: stackData,
|
|
161
|
-
plotStackKeys: stackKeys
|
|
166
|
+
plotStackKeys: stackKeys,
|
|
167
|
+
plotStackPositions: drawnStackPositions(viz, axisData, stackData, stackKeys)
|
|
162
168
|
};
|
|
163
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
|
+
}
|
|
164
180
|
/** Non-stacked branch: data-values-or-extent domains per axis. */ function computeNonStackedDomains(viz, ctx) {
|
|
165
181
|
const { axisData, xData, x2Data, yData, y2Data } = ctx;
|
|
166
182
|
const xTime = viz._xTime, x2Time = viz._x2Time, yTime = viz._yTime, y2Time = viz._y2Time;
|
|
@@ -172,9 +188,10 @@ import { trendDomainValues } from "./trendLines.js";
|
|
|
172
188
|
}
|
|
173
189
|
const domains = {
|
|
174
190
|
x: isSpanAxis(viz, "x") ? spanDomain(viz, axisData) : !xTime && viz.schema.discrete === "x" || viz.schema.xSort || viz._swarm?.cross === "x" ? xData : extent(xData),
|
|
175
|
-
|
|
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),
|
|
176
193
|
y: isSpanAxis(viz, "y") ? spanDomain(viz, axisData) : !yTime && viz.schema.discrete === "y" || viz.schema.ySort || viz._swarm?.cross === "y" ? yData : extent(yData),
|
|
177
|
-
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)
|
|
178
195
|
};
|
|
179
196
|
return {
|
|
180
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
|
/**
|
|
@@ -87,31 +155,38 @@ import { shapeConfigFor } from "../features/emitHelpers.js";
|
|
|
87
155
|
to the scale's nearest end instead.
|
|
88
156
|
*/ function axisEstimate(test, configScale, domain) {
|
|
89
157
|
return (d)=>{
|
|
90
|
-
if (configScale === "log" && d === 0) d = domain[0] < 0 ?
|
|
158
|
+
if (configScale === "log" && d === 0) d = test._givenDomain()[domain[0] < 0 ? 1 : 0];
|
|
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
|
};
|