@elastic/charts 45.1.1 → 46.1.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/CHANGELOG.md +44 -0
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js +1 -2
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js +36 -9
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.d.ts +24 -3
- package/dist/chart_types/goal_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.js.map +1 -1
- package/dist/chart_types/xy_chart/annotations/rect/dimensions.js +11 -4
- package/dist/chart_types/xy_chart/annotations/rect/dimensions.js.map +1 -1
- package/dist/chart_types/xy_chart/annotations/rect/tooltip.js +9 -10
- package/dist/chart_types/xy_chart/annotations/rect/tooltip.js.map +1 -1
- package/dist/chart_types/xy_chart/annotations/types.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/domains/y_domain.js +12 -10
- package/dist/chart_types/xy_chart/domains/y_domain.js.map +1 -1
- package/dist/chart_types/xy_chart/legend/legend.js +7 -5
- package/dist/chart_types/xy_chart/legend/legend.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/animations/animation.d.ts +57 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/animation.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/animation.js +98 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/animation.js.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/index.d.ts +2 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/index.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/index.js +77 -0
- package/dist/chart_types/xy_chart/renderer/canvas/animations/index.js.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/annotations/index.js +5 -4
- package/dist/chart_types/xy_chart/renderer/canvas/annotations/index.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/annotations/lines.js +16 -8
- package/dist/chart_types/xy_chart/renderer/canvas/annotations/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/annotations/rect.js +41 -9
- package/dist/chart_types/xy_chart/renderer/canvas/annotations/rect.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js +4 -3
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/bars.js +3 -3
- package/dist/chart_types/xy_chart/renderer/canvas/bars.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/bubbles.js +2 -3
- package/dist/chart_types/xy_chart/renderer/canvas/bubbles.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js +3 -2
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/panel_clipping.d.ts +2 -0
- package/dist/chart_types/xy_chart/renderer/canvas/panel_clipping.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/panel_clipping.js +12 -0
- package/dist/chart_types/xy_chart/renderer/canvas/panel_clipping.js.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/points.js +4 -2
- package/dist/chart_types/xy_chart/renderer/canvas/points.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js +74 -93
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/xy_chart.js +9 -7
- package/dist/chart_types/xy_chart/renderer/canvas/xy_chart.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/common/utils.d.ts +2 -0
- package/dist/chart_types/xy_chart/renderer/common/utils.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/renderer/common/utils.js +15 -0
- package/dist/chart_types/xy_chart/renderer/common/utils.js.map +1 -0
- package/dist/chart_types/xy_chart/renderer/dom/annotations/annotations.js +21 -7
- package/dist/chart_types/xy_chart/renderer/dom/annotations/annotations.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/dom/annotations/line_marker.js +18 -11
- package/dist/chart_types/xy_chart/renderer/dom/annotations/line_marker.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/line_annotation.d.ts +2 -2
- package/dist/chart_types/xy_chart/state/selectors/compute_legend.js +1 -2
- package/dist/chart_types/xy_chart/state/selectors/compute_legend.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/compute_series_domains.js +1 -0
- package/dist/chart_types/xy_chart/state/selectors/compute_series_domains.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_annotation_tooltip_state.js +2 -1
- package/dist/chart_types/xy_chart/state/selectors/get_annotation_tooltip_state.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_api_scale_configs.js +14 -14
- package/dist/chart_types/xy_chart/state/selectors/get_api_scale_configs.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_annotation_ids_selector.d.ts +2 -0
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_annotation_ids_selector.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_annotation_ids_selector.js +28 -0
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_annotation_ids_selector.js.map +1 -0
- package/dist/chart_types/xy_chart/state/selectors/get_multiple_rectangle_annotations.js +1 -4
- package/dist/chart_types/xy_chart/state/selectors/get_multiple_rectangle_annotations.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/merge_y_custom_domains.js +1 -2
- package/dist/chart_types/xy_chart/state/selectors/merge_y_custom_domains.js.map +1 -1
- package/dist/chart_types/xy_chart/state/utils/utils.js +24 -2
- package/dist/chart_types/xy_chart/state/utils/utils.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.d.ts +9 -2
- package/dist/chart_types/xy_chart/utils/specs.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/scales/scale_continuous.js +22 -9
- package/dist/scales/scale_continuous.js.map +1 -1
- package/dist/scales/utils.d.ts +2 -0
- package/dist/scales/utils.d.ts.map +1 -0
- package/dist/scales/utils.js +16 -0
- package/dist/scales/utils.js.map +1 -0
- package/dist/specs/constants.d.ts +1 -1
- package/dist/specs/constants.d.ts.map +1 -1
- package/dist/specs/settings.d.ts +4 -0
- package/dist/specs/settings.d.ts.map +1 -1
- package/dist/specs/settings.js.map +1 -1
- package/dist/theme_dark.css.map +1 -1
- package/dist/theme_light.css.map +1 -1
- package/dist/theme_only_dark.css.map +1 -1
- package/dist/theme_only_light.css.map +1 -1
- package/dist/utils/common.d.ts.map +1 -1
- package/dist/utils/common.js +20 -1
- package/dist/utils/common.js.map +1 -1
- package/dist/utils/logger.js +1 -1
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/themes/merge_utils.d.ts +3 -2
- package/dist/utils/themes/merge_utils.d.ts.map +1 -1
- package/dist/utils/themes/merge_utils.js +17 -28
- package/dist/utils/themes/merge_utils.js.map +1 -1
- package/dist/utils/themes/theme.d.ts +19 -6
- package/dist/utils/themes/theme.d.ts.map +1 -1
- package/dist/utils/themes/theme.js.map +1 -1
- package/dist/utils/time_functions.d.ts +27 -0
- package/dist/utils/time_functions.d.ts.map +1 -0
- package/dist/utils/time_functions.js +29 -0
- package/dist/utils/time_functions.js.map +1 -0
- package/package.json +2 -1
|
@@ -13,6 +13,7 @@ var __assign = (this && this.__assign) || function () {
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.renderPointGroup = exports.renderPoints = void 0;
|
|
15
15
|
var color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
16
|
+
var panel_clipping_1 = require("./panel_clipping");
|
|
16
17
|
var shapes_1 = require("./primitives/shapes");
|
|
17
18
|
var panel_transform_1 = require("./utils/panel_transform");
|
|
18
19
|
function renderPoints(ctx, points, _a) {
|
|
@@ -33,7 +34,7 @@ function renderPoints(ctx, points, _a) {
|
|
|
33
34
|
});
|
|
34
35
|
}
|
|
35
36
|
exports.renderPoints = renderPoints;
|
|
36
|
-
function renderPointGroup(ctx, points, geometryStateStyles, rotation, renderingArea,
|
|
37
|
+
function renderPointGroup(ctx, points, geometryStateStyles, rotation, renderingArea, shouldClip) {
|
|
37
38
|
points
|
|
38
39
|
.slice()
|
|
39
40
|
.sort(function (_a, _b) {
|
|
@@ -48,7 +49,8 @@ function renderPointGroup(ctx, points, geometryStateStyles, rotation, renderingA
|
|
|
48
49
|
var stroke = __assign(__assign({}, style.stroke), { color: (0, color_library_wrappers_1.overrideOpacity)(style.stroke.color, function (fillOpacity) { return fillOpacity * opacity; }) });
|
|
49
50
|
var coordinates = { x: x + transform.x, y: y, radius: radius };
|
|
50
51
|
var renderer = function () { return (0, shapes_1.renderShape)(ctx, style.shape, coordinates, fill, stroke); };
|
|
51
|
-
(0,
|
|
52
|
+
var clippings = { area: (0, panel_clipping_1.getPanelClipping)(panel, rotation), shouldClip: shouldClip };
|
|
53
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, renderer, clippings);
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
exports.renderPointGroup = renderPointGroup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/points.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,oFAA4E;AAO5E,8CAAkD;AAClD,2DAA6D;AAO7D,SAAgB,YAAY,CAAC,GAA6B,EAAE,MAAuB,EAAE,EAA+B;QAA7B,OAAO,aAAA;IAC5F,MAAM;SACH,KAAK,EAAE;SACP,IAAI,CAAC,UAAC,EAAa,EAAE,EAAa;YAAlB,CAAC,YAAA;YAAc,CAAC,YAAA;QAAO,OAAA,CAAC,GAAG,CAAC;IAAL,CAAK,CAAC;SAC7C,OAAO,CAAC,UAAC,EAAkC;YAAhC,CAAC,OAAA,EAAE,CAAC,OAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,KAAK,WAAA;QACxC,IAAM,WAAW,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,MAAM,QAAA,EAAE,CAAC;QACvE,IAAM,IAAI,GAAG,EAAE,KAAK,EAAE,IAAA,wCAAe,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,WAAW,IAAK,OAAA,WAAW,GAAG,OAAO,EAArB,CAAqB,CAAC,EAAE,CAAC;QAClG,IAAM,MAAM,yBACP,KAAK,CAAC,MAAM,KACf,KAAK,EAAE,IAAA,wCAAe,EAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,UAAC,WAAW,IAAK,OAAA,WAAW,GAAG,OAAO,EAArB,CAAqB,CAAC,GACnF,CAAC;QACF,IAAA,oBAAW,EAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,oCAaC;AAOD,SAAgB,gBAAgB,CAC9B,GAA6B,EAC7B,MAAuB,EACvB,mBAA0D,EAC1D,QAAkB,EAClB,aAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/points.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.renderXYChartCanvas2d = void 0;
|
|
4
4
|
var colors_1 = require("../../../../common/colors");
|
|
5
5
|
var canvas_1 = require("../../../../renderers/canvas");
|
|
6
|
+
var animations_1 = require("./animations");
|
|
6
7
|
var annotations_1 = require("./annotations");
|
|
7
8
|
var areas_1 = require("./areas");
|
|
8
9
|
var bars_1 = require("./bars");
|
|
@@ -12,103 +13,83 @@ var lines_1 = require("./lines");
|
|
|
12
13
|
var panels_1 = require("./panels/panels");
|
|
13
14
|
var debug_1 = require("./utils/debug");
|
|
14
15
|
var bar_1 = require("./values/bar");
|
|
15
|
-
function renderXYChartCanvas2d(ctx, dpr,
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
debug: debug,
|
|
39
|
-
axesStyles: axesStyles,
|
|
40
|
-
sharedAxesStyle: sharedAxesStyle,
|
|
41
|
-
});
|
|
42
|
-
},
|
|
43
|
-
function () { return (0, annotations_1.renderAnnotations)(ctx, { rotation: rotation, renderingArea: renderingArea, annotationDimensions: annotationDimensions, annotationSpecs: annotationSpecs }, true); },
|
|
44
|
-
function () {
|
|
45
|
-
return (0, bars_1.renderBars)(ctx, imgCanvas, geometries.bars, sharedStyle, clippings, renderingArea, highlightedLegendItem, rotation);
|
|
46
|
-
},
|
|
47
|
-
function () {
|
|
48
|
-
return (0, areas_1.renderAreas)(ctx, imgCanvas, {
|
|
49
|
-
areas: geometries.areas,
|
|
50
|
-
clippings: clippings,
|
|
51
|
-
renderingArea: renderingArea,
|
|
52
|
-
rotation: rotation,
|
|
53
|
-
highlightedLegendItem: highlightedLegendItem,
|
|
54
|
-
sharedStyle: sharedStyle,
|
|
55
|
-
});
|
|
56
|
-
},
|
|
57
|
-
function () {
|
|
58
|
-
return (0, lines_1.renderLines)(ctx, {
|
|
59
|
-
lines: geometries.lines,
|
|
60
|
-
clippings: clippings,
|
|
61
|
-
renderingArea: renderingArea,
|
|
62
|
-
rotation: rotation,
|
|
63
|
-
highlightedLegendItem: highlightedLegendItem,
|
|
64
|
-
sharedStyle: sharedStyle,
|
|
65
|
-
});
|
|
66
|
-
},
|
|
67
|
-
function () {
|
|
68
|
-
return (0, bubbles_1.renderBubbles)(ctx, {
|
|
69
|
-
bubbles: geometries.bubbles,
|
|
70
|
-
clippings: clippings,
|
|
71
|
-
highlightedLegendItem: highlightedLegendItem,
|
|
72
|
-
sharedStyle: sharedStyle,
|
|
73
|
-
rotation: rotation,
|
|
74
|
-
renderingArea: renderingArea,
|
|
75
|
-
});
|
|
76
|
-
},
|
|
77
|
-
function () {
|
|
78
|
-
return geometries.bars.forEach(function (_a) {
|
|
79
|
-
var bars = _a.value, panel = _a.panel;
|
|
80
|
-
return (0, bar_1.renderBarValues)(ctx, {
|
|
81
|
-
bars: bars,
|
|
82
|
-
panel: panel,
|
|
16
|
+
function renderXYChartCanvas2d(ctx, dpr, props, animationState) {
|
|
17
|
+
function render(aCtx) {
|
|
18
|
+
var imgCanvas = document.createElement('canvas');
|
|
19
|
+
(0, canvas_1.withContext)(ctx, function () {
|
|
20
|
+
ctx.scale(dpr, dpr);
|
|
21
|
+
var renderingArea = props.renderingArea, chartTransform = props.chartTransform, rotation = props.rotation, geometries = props.geometries, geometriesIndex = props.geometriesIndex, _a = props.theme, sharedAxesStyle = _a.axes, sharedStyle = _a.sharedStyle, barSeriesStyle = _a.barSeriesStyle, background = _a.background, highlightedLegendItem = props.highlightedLegendItem, annotationDimensions = props.annotationDimensions, annotationSpecs = props.annotationSpecs, perPanelAxisGeoms = props.perPanelAxisGeoms, perPanelGridLines = props.perPanelGridLines, axesSpecs = props.axesSpecs, axesStyles = props.axesStyles, debug = props.debug, panelGeoms = props.panelGeoms, hoveredAnnotationIds = props.hoveredAnnotationIds;
|
|
22
|
+
var transform = { x: renderingArea.left + chartTransform.x, y: renderingArea.top + chartTransform.y };
|
|
23
|
+
(0, canvas_1.renderLayers)(ctx, [
|
|
24
|
+
function () { return (0, canvas_1.clearCanvas)(ctx, 'transparent'); },
|
|
25
|
+
function () { return debug && (0, panels_1.renderGridPanels)(ctx, transform, panelGeoms); },
|
|
26
|
+
function () {
|
|
27
|
+
return (0, grids_1.renderGrids)(ctx, {
|
|
28
|
+
axesSpecs: axesSpecs,
|
|
29
|
+
renderingArea: renderingArea,
|
|
30
|
+
perPanelGridLines: perPanelGridLines,
|
|
31
|
+
axesStyles: axesStyles,
|
|
32
|
+
sharedAxesStyle: sharedAxesStyle,
|
|
33
|
+
});
|
|
34
|
+
},
|
|
35
|
+
function () {
|
|
36
|
+
return (0, panels_1.renderPanelSubstrates)(ctx, {
|
|
37
|
+
axesSpecs: axesSpecs,
|
|
38
|
+
perPanelAxisGeoms: perPanelAxisGeoms,
|
|
83
39
|
renderingArea: renderingArea,
|
|
84
|
-
rotation: rotation,
|
|
85
40
|
debug: debug,
|
|
86
|
-
|
|
87
|
-
|
|
41
|
+
axesStyles: axesStyles,
|
|
42
|
+
sharedAxesStyle: sharedAxesStyle,
|
|
88
43
|
});
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
return
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
44
|
+
},
|
|
45
|
+
function () {
|
|
46
|
+
return (0, annotations_1.renderAnnotations)(ctx, aCtx, annotationDimensions, annotationSpecs, rotation, renderingArea, sharedStyle, hoveredAnnotationIds, true);
|
|
47
|
+
},
|
|
48
|
+
function () { return (0, bars_1.renderBars)(ctx, imgCanvas, geometries.bars, sharedStyle, rotation, renderingArea, highlightedLegendItem); },
|
|
49
|
+
function () {
|
|
50
|
+
return (0, areas_1.renderAreas)(ctx, imgCanvas, geometries.areas, sharedStyle, rotation, renderingArea, highlightedLegendItem);
|
|
51
|
+
},
|
|
52
|
+
function () { return (0, lines_1.renderLines)(ctx, geometries.lines, sharedStyle, rotation, renderingArea, highlightedLegendItem); },
|
|
53
|
+
function () { return (0, bubbles_1.renderBubbles)(ctx, geometries.bubbles, sharedStyle, rotation, renderingArea, highlightedLegendItem); },
|
|
54
|
+
function () {
|
|
55
|
+
return geometries.bars.forEach(function (_a) {
|
|
56
|
+
var bars = _a.value, panel = _a.panel;
|
|
57
|
+
return (0, bar_1.renderBarValues)(ctx, {
|
|
58
|
+
bars: bars,
|
|
59
|
+
panel: panel,
|
|
60
|
+
renderingArea: renderingArea,
|
|
61
|
+
rotation: rotation,
|
|
62
|
+
debug: debug,
|
|
63
|
+
barSeriesStyle: barSeriesStyle,
|
|
64
|
+
background: background,
|
|
65
|
+
});
|
|
108
66
|
});
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
67
|
+
},
|
|
68
|
+
function () {
|
|
69
|
+
return (0, annotations_1.renderAnnotations)(ctx, aCtx, annotationDimensions, annotationSpecs, rotation, renderingArea, sharedStyle, hoveredAnnotationIds, false);
|
|
70
|
+
},
|
|
71
|
+
function () {
|
|
72
|
+
return debug &&
|
|
73
|
+
(0, canvas_1.withContext)(ctx, function () {
|
|
74
|
+
var _a;
|
|
75
|
+
var left = renderingArea.left, top = renderingArea.top, width = renderingArea.width, height = renderingArea.height;
|
|
76
|
+
(0, debug_1.renderDebugRect)(ctx, { x: left, y: top, width: width, height: height }, 0, { color: colors_1.Colors.Transparent.rgba }, { color: colors_1.Colors.Red.rgba, width: 4, dash: [4, 4] });
|
|
77
|
+
var renderer = (_a = geometriesIndex.triangulation([0, 0, width, height])) === null || _a === void 0 ? void 0 : _a.render;
|
|
78
|
+
if ((0, canvas_1.isCanvasRenderer)(renderer)) {
|
|
79
|
+
ctx.beginPath();
|
|
80
|
+
ctx.translate(left, top);
|
|
81
|
+
ctx.setLineDash([5, 5]);
|
|
82
|
+
renderer(ctx);
|
|
83
|
+
ctx.lineWidth = 1;
|
|
84
|
+
ctx.strokeStyle = 'blue';
|
|
85
|
+
ctx.stroke();
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
},
|
|
89
|
+
]);
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
void (0, animations_1.getAnimationPoolFn)(animationState, render);
|
|
112
93
|
}
|
|
113
94
|
exports.renderXYChartCanvas2d = renderXYChartCanvas2d;
|
|
114
95
|
//# sourceMappingURL=renderers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":";;;AAQA,oDAAmD;
|
|
1
|
+
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,19 +40,20 @@ var compute_per_panel_axes_geoms_1 = require("../../state/selectors/compute_per_
|
|
|
40
40
|
var compute_series_geometries_1 = require("../../state/selectors/compute_series_geometries");
|
|
41
41
|
var get_axis_styles_1 = require("../../state/selectors/get_axis_styles");
|
|
42
42
|
var get_grid_lines_1 = require("../../state/selectors/get_grid_lines");
|
|
43
|
+
var get_highlighted_annotation_ids_selector_1 = require("../../state/selectors/get_highlighted_annotation_ids_selector");
|
|
43
44
|
var get_highlighted_series_1 = require("../../state/selectors/get_highlighted_series");
|
|
44
45
|
var get_specs_1 = require("../../state/selectors/get_specs");
|
|
45
46
|
var is_chart_empty_1 = require("../../state/selectors/is_chart_empty");
|
|
46
47
|
var indexed_geometry_map_1 = require("../../utils/indexed_geometry_map");
|
|
47
48
|
var renderers_1 = require("./renderers");
|
|
48
49
|
var has_mostly_rtl_1 = require("./utils/has_mostly_rtl");
|
|
49
|
-
var CLIPPING_MARGINS = 0.5;
|
|
50
50
|
var XYChartComponent = (function (_super) {
|
|
51
51
|
__extends(XYChartComponent, _super);
|
|
52
52
|
function XYChartComponent(props) {
|
|
53
53
|
var _this = _super.call(this, props) || this;
|
|
54
54
|
_this.ctx = null;
|
|
55
55
|
_this.devicePixelRatio = window.devicePixelRatio;
|
|
56
|
+
_this.animationState = { rafId: NaN, pool: new Map() };
|
|
56
57
|
return _this;
|
|
57
58
|
}
|
|
58
59
|
XYChartComponent.prototype.componentDidMount = function () {
|
|
@@ -74,14 +75,13 @@ var XYChartComponent = (function (_super) {
|
|
|
74
75
|
this.props.onChartRendered();
|
|
75
76
|
}
|
|
76
77
|
};
|
|
78
|
+
XYChartComponent.prototype.componentWillUnmount = function () {
|
|
79
|
+
window.cancelAnimationFrame(this.animationState.rafId);
|
|
80
|
+
this.animationState.pool.clear();
|
|
81
|
+
};
|
|
77
82
|
XYChartComponent.prototype.drawCanvas = function () {
|
|
78
83
|
if (this.ctx) {
|
|
79
|
-
|
|
80
|
-
var vertical = Math.abs(rotation) === 90;
|
|
81
|
-
var width = (vertical ? renderingArea.height : renderingArea.width) + CLIPPING_MARGINS * 2;
|
|
82
|
-
var height = (vertical ? renderingArea.width : renderingArea.height) + CLIPPING_MARGINS * 2;
|
|
83
|
-
var clippings = { x: -CLIPPING_MARGINS, y: -CLIPPING_MARGINS, width: width, height: height };
|
|
84
|
-
(0, renderers_1.renderXYChartCanvas2d)(this.ctx, this.devicePixelRatio, clippings, this.props);
|
|
84
|
+
(0, renderers_1.renderXYChartCanvas2d)(this.ctx, this.devicePixelRatio, this.props, this.animationState);
|
|
85
85
|
}
|
|
86
86
|
};
|
|
87
87
|
XYChartComponent.prototype.tryCanvasContext = function () {
|
|
@@ -147,6 +147,7 @@ var DEFAULT_PROPS = {
|
|
|
147
147
|
perPanelAxisGeoms: [],
|
|
148
148
|
perPanelGridLines: [],
|
|
149
149
|
axesStyles: new Map(),
|
|
150
|
+
hoveredAnnotationIds: [],
|
|
150
151
|
annotationDimensions: new Map(),
|
|
151
152
|
annotationSpecs: [],
|
|
152
153
|
panelGeoms: [],
|
|
@@ -169,6 +170,7 @@ var mapStateToProps = function (state) {
|
|
|
169
170
|
theme: (0, get_chart_theme_1.getChartThemeSelector)(state),
|
|
170
171
|
chartContainerDimensions: (0, get_chart_container_dimensions_1.getChartContainerDimensionsSelector)(state),
|
|
171
172
|
highlightedLegendItem: (0, get_highlighted_series_1.getHighlightedSeriesSelector)(state),
|
|
173
|
+
hoveredAnnotationIds: (0, get_highlighted_annotation_ids_selector_1.getHighlightedAnnotationIdsSelector)(state),
|
|
172
174
|
rotation: (0, get_chart_rotation_1.getChartRotationSelector)(state),
|
|
173
175
|
renderingArea: (0, compute_chart_dimensions_1.computeChartDimensionsSelector)(state).chartDimensions,
|
|
174
176
|
chartTransform: (0, compute_chart_transform_1.computeChartTransformSelector)(state),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xy_chart.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/xy_chart.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAQA,gDAAyC;AACzC,2CAAsC;AACtC,+BAAqD;AAGrD,sEAA2E;AAC3E,yDAAkE;AAElE,iGAI8D;AAC9D,6GAAiH;AACjH,qFAA0F;AAC1F,+EAAoF;AACpF,qGAAsH;AACtH,qFAAyF;AAGzF,qEAA8D;AAE9D,oEAAmE;AAGnE,iFAAgG;AAChG,2FAAgG;AAChG,yFAA8F;AAC9F,uEAA0F;AAC1F,mGAG4D;AAC5D,6FAAkG;AAClG,yEAA8E;AAC9E,uEAA4E;AAC5E,uFAA4F;AAC5F,6DAAmG;AACnG,uEAA4E;AAG5E,yEAAsE;
|
|
1
|
+
{"version":3,"file":"xy_chart.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/xy_chart.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAQA,gDAAyC;AACzC,2CAAsC;AACtC,+BAAqD;AAGrD,sEAA2E;AAC3E,yDAAkE;AAElE,iGAI8D;AAC9D,6GAAiH;AACjH,qFAA0F;AAC1F,+EAAoF;AACpF,qGAAsH;AACtH,qFAAyF;AAGzF,qEAA8D;AAE9D,oEAAmE;AAGnE,iFAAgG;AAChG,2FAAgG;AAChG,yFAA8F;AAC9F,uEAA0F;AAC1F,mGAG4D;AAC5D,6FAAkG;AAClG,yEAA8E;AAC9E,uEAA4E;AAC5E,yHAAoH;AACpH,uFAA4F;AAC5F,6DAAmG;AACnG,uEAA4E;AAG5E,yEAAsE;AAGtE,yCAAoD;AACpD,yDAAsD;AAqCtD;IAA+B,oCAA6B;IAS1D,0BAAY,KAA6B;QAAzC,YACE,kBAAM,KAAK,CAAC,SAIb;QAHC,KAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAChB,KAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,KAAI,CAAC,cAAc,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;;IACxD,CAAC;IAED,4CAAiB,GAAjB;QAKE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAC1B,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;SAC9B;IACH,CAAC;IAED,gDAAqB,GAArB,UAAsB,SAAkC;QACtD,OAAO,CAAC,IAAA,2BAAS,EAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,6CAAkB,GAAlB;QACE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACzB;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAC1B,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;SAC9B;IACH,CAAC;IAED,+CAAoB,GAApB;QACE,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;IAEO,qCAAU,GAAlB;QACE,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAA,iCAAqB,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACzF;IACH,CAAC;IAEO,2CAAgB,GAAxB;QACE,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC;QACnD,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAGD,iCAAM,GAAN;QACQ,IAAA,KAQF,IAAI,CAAC,KAAK,EAPZ,gBAAgB,sBAAA,EAChB,WAAW,iBAAA,EACX,YAAY,kBAAA,EACZ,gCAA2C,EAAf,KAAK,WAAA,EAAE,MAAM,YAAA,EACzC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,KAAK,WACO,CAAC;QAEf,IAAI,CAAC,WAAW,IAAI,YAAY,EAAE;YAChC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;YAChB,OAAO,IAAI,CAAC;SACb;QAED,OAAO,CACL;YACE,6DAAyB,YAAY,CAAC,OAAO,sBAAoB,YAAY,CAAC,aAAa;gBACzF,0CACE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAC1B,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAC,mBAAmB,EAC7B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC,gBAAgB,EACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,gBAAgB,EACtC,KAAK,EAAE;wBACL,KAAK,OAAA;wBACL,MAAM,QAAA;qBACP,EAED,IAAI,EAAC,cAAc,GACnB;gBACD,CAAC,KAAK,IAAI,8BAAC,mCAAmB,OAAG,CAC3B;YACR,KAAK,IAAI,8BAAC,mCAAmB,OAAG,CAChC,CACJ,CAAC;IACJ,CAAC;IA/FM,4BAAW,GAAG,SAAS,CAAC;IAgGjC,uBAAC;CAAA,AAjGD,CAA+B,eAAK,CAAC,SAAS,GAiG7C;AAED,IAAM,kBAAkB,GAAG,UAAC,QAAkB;IAC5C,OAAA,IAAA,0BAAkB,EAChB;QACE,eAAe,yBAAA;KAChB,EACD,QAAQ,CACT;AALD,CAKC,CAAC;AAEJ,IAAM,aAAa,GAA4B;IAC7C,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;IAClB,KAAK,EAAE,KAAK;IACZ,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE;QACV,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ;IACD,eAAe,EAAE,IAAI,yCAAkB,EAAE;IACzC,KAAK,EAAE,yBAAW;IAClB,wBAAwB,EAAE;QACxB,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,CAAC;KACP;IACD,QAAQ,EAAE,CAAU;IACpB,aAAa,EAAE;QACb,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,CAAC;KACP;IACD,cAAc,EAAE;QACd,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,MAAM,EAAE,CAAC;KACV;IAED,SAAS,EAAE,EAAE;IACb,iBAAiB,EAAE,EAAE;IACrB,iBAAiB,EAAE,EAAE;IACrB,UAAU,EAAE,IAAI,GAAG,EAAE;IACrB,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,IAAI,GAAG,EAAE;IAC/B,eAAe,EAAE,EAAE;IACnB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,gDAAqB;CACpC,CAAC;AAEF,IAAM,eAAe,GAAG,UAAC,KAAuB;IAC9C,IAAI,IAAA,6DAAgC,EAAC,KAAK,CAAC,KAAK,uCAAU,CAAC,WAAW,EAAE;QACtE,OAAO,aAAa,CAAC;KACtB;IAEK,IAAA,KAAkC,IAAA,2DAA+B,EAAC,KAAK,CAAC,EAAtE,UAAU,gBAAA,EAAE,eAAe,qBAA2C,CAAC;IACvE,IAAA,KAAK,GAAK,IAAA,4CAAuB,EAAC,KAAK,CAAC,MAAnC,CAAoC;IACjD,IAAM,iBAAiB,GAAG,IAAA,+DAAgC,EAAC,KAAK,CAAC,CAAC;IAElE,OAAO;QACL,KAAK,EAAE,IAAA,6BAAY,EAAC,iBAAiB,CAAC;QACtC,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,IAAA,qCAAoB,EAAC,KAAK,CAAC;QACzC,KAAK,OAAA;QACL,UAAU,YAAA;QACV,eAAe,iBAAA;QACf,KAAK,EAAE,IAAA,uCAAqB,EAAC,KAAK,CAAC;QACnC,wBAAwB,EAAE,IAAA,oEAAmC,EAAC,KAAK,CAAC;QACpE,qBAAqB,EAAE,IAAA,qDAA4B,EAAC,KAAK,CAAC;QAC1D,oBAAoB,EAAE,IAAA,6EAAmC,EAAC,KAAK,CAAC;QAChE,QAAQ,EAAE,IAAA,6CAAwB,EAAC,KAAK,CAAC;QACzC,aAAa,EAAE,IAAA,yDAA8B,EAAC,KAAK,CAAC,CAAC,eAAe;QACpE,cAAc,EAAE,IAAA,uDAA6B,EAAC,KAAK,CAAC;QACpD,SAAS,EAAE,IAAA,gCAAoB,EAAC,KAAK,CAAC;QACtC,iBAAiB,mBAAA;QACjB,iBAAiB,EAAE,IAAA,qCAAoB,EAAC,KAAK,CAAC;QAC9C,UAAU,EAAE,IAAA,uCAAqB,EAAC,KAAK,CAAC;QACxC,oBAAoB,EAAE,IAAA,yDAAmC,EAAC,KAAK,CAAC;QAChE,eAAe,EAAE,IAAA,sCAA0B,EAAC,KAAK,CAAC;QAClD,UAAU,EAAE,IAAA,uCAAsB,EAAC,KAAK,CAAC;QACzC,YAAY,EAAE,IAAA,kDAAuB,EAAC,KAAK,CAAC;KAC7C,CAAC;AACJ,CAAC,CAAC;AAGW,QAAA,OAAO,GAAG,IAAA,qBAAO,EAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/common/utils.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getAnnotationHoverParamsFn = void 0;
|
|
4
|
+
var getAnnotationHoverParamsFn = function (hoveredElementIds, styles) { return function (id) {
|
|
5
|
+
var isHighlighted = hoveredElementIds.includes(id);
|
|
6
|
+
var style = hoveredElementIds.length === 0 ? styles.default : isHighlighted ? styles.highlighted : styles.unhighlighted;
|
|
7
|
+
var shouldTransition = !isHighlighted && hoveredElementIds.length > 0;
|
|
8
|
+
return {
|
|
9
|
+
style: style,
|
|
10
|
+
isHighlighted: isHighlighted,
|
|
11
|
+
shouldTransition: shouldTransition,
|
|
12
|
+
};
|
|
13
|
+
}; };
|
|
14
|
+
exports.getAnnotationHoverParamsFn = getAnnotationHoverParamsFn;
|
|
15
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/common/utils.ts"],"names":[],"mappings":";;;AAqBO,IAAM,0BAA0B,GAAG,UAAC,iBAA2B,EAAE,MAAgC,IAAK,OAAA,UAC3G,EAAU;IAEV,IAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrD,IAAM,KAAK,GACT,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;IAC9G,IAAM,gBAAgB,GAAG,CAAC,aAAa,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;IAExE,OAAO;QACL,KAAK,OAAA;QACL,aAAa,eAAA;QACb,gBAAgB,kBAAA;KACjB,CAAC;AACJ,CAAC,EAb4G,CAa5G,CAAC;AAbW,QAAA,0BAA0B,8BAarC"}
|
|
@@ -36,28 +36,35 @@ var react_redux_1 = require("react-redux");
|
|
|
36
36
|
var redux_1 = require("redux");
|
|
37
37
|
var dom_element_1 = require("../../../../../state/actions/dom_element");
|
|
38
38
|
var mouse_1 = require("../../../../../state/actions/mouse");
|
|
39
|
+
var get_chart_theme_1 = require("../../../../../state/selectors/get_chart_theme");
|
|
39
40
|
var get_internal_is_intialized_1 = require("../../../../../state/selectors/get_internal_is_intialized");
|
|
40
41
|
var get_settings_specs_1 = require("../../../../../state/selectors/get_settings_specs");
|
|
42
|
+
var light_theme_1 = require("../../../../../utils/themes/light_theme");
|
|
43
|
+
var merge_utils_1 = require("../../../../../utils/themes/merge_utils");
|
|
41
44
|
var compute_annotations_1 = require("../../../state/selectors/compute_annotations");
|
|
42
45
|
var compute_chart_dimensions_1 = require("../../../state/selectors/compute_chart_dimensions");
|
|
43
46
|
var get_annotation_tooltip_state_1 = require("../../../state/selectors/get_annotation_tooltip_state");
|
|
47
|
+
var get_highlighted_annotation_ids_selector_1 = require("../../../state/selectors/get_highlighted_annotation_ids_selector");
|
|
44
48
|
var get_specs_1 = require("../../../state/selectors/get_specs");
|
|
45
49
|
var is_chart_empty_1 = require("../../../state/selectors/is_chart_empty");
|
|
46
50
|
var spec_1 = require("../../../state/utils/spec");
|
|
47
51
|
var specs_1 = require("../../../utils/specs");
|
|
52
|
+
var utils_1 = require("../../common/utils");
|
|
48
53
|
var annotation_tooltip_1 = require("./annotation_tooltip");
|
|
49
54
|
var line_marker_1 = require("./line_marker");
|
|
50
|
-
function renderAnnotationLineMarkers(chartAreaRef, chartDimensions, annotationLines, onDOMElementEnter, onDOMElementLeave,
|
|
55
|
+
function renderAnnotationLineMarkers(chartAreaRef, chartDimensions, annotationLines, onDOMElementEnter, onDOMElementLeave, hoveredIds, lineStyle, sharedStyle, clickable) {
|
|
56
|
+
var getHoverStyles = (0, utils_1.getAnnotationHoverParamsFn)(hoveredIds, sharedStyle);
|
|
51
57
|
return annotationLines.reduce(function (acc, props) {
|
|
52
58
|
if (props.markers.length === 0) {
|
|
53
59
|
return acc;
|
|
54
60
|
}
|
|
55
|
-
|
|
61
|
+
var style = getHoverStyles(props.id).style;
|
|
62
|
+
acc.push(react_1.default.createElement(line_marker_1.LineMarker, __assign({}, props, { key: "annotation-" + props.id, chartAreaRef: chartAreaRef, chartDimensions: chartDimensions, onDOMElementEnter: onDOMElementEnter, onDOMElementLeave: onDOMElementLeave, onDOMElementClick: dom_element_1.onDOMElementClick, clickable: clickable, style: style, animationStyle: lineStyle.animations })));
|
|
56
63
|
return acc;
|
|
57
64
|
}, []);
|
|
58
65
|
}
|
|
59
66
|
var AnnotationsComponent = function (_a) {
|
|
60
|
-
var tooltipState = _a.tooltipState, isChartEmpty = _a.isChartEmpty, chartDimensions = _a.chartDimensions, annotationSpecs = _a.annotationSpecs, annotationDimensions = _a.annotationDimensions, getChartContainerRef = _a.getChartContainerRef, chartAreaRef = _a.chartAreaRef, chartId = _a.chartId, zIndex = _a.zIndex, onPointerMove = _a.onPointerMove, onDOMElementEnter = _a.onDOMElementEnter, onDOMElementLeave = _a.onDOMElementLeave,
|
|
67
|
+
var tooltipState = _a.tooltipState, isChartEmpty = _a.isChartEmpty, chartDimensions = _a.chartDimensions, annotationSpecs = _a.annotationSpecs, annotationDimensions = _a.annotationDimensions, getChartContainerRef = _a.getChartContainerRef, chartAreaRef = _a.chartAreaRef, chartId = _a.chartId, zIndex = _a.zIndex, onPointerMove = _a.onPointerMove, onDOMElementEnter = _a.onDOMElementEnter, onDOMElementLeave = _a.onDOMElementLeave, clickable = _a.clickable, hoveredAnnotationIds = _a.hoveredAnnotationIds, sharedStyle = _a.sharedStyle;
|
|
61
68
|
var renderAnnotationMarkers = (0, react_1.useCallback)(function () {
|
|
62
69
|
var markers = [];
|
|
63
70
|
annotationDimensions.forEach(function (dimensions, id) {
|
|
@@ -66,8 +73,9 @@ var AnnotationsComponent = function (_a) {
|
|
|
66
73
|
return;
|
|
67
74
|
}
|
|
68
75
|
if ((0, specs_1.isLineAnnotation)(annotationSpec)) {
|
|
76
|
+
var lineStyle = (0, merge_utils_1.mergeWithDefaultAnnotationLine)(annotationSpec.style);
|
|
69
77
|
var annotationLines = dimensions;
|
|
70
|
-
var lineMarkers = renderAnnotationLineMarkers(chartAreaRef, chartDimensions, annotationLines, onDOMElementEnter, onDOMElementLeave,
|
|
78
|
+
var lineMarkers = renderAnnotationLineMarkers(chartAreaRef, chartDimensions, annotationLines, onDOMElementEnter, onDOMElementLeave, hoveredAnnotationIds, lineStyle, sharedStyle, clickable);
|
|
71
79
|
lineMarkers.forEach(function (m) { return markers.push(m); });
|
|
72
80
|
}
|
|
73
81
|
});
|
|
@@ -79,7 +87,9 @@ var AnnotationsComponent = function (_a) {
|
|
|
79
87
|
chartDimensions,
|
|
80
88
|
onDOMElementEnter,
|
|
81
89
|
onDOMElementLeave,
|
|
82
|
-
|
|
90
|
+
hoveredAnnotationIds,
|
|
91
|
+
sharedStyle,
|
|
92
|
+
clickable,
|
|
83
93
|
]);
|
|
84
94
|
var onScroll = (0, react_1.useCallback)(function () {
|
|
85
95
|
onPointerMove({ x: -1, y: -1 }, Date.now());
|
|
@@ -106,23 +116,27 @@ var mapStateToProps = function (state) {
|
|
|
106
116
|
return {
|
|
107
117
|
isChartEmpty: true,
|
|
108
118
|
chartDimensions: { top: 0, left: 0, width: 0, height: 0 },
|
|
119
|
+
sharedStyle: light_theme_1.LIGHT_THEME.sharedStyle,
|
|
109
120
|
annotationDimensions: new Map(),
|
|
110
121
|
annotationSpecs: [],
|
|
111
122
|
tooltipState: null,
|
|
112
123
|
chartId: chartId,
|
|
113
124
|
zIndex: zIndex,
|
|
114
|
-
|
|
125
|
+
hoveredAnnotationIds: [],
|
|
126
|
+
clickable: false,
|
|
115
127
|
};
|
|
116
128
|
}
|
|
117
129
|
return {
|
|
118
130
|
isChartEmpty: (0, is_chart_empty_1.isChartEmptySelector)(state),
|
|
119
131
|
chartDimensions: (0, compute_chart_dimensions_1.computeChartDimensionsSelector)(state).chartDimensions,
|
|
132
|
+
sharedStyle: (0, get_chart_theme_1.getChartThemeSelector)(state).sharedStyle,
|
|
120
133
|
annotationDimensions: (0, compute_annotations_1.computeAnnotationDimensionsSelector)(state),
|
|
121
134
|
annotationSpecs: (0, get_specs_1.getAnnotationSpecsSelector)(state),
|
|
122
135
|
tooltipState: (0, get_annotation_tooltip_state_1.getAnnotationTooltipStateSelector)(state),
|
|
123
136
|
chartId: chartId,
|
|
124
137
|
zIndex: zIndex,
|
|
125
|
-
|
|
138
|
+
hoveredAnnotationIds: (0, get_highlighted_annotation_ids_selector_1.getHighlightedAnnotationIdsSelector)(state),
|
|
139
|
+
clickable: Boolean((0, get_settings_specs_1.getSettingsSpecSelector)(state).onAnnotationClick),
|
|
126
140
|
};
|
|
127
141
|
};
|
|
128
142
|
exports.Annotations = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(AnnotationsComponent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/dom/annotations/annotations.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,6CAAsD;AACtD,2CAAsC;AACtC,+BAAqD;
|
|
1
|
+
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/dom/annotations/annotations.tsx"],"names":[],"mappings":"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"}
|
|
@@ -64,16 +64,11 @@ function getMarkerCentredTransform(alignment, hasMarkerDimensions) {
|
|
|
64
64
|
}
|
|
65
65
|
function LineMarker(_a) {
|
|
66
66
|
var _b, _c;
|
|
67
|
-
var id = _a.id, specId = _a.specId, datum = _a.datum, panel = _a.panel, _d = __read(_a.markers, 1), _e = _d[0], icon = _e.icon, body = _e.body, color = _e.color, position = _e.position, alignment = _e.alignment, dimension = _e.dimension, chartAreaRef = _a.chartAreaRef, chartDimensions = _a.chartDimensions, onDOMElementEnter = _a.onDOMElementEnter, onDOMElementLeave = _a.onDOMElementLeave, onDOMElementClick = _a.onDOMElementClick,
|
|
67
|
+
var id = _a.id, specId = _a.specId, datum = _a.datum, panel = _a.panel, _d = __read(_a.markers, 1), _e = _d[0], icon = _e.icon, body = _e.body, color = _e.color, position = _e.position, alignment = _e.alignment, dimension = _e.dimension, chartAreaRef = _a.chartAreaRef, chartDimensions = _a.chartDimensions, onDOMElementEnter = _a.onDOMElementEnter, onDOMElementLeave = _a.onDOMElementLeave, onDOMElementClick = _a.onDOMElementClick, clickable = _a.clickable, style = _a.style, animationStyle = _a.animationStyle;
|
|
68
68
|
var iconRef = (0, react_1.useRef)(null);
|
|
69
69
|
var testRef = (0, react_1.useRef)(null);
|
|
70
70
|
var popper = (0, react_1.useRef)(null);
|
|
71
|
-
var
|
|
72
|
-
color: color,
|
|
73
|
-
top: chartDimensions.top + position.top + panel.top,
|
|
74
|
-
left: chartDimensions.left + position.left + panel.left,
|
|
75
|
-
cursor: annotationSpec ? 'pointer' : constants_1.DEFAULT_CSS_CURSOR,
|
|
76
|
-
};
|
|
71
|
+
var markerStyle = __assign(__assign(__assign({}, style), getAnimatedStyles(animationStyle, style)), { color: color, top: chartDimensions.top + position.top + panel.top, left: chartDimensions.left + position.left + panel.left, cursor: clickable ? 'pointer' : constants_1.DEFAULT_CSS_CURSOR });
|
|
77
72
|
var transform = { transform: getMarkerCentredTransform(alignment, Boolean(dimension)) };
|
|
78
73
|
var setPopper = (0, react_1.useCallback)(function () {
|
|
79
74
|
if (!iconRef.current || !testRef.current)
|
|
@@ -114,25 +109,37 @@ function LineMarker(_a) {
|
|
|
114
109
|
};
|
|
115
110
|
}, [setPopper, body]);
|
|
116
111
|
void ((_c = (_b = popper === null || popper === void 0 ? void 0 : popper.current) === null || _b === void 0 ? void 0 : _b.update) === null || _c === void 0 ? void 0 : _c.call(_b));
|
|
117
|
-
return onDOMElementClick ? (react_1.default.createElement("button", { className: "echAnnotation",
|
|
112
|
+
return onDOMElementClick ? (react_1.default.createElement("button", { className: "echAnnotation", onMouseEnter: function () {
|
|
118
113
|
onDOMElementEnter({
|
|
119
114
|
createdBySpecId: specId,
|
|
120
115
|
id: id,
|
|
121
116
|
type: dom_element_1.DOMElementType.LineAnnotationMarker,
|
|
122
117
|
datum: datum,
|
|
123
118
|
});
|
|
124
|
-
}, onMouseLeave: onDOMElementLeave, onClick: onDOMElementClick, style: __assign(__assign({},
|
|
119
|
+
}, onMouseLeave: onDOMElementLeave, onClick: onDOMElementClick, style: __assign(__assign({}, markerStyle), transform), type: "button" },
|
|
125
120
|
react_1.default.createElement("div", { ref: iconRef, className: "echAnnotation__icon" }, (0, common_1.renderWithProps)(icon, datum)),
|
|
126
|
-
body && (react_1.default.createElement("div", { ref: testRef, className: "echAnnotation__body" }, (0, common_1.renderWithProps)(body, datum))))) : (react_1.default.createElement("div", { className: "echAnnotation",
|
|
121
|
+
body && (react_1.default.createElement("div", { ref: testRef, className: "echAnnotation__body" }, (0, common_1.renderWithProps)(body, datum))))) : (react_1.default.createElement("div", { className: "echAnnotation", onMouseEnter: function () {
|
|
127
122
|
onDOMElementEnter({
|
|
128
123
|
createdBySpecId: specId,
|
|
129
124
|
id: id,
|
|
130
125
|
type: dom_element_1.DOMElementType.LineAnnotationMarker,
|
|
131
126
|
datum: datum,
|
|
132
127
|
});
|
|
133
|
-
}, onMouseLeave: onDOMElementLeave, style: __assign(__assign({},
|
|
128
|
+
}, onMouseLeave: onDOMElementLeave, style: __assign(__assign({}, markerStyle), transform) },
|
|
134
129
|
react_1.default.createElement("div", { ref: iconRef, className: "echAnnotation__icon" }, (0, common_1.renderWithProps)(icon, datum)),
|
|
135
130
|
body && (react_1.default.createElement("div", { ref: testRef, className: "echAnnotation__body" }, (0, common_1.renderWithProps)(body, datum)))));
|
|
136
131
|
}
|
|
137
132
|
exports.LineMarker = LineMarker;
|
|
133
|
+
function getAnimatedStyles(_a, _b) {
|
|
134
|
+
var duration = _a.duration, delay = _a.delay, timeFunction = _a.timeFunction, snapValues = _a.snapValues, enabled = _a.enabled;
|
|
135
|
+
var opacity = _b.opacity;
|
|
136
|
+
if (!enabled || (typeof opacity === 'number' && snapValues.includes(opacity)))
|
|
137
|
+
return {};
|
|
138
|
+
return {
|
|
139
|
+
transitionDuration: duration + "ms",
|
|
140
|
+
transitionDelay: delay + "ms",
|
|
141
|
+
transitionProperty: 'opacity',
|
|
142
|
+
transitionTimingFunction: timeFunction,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
138
145
|
//# sourceMappingURL=line_marker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line_marker.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/dom/annotations/line_marker.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,uCAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"line_marker.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/dom/annotations/line_marker.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { ComponentProps } from 'react';
|
|
2
2
|
import { SFProps } from '../../../state/spec_factory';
|
|
3
3
|
import { LineAnnotationSpec } from '../utils/specs';
|
|
4
|
-
declare const buildProps: import("../../../state/spec_factory").BuildProps<LineAnnotationSpec<any>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "
|
|
4
|
+
declare const buildProps: import("../../../state/spec_factory").BuildProps<LineAnnotationSpec<any>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "domainType" | "dataValues">;
|
|
5
5
|
/**
|
|
6
6
|
* Adds bar series to chart specs
|
|
7
7
|
* @public
|
|
8
8
|
*/
|
|
9
|
-
export declare const LineAnnotation: <D = any>(props: SFProps<LineAnnotationSpec<D>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "
|
|
9
|
+
export declare const LineAnnotation: <D = any>(props: SFProps<LineAnnotationSpec<D>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "domainType" | "dataValues">) => null;
|
|
10
10
|
/** @public */
|
|
11
11
|
export declare type LineAnnotationProps = ComponentProps<typeof LineAnnotation>;
|
|
12
12
|
export {};
|
|
@@ -22,7 +22,6 @@ exports.computeLegendSelector = (0, create_selector_1.createCustomCachedSelector
|
|
|
22
22
|
get_si_dataseries_map_1.getSiDataSeriesMapSelector,
|
|
23
23
|
], function (seriesSpecs, _a, chartTheme, seriesColors, axesSpecs, deselectedDataSeries, settings, siDataSeriesMap) {
|
|
24
24
|
var formattedDataSeries = _a.formattedDataSeries, xDomain = _a.xDomain;
|
|
25
|
-
|
|
26
|
-
return (0, legend_1.computeLegend)(formattedDataSeries, lastValues, seriesColors, seriesSpecs, axesSpecs, settings.showLegendExtra, siDataSeriesMap, deselectedDataSeries, chartTheme, settings.rotation);
|
|
25
|
+
return (0, legend_1.computeLegend)(formattedDataSeries, (0, get_last_value_1.getLastValues)(formattedDataSeries, xDomain), seriesColors, seriesSpecs, axesSpecs, settings, siDataSeriesMap, deselectedDataSeries, chartTheme);
|
|
27
26
|
});
|
|
28
27
|
//# sourceMappingURL=compute_legend.js.map
|