@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
|
@@ -34,9 +34,14 @@
|
|
|
34
34
|
scale's `range`, each tick at its slot's center: one bar each, for one
|
|
35
35
|
label per bar), so where two narrow neighbors can't both fit, the
|
|
36
36
|
narrower bar's label is the one hidden; every other label stays as it
|
|
37
|
-
is.
|
|
38
|
-
|
|
37
|
+
is. A label with none shown beside it widens no further than the ends
|
|
38
|
+
of the axis (`bounds`, the scale's `range` by default) allow, centered
|
|
39
|
+
on its tick. When no label fits whole, each is drawn in its own share
|
|
40
|
+
instead, cut short if need be. `resize` measures a label again at a
|
|
41
|
+
given width, within that width when `keepShare`.
|
|
42
|
+
*/ export function fitOwnSpaces(textData, spaces, range, resize, bounds = range) {
|
|
39
43
|
const share = (t)=>spaces[t.i] - t.fP * 2;
|
|
44
|
+
const around = (t)=>roomAround(t.position, bounds);
|
|
40
45
|
const pending = new Set(textData.filter((t)=>!t.fits));
|
|
41
46
|
// A label still waiting to widen keeps to its own share for now.
|
|
42
47
|
const extent = (t)=>pending.has(t) ? Math.min(t.width, share(t)) : t.width;
|
|
@@ -51,8 +56,8 @@
|
|
|
51
56
|
shown(datum.i, -1, skip),
|
|
52
57
|
shown(datum.i, 1, skip)
|
|
53
58
|
].filter((t)=>t !== undefined).map((t)=>2 * (Math.abs(t.position - datum.position) - extent(t) / 2 - datum.fP));
|
|
54
|
-
// With no label shown beside it, a label may
|
|
55
|
-
const space = Math.floor(widths.length ? Math.min(...widths) :
|
|
59
|
+
// With no label shown beside it, a label may reach the nearer end of the axis.
|
|
60
|
+
const space = Math.floor(widths.length ? Math.min(...widths) : around(datum));
|
|
56
61
|
if (space > share(datum)) resize(datum, space);
|
|
57
62
|
return datum.fits;
|
|
58
63
|
};
|
|
@@ -73,6 +78,95 @@
|
|
|
73
78
|
if (!widen(datum, false)) widen(datum, true);
|
|
74
79
|
datum.truncated = !datum.fits;
|
|
75
80
|
});
|
|
81
|
+
if (textData.every((t)=>t.truncated)) textData.forEach((datum)=>{
|
|
82
|
+
const space = Math.floor(Math.min(share(datum), around(datum)));
|
|
83
|
+
if (space <= 0) return;
|
|
84
|
+
resize(datum, space, true);
|
|
85
|
+
datum.truncated = !datum.lines.length;
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
The widest a label centered on its tick at `position` can be without
|
|
90
|
+
reaching past either end of `bounds` (0 for a tick outside them).
|
|
91
|
+
*/ export function roomAround(position, bounds) {
|
|
92
|
+
const lo = Math.min(...bounds);
|
|
93
|
+
const hi = Math.max(...bounds);
|
|
94
|
+
return Math.max(0, 2 * Math.min(position - lo, hi - position));
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
Measures each label left shown along a vertical axis again in the room
|
|
98
|
+
the hidden labels beside it leave: up to its padding short of the
|
|
99
|
+
nearest label shown on either side, and of the ends of the axis
|
|
100
|
+
(`bounds`), centered on its tick. Labels are first measured in room for
|
|
101
|
+
one at every tick, so the ones left shown after thinning could take more
|
|
102
|
+
lines. Only labels that don't fit whole are measured again, and only in
|
|
103
|
+
more room than they had; that room keeps them clear of their neighbors
|
|
104
|
+
and within the axis, so no two shown labels crowd and none reaches
|
|
105
|
+
further past an end than before.
|
|
106
|
+
*/ export function regrowShown(textData, resize, bounds) {
|
|
107
|
+
const shown = textData.filter((t)=>!t.truncated);
|
|
108
|
+
if (shown.length === textData.length) return;
|
|
109
|
+
const rooms = shown.map((datum, i)=>{
|
|
110
|
+
const gaps = [
|
|
111
|
+
shown[i - 1],
|
|
112
|
+
shown[i + 1]
|
|
113
|
+
].filter((t)=>t !== undefined).map((t)=>Math.abs(t.position - datum.position));
|
|
114
|
+
const room = Math.min(roomAround(datum.position, bounds), ...gaps);
|
|
115
|
+
return Math.floor(room - datum.fP);
|
|
116
|
+
});
|
|
117
|
+
shown.forEach((datum, i)=>{
|
|
118
|
+
if (!datum.fits && rooms[i] > datum.space) resize(datum, rooms[i]);
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
Picks which labels a vertical axis shows so that each takes as many
|
|
123
|
+
lines as it can, as a gradient color scale's few labels do: for a
|
|
124
|
+
bucketed color scale, whose every bucket has a label. While some label
|
|
125
|
+
shown is cut short, labels are hidden at an even interval, the first
|
|
126
|
+
and last always kept, until every label shown fits whole, or else as far
|
|
127
|
+
as gives the labels shown the most lines (the fewest any of them has),
|
|
128
|
+
hiding no more labels than that takes. Each label shown is measured in
|
|
129
|
+
the room between the nearest labels shown on either side, up to its
|
|
130
|
+
padding short of them (a label at an end, twice its distance to the one
|
|
131
|
+
beside it), and never less than every label had at first (`floor`):
|
|
132
|
+
one at an end reaching past the end of the axis narrows the axis's
|
|
133
|
+
range, as a gradient's do. `resize` measures a label again in a room.
|
|
134
|
+
*/ export function thinForLines(textData, resize, floor) {
|
|
135
|
+
const n = textData.length;
|
|
136
|
+
const shown = textData.filter((t)=>!t.truncated);
|
|
137
|
+
if (n < 3 || shown.every((t)=>t.fits)) return;
|
|
138
|
+
const rooms = (set)=>set.map((datum, i)=>{
|
|
139
|
+
const gaps = [
|
|
140
|
+
set[i - 1],
|
|
141
|
+
set[i + 1]
|
|
142
|
+
].filter((t)=>t !== undefined).map((t)=>Math.abs(t.position - datum.position));
|
|
143
|
+
const gap = gaps.length ? Math.min(...gaps) : 0;
|
|
144
|
+
return Math.max(floor, Math.floor(gap - datum.fP));
|
|
145
|
+
});
|
|
146
|
+
// How a set of labels shown measures: the fewest lines any has, and
|
|
147
|
+
// whether every one fits whole.
|
|
148
|
+
const score = (set)=>{
|
|
149
|
+
const sized = rooms(set).map((room, i)=>resize(set[i], room));
|
|
150
|
+
return {
|
|
151
|
+
set,
|
|
152
|
+
lines: Math.min(...sized.map((t)=>t.lines.length)),
|
|
153
|
+
whole: sized.every((t)=>t.fits)
|
|
154
|
+
};
|
|
155
|
+
};
|
|
156
|
+
const even = (m)=>Array.from({
|
|
157
|
+
length: m
|
|
158
|
+
}, (_, j)=>textData[Math.round(j * (n - 1) / (m - 1))]);
|
|
159
|
+
let best = score(shown);
|
|
160
|
+
for(let m = shown.length - 1; m >= 2 && !best.whole; m--){
|
|
161
|
+
const next = score(even(m));
|
|
162
|
+
if (next.whole || next.lines > best.lines) best = next;
|
|
163
|
+
}
|
|
164
|
+
const keep = new Set(best.set);
|
|
165
|
+
const chosen = rooms(best.set);
|
|
166
|
+
textData.forEach((datum)=>{
|
|
167
|
+
datum.truncated = !keep.has(datum);
|
|
168
|
+
});
|
|
169
|
+
best.set.forEach((datum, i)=>resize(datum, chosen[i]));
|
|
76
170
|
}
|
|
77
171
|
/**
|
|
78
172
|
Whether label `b` sits too close to label `a` before it, leaving less
|
|
@@ -24,25 +24,31 @@
|
|
|
24
24
|
duck-typed AxisLike shape works).
|
|
25
25
|
*/ import { max } from "d3-array";
|
|
26
26
|
import { timeFormatDefaultLocale } from "d3-time-format";
|
|
27
|
-
import { applyTitleMargin, computeAxisBounds, computeBuffers, createTextData, isDiscreteScale, wholeLineLabels } from "./axisLayoutLabels.js";
|
|
27
|
+
import { applyTitleMargin, computeAxisBounds, computeBuffers, createTextData, isDiscreteScale, labelDepth, limitLabels, wholeLineLabels } from "./axisLayoutLabels.js";
|
|
28
|
+
import { labelRoom } from "./axisLabelSize.js";
|
|
29
|
+
import { strictMaxSize } from "./axisMaxSize.js";
|
|
28
30
|
import { buildTickFormat, labelSets, setAxisScale } from "./axisLayoutScale.js";
|
|
29
31
|
import { FLAT, autoAngle, settingTurn, slantedReach } from "./axisLabelAngle.js";
|
|
30
32
|
import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
33
|
+
/** A tick's pixel size along the axis, read from its shape config. */ function tickSize(axis, width) {
|
|
34
|
+
const tickValue = axis.schema.shape === "Circle" ? axis.schema.shapeConfig.r : axis.schema.shape === "Rect" ? axis.schema.shapeConfig[width] : axis.schema.shapeConfig.strokeWidth;
|
|
35
|
+
return typeof tickValue !== "function" ? ()=>tickValue : tickValue;
|
|
36
|
+
}
|
|
31
37
|
/**
|
|
32
38
|
The standalone axis layout pass. Accepts any object satisfying the
|
|
33
39
|
Axis-instance shape (the production `Axis` class is the canonical input).
|
|
34
40
|
Pure compute — no DOM, no rendering. Mutates the input to set
|
|
35
41
|
`_d3Scale`/`_outerBounds`/`_margin`/etc. for callers that read those off
|
|
36
|
-
the instance afterward.
|
|
37
|
-
|
|
42
|
+
the instance afterward. `measureAxis` (see `axisLimit.ts`) runs it again
|
|
43
|
+
without the title when the labels don't fit `maxSize` beside it.
|
|
44
|
+
*/ export function layoutAxis(axis) {
|
|
38
45
|
const timeLocaleObj = axisTimeLocale(axis);
|
|
39
46
|
timeFormatDefaultLocale(timeLocaleObj);
|
|
40
47
|
const { width, height, x, y, horizontal, opposite } = axis._position, p = axis.schema.padding, rangeOuter = [
|
|
41
48
|
p,
|
|
42
49
|
axis.schema[width] - p
|
|
43
50
|
];
|
|
44
|
-
const
|
|
45
|
-
const tickGet = typeof tickValue !== "function" ? ()=>tickValue : tickValue;
|
|
51
|
+
const tickGet = tickSize(axis, width);
|
|
46
52
|
const margin = axis._margin = {
|
|
47
53
|
top: 0,
|
|
48
54
|
right: 0,
|
|
@@ -52,24 +58,27 @@ import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
|
52
58
|
resetAxisDates(axis);
|
|
53
59
|
axis._scaleData = axisScaleData(axis);
|
|
54
60
|
let labels = [], range = [], ticks = [];
|
|
55
|
-
const tickFormat = buildTickFormat(axis, timeLocaleObj, ()=>
|
|
61
|
+
const tickFormat = buildTickFormat(axis, timeLocaleObj, ()=>labels);
|
|
56
62
|
axis._labelFormat = tickFormat;
|
|
57
63
|
// Rebuilds the scale (over `newRange`, else the configured range) and
|
|
58
|
-
// keeps the
|
|
64
|
+
// keeps the labels the formatter reads in step with it.
|
|
59
65
|
const rescale = (newRange)=>({ range, ticks, labels } = setAxisScale(axis, rangeOuter, tickGet, newRange));
|
|
60
66
|
axis._labelSet = 0;
|
|
61
67
|
rescale();
|
|
62
|
-
applyTitleMargin(axis, {
|
|
68
|
+
const titleRange = applyTitleMargin(axis, {
|
|
63
69
|
range,
|
|
64
70
|
p,
|
|
65
71
|
height,
|
|
66
72
|
margin
|
|
67
73
|
});
|
|
68
74
|
const { hBuff, wBuff } = computeBuffers(axis, ticks, tickGet, height);
|
|
69
|
-
// Labels at given values naming things (one per variable-width bar
|
|
70
|
-
// within their own share of the axis
|
|
71
|
-
//
|
|
72
|
-
|
|
75
|
+
// Labels at given values naming things (one per variable-width bar, or a
|
|
76
|
+
// bucketed color scale's) wrap within their own share of the axis: along
|
|
77
|
+
// a horizontal axis, a wide bar's label lies flat across it while a
|
|
78
|
+
// narrow one's wraps (see `fitOwnSpaces`); along a vertical one, the
|
|
79
|
+
// labels left shown take the room the hidden ones leave (see
|
|
80
|
+
// `regrowShown`).
|
|
81
|
+
const named = !isDiscreteScale(axis.schema.scale) && rotatesLabels(axis, labels, tickFormat);
|
|
73
82
|
const labelCtx = {
|
|
74
83
|
rangeOuter,
|
|
75
84
|
horizontal,
|
|
@@ -77,7 +86,9 @@ import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
|
77
86
|
p,
|
|
78
87
|
tickFormat,
|
|
79
88
|
rescale,
|
|
80
|
-
ownSpace
|
|
89
|
+
ownSpace: horizontal && named,
|
|
90
|
+
regrow: !horizontal && named,
|
|
91
|
+
strict: strictMaxSize(axis, horizontal)
|
|
81
92
|
};
|
|
82
93
|
const setting = axis._labelRotationSetting;
|
|
83
94
|
turnLabels(axis, settingTurn(setting, horizontal));
|
|
@@ -95,14 +106,24 @@ import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
|
95
106
|
if (setting === undefined && horizontal) textData = autoRotateLabels(axis, textData, {
|
|
96
107
|
labels,
|
|
97
108
|
tickFormat,
|
|
98
|
-
ownSpace,
|
|
109
|
+
ownSpace: labelCtx.ownSpace,
|
|
99
110
|
rangeOuter,
|
|
100
111
|
relayout: ()=>layoutLabels(axis, rescale(), labelCtx)
|
|
101
112
|
});
|
|
102
113
|
hideTruncatedTicks(axis, textData, ticks);
|
|
114
|
+
alignLabelOffsets(axis, textData);
|
|
115
|
+
limitAxis(axis, textData, labelCtx);
|
|
103
116
|
axis._labelOverflow = slantedOverflow(axis, textData, range);
|
|
117
|
+
// The title is drawn across the final range, which the label passes can
|
|
118
|
+
// have changed.
|
|
119
|
+
applyTitleMargin(axis, {
|
|
120
|
+
range,
|
|
121
|
+
p,
|
|
122
|
+
height,
|
|
123
|
+
margin,
|
|
124
|
+
measured: titleRange
|
|
125
|
+
});
|
|
104
126
|
const labelHeight = max(textData, (t)=>t.height) || 0;
|
|
105
|
-
alignLabelOffsets(axis, textData);
|
|
106
127
|
const bounds = computeAxisBounds(axis, {
|
|
107
128
|
textData,
|
|
108
129
|
rangeOuter,
|
|
@@ -148,6 +169,18 @@ import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
|
148
169
|
Math.max(0, reach(last)[1] - (hi - last.position))
|
|
149
170
|
];
|
|
150
171
|
}
|
|
172
|
+
/**
|
|
173
|
+
Under a strict `maxSize` (see `strictMaxSize`), leaves out each label
|
|
174
|
+
reaching further out than the limit leaves room for (see
|
|
175
|
+
`limitLabels`); its tick stays. Records what it did on `axis._limited`.
|
|
176
|
+
*/ function limitAxis(axis, textData, ctx) {
|
|
177
|
+
const { horizontal, hBuff, p, strict } = ctx;
|
|
178
|
+
const room = labelRoom(axis, horizontal, hBuff, p);
|
|
179
|
+
axis._limited = strict ? {
|
|
180
|
+
dropped: limitLabels(textData, horizontal, room),
|
|
181
|
+
room
|
|
182
|
+
} : undefined;
|
|
183
|
+
}
|
|
151
184
|
/** The ticks whose labels the layout hides no longer count as visible. */ function hideTruncatedTicks(axis, textData, ticks) {
|
|
152
185
|
const hidden = new Set(textData.filter((t)=>t.truncated).map((t)=>t.d));
|
|
153
186
|
if (hidden.size) axis._visibleTicks = ticks.filter((t)=>!hidden.has(t));
|
|
@@ -225,28 +258,21 @@ import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
|
225
258
|
over the narrowed range and measuring again. Reads `axis._labelRotation`
|
|
226
259
|
for the labels' orientation.
|
|
227
260
|
*/ function layoutLabels(axis, scale, ctx) {
|
|
228
|
-
const { rangeOuter, horizontal, hBuff, p,
|
|
261
|
+
const { rangeOuter, horizontal, hBuff, p, rescale, strict } = ctx;
|
|
229
262
|
let { labels } = scale;
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
horizontal,
|
|
244
|
-
hBuff,
|
|
245
|
-
p,
|
|
246
|
-
tickFormat,
|
|
247
|
-
ownSpace,
|
|
248
|
-
offset: 2
|
|
249
|
-
});
|
|
263
|
+
const measure = (offset = 1)=>createTextData(axis, {
|
|
264
|
+
...ctx,
|
|
265
|
+
labels,
|
|
266
|
+
offset
|
|
267
|
+
});
|
|
268
|
+
let textData = measure();
|
|
269
|
+
let offsetEnabled = axis.schema.labelOffset && textData.some((d)=>d.truncated);
|
|
270
|
+
if (offsetEnabled) {
|
|
271
|
+
const staggered = measure(2);
|
|
272
|
+
// Under a strict `maxSize`, labels stagger only when both rows fit.
|
|
273
|
+
if (strict && !staggerFits(staggered, labelRoom(axis, horizontal, hBuff, p), horizontal)) offsetEnabled = false;
|
|
274
|
+
else textData = staggered;
|
|
275
|
+
}
|
|
250
276
|
// Narrowing the range can change which labels a time axis draws (its ticks
|
|
251
277
|
// follow the range); a new first or last label is measured again, a few
|
|
252
278
|
// times at most.
|
|
@@ -286,22 +312,21 @@ import { axisScaleData, axisTimeLocale, resetAxisDates } from "./timeValues.js";
|
|
|
286
312
|
const ends = endLabels(textData);
|
|
287
313
|
[first, last] = newRange;
|
|
288
314
|
({ labels } = rescale(newRange));
|
|
289
|
-
textData =
|
|
290
|
-
labels,
|
|
291
|
-
rangeOuter,
|
|
292
|
-
horizontal,
|
|
293
|
-
hBuff,
|
|
294
|
-
p,
|
|
295
|
-
tickFormat,
|
|
296
|
-
ownSpace,
|
|
297
|
-
offset: offsetEnabled ? 2 : 1
|
|
298
|
-
});
|
|
315
|
+
textData = measure(offsetEnabled ? 2 : 1);
|
|
299
316
|
// A slanted label's reach is lopsided, so its range narrows again until
|
|
300
317
|
// the label fits; others stop once the same labels end the axis.
|
|
301
318
|
if (endLabels(textData) === ends && !textData.some((t)=>t.slant)) break;
|
|
302
319
|
}
|
|
303
320
|
return textData;
|
|
304
321
|
}
|
|
322
|
+
/**
|
|
323
|
+
Whether staggered labels, each row as deep as its labels and the second
|
|
324
|
+
row set out past the first, reach out from the axis no further than
|
|
325
|
+
`room`.
|
|
326
|
+
*/ export function staggerFits(textData, room, horizontal) {
|
|
327
|
+
const offset = max(textData, (t)=>t.offset || 0) || 0;
|
|
328
|
+
return textData.every((t)=>!t.lines.length || Math.ceil(labelDepth(t, horizontal) + (t.offset ? offset : 0)) <= room);
|
|
329
|
+
}
|
|
305
330
|
/** The values of the first and last labels shown, to tell when they change. */ function endLabels(textData) {
|
|
306
331
|
const shown = textData.filter((t)=>!t.truncated);
|
|
307
332
|
const ends = [
|
|
@@ -3,30 +3,29 @@
|
|
|
3
3
|
compute — no DOM. `createTextData` measures every label via `textWrap`,
|
|
4
4
|
resolves truncation/offset, and returns the `textData` array the paint
|
|
5
5
|
phase consumes; `computeAxisBounds` derives `_outerBounds` + margins.
|
|
6
|
-
*/ import { max
|
|
7
|
-
import { fontFamily as d3plusFontFamily
|
|
8
|
-
import {
|
|
6
|
+
*/ import { max } from "d3-array";
|
|
7
|
+
import { fontFamily as d3plusFontFamily } from "@d3plus/text";
|
|
8
|
+
import { labelLineHeight } from "./axisLabelLineHeight.js";
|
|
9
|
+
import { titleRoom } from "./axisTitle.js";
|
|
10
|
+
import { fitLabelRoom } from "./axisLabelRoom.js";
|
|
9
11
|
import { slantedDepth, slantedWrapSize } from "./axisLabelAngle.js";
|
|
12
|
+
import { isDiscreteScale, ownLabelSpaces, wholeLineLabels } from "./axisLabelKinds.js";
|
|
13
|
+
import { calculateLabelSize, labelRoom } from "./axisLabelSize.js";
|
|
10
14
|
import { slantedLineWidth, slantedLines } from "./axisSlantWrap.js";
|
|
11
|
-
import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axisLabelThinning.js";
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const { range, p, height, margin } = ctx;
|
|
26
|
-
const { fontFamily, fontSize, lineHeight } = axis.schema.titleConfig;
|
|
27
|
-
const titleWrap = textWrap().fontFamily(typeof fontFamily === "function" ? fontFamily() : fontFamily).fontSize(typeof fontSize === "function" ? fontSize() : fontSize).lineHeight(typeof lineHeight === "function" ? lineHeight() : lineHeight).width(range[range.length - 1] - range[0] - p * 2).height(axis.schema[height] - axis.schema.tickSize - p * 2);
|
|
28
|
-
const lines = titleWrap(axis.schema.title).lines.length;
|
|
29
|
-
margin[axis.schema.orient] = lines * titleWrap.lineHeight() + p;
|
|
15
|
+
import { fitOwnSpaces, regrowShown, thinForLines, thinEvenly, thinGreedily, thinGreedilyShown } from "./axisLabelThinning.js";
|
|
16
|
+
export { isDiscreteScale, ownLabelSpaces, wholeLineLabels } from "./axisLabelKinds.js";
|
|
17
|
+
/**
|
|
18
|
+
Applies the axis title's wrapped height to the orient-side margin, as
|
|
19
|
+
the title TextBox draws it across `range` (see `titleRoom`). Given the
|
|
20
|
+
range it was `measured` across before, it measures again only when the
|
|
21
|
+
range has changed. Returns the range measured across. A title left out
|
|
22
|
+
(see `measureAxis` in `axisLimit.ts`) claims no room.
|
|
23
|
+
*/ export function applyTitleMargin(axis, ctx) {
|
|
24
|
+
const { range, p, height, margin, measured } = ctx;
|
|
25
|
+
const same = measured && measured[0] === range[0] && measured[measured.length - 1] === range[range.length - 1];
|
|
26
|
+
if (!axis.schema.title || axis._dropTitle || same) return range;
|
|
27
|
+
margin[axis.schema.orient] = titleRoom(axis, range, axis.schema[height] - axis.schema.tickSize - p * 2);
|
|
28
|
+
return range;
|
|
30
29
|
}
|
|
31
30
|
/** Resolves the tick height/width buffers from the shape config. */ export function computeBuffers(axis, _ticks, tickGet, height) {
|
|
32
31
|
// The ternary and `tickGet` already resolve per-tick functions to a single
|
|
@@ -46,79 +45,6 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
46
45
|
wBuff
|
|
47
46
|
};
|
|
48
47
|
}
|
|
49
|
-
/**
|
|
50
|
-
Wraps + measures a single label, returning its sized text result. Given a
|
|
51
|
-
`cache`, a label whose text, font, and space match one measured before
|
|
52
|
-
reuses that measurement.
|
|
53
|
-
*/ function calculateLabelSize(axis, datum, ctx, cache) {
|
|
54
|
-
const { horizontal, hBuff, p, tickFormat } = ctx;
|
|
55
|
-
const { d, i, fF, fP, fS, rotate, space, angle, slant } = datum;
|
|
56
|
-
const h = rotate ? "width" : "height", w = rotate ? "height" : "width";
|
|
57
|
-
const lineHeight = axis.schema.shapeConfig.lineHeight ? axis.schema.shapeConfig.lineHeight(d, i) : undefined;
|
|
58
|
-
const text = tickFormat(d);
|
|
59
|
-
const wSize = min([
|
|
60
|
-
axis.schema.maxSize,
|
|
61
|
-
axis.schema.width
|
|
62
|
-
]);
|
|
63
|
-
const depth = labelRoom(axis, horizontal, hBuff, p);
|
|
64
|
-
const slanted = slant ? slantedWrapSize(angle, horizontal, depth, space, lineHeight ?? Math.ceil(fS * 1.4)) : undefined;
|
|
65
|
-
const key = cache && JSON.stringify([
|
|
66
|
-
text,
|
|
67
|
-
fF,
|
|
68
|
-
fP,
|
|
69
|
-
fS,
|
|
70
|
-
lineHeight,
|
|
71
|
-
rotate,
|
|
72
|
-
slant && angle,
|
|
73
|
-
slant && ctx.slantWidth,
|
|
74
|
-
space
|
|
75
|
-
]);
|
|
76
|
-
const cached = key ? cache.get(key) : undefined;
|
|
77
|
-
if (cached) return {
|
|
78
|
-
...cached,
|
|
79
|
-
lines: cached.lines.slice(),
|
|
80
|
-
widths: cached.widths.slice()
|
|
81
|
-
};
|
|
82
|
-
const wrap = textWrap().fontFamily(fF).fontSize(fS).lineHeight(lineHeight);
|
|
83
|
-
if (slanted) {
|
|
84
|
-
// Slanted labels wrap between words, never mid-word.
|
|
85
|
-
wrap.split(wholeWordSplit).width(Math.min(slanted.width, ctx.slantWidth ?? Infinity)).height(slanted.height);
|
|
86
|
-
} else {
|
|
87
|
-
wrap[w](horizontal ? space : depth);
|
|
88
|
-
wrap[h](horizontal ? depth : space);
|
|
89
|
-
}
|
|
90
|
-
let res, fits;
|
|
91
|
-
if (ctx.wholeLine) {
|
|
92
|
-
// Measured across the whole axis (`maxSize` caps its depth, not its
|
|
93
|
-
// length), a label that still breaks onto a second line can't be drawn
|
|
94
|
-
// whole on one.
|
|
95
|
-
wrap.width(axis.schema.width - p * 2);
|
|
96
|
-
res = wrap(text);
|
|
97
|
-
fits = !res.truncated && res.lines.filter((l)=>l !== "").length <= 1;
|
|
98
|
-
} else {
|
|
99
|
-
res = wrap(text);
|
|
100
|
-
// A label that only fits by breaking a word mid-word doesn't fit.
|
|
101
|
-
fits = wholeWordFit(res, ()=>wrap.split(wholeWordSplit)(text)).fits;
|
|
102
|
-
// A label wider than its share of the axis wraps to nothing; measure it
|
|
103
|
-
// across the whole axis instead, so the overlap pass thins the labels out.
|
|
104
|
-
if (horizontal && !rotate && `${text}`.trim() && !res.lines.some((l)=>l !== "")) {
|
|
105
|
-
wrap.width(wSize - p * 2);
|
|
106
|
-
res = wrap(text);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
res.fits = fits;
|
|
110
|
-
res.lines = res.lines.filter((d)=>d !== "");
|
|
111
|
-
res.width = res.lines.length ? Math.ceil(max(res.widths)) : 0;
|
|
112
|
-
res.height = res.lines.length ? Math.ceil(res.lines.length * wrap.lineHeight()) + fP : 0;
|
|
113
|
-
if (key) cache.set(key, {
|
|
114
|
-
lines: res.lines.slice(),
|
|
115
|
-
widths: res.widths.slice(),
|
|
116
|
-
width: res.width,
|
|
117
|
-
height: res.height,
|
|
118
|
-
fits
|
|
119
|
-
});
|
|
120
|
-
return res;
|
|
121
|
-
}
|
|
122
48
|
/** Assigns vertical offsets to alternating labels that would overlap. */ function calculateOffset(arr = [], horizontal) {
|
|
123
49
|
let offset = 0;
|
|
124
50
|
arr.forEach((datum)=>{
|
|
@@ -145,7 +71,9 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
145
71
|
const slant = !!axis._labelRotation && axis._labelSlant;
|
|
146
72
|
return labels.map((d, i)=>{
|
|
147
73
|
const fF = typeof fontFamilyConfig === "function" ? fontFamilyConfig(d, i) : fontFamilyConfig, fP = typeof fontPadding === "function" ? fontPadding(d, i) : fontPadding, fS = typeof fontSize === "function" ? fontSize(d, i) : fontSize, position = axis._getPosition(d);
|
|
148
|
-
|
|
74
|
+
// Measured with the line height the label is painted with (see
|
|
75
|
+
// `configureTickShape`).
|
|
76
|
+
const lineHeight = labelLineHeight(axis.schema.shapeConfig, d, i, fS);
|
|
149
77
|
// Base record — `space`/`lines`/`width`/`height` are filled later.
|
|
150
78
|
return {
|
|
151
79
|
d,
|
|
@@ -181,11 +109,18 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
181
109
|
]);
|
|
182
110
|
}, 0);
|
|
183
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
Wraps a vertical axis's flat labels again in the box they are painted
|
|
114
|
+
in (see `fitLabelRoom`): painted only as wide as the widest label, a cut
|
|
115
|
+
label is cut there.
|
|
116
|
+
*/ function fitPaintedRoom(axis, textData, horizontal, measure) {
|
|
117
|
+
if (!horizontal && typeof axis.schema.fixedSize !== "number" && !textData.some((t)=>t.rotate || t.slant)) fitLabelRoom(textData, measure);
|
|
118
|
+
}
|
|
184
119
|
/**
|
|
185
120
|
Measures every label, computes per-label space, sizes via `textWrap`, and
|
|
186
121
|
resolves truncation (and optional offset). Returns the `textData` array.
|
|
187
122
|
*/ export function createTextData(axis, ctx) {
|
|
188
|
-
const { labels, rangeOuter, horizontal, hBuff, p, tickFormat, offset = 1, ownSpace } = ctx;
|
|
123
|
+
const { labels, rangeOuter, horizontal, hBuff, p, tickFormat, offset = 1, ownSpace, regrow, strict } = ctx;
|
|
189
124
|
const wholeLine = horizontal && !axis._labelRotation && wholeLineLabels(axis, labels);
|
|
190
125
|
// Every label is shown until the overlap pass below thins them.
|
|
191
126
|
axis._shownLabels = labels;
|
|
@@ -194,7 +129,9 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
194
129
|
hBuff,
|
|
195
130
|
p,
|
|
196
131
|
tickFormat,
|
|
197
|
-
wholeLine
|
|
132
|
+
wholeLine,
|
|
133
|
+
ownSpace,
|
|
134
|
+
strict
|
|
198
135
|
};
|
|
199
136
|
let textData = baseTextData(axis, labels);
|
|
200
137
|
const maxSpace = maxLabelSpace(axis, textData, rangeOuter);
|
|
@@ -206,9 +143,12 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
206
143
|
// Thinning measures the labels again as they read the ones shown (see
|
|
207
144
|
// `show`), mostly to the same text, so each text is measured once.
|
|
208
145
|
const measured = new Map();
|
|
209
|
-
const size = (datum, space = (spaces ? spaces[datum.i] : maxSpace) - datum.fP * 2)=>{
|
|
146
|
+
const size = (datum, space = (spaces ? spaces[datum.i] : maxSpace) - datum.fP * 2, keepShare = false)=>{
|
|
210
147
|
datum.space = space;
|
|
211
|
-
const { lines, widths, width, height, fits } = calculateLabelSize(axis, datum,
|
|
148
|
+
const { lines, widths, width, height, fits, cut } = calculateLabelSize(axis, datum, keepShare ? {
|
|
149
|
+
...labelCtx,
|
|
150
|
+
keepShare
|
|
151
|
+
} : labelCtx, measured);
|
|
212
152
|
// A label measured wider than its share (see `calculateLabelSize`) is
|
|
213
153
|
// painted at that width; the overlap pass below thins its neighbors.
|
|
214
154
|
if (horizontal && !datum.rotate) datum.space = Math.max(datum.space, Math.ceil(width));
|
|
@@ -218,7 +158,8 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
218
158
|
widths,
|
|
219
159
|
width,
|
|
220
160
|
height,
|
|
221
|
-
fits
|
|
161
|
+
fits,
|
|
162
|
+
cut
|
|
222
163
|
});
|
|
223
164
|
};
|
|
224
165
|
textData = textData.map((datum)=>size(datum));
|
|
@@ -232,9 +173,14 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
232
173
|
const shown = textData.filter((_t, i)=>i % step === 0);
|
|
233
174
|
show(shown, all ? textData : shown);
|
|
234
175
|
} : undefined);
|
|
235
|
-
else if (spaces && horizontal && !axis._labelRotation) fitOwnSpaces(textData, spaces, axis._d3Scale.range(), size);
|
|
176
|
+
else if (spaces && horizontal && !axis._labelRotation) fitOwnSpaces(textData, spaces, axis._d3Scale.range(), size, rangeOuter);
|
|
236
177
|
else if (wholeLine) thinGreedilyShown(textData, horizontal, show);
|
|
237
178
|
else thinGreedily(textData, horizontal);
|
|
179
|
+
if (regrow && !horizontal && !axis._labelRotation) {
|
|
180
|
+
regrowShown(textData, size, rangeOuter);
|
|
181
|
+
if (axis._thinForLines) thinForLines(textData, size, Math.min(...textData.map((t)=>t.space)));
|
|
182
|
+
}
|
|
183
|
+
fitPaintedRoom(axis, textData, horizontal, (t)=>calculateLabelSize(axis, t, labelCtx, measured));
|
|
238
184
|
if (offset > 1) calculateOffset(textData, horizontal);
|
|
239
185
|
return textData;
|
|
240
186
|
}
|
|
@@ -247,47 +193,13 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
247
193
|
const first = textData[0];
|
|
248
194
|
if (!first?.slant) return undefined;
|
|
249
195
|
const { horizontal, hBuff, p, tickFormat, space } = ctx;
|
|
250
|
-
const
|
|
251
|
-
const limit = slantedWrapSize(first.angle, horizontal, labelRoom(axis, horizontal, hBuff, p), space - first.fP * 2, lineHeight(first));
|
|
196
|
+
const limit = slantedWrapSize(first.angle, horizontal, labelRoom(axis, horizontal, hBuff, p), space - first.fP * 2, first.lineHeight);
|
|
252
197
|
return slantedLineWidth(textData.map((d)=>({
|
|
253
198
|
text: tickFormat(d.d),
|
|
254
199
|
fontFamily: d.fF,
|
|
255
200
|
fontSize: d.fS,
|
|
256
|
-
lineHeight: lineHeight
|
|
257
|
-
})), slantedLines(limit.height, lineHeight
|
|
258
|
-
}
|
|
259
|
-
/**
|
|
260
|
-
Each label's own share of an axis whose labels sit unevenly, such as one
|
|
261
|
-
label per variable-width bar (see `Plot/barWidth.ts`): reaching halfway to
|
|
262
|
-
the nearer of its neighbors on either side, so labels wrapped within their
|
|
263
|
-
shares never meet, while one between far-off neighbors keeps the room
|
|
264
|
-
they leave it. A lone label spans the whole range.
|
|
265
|
-
*/ export function ownLabelSpaces(positions, rangeOuter) {
|
|
266
|
-
if (positions.length < 2) return positions.map(()=>Math.abs(rangeOuter[rangeOuter.length - 1] - rangeOuter[0]));
|
|
267
|
-
return positions.map((position, i)=>{
|
|
268
|
-
const gaps = [
|
|
269
|
-
positions[i - 1],
|
|
270
|
-
positions[i + 1]
|
|
271
|
-
].filter((n)=>n !== undefined).map((n)=>Math.abs(position - n));
|
|
272
|
-
return Math.min(...gaps);
|
|
273
|
-
});
|
|
274
|
-
}
|
|
275
|
-
/**
|
|
276
|
-
Whether a horizontal axis's labels are values read in sequence (dates, or
|
|
277
|
-
numbers on a category axis) that are drawn whole on one line: thinned
|
|
278
|
-
rather than wrapped or cut short, since any one of them reads alone.
|
|
279
|
-
Labels naming categories wrap or rotate instead (see `rotatesLabels`).
|
|
280
|
-
*/ export function wholeLineLabels(axis, labels) {
|
|
281
|
-
const { scale } = axis.schema;
|
|
282
|
-
if (scale === "time") return true;
|
|
283
|
-
return isDiscreteScale(scale) && labels.length > 0 && labels.every((d)=>d instanceof Date || !isNaN(d));
|
|
284
|
-
}
|
|
285
|
-
/** Whether a scale places one tick per category (every value labeled in turn). */ export function isDiscreteScale(scale) {
|
|
286
|
-
return [
|
|
287
|
-
"band",
|
|
288
|
-
"ordinal",
|
|
289
|
-
"point"
|
|
290
|
-
].includes(scale);
|
|
201
|
+
lineHeight: d.lineHeight
|
|
202
|
+
})), slantedLines(limit.height, first.lineHeight), limit.width);
|
|
291
203
|
}
|
|
292
204
|
/**
|
|
293
205
|
How far a measured label reaches out from the axis: its height when it
|
|
@@ -298,11 +210,41 @@ import { fitOwnSpaces, thinEvenly, thinGreedily, thinGreedilyShown } from "./axi
|
|
|
298
210
|
if (t.slant) return slantedDepth(t.angle, horizontal, t.width, t.height - t.fP) + (horizontal ? t.fP : 0);
|
|
299
211
|
return t[t.rotate || !horizontal ? "width" : "height"];
|
|
300
212
|
}
|
|
213
|
+
/**
|
|
214
|
+
Leaves out each label that reaches further out from the axis than
|
|
215
|
+
`room` (what its strict `maxSize` leaves the labels, see
|
|
216
|
+
`strictMaxSize`), a staggered one by its row's offset too: it is hidden,
|
|
217
|
+
and claims no room. A label with no lines left in that room is hidden
|
|
218
|
+
too. Returns how many of the labels shown it left out for reaching too
|
|
219
|
+
far.
|
|
220
|
+
*/ export function limitLabels(textData, horizontal, room) {
|
|
221
|
+
let dropped = 0;
|
|
222
|
+
textData.forEach((t)=>{
|
|
223
|
+
if (!t.lines.length) {
|
|
224
|
+
t.truncated = true;
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
const depth = Math.ceil(labelDepth(t, horizontal) + (t.offset ?? 0));
|
|
228
|
+
if (depth <= room) return;
|
|
229
|
+
if (!t.truncated) dropped++;
|
|
230
|
+
Object.assign(t, {
|
|
231
|
+
truncated: true,
|
|
232
|
+
lines: [],
|
|
233
|
+
widths: [],
|
|
234
|
+
width: 0,
|
|
235
|
+
height: 0
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
return dropped;
|
|
239
|
+
}
|
|
301
240
|
/** Derives `_outerBounds` + axis margins from the measured text data. */ export function computeAxisBounds(axis, ctx) {
|
|
302
241
|
const { textData, rangeOuter, hBuff, horizontal, p, width, height, x, y, opposite, margin } = ctx;
|
|
303
242
|
const tBuff = axis.schema.shape === "Line" ? 0 : hBuff;
|
|
243
|
+
// The labels' padding comes with them: none when there are no labels, or
|
|
244
|
+
// when a strict `maxSize` left every one out (see `limitLabels`).
|
|
245
|
+
const labeled = axis._limited ? textData.some((t)=>t.lines.length) : textData.length > 0;
|
|
304
246
|
const bounds = axis._outerBounds = {
|
|
305
|
-
[height]: (max(textData, (t)=>Math.ceil(labelDepth(t, horizontal) + (t.offset ?? 0))) || 0) + (
|
|
247
|
+
[height]: (max(textData, (t)=>Math.ceil(labelDepth(t, horizontal) + (t.offset ?? 0))) || 0) + (labeled ? p : 0),
|
|
306
248
|
[width]: rangeOuter[rangeOuter.length - 1] - rangeOuter[0],
|
|
307
249
|
[x]: rangeOuter[0]
|
|
308
250
|
};
|