@elastic/charts 39.0.1 → 40.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 +41 -0
- package/dist/chart_types/heatmap/state/selectors/get_debug_state.js +9 -12
- package/dist/chart_types/heatmap/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_table.js +2 -4
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_table.js.map +1 -1
- package/dist/chart_types/xy_chart/axes/timeslip/multilayer_ticks.d.ts +2 -0
- package/dist/chart_types/xy_chart/axes/timeslip/multilayer_ticks.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/axes/timeslip/multilayer_ticks.js +91 -0
- package/dist/chart_types/xy_chart/axes/timeslip/multilayer_ticks.js.map +1 -0
- package/dist/chart_types/xy_chart/renderer/canvas/axes/tick_label.js +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/axes/tick_label.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/utils/has_mostly_rtl.js +6 -4
- package/dist/chart_types/xy_chart/renderer/canvas/utils/has_mostly_rtl.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/points.js +2 -1
- package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/axis_tick_formatter.d.ts +2 -0
- package/dist/chart_types/xy_chart/state/selectors/axis_tick_formatter.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/state/selectors/axis_tick_formatter.js +64 -0
- package/dist/chart_types/xy_chart/state/selectors/axis_tick_formatter.js.map +1 -0
- package/dist/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.js +19 -12
- package/dist/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_cursor_pointer.js +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_cursor_pointer.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js +18 -1
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js +32 -100
- package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/axis_utils.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/group_data_series.d.ts +4 -1
- package/dist/chart_types/xy_chart/utils/group_data_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/utils/group_data_series.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/stacked_series_utils.js +6 -2
- package/dist/chart_types/xy_chart/utils/stacked_series_utils.js.map +1 -1
- package/dist/components/chart.d.ts +0 -1
- package/dist/components/chart.d.ts.map +1 -1
- package/dist/components/chart.js +0 -1
- package/dist/components/chart.js.map +1 -1
- package/dist/components/chart_status.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/state/types.d.ts +15 -2
- package/dist/state/types.d.ts.map +1 -1
- package/dist/utils/common.js +5 -1
- package/dist/utils/common.js.map +1 -1
- package/dist/utils/data/data_processing.d.ts +26 -0
- package/dist/utils/data/data_processing.d.ts.map +1 -0
- package/dist/utils/data/data_processing.js +33 -0
- package/dist/utils/data/data_processing.js.map +1 -0
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,44 @@
|
|
|
1
|
+
# [40.1.0](https://github.com/elastic/elastic-charts/compare/v40.0.0...v40.1.0) (2021-12-01)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** update dependency @elastic/eui to ^41.3.0 ([#1506](https://github.com/elastic/elastic-charts/issues/1506)) ([d364cc0](https://github.com/elastic/elastic-charts/commit/d364cc0fd0ecef83772ca1ca52ff04ed649badb6))
|
|
7
|
+
* remove pointer for onElementOver ([#1493](https://github.com/elastic/elastic-charts/issues/1493)) ([bf95dbc](https://github.com/elastic/elastic-charts/commit/bf95dbc6aae31d2c9994732b1c6ce6c29e58bd9a))
|
|
8
|
+
* **deps:** update dependency @elastic/eui to ^41.2.1 ([#1494](https://github.com/elastic/elastic-charts/issues/1494)) ([1c32f82](https://github.com/elastic/elastic-charts/commit/1c32f8264d9f03c304534a9b9688ee355d7fda39))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* expose computeRatioByGroups fn ([#1495](https://github.com/elastic/elastic-charts/issues/1495)) ([65f4886](https://github.com/elastic/elastic-charts/commit/65f4886ee3a1ef71eb34cfe8bd504ec4d76f82cb))
|
|
14
|
+
|
|
15
|
+
# [40.0.0](https://github.com/elastic/elastic-charts/compare/v39.0.2...v40.0.0) (2021-11-18)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* **interactions:** remove the option for pixelRatio with png snapshot ([#1431](https://github.com/elastic/elastic-charts/issues/1431)) ([eebb069](https://github.com/elastic/elastic-charts/commit/eebb0697a0b9ec5a860feb687f5b52721850714b))
|
|
21
|
+
* **xy:** occlude points outside of y domain ([#1475](https://github.com/elastic/elastic-charts/issues/1475)) ([3176f02](https://github.com/elastic/elastic-charts/commit/3176f02c2587522f5b057493b592dc3446315998))
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
### Features
|
|
25
|
+
|
|
26
|
+
* **annotations:** add annotations to DebugState ([#1434](https://github.com/elastic/elastic-charts/issues/1434)) ([c5ea600](https://github.com/elastic/elastic-charts/commit/c5ea60027299882cc1c05f9227e7e3204bb0ff71))
|
|
27
|
+
* **heatmap:** add valueShown in heatmap debug state ([#1460](https://github.com/elastic/elastic-charts/issues/1460)) ([962e089](https://github.com/elastic/elastic-charts/commit/962e089fe61540dcd5ed3612d41d915c29b98d13))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
### BREAKING CHANGES
|
|
31
|
+
|
|
32
|
+
* **interactions:** The getPNGSnapshot function no longer has an option for pixelRatio
|
|
33
|
+
|
|
34
|
+
## [39.0.2](https://github.com/elastic/elastic-charts/compare/v39.0.1...v39.0.2) (2021-11-17)
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
### Bug Fixes
|
|
38
|
+
|
|
39
|
+
* align axis tick formatter logic ([#1482](https://github.com/elastic/elastic-charts/issues/1482)) ([1bd30b9](https://github.com/elastic/elastic-charts/commit/1bd30b963d0136eb845381412737cb0e9dea4954)), closes [#1476](https://github.com/elastic/elastic-charts/issues/1476)
|
|
40
|
+
* **deps:** update dependency @elastic/eui to ^41.1.0 ([#1477](https://github.com/elastic/elastic-charts/issues/1477)) ([20306a1](https://github.com/elastic/elastic-charts/commit/20306a13bd1d7a3f021e8509a79099edccdb82fd))
|
|
41
|
+
|
|
1
42
|
## [39.0.1](https://github.com/elastic/elastic-charts/compare/v39.0.0...v39.0.1) (2021-11-15)
|
|
2
43
|
|
|
3
44
|
|
|
@@ -23,8 +23,7 @@ var common_1 = require("../../../../utils/common");
|
|
|
23
23
|
var compute_legend_1 = require("./compute_legend");
|
|
24
24
|
var geometries_1 = require("./geometries");
|
|
25
25
|
var get_highlighted_area_1 = require("./get_highlighted_area");
|
|
26
|
-
|
|
27
|
-
exports.getDebugStateSelector = (0, create_selector_1.createCustomCachedSelector)([geometries_1.geometries, compute_legend_1.computeLegendSelector, get_highlighted_area_1.getHighlightedAreaSelector, get_picked_cells_1.getPickedCells, get_highlighted_area_1.getHighlightedDataSelector], function (geoms, legend, pickedArea, pickedCells, highlightedData) {
|
|
26
|
+
exports.getDebugStateSelector = (0, create_selector_1.createCustomCachedSelector)([geometries_1.geometries, compute_legend_1.computeLegendSelector, get_highlighted_area_1.getHighlightedAreaSelector, get_highlighted_area_1.getHighlightedDataSelector], function (geoms, legend, pickedArea, highlightedData) {
|
|
28
27
|
return {
|
|
29
28
|
legend: getLegendState(legend),
|
|
30
29
|
axes: {
|
|
@@ -60,16 +59,14 @@ exports.getDebugStateSelector = (0, create_selector_1.createCustomCachedSelector
|
|
|
60
59
|
],
|
|
61
60
|
},
|
|
62
61
|
heatmap: {
|
|
63
|
-
cells: geoms.heatmapViewModel.cells.map(function (
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
});
|
|
72
|
-
}),
|
|
62
|
+
cells: geoms.heatmapViewModel.cells.map(function (cell) { return ({
|
|
63
|
+
x: cell.x,
|
|
64
|
+
y: cell.y,
|
|
65
|
+
fill: (0, color_library_wrappers_1.RGBATupleToString)(cell.fill.color),
|
|
66
|
+
formatted: cell.formatted,
|
|
67
|
+
value: cell.value,
|
|
68
|
+
valueShown: geoms.config.cell.label.visible && Number.isFinite(geoms.heatmapViewModel.cellFontSize(cell)),
|
|
69
|
+
}); }),
|
|
73
70
|
selection: {
|
|
74
71
|
area: pickedArea,
|
|
75
72
|
data: highlightedData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_debug_state.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/get_debug_state.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAQA,oFAA8E;AAE9E,qEAA+E;AAE/E,mDAAoD;AACpD,mDAAyD;AACzD,2CAA0C;AAC1C,+DAAgG;
|
|
1
|
+
{"version":3,"file":"get_debug_state.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/get_debug_state.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ var create_selector_1 = require("../../../../state/create_selector");
|
|
|
24
24
|
var get_settings_specs_1 = require("../../../../state/selectors/get_settings_specs");
|
|
25
25
|
var accessor_1 = require("../../../../utils/accessor");
|
|
26
26
|
var elasticsearch_1 = require("../../../../utils/chrono/elasticsearch");
|
|
27
|
+
var common_1 = require("../../../../utils/common");
|
|
27
28
|
var get_heatmap_config_1 = require("./get_heatmap_config");
|
|
28
29
|
var get_heatmap_spec_1 = require("./get_heatmap_spec");
|
|
29
30
|
exports.getHeatmapTableSelector = (0, create_selector_1.createCustomCachedSelector)([get_heatmap_spec_1.getHeatmapSpecSelector, get_settings_specs_1.getSettingsSpecSelector, get_heatmap_config_1.getHeatmapConfigSelector], function (_a, _b, _c) {
|
|
@@ -64,7 +65,7 @@ exports.getHeatmapTableSelector = (0, create_selector_1.createCustomCachedSelect
|
|
|
64
65
|
var _k = __read((0, d3_array_1.extent)([xDataMin, customMin, customMax, dataMaxExtended]), 2), min = _k[0], max = _k[1];
|
|
65
66
|
resultData.xNumericExtent = [min !== null && min !== void 0 ? min : NaN, max !== null && max !== void 0 ? max : NaN];
|
|
66
67
|
resultData.xValues =
|
|
67
|
-
isFiniteNumber(min) && isFiniteNumber(max) ? (0, elasticsearch_1.timeRange)(min, max, xScale.interval, timeZone) : [];
|
|
68
|
+
(0, common_1.isFiniteNumber)(min) && (0, common_1.isFiniteNumber)(max) ? (0, elasticsearch_1.timeRange)(min, max, xScale.interval, timeZone) : [];
|
|
68
69
|
}
|
|
69
70
|
else if (xScale.type === constants_1.ScaleType.Ordinal) {
|
|
70
71
|
resultData.xValues.sort((0, predicate_1.getPredicateFn)(xSortPredicate));
|
|
@@ -72,7 +73,4 @@ exports.getHeatmapTableSelector = (0, create_selector_1.createCustomCachedSelect
|
|
|
72
73
|
resultData.yValues.sort((0, predicate_1.getPredicateFn)(ySortPredicate));
|
|
73
74
|
return resultData;
|
|
74
75
|
});
|
|
75
|
-
function isFiniteNumber(value) {
|
|
76
|
-
return Number.isFinite(value);
|
|
77
|
-
}
|
|
78
76
|
//# sourceMappingURL=get_heatmap_table.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_heatmap_table.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/get_heatmap_table.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAQA,qCAAkC;AAElC,0DAA8D;AAC9D,0DAAyD;AACzD,qEAA+E;AAC/E,qFAAyF;AACzF,uDAA8D;AAC9D,wEAAsF;
|
|
1
|
+
{"version":3,"file":"get_heatmap_table.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/get_heatmap_table.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multilayer_ticks.d.ts","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/axes/timeslip/multilayer_ticks.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
+
if (!m) return o;
|
|
16
|
+
var i = m.call(o), r, ar = [], e;
|
|
17
|
+
try {
|
|
18
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
+
}
|
|
20
|
+
catch (error) { e = { error: error }; }
|
|
21
|
+
finally {
|
|
22
|
+
try {
|
|
23
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
+
}
|
|
25
|
+
finally { if (e) throw e.error; }
|
|
26
|
+
}
|
|
27
|
+
return ar;
|
|
28
|
+
};
|
|
29
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
30
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
31
|
+
if (ar || !(i in from)) {
|
|
32
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
33
|
+
ar[i] = from[i];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.multilayerAxisEntry = exports.notTooDense = void 0;
|
|
40
|
+
var rasters_1 = require("./rasters");
|
|
41
|
+
var MAX_TIME_TICK_COUNT = 50;
|
|
42
|
+
var WIDTH_FUDGE = 1.05;
|
|
43
|
+
var MAX_TIME_GRID_COUNT = 12;
|
|
44
|
+
var notTooDense = function (domainFrom, domainTo, binWidth, cartesianWidth, maxTickCount) {
|
|
45
|
+
if (maxTickCount === void 0) { maxTickCount = MAX_TIME_TICK_COUNT; }
|
|
46
|
+
return function (raster) {
|
|
47
|
+
var domainInSeconds = domainTo - domainFrom;
|
|
48
|
+
var pixelsPerSecond = cartesianWidth / domainInSeconds;
|
|
49
|
+
return (pixelsPerSecond > raster.minimumPixelsPerSecond &&
|
|
50
|
+
raster.approxWidthInMs * WIDTH_FUDGE >= binWidth &&
|
|
51
|
+
(domainInSeconds * 1000) / maxTickCount <= raster.approxWidthInMs);
|
|
52
|
+
};
|
|
53
|
+
};
|
|
54
|
+
exports.notTooDense = notTooDense;
|
|
55
|
+
function multilayerAxisEntry(xDomain, extendByOneBin, range, timeAxisLayerCount, scale, getMeasuredTicks) {
|
|
56
|
+
var rasterSelector = (0, rasters_1.rasters)({ minimumTickPixelDistance: 24, locale: 'en-US' }, xDomain.timeZone);
|
|
57
|
+
var domainValues = xDomain.domain;
|
|
58
|
+
var domainFromS = Number(domainValues[0]) / 1000;
|
|
59
|
+
var binWidth = xDomain.minInterval;
|
|
60
|
+
var domainExtension = extendByOneBin ? binWidth : 0;
|
|
61
|
+
var domainToS = ((Number(domainValues[domainValues.length - 1]) || NaN) + domainExtension) / 1000;
|
|
62
|
+
var layers = rasterSelector((0, exports.notTooDense)(domainFromS, domainToS, binWidth, Math.abs(range[1] - range[0])));
|
|
63
|
+
var layerIndex = -1;
|
|
64
|
+
var fillLayerTimeslip = function (layer, detailedLayer, timeTicks, labelFormat, showGrid) {
|
|
65
|
+
return {
|
|
66
|
+
entry: getMeasuredTicks(scale, timeTicks, layer, detailedLayer, labelFormat, showGrid),
|
|
67
|
+
fallbackAskedTickCount: NaN,
|
|
68
|
+
};
|
|
69
|
+
};
|
|
70
|
+
return layers.reduce(function (combinedEntry, l, detailedLayerIndex) {
|
|
71
|
+
if (l.labeled)
|
|
72
|
+
layerIndex++;
|
|
73
|
+
if (layerIndex >= timeAxisLayerCount)
|
|
74
|
+
return combinedEntry;
|
|
75
|
+
var binWidthS = binWidth / 1000;
|
|
76
|
+
var entry = fillLayerTimeslip(layerIndex, detailedLayerIndex, __spreadArray([], __read(l.binStarts(domainFromS - binWidthS, domainToS + binWidthS)), false).filter(function (b) { return b.nextTimePointSec > domainFromS && b.timePointSec <= domainToS; })
|
|
77
|
+
.map(function (b) { return 1000 * b.timePointSec; }), !l.labeled ? function () { return ''; } : layerIndex === timeAxisLayerCount - 1 ? l.detailedLabelFormat : l.minorTickLabelFormat, (0, exports.notTooDense)(domainFromS, domainToS, binWidth, Math.abs(range[1] - range[0]), MAX_TIME_GRID_COUNT)(l)).entry;
|
|
78
|
+
var minLabelGap = 4;
|
|
79
|
+
var lastTick = entry.ticks[entry.ticks.length - 1];
|
|
80
|
+
if (lastTick && lastTick.position + entry.labelBox.maxLabelBboxWidth > range[1]) {
|
|
81
|
+
lastTick.label = '';
|
|
82
|
+
}
|
|
83
|
+
return __assign(__assign(__assign({}, entry), combinedEntry), { ticks: (combinedEntry.ticks || []).concat(entry.ticks.filter(function (tick, i, a) {
|
|
84
|
+
return i > 0 ||
|
|
85
|
+
!a[1] ||
|
|
86
|
+
a[1].domainClampedPosition - tick.domainClampedPosition >= entry.labelBox.maxLabelBboxWidth + minLabelGap;
|
|
87
|
+
})) });
|
|
88
|
+
}, { ticks: [] });
|
|
89
|
+
}
|
|
90
|
+
exports.multilayerAxisEntry = multilayerAxisEntry;
|
|
91
|
+
//# sourceMappingURL=multilayer_ticks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multilayer_ticks.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/axes/timeslip/multilayer_ticks.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ function renderTickLabel(ctx, tick, showTicks, _a, layerGirth) {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
var tickOnTheSide = timeAxisLayerCount > 0 && Number.isFinite(tick.layer);
|
|
34
|
-
(0, text_1.renderText)(ctx, center, tick.
|
|
34
|
+
(0, text_1.renderText)(ctx, center, tick.label, {
|
|
35
35
|
fontFamily: labelStyle.fontFamily,
|
|
36
36
|
fontStyle: (_b = labelStyle.fontStyle) !== null && _b !== void 0 ? _b : 'normal',
|
|
37
37
|
fontVariant: 'normal',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tick_label.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/axes/tick_label.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AASA,sDAAuD;AACvD,wDAA2E;AAC3E,2CAAgD;AAChD,wCAA8D;AAE9D,IAAM,iBAAiB,GAAG,CAAC,CAAC;AAG5B,SAAgB,eAAe,CAC7B,GAA6B,EAC7B,IAAc,EACd,SAAkB,EAClB,EAA4F,EAC5F,UAAkB;;QADhB,gBAA0C,EAA9B,QAAQ,cAAA,EAAE,kBAAkB,wBAAA,EAAI,SAAS,eAAA,EAAE,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,SAAS,eAAA;IAG/E,IAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC;IACvC,IAAM,cAAc,GAAG,IAAA,iCAAoB,EACzC,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,QAAQ,EACR,UAAU,CAAC,QAAQ,EACnB,IAAI,EACJ,SAAS,EACT,SAAS,EACT,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,CACrB,CAAC;IAEF,IAAM,MAAM,GAAG,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;IAE9G,IAAI,KAAK,EAAE;QACD,IAAA,iBAAiB,GAA+E,SAAS,kBAAxF,EAAE,kBAAkB,GAA2D,SAAS,mBAApE,EAAqB,KAAK,GAAiC,SAAS,kBAA1C,EAAsB,MAAM,GAAK,SAAS,mBAAd,CAAe;QAElH,IAAA,oCAA4B,EAAC,GAAG,EAAE,MAAM,wBAAO,MAAM,KAAE,KAAK,OAAA,EAAE,MAAM,QAAA,KAAI,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEnH,IAAI,UAAU,CAAC,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE;YAClC,IAAA,oCAA4B,EAAC,GAAG,EAAE,MAAM,wBAAO,MAAM,KAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,kBAAkB,IAAG,CAAC;SAChH;KACF;IAED,IAAM,aAAa,GAAG,kBAAkB,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE5E,IAAA,iBAAU,EACR,GAAG,EACH,MAAM,EACN,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"tick_label.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/axes/tick_label.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AASA,sDAAuD;AACvD,wDAA2E;AAC3E,2CAAgD;AAChD,wCAA8D;AAE9D,IAAM,iBAAiB,GAAG,CAAC,CAAC;AAG5B,SAAgB,eAAe,CAC7B,GAA6B,EAC7B,IAAc,EACd,SAAkB,EAClB,EAA4F,EAC5F,UAAkB;;QADhB,gBAA0C,EAA9B,QAAQ,cAAA,EAAE,kBAAkB,wBAAA,EAAI,SAAS,eAAA,EAAE,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,SAAS,eAAA;IAG/E,IAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC;IACvC,IAAM,cAAc,GAAG,IAAA,iCAAoB,EACzC,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,QAAQ,EACR,UAAU,CAAC,QAAQ,EACnB,IAAI,EACJ,SAAS,EACT,SAAS,EACT,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,CACrB,CAAC;IAEF,IAAM,MAAM,GAAG,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;IAE9G,IAAI,KAAK,EAAE;QACD,IAAA,iBAAiB,GAA+E,SAAS,kBAAxF,EAAE,kBAAkB,GAA2D,SAAS,mBAApE,EAAqB,KAAK,GAAiC,SAAS,kBAA1C,EAAsB,MAAM,GAAK,SAAS,mBAAd,CAAe;QAElH,IAAA,oCAA4B,EAAC,GAAG,EAAE,MAAM,wBAAO,MAAM,KAAE,KAAK,OAAA,EAAE,MAAM,QAAA,KAAI,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEnH,IAAI,UAAU,CAAC,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE;YAClC,IAAA,oCAA4B,EAAC,GAAG,EAAE,MAAM,wBAAO,MAAM,KAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,kBAAkB,IAAG,CAAC;SAChH;KACF;IAED,IAAM,aAAa,GAAG,kBAAkB,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE5E,IAAA,iBAAU,EACR,GAAG,EACH,MAAM,EACN,IAAI,CAAC,KAAK,EACV;QACE,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,SAAS,EAAE,MAAA,UAAU,CAAC,SAAS,mCAAI,QAAQ;QAC3C,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE,QAAQ;QACpB,SAAS,EAAE,UAAU,CAAC,IAAI;QAC1B,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,KAAK,EAAE,cAAc,CAAC,eAAe;QACrC,QAAQ,EAAE,cAAc,CAAC,aAAa;KACvC,EACD,UAAU,CAAC,QAAQ,EACnB,cAAc,CAAC,WAAW,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,EACpE,cAAc,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC,QAAQ,KAAK,iBAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClG,CAAC,EACD,IAAI,CAAC,SAAS,CACf,CAAC;AACJ,CAAC;AAtDD,0CAsDC"}
|
|
@@ -7,10 +7,12 @@ function hasMostlyRTL(geoms) {
|
|
|
7
7
|
var axesGeoms = _a.axesGeoms;
|
|
8
8
|
return axesGeoms.flatMap(function (_a) {
|
|
9
9
|
var visibleTicks = _a.visibleTicks;
|
|
10
|
-
return visibleTicks
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
return visibleTicks
|
|
11
|
+
.filter(function (_a) {
|
|
12
|
+
var value = _a.value, label = _a.label;
|
|
13
|
+
return typeof value === 'string' && label !== '';
|
|
14
|
+
})
|
|
15
|
+
.map(function (_a) {
|
|
14
16
|
var label = _a.label;
|
|
15
17
|
return label;
|
|
16
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"has_mostly_rtl.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/utils/has_mostly_rtl.ts"],"names":[],"mappings":";;;AAQA,sDAAgE;AAIhE,SAAgB,YAAY,CAAC,KAA0B;IAErD,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,UAAC,EAAa;YAAX,SAAS,eAAA;QACvC,OAAO,SAAS,CAAC,OAAO,CAAC,UAAC,EAAgB;gBAAd,YAAY,kBAAA;YACtC,OAAO,YAAY,
|
|
1
|
+
{"version":3,"file":"has_mostly_rtl.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/utils/has_mostly_rtl.ts"],"names":[],"mappings":";;;AAQA,sDAAgE;AAIhE,SAAgB,YAAY,CAAC,KAA0B;IAErD,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,UAAC,EAAa;YAAX,SAAS,eAAA;QACvC,OAAO,SAAS,CAAC,OAAO,CAAC,UAAC,EAAgB;gBAAd,YAAY,kBAAA;YACtC,OAAO,YAAY;iBAChB,MAAM,CAAC,UAAC,EAAgB;oBAAd,KAAK,WAAA,EAAE,KAAK,WAAA;gBAAO,OAAA,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE;YAAzC,CAAyC,CAAC;iBACvE,GAAG,CAAC,UAAC,EAAS;oBAAP,KAAK,WAAA;gBAAO,OAAA,KAAK;YAAL,CAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,0BAAiB,EAAC,MAAM,CAAC,CAAC;AACnC,CAAC;AAXD,oCAWC"}
|
|
@@ -94,8 +94,9 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
|
|
|
94
94
|
panel: panel,
|
|
95
95
|
orphan: orphan,
|
|
96
96
|
};
|
|
97
|
+
var isInYDomain = yScale.isValueInDomain(valueAccessor(datum));
|
|
97
98
|
indexedGeometryMap.set(pointGeometry, geometryType);
|
|
98
|
-
if (y !== null && yDefined(datum, valueAccessor) && !(0, utils_1.isDatumFilled)(datum)) {
|
|
99
|
+
if (y !== null && yDefined(datum, valueAccessor) && isInYDomain && !(0, utils_1.isDatumFilled)(datum)) {
|
|
99
100
|
points.push(pointGeometry);
|
|
100
101
|
}
|
|
101
102
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,gDAA8C;AAE9C,oDAA4E;AAE5E,sEAAiF;AAEjF,wCAA+D;AAC/D,6CAAyD;AACzD,iCAQiB;AAGjB,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,UAAsB,EACtB,cAAuB,EACvB,eAAgC,EAChC,aAAkC,EAClC,OAAe;IAAf,wBAAA,EAAA,eAAe;IAKf,IAAM,kBAAkB,GAAG,IAAI,yCAAkB,EAAE,CAAC;IACpD,IAAM,SAAS,GAAG,eAAe,CAAC,OAAO;QACvC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC;QAC7E,CAAC,CAAC,cAAM,OAAA,CAAC,EAAD,CAAC,CAAC;IACZ,IAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,mCAAY,CAAC,OAAO,CAAC,CAAC,CAAC,mCAAY,CAAC,MAAM,CAAC;IAE1E,IAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,IAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,IAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnD,IAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,KAAK,EAAE,SAAS;QAC3D,IAAG,MAAM,GAAW,KAAK,EAAhB,EAAE,IAAI,GAAK,KAAK,KAAV,CAAW;QAClC,IAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;QAC5C,IAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC;YAAE,OAAO,GAAG,CAAC;QAGhD,IAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE/B,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,OAAO,GAAG,CAAC;QAEhC,IAAM,MAAM,GAAoB,EAAE,CAAC;QACnC,IAAM,cAAc,GAAyC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAEpG,cAAc,CAAC,OAAO,CAAC,UAAC,aAAa,EAAE,QAAQ;;YAC7C,IAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,aAAa,CAAC,CAAC;YACtD,IAAM,CAAC,GAAG,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7D,IAAM,SAAS,GAAG,cAAc,CAAC,KAAK,EAAE,QAAQ,KAAK,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;YAC9F,IAAM,gBAAgB,GAA4B;gBAChD,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;gBACzC,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;gBAC3D,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;aAChE,CAAC;YACF,IAAM,cAAc,GAAG,sBAAsB,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;YACtF,IAAM,KAAK,GAAG,IAAA,sCAAwB,EAAC,KAAK,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;YAC1E,IAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAE1F,IAAM,MAAM,GAAG,eAAe,CAAC,OAAO;gBACpC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;gBAC9C,CAAC,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,mCAAI,UAAU,CAAC,MAAM,CAAC;YAChD,IAAM,aAAa,GAAkB;gBACnC,CAAC,GAAA;gBACD,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvB,MAAM,QAAA;gBACN,KAAK,OAAA;gBACL,KAAK,OAAA;gBACL,KAAK,EAAE;oBACL,CAAC,EAAE,MAAM;oBACT,CAAC,EAAE,SAAS;oBACZ,IAAI,MAAA;oBACJ,QAAQ,EAAE,cAAc,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,6BAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,6BAAkB,CAAC,EAAE;oBAC1F,KAAK,EAAE,KAAK,CAAC,KAAK;iBACnB;gBACD,SAAS,EAAE;oBACT,CAAC,EAAE,KAAK;oBACR,CAAC,EAAE,CAAC;iBACL;gBACD,gBAAgB,kBAAA;gBAChB,KAAK,OAAA;gBACL,MAAM,QAAA;aACP,CAAC;YACF,IAAM,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YACjE,kBAAkB,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YAEpD,IAAI,CAAC,KAAK,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,WAAW,IAAI,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE;gBACxF,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;QACH,8CAAW,GAAG,kBAAK,MAAM,UAAE;IAC7B,CAAC,EAAE,EAAqB,CAAC,CAAC;IAC1B,OAAO;QACL,eAAe,iBAAA;QACf,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AA/FD,oCA+FC;AAGD,SAAgB,sBAAsB,CACpC,KAAsB,EACtB,gBAAyC,EACzC,kBAAuC;IAEvC,IAAM,aAAa,GAAG,kBAAkB,IAAI,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAExF,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO;KACR;IAED,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,OAAO;YACL,MAAM,EAAE,aAAa;SACtB,CAAC;KACH;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAlBD,wDAkBC;AAUD,SAAgB,cAAc,CAC5B,EAAiD,EACjD,YAAqB,EACrB,WAAoB,EACpB,SAAqB;QAHnB,EAAE,QAAA,EAAE,EAAE,QAAA,EAAE,SAAS,eAAA,EAAE,SAAS,eAAA;IAK9B,IAAI,WAAW,EAAE;QAKf,OAAO,SAAS,KAAK,iBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;KAC7G;IAID,OAAO,SAAS,KAAK,iBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,CAAC,IAAI,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,aAAF,EAAE,cAAF,EAAE,GAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAClH,CAAC;AAjBD,wCAiBC;AAYD,SAAgB,WAAW,CACzB,IAAuB,EACvB,SAAiB,EACjB,aAA0B;IAA1B,8BAAA,EAAA,kBAA0B;IAE1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,cAAM,OAAA,CAAC,EAAD,CAAC,CAAC;KAChB;IACK,IAAA,KAAe,IAAI,CAAC,MAAM,CAC9B,UAAC,GAAG,EAAE,EAAQ;YAAN,IAAI,UAAA;QACV,OAAA,IAAI,KAAK,IAAI;YACX,CAAC,CAAC,GAAG;YACL,CAAC,CAAC;gBACE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,CAAC;gBAChC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,CAAC;aACjC;IALL,CAKK,EACP,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAClC,EATO,GAAG,SAAA,EAAE,GAAG,SASf,CAAC;IACF,IAAM,qBAAqB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,IAAM,UAAU,GAAG,CAAC,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;IACjF,OAAO,SAAS,SAAS,CAAC,IAAI,EAAE,aAAiB;QAAjB,8BAAA,EAAA,iBAAiB;QAC/C,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,OAAO,aAAa,CAAC;SACtB;QACD,IAAM,YAAY,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,UAAU,CAAC;QACnD,IAAM,eAAe,GAAG,CAAC,CAAC;QAC1B,OAAO,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1F,CAAC,CAAC;AACJ,CAAC;AA5BD,kCA4BC;AAED,SAAS,uBAAuB,CAAC,KAAsB;;IACrD,OAAO,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,EAAE,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CACxB,KAAa,EACb,MAAc,EACd,QAAoB,EACpB,IAAsB,EACtB,IAAsB;IAEtB,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,EAAE;QAC5E,OAAO,IAAI,CAAC;KACb;IACD,IAAI,KAAK,KAAK,MAAM,GAAG,CAAC,IAAI,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,EAAE;QACrF,OAAO,IAAI,CAAC;KACb;IACD,OAAO,CACL,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;QACzD,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAC1D,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"axis_tick_formatter.d.ts","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/axis_tick_formatter.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,64 @@
|
|
|
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.getAxisTickLabelFormatter = void 0;
|
|
29
|
+
var create_selector_1 = require("../../../../state/create_selector");
|
|
30
|
+
var get_settings_specs_1 = require("../../../../state/selectors/get_settings_specs");
|
|
31
|
+
var axis_utils_1 = require("../../utils/axis_utils");
|
|
32
|
+
var group_data_series_1 = require("../../utils/group_data_series");
|
|
33
|
+
var get_api_scale_configs_1 = require("./get_api_scale_configs");
|
|
34
|
+
var get_specs_1 = require("./get_specs");
|
|
35
|
+
exports.getAxisTickLabelFormatter = (0, create_selector_1.createCustomCachedSelector)([get_specs_1.getSeriesSpecsSelector, get_specs_1.getAxisSpecsSelector, get_settings_specs_1.getSettingsSpecSelector, get_api_scale_configs_1.getScaleConfigsFromSpecsSelector], function (seriesSpecs, axesSpecs, _a, scaleConfigs) {
|
|
36
|
+
var rotation = _a.rotation;
|
|
37
|
+
var seriesByGroupId = (0, group_data_series_1.groupBy)(seriesSpecs, ['groupId'], false);
|
|
38
|
+
var axesByGroupId = (0, group_data_series_1.groupBy)(axesSpecs, ['groupId'], false);
|
|
39
|
+
var groupIds = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(Object.keys(seriesByGroupId)), false), __read(Object.keys(axesByGroupId)), false))), false);
|
|
40
|
+
var timeZone = scaleConfigs.x.timeZone;
|
|
41
|
+
return groupIds.reduce(function (acc, groupId) {
|
|
42
|
+
var _a, _b, _c;
|
|
43
|
+
var ySpecDataFormatter = (_b = ((_a = seriesByGroupId[groupId]) !== null && _a !== void 0 ? _a : []).find(function (_a) {
|
|
44
|
+
var tickFormat = _a.tickFormat;
|
|
45
|
+
return tickFormat;
|
|
46
|
+
})) === null || _b === void 0 ? void 0 : _b.tickFormat;
|
|
47
|
+
var axes = groupAxesByCartesianCoords((_c = axesByGroupId[groupId]) !== null && _c !== void 0 ? _c : [], rotation);
|
|
48
|
+
axes.x.forEach(function (spec) {
|
|
49
|
+
acc.x.set(spec.id, function (v) { var _a, _b; return ((_b = (_a = spec === null || spec === void 0 ? void 0 : spec.labelFormat) !== null && _a !== void 0 ? _a : spec === null || spec === void 0 ? void 0 : spec.tickFormat) !== null && _b !== void 0 ? _b : axis_utils_1.defaultTickFormatter)(v, { timeZone: timeZone }); });
|
|
50
|
+
});
|
|
51
|
+
axes.y.forEach(function (spec) {
|
|
52
|
+
acc.y.set(spec.id, function (v) { var _a, _b, _c; return ((_c = (_b = (_a = spec.labelFormat) !== null && _a !== void 0 ? _a : spec.tickFormat) !== null && _b !== void 0 ? _b : ySpecDataFormatter) !== null && _c !== void 0 ? _c : axis_utils_1.defaultTickFormatter)(v, {}); });
|
|
53
|
+
});
|
|
54
|
+
return acc;
|
|
55
|
+
}, { x: new Map(), y: new Map() });
|
|
56
|
+
});
|
|
57
|
+
function groupAxesByCartesianCoords(sameGroupAxes, chartRotation) {
|
|
58
|
+
if (chartRotation === void 0) { chartRotation = 0; }
|
|
59
|
+
return sameGroupAxes.reduce(function (acc, spec) {
|
|
60
|
+
acc[(0, axis_utils_1.isXDomain)(spec.position, chartRotation) ? 'x' : 'y'].push(spec);
|
|
61
|
+
return acc;
|
|
62
|
+
}, { x: [], y: [] });
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=axis_tick_formatter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"axis_tick_formatter.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/axis_tick_formatter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,qEAA+E;AAC/E,qFAAyF;AAGzF,qDAAyE;AACzE,mEAAwD;AAExD,iEAA2E;AAC3E,yCAA2E;AAS9D,QAAA,yBAAyB,GAAG,IAAA,4CAA0B,EACjE,CAAC,kCAAsB,EAAE,gCAAoB,EAAE,4CAAuB,EAAE,wDAAgC,CAAC,EACzG,UAAC,WAAW,EAAE,SAAS,EAAE,EAAY,EAAE,YAAY;QAAxB,QAAQ,cAAA;IACjC,IAAM,eAAe,GAAG,IAAA,2BAAO,EAAC,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IACjE,IAAM,aAAa,GAAG,IAAA,2BAAO,EAAC,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7D,IAAM,QAAQ,4BAAO,IAAI,GAAG,wCAAK,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAK,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAE,SAAC,CAAC;IACxF,IAAA,QAAQ,GAAK,YAAY,CAAC,CAAC,SAAnB,CAAoB;IAEpC,OAAO,QAAQ,CAAC,MAAM,CACpB,UAAC,GAAG,EAAE,OAAO;;QACX,IAAM,kBAAkB,GAAG,MAAA,CAAC,MAAA,eAAe,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC,CAAC,IAAI,CAAC,UAAC,EAAc;gBAAZ,UAAU,gBAAA;YAAO,OAAA,UAAU;QAAV,CAAU,CAAC,0CAAE,UAAU,CAAC;QAC7G,IAAM,IAAI,GAAG,0BAA0B,CAAC,MAAA,aAAa,CAAC,OAAO,CAAC,mCAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;QAChF,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAC,IAAI;YAClB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,UAAC,CAAC,gBAAK,OAAA,CAAC,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,mCAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,mCAAI,iCAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;QAC9G,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAC,IAAI;YAClB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,UAAC,CAAC,oBACnB,OAAA,CAAC,MAAA,MAAA,MAAA,IAAI,CAAC,WAAW,mCAAI,IAAI,CAAC,UAAU,mCAAI,kBAAkB,mCAAI,iCAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA,EAAA,CAC3F,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,CAC/B,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,0BAA0B,CAAC,aAAyB,EAAE,aAA2B;IAA3B,8BAAA,EAAA,iBAA2B;IACxF,OAAO,aAAa,CAAC,MAAM,CACzB,UAAC,GAAG,EAAE,IAAI;QACR,GAAG,CAAC,IAAA,sBAAS,EAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACjB,CAAC;AACJ,CAAC"}
|
|
@@ -44,6 +44,7 @@ var canvas_text_bbox_calculator_1 = require("../../../../utils/bbox/canvas_text_
|
|
|
44
44
|
var logger_1 = require("../../../../utils/logger");
|
|
45
45
|
var axis_type_utils_1 = require("../../utils/axis_type_utils");
|
|
46
46
|
var axis_utils_1 = require("../../utils/axis_utils");
|
|
47
|
+
var axis_tick_formatter_1 = require("./axis_tick_formatter");
|
|
47
48
|
var compute_series_domains_1 = require("./compute_series_domains");
|
|
48
49
|
var count_bars_in_cluster_1 = require("./count_bars_in_cluster");
|
|
49
50
|
var get_axis_styles_1 = require("./get_axis_styles");
|
|
@@ -74,26 +75,32 @@ var getUnitScales = (0, create_selector_1.createCustomCachedSelector)([getScaleF
|
|
|
74
75
|
var getThemedAxesStyles = (0, create_selector_1.createCustomCachedSelector)([get_chart_theme_1.getChartThemeSelector, get_axis_styles_1.getAxesStylesSelector], function (chartTheme, axesStyles) {
|
|
75
76
|
return __spreadArray([], __read(axesStyles.keys()), false).reduce(function (styles, id) { var _a; return styles.set(id, (_a = axesStyles.get(id)) !== null && _a !== void 0 ? _a : chartTheme.axes); }, new Map());
|
|
76
77
|
});
|
|
77
|
-
exports.getJoinedVisibleAxesData = (0, create_selector_1.createCustomCachedSelector)([getUnitScales, get_specs_1.getAxisSpecsSelector, getThemedAxesStyles,
|
|
78
|
-
var
|
|
78
|
+
exports.getJoinedVisibleAxesData = (0, create_selector_1.createCustomCachedSelector)([getUnitScales, get_specs_1.getAxisSpecsSelector, getThemedAxesStyles, get_settings_specs_1.getSettingsSpecSelector, axis_tick_formatter_1.getAxisTickLabelFormatter], function (unitScales, axesSpecs, themedAxesStyles, _a, axisTickLabelFormatters) {
|
|
79
|
+
var rotation = _a.rotation;
|
|
79
80
|
return axesSpecs.reduce(function (axisData, axisSpec) {
|
|
80
81
|
var _a;
|
|
81
|
-
var id = axisSpec.id,
|
|
82
|
+
var id = axisSpec.id, position = axisSpec.position, hide = axisSpec.hide;
|
|
82
83
|
var axesStyle = themedAxesStyles.get(id);
|
|
83
|
-
var scale = unitScales.get(
|
|
84
|
-
var format = (_a = labelFormat !== null && labelFormat !== void 0 ? labelFormat : tickFormat) !== null && _a !== void 0 ? _a : fallBackTickFormatter;
|
|
85
|
-
var formatOption = { timeZone: timeZone };
|
|
86
|
-
var tickFormatter = function (d) { return format(d, formatOption); };
|
|
84
|
+
var scale = unitScales.get(id);
|
|
87
85
|
if (scale && axesStyle) {
|
|
88
86
|
var gridLine = (0, axis_type_utils_1.isVerticalAxis)(position) ? axesStyle.gridLine.vertical : axesStyle.gridLine.horizontal;
|
|
89
|
-
var axisShown = gridLine.visible || !
|
|
87
|
+
var axisShown = gridLine.visible || !hide;
|
|
88
|
+
var isXAxis = (0, axis_utils_1.isXDomain)(position, rotation);
|
|
89
|
+
var labelFormatter = (_a = axisTickLabelFormatters[isXAxis ? 'x' : 'y'].get(id)) !== null && _a !== void 0 ? _a : axis_utils_1.defaultTickFormatter;
|
|
90
90
|
if (axisShown)
|
|
91
|
-
axisData.set(
|
|
91
|
+
axisData.set(id, {
|
|
92
|
+
axisSpec: axisSpec,
|
|
93
|
+
scale: scale,
|
|
94
|
+
axesStyle: axesStyle,
|
|
95
|
+
gridLine: gridLine,
|
|
96
|
+
labelFormatter: labelFormatter,
|
|
97
|
+
isXAxis: isXAxis,
|
|
98
|
+
});
|
|
92
99
|
}
|
|
93
100
|
return axisData;
|
|
94
101
|
}, new Map());
|
|
95
102
|
});
|
|
96
|
-
var getLabelBox = function (axesStyle, ticks,
|
|
103
|
+
var getLabelBox = function (axesStyle, ticks, labelFormatter, textMeasure, axisSpec, gridLine) { return (__assign(__assign({}, (axesStyle.tickLabel.visible ? ticks.map(labelFormatter) : []).reduce(function (sizes, labelText) {
|
|
97
104
|
var bbox = textMeasure(labelText, 0, axesStyle.tickLabel.fontSize, axesStyle.tickLabel.fontFamily);
|
|
98
105
|
var rotatedBbox = (0, axis_utils_1.computeRotatedLabelDimensions)(bbox, axesStyle.tickLabel.rotation);
|
|
99
106
|
sizes.maxLabelBboxWidth = Math.max(sizes.maxLabelBboxWidth, Math.ceil(rotatedBbox.width));
|
|
@@ -106,8 +113,8 @@ exports.getLabelBox = getLabelBox;
|
|
|
106
113
|
exports.computeAxisTicksDimensionsSelector = (0, create_selector_1.createCustomCachedSelector)([exports.getJoinedVisibleAxesData], function (joinedAxesData) {
|
|
107
114
|
return (0, canvas_text_bbox_calculator_1.withTextMeasure)(function (textMeasure) {
|
|
108
115
|
return __spreadArray([], __read(joinedAxesData), false).reduce(function (axesTicksDimensions, _a) {
|
|
109
|
-
var _b = __read(_a, 2), id = _b[0], _c = _b[1], axisSpec = _c.axisSpec, scale = _c.scale, axesStyle = _c.axesStyle, gridLine = _c.gridLine,
|
|
110
|
-
return axesTicksDimensions.set(id, (0, exports.getLabelBox)(axesStyle, scale.ticks(),
|
|
116
|
+
var _b = __read(_a, 2), id = _b[0], _c = _b[1], axisSpec = _c.axisSpec, scale = _c.scale, axesStyle = _c.axesStyle, gridLine = _c.gridLine, labelFormatter = _c.labelFormatter;
|
|
117
|
+
return axesTicksDimensions.set(id, (0, exports.getLabelBox)(axesStyle, scale.ticks(), labelFormatter, textMeasure, axisSpec, gridLine));
|
|
111
118
|
}, new Map());
|
|
112
119
|
});
|
|
113
120
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute_axis_ticks_dimensions.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,qEAA+E;AAC/E,+EAAoF;AACpF,qFAAyF;AACzF,kGAAkG;AAElG,mDAAkD;AAElD,+DAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"compute_axis_ticks_dimensions.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ exports.getPointerCursorSelector = (0, create_selector_1.createCustomCachedSelec
|
|
|
26
26
|
if (xPos < 0 || xPos >= chartDimensions.width || yPos < 0 || yPos >= chartDimensions.height) {
|
|
27
27
|
return constants_1.DEFAULT_CSS_CURSOR;
|
|
28
28
|
}
|
|
29
|
-
if (highlightedGeometries.length > 0 &&
|
|
29
|
+
if (highlightedGeometries.length > 0 && settingsSpec.onElementClick) {
|
|
30
30
|
return 'pointer';
|
|
31
31
|
}
|
|
32
32
|
if (highlightedGeometries.length === 0 && settingsSpec.onAnnotationClick && annotationTooltipState) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_cursor_pointer.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/get_cursor_pointer.ts"],"names":[],"mappings":";;;AAQA,0DAAkE;AAElE,qEAA+E;AAC/E,qFAAyF;AACzF,uEAA4E;AAC5E,+EAAmF;AACnF,6EAAyE;AACzE,+FAAqF;AACrF,2DAAgE;AAEhE,IAAM,iCAAiC,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAA3C,CAA2C,CAAC;AAGtG,QAAA,wBAAwB,GAAG,IAAA,4CAA0B,EAChE;IACE,kEAA2B;IAC3B,4CAAuB;IACvB,iCAAiC;IACjC,sDAAwB;IACxB,yDAA8B;IAC9B,6CAAwB;IACxB,gEAAiC;CAClC,EACD,UACE,qBAAqB,EACrB,YAAY,EACZ,sBAAsB,EACtB,eAAe,EACf,EAAmB,EACnB,gBAAgB,EAChB,sBAAsB;QAFpB,eAAe,qBAAA;IAIT,IAAA,CAAC,GAAQ,sBAAsB,EAA9B,EAAE,CAAC,GAAK,sBAAsB,EAA3B,CAA4B;IAExC,IAAM,IAAI,GAAG,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC;IACtC,IAAM,IAAI,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC;IAGrC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,eAAe,CAAC,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,eAAe,CAAC,MAAM,EAAE;QAC3F,OAAO,8BAAkB,CAAC;KAC3B;IACD,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"get_cursor_pointer.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/get_cursor_pointer.ts"],"names":[],"mappings":";;;AAQA,0DAAkE;AAElE,qEAA+E;AAC/E,qFAAyF;AACzF,uEAA4E;AAC5E,+EAAmF;AACnF,6EAAyE;AACzE,+FAAqF;AACrF,2DAAgE;AAEhE,IAAM,iCAAiC,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAA3C,CAA2C,CAAC;AAGtG,QAAA,wBAAwB,GAAG,IAAA,4CAA0B,EAChE;IACE,kEAA2B;IAC3B,4CAAuB;IACvB,iCAAiC;IACjC,sDAAwB;IACxB,yDAA8B;IAC9B,6CAAwB;IACxB,gEAAiC;CAClC,EACD,UACE,qBAAqB,EACrB,YAAY,EACZ,sBAAsB,EACtB,eAAe,EACf,EAAmB,EACnB,gBAAgB,EAChB,sBAAsB;QAFpB,eAAe,qBAAA;IAIT,IAAA,CAAC,GAAQ,sBAAsB,EAA9B,EAAE,CAAC,GAAK,sBAAsB,EAA3B,CAA4B;IAExC,IAAM,IAAI,GAAG,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC;IACtC,IAAM,IAAI,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC;IAGrC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,eAAe,CAAC,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,eAAe,CAAC,MAAM,EAAE;QAC3F,OAAO,8BAAkB,CAAC;KAC3B;IACD,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,cAAc,EAAE;QACnE,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,iBAAiB,IAAI,sBAAsB,EAAE;QAClG,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,eAAe,KAAK,IAAI,IAAI,YAAY,CAAC,iBAAiB,EAAE;QAC9D,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,8BAAkB,CAAC;AAC7D,CAAC,CACF,CAAC"}
|
|
@@ -38,9 +38,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.getDebugStateSelector = void 0;
|
|
40
40
|
var predicate_1 = require("../../../../common/predicate");
|
|
41
|
+
var specs_1 = require("../../../../specs");
|
|
41
42
|
var create_selector_1 = require("../../../../state/create_selector");
|
|
42
43
|
var get_settings_specs_1 = require("../../../../state/selectors/get_settings_specs");
|
|
43
44
|
var geometry_1 = require("../../../../utils/geometry");
|
|
45
|
+
var merge_utils_1 = require("../../../../utils/themes/merge_utils");
|
|
44
46
|
var axis_type_utils_1 = require("../../utils/axis_type_utils");
|
|
45
47
|
var common_1 = require("../utils/common");
|
|
46
48
|
var compute_axes_geometries_1 = require("./compute_axes_geometries");
|
|
@@ -55,7 +57,8 @@ exports.getDebugStateSelector = (0, create_selector_1.createCustomCachedSelector
|
|
|
55
57
|
get_grid_lines_1.getGridLinesSelector,
|
|
56
58
|
get_specs_1.getAxisSpecsSelector,
|
|
57
59
|
get_settings_specs_1.getSettingsSpecSelector,
|
|
58
|
-
|
|
60
|
+
get_specs_1.getAnnotationSpecsSelector,
|
|
61
|
+
], function (_a, legend, axes, gridLines, axesSpecs, _b, annotations) {
|
|
59
62
|
var geometries = _a.geometries;
|
|
60
63
|
var rotation = _b.rotation;
|
|
61
64
|
var seriesNameMap = getSeriesNameMap(legend);
|
|
@@ -65,6 +68,7 @@ exports.getDebugStateSelector = (0, create_selector_1.createCustomCachedSelector
|
|
|
65
68
|
areas: geometries.areas.map(getAreaState(seriesNameMap)),
|
|
66
69
|
lines: geometries.lines.map(getLineState(seriesNameMap)),
|
|
67
70
|
bars: getBarsState(seriesNameMap, geometries.bars),
|
|
71
|
+
annotations: getAnnotationsState(annotations),
|
|
68
72
|
};
|
|
69
73
|
});
|
|
70
74
|
function getAxes(axesGeoms, axesSpecs, gridLines, rotation) {
|
|
@@ -246,6 +250,19 @@ function getLegendState(legendItems) {
|
|
|
246
250
|
.flat();
|
|
247
251
|
return { items: items };
|
|
248
252
|
}
|
|
253
|
+
function getAnnotationsState(annotationSpecs) {
|
|
254
|
+
return annotationSpecs.flatMap(function (annotation) {
|
|
255
|
+
return annotation.dataValues.map(function (dataValue) { return ({
|
|
256
|
+
data: dataValue,
|
|
257
|
+
id: annotation.id,
|
|
258
|
+
style: annotation.annotationType === specs_1.AnnotationType.Line
|
|
259
|
+
? (0, merge_utils_1.mergeWithDefaultAnnotationLine)(annotation === null || annotation === void 0 ? void 0 : annotation.style)
|
|
260
|
+
: (0, merge_utils_1.mergeWithDefaultAnnotationRect)(annotation === null || annotation === void 0 ? void 0 : annotation.style),
|
|
261
|
+
type: annotation.annotationType,
|
|
262
|
+
domainType: annotation.annotationType === specs_1.AnnotationType.Line ? annotation.domainType : undefined,
|
|
263
|
+
}); });
|
|
264
|
+
});
|
|
265
|
+
}
|
|
249
266
|
function hasVisibleStyle(_a) {
|
|
250
267
|
var _b = _a.visible, visible = _b === void 0 ? true : _b, _c = _a.fill, fill = _c === void 0 ? '#fff' : _c, _d = _a.stroke, stroke = _d === void 0 ? '#fff' : _d, _e = _a.strokeWidth, strokeWidth = _e === void 0 ? 1 : _e, _f = _a.opacity, opacity = _f === void 0 ? 1 : _f;
|
|
251
268
|
return Boolean(visible && opacity > 0 && strokeWidth > 0 && fill && stroke);
|