ggaction 0.0.12 → 0.0.15
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/CHANGELOG.md +127 -0
- package/README.md +20 -11
- package/knowledge/action-card.schema.json +1 -1
- package/knowledge/action-cards.json +1 -1
- package/knowledge/action-cards.schema.json +1 -1
- package/knowledge/extension-authoring.md +2 -1
- package/knowledge/intent-taxonomy.json +1 -1
- package/knowledge/mcp-resources.json +1 -1
- package/knowledge/task-resolver.js +1 -1
- package/package.json +10 -3
- package/src/actions/basic.js +4 -2
- package/src/actions/boxPlots/components.js +14 -4
- package/src/actions/boxPlots/edit.js +31 -5
- package/src/actions/boxPlots/materialize.js +13 -4
- package/src/actions/boxPlots/options.js +48 -16
- package/src/actions/canvas/actions.js +3 -1
- package/src/actions/canvas/fitting.js +211 -0
- package/src/actions/canvas/index.js +2 -0
- package/src/actions/categoryOrder/index.js +18 -6
- package/src/actions/charts/area.js +51 -0
- package/src/actions/charts/bar.js +13 -6
- package/src/actions/charts/beeswarm.js +70 -0
- package/src/actions/charts/density.js +48 -0
- package/src/actions/charts/ecdf.js +186 -0
- package/src/actions/charts/endpoints.js +473 -0
- package/src/actions/charts/heatmap.js +4 -3
- package/src/actions/charts/histogram.js +5 -4
- package/src/actions/charts/horizon.js +73 -0
- package/src/actions/charts/index.js +37 -0
- package/src/actions/charts/interval-regression.js +172 -0
- package/src/actions/charts/line.js +8 -6
- package/src/actions/charts/parallel.js +8 -2
- package/src/actions/charts/pie.js +52 -0
- package/src/actions/charts/polar.js +134 -0
- package/src/actions/charts/radar.js +305 -0
- package/src/actions/charts/radial.js +50 -0
- package/src/actions/charts/raincloud.js +422 -0
- package/src/actions/charts/rug-strip.js +283 -0
- package/src/actions/charts/scatter.js +11 -3
- package/src/actions/charts/shared.js +69 -10
- package/src/actions/composition/actions.js +129 -3
- package/src/actions/coordinates/actions.js +1 -1
- package/src/actions/coordinates/edit.js +76 -0
- package/src/actions/data/bin.js +29 -0
- package/src/actions/data/bin2d.js +57 -185
- package/src/actions/data/complete.js +26 -0
- package/src/actions/data/computed.js +24 -0
- package/src/actions/data/create.js +2 -2
- package/src/actions/data/density.js +12 -20
- package/src/actions/data/derived.js +111 -15
- package/src/actions/data/ecdf.js +38 -0
- package/src/actions/data/edit.js +539 -0
- package/src/actions/data/filter.js +226 -30
- package/src/actions/data/fold.js +24 -0
- package/src/actions/data/impute.js +26 -0
- package/src/actions/data/index.js +38 -0
- package/src/actions/data/interval.js +2 -0
- package/src/actions/data/intervalEdit.js +86 -4
- package/src/actions/data/normalize.js +27 -0
- package/src/actions/data/regression.js +19 -21
- package/src/actions/data/revisionBindings.js +145 -0
- package/src/actions/data/shared.js +20 -4
- package/src/actions/data/stack.js +26 -0
- package/src/actions/data/summary.js +26 -0
- package/src/actions/data/timeUnit.js +4 -1
- package/src/actions/data/window.js +1 -1
- package/src/actions/encodings/appearance.js +32 -13
- package/src/actions/encodings/barWidth.js +8 -0
- package/src/actions/encodings/basic.js +2 -0
- package/src/actions/encodings/channels.js +415 -0
- package/src/actions/encodings/color/continuous.js +19 -59
- package/src/actions/encodings/color/index.js +30 -23
- package/src/actions/encodings/color/layout.js +3 -97
- package/src/actions/encodings/color/policy.js +5 -8
- package/src/actions/encodings/density/resolve.js +37 -5
- package/src/actions/encodings/density.js +124 -34
- package/src/actions/encodings/histogram.js +3 -2
- package/src/actions/encodings/horizon/resolve.js +8 -4
- package/src/actions/encodings/horizon.js +18 -8
- package/src/actions/encodings/index.js +6 -0
- package/src/actions/encodings/offset.js +30 -29
- package/src/actions/encodings/parallel.js +2 -8
- package/src/actions/encodings/position/apply.js +63 -11
- package/src/actions/encodings/position/index.js +52 -6
- package/src/actions/encodings/position/policies/arc.js +14 -0
- package/src/actions/encodings/position/policies/area.js +4 -42
- package/src/actions/encodings/position/policies/bar.js +57 -13
- package/src/actions/encodings/position/resolve.js +88 -26
- package/src/actions/encodings/ranged.js +123 -97
- package/src/actions/encodings/remove.js +44 -34
- package/src/actions/encodings/ruleAppearance.js +24 -32
- package/src/actions/encodings/seriesLayout.js +105 -0
- package/src/actions/encodings/shared.js +107 -37
- package/src/actions/encodings/stroke.js +226 -0
- package/src/actions/encodings/strokeDash.js +9 -6
- package/src/actions/encodings/temporal.js +7 -0
- package/src/actions/encodings/text.js +30 -15
- package/src/actions/errorBands/create.js +41 -8
- package/src/actions/errorBands/edit.js +360 -25
- package/src/actions/errorBars/create.js +56 -17
- package/src/actions/errorBars/edit.js +372 -21
- package/src/actions/facets/actions.js +619 -41
- package/src/actions/facets/derive.js +139 -25
- package/src/actions/gradientPlots/components.js +43 -13
- package/src/actions/gradientPlots/edit.js +14 -4
- package/src/actions/gradientPlots/materialize.js +8 -8
- package/src/actions/gradientPlots/options.js +10 -2
- package/src/actions/guides/applicability.js +28 -19
- package/src/actions/guides/axes/axes.js +4 -3
- package/src/actions/guides/axes/axis.js +18 -18
- package/src/actions/guides/axes/components.js +43 -0
- package/src/actions/guides/axes/edit.js +16 -51
- package/src/actions/guides/axes/labels.js +184 -28
- package/src/actions/guides/axes/lines.js +13 -7
- package/src/actions/guides/axes/parallel/lifecycle.js +117 -0
- package/src/actions/guides/axes/parallel/policy.js +137 -0
- package/src/actions/guides/axes/parallel/resolve.js +50 -25
- package/src/actions/guides/axes/parallel.js +93 -217
- package/src/actions/guides/axes/policy.js +21 -67
- package/src/actions/guides/axes/tickGroups.js +15 -8
- package/src/actions/guides/axes/ticks.js +11 -6
- package/src/actions/guides/axes/titles.js +32 -11
- package/src/actions/guides/basic.js +2 -0
- package/src/actions/guides/facade.js +106 -0
- package/src/actions/guides/facadeAxes.js +200 -0
- package/src/actions/guides/facadeLegend.js +63 -0
- package/src/actions/guides/grids/grid.js +37 -33
- package/src/actions/guides/grids/resolve.js +17 -4
- package/src/actions/guides/guides.js +54 -31
- package/src/actions/guides/legends/blocks.js +426 -0
- package/src/actions/guides/legends/categorical/actions.js +309 -279
- package/src/actions/guides/legends/categorical/components.js +21 -17
- package/src/actions/guides/legends/categorical/index.js +37 -33
- package/src/actions/guides/legends/categorical/layout.js +123 -354
- package/src/actions/guides/legends/categorical/options.js +32 -16
- package/src/actions/guides/legends/categorical/recipes.js +114 -9
- package/src/actions/guides/legends/categorical/resolve.js +30 -15
- package/src/actions/guides/legends/categorical/symbols.js +87 -33
- package/src/actions/guides/legends/continuous/common.js +99 -26
- package/src/actions/guides/legends/continuous/gradient.js +120 -89
- package/src/actions/guides/legends/continuous/index.js +8 -2
- package/src/actions/guides/legends/continuous/interval.js +79 -95
- package/src/actions/guides/legends/continuous/opacity.js +113 -89
- package/src/actions/guides/legends/continuous/stroke.js +525 -0
- package/src/actions/guides/legends/creation.js +40 -0
- package/src/actions/guides/legends/edit.js +321 -90
- package/src/actions/guides/legends/focused.js +2 -2
- package/src/actions/guides/legends/index.js +2 -0
- package/src/actions/guides/legends/lane.js +149 -102
- package/src/actions/guides/legends/lifecycle.js +143 -0
- package/src/actions/guides/legends/remove.js +43 -78
- package/src/actions/guides/legends/sampling.js +140 -0
- package/src/actions/guides/legends/size.js +213 -116
- package/src/actions/guides/legends/strokeWidth.js +121 -73
- package/src/actions/guides/legends/target.js +123 -0
- package/src/actions/guides/legends/transition.js +192 -0
- package/src/actions/guides/polar/axes/facade.js +81 -66
- package/src/actions/guides/polar/axes/labels.js +28 -8
- package/src/actions/guides/polar/axes/lines.js +12 -5
- package/src/actions/guides/polar/axes/shared.js +22 -0
- package/src/actions/guides/polar/axes/ticks.js +6 -5
- package/src/actions/guides/polar/axes/titles.js +6 -5
- package/src/actions/guides/polar/grids.js +8 -8
- package/src/actions/guides/polar/resolve.js +12 -8
- package/src/actions/guides/reuse.js +44 -0
- package/src/actions/guides/tickValues.js +19 -21
- package/src/actions/index.js +15 -2
- package/src/actions/intervals/resolve.js +35 -15
- package/src/actions/marks/arc/actions.js +78 -20
- package/src/actions/marks/area/actions.js +51 -12
- package/src/actions/marks/area/materialize.js +22 -3
- package/src/actions/marks/bar/create.js +11 -2
- package/src/actions/marks/bar/edit.js +20 -3
- package/src/actions/marks/bar/materialize.js +33 -9
- package/src/actions/marks/index.js +14 -0
- package/src/actions/marks/line/actions.js +71 -113
- package/src/actions/marks/line/materialize.js +57 -56
- package/src/actions/marks/point/create.js +8 -2
- package/src/actions/marks/point/edit.js +29 -21
- package/src/actions/marks/point/index.js +1 -0
- package/src/actions/marks/point/jitter.js +3 -0
- package/src/actions/marks/point/materialize.js +154 -16
- package/src/actions/marks/point/packing.js +68 -0
- package/src/actions/marks/rect/actions.js +33 -12
- package/src/actions/marks/references.js +658 -0
- package/src/actions/marks/remove.js +87 -4
- package/src/actions/marks/rule/actions.js +77 -9
- package/src/actions/marks/rule/appearance.js +26 -0
- package/src/actions/marks/shared.js +13 -13
- package/src/actions/marks/text/actions.js +296 -13
- package/src/actions/marks/text/index.js +4 -0
- package/src/actions/marks/text/layout.js +156 -8
- package/src/actions/marks/text/removal.js +173 -0
- package/src/actions/marks/text/selection.js +73 -0
- package/src/actions/marks/tick/actions.js +22 -5
- package/src/actions/primitives/createGraphics.js +3 -1
- package/src/actions/primitives/editGraphics.js +26 -0
- package/src/actions/primitives/semantic.js +3 -2
- package/src/actions/primitives/semanticAction.js +120 -10
- package/src/actions/primitives/semanticValidation/guide.js +10 -0
- package/src/actions/primitives/semanticValidation/index.js +9 -1
- package/src/actions/primitives/semanticValidation/layer.js +23 -1
- package/src/actions/primitives/semanticValidation/scale.js +38 -8
- package/src/actions/regression/components.js +26 -11
- package/src/actions/regression/create.js +11 -3
- package/src/actions/regression/edit.js +40 -13
- package/src/actions/regression/resolve.js +1 -1
- package/src/actions/resources/index.js +7 -0
- package/src/actions/resources/remove.js +172 -0
- package/src/actions/scales/channels.js +212 -0
- package/src/actions/scales/consumers/common.js +21 -54
- package/src/actions/scales/consumers/families.js +28 -14
- package/src/actions/scales/consumers/index.js +42 -4
- package/src/actions/scales/consumers/seriesLayout.js +57 -12
- package/src/actions/scales/create.js +58 -26
- package/src/actions/scales/definitions.js +109 -39
- package/src/actions/scales/edit.js +101 -34
- package/src/actions/scales/editPolicy.js +95 -35
- package/src/actions/scales/index.js +6 -0
- package/src/actions/scales/materialize.js +14 -49
- package/src/actions/scales/offset.js +48 -0
- package/src/actions/scales/parallel.js +71 -0
- package/src/actions/scales/patch.js +1 -1
- package/src/actions/scales/preview.js +140 -0
- package/src/actions/scales/quantitativeColor.js +9 -5
- package/src/actions/selection/actions.js +154 -30
- package/src/actions/selection/index.js +3 -0
- package/src/actions/theme/actions.js +98 -0
- package/src/actions/theme/composition.js +238 -0
- package/src/actions/theme/index.js +16 -0
- package/src/actions/theme/reconcile.js +1130 -0
- package/src/actions/theme/state.js +160 -0
- package/src/actions/titles/actions.js +11 -10
- package/src/actions/titles/resolve.js +1 -40
- package/src/actions/violinPlots/create.js +90 -43
- package/src/actions/violinPlots/edit.js +192 -0
- package/src/actions/violinPlots/index.js +2 -0
- package/src/core/ChartProgram.js +7 -0
- package/src/core/action.js +32 -2
- package/src/core/compositionState.js +141 -8
- package/src/core/programState.js +20 -0
- package/src/core/resourceReferences.js +332 -0
- package/src/core/vocabulary.js +16 -3
- package/src/grammar/aggregate.js +66 -23
- package/src/grammar/arcs.js +58 -1
- package/src/grammar/areaEndpoints.js +46 -0
- package/src/grammar/areaSeries.js +87 -41
- package/src/grammar/bars/aggregate.js +37 -13
- package/src/grammar/bars/geometry.js +44 -0
- package/src/grammar/bars/policy.js +9 -7
- package/src/grammar/bin.js +226 -0
- package/src/grammar/categoryOrder.js +34 -0
- package/src/grammar/complete.js +279 -0
- package/src/grammar/computed.js +351 -0
- package/src/grammar/coordinates.js +37 -0
- package/src/grammar/density.js +239 -37
- package/src/grammar/displayLabels.js +57 -0
- package/src/grammar/ecdf.js +198 -0
- package/src/grammar/facets/dependencies.js +133 -1
- package/src/grammar/facets/guides.js +3 -0
- package/src/grammar/facets/index.js +123 -52
- package/src/grammar/facets/scales.js +15 -18
- package/src/grammar/fold.js +123 -0
- package/src/grammar/horizon.js +6 -4
- package/src/grammar/impute.js +340 -0
- package/src/grammar/interval.js +37 -20
- package/src/grammar/lineSeries.js +20 -63
- package/src/grammar/markFilter.js +22 -4
- package/src/grammar/markLabelSelection.js +57 -0
- package/src/grammar/markLabels.js +110 -0
- package/src/grammar/normalize.js +366 -0
- package/src/grammar/parallelAxisTitles.js +16 -0
- package/src/grammar/pathSeries.js +109 -0
- package/src/grammar/pointPacking.js +183 -0
- package/src/grammar/pointShapes.js +13 -4
- package/src/grammar/polar.js +90 -8
- package/src/grammar/positionDatum.js +12 -0
- package/src/grammar/rects.js +9 -1
- package/src/grammar/regression/derive.js +4 -0
- package/src/grammar/regression/index.js +8 -2
- package/src/grammar/regression/models.js +22 -7
- package/src/grammar/regression/parameters.js +63 -13
- package/src/grammar/rotation.js +29 -0
- package/src/grammar/roundedRect.js +180 -0
- package/src/grammar/rules.js +8 -21
- package/src/grammar/scales/color.js +23 -1
- package/src/grammar/scales/colorConsumers.js +57 -0
- package/src/grammar/scales/continuous.js +2 -2
- package/src/grammar/scales/definition.js +42 -5
- package/src/grammar/scales/discretized.js +11 -5
- package/src/grammar/scales/fields.js +38 -8
- package/src/grammar/scales/index.js +1 -0
- package/src/grammar/scales/mapping.js +2 -0
- package/src/grammar/scales/ordinal.js +12 -3
- package/src/grammar/scales/policies.js +2 -2
- package/src/grammar/scales/radial.js +55 -0
- package/src/grammar/scales/size.js +456 -0
- package/src/grammar/scales/types.js +1 -0
- package/src/grammar/schemas/concreteGraphic.js +14 -2
- package/src/grammar/schemas/graphic.js +15 -0
- package/src/grammar/schemas/graphicBounds.js +179 -30
- package/src/grammar/schemas/semanticPath.js +23 -4
- package/src/grammar/stack.js +170 -0
- package/src/grammar/statisticalReference.js +103 -0
- package/src/grammar/statistics/confidenceInterval.js +101 -0
- package/src/grammar/strokeStyle.js +77 -0
- package/src/grammar/summary.js +245 -0
- package/src/grammar/text.js +22 -16
- package/src/grammar/timeUnit.js +234 -13
- package/src/grammar/transformTopology.js +10 -0
- package/src/grammar/transforms.js +418 -16
- package/src/grammar/valueFormat.js +112 -0
- package/src/grammar/weightedStatistics.js +374 -0
- package/src/grammar/window.js +232 -21
- package/src/layout/aspect.js +80 -0
- package/src/layout/facets.js +100 -12
- package/src/layout/guideCollisions.js +12 -0
- package/src/layout/labels.js +343 -0
- package/src/layout/legend.js +2 -10
- package/src/layout/legendItems.js +102 -0
- package/src/layout/legendLane.js +100 -11
- package/src/materialization/bars/aggregate.js +56 -147
- package/src/materialization/bars/histogram.js +104 -20
- package/src/materialization/bars/ranged.js +19 -3
- package/src/materialization/bars/resolve.js +7 -4
- package/src/materialization/categorySlotOffset.js +40 -0
- package/src/materialization/composition.js +3 -1
- package/src/materialization/compositionSnapshot.js +1 -1
- package/src/materialization/coordinateBounds.js +204 -0
- package/src/materialization/dependencies.js +93 -16
- package/src/materialization/encodings.js +1 -1
- package/src/materialization/facetGuides/legacyCategorical.js +3 -0
- package/src/materialization/facetGuides/placement.js +8 -2
- package/src/materialization/facetGuides/preparation.js +12 -7
- package/src/materialization/facetHeaders.js +346 -0
- package/src/materialization/facets.js +23 -66
- package/src/materialization/guides/layout.js +57 -0
- package/src/materialization/guides/resources.js +28 -2
- package/src/materialization/legends.js +11 -2
- package/src/materialization/marks/capabilities.js +20 -5
- package/src/materialization/marks/grouping.js +52 -0
- package/src/materialization/marks/index.js +68 -27
- package/src/materialization/marks/policies.js +4 -1
- package/src/materialization/rect.js +55 -42
- package/src/materialization/rectConfig.js +5 -1
- package/src/materialization/rowEncoding.js +13 -13
- package/src/materialization/scaleGuideDependencies.js +8 -5
- package/src/materialization/scales/map.js +6 -3
- package/src/materialization/scales/policies/arc.js +42 -0
- package/src/materialization/scales/policies/binnedPosition.js +7 -4
- package/src/materialization/scales/policies/offset.js +50 -8
- package/src/materialization/scales/policies/series.js +5 -1
- package/src/materialization/scales/resolve.js +65 -17
- package/src/materialization/selection/compatibility.js +11 -0
- package/src/materialization/selection/items/arc.js +28 -4
- package/src/materialization/selection/items/bar.js +42 -71
- package/src/materialization/selection/items/common.js +27 -6
- package/src/materialization/selection/items/path.js +3 -13
- package/src/materialization/selection/items/rect.js +35 -8
- package/src/materialization/selection/path.js +1 -1
- package/src/materialization/selection/point.js +3 -1
- package/src/materialization/text.js +324 -14
- package/src/mcp/adapter.js +2 -2
- package/src/renderers/canvas/circle.js +2 -3
- package/src/renderers/canvas/line.js +2 -3
- package/src/renderers/canvas/native.js +4 -4
- package/src/renderers/canvas/path.js +2 -3
- package/src/renderers/canvas/rect.js +2 -3
- package/src/renderers/canvas/stroke.js +11 -0
- package/src/renderers/svg.js +19 -0
- package/src/selectors/datasets.js +44 -0
- package/src/selectors/layers.js +7 -2
- package/src/selectors/scales.js +6 -0
- package/src/theme/defaults.js +140 -0
- package/types/basic.d.ts +17 -2
- package/types/index.d.ts +211 -0
- package/types/program.d.ts +2182 -204
- package/src/materialization/bars/grouped.js +0 -144
|
@@ -1,228 +1,104 @@
|
|
|
1
1
|
import { action } from "../../../core/action.js";
|
|
2
|
-
import { validateOptionObject } from "../../../core/validation.js";
|
|
3
|
-
import { resolvePlotGraphicPlacement } from
|
|
4
|
-
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
import {
|
|
8
|
-
requireParallelAxisLayer,
|
|
9
|
-
resolveParallelAxisTarget,
|
|
10
|
-
resolveParallelAxisValues
|
|
11
|
-
} from "./parallel/resolve.js";
|
|
2
|
+
import { validateGeneratedItemLimit, validateOptionObject } from "../../../core/validation.js";
|
|
3
|
+
import { resolvePlotGraphicPlacement } from "../../../materialization/graphicHierarchy.js";
|
|
4
|
+
import { requireParallelAxisLayer, resolveParallelAxisTarget, resolveStyledParallelAxes } from "./parallel/resolve.js";
|
|
5
|
+
import { PARALLEL_AXIS_GRAPHICS, PARALLEL_AXIS_PARTS, hasParallelAxisParts } from "./parallel/policy.js";
|
|
6
|
+
import { registerParallelAxisLifecycleActions } from "./parallel/lifecycle.js";
|
|
12
7
|
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
function uniform(values) {
|
|
9
|
+
return values.length > 0 && values.every(value => value === values[0]) ? values[0] : values;
|
|
10
|
+
}
|
|
15
11
|
|
|
16
|
-
|
|
17
|
-
{
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
)
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
)
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
.editGraphics({
|
|
67
|
-
target: "parallelAxisLines",
|
|
68
|
-
property: "strokeWidth",
|
|
69
|
-
value: 1.25
|
|
70
|
-
})
|
|
71
|
-
.editGraphics({
|
|
72
|
-
target: "parallelAxisTicks",
|
|
73
|
-
property: "length",
|
|
74
|
-
value: ticks.length
|
|
75
|
-
})
|
|
76
|
-
.editGraphics({
|
|
77
|
-
target: "parallelAxisTicks",
|
|
78
|
-
property: "x1",
|
|
79
|
-
value: ticks.map(tick => tick.x - 4)
|
|
80
|
-
})
|
|
81
|
-
.editGraphics({
|
|
82
|
-
target: "parallelAxisTicks",
|
|
83
|
-
property: "y1",
|
|
84
|
-
value: ticks.map(tick => tick.y)
|
|
85
|
-
})
|
|
86
|
-
.editGraphics({
|
|
87
|
-
target: "parallelAxisTicks",
|
|
88
|
-
property: "x2",
|
|
89
|
-
value: ticks.map(tick => tick.x + 4)
|
|
90
|
-
})
|
|
91
|
-
.editGraphics({
|
|
92
|
-
target: "parallelAxisTicks",
|
|
93
|
-
property: "y2",
|
|
94
|
-
value: ticks.map(tick => tick.y)
|
|
95
|
-
})
|
|
96
|
-
.editGraphics({
|
|
97
|
-
target: "parallelAxisTicks",
|
|
98
|
-
property: "stroke",
|
|
99
|
-
value: DEFAULT_COLORS.mutedText
|
|
100
|
-
})
|
|
101
|
-
.editGraphics({
|
|
102
|
-
target: "parallelAxisTicks",
|
|
103
|
-
property: "strokeWidth",
|
|
104
|
-
value: 1
|
|
105
|
-
})
|
|
106
|
-
.editGraphics({
|
|
107
|
-
target: "parallelAxisLabels",
|
|
108
|
-
property: "length",
|
|
109
|
-
value: ticks.length
|
|
110
|
-
})
|
|
111
|
-
.editGraphics({
|
|
112
|
-
target: "parallelAxisLabels",
|
|
113
|
-
property: "x",
|
|
114
|
-
value: ticks.map(tick => tick.x - 9)
|
|
115
|
-
})
|
|
116
|
-
.editGraphics({
|
|
117
|
-
target: "parallelAxisLabels",
|
|
118
|
-
property: "y",
|
|
119
|
-
value: ticks.map(tick => tick.y)
|
|
120
|
-
})
|
|
121
|
-
.editGraphics({
|
|
122
|
-
target: "parallelAxisLabels",
|
|
123
|
-
property: "text",
|
|
124
|
-
value: ticks.map(tick => tick.text)
|
|
125
|
-
})
|
|
126
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fill", value: DEFAULT_COLORS.axis })
|
|
127
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fontSize", value: 11 })
|
|
128
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fontFamily", value: DEFAULT_FONT_FAMILY })
|
|
129
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fontWeight", value: "normal" })
|
|
130
|
-
.editGraphics({ target: "parallelAxisLabels", property: "textAlign", value: "right" })
|
|
131
|
-
.editGraphics({ target: "parallelAxisLabels", property: "textBaseline", value: "middle" })
|
|
132
|
-
.editGraphics({
|
|
133
|
-
target: "parallelAxisTitles",
|
|
134
|
-
property: "length",
|
|
135
|
-
value: axes.length
|
|
136
|
-
})
|
|
137
|
-
.editGraphics({
|
|
138
|
-
target: "parallelAxisTitles",
|
|
139
|
-
property: "x",
|
|
140
|
-
value: axes.map(axis => axis.x)
|
|
141
|
-
})
|
|
142
|
-
.editGraphics({
|
|
143
|
-
target: "parallelAxisTitles",
|
|
144
|
-
property: "y",
|
|
145
|
-
value: bounds.y - 20
|
|
146
|
-
})
|
|
147
|
-
.editGraphics({
|
|
148
|
-
target: "parallelAxisTitles",
|
|
149
|
-
property: "text",
|
|
150
|
-
value: axes.map(axis => axis.title)
|
|
151
|
-
})
|
|
152
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fill", value: DEFAULT_COLORS.axisTitle })
|
|
153
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fontSize", value: 13 })
|
|
154
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fontFamily", value: DEFAULT_FONT_FAMILY })
|
|
155
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fontWeight", value: 600 })
|
|
156
|
-
.editGraphics({ target: "parallelAxisTitles", property: "textAlign", value: "center" })
|
|
157
|
-
.editGraphics({ target: "parallelAxisTitles", property: "textBaseline", value: "middle" });
|
|
158
|
-
return next._withGuideConfig("parallel", "axes", {
|
|
159
|
-
target,
|
|
160
|
-
scales: dimensions.map(dimension => dimension.scale)
|
|
161
|
-
});
|
|
162
|
-
}
|
|
163
|
-
);
|
|
12
|
+
function collectionProperties(part, axes, bounds) {
|
|
13
|
+
if (part === "line") return {
|
|
14
|
+
length: axes.length,
|
|
15
|
+
x1: axes.map(axis => axis.x), y1: bounds.y,
|
|
16
|
+
x2: axes.map(axis => axis.x), y2: bounds.y + bounds.height,
|
|
17
|
+
stroke: uniform(axes.map(axis => axis.config.line.color)),
|
|
18
|
+
strokeWidth: uniform(axes.map(axis => axis.config.line.lineWidth))
|
|
19
|
+
};
|
|
20
|
+
if (part === "title") return {
|
|
21
|
+
length: axes.length, x: axes.map(axis => axis.x),
|
|
22
|
+
y: uniform(axes.map(axis => bounds.y - axis.config.title.offset)),
|
|
23
|
+
text: axes.map(axis => axis.title),
|
|
24
|
+
fill: uniform(axes.map(axis => axis.config.title.color)),
|
|
25
|
+
fontSize: uniform(axes.map(axis => axis.config.title.fontSize)),
|
|
26
|
+
fontFamily: uniform(axes.map(axis => axis.config.title.fontFamily)),
|
|
27
|
+
fontWeight: uniform(axes.map(axis => axis.config.title.fontWeight)),
|
|
28
|
+
textAlign: "center", textBaseline: "middle"
|
|
29
|
+
};
|
|
30
|
+
const rows = axes.flatMap(axis => axis[part].values.map((value, index) => ({
|
|
31
|
+
x: axis.x, y: axis[part].y[index], text: axis[part].text?.[index], config: axis.config[part]
|
|
32
|
+
})));
|
|
33
|
+
if (part === "ticks") return {
|
|
34
|
+
length: rows.length, x1: rows.map(row => row.x - row.config.length / 2),
|
|
35
|
+
y1: rows.map(row => row.y), x2: rows.map(row => row.x + row.config.length / 2),
|
|
36
|
+
y2: rows.map(row => row.y), stroke: uniform(rows.map(row => row.config.color)),
|
|
37
|
+
strokeWidth: uniform(rows.map(row => row.config.lineWidth))
|
|
38
|
+
};
|
|
39
|
+
return {
|
|
40
|
+
length: rows.length, x: rows.map(row => row.x - row.config.offset),
|
|
41
|
+
y: rows.map(row => row.y), text: rows.map(row => row.text),
|
|
42
|
+
fill: uniform(rows.map(row => row.config.color)),
|
|
43
|
+
fontSize: uniform(rows.map(row => row.config.fontSize)),
|
|
44
|
+
fontFamily: uniform(rows.map(row => row.config.fontFamily)),
|
|
45
|
+
fontWeight: uniform(rows.map(row => row.config.fontWeight)),
|
|
46
|
+
textAlign: "right", textBaseline: "middle"
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export const rematerializeParallelAxes = action({
|
|
51
|
+
op: "rematerializeParallelAxes",
|
|
52
|
+
description: "Recompute concrete Parallel dimension axes."
|
|
53
|
+
}, function (args = {}) {
|
|
54
|
+
validateOptionObject(args, ["target"], "rematerializeParallelAxes");
|
|
55
|
+
const stored = this.semanticSpec.guides.axis?.parallel;
|
|
56
|
+
if (stored === undefined) throw new Error("rematerializeParallelAxes requires existing Parallel axes.");
|
|
57
|
+
const target = resolveParallelAxisTarget(this, args.target ?? stored.target);
|
|
58
|
+
if (target !== stored.target) throw new Error("Parallel axes belong to another target.");
|
|
59
|
+
const { dimensions } = requireParallelAxisLayer(this, target);
|
|
60
|
+
const { axes, bounds, configs } = resolveStyledParallelAxes(this, dimensions);
|
|
61
|
+
if (!configs.dimensions.some(hasParallelAxisParts)) return this.removeParallelAxes({ target });
|
|
164
62
|
|
|
165
|
-
|
|
166
|
-
{
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
63
|
+
// Preflight every collection before authoring any concrete graphic.
|
|
64
|
+
const properties = Object.fromEntries(PARALLEL_AXIS_PARTS.map(part => {
|
|
65
|
+
const selected = axes.filter(axis => axis.config[part] !== undefined);
|
|
66
|
+
const value = collectionProperties(part, selected, bounds);
|
|
67
|
+
validateGeneratedItemLimit(value.length, "Parallel axis item count");
|
|
68
|
+
return [part, { enabled: selected.length > 0, value }];
|
|
69
|
+
}));
|
|
70
|
+
let next = this;
|
|
71
|
+
const scales = dimensions.map(dimension => dimension.scale);
|
|
72
|
+
if (stored.scales?.length !== scales.length || scales.some((scale, index) => scale !== stored.scales[index])) {
|
|
73
|
+
next = next.editSemantic({ property: "guide.axis.parallel.scales", value: scales });
|
|
74
|
+
}
|
|
75
|
+
const retainedTitles = stored.titles?.filter(title =>
|
|
76
|
+
configs.dimensions.some(config => config.field === title.field && config.title !== undefined));
|
|
77
|
+
if (retainedTitles !== undefined && retainedTitles.length !== stored.titles.length) {
|
|
78
|
+
next = next.editSemantic({ property: "guide.axis.parallel.titles",
|
|
79
|
+
...(retainedTitles.length === 0 ? { remove: true } : { value: retainedTitles }) });
|
|
80
|
+
}
|
|
81
|
+
for (const [index, part] of PARALLEL_AXIS_PARTS.entries()) {
|
|
82
|
+
const id = PARALLEL_AXIS_GRAPHICS[part];
|
|
83
|
+
const { enabled, value } = properties[part];
|
|
84
|
+
if (!enabled) {
|
|
85
|
+
if (next.graphicSpec.objects[id] !== undefined) next = next.editGraphics({ target: id, remove: true });
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
if (next.graphicSpec.objects[id] === undefined) {
|
|
89
|
+
const before = PARALLEL_AXIS_PARTS.slice(index + 1).map(key => PARALLEL_AXIS_GRAPHICS[key])
|
|
90
|
+
.find(key => next.graphicSpec.objects[key] !== undefined);
|
|
91
|
+
next = next.createGraphics({ id, type: part === "line" || part === "ticks" ? "line" : "text", length: 0,
|
|
92
|
+
...resolvePlotGraphicPlacement(next, before === undefined ? {} : { before }) });
|
|
178
93
|
}
|
|
179
|
-
for (const
|
|
180
|
-
|
|
181
|
-
"parallelAxisTitles"
|
|
182
|
-
]) {
|
|
183
|
-
if (this.graphicSpec.objects[id] !== undefined) {
|
|
184
|
-
throw new Error("createParallelAxes requires missing Parallel axes.");
|
|
185
|
-
}
|
|
94
|
+
for (const [property, item] of Object.entries(value)) {
|
|
95
|
+
next = next.editGraphics({ target: id, property, value: item });
|
|
186
96
|
}
|
|
187
|
-
const placement = resolvePlotGraphicPlacement(this);
|
|
188
|
-
let next = this
|
|
189
|
-
.editSemantic({
|
|
190
|
-
property: "guide.axis.parallel.target",
|
|
191
|
-
value: target
|
|
192
|
-
})
|
|
193
|
-
.editSemantic({
|
|
194
|
-
property: "guide.axis.parallel.coordinate",
|
|
195
|
-
value: coordinate.id
|
|
196
|
-
})
|
|
197
|
-
.editSemantic({
|
|
198
|
-
property: "guide.axis.parallel.scales",
|
|
199
|
-
value: dimensions.map(dimension => dimension.scale)
|
|
200
|
-
})
|
|
201
|
-
.createGraphics({ id: "parallelAxisLines", type: "line", length: 0, ...placement })
|
|
202
|
-
.editGraphics({ target: "parallelAxisLines", property: "stroke", value: DEFAULT_COLORS.axis })
|
|
203
|
-
.editGraphics({ target: "parallelAxisLines", property: "strokeWidth", value: 1.25 })
|
|
204
|
-
.createGraphics({ id: "parallelAxisTicks", type: "line", length: 0, ...placement })
|
|
205
|
-
.editGraphics({ target: "parallelAxisTicks", property: "stroke", value: DEFAULT_COLORS.mutedText })
|
|
206
|
-
.editGraphics({ target: "parallelAxisTicks", property: "strokeWidth", value: 1 })
|
|
207
|
-
.createGraphics({ id: "parallelAxisLabels", type: "text", length: 0, ...placement })
|
|
208
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fill", value: DEFAULT_COLORS.axis })
|
|
209
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fontSize", value: 11 })
|
|
210
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fontFamily", value: DEFAULT_FONT_FAMILY })
|
|
211
|
-
.editGraphics({ target: "parallelAxisLabels", property: "fontWeight", value: "normal" })
|
|
212
|
-
.editGraphics({ target: "parallelAxisLabels", property: "textAlign", value: "right" })
|
|
213
|
-
.editGraphics({ target: "parallelAxisLabels", property: "textBaseline", value: "middle" })
|
|
214
|
-
.createGraphics({ id: "parallelAxisTitles", type: "text", length: 0, ...placement })
|
|
215
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fill", value: DEFAULT_COLORS.axisTitle })
|
|
216
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fontSize", value: 13 })
|
|
217
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fontFamily", value: DEFAULT_FONT_FAMILY })
|
|
218
|
-
.editGraphics({ target: "parallelAxisTitles", property: "fontWeight", value: 600 })
|
|
219
|
-
.editGraphics({ target: "parallelAxisTitles", property: "textAlign", value: "center" })
|
|
220
|
-
.editGraphics({ target: "parallelAxisTitles", property: "textBaseline", value: "middle" });
|
|
221
|
-
return next.rematerializeParallelAxes({ target });
|
|
222
97
|
}
|
|
223
|
-
);
|
|
98
|
+
return next._withGuideConfig("parallel", "axes", { target, scales, ...configs });
|
|
99
|
+
});
|
|
224
100
|
|
|
225
101
|
export function registerParallelAxisActions(ProgramClass) {
|
|
226
|
-
ProgramClass.prototype.createParallelAxes = createParallelAxes;
|
|
227
102
|
ProgramClass.prototype.rematerializeParallelAxes = rematerializeParallelAxes;
|
|
103
|
+
registerParallelAxisLifecycleActions(ProgramClass);
|
|
228
104
|
}
|
|
@@ -1,32 +1,15 @@
|
|
|
1
1
|
import { formatVisibleText } from "../../../core/textMetrics.js";
|
|
2
|
+
import {
|
|
3
|
+
formatValue,
|
|
4
|
+
isUtcValueFormat,
|
|
5
|
+
validateValueFormat
|
|
6
|
+
} from "../../../grammar/valueFormat.js";
|
|
2
7
|
|
|
3
8
|
const AXIS_POSITIONS = Object.freeze({
|
|
4
9
|
x: Object.freeze(["bottom", "top"]),
|
|
5
10
|
y: Object.freeze(["left", "right"])
|
|
6
11
|
});
|
|
7
12
|
|
|
8
|
-
const NUMERIC_FORMATS = new Set([
|
|
9
|
-
".0f", ".1f", ".2f", ".0%", ".1%", ".2e"
|
|
10
|
-
]);
|
|
11
|
-
const TIME_DIRECTIVES = new Set(["Y", "m", "d", "b", "%"]);
|
|
12
|
-
const MONTH_NAMES = Object.freeze([
|
|
13
|
-
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
14
|
-
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
|
|
15
|
-
]);
|
|
16
|
-
|
|
17
|
-
function isTimeFormat(format) {
|
|
18
|
-
if (typeof format !== "string") return false;
|
|
19
|
-
let directives = 0;
|
|
20
|
-
for (let index = 0; index < format.length; index += 1) {
|
|
21
|
-
if (format[index] !== "%") continue;
|
|
22
|
-
const directive = format[index + 1];
|
|
23
|
-
if (!TIME_DIRECTIVES.has(directive)) return false;
|
|
24
|
-
if (directive !== "%") directives += 1;
|
|
25
|
-
index += 1;
|
|
26
|
-
}
|
|
27
|
-
return directives > 0;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
13
|
export function defaultAxisPosition(channel) {
|
|
31
14
|
return channel === "x" ? "bottom" : "left";
|
|
32
15
|
}
|
|
@@ -113,42 +96,9 @@ export function resolveAxisTitleGeometry({
|
|
|
113
96
|
}
|
|
114
97
|
|
|
115
98
|
export function validateAxisFormat(format) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
typeof format === "object" &&
|
|
120
|
-
Number.isInteger(format.decimals) &&
|
|
121
|
-
format.decimals >= 0 &&
|
|
122
|
-
Object.keys(format).length === 1
|
|
123
|
-
) {
|
|
124
|
-
return format;
|
|
125
|
-
}
|
|
126
|
-
if (typeof format === "string" && (
|
|
127
|
-
NUMERIC_FORMATS.has(format) || isTimeFormat(format)
|
|
128
|
-
)) {
|
|
129
|
-
return format;
|
|
130
|
-
}
|
|
131
|
-
throw new TypeError(
|
|
132
|
-
"Label format must be auto, { decimals }, or a supported format string."
|
|
133
|
-
);
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
function pad(value, length = 2) {
|
|
137
|
-
return String(value).padStart(length, "0");
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
function formatTime(value, format) {
|
|
141
|
-
const date = new Date(value);
|
|
142
|
-
if (!Number.isFinite(date.getTime())) {
|
|
143
|
-
throw new TypeError("Time axis format requires valid timestamps.");
|
|
144
|
-
}
|
|
145
|
-
const year = pad(date.getUTCFullYear(), 4);
|
|
146
|
-
const month = pad(date.getUTCMonth() + 1);
|
|
147
|
-
const day = pad(date.getUTCDate());
|
|
148
|
-
const values = { Y: year, m: month, d: day, b: MONTH_NAMES[date.getUTCMonth()] };
|
|
149
|
-
return format.replace(/%([Ymdb%])/g, (_, directive) =>
|
|
150
|
-
directive === "%" ? "%" : values[directive]
|
|
151
|
-
);
|
|
99
|
+
return validateValueFormat(format, "Label format", {
|
|
100
|
+
allowDecimalsObject: true
|
|
101
|
+
});
|
|
152
102
|
}
|
|
153
103
|
|
|
154
104
|
export function formatAxisValue(value, scaleType, format, autoFormatter) {
|
|
@@ -158,18 +108,22 @@ export function formatAxisValue(value, scaleType, format, autoFormatter) {
|
|
|
158
108
|
throw new Error('Discrete axis labels require format "auto".');
|
|
159
109
|
}
|
|
160
110
|
if (scaleType === "time") {
|
|
161
|
-
if (!
|
|
111
|
+
if (!isUtcValueFormat(format)) {
|
|
162
112
|
throw new Error("Time axis labels require a supported time format string.");
|
|
163
113
|
}
|
|
164
|
-
return
|
|
114
|
+
return formatValue(value, {
|
|
115
|
+
format,
|
|
116
|
+
valueType: "temporal",
|
|
117
|
+
label: "Axis label format"
|
|
118
|
+
});
|
|
165
119
|
}
|
|
166
|
-
if (
|
|
120
|
+
if (isUtcValueFormat(format)) {
|
|
167
121
|
throw new Error("Quantitative axis labels cannot use a time format string.");
|
|
168
122
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
123
|
+
return formatValue(value, {
|
|
124
|
+
format,
|
|
125
|
+
valueType: "quantitative",
|
|
126
|
+
label: "Axis label format",
|
|
127
|
+
allowDecimalsObject: true
|
|
128
|
+
});
|
|
175
129
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withGuideLayoutValidation } from "../../../materialization/guides/layout.js";
|
|
1
2
|
import { action } from "../../../core/action.js";
|
|
2
3
|
import { isPlainObject } from "../../../core/immutable.js";
|
|
3
4
|
import { validateKeys, validateOptionObject } from "../../../core/validation.js";
|
|
@@ -24,7 +25,13 @@ const LABEL_OPTIONS = Object.freeze([
|
|
|
24
25
|
"color",
|
|
25
26
|
"fontSize",
|
|
26
27
|
"fontFamily",
|
|
27
|
-
"fontWeight"
|
|
28
|
+
"fontWeight",
|
|
29
|
+
"rotation",
|
|
30
|
+
"maxWidth",
|
|
31
|
+
"wrap",
|
|
32
|
+
"lineHeight",
|
|
33
|
+
"overlap",
|
|
34
|
+
"labelMap"
|
|
28
35
|
]);
|
|
29
36
|
const SHARED_CREATE = Object.freeze(["scale", "position", "count", "values"]);
|
|
30
37
|
const SHARED_EDIT = Object.freeze(["position", "count", "values"]);
|
|
@@ -37,7 +44,7 @@ function validateNested(value, supported, label) {
|
|
|
37
44
|
validateKeys(value, supported, label);
|
|
38
45
|
}
|
|
39
46
|
|
|
40
|
-
function
|
|
47
|
+
export function validateAxisTickGroupArgs(args, operation, create) {
|
|
41
48
|
validateOptionObject(
|
|
42
49
|
args,
|
|
43
50
|
create ? CREATE_OPTIONS : EDIT_OPTIONS,
|
|
@@ -89,8 +96,8 @@ function makeCreate(channel) {
|
|
|
89
96
|
op: operation.create,
|
|
90
97
|
description: `Create ${channel}-axis ticks and labels.`
|
|
91
98
|
},
|
|
92
|
-
function (args = {}) {
|
|
93
|
-
|
|
99
|
+
withGuideLayoutValidation(function (args = {}) {
|
|
100
|
+
validateAxisTickGroupArgs(args, operation.create, true);
|
|
94
101
|
const shared = select(args, SHARED_CREATE);
|
|
95
102
|
const tickArgs = { ...shared, ...(args.ticks ?? {}) };
|
|
96
103
|
const labelArgs = {
|
|
@@ -101,7 +108,7 @@ function makeCreate(channel) {
|
|
|
101
108
|
return this[operation.createTicks](tickArgs)[operation.createLabels](
|
|
102
109
|
labelArgs
|
|
103
110
|
);
|
|
104
|
-
}
|
|
111
|
+
})
|
|
105
112
|
);
|
|
106
113
|
}
|
|
107
114
|
|
|
@@ -113,8 +120,8 @@ function makeEdit(channel) {
|
|
|
113
120
|
op: operation.edit,
|
|
114
121
|
description: `Edit ${channel}-axis ticks and labels.`
|
|
115
122
|
},
|
|
116
|
-
function (args = {}) {
|
|
117
|
-
|
|
123
|
+
withGuideLayoutValidation(function (args = {}) {
|
|
124
|
+
validateAxisTickGroupArgs(args, operation.edit, false);
|
|
118
125
|
const shared = select(args, SHARED_EDIT);
|
|
119
126
|
const hasShared = Object.keys(shared).length > 0;
|
|
120
127
|
let next = this;
|
|
@@ -134,7 +141,7 @@ function makeEdit(channel) {
|
|
|
134
141
|
}
|
|
135
142
|
|
|
136
143
|
return next;
|
|
137
|
-
}
|
|
144
|
+
})
|
|
138
145
|
);
|
|
139
146
|
}
|
|
140
147
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withGuideLayoutValidation } from "../../../materialization/guides/layout.js";
|
|
1
2
|
import { action } from "../../../core/action.js";
|
|
2
3
|
import { validateUserId } from "../../../core/identifiers.js";
|
|
3
4
|
import {
|
|
@@ -6,7 +7,7 @@ import {
|
|
|
6
7
|
validateNonNegativeFinite,
|
|
7
8
|
validateOptionObject
|
|
8
9
|
} from "../../../core/validation.js";
|
|
9
|
-
import {
|
|
10
|
+
import { resolveGuideCoordinateBounds } from "../../../materialization/coordinateBounds.js";
|
|
10
11
|
import {
|
|
11
12
|
isTransformedScaleType,
|
|
12
13
|
mapContinuousScaleValues,
|
|
@@ -68,7 +69,11 @@ function validateConfig(channel, config) {
|
|
|
68
69
|
|
|
69
70
|
function geometry(program, channel, config) {
|
|
70
71
|
const scale = program.resolvedScales[config.scale];
|
|
71
|
-
const bounds =
|
|
72
|
+
const bounds = resolveGuideCoordinateBounds(program, {
|
|
73
|
+
coordinate: program.semanticSpec.guides.axis?.[channel]?.coordinate,
|
|
74
|
+
scale: config.scale,
|
|
75
|
+
channel
|
|
76
|
+
});
|
|
72
77
|
const discrete = ["ordinal", "band", "point"].includes(scale?.type);
|
|
73
78
|
if ((
|
|
74
79
|
!["linear", "time", "ordinal", "band", "point"].includes(scale?.type) &&
|
|
@@ -126,7 +131,7 @@ function geometry(program, channel, config) {
|
|
|
126
131
|
|
|
127
132
|
function makeEdit(channel) {
|
|
128
133
|
const op = channel === "x" ? "editXAxisTicks" : "editYAxisTicks";
|
|
129
|
-
return action({ op, description: `Edit concrete ${channel}-axis ticks.` }, function (args = {}) {
|
|
134
|
+
return action({ op, description: `Edit concrete ${channel}-axis ticks.` }, withGuideLayoutValidation(function (args = {}) {
|
|
130
135
|
validateOptions(args, op, false);
|
|
131
136
|
const id = `${channel}AxisTicks`;
|
|
132
137
|
if (this.graphicSpec.objects[id]?.type !== "line") throw new Error(`${op} requires existing axis ticks.`);
|
|
@@ -157,7 +162,7 @@ function makeEdit(channel) {
|
|
|
157
162
|
let next = this._withGuideConfig(channel, config).editGraphics({ target: id, property: "length", value: resolved.values.length });
|
|
158
163
|
for (const property of ["x1", "y1", "x2", "y2"]) next = next.editGraphics({ target: id, property, value: resolved[property] });
|
|
159
164
|
return next.editGraphics({ target: id, property: "stroke", value: config.color }).editGraphics({ target: id, property: "strokeWidth", value: config.lineWidth });
|
|
160
|
-
});
|
|
165
|
+
}));
|
|
161
166
|
}
|
|
162
167
|
|
|
163
168
|
const editXAxisTicks = makeEdit("x"), editYAxisTicks = makeEdit("y");
|
|
@@ -165,7 +170,7 @@ const editXAxisTicks = makeEdit("x"), editYAxisTicks = makeEdit("y");
|
|
|
165
170
|
function makeCreate(channel) {
|
|
166
171
|
const op = channel === "x" ? "createXAxisTicks" : "createYAxisTicks";
|
|
167
172
|
const edit = channel === "x" ? "editXAxisTicks" : "editYAxisTicks";
|
|
168
|
-
return action({ op, description: `Create concrete ${channel}-axis ticks.` }, function (args = {}) {
|
|
173
|
+
return action({ op, description: `Create concrete ${channel}-axis ticks.` }, withGuideLayoutValidation(function (args = {}) {
|
|
169
174
|
validateOptions(args, op, true);
|
|
170
175
|
const scale = validateUserId(args.scale ?? channel, "Scale id");
|
|
171
176
|
const existingGuide = this.semanticSpec.guides.axis?.[channel]?.scale;
|
|
@@ -192,7 +197,7 @@ function makeCreate(channel) {
|
|
|
192
197
|
...resolvePlotGraphicPlacement(this)
|
|
193
198
|
})
|
|
194
199
|
._withGuideConfig(channel, config)[edit]();
|
|
195
|
-
});
|
|
200
|
+
}));
|
|
196
201
|
}
|
|
197
202
|
|
|
198
203
|
const createXAxisTicks = makeCreate("x"), createYAxisTicks = makeCreate("y");
|