@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
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
*/ import { select } from "d3-selection";
|
|
20
20
|
import { stylize } from "@d3plus/dom";
|
|
21
21
|
import { chartBounds } from "./chartGeometry.js";
|
|
22
|
-
import {
|
|
22
|
+
import { attributionStyleDefault } from "../viz/vizDefaults.js";
|
|
23
|
+
import { themeOverlayStyle } from "../viz/vizTheme.js";
|
|
23
24
|
/** An "i" in a circle, drawn like the zoom-control icons (see `zoomControlsMarkup.ts`). */ const INFO_ICON = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" style="width:12px;height:12px;display:block"><circle cx="12" cy="12" r="10"/><line x1="12" y1="11" x2="12" y2="17"/><line x1="12" y1="7" x2="12" y2="7.01"/></svg>';
|
|
24
25
|
/** Markup for a mount-function icon — see `zoomControlsMarkup.ts`'s `iconSlot`. */ const CUSTOM_ICON_SLOT = '<span class="d3plus-attribution-icon" style="display:inline-block;width:12px;height:12px;vertical-align:middle;flex-shrink:0"></span>';
|
|
25
26
|
/** The toggle button's glyph markup: a custom override, or the built-in "i". */ function toggleIcon(viz) {
|
|
@@ -50,15 +51,6 @@ import { attributionStyleDarkDefault, attributionStyleDefault } from "../viz/viz
|
|
|
50
51
|
node.style.borderRadius = open ? "3px 0 0 0" : "3px 0 0 0";
|
|
51
52
|
node.style.padding = open ? "4px 6px" : "2px";
|
|
52
53
|
}
|
|
53
|
-
/** Swaps each entry still at its light default for the dark default. */ function darkAttributionStyle(style) {
|
|
54
|
-
const light = attributionStyleDefault;
|
|
55
|
-
const dark = attributionStyleDarkDefault;
|
|
56
|
-
const out = {
|
|
57
|
-
...style
|
|
58
|
-
};
|
|
59
|
-
for (const key of Object.keys(dark))if (out[key] === light[key]) out[key] = dark[key];
|
|
60
|
-
return out;
|
|
61
|
-
}
|
|
62
54
|
export const attributionFeature = {
|
|
63
55
|
name: "attribution",
|
|
64
56
|
configFields: [
|
|
@@ -72,7 +64,10 @@ export const attributionFeature = {
|
|
|
72
64
|
] : []);
|
|
73
65
|
const attrEnter = attr.enter().append("div").attr("class", "d3plus-attribution");
|
|
74
66
|
attr.exit().remove();
|
|
75
|
-
const style = viz
|
|
67
|
+
const style = themeOverlayStyle(viz, viz.schema.attributionStyle, attributionStyleDefault, {
|
|
68
|
+
background: (o)=>o.background,
|
|
69
|
+
color: (o)=>o.text
|
|
70
|
+
});
|
|
76
71
|
attr = attr.merge(attrEnter).style("position", "absolute").style("right", `${viz._margin.right}px`).style("bottom", `${viz._margin.bottom}px`).call(stylize, style);
|
|
77
72
|
// Rewrite the markup — and remount a custom icon — only when it actually
|
|
78
73
|
// changed (the credit text, locale, theme, or icon override), the same
|
|
@@ -62,8 +62,9 @@ import { solveFinalAxes } from "./axesFinal.js";
|
|
|
62
62
|
// `_chartScene` (the chart-cells group already applies `_chartTransform`).
|
|
63
63
|
// Axes are scene-only: `renderMode("compute")` renders into a detached svg
|
|
64
64
|
// and `axis.toScene()` produces the visible output.
|
|
65
|
+
// The y axis hugs the plot, or sits left of the lines' left-end labels.
|
|
65
66
|
const yW = yWidth;
|
|
66
|
-
const xTrans = xOffsetLeft
|
|
67
|
+
const xTrans = Math.max(0, xOffsetLeft - yW - (pCtx.startLabelSpace ?? 0)) || 0;
|
|
67
68
|
const axisAbsoluteTransforms = {
|
|
68
69
|
x: {
|
|
69
70
|
x: viz._margin.left,
|
|
@@ -89,6 +90,7 @@ import { solveFinalAxes } from "./axesFinal.js";
|
|
|
89
90
|
y: axisAbsoluteTransforms[which].y - chartTransform.y
|
|
90
91
|
});
|
|
91
92
|
}
|
|
93
|
+
/** The rotation a test axis settled on, to draw its axis with: its angle, or `false`. */ const testRotation = (test)=>test._labelRotation ? test._labelAngle : false;
|
|
92
94
|
/**
|
|
93
95
|
Render the production x/x2 axes against `xRange`, queue their scenes, and
|
|
94
96
|
build the `viz._xFunc` position accessor.
|
|
@@ -100,7 +102,7 @@ import { solveFinalAxes } from "./axesFinal.js";
|
|
|
100
102
|
const xAxis = viz._xAxis;
|
|
101
103
|
const x2Axis = viz._x2Axis;
|
|
102
104
|
xAxis.renderMode("compute").select(null).domain(xDomain).height(height - (x2Height + topOffset + verticalMargin)).maxSize(height / 2).range(xRange).ticks(xTicks).width(width)// Rotate the labels as the test axis did when it claimed their height.
|
|
103
|
-
.labelRotation(pCtx.xTest
|
|
105
|
+
.labelRotation(testRotation(pCtx.xTest)).config({
|
|
104
106
|
...UNZOOMED_AXIS,
|
|
105
107
|
...xC
|
|
106
108
|
}).config(plotAxisConfig(viz, "x")).config(pCtx.zoomAxes?.x ?? {}).scale(xConfigScale);
|
|
@@ -117,7 +119,7 @@ import { solveFinalAxes } from "./axesFinal.js";
|
|
|
117
119
|
});
|
|
118
120
|
}
|
|
119
121
|
if (x2Exists) {
|
|
120
|
-
x2Axis.renderMode("compute").select(null).domain(x2Domain).height(height - (pCtx.xHeight + topOffset + verticalMargin)).range(xRange).ticks(x2Ticks).width(width).labelRotation(pCtx.x2Test
|
|
122
|
+
x2Axis.renderMode("compute").select(null).domain(x2Domain).height(height - (pCtx.xHeight + topOffset + verticalMargin)).range(xRange).ticks(x2Ticks).width(width).labelRotation(testRotation(pCtx.x2Test)).config({
|
|
121
123
|
...UNZOOMED_AXIS,
|
|
122
124
|
...xC
|
|
123
125
|
}).config(defaultX2Config).config(viz._x2Config).config(pCtx.zoomAxes?.x2 ?? {}).scale(x2ConfigScale).render();
|
|
@@ -130,10 +132,10 @@ import { solveFinalAxes } from "./axesFinal.js";
|
|
|
130
132
|
const xs = frozenAxis(xAxis), x2s = frozenAxis(x2Axis);
|
|
131
133
|
const x = (d, x)=>{
|
|
132
134
|
if (x === "x2") {
|
|
133
|
-
if (x2ConfigScale === "log" && d === 0) d = x2s.
|
|
135
|
+
if (x2ConfigScale === "log" && d === 0) d = x2s._givenDomain()[x2Domain[0] < 0 ? 1 : 0];
|
|
134
136
|
return x2s._getPosition(d);
|
|
135
137
|
} else {
|
|
136
|
-
if (xConfigScale === "log" && d === 0) d = xs.
|
|
138
|
+
if (xConfigScale === "log" && d === 0) d = xs._givenDomain()[xDomain[0] < 0 ? 1 : 0];
|
|
137
139
|
return xs._getPosition(d);
|
|
138
140
|
}
|
|
139
141
|
};
|
|
@@ -178,10 +180,10 @@ import { solveFinalAxes } from "./axesFinal.js";
|
|
|
178
180
|
const ys = frozenAxis(yAxis), y2s = frozenAxis(y2Axis);
|
|
179
181
|
const y = (d, y)=>{
|
|
180
182
|
if (y === "y2") {
|
|
181
|
-
if (y2ConfigScale === "log" && d === 0) d = y2Domain[1] < 0 ? y2s.
|
|
183
|
+
if (y2ConfigScale === "log" && d === 0) d = y2Domain[1] < 0 ? y2s._givenDomain(true)[0] : y2s._givenDomain()[1];
|
|
182
184
|
return y2s._getPosition(d) - x2Height;
|
|
183
185
|
} else {
|
|
184
|
-
if (yConfigScale === "log" && d === 0) d = yDomain[1] < 0 ? ys.
|
|
186
|
+
if (yConfigScale === "log" && d === 0) d = yDomain[1] < 0 ? ys._givenDomain(true)[0] : ys._givenDomain()[1];
|
|
185
187
|
return ys._getPosition(d) - x2Height;
|
|
186
188
|
}
|
|
187
189
|
};
|
|
@@ -47,12 +47,14 @@ import { plotAxisConfig } from "../Plot/baselineBreak.js";
|
|
|
47
47
|
}
|
|
48
48
|
const yBounds = yTest.outerBounds();
|
|
49
49
|
const yWidth = yBounds.width ? yBounds.width + yTest.padding() : undefined;
|
|
50
|
+
const { startLabelSpace } = pCtx;
|
|
50
51
|
const xOffsetLeft = max([
|
|
51
52
|
0,
|
|
52
53
|
yWidth,
|
|
53
54
|
xTestRange[0],
|
|
54
55
|
x2TestRange[0],
|
|
55
|
-
viz._plotMinLeft?.()
|
|
56
|
+
viz._plotMinLeft?.(),
|
|
57
|
+
startLabelSpace && (yWidth ?? 0) + startLabelSpace
|
|
56
58
|
]);
|
|
57
59
|
if (y2Exists) {
|
|
58
60
|
y2Test.config(yC).domain(y2Domain).gridSize(0).height(height).range(yRange).width(width - max([
|
|
@@ -82,6 +84,20 @@ import { plotAxisConfig } from "../Plot/baselineBreak.js";
|
|
|
82
84
|
xTest.range(xRange).measure();
|
|
83
85
|
return xTest.outerBounds().height + xTest.padding();
|
|
84
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
How much further than the x axis's band slanted y-axis labels reach
|
|
89
|
+
below the y range (see `Axis._labelOverflow`): the room the y range
|
|
90
|
+
leaves above the x axis for them.
|
|
91
|
+
*/ function slantedLabelsBelow(pCtx, inset) {
|
|
92
|
+
const axes = [
|
|
93
|
+
pCtx.yTest,
|
|
94
|
+
...pCtx.y2Exists ? [
|
|
95
|
+
pCtx.y2Test
|
|
96
|
+
] : []
|
|
97
|
+
];
|
|
98
|
+
const reach = Math.max(0, ...axes.map((a)=>a._labelOverflow?.[1] ?? 0));
|
|
99
|
+
return Math.max(0, Math.ceil(reach - (pCtx.xHeight + inset)));
|
|
100
|
+
}
|
|
85
101
|
/**
|
|
86
102
|
The y/y2 axes' final solve, and the plot's y range, once the chrome has
|
|
87
103
|
taken its margins. A `frozen` layout (a zoom repaint) keeps the previous
|
|
@@ -97,10 +113,11 @@ import { plotAxisConfig } from "../Plot/baselineBreak.js";
|
|
|
97
113
|
*/ export function solveFinalAxes(viz, pCtx, frozen) {
|
|
98
114
|
const { x2Height, topOffset, height, horizontalMargin, verticalMargin } = pCtx;
|
|
99
115
|
// The plot's bottom edge for an x axis `xHeight` tall, less the room a
|
|
100
|
-
// chart reserves between the value axis and the x axis
|
|
101
|
-
|
|
116
|
+
// chart reserves between the value axis and the x axis, and `labels`
|
|
117
|
+
// more for y-axis labels that reach below the range.
|
|
118
|
+
const bottom = (xHeight, labels = 0)=>{
|
|
102
119
|
const yBottom = height - (xHeight + topOffset + verticalMargin);
|
|
103
|
-
const insetBottom = frozen?.insetBottom ?? Math.max(0, viz._plotInsetBottom?.(yBottom - x2Height) ?? 0);
|
|
120
|
+
const insetBottom = frozen?.insetBottom ?? Math.max(0, viz._plotInsetBottom?.(yBottom - x2Height) ?? 0) + labels;
|
|
104
121
|
return {
|
|
105
122
|
yBottom,
|
|
106
123
|
insetBottom,
|
|
@@ -126,6 +143,11 @@ import { plotAxisConfig } from "../Plot/baselineBreak.js";
|
|
|
126
143
|
fit = bottom(xHeight);
|
|
127
144
|
solved = solveFinalYAxes(viz, pCtx, fit.yRange);
|
|
128
145
|
}
|
|
146
|
+
const below = frozen ? 0 : slantedLabelsBelow(pCtx, fit.insetBottom);
|
|
147
|
+
if (below) {
|
|
148
|
+
fit = bottom(pCtx.xHeight, below);
|
|
149
|
+
solved = solveFinalYAxes(viz, pCtx, fit.yRange);
|
|
150
|
+
}
|
|
129
151
|
return {
|
|
130
152
|
pCtx,
|
|
131
153
|
...fit,
|
|
@@ -4,8 +4,11 @@
|
|
|
4
4
|
coupled offsets are solved, and the four-side claim is written to
|
|
5
5
|
`viz._padding.*`. Runs BEFORE the base `Viz` draw finalizes margins.
|
|
6
6
|
*/ import { max } from "d3-array";
|
|
7
|
+
import AxisBottom from "../../components/Axis/AxisBottom.js";
|
|
8
|
+
import { barLabelsNeedAxis } from "../Plot/barLabelFit.js";
|
|
7
9
|
import { plotAxisConfig } from "../Plot/baselineBreak.js";
|
|
8
10
|
import { xRightInset } from "./axesFinal.js";
|
|
11
|
+
import { cornerControlsHeight } from "./features.js";
|
|
9
12
|
import { END_LABEL_AXIS_CONFIG, endLabelSpace, labelsXEnds, measureEndLabels } from "./plotEndLabels.js";
|
|
10
13
|
import { buildXConfig } from "./xAxisConfig.js";
|
|
11
14
|
/** Measure the y/y2 test axes and report their bounds + claimed widths. */ function measureYTestAxes(viz, inputs) {
|
|
@@ -46,7 +49,7 @@ import { buildXConfig } from "./xAxisConfig.js";
|
|
|
46
49
|
xRangeMax
|
|
47
50
|
]).ticks(xTicks).width(width).config(xC).config(plotAxisConfig(viz, "x")).config(xOverrides).scale(xConfigScale).measure();
|
|
48
51
|
}
|
|
49
|
-
const { labelWidths, largestLabel, xRangeMax: measuredXRangeMax } = measureLineLabels();
|
|
52
|
+
const { labelWidths, largestLabel, xRangeMax: measuredXRangeMax, startLabelSpace = 0 } = measureLineLabels();
|
|
50
53
|
if (measuredXRangeMax !== undefined) xRangeMax = measuredXRangeMax;
|
|
51
54
|
if (showX && xRangeMax) {
|
|
52
55
|
xTest.domain(xDomain).height(height).maxSize(height / 2).range([
|
|
@@ -63,14 +66,15 @@ import { buildXConfig } from "./xAxisConfig.js";
|
|
|
63
66
|
return {
|
|
64
67
|
labelWidths,
|
|
65
68
|
largestLabel,
|
|
66
|
-
xRangeMax
|
|
69
|
+
xRangeMax,
|
|
70
|
+
startLabelSpace
|
|
67
71
|
};
|
|
68
72
|
}
|
|
69
73
|
/**
|
|
70
74
|
Measure the x/x2 test axes and solve the coupled four-side offsets.
|
|
71
75
|
*/ function measureXTestAxes(viz, inputs, xC, yWidth, y2Width, measureLineLabels, ends) {
|
|
72
76
|
const { xTest, x2Test, yTest, showX, showY, x2Exists, height, width } = inputs;
|
|
73
|
-
const { labelWidths, largestLabel, xRangeMax } = measureXTestPasses(viz, inputs, xC, measureLineLabels, ends);
|
|
77
|
+
const { labelWidths, largestLabel, xRangeMax, startLabelSpace = 0 } = measureXTestPasses(viz, inputs, xC, measureLineLabels, ends);
|
|
74
78
|
const xTestRange = xTest._getRange();
|
|
75
79
|
const x2TestRange = x2Test._getRange();
|
|
76
80
|
const x2Bounds = x2Test.outerBounds();
|
|
@@ -80,7 +84,8 @@ import { buildXConfig } from "./xAxisConfig.js";
|
|
|
80
84
|
yWidth,
|
|
81
85
|
xTestRange[0],
|
|
82
86
|
x2TestRange[0],
|
|
83
|
-
viz._plotMinLeft?.()
|
|
87
|
+
viz._plotMinLeft?.(),
|
|
88
|
+
startLabelSpace && (yWidth ?? 0) + startLabelSpace
|
|
84
89
|
]);
|
|
85
90
|
const yLabelConfig = yTest.shapeConfig().labelConfig;
|
|
86
91
|
const topOffset = (showY ? yLabelConfig.fontSize() / 2 : 0) + (viz._plotInsetTop ?? 0);
|
|
@@ -100,6 +105,7 @@ import { buildXConfig } from "./xAxisConfig.js";
|
|
|
100
105
|
xRangeMax,
|
|
101
106
|
labelWidths,
|
|
102
107
|
largestLabel,
|
|
108
|
+
startLabelSpace,
|
|
103
109
|
xTestRange,
|
|
104
110
|
x2TestRange,
|
|
105
111
|
x2Height,
|
|
@@ -118,8 +124,23 @@ import { buildXConfig } from "./xAxisConfig.js";
|
|
|
118
124
|
|
|
119
125
|
`measureLineLabels` is invoked once, after the first x-axis measure and
|
|
120
126
|
before the re-measure, so its `xRangeMax` can re-bound the x range.
|
|
121
|
-
*/ export function measureAxes(viz,
|
|
127
|
+
*/ export function measureAxes(viz, measureInputs, measureLineLabels) {
|
|
128
|
+
let inputs = measureInputs;
|
|
129
|
+
const check = inputs.barLabelCheck;
|
|
130
|
+
// Horizontal bars: the y axis measures first, so the x axis's height
|
|
131
|
+
// comes from a throwaway measure.
|
|
132
|
+
const yOnAxis = check?.axis === "y" && barLabelsNeedAxis(viz, check, barPlot(viz, inputs, 0, provisionalXHeight(viz, inputs) + provisionalTopOffset(viz, inputs)));
|
|
133
|
+
if (yOnAxis) inputs = {
|
|
134
|
+
...inputs,
|
|
135
|
+
yTicks: null
|
|
136
|
+
};
|
|
122
137
|
const { yBounds, yWidth, y2Bounds, y2Width } = measureYTestAxes(viz, inputs);
|
|
138
|
+
// Vertical bars: the y axes have claimed their width.
|
|
139
|
+
const xOnAxis = check?.axis === "x" && barLabelsNeedAxis(viz, check, barPlot(viz, inputs, (yWidth ?? 0) + (y2Width ?? 0), 0));
|
|
140
|
+
if (xOnAxis) inputs = {
|
|
141
|
+
...inputs,
|
|
142
|
+
xTicks: null
|
|
143
|
+
};
|
|
123
144
|
const ends = labelsXEnds(viz, inputs.showX, inputs.showY);
|
|
124
145
|
const xC = buildXConfig(viz, inputs);
|
|
125
146
|
const xResult = measureXTestAxes(viz, inputs, xC, yWidth, y2Width, measureLineLabels, ends);
|
|
@@ -133,6 +154,40 @@ import { buildXConfig } from "./xAxisConfig.js";
|
|
|
133
154
|
yWidth,
|
|
134
155
|
y2Width,
|
|
135
156
|
xC,
|
|
136
|
-
...xResult
|
|
157
|
+
...xResult,
|
|
158
|
+
barLabelsOnAxis: yOnAxis || xOnAxis,
|
|
159
|
+
xTicks: inputs.xTicks,
|
|
160
|
+
yTicks: inputs.yTicks
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
The plot area a bar's label gets measured against: the chart area less
|
|
165
|
+
the axes' claims (`left`, `bottom`) and the corner controls' reach,
|
|
166
|
+
which the top margin always clears (a small-multiples panel's chrome is
|
|
167
|
+
already claimed).
|
|
168
|
+
*/ function barPlot(viz, inputs, left, bottom) {
|
|
169
|
+
const corner = viz._facetStep === "panel" ? 0 : cornerControlsHeight(viz);
|
|
170
|
+
return {
|
|
171
|
+
width: inputs.width - left,
|
|
172
|
+
height: inputs.height - bottom - corner
|
|
137
173
|
};
|
|
138
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
The room above the plot for the y axis's top label (see
|
|
177
|
+
`measureXTestAxes`), read from the y test axis's config ahead of its
|
|
178
|
+
measure.
|
|
179
|
+
*/ function provisionalTopOffset(viz, inputs) {
|
|
180
|
+
const { yTest, yC, showY } = inputs;
|
|
181
|
+
if (showY) yTest.config(yC).config(plotAxisConfig(viz, "y"));
|
|
182
|
+
const labelConfig = yTest.shapeConfig().labelConfig;
|
|
183
|
+
return (showY ? labelConfig.fontSize() / 2 : 0) + (viz._plotInsetTop ?? 0);
|
|
184
|
+
}
|
|
185
|
+
/** The x axis's height, from a throwaway measure ahead of the joint solve. */ function provisionalXHeight(viz, inputs) {
|
|
186
|
+
if (!inputs.showX) return 0;
|
|
187
|
+
const axis = new AxisBottom().align("end").gridSize(0);
|
|
188
|
+
axis.domain(inputs.xDomain).height(inputs.height).maxSize(inputs.height / 2).range([
|
|
189
|
+
undefined,
|
|
190
|
+
undefined
|
|
191
|
+
]).ticks(inputs.xTicks).width(inputs.width).config(buildXConfig(viz, inputs)).config(plotAxisConfig(viz, "x")).scale(inputs.xConfigScale).measure();
|
|
192
|
+
return axis.outerBounds().height + axis.padding();
|
|
193
|
+
}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
/**
|
|
2
|
+
A callout's geometry in pixels: its box offset from the anchor and kept
|
|
3
|
+
inside the plot, the connector from the box's edge to the anchor, and the
|
|
4
|
+
arrowhead at the anchor.
|
|
5
|
+
*/ /**
|
|
6
|
+
A `width` × `height` box centered `dx`/`dy` pixels from the anchor.
|
|
7
|
+
@param anchor The anchor.
|
|
8
|
+
@param size The box's size.
|
|
9
|
+
@param dx The horizontal offset of its center.
|
|
10
|
+
@param dy The vertical offset of its center.
|
|
11
|
+
*/ export function offsetBox(anchor, size, dx, dy) {
|
|
12
|
+
return {
|
|
13
|
+
x: anchor[0] + dx - size.width / 2,
|
|
14
|
+
y: anchor[1] + dy - size.height / 2,
|
|
15
|
+
width: size.width,
|
|
16
|
+
height: size.height
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
/** Moves a `[start, size]` stretch inside `[min, max]`, keeping it at `min` when it is wider. */ const clampStretch = (start, size, min, max)=>Math.max(min, Math.min(start, max - size));
|
|
20
|
+
/**
|
|
21
|
+
Moves a box the least distance that puts it inside the plot area; a box
|
|
22
|
+
larger than the plot keeps to its top-left corner.
|
|
23
|
+
@param box The box.
|
|
24
|
+
@param plot The plot area.
|
|
25
|
+
*/ export function clampBox(box, plot) {
|
|
26
|
+
return {
|
|
27
|
+
...box,
|
|
28
|
+
x: clampStretch(box.x, box.width, plot.x0, plot.x1),
|
|
29
|
+
y: clampStretch(box.y, box.height, plot.y0, plot.y1)
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
Where the connector runs: `from` the point the line from the box's center
|
|
34
|
+
to the anchor leaves the box, `to` the anchor (pulled back toward the box
|
|
35
|
+
by `standoff`). Null when the anchor is inside the box or the connector
|
|
36
|
+
would be shorter than a pixel.
|
|
37
|
+
@param box The callout box.
|
|
38
|
+
@param anchor The anchor.
|
|
39
|
+
@param standoff The gap to leave before the anchor.
|
|
40
|
+
*/ export function connectorEndpoints(box, anchor, standoff = 0) {
|
|
41
|
+
const cx = box.x + box.width / 2, cy = box.y + box.height / 2;
|
|
42
|
+
const vx = anchor[0] - cx, vy = anchor[1] - cy;
|
|
43
|
+
const tx = vx ? box.width / 2 / Math.abs(vx) : Infinity;
|
|
44
|
+
const ty = vy ? box.height / 2 / Math.abs(vy) : Infinity;
|
|
45
|
+
const t = Math.min(tx, ty);
|
|
46
|
+
if (!(t < 1)) return null;
|
|
47
|
+
const from = [
|
|
48
|
+
cx + vx * t,
|
|
49
|
+
cy + vy * t
|
|
50
|
+
];
|
|
51
|
+
const length = Math.hypot(anchor[0] - from[0], anchor[1] - from[1]);
|
|
52
|
+
const pull = Math.min(Math.max(standoff, 0), length);
|
|
53
|
+
const k = length ? pull / length : 0;
|
|
54
|
+
const to = [
|
|
55
|
+
anchor[0] - (anchor[0] - from[0]) * k,
|
|
56
|
+
anchor[1] - (anchor[1] - from[1]) * k
|
|
57
|
+
];
|
|
58
|
+
if (Math.hypot(to[0] - from[0], to[1] - from[1]) < 1) return null;
|
|
59
|
+
return {
|
|
60
|
+
from,
|
|
61
|
+
to
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
The three corners of an arrowhead `size` pixels long with its tip at
|
|
66
|
+
`tip`, pointing along the line from `from`: the tip, then its base's two
|
|
67
|
+
corners.
|
|
68
|
+
@param from The line's start.
|
|
69
|
+
@param tip The arrow's tip.
|
|
70
|
+
@param size The arrowhead's length (its base is as wide).
|
|
71
|
+
*/ export function arrowheadPoints(from, tip, size) {
|
|
72
|
+
const length = Math.hypot(tip[0] - from[0], tip[1] - from[1]) || 1;
|
|
73
|
+
const ux = (tip[0] - from[0]) / length, uy = (tip[1] - from[1]) / length;
|
|
74
|
+
const bx = tip[0] - ux * size, by = tip[1] - uy * size;
|
|
75
|
+
const half = size / 2;
|
|
76
|
+
return [
|
|
77
|
+
tip,
|
|
78
|
+
[
|
|
79
|
+
bx - uy * half,
|
|
80
|
+
by + ux * half
|
|
81
|
+
],
|
|
82
|
+
[
|
|
83
|
+
bx + uy * half,
|
|
84
|
+
by - ux * half
|
|
85
|
+
]
|
|
86
|
+
];
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
Where a point moves along the line from `from` by `distance` pixels back
|
|
90
|
+
from its end (the arrow's base, where the connector stops).
|
|
91
|
+
@param from The line's start.
|
|
92
|
+
@param to The line's end.
|
|
93
|
+
@param distance How far back from `to`.
|
|
94
|
+
*/ export function pullBack(from, to, distance) {
|
|
95
|
+
const length = Math.hypot(to[0] - from[0], to[1] - from[1]);
|
|
96
|
+
if (!length) return to;
|
|
97
|
+
const k = Math.min(distance, length) / length;
|
|
98
|
+
return [
|
|
99
|
+
to[0] - (to[0] - from[0]) * k,
|
|
100
|
+
to[1] - (to[1] - from[1]) * k
|
|
101
|
+
];
|
|
102
|
+
}
|
|
103
|
+
/** Whether a point lies inside a box. */ const contains = (box, [x, y])=>x >= box.x && x <= box.x + box.width && y >= box.y && y <= box.y + box.height;
|
|
104
|
+
/**
|
|
105
|
+
Where a callout's box goes: centered `dx`/`dy` from the anchor and, when
|
|
106
|
+
`clamp` is on, moved inside the plot area. A box that clamping pushes
|
|
107
|
+
over its own anchor tries the opposite offset instead, and keeps it when
|
|
108
|
+
that leaves the anchor clear.
|
|
109
|
+
@param anchor The anchor.
|
|
110
|
+
@param size The box's size.
|
|
111
|
+
@param offset The box center's offset from the anchor.
|
|
112
|
+
@param plot The plot area.
|
|
113
|
+
@param clamp Whether the box stays inside the plot area.
|
|
114
|
+
*/ export function placeCalloutBox(anchor, size, [dx, dy], plot, clamp = true) {
|
|
115
|
+
const box = offsetBox(anchor, size, dx, dy);
|
|
116
|
+
if (!clamp) return box;
|
|
117
|
+
const clamped = clampBox(box, plot);
|
|
118
|
+
if (!contains(clamped, anchor) || contains(box, anchor)) return clamped;
|
|
119
|
+
const flipped = clampBox(offsetBox(anchor, size, -dx, -dy), plot);
|
|
120
|
+
return contains(flipped, anchor) ? clamped : flipped;
|
|
121
|
+
}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
/**
|
|
2
|
+
The scene of a callout annotation: per row, a connector from the box to
|
|
3
|
+
the anchor, an arrowhead or dot at the anchor, the box, and its wrapped
|
|
4
|
+
text, all inert.
|
|
5
|
+
*/ import { parseDash } from "../../shapes/Shape.js";
|
|
6
|
+
import { chartBackground } from "../viz/backgroundInk.js";
|
|
7
|
+
import { anchorPoint, inPlot } from "./annotationFrame.js";
|
|
8
|
+
import { annotationTextNode, annotationTextStyle, wrapAnnotationText } from "./annotationText.js";
|
|
9
|
+
import { arrowheadPoints, connectorEndpoints, placeCalloutBox, pullBack } from "./calloutLayout.js";
|
|
10
|
+
const num = (v, fallback)=>typeof v === "number" && Number.isFinite(v) ? v : fallback;
|
|
11
|
+
/** Whether a color setting turns its paint off. */ const off = (v)=>v === false || v === "none";
|
|
12
|
+
/**
|
|
13
|
+
Reads one style key for a callout row: an accessor on the annotation
|
|
14
|
+
called with the row, else the row's own value, else the annotation's.
|
|
15
|
+
@param annotation The callout annotation.
|
|
16
|
+
@param d The row.
|
|
17
|
+
@param i The row's index.
|
|
18
|
+
*/ export function calloutPicker(annotation, d, i) {
|
|
19
|
+
return (key)=>{
|
|
20
|
+
const own = annotation[key];
|
|
21
|
+
if (typeof own === "function") return own(d, i);
|
|
22
|
+
return d[key] !== undefined ? d[key] : own;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/** The box's rect, or null when it has neither fill nor border. */ function boxNode(viz, pick, box, key, ink) {
|
|
26
|
+
const fill = pick("fill"), stroke = pick("stroke");
|
|
27
|
+
if (off(fill) && off(stroke)) return null;
|
|
28
|
+
const paint = off(fill) ? {
|
|
29
|
+
fill: "none"
|
|
30
|
+
} : {
|
|
31
|
+
fill: fill || chartBackground(viz),
|
|
32
|
+
fillOpacity: num(pick("fillOpacity"), 1)
|
|
33
|
+
};
|
|
34
|
+
if (!off(stroke)) {
|
|
35
|
+
paint.stroke = stroke || ink;
|
|
36
|
+
paint.strokeWidth = num(pick("strokeWidth"), 1);
|
|
37
|
+
paint.strokeOpacity = num(pick("strokeOpacity"), 0.25);
|
|
38
|
+
}
|
|
39
|
+
return {
|
|
40
|
+
type: "rect",
|
|
41
|
+
key,
|
|
42
|
+
interactive: false,
|
|
43
|
+
...box,
|
|
44
|
+
rx: num(pick("rx"), 3),
|
|
45
|
+
paint
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
/** The connector line and its anchor marker, or nothing when it is off or too short. */ function connectorNodes(pick, box, anchor, key, ink) {
|
|
49
|
+
if (pick("connector") === false) return [];
|
|
50
|
+
const ends = connectorEndpoints(box, anchor, num(pick("standoff"), 0));
|
|
51
|
+
if (!ends) return [];
|
|
52
|
+
const color = pick("connectorStroke") || ink;
|
|
53
|
+
const opacity = num(pick("connectorStrokeOpacity"), 1);
|
|
54
|
+
const marker = pick("marker") ?? "arrow";
|
|
55
|
+
const size = Math.max(0, num(pick("markerSize"), 6));
|
|
56
|
+
const width = num(pick("connectorStrokeWidth"), 1);
|
|
57
|
+
const out = [];
|
|
58
|
+
const end = marker === "arrow" && size ? pullBack(ends.from, ends.to, size) : ends.to;
|
|
59
|
+
const paint = {
|
|
60
|
+
fill: "none",
|
|
61
|
+
stroke: color,
|
|
62
|
+
strokeWidth: width,
|
|
63
|
+
strokeOpacity: opacity
|
|
64
|
+
};
|
|
65
|
+
const dash = parseDash(pick("connectorStrokeDasharray"));
|
|
66
|
+
if (dash) paint.strokeDasharray = dash;
|
|
67
|
+
out.push({
|
|
68
|
+
type: "line",
|
|
69
|
+
key: `${key}-connector`,
|
|
70
|
+
interactive: false,
|
|
71
|
+
points: [
|
|
72
|
+
ends.from,
|
|
73
|
+
end
|
|
74
|
+
],
|
|
75
|
+
curve: "linear",
|
|
76
|
+
paint
|
|
77
|
+
});
|
|
78
|
+
if (marker === "arrow" && size) {
|
|
79
|
+
const [tip, a, b] = arrowheadPoints(ends.from, ends.to, size);
|
|
80
|
+
out.push({
|
|
81
|
+
type: "path",
|
|
82
|
+
key: `${key}-marker`,
|
|
83
|
+
interactive: false,
|
|
84
|
+
d: `M${tip[0]},${tip[1]}L${a[0]},${a[1]}L${b[0]},${b[1]}Z`,
|
|
85
|
+
paint: {
|
|
86
|
+
fill: color,
|
|
87
|
+
opacity
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
} else if (marker === "dot" && size) out.push({
|
|
91
|
+
type: "circle",
|
|
92
|
+
key: `${key}-marker`,
|
|
93
|
+
interactive: false,
|
|
94
|
+
cx: ends.to[0],
|
|
95
|
+
cy: ends.to[1],
|
|
96
|
+
r: size / 2,
|
|
97
|
+
paint: {
|
|
98
|
+
fill: color,
|
|
99
|
+
opacity
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
return out;
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
The scene nodes of one callout row, or nothing when it has no label or
|
|
106
|
+
its anchor lies outside the plot area (a zoom that pans it out of view).
|
|
107
|
+
@param viz The chart.
|
|
108
|
+
@param annotation The callout annotation.
|
|
109
|
+
@param frame The plot area and its axes.
|
|
110
|
+
@param row The row, its index, and its key.
|
|
111
|
+
*/ export function calloutRowNodes(viz, annotation, frame, row) {
|
|
112
|
+
const pick = calloutPicker(annotation, row.d, row.i);
|
|
113
|
+
const anchor = anchorPoint(frame, row.d, annotation.xRef, annotation.yRef);
|
|
114
|
+
if (!anchor.every(Number.isFinite) || !inPlot(anchor, frame.plot)) return [];
|
|
115
|
+
const text = pick("label");
|
|
116
|
+
if (text === undefined || text === null || text === false || text === "") return [];
|
|
117
|
+
const style = annotationTextStyle(viz, pick);
|
|
118
|
+
const block = wrapAnnotationText(`${text}`, style);
|
|
119
|
+
if (!block.lines.length) return [];
|
|
120
|
+
const padding = Math.max(0, num(pick("padding"), 6));
|
|
121
|
+
const box = placeCalloutBox(anchor, {
|
|
122
|
+
width: block.width + padding * 2,
|
|
123
|
+
height: block.height + padding * 2
|
|
124
|
+
}, [
|
|
125
|
+
num(pick("dx"), 0),
|
|
126
|
+
num(pick("dy"), -40)
|
|
127
|
+
], frame.plot, pick("clamp") !== false);
|
|
128
|
+
const align = pick("textAlign") || "middle";
|
|
129
|
+
const textX = align === "start" ? box.x + padding : align === "end" ? box.x + box.width - padding : box.x + box.width / 2;
|
|
130
|
+
const ink = style.fontColor;
|
|
131
|
+
const out = connectorNodes(pick, box, anchor, row.key, ink);
|
|
132
|
+
const rect = boxNode(viz, pick, box, `${row.key}-box`, ink);
|
|
133
|
+
if (rect) out.push(rect);
|
|
134
|
+
out.push(annotationTextNode(block, style, {
|
|
135
|
+
key: `${row.key}-label`,
|
|
136
|
+
x: textX,
|
|
137
|
+
y: box.y + padding,
|
|
138
|
+
align
|
|
139
|
+
}));
|
|
140
|
+
return out;
|
|
141
|
+
}
|
|
142
|
+
/**
|
|
143
|
+
The scene nodes of a callout annotation's rows.
|
|
144
|
+
@param viz The chart.
|
|
145
|
+
@param annotation The callout annotation.
|
|
146
|
+
@param frame The plot area and its axes.
|
|
147
|
+
@param key The annotation's key, which prefixes its nodes'.
|
|
148
|
+
*/ export function calloutNodes(viz, annotation, frame, key) {
|
|
149
|
+
const data = Array.isArray(annotation.data) ? annotation.data : [];
|
|
150
|
+
return data.flatMap((d, i)=>calloutRowNodes(viz, annotation, frame, {
|
|
151
|
+
d,
|
|
152
|
+
i,
|
|
153
|
+
key: `${key}-${i}`
|
|
154
|
+
}));
|
|
155
|
+
}
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
|
|
56
56
|
Width and height are the margin-adjusted chart-area dimensions —
|
|
57
57
|
callers usually have them on hand from `chartBounds(viz)` or from
|
|
58
|
-
fields a stage stashed (e.g. `
|
|
58
|
+
fields a stage stashed (e.g. `_radialMatrixWidth`).
|
|
59
59
|
*/ export function centerChartTransform(viz, width, height) {
|
|
60
60
|
return {
|
|
61
61
|
x: viz._margin.left + width / 2,
|