@elastic/charts 46.0.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 +14 -0
- 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/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 -3
- 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/renderers.js +74 -64
- 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 -1
- 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/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_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/utils/specs.d.ts +1 -1
- package/dist/chart_types/xy_chart/utils/specs.d.ts.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.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/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
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [46.1.0](https://github.com/elastic/elastic-charts/compare/v46.0.1...v46.1.0) (2022-05-05)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **animations:** flashing when using grouped parameterized keys ([#1665](https://github.com/elastic/elastic-charts/issues/1665)) ([1323edc](https://github.com/elastic/elastic-charts/commit/1323edc76f496028ffe2119ec83af2834484bede))
|
|
7
|
+
* **deps:** update dependency @elastic/eui to ^55.1.0 ([#1663](https://github.com/elastic/elastic-charts/issues/1663)) ([ef8a185](https://github.com/elastic/elastic-charts/commit/ef8a185fc621890d561432953846112e957bdb5d))
|
|
8
|
+
* **deps:** update dependency @elastic/eui to v55 ([#1659](https://github.com/elastic/elastic-charts/issues/1659)) ([5fc4af3](https://github.com/elastic/elastic-charts/commit/5fc4af3c84b1ff9d2818862d1eb19de780de4208))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* **annotations:** animated focus states for hovered annotation ([#1628](https://github.com/elastic/elastic-charts/issues/1628)) ([0bbb809](https://github.com/elastic/elastic-charts/commit/0bbb809132897dc691f1a71c676c46ec91aa59df))
|
|
14
|
+
|
|
1
15
|
## [46.0.1](https://github.com/elastic/elastic-charts/compare/v46.0.0...v46.0.1) (2022-04-19)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -36,7 +36,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
36
36
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.computeRectAnnotationDimensions = exports.isWithinRectBounds = void 0;
|
|
39
|
+
exports.getAnnotationRectPropsId = exports.computeRectAnnotationDimensions = exports.isWithinRectBounds = void 0;
|
|
40
40
|
var types_1 = require("../../../../scales/types");
|
|
41
41
|
var common_1 = require("../../../../utils/common");
|
|
42
42
|
var common_2 = require("../../state/utils/common");
|
|
@@ -52,7 +52,7 @@ function isWithinRectBounds(_a, _b) {
|
|
|
52
52
|
exports.isWithinRectBounds = isWithinRectBounds;
|
|
53
53
|
function computeRectAnnotationDimensions(annotationSpec, yScales, xScale, axesSpecs, smallMultiplesScales, chartRotation, getAxisStyle, isHistogram) {
|
|
54
54
|
if (isHistogram === void 0) { isHistogram = false; }
|
|
55
|
-
var dataValues = annotationSpec.dataValues, groupId = annotationSpec.groupId, outside = annotationSpec.outside;
|
|
55
|
+
var dataValues = annotationSpec.dataValues, groupId = annotationSpec.groupId, outside = annotationSpec.outside, annotationSpecId = annotationSpec.id;
|
|
56
56
|
var _a = (0, spec_1.getAxesSpecForSpecId)(axesSpecs, groupId), xAxis = _a.xAxis, yAxis = _a.yAxis;
|
|
57
57
|
var yScale = yScales.get(groupId);
|
|
58
58
|
var rectsProps = [];
|
|
@@ -96,6 +96,7 @@ function computeRectAnnotationDimensions(annotationSpec, yScales, xScale, axesSp
|
|
|
96
96
|
height: orthoDimension_1,
|
|
97
97
|
}));
|
|
98
98
|
rectsProps.push({
|
|
99
|
+
specId: annotationSpecId,
|
|
99
100
|
rect: rectDimensions_1,
|
|
100
101
|
datum: datum,
|
|
101
102
|
});
|
|
@@ -127,20 +128,22 @@ function computeRectAnnotationDimensions(annotationSpec, yScales, xScale, axesSp
|
|
|
127
128
|
}
|
|
128
129
|
: xAndWidth)), { y: scaledY1, height: height });
|
|
129
130
|
rectsProps.push({
|
|
131
|
+
specId: annotationSpecId,
|
|
130
132
|
rect: rectDimensions,
|
|
131
133
|
datum: datum,
|
|
132
134
|
});
|
|
133
135
|
});
|
|
134
|
-
return rectsProps.reduce(function (acc, props) {
|
|
136
|
+
return rectsProps.reduce(function (acc, props, i) {
|
|
135
137
|
var duplicated = [];
|
|
136
138
|
smallMultiplesScales.vertical.domain.forEach(function (vDomainValue) {
|
|
137
139
|
smallMultiplesScales.horizontal.domain.forEach(function (hDomainValue) {
|
|
140
|
+
var id = getAnnotationRectPropsId(annotationSpecId, props.datum, i, vDomainValue, hDomainValue);
|
|
138
141
|
var top = smallMultiplesScales.vertical.scale(vDomainValue);
|
|
139
142
|
var left = smallMultiplesScales.horizontal.scale(hDomainValue);
|
|
140
143
|
if (Number.isNaN(top + left))
|
|
141
144
|
return;
|
|
142
145
|
var panel = __assign(__assign({}, panelSize), { top: top, left: left });
|
|
143
|
-
duplicated.push(__assign(__assign({}, props), { panel: panel }));
|
|
146
|
+
duplicated.push(__assign(__assign({}, props), { panel: panel, id: id }));
|
|
144
147
|
});
|
|
145
148
|
});
|
|
146
149
|
return __spreadArray(__spreadArray([], __read(acc), false), __read(duplicated), false);
|
|
@@ -199,4 +202,8 @@ function getOutsideDimension(style) {
|
|
|
199
202
|
var _a = style.tickLine, visible = _a.visible, size = _a.size, strokeWidth = _a.strokeWidth;
|
|
200
203
|
return visible && size > 0 && strokeWidth > 0 ? size : 0;
|
|
201
204
|
}
|
|
205
|
+
function getAnnotationRectPropsId(specId, datum, index, verticalValue, horizontalValue) {
|
|
206
|
+
return __spreadArray(__spreadArray([specId, verticalValue, horizontalValue], __read(Object.values(datum.coordinates)), false), [datum.details, index], false).join('__');
|
|
207
|
+
}
|
|
208
|
+
exports.getAnnotationRectPropsId = getAnnotationRectPropsId;
|
|
202
209
|
//# sourceMappingURL=dimensions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dimensions.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/annotations/rect/dimensions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,kDAA0E;AAC1E,mDAAyE;AAMzE,mDAAoF;AACpF,+CAA8D;AAC9D,2CAAiD;AAMjD,SAAgB,kBAAkB,CAAC,EAAe,EAAE,EAAsC;QAArD,CAAC,OAAA,EAAE,CAAC,OAAA;QAAa,MAAM,YAAA,EAAE,IAAI,UAAA,EAAE,MAAM,YAAA,EAAE,IAAI,UAAA;IAC9E,IAAM,aAAa,GAAG,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC;IAC/C,IAAM,aAAa,GAAG,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC;IAE/C,OAAO,aAAa,IAAI,aAAa,CAAC;AACxC,CAAC;AALD,gDAKC;AAGD,SAAgB,+BAA+B,CAC7C,cAAkC,EAClC,OAAoC,EACpC,MAAqB,EACrB,SAAqB,EACrB,oBAAyC,EACzC,aAAuB,EACvB,YAAwC,EACxC,WAA4B;IAA5B,4BAAA,EAAA,mBAA4B;IAEpB,IAAA,UAAU,
|
|
1
|
+
{"version":3,"file":"dimensions.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/annotations/rect/dimensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,21 +4,20 @@ exports.getRectAnnotationTooltipState = void 0;
|
|
|
4
4
|
var common_1 = require("../../state/utils/common");
|
|
5
5
|
var specs_1 = require("../../utils/specs");
|
|
6
6
|
var dimensions_1 = require("./dimensions");
|
|
7
|
-
function getRectAnnotationTooltipState(cursorPosition, annotationRects, rotation, chartDimensions,
|
|
8
|
-
var
|
|
9
|
-
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
var
|
|
14
|
-
var
|
|
15
|
-
var startY = rect.y + chartDimensions.top + panel.top;
|
|
16
|
-
var endY = startY + rect.height;
|
|
7
|
+
function getRectAnnotationTooltipState(cursorPosition, annotationRects, rotation, chartDimensions, specId) {
|
|
8
|
+
for (var i = 0; i < annotationRects.length; i++) {
|
|
9
|
+
var _a = annotationRects[i], rect = _a.rect, panel = _a.panel, datum = _a.datum, id = _a.id;
|
|
10
|
+
var newRect = transformRotateRect(rect, rotation, panel);
|
|
11
|
+
var startX = newRect.x + chartDimensions.left + panel.left;
|
|
12
|
+
var endX = startX + newRect.width;
|
|
13
|
+
var startY = newRect.y + chartDimensions.top + panel.top;
|
|
14
|
+
var endY = startY + newRect.height;
|
|
17
15
|
var bounds = { startX: startX, endX: endX, startY: startY, endY: endY };
|
|
18
16
|
var isWithinBounds = (0, dimensions_1.isWithinRectBounds)(cursorPosition, bounds);
|
|
19
17
|
if (isWithinBounds) {
|
|
20
18
|
return {
|
|
21
19
|
id: id,
|
|
20
|
+
specId: specId,
|
|
22
21
|
isVisible: true,
|
|
23
22
|
annotationType: specs_1.AnnotationType.Rectangle,
|
|
24
23
|
anchor: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tooltip.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/annotations/rect/tooltip.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tooltip.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/annotations/rect/tooltip.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/annotations/types.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAa,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/annotations/types.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAa,MAAM,OAAO,CAAC;AAMjD,OAAO,EAAkB,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAI1F,cAAc;AACd,oBAAY,0BAA0B,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;AAElF,cAAc;AACd,oBAAY,uBAAuB,GAAG,aAAa,CAAC;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,mBAAmB,GAAG,mBAAmB,CAAC;CAClD,CAAC,GAAG,IAAI,CAAC;AAWV;;;;GAIG;AACH,oBAAY,4BAA4B,CAAC,CAAC,GAAG,GAAG,IAAI,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { $Keys } from 'utility-types';
|
|
2
|
+
import { TimeMs } from '../../../../../common/geometry';
|
|
3
|
+
import { TimeFunction } from './../../../../../utils/time_functions';
|
|
4
|
+
/**
|
|
5
|
+
* TODO add logic for other types like colors
|
|
6
|
+
* @public
|
|
7
|
+
*/
|
|
8
|
+
export declare type AnimatedValue = number;
|
|
9
|
+
/**
|
|
10
|
+
* Shared animation speeds in ms
|
|
11
|
+
* @public
|
|
12
|
+
*/
|
|
13
|
+
export declare const AnimationSpeed: Readonly<{
|
|
14
|
+
extraFast: number;
|
|
15
|
+
fast: number;
|
|
16
|
+
normal: number;
|
|
17
|
+
slow: number;
|
|
18
|
+
extraSlow: number;
|
|
19
|
+
}>;
|
|
20
|
+
/** @public */
|
|
21
|
+
export declare type AnimationSpeed = $Keys<typeof AnimationSpeed>;
|
|
22
|
+
/** @public */
|
|
23
|
+
export interface AnimationOptions {
|
|
24
|
+
/**
|
|
25
|
+
* Enables animations on annotations
|
|
26
|
+
*/
|
|
27
|
+
enabled?: boolean;
|
|
28
|
+
/**
|
|
29
|
+
* Set initial value for initial render animations.
|
|
30
|
+
* By default, the initial value is determined on the initial render
|
|
31
|
+
* then animates any change thereafter.
|
|
32
|
+
*
|
|
33
|
+
* @example
|
|
34
|
+
* ```ts
|
|
35
|
+
* // Initially animates the height from 0 to 100 with no value change
|
|
36
|
+
* atx.getValue('bar-height', 100, { initialValue: 0 })
|
|
37
|
+
* ```
|
|
38
|
+
*/
|
|
39
|
+
initialValue?: AnimatedValue;
|
|
40
|
+
/**
|
|
41
|
+
* start delay in ms
|
|
42
|
+
*/
|
|
43
|
+
delay?: TimeMs | AnimationSpeed;
|
|
44
|
+
/**
|
|
45
|
+
* Snaps back to initial value instantly
|
|
46
|
+
*/
|
|
47
|
+
snapValues?: AnimatedValue[];
|
|
48
|
+
/**
|
|
49
|
+
* The speed curve of the animation
|
|
50
|
+
*/
|
|
51
|
+
timeFunction?: TimeFunction;
|
|
52
|
+
/**
|
|
53
|
+
* Duration from start of animation to completion in ms
|
|
54
|
+
*/
|
|
55
|
+
duration?: TimeMs | AnimationSpeed;
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=animation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"animation.d.ts","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/animations/animation.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAExD,OAAO,EAAE,YAAY,EAAmB,MAAM,uCAAuC,CAAC;AAEtF;;;GAGG;AACH,oBAAY,aAAa,GAAG,MAAM,CAAC;AAEnC;;;GAGG;AACH,eAAO,MAAM,cAAc;;;;;;EAMzB,CAAC;AAEH,cAAc;AACd,oBAAY,cAAc,GAAG,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAkH1D,cAAc;AACd,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAChC;;OAEG;IACH,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAC7B;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;CACpC"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Animation = exports.AnimationSpeed = void 0;
|
|
4
|
+
var common_1 = require("../../../../../utils/common");
|
|
5
|
+
var time_functions_1 = require("./../../../../../utils/time_functions");
|
|
6
|
+
exports.AnimationSpeed = Object.freeze({
|
|
7
|
+
extraFast: 90,
|
|
8
|
+
fast: 150,
|
|
9
|
+
normal: 250,
|
|
10
|
+
slow: 350,
|
|
11
|
+
extraSlow: 500,
|
|
12
|
+
});
|
|
13
|
+
var Animation = (function () {
|
|
14
|
+
function Animation(value, options) {
|
|
15
|
+
if (options === void 0) { options = {}; }
|
|
16
|
+
var _a, _b, _c, _d, _e, _f;
|
|
17
|
+
this.timingFn = time_functions_1.TimingFunctions.linear;
|
|
18
|
+
this.initial = (_a = options === null || options === void 0 ? void 0 : options.initialValue) !== null && _a !== void 0 ? _a : value;
|
|
19
|
+
this.current = (_b = options === null || options === void 0 ? void 0 : options.initialValue) !== null && _b !== void 0 ? _b : value;
|
|
20
|
+
this.target = value;
|
|
21
|
+
this.previousTarget = value;
|
|
22
|
+
this.timeOffset = 0;
|
|
23
|
+
this.delay = (_c = (typeof (options === null || options === void 0 ? void 0 : options.delay) === 'string' ? exports.AnimationSpeed[options.delay] : options === null || options === void 0 ? void 0 : options.delay)) !== null && _c !== void 0 ? _c : 0;
|
|
24
|
+
this.duration =
|
|
25
|
+
typeof (options === null || options === void 0 ? void 0 : options.duration) === 'string'
|
|
26
|
+
? exports.AnimationSpeed[options.duration]
|
|
27
|
+
: (_d = options === null || options === void 0 ? void 0 : options.duration) !== null && _d !== void 0 ? _d : exports.AnimationSpeed.slow;
|
|
28
|
+
this.timeFunction = (_e = options === null || options === void 0 ? void 0 : options.timeFunction) !== null && _e !== void 0 ? _e : time_functions_1.TimeFunction.linear;
|
|
29
|
+
this.snapValues = (_f = options === null || options === void 0 ? void 0 : options.snapValues) !== null && _f !== void 0 ? _f : [];
|
|
30
|
+
this.setTimingFn();
|
|
31
|
+
}
|
|
32
|
+
Animation.prototype.isDelayed = function (t) {
|
|
33
|
+
if (this.timeOffset !== 0)
|
|
34
|
+
return false;
|
|
35
|
+
return t < this.delay;
|
|
36
|
+
};
|
|
37
|
+
Animation.prototype.isActive = function (t) {
|
|
38
|
+
if (!(0, common_1.isFiniteNumber)(this.initial) || !(0, common_1.isFiniteNumber)(this.target) || this.initial === this.target) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
return t - this.delay + this.timeOffset < this.duration;
|
|
42
|
+
};
|
|
43
|
+
Animation.prototype.setTarget = function (value) {
|
|
44
|
+
if (this.snapValues.includes(value)) {
|
|
45
|
+
this.current = value;
|
|
46
|
+
this.clear();
|
|
47
|
+
}
|
|
48
|
+
else if (this.target !== value) {
|
|
49
|
+
if (this.previousTarget) {
|
|
50
|
+
this.initial = this.previousTarget;
|
|
51
|
+
this.target = value;
|
|
52
|
+
this.setTimingFn();
|
|
53
|
+
this.timeOffset = this.invertTimingFn();
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
this.timeOffset = 0;
|
|
57
|
+
this.initial = this.current;
|
|
58
|
+
this.target = value;
|
|
59
|
+
this.setTimingFn();
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
Animation.prototype.invertTimingFn = function () {
|
|
64
|
+
var scaledValue = this.current - this.initial;
|
|
65
|
+
var scalar = this.target - this.initial;
|
|
66
|
+
var multiplier = scaledValue / scalar;
|
|
67
|
+
var timeDelta = (0, common_1.clamp)(time_functions_1.TimingFunctions[this.timeFunction].inverse(multiplier), 0, 1);
|
|
68
|
+
return timeDelta * this.duration + this.delay;
|
|
69
|
+
};
|
|
70
|
+
Animation.prototype.setTimingFn = function () {
|
|
71
|
+
var _this = this;
|
|
72
|
+
var scalar = this.target - this.initial;
|
|
73
|
+
this.timingFn =
|
|
74
|
+
scalar === 0
|
|
75
|
+
? function () { return _this.initial; }
|
|
76
|
+
: function (t) {
|
|
77
|
+
var multiplier = time_functions_1.TimingFunctions[_this.timeFunction](t);
|
|
78
|
+
return _this.initial + scalar * multiplier;
|
|
79
|
+
};
|
|
80
|
+
};
|
|
81
|
+
Animation.prototype.valueAtTime = function (t) {
|
|
82
|
+
if (this.isDelayed(t))
|
|
83
|
+
return this.initial;
|
|
84
|
+
var unitNormalizedTime = Math.max(0, Math.min(1, (t - this.delay + this.timeOffset) / this.duration));
|
|
85
|
+
var value = this.timingFn(unitNormalizedTime);
|
|
86
|
+
this.current = value;
|
|
87
|
+
return value;
|
|
88
|
+
};
|
|
89
|
+
Animation.prototype.clear = function () {
|
|
90
|
+
this.previousTarget = this.current === this.target ? null : this.target;
|
|
91
|
+
this.initial = this.current;
|
|
92
|
+
this.target = this.current;
|
|
93
|
+
this.setTimingFn();
|
|
94
|
+
};
|
|
95
|
+
return Animation;
|
|
96
|
+
}());
|
|
97
|
+
exports.Animation = Animation;
|
|
98
|
+
//# sourceMappingURL=animation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"animation.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/animations/animation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/animations/index.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
3
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
4
|
+
if (!m) return o;
|
|
5
|
+
var i = m.call(o), r, ar = [], e;
|
|
6
|
+
try {
|
|
7
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
8
|
+
}
|
|
9
|
+
catch (error) { e = { error: error }; }
|
|
10
|
+
finally {
|
|
11
|
+
try {
|
|
12
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
13
|
+
}
|
|
14
|
+
finally { if (e) throw e.error; }
|
|
15
|
+
}
|
|
16
|
+
return ar;
|
|
17
|
+
};
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
19
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
20
|
+
if (ar || !(i in from)) {
|
|
21
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
22
|
+
ar[i] = from[i];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
26
|
+
};
|
|
27
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
|
+
exports.getAnimationPoolFn = void 0;
|
|
29
|
+
var ts_debounce_1 = require("ts-debounce");
|
|
30
|
+
var logger_1 = require("./../../../../../utils/logger");
|
|
31
|
+
var animation_1 = require("./animation");
|
|
32
|
+
var DISABLE_ANIMATIONS = Boolean(process.env.VRT);
|
|
33
|
+
var getAnimationPoolFn = function (animationState, renderFn) {
|
|
34
|
+
window.cancelAnimationFrame(animationState.rafId);
|
|
35
|
+
animationState.pool.forEach(function (a) { return a.clear(); });
|
|
36
|
+
return (0, ts_debounce_1.debounce)(function getAnimationPoolFnDebounce() {
|
|
37
|
+
var propValuesForRun = new Map();
|
|
38
|
+
var getAnimatedValueFn = function (t) { return function (options) { return function (key, value) {
|
|
39
|
+
var _a;
|
|
40
|
+
if (t === 0 && propValuesForRun.has(key) && propValuesForRun.get(key) !== value) {
|
|
41
|
+
logger_1.Logger.error("aCtx.getValue(`" + key + "`, <value>) was called multiple times in a single render with different values. Please animate these values independently to avoid collisions.");
|
|
42
|
+
}
|
|
43
|
+
if (DISABLE_ANIMATIONS || !((_a = options === null || options === void 0 ? void 0 : options.enabled) !== null && _a !== void 0 ? _a : true))
|
|
44
|
+
return value;
|
|
45
|
+
propValuesForRun.set(key, value);
|
|
46
|
+
if (!animationState.pool.has(key)) {
|
|
47
|
+
animationState.pool.set(key, new animation_1.Animation(value, options));
|
|
48
|
+
}
|
|
49
|
+
var animation = animationState.pool.get(key);
|
|
50
|
+
if (!animation)
|
|
51
|
+
return value;
|
|
52
|
+
animation.setTarget(value);
|
|
53
|
+
return animation.valueAtTime(t);
|
|
54
|
+
}; }; };
|
|
55
|
+
function getAnimationContext(t) {
|
|
56
|
+
return {
|
|
57
|
+
getValue: getAnimatedValueFn(t),
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
renderFn(getAnimationContext(0));
|
|
61
|
+
animationState.rafId = window.requestAnimationFrame(function (epochStartTime) {
|
|
62
|
+
var anim = function (t) {
|
|
63
|
+
var elapsed = t - epochStartTime;
|
|
64
|
+
var animations = __spreadArray([], __read(animationState.pool.values()), false);
|
|
65
|
+
if (!animations.every(function (a) { return a.isDelayed(elapsed); })) {
|
|
66
|
+
renderFn(getAnimationContext(elapsed));
|
|
67
|
+
}
|
|
68
|
+
if (animations.some(function (a) { return a.isActive(elapsed); })) {
|
|
69
|
+
animationState.rafId = window.requestAnimationFrame(anim);
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
animationState.rafId = window.requestAnimationFrame(anim);
|
|
73
|
+
});
|
|
74
|
+
}, 300, { isImmediate: true })();
|
|
75
|
+
};
|
|
76
|
+
exports.getAnimationPoolFn = getAnimationPoolFn;
|
|
77
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/animations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,2CAAuC;AAEvC,wDAAuD;AACvD,yCAAyF;AAEzF,IAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAgB7C,IAAM,kBAAkB,GAAG,UAChC,cAA8B,EAC9B,QAAkD;IAGlD,MAAM,CAAC,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAClD,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,EAAE,EAAT,CAAS,CAAC,CAAC;IAE9C,OAAO,IAAA,sBAAQ,EACb,SAAS,0BAA0B;QACjC,IAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACnD,IAAM,kBAAkB,GAAG,UAAC,CAAS,IAAgB,OAAA,UAAC,OAAO,IAAK,OAAA,UAAC,GAAG,EAAE,KAAK;;YAC3E,IAAI,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;gBAC/E,eAAM,CAAC,KAAK,CACV,oBAAmB,GAAG,mJAC8B,CACrD,CAAC;aACH;YAED,IAAI,kBAAkB,IAAI,CAAC,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCAAI,IAAI,CAAC;gBAAE,OAAO,KAAK,CAAC;YAEpE,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACjC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACjC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,qBAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;aAC7D;YAED,IAAM,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,SAAS;gBAAE,OAAO,KAAK,CAAC;YAE7B,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAE3B,OAAO,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC,EArBiE,CAqBjE,EArBoD,CAqBpD,CAAC;QAEF,SAAS,mBAAmB,CAAC,CAAS;YAEpC,OAAO;gBACL,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC;aAChC,CAAC;QACJ,CAAC;QAED,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjC,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,qBAAqB,CAAC,UAAC,cAAc;YACjE,IAAM,IAAI,GAAG,UAAC,CAAS;gBACrB,IAAM,OAAO,GAAG,CAAC,GAAG,cAAc,CAAC;gBACnC,IAAM,UAAU,4BAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,SAAC,CAAC;gBAGrD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAApB,CAAoB,CAAC,EAAE;oBAClD,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;iBACxC;gBACD,IAAI,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAnB,CAAmB,CAAC,EAAE;oBAC/C,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;iBAC3D;YACH,CAAC,CAAC;YACF,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC,EACD,GAAG,EACH,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,EAAE,CAAC;AACN,CAAC,CAAC;AA9DW,QAAA,kBAAkB,sBA8D7B"}
|
|
@@ -4,10 +4,12 @@ exports.renderAnnotations = void 0;
|
|
|
4
4
|
var merge_utils_1 = require("../../../../../utils/themes/merge_utils");
|
|
5
5
|
var spec_1 = require("../../../state/utils/spec");
|
|
6
6
|
var specs_1 = require("../../../utils/specs");
|
|
7
|
+
var utils_1 = require("../../common/utils");
|
|
7
8
|
var lines_1 = require("./lines");
|
|
8
9
|
var rect_1 = require("./rect");
|
|
9
|
-
function renderAnnotations(ctx, annotationDimensions, annotationSpecs, rotation, renderingArea, renderOnBackground) {
|
|
10
|
+
function renderAnnotations(ctx, aCtx, annotationDimensions, annotationSpecs, rotation, renderingArea, sharedStyle, hoveredAnnotationIds, renderOnBackground) {
|
|
10
11
|
if (renderOnBackground === void 0) { renderOnBackground = true; }
|
|
12
|
+
var getHoverParams = (0, utils_1.getAnnotationHoverParamsFn)(hoveredAnnotationIds, sharedStyle);
|
|
11
13
|
annotationDimensions.forEach(function (annotation, id) {
|
|
12
14
|
var _a;
|
|
13
15
|
var spec = (0, spec_1.getSpecsById)(annotationSpecs, id);
|
|
@@ -15,11 +17,11 @@ function renderAnnotations(ctx, annotationDimensions, annotationSpecs, rotation,
|
|
|
15
17
|
if (spec && isBackground === renderOnBackground) {
|
|
16
18
|
if ((0, specs_1.isLineAnnotation)(spec)) {
|
|
17
19
|
var lineStyle = (0, merge_utils_1.mergeWithDefaultAnnotationLine)(spec.style);
|
|
18
|
-
(0, lines_1.renderLineAnnotations)(ctx, annotation, lineStyle, rotation, renderingArea);
|
|
20
|
+
(0, lines_1.renderLineAnnotations)(ctx, aCtx, annotation, lineStyle, getHoverParams, rotation, renderingArea);
|
|
19
21
|
}
|
|
20
22
|
else if ((0, specs_1.isRectAnnotation)(spec)) {
|
|
21
23
|
var rectStyle = (0, merge_utils_1.mergeWithDefaultAnnotationRect)(spec.style);
|
|
22
|
-
(0, rect_1.renderRectAnnotations)(ctx, annotation, rectStyle, rotation, renderingArea);
|
|
24
|
+
(0, rect_1.renderRectAnnotations)(ctx, aCtx, annotation, rectStyle, getHoverParams, rotation, renderingArea);
|
|
23
25
|
}
|
|
24
26
|
}
|
|
25
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/annotations/index.ts"],"names":[],"mappings":";;;AAWA,uEAGiD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/annotations/index.ts"],"names":[],"mappings":";;;AAWA,uEAGiD;AAKjD,kDAAyD;AACzD,8CAA0F;AAC1F,4CAAgE;AAEhE,iCAAgD;AAChD,+BAA+C;AAG/C,SAAgB,iBAAiB,CAC/B,GAA6B,EAC7B,IAAsB,EACtB,oBAA6D,EAC7D,eAAiC,EACjC,QAAkB,EAClB,aAAyB,EACzB,WAAqC,EACrC,oBAA8B,EAC9B,kBAAkC;IAAlC,mCAAA,EAAA,yBAAkC;IAElC,IAAM,cAAc,GAAG,IAAA,kCAA0B,EAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IACrF,oBAAoB,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,EAAE;;QAC1C,IAAM,IAAI,GAAG,IAAA,mBAAY,EAAiB,eAAe,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAM,YAAY,GAAG,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QAE9C,IAAI,IAAI,IAAI,YAAY,KAAK,kBAAkB,EAAE;YAC/C,IAAI,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE;gBAC1B,IAAM,SAAS,GAAG,IAAA,4CAA8B,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC7D,IAAA,6BAAqB,EACnB,GAAG,EACH,IAAI,EACJ,UAAmC,EACnC,SAAS,EACT,cAAc,EACd,QAAQ,EACR,aAAa,CACd,CAAC;aACH;iBAAM,IAAI,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE;gBACjC,IAAM,SAAS,GAAG,IAAA,4CAA8B,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC7D,IAAA,4BAAqB,EACnB,GAAG,EACH,IAAI,EACJ,UAAmC,EACnC,SAAS,EACT,cAAc,EACd,QAAQ,EACR,aAAa,CACd,CAAC;aACH;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA1CD,8CA0CC"}
|
|
@@ -4,16 +4,24 @@ exports.renderLineAnnotations = void 0;
|
|
|
4
4
|
var color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
5
5
|
var line_1 = require("../primitives/line");
|
|
6
6
|
var panel_transform_1 = require("../utils/panel_transform");
|
|
7
|
-
function renderLineAnnotations(ctx, annotations, lineStyle, rotation, renderingArea) {
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
function renderLineAnnotations(ctx, aCtx, annotations, lineStyle, getHoverParams, rotation, renderingArea) {
|
|
8
|
+
var getAnimatedValue = aCtx.getValue(lineStyle.animations);
|
|
9
|
+
var getStroke = function (id) {
|
|
10
|
+
var style = getHoverParams(id).style;
|
|
11
|
+
var opacityKey = "anno-rect-opacity--" + id;
|
|
12
|
+
var hoverOpacity = getAnimatedValue(opacityKey, style.opacity);
|
|
13
|
+
var strokeColor = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(lineStyle.line.stroke), function (opacity) { return opacity * lineStyle.line.opacity * hoverOpacity; });
|
|
14
|
+
return {
|
|
15
|
+
color: strokeColor,
|
|
16
|
+
width: lineStyle.line.strokeWidth,
|
|
17
|
+
dash: lineStyle.line.dash,
|
|
18
|
+
};
|
|
13
19
|
};
|
|
14
20
|
annotations.forEach(function (_a) {
|
|
15
|
-
var linePathPoints = _a.linePathPoints, panel = _a.panel;
|
|
16
|
-
return (0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () {
|
|
21
|
+
var linePathPoints = _a.linePathPoints, panel = _a.panel, id = _a.id;
|
|
22
|
+
return (0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () {
|
|
23
|
+
return (0, line_1.renderMultiLine)(ctx, [linePathPoints], getStroke(id));
|
|
24
|
+
});
|
|
17
25
|
});
|
|
18
26
|
}
|
|
19
27
|
exports.renderLineAnnotations = renderLineAnnotations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/annotations/lines.ts"],"names":[],"mappings":";;;AAQA,uFAA4F;
|
|
1
|
+
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/annotations/lines.ts"],"names":[],"mappings":";;;AAQA,uFAA4F;AAQ5F,2CAAqD;AACrD,4DAA8D;AAG9D,SAAgB,qBAAqB,CACnC,GAA6B,EAC7B,IAAsB,EACtB,WAAkC,EAClC,SAA8B,EAC9B,cAAqD,EACrD,QAAkB,EAClB,aAAyB;IAEzB,IAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAM,SAAS,GAAG,UAAC,EAAU;QACnB,IAAA,KAAK,GAAK,cAAc,CAAC,EAAE,CAAC,MAAvB,CAAwB;QAErC,IAAM,UAAU,GAAG,wBAAsB,EAAI,CAAC;QAC9C,IAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjE,IAAM,WAAW,GAAG,IAAA,wCAAe,EACjC,IAAA,oCAAW,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAClC,UAAC,OAAO,IAAK,OAAA,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,GAAG,YAAY,EAA/C,CAA+C,CAC7D,CAAC;QACF,OAAO;YACL,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW;YACjC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;SAC1B,CAAC;IACJ,CAAC,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,UAAC,EAA6B;YAA3B,cAAc,oBAAA,EAAE,KAAK,WAAA,EAAE,EAAE,QAAA;QAC9C,OAAA,IAAA,oCAAkB,EAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE;YACtD,OAAA,IAAA,sBAAe,EAAC,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAArD,CAAqD,CACtD;IAFD,CAEC,CACF,CAAC;AACJ,CAAC;AAhCD,sDAgCC"}
|
|
@@ -1,20 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
3
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
4
|
+
if (!m) return o;
|
|
5
|
+
var i = m.call(o), r, ar = [], e;
|
|
6
|
+
try {
|
|
7
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
8
|
+
}
|
|
9
|
+
catch (error) { e = { error: error }; }
|
|
10
|
+
finally {
|
|
11
|
+
try {
|
|
12
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
13
|
+
}
|
|
14
|
+
finally { if (e) throw e.error; }
|
|
15
|
+
}
|
|
16
|
+
return ar;
|
|
17
|
+
};
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
19
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
20
|
+
if (ar || !(i in from)) {
|
|
21
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
22
|
+
ar[i] = from[i];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
26
|
+
};
|
|
2
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
28
|
exports.renderRectAnnotations = void 0;
|
|
4
29
|
var color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
5
30
|
var rect_1 = require("../primitives/rect");
|
|
6
31
|
var panel_transform_1 = require("../utils/panel_transform");
|
|
7
|
-
function renderRectAnnotations(ctx, annotations, rectStyle, rotation, renderingArea) {
|
|
8
|
-
var
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
32
|
+
function renderRectAnnotations(ctx, aCtx, annotations, rectStyle, getHoverParams, rotation, renderingArea) {
|
|
33
|
+
var getAnimatedValue = aCtx.getValue(rectStyle.animations);
|
|
34
|
+
var getFillAndStroke = function (id) {
|
|
35
|
+
var style = getHoverParams(id).style;
|
|
36
|
+
var opacityKey = "anno-rect-opacity--" + id;
|
|
37
|
+
var hoverOpacity = getAnimatedValue(opacityKey, style.opacity);
|
|
38
|
+
var fill = {
|
|
39
|
+
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(rectStyle.fill), function (opacity) { return opacity * rectStyle.opacity * hoverOpacity; }),
|
|
40
|
+
};
|
|
41
|
+
var stroke = {
|
|
42
|
+
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(rectStyle.stroke), function (opacity) { return opacity * rectStyle.opacity * hoverOpacity; }),
|
|
43
|
+
width: rectStyle.strokeWidth,
|
|
44
|
+
};
|
|
45
|
+
return [fill, stroke];
|
|
14
46
|
};
|
|
15
47
|
annotations.forEach(function (_a) {
|
|
16
|
-
var rect = _a.rect, panel = _a.panel;
|
|
17
|
-
return (0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () { return (0,
|
|
48
|
+
var rect = _a.rect, panel = _a.panel, id = _a.id;
|
|
49
|
+
return (0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () { return rect_1.renderRect.apply(void 0, __spreadArray([ctx, rect], __read(getFillAndStroke(id)), false)); });
|
|
18
50
|
});
|
|
19
51
|
}
|
|
20
52
|
exports.renderRectAnnotations = renderRectAnnotations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rect.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/annotations/rect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rect.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/annotations/rect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,uFAA4F;AAQ5F,2CAAgD;AAChD,4DAA8D;AAG9D,SAAgB,qBAAqB,CACnC,GAA6B,EAC7B,IAAsB,EACtB,WAAkC,EAClC,SAA8B,EAC9B,cAAqD,EACrD,QAAkB,EAClB,aAAyB;IAEzB,IAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAM,gBAAgB,GAAG,UAAC,EAAU;QAC1B,IAAA,KAAK,GAAK,cAAc,CAAC,EAAE,CAAC,MAAvB,CAAwB;QAErC,IAAM,UAAU,GAAG,wBAAsB,EAAI,CAAC;QAC9C,IAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjE,IAAM,IAAI,GAAS;YACjB,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,UAAC,OAAO,IAAK,OAAA,OAAO,GAAG,SAAS,CAAC,OAAO,GAAG,YAAY,EAA1C,CAA0C,CAAC;SAC7G,CAAC;QACF,IAAM,MAAM,GAAW;YACrB,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,SAAS,CAAC,MAAM,CAAC,EAAE,UAAC,OAAO,IAAK,OAAA,OAAO,GAAG,SAAS,CAAC,OAAO,GAAG,YAAY,EAA1C,CAA0C,CAAC;YAC9G,KAAK,EAAE,SAAS,CAAC,WAAW;SAC7B,CAAC;QAEF,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,UAAC,EAAmB;YAAjB,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,EAAE,QAAA;QACpC,OAAA,IAAA,oCAAkB,EAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAM,OAAA,iBAAU,8BAAC,GAAG,EAAE,IAAI,UAAK,gBAAgB,CAAC,EAAE,CAAC,YAA7C,CAA8C,CAAC;IAA7G,CAA6G,CAC9G,CAAC;AACJ,CAAC;AA9BD,sDA8BC"}
|