@d3plus/core 4.11.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/internal.js +15 -5
- package/es/src/charts/Alluvial/emit.js +2 -2
- package/es/src/charts/Alluvial/index.js +7 -1
- package/es/src/charts/Alluvial/titles.js +24 -4
- package/es/src/charts/ArcDiagram/emit.js +27 -13
- package/es/src/charts/ArcDiagram/events.js +6 -2
- package/es/src/charts/ArcDiagram/index.js +2 -0
- package/es/src/charts/BarChart/index.js +3 -10
- package/es/src/charts/Calendar/index.js +2 -0
- package/es/src/charts/Candlestick/index.js +4 -10
- package/es/src/charts/Gantt/applyLayout.js +2 -4
- package/es/src/charts/Geomap/flowEmit.js +11 -6
- package/es/src/charts/Hexbin/index.js +2 -0
- package/es/src/charts/Icicle/index.js +3 -1
- 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 +36 -5
- package/es/src/charts/Network/bundle.js +5 -4
- package/es/src/charts/Network/emit.js +39 -40
- package/es/src/charts/Network/graph.js +34 -5
- package/es/src/charts/Network/graphFluent.js +5 -3
- package/es/src/charts/Network/index.js +6 -1
- 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 +3 -0
- 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/emit.js +9 -1
- package/es/src/charts/Pie/index.js +10 -0
- package/es/src/charts/Plot/areaEnter.js +68 -0
- package/es/src/charts/Plot/draw.js +26 -12
- package/es/src/charts/Plot/index.js +4 -10
- package/es/src/charts/Plot/lineMarkerKeys.js +19 -0
- package/es/src/charts/Plot/plotInit.js +6 -0
- 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/PolarArea/index.js +2 -1
- package/es/src/charts/Priestley/applyLayout.js +11 -7
- package/es/src/charts/Priestley/index.js +0 -2
- package/es/src/charts/Priestley/timeAxis.js +11 -8
- 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 +29 -17
- package/es/src/charts/Radar/curvedLabels.js +43 -2
- package/es/src/charts/Radar/emit.js +30 -15
- package/es/src/charts/Radar/index.js +41 -2
- package/es/src/charts/Radar/points.js +85 -0
- package/es/src/charts/RadialBar/emit.js +6 -1
- package/es/src/charts/RadialBar/index.js +10 -0
- package/es/src/charts/RadialMatrix/applyLayout.js +115 -31
- package/es/src/charts/RadialMatrix/index.js +15 -2
- package/es/src/charts/Rings/applyLayout.js +11 -150
- package/es/src/charts/Rings/emit.js +80 -40
- package/es/src/charts/Rings/index.js +27 -4
- package/es/src/charts/Rings/ringsCurves.js +156 -0
- package/es/src/charts/Rings/ringsParallel.js +20 -3
- 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 +18 -4
- package/es/src/charts/Sankey/index.js +7 -1
- package/es/src/charts/Sunburst/emit.js +9 -1
- package/es/src/charts/Sunburst/index.js +13 -1
- 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 +10 -12
- 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/definition/makeChart.js +6 -2
- package/es/src/charts/drawSteps/minimap.js +4 -20
- package/es/src/charts/drawSteps/zoomActions.js +36 -0
- package/es/src/charts/drawSteps/zoomControls.js +31 -18
- 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 +4 -2
- package/es/src/charts/events/click.shape.js +5 -3
- 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 +44 -44
- package/es/src/charts/features/axes.js +15 -4
- package/es/src/charts/features/axesFinal.js +7 -2
- package/es/src/charts/features/axesMeasure.js +26 -8
- package/es/src/charts/features/axisTooltip.js +138 -0
- package/es/src/charts/features/centerLabel.js +177 -0
- package/es/src/charts/features/colorScaleBivariate.js +83 -0
- package/es/src/charts/features/colorScaleBucket.js +18 -0
- package/es/src/charts/features/colorScaleHover.js +30 -5
- 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/curvedArrows.js +33 -0
- package/es/src/charts/features/depthKey.js +26 -0
- package/es/src/charts/features/edgeArrows.js +61 -2
- package/es/src/charts/features/featuresColorScale.js +57 -16
- package/es/src/charts/features/hoverTicks.js +41 -0
- package/es/src/charts/features/idleQueue.js +72 -0
- package/es/src/charts/features/linkInteraction.js +59 -7
- package/es/src/charts/features/networkMeasures.js +241 -0
- package/es/src/charts/features/nodeStats.js +309 -0
- package/es/src/charts/features/plotEndLabels.js +28 -7
- package/es/src/charts/features/plotPaint.js +9 -2
- package/es/src/charts/features/shapeEmit.js +7 -1
- package/es/src/charts/features/textHalo.js +3 -2
- package/es/src/charts/partition/chartFields.js +12 -3
- package/es/src/charts/partition/interaction.js +10 -5
- package/es/src/charts/pipeline/insetPlacement.js +8 -3
- package/es/src/charts/polar/chrome.js +81 -9
- package/es/src/charts/polar/config.js +4 -0
- package/es/src/charts/polar/wedgeLayout.js +2 -1
- package/es/src/charts/viz/Viz.js +24 -15
- package/es/src/charts/viz/VizBase.js +39 -4
- package/es/src/charts/viz/backgroundInk.js +10 -0
- package/es/src/charts/viz/emphasis.js +14 -0
- package/es/src/charts/viz/fillStroke.js +10 -0
- package/es/src/charts/viz/interactionOpacity.js +115 -32
- 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 +0 -1
- package/es/src/charts/viz/vizDefaults.js +13 -34
- package/es/src/charts/viz/vizFields.js +6 -1
- package/es/src/charts/viz/vizRender.js +35 -5
- package/es/src/charts/viz/vizVisibility.js +12 -2
- package/es/src/components/Axis/Axis.js +29 -2
- package/es/src/components/Axis/axisBreak.js +29 -7
- package/es/src/components/Axis/axisDefaults.js +11 -0
- 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 +9 -10
- package/es/src/components/Axis/axisLimit.js +27 -0
- package/es/src/components/Axis/axisMaxSize.js +39 -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/ColorScale/ColorScale.js +62 -18
- package/es/src/components/ColorScale/bivariateRender.js +353 -0
- package/es/src/components/ColorScale/bivariateScale.js +150 -0
- package/es/src/components/ColorScale/colorScaleRender.js +32 -2
- package/es/src/components/ColorScale/colorScaleSwatchTooltips.js +77 -0
- package/es/src/components/Legend/Legend.js +10 -2
- package/es/src/components/Legend/legendCut.js +108 -0
- package/es/src/components/Legend/legendRender.js +38 -13
- package/es/src/components/TextBox.js +5 -2
- package/es/src/components/Timeline/timelineRender.js +2 -1
- package/es/src/components/textBoxScene.js +3 -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/utils/BaseClass.js +7 -2
- package/es/src/utils/configValue.js +9 -0
- package/package.json +10 -10
- package/types/index.d.ts +1 -1
- package/types/internal.d.ts +22 -5
- package/types/src/charts/Alluvial/titles.d.ts +16 -3
- package/types/src/charts/ArcDiagram/emit.d.ts +3 -2
- package/types/src/charts/ArcDiagram/events.d.ts +2 -1
- package/types/src/charts/Geomap/flowEmit.d.ts +3 -2
- 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 +3 -1
- package/types/src/charts/Network/graph.d.ts +12 -4
- 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/Plot/areaEnter.d.ts +34 -0
- package/types/src/charts/Plot/index.d.ts +4 -10
- package/types/src/charts/Plot/lineMarkerKeys.d.ts +11 -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/Priestley/timeAxis.d.ts +7 -4
- 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 +5 -2
- package/types/src/charts/Radar/curvedLabels.d.ts +35 -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/RadialMatrix/applyLayout.d.ts +6 -4
- package/types/src/charts/Rings/emit.d.ts +24 -2
- 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 +29 -5
- package/types/src/charts/Rings/ringsParallel.d.ts +4 -2
- package/types/src/charts/Rings/ringsPlacement.d.ts +47 -0
- package/types/src/charts/Rings/ringsSizing.d.ts +36 -9
- 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 +13 -0
- package/types/src/charts/definition/makeChart.d.ts +2 -2
- 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/features/axisTooltip.d.ts +49 -0
- package/types/src/charts/features/centerLabel.d.ts +75 -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/curvedArrows.d.ts +14 -0
- package/types/src/charts/features/depthKey.d.ts +19 -0
- package/types/src/charts/features/edgeArrows.d.ts +29 -2
- 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/linkInteraction.d.ts +13 -4
- 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/plotEndLabels.d.ts +14 -1
- package/types/src/charts/features/textHalo.d.ts +4 -3
- package/types/src/charts/partition/chartFields.d.ts +6 -1
- package/types/src/charts/pipeline/insetPlacement.d.ts +6 -0
- package/types/src/charts/polar/chrome.d.ts +19 -6
- package/types/src/charts/viz/Viz.d.ts +10 -3
- package/types/src/charts/viz/VizBase.d.ts +31 -2
- package/types/src/charts/viz/backgroundInk.d.ts +8 -0
- 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/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/vizFields.d.ts +5 -0
- package/types/src/charts/viz/vizTypes.d.ts +16 -0
- package/types/src/charts/viz/vizVisibility.d.ts +7 -0
- package/types/src/components/Axis/Axis.d.ts +33 -3
- package/types/src/components/Axis/axisBreak.d.ts +19 -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/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/ColorScale/ColorScale.d.ts +21 -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/colorScaleSwatchTooltips.d.ts +48 -0
- package/types/src/components/Legend/Legend.d.ts +5 -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/TextBox.d.ts +4 -0
- package/types/src/components/textEllipsis.d.ts +6 -0
- package/types/src/fluent.d.ts +18 -0
- package/types/src/shapes/emitLabels.d.ts +1 -1
- package/types/src/utils/D3plusConfig.d.ts +485 -609
- package/types/src/utils/configValue.d.ts +8 -0
- package/types/src/utils/index.d.ts +1 -1
- package/types/umd-entry.d.ts +4 -0
- package/umd/d3plus-core.full.js +22930 -17936
- package/umd/d3plus-core.full.min.js +2 -2
- package/umd/d3plus-core.js +21240 -16404
- package/umd/d3plus-core.min.js +2 -2
|
@@ -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
|
};
|
|
@@ -13,18 +13,20 @@ import { applyAxisBreaks, breakTickValues } from "./axisBreak.js";
|
|
|
13
13
|
import { applyAxisRangeBreaks, rangeBreakDayLabel, visibleTimeValues } from "./axisRangeBreaks.js";
|
|
14
14
|
import { axisDateCategories, axisShownDates, axisTimeDomain, axisTimeReference, isCategoryAxis, isValidDate, parseTimeValues } from "./timeValues.js";
|
|
15
15
|
import { axisIsYearLike, formatYear } from "./yearValues.js";
|
|
16
|
-
import { floorPow, isNegative, roundedDomain } from "./axisRounding.js";
|
|
16
|
+
import { floorPow, isNegative, openEnd, roundedDomain } from "./axisRounding.js";
|
|
17
17
|
import { powExponent } from "./powTicks.js";
|
|
18
18
|
/**
|
|
19
19
|
Builds the tick label formatter (user-supplied or scale-derived). With a
|
|
20
20
|
`rotatedTickFormat`, the formatter reads `axis._labelRotation` on every
|
|
21
21
|
call, so labels measured and painted rotated use that one instead.
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
`getLabels` returns the values the axis labels, which decide the
|
|
23
|
+
open-ended labels of an axis rounded "inside".
|
|
24
|
+
*/ export function buildTickFormat(axis, timeLocaleObj, getLabels) {
|
|
25
|
+
const format = baseTickFormat(axis, timeLocaleObj, getLabels);
|
|
24
26
|
const rotated = axis.schema.rotatedTickFormat;
|
|
25
27
|
return rotated ? (d)=>(axis._labelRotation ? rotated : format)(d) : format;
|
|
26
28
|
}
|
|
27
|
-
/** The tick label formatter for unrotated labels: `tickFormat`, else the scale's default. */ function baseTickFormat(axis, timeLocaleObj,
|
|
29
|
+
/** The tick label formatter for unrotated labels: `tickFormat`, else the scale's default. */ function baseTickFormat(axis, timeLocaleObj, getLabels) {
|
|
28
30
|
let years;
|
|
29
31
|
let categories;
|
|
30
32
|
// Every label reads all of the axis's dates, so they are read once per set
|
|
@@ -60,12 +62,9 @@ import { powExponent } from "./powTicks.js";
|
|
|
60
62
|
const number = formatAbbreviate(tick, loc, `,.${tick.toString().length}r`);
|
|
61
63
|
return `${number}${separator}${suff}`;
|
|
62
64
|
} else {
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
const
|
|
66
|
-
const maxTick = inverted ? 0 : ticks.length - 1;
|
|
67
|
-
const prefix = axis.schema.rounding === "inside" ? ticks.indexOf(d) === minTick ? axis.schema.roundingInsideMinPrefix : ticks.indexOf(d) === maxTick ? axis.schema.roundingInsideMaxPrefix : "" : "";
|
|
68
|
-
const suffix = axis.schema.rounding === "inside" ? ticks.indexOf(d) === minTick ? axis.schema.roundingInsideMinSuffix : ticks.indexOf(d) === maxTick ? axis.schema.roundingInsideMaxSuffix : "" : "";
|
|
65
|
+
const end = axis.schema.rounding === "inside" ? openEnd(d, getLabels(), axis.schema.domain) : undefined;
|
|
66
|
+
const prefix = end === "min" ? axis.schema.roundingInsideMinPrefix : end === "max" ? axis.schema.roundingInsideMaxPrefix : "";
|
|
67
|
+
const suffix = end === "min" ? axis.schema.roundingInsideMinSuffix : end === "max" ? axis.schema.roundingInsideMaxSuffix : "";
|
|
69
68
|
years ??= axisIsYearLike(axis);
|
|
70
69
|
const number = years ? formatYear(d, axis.schema.locale) : formatAbbreviate(d, axis.schema.locale);
|
|
71
70
|
return `${prefix}${number}${suffix}`;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Lays an axis out within its `maxSize` (see `strictMaxSize`): when the
|
|
3
|
+
labels can't fit beside the title, the title gives way, and when they
|
|
4
|
+
can't fit at all, the labels do. Pure compute, no DOM.
|
|
5
|
+
*/ import { layoutAxis } from "./axisLayout.js";
|
|
6
|
+
/**
|
|
7
|
+
Lays out `axis` (see `layoutAxis`) and returns the layout the paint
|
|
8
|
+
phase draws. A label that reaches further out from the axis than its
|
|
9
|
+
`maxSize` leaves room for is left out (see `limitLabels`). When that
|
|
10
|
+
leaves out any label shown, a title is left out instead if every label
|
|
11
|
+
then fits; otherwise the labels are left out and the title stays, unless
|
|
12
|
+
the title alone takes more than the `maxSize` too. The ticks, the axis
|
|
13
|
+
line and its bar still draw, and the axis claims only the room of what
|
|
14
|
+
it draws.
|
|
15
|
+
*/ export function measureAxis(axis) {
|
|
16
|
+
axis._dropTitle = false;
|
|
17
|
+
const titled = layoutAxis(axis);
|
|
18
|
+
const limited = axis._limited;
|
|
19
|
+
if (!limited || !limited.dropped && limited.room >= 0) return titled;
|
|
20
|
+
if (!axis.schema.title) return titled;
|
|
21
|
+
axis._dropTitle = true;
|
|
22
|
+
const bare = layoutAxis(axis);
|
|
23
|
+
// Without the title every label fits, or the title doesn't fit alone.
|
|
24
|
+
if (!axis._limited?.dropped || limited.room < 0) return bare;
|
|
25
|
+
axis._dropTitle = false;
|
|
26
|
+
return layoutAxis(axis);
|
|
27
|
+
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/** The limit a `maxSize` sets: a function is called with `size`, a number is the limit itself. */ export function resolveMaxSize(maxSize, size) {
|
|
2
|
+
return typeof maxSize === "function" ? maxSize(size) : maxSize;
|
|
3
|
+
}
|
|
4
|
+
/**
|
|
5
|
+
The limit an axis's `maxSize` sets, read against the room the axis has
|
|
6
|
+
across its labels: its height when it lies `horizontal`, else its width.
|
|
7
|
+
*/ export function axisMaxSize(schema, horizontal) {
|
|
8
|
+
const size = horizontal ? schema.height : schema.width;
|
|
9
|
+
return resolveMaxSize(schema.maxSize, size);
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
Replaces a function `maxSize` on `axis` with the limit it sets for `size`,
|
|
13
|
+
so an axis drawn at another size than it was measured at keeps the limit
|
|
14
|
+
it was measured with.
|
|
15
|
+
*/ export function pinMaxSize(axis, size) {
|
|
16
|
+
const { maxSize } = axis.schema;
|
|
17
|
+
if (typeof maxSize === "function") axis.schema.maxSize = maxSize(size);
|
|
18
|
+
return axis;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
Marks the `maxSize` a chart gives `axis` as the chart's own default
|
|
22
|
+
limit, unless one of `configs` (the configs the chart applies to the
|
|
23
|
+
axis, the user's among them) sets a `maxSize`. A default limit wraps the
|
|
24
|
+
labels within it, but lets the axis take more than it to draw one line
|
|
25
|
+
of labels and the title (see `strictMaxSize`).
|
|
26
|
+
*/ export function defaultMaxSize(axis, ...configs) {
|
|
27
|
+
axis._softMaxSize = !configs.some((config)=>!!config && typeof config === "object" && config.maxSize !== undefined);
|
|
28
|
+
return axis;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
Whether `axis` keeps all it claims across its labels within its
|
|
32
|
+
`maxSize`, however its labels are laid out (wrapped, slanted, upright or
|
|
33
|
+
staggered), leaving out the labels and title that don't fit: any finite
|
|
34
|
+
`maxSize` but a chart's own default (see `defaultMaxSize`).
|
|
35
|
+
*/ export function strictMaxSize(axis, horizontal) {
|
|
36
|
+
if (axis._softMaxSize) return false;
|
|
37
|
+
const limit = axisMaxSize(axis.schema, horizontal);
|
|
38
|
+
return limit !== undefined && Number.isFinite(limit);
|
|
39
|
+
}
|