@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
|
@@ -6,7 +6,7 @@ import constant from "../../utils/constant.js";
|
|
|
6
6
|
import { emitLabels, shapeLabelDefaults } from "../../shapes/emitLabels.js";
|
|
7
7
|
import { chartBounds } from "../features/chartGeometry.js";
|
|
8
8
|
import { emitOutsideLabels, insideFontMin, layoutCircleLabels, outsideLabels } from "../features/circleLabels.js";
|
|
9
|
-
import { edgeArrowTrims, straightEdgeArrows, straightEdgeD } from "../features/edgeArrows.js";
|
|
9
|
+
import { edgeArrowTrims, emphasizedArrowEdge, scaledArrowSize, scaledStrokeWidth, straightEdgeArrows, straightEdgeD } from "../features/edgeArrows.js";
|
|
10
10
|
import { drawNodeLabel, paintFromShapeConfig, resolveAccessor, shapeConfigFor, userLabelConfig } from "../features/emitHelpers.js";
|
|
11
11
|
import { backgroundImageNode } from "../features/backgroundImageEmit.js";
|
|
12
12
|
import { linkAriaLabel, linkHitPath, linkMeta } from "../features/linkInteraction.js";
|
|
@@ -17,53 +17,48 @@ import { emitLinkLabels } from "../features/linkLabels.js";
|
|
|
17
17
|
import { curvePoints } from "../features/linkLabelPath.js";
|
|
18
18
|
import { networkClusterLabels } from "./clusterLabels.js";
|
|
19
19
|
import { bundledLinkAnchor, bundledLinkEdge, bundledLinkPath } from "./bundle.js";
|
|
20
|
-
/**
|
|
20
|
+
/**
|
|
21
|
+
A link's visible stroke and arrowheads (straight, center-to-center,
|
|
22
|
+
along its loop, or along its bundle), drawn `scale` times as wide (see
|
|
23
|
+
`emphasizedArrowEdge`): `d` cut short inside its arrowheads (see
|
|
24
|
+
`edgeArrowTrims`) so the line doesn't show past their sides.
|
|
25
|
+
*/ function networkLinkEdge(viz, link, datum, i, d, paint, keyPrefix, scale) {
|
|
21
26
|
const common = {
|
|
22
27
|
arrows: viz.schema.arrows,
|
|
23
|
-
arrowSize: viz.schema.arrowSize,
|
|
24
|
-
strokeWidth,
|
|
28
|
+
arrowSize: scaledArrowSize(viz.schema.arrowSize, scale),
|
|
29
|
+
strokeWidth: scaledStrokeWidth(typeof paint.strokeWidth === "number" ? paint.strokeWidth : undefined, scale),
|
|
25
30
|
datum,
|
|
26
31
|
i,
|
|
27
32
|
keyPrefix,
|
|
28
|
-
fill: typeof stroke === "string" ? stroke : undefined
|
|
33
|
+
fill: typeof paint.stroke === "string" ? paint.stroke : undefined
|
|
34
|
+
};
|
|
35
|
+
const trims = edgeArrowTrims(common);
|
|
36
|
+
if (!trims.source && !trims.target) return {
|
|
37
|
+
d,
|
|
38
|
+
arrows: []
|
|
39
|
+
};
|
|
40
|
+
if (link.loop) return {
|
|
41
|
+
d: selfLoopD(link.loop, trims),
|
|
42
|
+
arrows: selfLoopArrows({
|
|
43
|
+
...common,
|
|
44
|
+
loop: link.loop
|
|
45
|
+
})
|
|
29
46
|
};
|
|
30
|
-
if (link.loop) return selfLoopArrows({
|
|
31
|
-
...common,
|
|
32
|
-
loop: link.loop
|
|
33
|
-
});
|
|
34
47
|
if (link.points) return bundledLinkEdge(viz, {
|
|
35
48
|
...link,
|
|
36
49
|
points: link.points
|
|
37
|
-
}, common)
|
|
38
|
-
|
|
39
|
-
...common,
|
|
50
|
+
}, common);
|
|
51
|
+
const ends = {
|
|
40
52
|
source: link.source,
|
|
41
53
|
target: link.target
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
arrowSize: viz.schema.arrowSize,
|
|
51
|
-
strokeWidth: typeof strokeWidth === "number" ? strokeWidth : undefined,
|
|
52
|
-
datum,
|
|
53
|
-
i
|
|
54
|
-
});
|
|
55
|
-
if (!trims.source && !trims.target) return d;
|
|
56
|
-
if (link.loop) return selfLoopD(link.loop, trims);
|
|
57
|
-
if (link.points) return bundledLinkEdge(viz, {
|
|
58
|
-
...link,
|
|
59
|
-
points: link.points
|
|
60
|
-
}, {
|
|
61
|
-
datum,
|
|
62
|
-
i,
|
|
63
|
-
strokeWidth,
|
|
64
|
-
keyPrefix: ""
|
|
65
|
-
}).d;
|
|
66
|
-
return straightEdgeD(link.source, link.target, trims);
|
|
54
|
+
};
|
|
55
|
+
return {
|
|
56
|
+
d: straightEdgeD(ends.source, ends.target, trims),
|
|
57
|
+
arrows: straightEdgeArrows({
|
|
58
|
+
...common,
|
|
59
|
+
...ends
|
|
60
|
+
})
|
|
61
|
+
};
|
|
67
62
|
}
|
|
68
63
|
/**
|
|
69
64
|
Link Paths, one per resolved `c.links` entry, each followed by a wider
|
|
@@ -84,10 +79,15 @@ import { bundledLinkAnchor, bundledLinkEdge, bundledLinkPath } from "./bundle.js
|
|
|
84
79
|
const tgtId = link.target.id ?? "";
|
|
85
80
|
const key = networkLinkKey(link, i);
|
|
86
81
|
const d = c.linkD(link);
|
|
82
|
+
// Optional directional arrowheads at the node boundary.
|
|
83
|
+
const edge = emphasizedArrowEdge((scale)=>networkLinkEdge(viz, link, datum, i, d, paint, `network-arrow-${srcId}-${tgtId}-${i}`, scale));
|
|
87
84
|
out.push({
|
|
88
85
|
type: "path",
|
|
89
86
|
key,
|
|
90
|
-
d:
|
|
87
|
+
d: edge.d,
|
|
88
|
+
...edge.emphasis ? {
|
|
89
|
+
emphasis: edge.emphasis
|
|
90
|
+
} : {},
|
|
91
91
|
datum,
|
|
92
92
|
index: i,
|
|
93
93
|
paint,
|
|
@@ -96,8 +96,7 @@ import { bundledLinkAnchor, bundledLinkEdge, bundledLinkPath } from "./bundle.js
|
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
98
|
out.push(linkHitPath(key, d, datum, paint.strokeWidth));
|
|
99
|
-
|
|
100
|
-
out.push(...networkLinkArrows(viz, link, datum, paint.stroke, paint.strokeWidth, i, `network-arrow-${srcId}-${tgtId}-${i}`));
|
|
99
|
+
out.push(...edge.arrows);
|
|
101
100
|
}
|
|
102
101
|
return out;
|
|
103
102
|
}
|
|
@@ -18,16 +18,45 @@ import { makeLinkDatum, setLinkValue } from "../features/linkInteraction.js";
|
|
|
18
18
|
])](d, i)}`;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
The chart's node rows: `nodes` when set, else one row per data row and
|
|
22
|
+
one per link end no data row stands for (the link's own object, or
|
|
23
|
+
`{id}` for an id), so a chart given only `data` and `links` still draws
|
|
24
|
+
its nodes, linked or not.
|
|
25
|
+
*/ export function graphNodeRows(v) {
|
|
26
|
+
const nodes = v.schema.nodes;
|
|
27
|
+
if (nodes.length) return nodes;
|
|
28
|
+
const data = v._filteredData;
|
|
29
|
+
const rows = [
|
|
30
|
+
...data
|
|
31
|
+
];
|
|
32
|
+
const ids = new Set(data.map((d, i)=>graphNodeId(v, d, i)));
|
|
33
|
+
for (const l of v.schema.links)for (const end of [
|
|
34
|
+
l.source,
|
|
35
|
+
l.target
|
|
36
|
+
]){
|
|
37
|
+
if (typeof end === "number" || end === undefined || end === null) continue;
|
|
38
|
+
const row = typeof end === "object" ? end : {
|
|
39
|
+
id: end
|
|
40
|
+
};
|
|
41
|
+
const id = graphNodeId(v, row, rows.length);
|
|
42
|
+
if (ids.has(id)) continue;
|
|
43
|
+
ids.add(id);
|
|
44
|
+
rows.push(row);
|
|
45
|
+
}
|
|
46
|
+
return rows;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
Resolves the filtered data and the node rows (see `graphNodeRows`) into
|
|
50
|
+
node records, in the order the ids first appear (data rows, then nodes).
|
|
51
|
+
Only ids present in the node rows become nodes; a matching data row
|
|
52
|
+
supplies a node's values. `fx`/`fy` read the chart's `x`/`y` accessors
|
|
53
|
+
when it has them.
|
|
25
54
|
*/ export function resolveGraphNodes(v) {
|
|
26
55
|
const data = v._filteredData.reduce((obj, d, i)=>{
|
|
27
56
|
obj[v._id(d, i)] = d;
|
|
28
57
|
return obj;
|
|
29
58
|
}, {});
|
|
30
|
-
const rawNodes = v.
|
|
59
|
+
const rawNodes = graphNodeRows(v).reduce((obj, d, i)=>{
|
|
31
60
|
obj[graphNodeId(v, d, i)] = d;
|
|
32
61
|
return obj;
|
|
33
62
|
}, {});
|
|
@@ -27,9 +27,11 @@ import { setLoaderValue } from "../viz/loaderFormat.js";
|
|
|
27
27
|
return this.schema.links;
|
|
28
28
|
};
|
|
29
29
|
/**
|
|
30
|
-
The nodes to draw.
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
The nodes to draw. When empty, every data row is a node, linked or
|
|
31
|
+
not, and so is every link end no data row stands for. Accepts an array
|
|
32
|
+
of node objects, or a URL/filepath string to load them from.
|
|
33
|
+
`nodesFormat` transforms them; a function passed as a second argument
|
|
34
|
+
sets it.
|
|
33
35
|
@type {object[] | string}
|
|
34
36
|
*/ v.nodes = function() {
|
|
35
37
|
if (arguments.length) {
|
|
@@ -21,7 +21,8 @@ import { installGraphFluent } from "./graphFluent.js";
|
|
|
21
21
|
import { effectiveDuration } from "../viz/reducedMotion.js";
|
|
22
22
|
import { themed } from "../../utils/theme.js";
|
|
23
23
|
import { focusLink, installFocusBackgroundClick, linkEndsBox } from "../features/linkFocus.js";
|
|
24
|
-
import { isLinkDatum, linkHighlight, linkMeta, linkTooltipConfig } from "../features/linkInteraction.js";
|
|
24
|
+
import { isLinkDatum, legendHighlight, linkHighlight, linkMeta, linkTooltipConfig } from "../features/linkInteraction.js";
|
|
25
|
+
import { nodeStatsFields } from "../features/nodeStats.js";
|
|
25
26
|
import { linkBundleFields, linkSizeMaxField, linkStyleFields } from "../features/linkFields.js";
|
|
26
27
|
import { polylineBox } from "../features/polyline.js";
|
|
27
28
|
import { isSelfLoopMark, unionBox } from "../features/selfLoops.js";
|
|
@@ -152,6 +153,9 @@ const getNodeId = graphNodeId;
|
|
|
152
153
|
}
|
|
153
154
|
/** Installs mouseenter/mouseleave/mousemove handlers that drive hover highlighting. */ function setupNetworkMouse(viz, v) {
|
|
154
155
|
viz.schema.on.mouseenter = ()=>undefined;
|
|
156
|
+
viz.schema.on["mouseenter.legend"] = (d, i)=>{
|
|
157
|
+
v.hover(legendHighlight(viz, d, i));
|
|
158
|
+
};
|
|
155
159
|
viz.schema.on["mouseleave.shape"] = ()=>{
|
|
156
160
|
v.hover(false);
|
|
157
161
|
};
|
|
@@ -349,6 +353,7 @@ export const networkDef = {
|
|
|
349
353
|
*/ {
|
|
350
354
|
key: "nodeTooltipLinks"
|
|
351
355
|
},
|
|
356
|
+
...nodeStatsFields(),
|
|
352
357
|
{
|
|
353
358
|
key: "tooltipConfig",
|
|
354
359
|
merge: true,
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
center the layout.
|
|
6
6
|
*/ import { hierarchy } from "d3-hierarchy";
|
|
7
7
|
import { nestGroups } from "@d3plus/data";
|
|
8
|
+
import { attachGroupRows, packDatum, packPaintDatum } from "./groupRows.js";
|
|
8
9
|
export const applyPackLayout = ({ viz })=>{
|
|
9
10
|
const data = viz._filteredData;
|
|
10
11
|
if (!data || !data.length) return {
|
|
@@ -19,17 +20,27 @@ export const applyPackLayout = ({ viz })=>{
|
|
|
19
20
|
diameter,
|
|
20
21
|
diameter
|
|
21
22
|
]);
|
|
22
|
-
const
|
|
23
|
+
const root = built(hierarchy({
|
|
23
24
|
key: nestedData.key,
|
|
24
25
|
values: nestedData
|
|
25
|
-
}, (d)=>d.values).sum(viz.schema.sum).sort(viz.schema.sort))
|
|
26
|
+
}, (d)=>d.values).sum(viz.schema.sum).sort(viz.schema.sort));
|
|
27
|
+
attachGroupRows(root, viz.schema.aggs);
|
|
28
|
+
const packed = root.descendants().filter((d, i)=>{
|
|
26
29
|
const node = d;
|
|
27
30
|
node.__d3plus__ = true;
|
|
28
31
|
node.i = i;
|
|
29
32
|
node.id = node.parent ? node.parent.data.key : "root";
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
+
const grouped = node;
|
|
34
|
+
const opacity = node.height ? packOpacityFn(packPaintDatum(grouped, !node.parent), i) : 1;
|
|
35
|
+
// A group circle's tooltip names its group; the outermost circle,
|
|
36
|
+
// holding every group, has none.
|
|
37
|
+
for (const data of new Set([
|
|
38
|
+
node.data,
|
|
39
|
+
packDatum(grouped)
|
|
40
|
+
])){
|
|
41
|
+
data.__d3plusOpacity__ = opacity;
|
|
42
|
+
data.__d3plusTooltip__ = !!node.parent;
|
|
43
|
+
}
|
|
33
44
|
return !node.children || node.children.length > 1;
|
|
34
45
|
});
|
|
35
46
|
viz.ctx.packDiameter = diameter;
|
|
@@ -5,21 +5,27 @@
|
|
|
5
5
|
import { emitLabels } from "../../shapes/emitLabels.js";
|
|
6
6
|
import { userLabelConfig, textureFill, shapeConfigFor, resolveAccessor } from "../features/emitHelpers.js";
|
|
7
7
|
import { backgroundImageNodes } from "../features/backgroundImageEmit.js";
|
|
8
|
+
import { packDatum, packNeutral, packPaintDatum } from "./groupRows.js";
|
|
9
|
+
import { packNeutralPaint } from "./neutralPaint.js";
|
|
10
|
+
import { packNodeKey, packNodeLabel } from "./nodeNames.js";
|
|
8
11
|
export const packEmit = ({ viz, shapeData })=>{
|
|
9
12
|
const nodes = shapeData ?? [];
|
|
10
13
|
if (!nodes.length) return [];
|
|
11
14
|
const sc = shapeConfigFor(viz, "Circle");
|
|
15
|
+
const colorScaled = !!viz.schema.colorScale;
|
|
16
|
+
const neutralPaint = packNeutralPaint(viz);
|
|
12
17
|
// Pack's label accessor is nested under `Circle`.
|
|
13
18
|
const circleConfig = viz.schema.shapeConfig.Circle ?? {};
|
|
14
19
|
const labelFn = circleConfig.label;
|
|
15
20
|
const circleNodes = nodes.map((d, i)=>{
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const
|
|
21
|
+
const neutral = packNeutral(d, colorScaled);
|
|
22
|
+
const datum = packPaintDatum(d, neutral);
|
|
23
|
+
const fill = neutral ? neutralPaint.fill : resolveAccessor(sc.fill, datum, i);
|
|
24
|
+
const stroke = neutral && neutralPaint.stroke !== undefined ? neutralPaint.stroke : resolveAccessor(sc.stroke, datum, i);
|
|
19
25
|
const strokeWidth = resolveAccessor(sc.strokeWidth, datum, i);
|
|
20
26
|
return {
|
|
21
27
|
type: "circle",
|
|
22
|
-
key:
|
|
28
|
+
key: packNodeKey(d),
|
|
23
29
|
cx: d.x,
|
|
24
30
|
cy: d.y,
|
|
25
31
|
r: d.r,
|
|
@@ -29,7 +35,8 @@ export const packEmit = ({ viz, shapeData })=>{
|
|
|
29
35
|
// subdivide-a-container circles, not a scatter chart's — only applies
|
|
30
36
|
// here.
|
|
31
37
|
shapeType: "Pack",
|
|
32
|
-
|
|
38
|
+
// A group circle carries its group's row (see `groupRows.ts`).
|
|
39
|
+
datum: packDatum(d),
|
|
33
40
|
paint: {
|
|
34
41
|
fill: textureFill(sc, datum, i, fill),
|
|
35
42
|
stroke,
|
|
@@ -37,7 +44,7 @@ export const packEmit = ({ viz, shapeData })=>{
|
|
|
37
44
|
strokeWidth
|
|
38
45
|
},
|
|
39
46
|
aria: {
|
|
40
|
-
label:
|
|
47
|
+
label: packNodeLabel(viz, d)
|
|
41
48
|
}
|
|
42
49
|
};
|
|
43
50
|
});
|
|
@@ -65,7 +72,7 @@ export const packEmit = ({ viz, shapeData })=>{
|
|
|
65
72
|
};
|
|
66
73
|
},
|
|
67
74
|
rotate: constant(0),
|
|
68
|
-
id: (d)=>d
|
|
75
|
+
id: (d)=>packNodeKey(d),
|
|
69
76
|
labelBounds: (_d, _i, aes)=>{
|
|
70
77
|
const r = aes.r;
|
|
71
78
|
return {
|
|
@@ -81,7 +88,7 @@ export const packEmit = ({ viz, shapeData })=>{
|
|
|
81
88
|
}
|
|
82
89
|
});
|
|
83
90
|
const imageNodes = backgroundImageNodes(sc, circleNodes, (k)=>[
|
|
84
|
-
nodes[k]
|
|
91
|
+
packPaintDatum(nodes[k], packNeutral(nodes[k], colorScaled)),
|
|
85
92
|
k
|
|
86
93
|
]);
|
|
87
94
|
return [
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Pack group rows: a circle enclosing others stands for a group above the
|
|
3
|
+
drawn leaves, so its scene datum is that group's row (see
|
|
4
|
+
`viz/groupRow.ts`), as Treemap's group headers carry theirs: the group's
|
|
5
|
+
rows merged, stamped with its `groupBy` level. Clicking it zooms into the
|
|
6
|
+
group, its tooltip names it at its own level, `packOpacity` reads it,
|
|
7
|
+
and so does its paint (every `shapeConfig` accessor), so it takes its
|
|
8
|
+
group's color.
|
|
9
|
+
|
|
10
|
+
The outermost circle holds every row. Its level, -1, sits above the first
|
|
11
|
+
`groupBy`, so its group is everything drawn and zooming into it changes
|
|
12
|
+
nothing. It names no one group, so it is painted neutral (`neutralFill`,
|
|
13
|
+
between the chart's background and its ink), and so is every group while
|
|
14
|
+
a colorScale colors the leaves, as Treemap's group headers are, rather
|
|
15
|
+
than take the scale's color for its total. A neutral circle's fill is
|
|
16
|
+
that tone, its default stroke that tone a shade darker (see
|
|
17
|
+
`neutralPaint.ts`), and its other paint reads its nest entry, which holds
|
|
18
|
+
no fields.
|
|
19
|
+
|
|
20
|
+
Each row also keeps its nest entry's `key` and, as `values`, the datums of
|
|
21
|
+
the circles directly inside it, unenumerated: hover walks them to light a
|
|
22
|
+
group's descendants (`recursionCircles`), and they stay out of the row's
|
|
23
|
+
fields.
|
|
24
|
+
*/ import { merge } from "@d3plus/data";
|
|
25
|
+
import { MEMBERS_KEY } from "../features/thresholdMembers.js";
|
|
26
|
+
import { GROUP_DEPTH_KEY } from "../viz/groupRow.js";
|
|
27
|
+
/** The datum a node's circle carries: its group row, or a leaf's own row. */ export function packDatum(node) {
|
|
28
|
+
return node.groupRow ?? node.data;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
Whether a node's circle is painted neutral (see above): the outermost
|
|
32
|
+
always, and a group while the chart has a colorScale.
|
|
33
|
+
*/ export function packNeutral(node, colorScale) {
|
|
34
|
+
return !node.parent || colorScale && !!node.children;
|
|
35
|
+
}
|
|
36
|
+
/** The datum a node's circle is painted from: a neutral one's nest entry. */ export function packPaintDatum(node, neutral) {
|
|
37
|
+
return neutral ? node.data : packDatum(node);
|
|
38
|
+
}
|
|
39
|
+
/** Stamps every node with children with its group row, innermost first. */ export function attachGroupRows(root, aggs) {
|
|
40
|
+
root.eachAfter((n)=>{
|
|
41
|
+
const node = n;
|
|
42
|
+
if (!node.children) return;
|
|
43
|
+
const row = merge(node.leaves().map((leaf)=>leaf.data), aggs);
|
|
44
|
+
// A group holding the threshold bucket is still a real group.
|
|
45
|
+
delete row._isAggregation;
|
|
46
|
+
delete row._threshold;
|
|
47
|
+
delete row[MEMBERS_KEY];
|
|
48
|
+
row[GROUP_DEPTH_KEY] = node.depth - 1;
|
|
49
|
+
Object.defineProperties(row, {
|
|
50
|
+
key: {
|
|
51
|
+
value: node.data.key,
|
|
52
|
+
configurable: true
|
|
53
|
+
},
|
|
54
|
+
values: {
|
|
55
|
+
value: node.children.map((child)=>packDatum(child)),
|
|
56
|
+
configurable: true
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
node.groupRow = row;
|
|
60
|
+
});
|
|
61
|
+
}
|
|
@@ -4,7 +4,10 @@
|
|
|
4
4
|
Implementation files in this folder:
|
|
5
5
|
- `applyLayout.ts` — chart-specific `TransformStage`.
|
|
6
6
|
- `emit.ts` — Circle + label scene nodes from the laid-out data.
|
|
7
|
+
- `nodeNames.ts` — each circle's scene key and accessible name.
|
|
7
8
|
- `recursionCircles.ts` — descendant-walk helper used by hover handlers.
|
|
9
|
+
- `groupRows.ts` — the group row each enclosing circle carries.
|
|
10
|
+
- `neutralPaint.ts` — the fill and stroke of the neutral circles.
|
|
8
11
|
*/ import { pack } from "d3-hierarchy";
|
|
9
12
|
import accessor from "../../utils/accessor.js";
|
|
10
13
|
import { fieldAccessor } from "../../utils/fieldAccessor.js";
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
The paint of Pack's neutral circles (see `groupRows.ts`): the neutral
|
|
3
|
+
fill, and the stroke the chart's default draws around it, unless a stroke
|
|
4
|
+
of the user's own (`shapeConfig.stroke`, or `shapeConfig.Circle.stroke`)
|
|
5
|
+
paints them instead.
|
|
6
|
+
*/ import { isDefault } from "../../utils/configDefault.js";
|
|
7
|
+
import { neutralFill } from "../viz/backgroundInk.js";
|
|
8
|
+
import { fillStroke } from "../viz/fillStroke.js";
|
|
9
|
+
/** The paint of the chart's neutral circles. */ export function packNeutralPaint(viz) {
|
|
10
|
+
const fill = neutralFill(viz);
|
|
11
|
+
const config = viz.schema.shapeConfig ?? {};
|
|
12
|
+
const circle = config.Circle ?? {};
|
|
13
|
+
const userStroke = circle.stroke !== undefined || !isDefault(config.stroke);
|
|
14
|
+
return userStroke ? {
|
|
15
|
+
fill
|
|
16
|
+
} : {
|
|
17
|
+
fill,
|
|
18
|
+
stroke: `${fillStroke(fill)}`
|
|
19
|
+
};
|
|
20
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
A packed circle's scene key and accessible name. Each group and leaf
|
|
3
|
+
circle is keyed by its path of keys, so a redraw pairs it with itself
|
|
4
|
+
however the circles reorder, and a group circle is named after its own
|
|
5
|
+
group, at its own `groupBy` level; the outermost circle, enclosing every
|
|
6
|
+
group, is named as the chart's total.
|
|
7
|
+
*/ /** A group's key at each `groupBy` level, from the first down to its own. */ function groupPath(node) {
|
|
8
|
+
const keys = [];
|
|
9
|
+
for(let n = node; n && n.parent; n = n.parent)keys.unshift(`${n.data.key}`);
|
|
10
|
+
return keys.join("/");
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
The circle's scene key: a group's path of keys, and a leaf's its groups'
|
|
14
|
+
keys and then its own id (the key of the one-row group it was nested
|
|
15
|
+
in), so no two circles share one and each keeps its own across redraws.
|
|
16
|
+
*/ export function packNodeKey(node) {
|
|
17
|
+
const parent = node.parent;
|
|
18
|
+
if (!parent) return "pack-root-0";
|
|
19
|
+
if (node.children) return `pack-group-${groupPath(node)}`;
|
|
20
|
+
const key = `pack-leaf-${groupPath(parent)}`;
|
|
21
|
+
// Rows that share every key are told apart by their order.
|
|
22
|
+
const siblings = parent.children ?? [];
|
|
23
|
+
return siblings.length > 1 ? `${key}#${siblings.indexOf(node)}` : key;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
The circle's accessible name and value: a leaf's label, a group's name at
|
|
27
|
+
its own `groupBy` level (as Treemap names its group headers), or the
|
|
28
|
+
translated "Total" for the root.
|
|
29
|
+
*/ export function packNodeLabel(viz, node) {
|
|
30
|
+
let name;
|
|
31
|
+
if (!node.parent) name = viz.schema.translate("Total");
|
|
32
|
+
else if (node.children) name = viz._drawLabel(node.leaves()[0].data, 0, node.depth - 1);
|
|
33
|
+
else name = viz._drawLabel(node.data, node.i);
|
|
34
|
+
return `${name}, ${node.value}.`;
|
|
35
|
+
}
|
|
@@ -4,9 +4,11 @@
|
|
|
4
4
|
orient: horizontal axes, titles to the left). Every axis shares one pixel
|
|
5
5
|
range so the lines between them read against a common frame.
|
|
6
6
|
*/ import { Axis } from "../../components/index.js";
|
|
7
|
+
import { defaultMaxSize } from "../../components/Axis/axisMaxSize.js";
|
|
7
8
|
import { barLinePoints } from "../../components/Axis/axisScene.js";
|
|
8
9
|
import { withAxisInk } from "../Plot/axisInk.js";
|
|
9
10
|
import { backgroundInk } from "../viz/backgroundInk.js";
|
|
11
|
+
import { chromeNode } from "./chrome.js";
|
|
10
12
|
import { axisPositions } from "./dimensions.js";
|
|
11
13
|
import { titleHeight, titleNodes, titleWidths } from "./titles.js";
|
|
12
14
|
/** Gap (px) between the titles and the axes they label. */ export const TITLE_GAP = 8;
|
|
@@ -41,16 +43,20 @@ import { titleHeight, titleNodes, titleWidths } from "./titles.js";
|
|
|
41
43
|
...axisConfig.titleConfig ?? {}
|
|
42
44
|
};
|
|
43
45
|
}
|
|
44
|
-
function makeAxis(viz, dim, orient) {
|
|
46
|
+
/** A dimension's axis, its labels given `labelRoom` unless its config sets a `maxSize`. */ function makeAxis(viz, dim, orient, labelRoom) {
|
|
45
47
|
const dimensionConfig = viz.schema.dimensionConfig ?? {};
|
|
46
48
|
const axis = new Axis().orient(orient === "horizontal" ? "left" : "bottom").align("start");
|
|
47
|
-
axis.renderMode("compute").select(null);
|
|
48
|
-
|
|
49
|
+
axis.renderMode("compute").select(null).maxSize(labelRoom);
|
|
50
|
+
const own = dimensionAxisConfig(dimensionConfig[dim.key]);
|
|
51
|
+
axis.config(withAxisInk(viz, {})).config(viz.schema.axisConfig ?? {}).config(own);
|
|
52
|
+
defaultMaxSize(axis, viz.schema.axisConfig, own);
|
|
49
53
|
axis.gridSize(0).title(false);
|
|
50
54
|
const scale = axis.scale();
|
|
51
55
|
if (dim.type === "categorical" && scale !== "point" && scale !== "band") axis.scale("point");
|
|
52
56
|
if (dim.type === "numeric" && (scale === "point" || scale === "band")) axis.scale("linear");
|
|
53
57
|
axis.domain(axisDomain(dim, orient));
|
|
58
|
+
// A reversed categorical axis is handed its domain last category first.
|
|
59
|
+
axis._domainEndFirst = dim.type === "categorical" && dim.reverse;
|
|
54
60
|
return axis;
|
|
55
61
|
}
|
|
56
62
|
/** The pixel range every axis can share: inside each axis's own end-label room. */ function commonRange(axes, length) {
|
|
@@ -71,26 +77,20 @@ function makeAxis(viz, dim, orient) {
|
|
|
71
77
|
length
|
|
72
78
|
];
|
|
73
79
|
}
|
|
74
|
-
/** Wraps an axis's scene in a group at `transform`,
|
|
75
|
-
|
|
76
|
-
const kids = node.children;
|
|
77
|
-
const next = {
|
|
78
|
-
...node,
|
|
79
|
-
interactionGroup: "axis",
|
|
80
|
-
interactive: false
|
|
81
|
-
};
|
|
82
|
-
delete next.datum;
|
|
83
|
-
if (kids) next.children = kids.map(tag);
|
|
84
|
-
return next;
|
|
85
|
-
};
|
|
86
|
-
const scene = axis.toScene();
|
|
87
|
-
return tag({
|
|
80
|
+
/** Wraps an axis's scene in a group at `transform`, as chrome (see `chromeNode`). */ function axisNode(axis, key, transform) {
|
|
81
|
+
return chromeNode({
|
|
88
82
|
type: "group",
|
|
89
83
|
key: `pc-axis-${key}`,
|
|
90
84
|
transform,
|
|
91
|
-
children:
|
|
85
|
+
children: axis.toScene().children
|
|
92
86
|
});
|
|
93
87
|
}
|
|
88
|
+
/** Each dimension's `titleTooltip`, by key: its axis's, from `axisConfig` and its `dimensionConfig` entry. */ function titleTooltips(dims, axes) {
|
|
89
|
+
return new Map(dims.map((dim, i)=>[
|
|
90
|
+
dim.key,
|
|
91
|
+
axes[i].schema.titleTooltip
|
|
92
|
+
]));
|
|
93
|
+
}
|
|
94
94
|
function placedAxis(axis, dim, offset, origin, range) {
|
|
95
95
|
const toAxis = (v)=>dim.type === "categorical" ? String(v) : v;
|
|
96
96
|
const scale = axis._d3Scale;
|
|
@@ -113,7 +113,7 @@ function placedAxis(axis, dim, offset, origin, range) {
|
|
|
113
113
|
const locale = viz.schema.locale;
|
|
114
114
|
const natural = titleWidths(dims.map((d)=>d.title), style, locale);
|
|
115
115
|
const maxLabel = Math.max(30, width / n * 0.6);
|
|
116
|
-
const axes = dims.map((dim)=>makeAxis(viz, dim, "horizontal").height(height).width(maxLabel)
|
|
116
|
+
const axes = dims.map((dim)=>makeAxis(viz, dim, "horizontal", maxLabel).height(height).width(maxLabel));
|
|
117
117
|
axes.forEach((a)=>a.measure());
|
|
118
118
|
const labelSpace = axes.map((a)=>a.outerBounds().width || 0);
|
|
119
119
|
let spacing = n > 1 ? width / n : width;
|
|
@@ -150,7 +150,7 @@ function placedAxis(axis, dim, offset, origin, range) {
|
|
|
150
150
|
}));
|
|
151
151
|
return placedAxis(axis, dims[i], offsets[i], top, range);
|
|
152
152
|
});
|
|
153
|
-
nodes.push(...titleNodes(titles, style, locale));
|
|
153
|
+
nodes.push(...titleNodes(titles, style, locale, titleTooltips(dims, axes)));
|
|
154
154
|
return {
|
|
155
155
|
axes: placed,
|
|
156
156
|
nodes
|
|
@@ -165,7 +165,7 @@ function placedAxis(axis, dim, offset, origin, range) {
|
|
|
165
165
|
const left = titleWidth ? titleWidth + TITLE_GAP : 0;
|
|
166
166
|
const length = Math.max(0, width - left);
|
|
167
167
|
const maxLabel = Math.max(20, height / n * 0.5);
|
|
168
|
-
const axes = dims.map((dim)=>makeAxis(viz, dim, "vertical").width(length).height(maxLabel)
|
|
168
|
+
const axes = dims.map((dim)=>makeAxis(viz, dim, "vertical", maxLabel).width(length).height(maxLabel));
|
|
169
169
|
axes.forEach((a)=>a.measure());
|
|
170
170
|
const labelSpace = axes.map((a)=>a.outerBounds().height || 0);
|
|
171
171
|
const lineHeight = titleHeight(dims.slice(0, 1).map((d)=>({
|
|
@@ -198,7 +198,7 @@ function placedAxis(axis, dim, offset, origin, range) {
|
|
|
198
198
|
width: titleWidth,
|
|
199
199
|
height: spacing
|
|
200
200
|
})).filter((t)=>t.text) : [];
|
|
201
|
-
nodes.push(...titleNodes(titles, style, locale));
|
|
201
|
+
nodes.push(...titleNodes(titles, style, locale, titleTooltips(dims, axes)));
|
|
202
202
|
return {
|
|
203
203
|
axes: placed,
|
|
204
204
|
nodes
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
ParallelCoordinates chrome: the axes and their titles hold no data and
|
|
3
|
+
stay out of hit-testing, all but the labels with an axis tooltip to show.
|
|
4
|
+
*/ import { inertAxis } from "../../components/Axis/axisTooltipTargets.js";
|
|
5
|
+
/** Removes the data from a scene subtree, in place. */ function dataless(node) {
|
|
6
|
+
delete node.datum;
|
|
7
|
+
delete node.index;
|
|
8
|
+
if (node.type === "group") node.children.forEach(dataless);
|
|
9
|
+
return node;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
A copy of an axis's or title's scene as chrome (see `inertAxis`), without
|
|
13
|
+
its data: the pointer passes through it to the lines, and catches only on
|
|
14
|
+
a label stamped with a tooltip target.
|
|
15
|
+
@param node An axis's or title's scene, or a node in it.
|
|
16
|
+
*/ export function chromeNode(node) {
|
|
17
|
+
return dataless(inertAxis(node));
|
|
18
|
+
}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
- `dimensions.ts` — which keys get an axis, their types and domains.
|
|
7
7
|
- `axes.ts` — one Axis per dimension, laid out with its title.
|
|
8
8
|
- `titles.ts` — dimension titles (TextBox).
|
|
9
|
+
- `chrome.ts` — axes and titles as chrome, hoverable where a label has a tooltip.
|
|
9
10
|
- `paths.ts` — each row's crossing points and path.
|
|
10
11
|
- `applyLayout.ts` — chart-specific `TransformStage`.
|
|
11
12
|
- `emit.ts` — a path (plus hit path) per row.
|
|
@@ -154,7 +155,8 @@ export const parallelCoordinatesDef = {
|
|
|
154
155
|
},
|
|
155
156
|
/**
|
|
156
157
|
Per-dimension options, keyed by dimension: `domain`, `reverse`,
|
|
157
|
-
`title`, and any Axis config (`tickFormat`, `ticks`, `scale`,
|
|
158
|
+
`title`, and any Axis config (`tickFormat`, `ticks`, `scale`,
|
|
159
|
+
`tickTooltip`, `titleTooltip`, …).
|
|
158
160
|
@type {Record<string, object>}
|
|
159
161
|
*/ {
|
|
160
162
|
key: "dimensionConfig",
|
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
centered above each axis (horizontal layout) or right-aligned beside it
|
|
4
4
|
(vertical layout).
|
|
5
5
|
*/ import { TextBox } from "../../components/index.js";
|
|
6
|
+
import { stampTitleTooltip } from "../../components/Axis/axisTooltipTargets.js";
|
|
7
|
+
import { chromeNode } from "./chrome.js";
|
|
6
8
|
/** Room assumed for a title's text when measuring its natural (one-line) width. */ const UNWRAPPED = 1e4;
|
|
7
9
|
function titleBox(titles, style, locale) {
|
|
8
10
|
const box = new TextBox().data(titles.map((t)=>({
|
|
@@ -38,19 +40,25 @@ function titleBox(titles, style, locale) {
|
|
|
38
40
|
}, locale)._textData();
|
|
39
41
|
return Math.ceil(Math.max(0, ...data.map((d)=>d.lines.length * d.lH)));
|
|
40
42
|
}
|
|
41
|
-
/**
|
|
43
|
+
/**
|
|
44
|
+
The title text nodes, as chrome (see `chromeNode`). With `tooltips`, each
|
|
45
|
+
dimension's `titleTooltip` by key, a title with a tooltip to show (the
|
|
46
|
+
option's, or its whole text when it is drawn cut short) takes the
|
|
47
|
+
pointer; without it none does.
|
|
48
|
+
*/ export function titleNodes(titles, style, locale, tooltips) {
|
|
42
49
|
if (!titles.length) return [];
|
|
50
|
+
const byId = new Map(titles.map((t)=>[
|
|
51
|
+
`pc-title-${t.key}`,
|
|
52
|
+
t
|
|
53
|
+
]));
|
|
43
54
|
return titleBox(titles, {
|
|
44
55
|
...style,
|
|
45
56
|
padding: 0
|
|
46
57
|
}, locale).toScene().children.map((node)=>{
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
delete next.datum;
|
|
53
|
-
delete next.index;
|
|
54
|
-
return next;
|
|
58
|
+
const title = byId.get(`${node.datum?.id}`);
|
|
59
|
+
if (tooltips && title) stampTitleTooltip([
|
|
60
|
+
node
|
|
61
|
+
], title.text, tooltips.get(title.key));
|
|
62
|
+
return chromeNode(node);
|
|
55
63
|
});
|
|
56
64
|
}
|