@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
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
The zoom-control buttons' actions, for a chart's `zoomIn`, `zoomOut`,
|
|
3
|
+
`zoomReset`, and `zoomBrush` methods: buttons of a page's own can zoom a
|
|
4
|
+
chart exactly as the built-in ones do, shown or not.
|
|
5
|
+
|
|
6
|
+
@module
|
|
7
|
+
*/ import { zoomEvents, zoomMath } from "./zoomControls.js";
|
|
8
|
+
import { isBrushing, syncBrushButton } from "./zoomControlsMarkup.js";
|
|
9
|
+
/**
|
|
10
|
+
Whether a chart can zoom right now: `zoom` is on and it has rendered, so
|
|
11
|
+
its zoom surface and brush are in place.
|
|
12
|
+
@param viz The chart.
|
|
13
|
+
*/ export function canZoom(viz) {
|
|
14
|
+
const tgt = viz._zoomEventTarget || viz._container;
|
|
15
|
+
return Boolean(viz.schema.zoom && viz._zoomBehavior && viz._brushGroup && tgt?.node());
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
Zooms by `factor` about the chart area's center, as the zoom-in (`factor`
|
|
19
|
+
is `zoomFactor`) and zoom-out (`1 / zoomFactor`) buttons do, or resets to
|
|
20
|
+
the initial view for `0`, as the reset button does. Does nothing while
|
|
21
|
+
the chart can't zoom (see `canZoom`).
|
|
22
|
+
@param viz The chart.
|
|
23
|
+
@param factor The zoom multiplier, or 0 to reset.
|
|
24
|
+
*/ export function zoomBy(viz, factor) {
|
|
25
|
+
if (canZoom(viz)) zoomMath.call(viz, factor);
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
Turns brush mode on or off, as the brush button does, and has the button
|
|
29
|
+
(when it shows) report it. Does nothing while the chart can't zoom.
|
|
30
|
+
@param viz The chart.
|
|
31
|
+
@param on Whether brush mode is on.
|
|
32
|
+
*/ export function setZoomBrush(viz, on) {
|
|
33
|
+
if (!canZoom(viz) || on === isBrushing(viz)) return;
|
|
34
|
+
zoomEvents.call(viz, on);
|
|
35
|
+
syncBrushButton(viz);
|
|
36
|
+
}
|
|
@@ -7,6 +7,8 @@ import { autoZoomMax } from "../features/zoomExtent.js";
|
|
|
7
7
|
import { isBrushing, mountCustomIcons, paintZoomButton, setBrushing, showsZoomControls, syncBrushButton, ZOOM_PANEL_STYLE, zoomControlsHtml } from "./zoomControlsMarkup.js";
|
|
8
8
|
import { refreshBottomRightPanel } from "./bottomRightControlsMarkup.js";
|
|
9
9
|
import { startsOnBrush } from "./zoomGesture.js";
|
|
10
|
+
import { fitBounds } from "./zoomFit.js";
|
|
11
|
+
import { bindZoomGestures, unbindZoomGestures } from "./zoomDrag.js";
|
|
10
12
|
import { gestureHoverEnd, gestureHoverMove, gestureHoverStart } from "./gestureHover.js";
|
|
11
13
|
import { forgetTransform, recordTransform, showsTransform } from "./zoomShown.js";
|
|
12
14
|
import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
@@ -207,8 +209,8 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
207
209
|
*/ function retargetZoom(viz, target) {
|
|
208
210
|
const prev = viz._zoomEventTarget;
|
|
209
211
|
if (prev && prev.node() === target.node()) return;
|
|
210
|
-
if (prev) prev.on(".zoom", null);
|
|
211
|
-
if (viz._container) viz._container.on(".zoom", null);
|
|
212
|
+
if (prev) unbindZoomGestures(prev.on(".zoom", null));
|
|
213
|
+
if (viz._container) unbindZoomGestures(viz._container.on(".zoom", null));
|
|
212
214
|
viz._zoomEventTarget = target;
|
|
213
215
|
}
|
|
214
216
|
/**
|
|
@@ -260,9 +262,11 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
260
262
|
}
|
|
261
263
|
/**
|
|
262
264
|
@name zoomEvents
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
265
|
+
Turns brush mode on or off, binding the zoom gestures to match: brush
|
|
266
|
+
mode hands every press to the zoom brush, and otherwise d3-zoom takes the
|
|
267
|
+
wheel, pinch, and pan (as `zoomScroll` and `zoomPan` allow) and the
|
|
268
|
+
`zoomDrag`/`zoomDoubleClick` gestures are bound beside it.
|
|
269
|
+
*/ export function zoomEvents(brush = false) {
|
|
266
270
|
setBrushing(this, brush);
|
|
267
271
|
if (brush) this._brushGroup.style("display", "inline");
|
|
268
272
|
else this._brushGroup.style("display", "none");
|
|
@@ -282,8 +286,9 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
282
286
|
if (!this.schema.zoomPan) {
|
|
283
287
|
tgt.on("mousedown.zoom mousemove.zoom", null).on("touchstart.zoom touchmove.zoom touchend.zoom touchcancel.zoom", null);
|
|
284
288
|
}
|
|
289
|
+
bindZoomGestures(this, tgt, ()=>zoomMath.bind(this)(0));
|
|
285
290
|
} else {
|
|
286
|
-
tgt.on(".zoom", null);
|
|
291
|
+
unbindZoomGestures(tgt.on(".zoom", null));
|
|
287
292
|
}
|
|
288
293
|
}
|
|
289
294
|
/** Whether the chart is currently zoomed in (or panned) from its natural view. */ function isZoomedIn(viz) {
|
|
@@ -299,13 +304,16 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
299
304
|
zooms — until the chart is zoomed in, when one finger pans it. d3-zoom
|
|
300
305
|
registers every current touch when a gesture starts, so skipping the
|
|
301
306
|
first finger still gives a full pinch. A press on a brush (the timeline)
|
|
302
|
-
is left to the brush (see `startsOnBrush`).
|
|
303
|
-
|
|
307
|
+
is left to the brush (see `startsOnBrush`). With `zoomDrag: "brush"`, a
|
|
308
|
+
mouse drag draws a zoom box (see `zoomDrag.ts`), so only Shift + drag
|
|
309
|
+
pans. Everything else follows d3-zoom's default filter (no Ctrl + drag,
|
|
310
|
+
primary button only).
|
|
304
311
|
@private
|
|
305
312
|
*/ function zoomGestureFilter(viz, event) {
|
|
306
313
|
const modifier = viz.schema.zoomScroll === "modifier";
|
|
307
314
|
if (event.type === "wheel") return !modifier || event.ctrlKey || event.metaKey;
|
|
308
315
|
if (startsOnBrush(event)) return false;
|
|
316
|
+
if (event.type === "mousedown" && viz.schema.zoomDrag === "brush" && !event.shiftKey) return false;
|
|
309
317
|
if (event.type === "touchstart" && modifier) return (event.touches?.length ?? 0) > 1 || isZoomedIn(viz);
|
|
310
318
|
return !event.ctrlKey && !event.button;
|
|
311
319
|
}
|
|
@@ -387,9 +395,10 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
387
395
|
}
|
|
388
396
|
/**
|
|
389
397
|
@name zoomMath
|
|
390
|
-
Zooms in or out
|
|
391
|
-
|
|
392
|
-
|
|
398
|
+
Zooms in or out by a multiplier about the chart area's center, as the
|
|
399
|
+
zoom-in and zoom-out buttons do; `0` resets to the initial view.
|
|
400
|
+
@param factor
|
|
401
|
+
*/ export function zoomMath(factor = 0) {
|
|
393
402
|
if (!this._container) return;
|
|
394
403
|
const [[x0, y0], [x1, y1]] = this._zoomBehavior.extent().bind(document)(), cx = (x0 + x1) / 2, cy = (y0 + y1) / 2, t = zoomTransform((this._zoomEventTarget || this._container).node());
|
|
395
404
|
if (!factor) {
|
|
@@ -424,16 +433,18 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
424
433
|
/**
|
|
425
434
|
@name zoomToBounds
|
|
426
435
|
Zooms so the given on-screen bounds (surface pixels, as currently
|
|
427
|
-
displayed) fill the chart area
|
|
436
|
+
displayed) fill the chart's zoom area (see `fitBounds`). `null` resets.
|
|
428
437
|
@param bounds
|
|
429
438
|
@private
|
|
430
439
|
*/ function zoomToBounds(bounds, duration = effectiveDuration(this)) {
|
|
431
440
|
if (!bounds) return zoomTo(this, 1, 0, 0, duration);
|
|
432
|
-
const
|
|
433
|
-
|
|
434
|
-
const
|
|
435
|
-
|
|
436
|
-
|
|
441
|
+
const t = zoomTransform((this._zoomEventTarget || this._container).node());
|
|
442
|
+
// Un-apply the current transform: bounds → unzoomed surface space.
|
|
443
|
+
const fit = fitBounds(this, bounds.map(([x, y])=>[
|
|
444
|
+
(x - t.x) / t.k,
|
|
445
|
+
(y - t.y) / t.k
|
|
446
|
+
]));
|
|
447
|
+
zoomTo(this, fit.k, fit.x, fit.y, duration);
|
|
437
448
|
}
|
|
438
449
|
/**
|
|
439
450
|
Triggered on brush "brush".
|
|
@@ -445,7 +456,9 @@ import { effectiveDuration, motionReduced } from "../viz/reducedMotion.js";
|
|
|
445
456
|
Triggered on brush "end".
|
|
446
457
|
@private
|
|
447
458
|
*/ function brushEnd(event) {
|
|
448
|
-
|
|
459
|
+
// Only zoom on a selection made by input, not one a drag gesture shows
|
|
460
|
+
// with `_zoomBrush.move` (see `zoomDrag.ts`).
|
|
461
|
+
if (!event.selection || !event.sourceEvent) return;
|
|
449
462
|
this._brushGroup.call(this._zoomBrush.move, null);
|
|
450
463
|
// A selection is a one-shot zoom: leave brush mode so the chart takes
|
|
451
464
|
// pointer events (hover, pan, wheel) again.
|
|
@@ -96,6 +96,9 @@ const ZOOM_BRUSH_ICON = `<svg ${ICON_ATTRS} stroke-dasharray="4 3"><rect x="4" y
|
|
|
96
96
|
`padding` (with `box-sizing: border-box`) one 4px inset from the chart's
|
|
97
97
|
top/right edge. This isn't part of the auto-disable `zoomControlClassName`
|
|
98
98
|
triggers, so a host page never has to re-add its own spacing utility.
|
|
99
|
+
The panel spans the chart's width, so it lets the pointer through to
|
|
100
|
+
whatever it covers (a color scale's axis, a title) and only its buttons
|
|
101
|
+
(see `zoomControlsHtml`) take it.
|
|
99
102
|
*/ export const ZOOM_PANEL_STYLE = {
|
|
100
103
|
display: "flex",
|
|
101
104
|
alignItems: "center",
|
|
@@ -103,7 +106,8 @@ const ZOOM_BRUSH_ICON = `<svg ${ICON_ATTRS} stroke-dasharray="4 3"><rect x="4" y
|
|
|
103
106
|
gap: "4px",
|
|
104
107
|
boxSizing: "border-box",
|
|
105
108
|
paddingTop: `${ZOOM_PANEL_PADDING}px`,
|
|
106
|
-
paddingRight: `${ZOOM_PANEL_PADDING}px
|
|
109
|
+
paddingRight: `${ZOOM_PANEL_PADDING}px`,
|
|
110
|
+
pointerEvents: "none"
|
|
107
111
|
};
|
|
108
112
|
/**
|
|
109
113
|
The four buttons' markup. Real <button>s (not <div>s) so a host page's own
|
|
@@ -113,9 +117,10 @@ const ZOOM_BRUSH_ICON = `<svg ${ICON_ATTRS} stroke-dasharray="4 3"><rect x="4" y
|
|
|
113
117
|
consumer's own class onto each button without losing the fixed classes
|
|
114
118
|
event delegation depends on. The brush toggle carries `aria-pressed` (and
|
|
115
119
|
the `.active` class frameworks like Bootstrap style) while brush mode is on.
|
|
120
|
+
Each button takes the pointer back from the panel (`ZOOM_PANEL_STYLE`).
|
|
116
121
|
*/ export function zoomControlsHtml(viz) {
|
|
117
122
|
const extraClass = viz.schema.zoomControlClassName ? ` ${viz.schema.zoomControlClassName}` : "";
|
|
118
|
-
const button = (cls, label, glyph, pressed)=>`<button type="button" class="zoom-control ${cls}${pressed ? " active" : ""}${extraClass}" aria-label="${viz.schema.translate(label)}"${pressed === undefined ? "" : ` aria-pressed="${pressed}"`}>${glyph}</button>`;
|
|
123
|
+
const button = (cls, label, glyph, pressed)=>`<button type="button" style="pointer-events:auto" class="zoom-control ${cls}${pressed ? " active" : ""}${extraClass}" aria-label="${viz.schema.translate(label)}"${pressed === undefined ? "" : ` aria-pressed="${pressed}"`}>${glyph}</button>`;
|
|
119
124
|
return button("zoom-in", "Zoom In", iconFor(viz, "zoomIn", ZOOM_IN_ICON)) + button("zoom-out", "Zoom Out", iconFor(viz, "zoomOut", ZOOM_OUT_ICON)) + button("zoom-reset", "Reset Zoom", iconFor(viz, "zoomReset", ZOOM_RESET_ICON)) + button("zoom-brush", "Brush Zoom", iconFor(viz, "zoomBrush", ZOOM_BRUSH_ICON), isBrushing(viz));
|
|
120
125
|
}
|
|
121
126
|
/**
|
|
@@ -156,8 +161,8 @@ const ZOOM_BRUSH_ICON = `<svg ${ICON_ATTRS} stroke-dasharray="4 3"><rect x="4" y
|
|
|
156
161
|
btn.setAttribute("aria-pressed", String(pressed));
|
|
157
162
|
paintZoomButton(viz, btn, btn.matches(":hover"));
|
|
158
163
|
}
|
|
159
|
-
/** Whether a chart shows the zoom-control panel. */ export function showsZoomControls(viz) {
|
|
160
|
-
return Boolean(viz.schema.zoom) && !viz._ssr;
|
|
164
|
+
/** Whether a chart shows the zoom-control panel: it zooms, and `zoomControls` isn't false. */ export function showsZoomControls(viz) {
|
|
165
|
+
return Boolean(viz.schema.zoom) && viz.schema.zoomControls !== false && !viz._ssr;
|
|
161
166
|
}
|
|
162
167
|
/** Panel size before it has been measured (the default 20px buttons). */ const ESTIMATED_BOX = {
|
|
163
168
|
width: 4 * 20 + 3 * 4 + ZOOM_PANEL_PADDING,
|
|
@@ -204,6 +209,20 @@ const ZOOM_BRUSH_ICON = `<svg ${ICON_ATTRS} stroke-dasharray="4 3"><rect x="4" y
|
|
|
204
209
|
};
|
|
205
210
|
return viz._zoomControlsBox;
|
|
206
211
|
}
|
|
212
|
+
/**
|
|
213
|
+
The box the minimap hangs beneath: the zoom-control panel, or, with the
|
|
214
|
+
buttons hidden (`zoomControls: false`), a strip as wide as the default
|
|
215
|
+
panel down to the chart area's top, so the minimap overlays the chart
|
|
216
|
+
area rather than the title and other top content that take the
|
|
217
|
+
buttons' room. Null when the chart doesn't zoom.
|
|
218
|
+
*/ export function minimapAnchor(viz) {
|
|
219
|
+
const box = zoomControlsBox(viz);
|
|
220
|
+
if (box) return box;
|
|
221
|
+
return viz.schema.zoom && !viz._ssr ? {
|
|
222
|
+
width: ESTIMATED_BOX.width,
|
|
223
|
+
height: viz._margin?.top ?? 0
|
|
224
|
+
} : null;
|
|
225
|
+
}
|
|
207
226
|
/**
|
|
208
227
|
How far down the chart content must start to clear the zoom buttons
|
|
209
228
|
with the same gap below them as above: the panel's height (its top
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
/**
|
|
2
|
+
The pointer gestures a chart zooms by beyond d3-zoom's own pan and wheel:
|
|
3
|
+
a mouse drag that draws a box to zoom into (`zoomDrag: "brush"`), and
|
|
4
|
+
what a double-click does (`zoomDoubleClick`).
|
|
5
|
+
|
|
6
|
+
The drawn box needs no brush overlay over the chart: the press listens on
|
|
7
|
+
the zoom surface beside the chart's own pointer listeners, so a click
|
|
8
|
+
that doesn't drag still reaches the shape under it, and hover still
|
|
9
|
+
works until a drag begins. Once one does, it reuses the brush mode's
|
|
10
|
+
pieces: the zoom brush shows the box (with its styles), and releasing
|
|
11
|
+
zooms to it through `viz._zoomToBounds`.
|
|
12
|
+
|
|
13
|
+
@module
|
|
14
|
+
*/ import { pointer, select } from "d3-selection";
|
|
15
|
+
import { zoomTransform } from "d3-zoom";
|
|
16
|
+
import { gestureHoverEnd, gestureHoverMove, gestureHoverStart } from "./gestureHover.js";
|
|
17
|
+
import { setCursor } from "../viz/setCursor.js";
|
|
18
|
+
import { startsOnBrush } from "./zoomGesture.js";
|
|
19
|
+
/** How far (px) a press moves before it draws a box instead of clicking. */ export const BOX_DRAG_DISTANCE = 3;
|
|
20
|
+
/** The listener namespace of every gesture bound here. */ const NS = "zoombox";
|
|
21
|
+
/** Window listeners a press adds, removed when it lets go. */ const PRESS_EVENTS = [
|
|
22
|
+
"mousemove",
|
|
23
|
+
"mouseup",
|
|
24
|
+
"keydown",
|
|
25
|
+
"selectstart",
|
|
26
|
+
"dragstart"
|
|
27
|
+
].map((type)=>`${type}.${NS}`).join(" ");
|
|
28
|
+
/**
|
|
29
|
+
Clamps a point into a box.
|
|
30
|
+
@param point The point.
|
|
31
|
+
@param box The box.
|
|
32
|
+
*/ export function clampPoint([x, y], [[x0, y0], [x1, y1]]) {
|
|
33
|
+
return [
|
|
34
|
+
Math.max(x0, Math.min(x1, x)),
|
|
35
|
+
Math.max(y0, Math.min(y1, y))
|
|
36
|
+
];
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
The box two corners span, whichever way the drag went.
|
|
40
|
+
@param a One corner.
|
|
41
|
+
@param b The opposite corner.
|
|
42
|
+
*/ export function spanBox(a, b) {
|
|
43
|
+
return [
|
|
44
|
+
[
|
|
45
|
+
Math.min(a[0], b[0]),
|
|
46
|
+
Math.min(a[1], b[1])
|
|
47
|
+
],
|
|
48
|
+
[
|
|
49
|
+
Math.max(a[0], b[0]),
|
|
50
|
+
Math.max(a[1], b[1])
|
|
51
|
+
]
|
|
52
|
+
];
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
Whether a point lies in a box, edges included.
|
|
56
|
+
@param point The point.
|
|
57
|
+
@param box The box.
|
|
58
|
+
*/ export function inBox([x, y], [[x0, y0], [x1, y1]]) {
|
|
59
|
+
return x >= x0 && x <= x1 && y >= y0 && y <= y1;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
Whether a press at `at` may draw a zoom box: the primary button with no
|
|
63
|
+
modifier key (Shift + drag pans), the first press of a click (not the
|
|
64
|
+
second of a double-click), inside the chart area, and not on a brush
|
|
65
|
+
(the timeline's).
|
|
66
|
+
@param event The mousedown.
|
|
67
|
+
@param at The press, in the zoom surface's coordinates.
|
|
68
|
+
@param area The chart area, in the same coordinates.
|
|
69
|
+
*/ export function startsBoxDrag(event, at, area) {
|
|
70
|
+
return !event.button && !event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey && event.detail < 2 && !startsOnBrush(event) && inBox(at, area);
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
Whether a move from `from` to `to` (client pixels) has gone far enough
|
|
74
|
+
to be a drag rather than a click.
|
|
75
|
+
@param from Where the press began.
|
|
76
|
+
@param to Where the pointer is now.
|
|
77
|
+
*/ export function dragsFar(from, to) {
|
|
78
|
+
return Math.hypot(to[0] - from[0], to[1] - from[1]) > BOX_DRAG_DISTANCE;
|
|
79
|
+
}
|
|
80
|
+
/** The chart area in the zoom surface's coordinates (the zoom extent). */ function zoomArea(viz) {
|
|
81
|
+
return viz._zoomBehavior.extent().bind(document)();
|
|
82
|
+
}
|
|
83
|
+
/** Shows `box` (surface coordinates) with the zoom brush, offset like it to the chart area. */ function showBox(viz, box) {
|
|
84
|
+
const { left, top } = viz._margin;
|
|
85
|
+
viz._brushGroup.style("display", "inline").style("pointer-events", "none").call(viz._zoomBrush.move, box.map(([x, y])=>[
|
|
86
|
+
x - left,
|
|
87
|
+
y - top
|
|
88
|
+
]));
|
|
89
|
+
}
|
|
90
|
+
/** Hides the zoom brush's box again. */ function hideBox(viz) {
|
|
91
|
+
viz._brushGroup.call(viz._zoomBrush.move, null).style("display", "none").style("pointer-events", null);
|
|
92
|
+
}
|
|
93
|
+
/** Swallows the click a drag ends with, so it reaches no shape. */ function suppressClick(view) {
|
|
94
|
+
const win = select(view);
|
|
95
|
+
win.on(`click.${NS}`, (event)=>{
|
|
96
|
+
event.preventDefault();
|
|
97
|
+
event.stopImmediatePropagation();
|
|
98
|
+
}, true);
|
|
99
|
+
setTimeout(()=>win.on(`click.${NS}`, null), 0);
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
A press on the zoom surface while `zoomDrag` is "brush": once it drags
|
|
103
|
+
past `BOX_DRAG_DISTANCE`, it draws a box (clamped to the chart area),
|
|
104
|
+
holds hover like a pan does (see `gestureHover.ts`) under a crosshair
|
|
105
|
+
cursor, and on release
|
|
106
|
+
zooms to the box and swallows the click. A press that doesn't drag is
|
|
107
|
+
left alone, so it clicks as usual. Escape cancels a box mid-drag.
|
|
108
|
+
*/ function pressed(viz, event) {
|
|
109
|
+
const surface = event.currentTarget;
|
|
110
|
+
const area = zoomArea(viz);
|
|
111
|
+
const start = pointer(event, surface);
|
|
112
|
+
if (!startsBoxDrag(event, start, area)) return;
|
|
113
|
+
const view = event.view ?? window;
|
|
114
|
+
const win = select(view);
|
|
115
|
+
const origin = [
|
|
116
|
+
event.clientX,
|
|
117
|
+
event.clientY
|
|
118
|
+
];
|
|
119
|
+
let box = null;
|
|
120
|
+
const finish = (zoom)=>{
|
|
121
|
+
win.on(PRESS_EVENTS, null);
|
|
122
|
+
if (!box) return;
|
|
123
|
+
setCursor(viz, "auto");
|
|
124
|
+
hideBox(viz);
|
|
125
|
+
gestureHoverEnd(viz);
|
|
126
|
+
suppressClick(view);
|
|
127
|
+
if (zoom) viz._zoomToBounds?.(box);
|
|
128
|
+
box = null;
|
|
129
|
+
};
|
|
130
|
+
win.on(`mousemove.${NS}`, (move)=>{
|
|
131
|
+
if (!box) {
|
|
132
|
+
if (!dragsFar(origin, [
|
|
133
|
+
move.clientX,
|
|
134
|
+
move.clientY
|
|
135
|
+
])) return;
|
|
136
|
+
const transform = zoomTransform(surface);
|
|
137
|
+
gestureHoverStart(viz, {
|
|
138
|
+
transform,
|
|
139
|
+
sourceEvent: event
|
|
140
|
+
});
|
|
141
|
+
gestureHoverMove(viz, {
|
|
142
|
+
transform,
|
|
143
|
+
sourceEvent: move
|
|
144
|
+
});
|
|
145
|
+
setCursor(viz, "crosshair");
|
|
146
|
+
}
|
|
147
|
+
move.preventDefault();
|
|
148
|
+
const at = clampPoint(pointer(move, surface), area);
|
|
149
|
+
box = spanBox(clampPoint(start, area), at);
|
|
150
|
+
showBox(viz, box);
|
|
151
|
+
}, true).on(`mouseup.${NS}`, ()=>finish(true), true).on(`keydown.${NS}`, (key)=>{
|
|
152
|
+
if (key.key === "Escape" && box) finish(false);
|
|
153
|
+
}, true).on(`selectstart.${NS} dragstart.${NS}`, (e)=>e.preventDefault(), true);
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
The double-click listener for `zoomDoubleClick`: d3-zoom's own (zoom in)
|
|
157
|
+
for `"in"`, a reset for `"reset"`, or none for `false`. It rides
|
|
158
|
+
d3-zoom's `dblclick.zoom` slot, which d3-zoom also calls for a touch
|
|
159
|
+
double-tap, so a double-tap does the same.
|
|
160
|
+
*/ function bindDoubleClick(viz, tgt, reset) {
|
|
161
|
+
const mode = viz.schema.zoomDoubleClick;
|
|
162
|
+
if (mode === false) tgt.on("dblclick.zoom", null);
|
|
163
|
+
else if (mode === "reset") tgt.on("dblclick.zoom", (event)=>{
|
|
164
|
+
if (event.button || event.ctrlKey || startsOnBrush(event)) return;
|
|
165
|
+
event.preventDefault();
|
|
166
|
+
event.stopImmediatePropagation();
|
|
167
|
+
reset();
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
/**
|
|
171
|
+
Binds the gestures this module adds to the zoom surface, after d3-zoom's
|
|
172
|
+
own: the drawn zoom box for `zoomDrag: "brush"`, and the double-click
|
|
173
|
+
for `zoomDoubleClick`.
|
|
174
|
+
@param viz The chart.
|
|
175
|
+
@param tgt The element d3-zoom is bound to.
|
|
176
|
+
@param reset Returns the chart to its initial view.
|
|
177
|
+
*/ export function bindZoomGestures(viz, tgt, reset) {
|
|
178
|
+
const brush = viz.schema.zoomDrag === "brush";
|
|
179
|
+
tgt.on(`mousedown.${NS}`, brush ? (e)=>pressed(viz, e) : null);
|
|
180
|
+
bindDoubleClick(viz, tgt, reset);
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
Removes the gestures `bindZoomGestures` added (d3-zoom's own listeners,
|
|
184
|
+
the double-click included, go with `.on(".zoom", null)`).
|
|
185
|
+
@param tgt The element they were bound to.
|
|
186
|
+
*/ export function unbindZoomGestures(tgt) {
|
|
187
|
+
tgt.on(`.${NS}`, null);
|
|
188
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Which screen dimensions the zoom actually scales. Every chart zooms its
|
|
3
|
+
picture uniformly, except a Plot, which rescales only its linear and time
|
|
4
|
+
axes: a LinePlot or a bar chart with a discrete x axis zooms vertically
|
|
5
|
+
alone.
|
|
6
|
+
@param viz The chart.
|
|
7
|
+
*/ export function zoomedDims(viz) {
|
|
8
|
+
const scales = viz._plotZoomBase?.scales;
|
|
9
|
+
if (!scales) return {
|
|
10
|
+
x: true,
|
|
11
|
+
y: true
|
|
12
|
+
};
|
|
13
|
+
return {
|
|
14
|
+
x: Boolean(scales.x || scales.x2),
|
|
15
|
+
y: Boolean(scales.y || scales.y2)
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
The area zoomed bounds fill, in surface coordinates: a Plot's plot rect,
|
|
20
|
+
where its axes read their values, so a brushed range becomes the axes'
|
|
21
|
+
exact domain; any other chart's zoom area less `zoomPadding`.
|
|
22
|
+
@param viz The chart.
|
|
23
|
+
*/ function fitArea(viz) {
|
|
24
|
+
const base = viz._plotZoomBase;
|
|
25
|
+
if (base) {
|
|
26
|
+
const { layout, chartTransform: ct, pCtx } = base;
|
|
27
|
+
// Axis ranges are measured from the plot body; y also sits below the x2 axis.
|
|
28
|
+
const top = ct.y - pCtx.x2Height;
|
|
29
|
+
return [
|
|
30
|
+
[
|
|
31
|
+
layout.xRange[0] + ct.x,
|
|
32
|
+
layout.yRange[0] + top
|
|
33
|
+
],
|
|
34
|
+
[
|
|
35
|
+
layout.xRange[1] + ct.x,
|
|
36
|
+
layout.yRange[1] + top
|
|
37
|
+
]
|
|
38
|
+
];
|
|
39
|
+
}
|
|
40
|
+
const [[x0, y0], [x1, y1]] = viz._zoomBehavior.translateExtent(), pad = viz.schema.zoomPadding;
|
|
41
|
+
return [
|
|
42
|
+
[
|
|
43
|
+
x0 + pad,
|
|
44
|
+
y0 + pad
|
|
45
|
+
],
|
|
46
|
+
[
|
|
47
|
+
x1 - pad,
|
|
48
|
+
y1 - pad
|
|
49
|
+
]
|
|
50
|
+
];
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
The zoom transform that fits `bounds` (unzoomed surface coordinates) to
|
|
54
|
+
the chart's zoom area along each dimension the zoom scales (see
|
|
55
|
+
`zoomedDims`): the dimension with less room fills the area, and the other
|
|
56
|
+
is centered in it. A dimension the zoom doesn't scale (a Plot's discrete
|
|
57
|
+
axis) has no say in the scale.
|
|
58
|
+
@param viz The chart.
|
|
59
|
+
@param bounds The bounds to show.
|
|
60
|
+
*/ export function fitBounds(viz, bounds) {
|
|
61
|
+
const [[ax0, ay0], [ax1, ay1]] = fitArea(viz), [[bx0, by0], [bx1, by1]] = bounds, dims = zoomedDims(viz);
|
|
62
|
+
const kx = (ax1 - ax0) / (bx1 - bx0), ky = (ay1 - ay0) / (by1 - by0);
|
|
63
|
+
const k = dims.x && dims.y ? Math.min(kx, ky) : dims.x ? kx : ky;
|
|
64
|
+
return {
|
|
65
|
+
k,
|
|
66
|
+
x: (ax0 + ax1) / 2 - k * (bx0 + bx1) / 2,
|
|
67
|
+
y: (ay0 + ay1) / 2 - k * (by0 + by1) / 2
|
|
68
|
+
};
|
|
69
|
+
}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { merge } from "d3-array";
|
|
2
2
|
import { legendSnapshot, recordLegendChange } from "../viz/history.js";
|
|
3
3
|
import { broadcastLegend } from "../viz/linkGroup.js";
|
|
4
|
+
import { setCursor } from "../viz/setCursor.js";
|
|
5
|
+
import { tooltipEnabled } from "../viz/tooltipEnabled.js";
|
|
4
6
|
/**
|
|
5
7
|
@module clickLegend
|
|
6
8
|
On click event for all legend shapes in a Viz. A click that changes what
|
|
7
9
|
is hidden or solo'd goes on the chart's Back history (see `legendHistory`).
|
|
8
10
|
@private
|
|
9
11
|
*/ export default function(d, i, x, event) {
|
|
10
|
-
this
|
|
11
|
-
if (this
|
|
12
|
+
setCursor(this, "auto");
|
|
13
|
+
if (tooltipEnabled(this, d, i, true)) this._tooltipClass.data([]).render();
|
|
12
14
|
let id = this._id(d, i);
|
|
13
15
|
if (!(id instanceof Array)) id = [
|
|
14
16
|
id
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { nodeRect } from "../pipeline/drillMorph.js";
|
|
2
2
|
import { groupDepthOf, groupNarrows, groupPath, inGroup } from "../viz/groupRow.js";
|
|
3
3
|
import { takeLegendState } from "../viz/history.js";
|
|
4
|
+
import { setCursor } from "../viz/setCursor.js";
|
|
5
|
+
import { tooltipEnabled } from "../viz/tooltipEnabled.js";
|
|
4
6
|
/**
|
|
5
7
|
Zooms into the group a group row stands for (see `viz/groupRow.ts`):
|
|
6
8
|
filters the data to that group, keeping the drawn depth, and records the
|
|
@@ -10,7 +12,7 @@ import { takeLegendState } from "../viz/history.js";
|
|
|
10
12
|
const groupBy = viz.schema.groupBy;
|
|
11
13
|
const path = groupPath(groupBy, d, depth);
|
|
12
14
|
if (!groupNarrows(groupBy, path, viz._filteredData ?? [])) return;
|
|
13
|
-
viz
|
|
15
|
+
setCursor(viz, "auto");
|
|
14
16
|
viz.hover(false);
|
|
15
17
|
viz._tooltipClass.data([]).render();
|
|
16
18
|
const oldFilter = viz.schema.filter;
|
|
@@ -34,10 +36,10 @@ import { takeLegendState } from "../viz/history.js";
|
|
|
34
36
|
return;
|
|
35
37
|
}
|
|
36
38
|
if (this._drawDepth < this.schema.groupBy.length - 1) {
|
|
37
|
-
this
|
|
39
|
+
setCursor(this, "auto");
|
|
38
40
|
const filterGroup = this.schema.groupBy[this._drawDepth], filterId = filterGroup(d, i);
|
|
39
41
|
this.hover(false);
|
|
40
|
-
if (this
|
|
42
|
+
if (tooltipEnabled(this, d, i)) this._tooltipClass.data([]).render();
|
|
41
43
|
const oldFilter = this.schema.filter;
|
|
42
44
|
// Arm the drill-down morph: normalize the clicked node's live rect as
|
|
43
45
|
// fractions of the *current* (pre-click) body rect, so the fraction
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { hoverColorScaleBucket } from "../features/colorScaleBucket.js";
|
|
2
2
|
import { groupDepthOf, groupPath, inGroup } from "../viz/groupRow.js";
|
|
3
3
|
import { shapeHoverEnabled } from "../viz/shapeHover.js";
|
|
4
4
|
/**
|
|
@@ -10,21 +10,11 @@ import { shapeHoverEnabled } from "../viz/shapeHover.js";
|
|
|
10
10
|
if (this._sharedHoverActive && this._sharedHoverState?.mode === "shared") return;
|
|
11
11
|
// ColorScale range swatch: it has no groupBy id, so highlight every datum
|
|
12
12
|
// whose colorScale value falls in this swatch's color range — mirroring the
|
|
13
|
-
// regular legend, which highlights the data shapes by id.
|
|
14
|
-
//
|
|
15
|
-
//
|
|
16
|
-
//
|
|
17
|
-
|
|
18
|
-
// case is handled in `interactionOpacity`.
|
|
19
|
-
const bucket = colorScaleBucketOf(d);
|
|
20
|
-
if (bucket) {
|
|
21
|
-
const predicate = colorScaleBucketPredicate(this, bucket.color);
|
|
22
|
-
if (predicate) {
|
|
23
|
-
this._hoverBucket = true;
|
|
24
|
-
this.hover(predicate);
|
|
25
|
-
}
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
13
|
+
// regular legend, which highlights the data shapes by id. This is a
|
|
14
|
+
// deliberate colorScale interaction, so it runs even for charts (e.g.
|
|
15
|
+
// Geomap) that turn off per-shape hover dimming with hoverOpacity:1 — the
|
|
16
|
+
// dim amount for that case is handled in `interactionOpacity`.
|
|
17
|
+
if (hoverColorScaleBucket(this, d)) return;
|
|
28
18
|
this._hoverBucket = false;
|
|
29
19
|
// A snapped hover on a chart with its own column emphasis
|
|
30
20
|
// (`_plotColumnHighlight`) owns it too: it highlights the mark's column.
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { isAxisTooltipDatum } from "../features/axisTooltip.js";
|
|
2
|
+
import { setCursor } from "../viz/setCursor.js";
|
|
1
3
|
import { shapeHoverEnabled } from "../viz/shapeHover.js";
|
|
4
|
+
import { tooltipEnabled } from "../viz/tooltipEnabled.js";
|
|
2
5
|
/**
|
|
3
6
|
Whether two `_id` results name the same item. A legend entry that merges
|
|
4
7
|
several groupBy members (a legend grouped by color, or by a shallower
|
|
@@ -17,6 +20,9 @@ import { shapeHoverEnabled } from "../viz/shapeHover.js";
|
|
|
17
20
|
On mouseleave event for all shapes in a Viz.
|
|
18
21
|
@private
|
|
19
22
|
*/ export default function(d, i) {
|
|
23
|
+
// The pick being left, read before the deferred work: the router clears it
|
|
24
|
+
// once the leave handlers return.
|
|
25
|
+
const legend = Boolean(this._lastScenePick?.isLegend);
|
|
20
26
|
setTimeout(()=>{
|
|
21
27
|
let leaveDatum = d;
|
|
22
28
|
while(leaveDatum && leaveDatum.__d3plus__ && leaveDatum.data)leaveDatum = leaveDatum.data;
|
|
@@ -39,7 +45,8 @@ import { shapeHoverEnabled } from "../viz/shapeHover.js";
|
|
|
39
45
|
this.hover(false);
|
|
40
46
|
}
|
|
41
47
|
const tooltipData = this._tooltipClass.data();
|
|
42
|
-
|
|
48
|
+
// An axis label's tooltip, shown since, isn't this shape's to hide.
|
|
49
|
+
if (tooltipData.length && !isAxisTooltipDatum(tooltipData[0]) && tooltipEnabled(this, d, i, legend)) {
|
|
43
50
|
let tooltipDatum = tooltipData[0];
|
|
44
51
|
while(tooltipDatum.__d3plus__ && tooltipDatum.data)tooltipDatum = tooltipDatum.data;
|
|
45
52
|
if (sameId(this._id(tooltipDatum), this._id(leaveDatum))) this._tooltipClass.data([]).render();
|
|
@@ -50,5 +57,5 @@ import { shapeHoverEnabled } from "../viz/shapeHover.js";
|
|
|
50
57
|
// above observe that updated datum, while still hiding promptly — a
|
|
51
58
|
// larger delay made the tooltip lag behind the cursor on dense charts.
|
|
52
59
|
}, 0);
|
|
53
|
-
this
|
|
60
|
+
setCursor(this, "auto");
|
|
54
61
|
}
|