@elastic/charts 71.1.1 → 71.1.2
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/dist/chart_types/bullet_graph/renderer/canvas/index.js +8 -6
- package/dist/chart_types/bullet_graph/renderer/canvas/index.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/points.js +9 -3
- package/dist/chart_types/xy_chart/renderer/canvas/points.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/dom/highlighter.js +28 -8
- package/dist/chart_types/xy_chart/renderer/dom/highlighter.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/bars.js +38 -29
- package/dist/chart_types/xy_chart/rendering/bars.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/points.js +5 -4
- package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/utils.js +14 -0
- package/dist/chart_types/xy_chart/rendering/utils.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_tooltip_values_highlighted_geoms.js +49 -14
- package/dist/chart_types/xy_chart/state/selectors/get_tooltip_values_highlighted_geoms.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.d.ts +0 -1
- 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/utils/bbox/canvas_text_bbox_calculator.js +7 -5
- package/dist/utils/bbox/canvas_text_bbox_calculator.js.map +1 -1
- package/dist/utils/geometry.js.map +1 -1
- package/dist/utils/themes/amsterdam_dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/amsterdam_dark_theme.js +12 -5
- package/dist/utils/themes/amsterdam_dark_theme.js.map +1 -1
- package/dist/utils/themes/amsterdam_light_theme.d.ts.map +1 -1
- package/dist/utils/themes/amsterdam_light_theme.js +12 -5
- package/dist/utils/themes/amsterdam_light_theme.js.map +1 -1
- package/dist/utils/themes/base_colors.js +4 -4
- package/dist/utils/themes/base_colors.js.map +1 -1
- package/dist/utils/themes/dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/dark_theme.js +23 -15
- package/dist/utils/themes/dark_theme.js.map +1 -1
- package/dist/utils/themes/legacy_dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/legacy_dark_theme.js +10 -3
- package/dist/utils/themes/legacy_dark_theme.js.map +1 -1
- package/dist/utils/themes/legacy_light_theme.d.ts.map +1 -1
- package/dist/utils/themes/legacy_light_theme.js +10 -3
- package/dist/utils/themes/legacy_light_theme.js.map +1 -1
- package/dist/utils/themes/light_theme.d.ts.map +1 -1
- package/dist/utils/themes/light_theme.js +23 -14
- package/dist/utils/themes/light_theme.js.map +1 -1
- package/dist/utils/themes/theme.d.ts +13 -0
- package/dist/utils/themes/theme.d.ts.map +1 -1
- package/dist/utils/themes/theme.js.map +1 -1
- package/package.json +1 -1
|
@@ -96,11 +96,12 @@ class Component extends react_1.default.Component {
|
|
|
96
96
|
domain: datum.domain,
|
|
97
97
|
niceDomain: datum.niceDomain,
|
|
98
98
|
valueLabels,
|
|
99
|
-
extra: datum.target
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
99
|
+
extra: datum.target
|
|
100
|
+
? {
|
|
101
|
+
value: datum.target.toString(),
|
|
102
|
+
label: `${valueLabels.target}:`,
|
|
103
|
+
}
|
|
104
|
+
: undefined,
|
|
104
105
|
};
|
|
105
106
|
const bulletToMetricStyle = (0, common_1.mergePartial)(metricStyle, {
|
|
106
107
|
barBackground: colorScale(datum.value).hex(),
|
|
@@ -114,7 +115,8 @@ class Component extends react_1.default.Component {
|
|
|
114
115
|
});
|
|
115
116
|
const panel = { width: size.width / stats.columns, height: size.height / stats.rows };
|
|
116
117
|
const textDimensions = (0, text_measurements_1.getMetricTextPartDimensions)(bulletDatum, panel, bulletToMetricStyle, locale);
|
|
117
|
-
const
|
|
118
|
+
const fittedValueFontSize = (0, text_measurements_1.getFitValueFontSize)(textDimensions.heightBasedSizes.valueFontSize, panel.width - textDimensions.progressBarWidth, textDimensions.visibility.availableHeightWithoutValue, textDimensions.textParts, bulletToMetricStyle.minValueFontSize, false, false);
|
|
119
|
+
const sizes = (0, text_measurements_1.getSnappedFontSizes)(fittedValueFontSize, panel.height, bulletToMetricStyle);
|
|
118
120
|
textDimensions.heightBasedSizes.valueFontSize = sizes.valueFontSize;
|
|
119
121
|
textDimensions.heightBasedSizes.valuePartFontSize = sizes.valuePartFontSize;
|
|
120
122
|
return (react_1.default.createElement(metric_1.Metric, { chartId: `${this.props.chartId}-${stats.rowIndex}-${stats.columnIndex}`, datum: bulletDatum, hasTitles: this.props.hasTitles, totalRows: stats.rows, totalColumns: stats.columns, columnIndex: stats.columnIndex, rowIndex: stats.rowIndex, style: bulletToMetricStyle, backgroundColor: backgroundColor, contrastOptions: contrastOptions, textDimensions: textDimensions }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/chart_types/bullet_graph/renderer/canvas/index.tsx"],"names":[],"mappings":";;;;;;AASA,kDAA0B;AAC1B,6CAAsC;AAEtC,iCAA2C;AAE3C,qCAAwC;AAExC,sFAAwE;AAExE,sDAAmD;AACnD,wEAA2E;AAC3E,2EAAuE;AAEvE,6CAAuD;AACvD,2DAAkE;AAGlE,mGAAsH;AACtH,iFAAoF;AACpF,uGAAsH;AACtH,6GAA+G;AAC/G,qFAAwF;AACxF,qDAAwD;AAExD,uEAA8D;AAE9D,sEAAmE;AAEnE,gEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/chart_types/bullet_graph/renderer/canvas/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function renderLines(ctx, lines, rotation, renderingArea, highlightedLegendItem)
|
|
|
19
19
|
highlightState: (0, geometry_1.getGeometryHighlightState)(value.seriesIdentifier.key, highlightedLegendItem),
|
|
20
20
|
};
|
|
21
21
|
})
|
|
22
|
-
.sort((
|
|
22
|
+
.sort((a, b) => (a.highlightState === b.highlightState ? 0 : a.highlightState === 'dimmed' ? -1 : 1))
|
|
23
23
|
.forEach(({ panel, line, highlightState }) => {
|
|
24
24
|
const clippings = (0, panel_clipping_1.getPanelClipping)(panel, rotation);
|
|
25
25
|
if (line.style.line.visible) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/lines.ts"],"names":[],"mappings":";;AA4BA,kCAoDC;AAiCD,sCAcC;AAvHD,qDAAoD;AACpD,qCAAwC;AACxC,4CAAoD;AACpD,wCAAgD;AAChD,6DAA6D;AAI7D,yDAA2D;AAG3D,yDAKoC;AAIpC,SAAgB,WAAW,CACzB,GAA6B,EAC7B,KAAoC,EACpC,QAAkB,EAClB,aAAyB,EACzB,qBAAkC;IAElC,IAAA,oBAAW,EAAC,GAAG,EAAE,GAAG,EAAE;QACpB,KAAK;aACF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;YACxB,OAAO;gBACL,KAAK;gBACL,IAAI,EAAE,KAAK;gBACX,cAAc,EAAE,IAAA,oCAAyB,EAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,EAAE,qBAAqB,CAAC;aAC7F,CAAC;QACJ,CAAC,CAAC;aAED,IAAI,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/lines.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,16 +6,18 @@ const panel_clipping_1 = require("./panel_clipping");
|
|
|
6
6
|
const shapes_1 = require("./primitives/shapes");
|
|
7
7
|
const panel_transform_1 = require("./utils/panel_transform");
|
|
8
8
|
const color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
9
|
+
const common_1 = require("../../../../utils/common");
|
|
9
10
|
const points_1 = require("../../rendering/points");
|
|
10
11
|
function renderPoints(ctx, points, highlightState, pointStyle, lineStrokeWidth, seriesMinPointDistance, pointsDistanceVisibilityThreshold, hasConnectingLine) {
|
|
11
|
-
const isHiddenOnAuto = pointStyle.visible === 'auto' && seriesMinPointDistance < pointsDistanceVisibilityThreshold;
|
|
12
|
+
const isHiddenOnAuto = pointStyle.visible === 'auto' && (seriesMinPointDistance < pointsDistanceVisibilityThreshold || points.length <= 1);
|
|
12
13
|
const hideDataPoints = pointStyle.visible === 'never' || isHiddenOnAuto;
|
|
13
14
|
const hideIsolatedDataPoints = hasConnectingLine && hideDataPoints;
|
|
14
15
|
const useIsolatedPointRadius = hideDataPoints && !hasConnectingLine;
|
|
15
16
|
const opacity = highlightState === 'dimmed' && 'opacity' in pointStyle.dimmed ? pointStyle.dimmed.opacity : pointStyle.opacity;
|
|
16
17
|
const dimmedFill = highlightState === 'dimmed' && 'fill' in pointStyle.dimmed ? (0, color_library_wrappers_1.colorToRgba)(pointStyle.dimmed.fill) : undefined;
|
|
17
18
|
const dimmedStroke = highlightState === 'dimmed' && 'stroke' in pointStyle.dimmed ? (0, color_library_wrappers_1.colorToRgba)(pointStyle.dimmed.stroke) : undefined;
|
|
18
|
-
|
|
19
|
+
const focusedStrokeWidth = highlightState === 'focused' && pointStyle.focused ? pointStyle.focused.strokeWidth : undefined;
|
|
20
|
+
points.forEach(({ x, y, radius, transform, style, isolated, color }) => {
|
|
19
21
|
if ((isolated && hideIsolatedDataPoints) || (!isolated && hideDataPoints)) {
|
|
20
22
|
return;
|
|
21
23
|
}
|
|
@@ -24,10 +26,14 @@ function renderPoints(ctx, points, highlightState, pointStyle, lineStrokeWidth,
|
|
|
24
26
|
y: y + transform.y,
|
|
25
27
|
radius: isolated && useIsolatedPointRadius ? (0, points_1.isolatedPointRadius)(lineStrokeWidth) : radius,
|
|
26
28
|
};
|
|
27
|
-
const
|
|
29
|
+
const fillColor = isolated && useIsolatedPointRadius && pointStyle?.stroke
|
|
30
|
+
? (0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(color, pointStyle.stroke))
|
|
31
|
+
: style.fill.color;
|
|
32
|
+
const fill = { color: (0, color_library_wrappers_1.overrideOpacity)(dimmedFill ?? fillColor, (fillOpacity) => fillOpacity * opacity) };
|
|
28
33
|
const stroke = {
|
|
29
34
|
...style.stroke,
|
|
30
35
|
color: (0, color_library_wrappers_1.overrideOpacity)(dimmedStroke ?? style.stroke.color, (fillOpacity) => fillOpacity * opacity),
|
|
36
|
+
width: isolated && useIsolatedPointRadius ? 0 : focusedStrokeWidth ?? style.stroke.width,
|
|
31
37
|
};
|
|
32
38
|
(0, shapes_1.renderShape)(ctx, style.shape, coordinates, fill, stroke);
|
|
33
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/points.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/points.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,10 @@ const geometry_1 = require("../../../../utils/geometry");
|
|
|
16
16
|
const light_theme_1 = require("../../../../utils/themes/light_theme");
|
|
17
17
|
const compute_chart_dimensions_1 = require("../../state/selectors/compute_chart_dimensions");
|
|
18
18
|
const compute_chart_transform_1 = require("../../state/selectors/compute_chart_transform");
|
|
19
|
+
const get_specs_1 = require("../../state/selectors/get_specs");
|
|
19
20
|
const get_tooltip_values_highlighted_geoms_1 = require("../../state/selectors/get_tooltip_values_highlighted_geoms");
|
|
20
21
|
const utils_1 = require("../../state/utils/utils");
|
|
22
|
+
const specs_1 = require("../../utils/specs");
|
|
21
23
|
const shapes_paths_1 = require("../shapes_paths");
|
|
22
24
|
function getTransformForPanel(panel, rotation, { left, top }) {
|
|
23
25
|
const { x, y } = (0, utils_1.computeChartTransform)(panel, rotation);
|
|
@@ -33,7 +35,7 @@ function renderPath(geom, radius) {
|
|
|
33
35
|
class HighlighterComponent extends react_1.default.Component {
|
|
34
36
|
static displayName = 'Highlighter';
|
|
35
37
|
render() {
|
|
36
|
-
const { chartDimensions, chartRotation, chartId, zIndex, isBrushing, style } = this.props;
|
|
38
|
+
const { chartDimensions, chartRotation, chartId, zIndex, isBrushing, style, highlightedPoints } = this.props;
|
|
37
39
|
if (isBrushing)
|
|
38
40
|
return null;
|
|
39
41
|
const clipWidth = [90, -90].includes(chartRotation) ? chartDimensions.height : chartDimensions.width;
|
|
@@ -51,20 +53,34 @@ class HighlighterComponent extends react_1.default.Component {
|
|
|
51
53
|
react_1.default.createElement("defs", null,
|
|
52
54
|
react_1.default.createElement("clipPath", { id: clipPathId },
|
|
53
55
|
react_1.default.createElement("rect", { x: "0", y: "0", width: clipWidth, height: clipHeight }))),
|
|
54
|
-
|
|
56
|
+
highlightedPoints.map((geom) => {
|
|
55
57
|
const { panel } = geom;
|
|
56
58
|
const x = geom.x + geom.transform.x;
|
|
57
59
|
const y = geom.y + geom.transform.y;
|
|
58
60
|
const geomTransform = getTransformForPanel(panel, chartRotation, chartDimensions);
|
|
61
|
+
const baseKey = `${geom.seriesIdentifier.key}-${geom.value.x}-${geom.value.y}-bucket`;
|
|
62
|
+
const bucketHighlightedFillColor = (0, common_1.getColorFromVariant)((0, color_library_wrappers_1.RGBATupleToString)(geom.style.stroke.color), style.point.fill);
|
|
63
|
+
const bucketHighlightedStrokeColor = (0, common_1.getColorFromVariant)((0, color_library_wrappers_1.RGBATupleToString)(geom.style.stroke.color), style.point.stroke);
|
|
64
|
+
const bucketHighlightedRadius = Math.max(geom.radius, style.point.radius || 0);
|
|
65
|
+
const { d: bucketHighlightedD, rotate: bucketHighlightedRotate } = renderPath(geom, bucketHighlightedRadius);
|
|
66
|
+
return (react_1.default.createElement("g", { key: baseKey, transform: geomTransform, clipPath: geom.value.mark !== null ? `url(#${clipPathId})` : undefined },
|
|
67
|
+
react_1.default.createElement("path", { d: bucketHighlightedD, transform: `translate(${x}, ${y}) rotate(${bucketHighlightedRotate || 0})`, fill: bucketHighlightedFillColor, stroke: bucketHighlightedStrokeColor, strokeWidth: style.point.strokeWidth, opacity: style.point.opacity })));
|
|
68
|
+
}),
|
|
69
|
+
highlightedGeometries.map((geom) => {
|
|
70
|
+
const { panel } = geom;
|
|
71
|
+
const x = geom.x + geom.transform.x;
|
|
72
|
+
const y = geom.y + geom.transform.y;
|
|
73
|
+
const geomTransform = getTransformForPanel(panel, chartRotation, chartDimensions);
|
|
74
|
+
const baseKey = `${geom.seriesIdentifier.key}-${geom.value.x}-${geom.value.y}-hovered`;
|
|
59
75
|
if ((0, geometry_1.isPointGeometry)(geom)) {
|
|
60
|
-
const fillColor = (0, common_1.getColorFromVariant)((0, color_library_wrappers_1.RGBATupleToString)(geom.style.fill.color), style.point.fill);
|
|
61
|
-
const strokeColor = (0, common_1.getColorFromVariant)((0, color_library_wrappers_1.RGBATupleToString)(geom.style.stroke.color), style.point.stroke);
|
|
62
|
-
const radius = Math.max(geom.radius, style.point.radius);
|
|
76
|
+
const fillColor = (0, common_1.getColorFromVariant)((0, color_library_wrappers_1.RGBATupleToString)(geom.seriesType === specs_1.SeriesType.Bubble ? geom.style.fill.color : geom.style.stroke.color), style.point.onHover.fill);
|
|
77
|
+
const strokeColor = (0, common_1.getColorFromVariant)((0, color_library_wrappers_1.RGBATupleToString)(geom.style.stroke.color), style.point.onHover.stroke);
|
|
78
|
+
const radius = Math.max(geom.radius, style.point.onHover.radius);
|
|
63
79
|
const { d, rotate } = renderPath(geom, radius);
|
|
64
|
-
return (react_1.default.createElement("g", { key:
|
|
65
|
-
react_1.default.createElement("path", { d: d, transform: `translate(${x}, ${y}) rotate(${rotate || 0})`, fill: fillColor, stroke: strokeColor, strokeWidth: style.point.strokeWidth, opacity: style.point.opacity })));
|
|
80
|
+
return (react_1.default.createElement("g", { key: baseKey, transform: geomTransform, clipPath: geom.value.mark !== null ? `url(#${clipPathId})` : undefined },
|
|
81
|
+
react_1.default.createElement("path", { d: d, transform: `translate(${x}, ${y}) rotate(${rotate || 0})`, fill: fillColor, stroke: strokeColor, strokeWidth: style.point.onHover.strokeWidth, opacity: style.point.onHover.opacity })));
|
|
66
82
|
}
|
|
67
|
-
return (react_1.default.createElement("rect", { key:
|
|
83
|
+
return (react_1.default.createElement("rect", { key: baseKey, x: x, y: geom.y, width: geom.width, height: geom.height, transform: geomTransform, className: "echHighlighterOverlay__fill", clipPath: `url(#${clipPathId})` }));
|
|
68
84
|
})));
|
|
69
85
|
}
|
|
70
86
|
}
|
|
@@ -77,6 +93,7 @@ const mapStateToProps = (state) => {
|
|
|
77
93
|
zIndex,
|
|
78
94
|
isBrushing: false,
|
|
79
95
|
highlightedGeometries: [],
|
|
96
|
+
highlightedPoints: [],
|
|
80
97
|
chartTransform: {
|
|
81
98
|
x: 0,
|
|
82
99
|
y: 0,
|
|
@@ -85,6 +102,7 @@ const mapStateToProps = (state) => {
|
|
|
85
102
|
chartDimensions: { top: 0, left: 0, width: 0, height: 0 },
|
|
86
103
|
chartRotation: 0,
|
|
87
104
|
style: light_theme_1.LIGHT_THEME.highlighter,
|
|
105
|
+
seriesSpecs: [],
|
|
88
106
|
};
|
|
89
107
|
}
|
|
90
108
|
return {
|
|
@@ -93,10 +111,12 @@ const mapStateToProps = (state) => {
|
|
|
93
111
|
zIndex,
|
|
94
112
|
isBrushing: (0, is_brushing_1.isBrushingSelector)(state),
|
|
95
113
|
highlightedGeometries: (0, get_tooltip_values_highlighted_geoms_1.getHighlightedGeomsSelector)(state),
|
|
114
|
+
highlightedPoints: (0, get_tooltip_values_highlighted_geoms_1.getHighlightedPointsSelector)(state),
|
|
96
115
|
chartTransform: (0, compute_chart_transform_1.computeChartTransformSelector)(state),
|
|
97
116
|
chartDimensions: (0, compute_chart_dimensions_1.computeChartDimensionsSelector)(state).chartDimensions,
|
|
98
117
|
chartRotation: (0, get_chart_rotation_1.getChartRotationSelector)(state),
|
|
99
118
|
style: (0, get_chart_theme_1.getChartThemeSelector)(state).highlighter,
|
|
119
|
+
seriesSpecs: (0, get_specs_1.getSeriesSpecsSelector)(state),
|
|
100
120
|
};
|
|
101
121
|
};
|
|
102
122
|
exports.Highlighter = (0, react_redux_1.connect)(mapStateToProps)(HighlighterComponent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"highlighter.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/dom/highlighter.tsx"],"names":[],"mappings":";;;;;;AAQA,kDAA0B;AAC1B,6CAAsC;AAEtC,sFAA8E;AAE9E,uFAA0F;AAC1F,iFAAoF;AACpF,uGAAsH;AACtH,yEAA6E;AAE7E,qDAA+D;AAG/D,yDAA4E;AAC5E,sEAAmE;AAEnE,6FAAgG;AAChG,2FAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"highlighter.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/dom/highlighter.tsx"],"names":[],"mappings":";;;;;;AAQA,kDAA0B;AAC1B,6CAAsC;AAEtC,sFAA8E;AAE9E,uFAA0F;AAC1F,iFAAoF;AACpF,uGAAsH;AACtH,yEAA6E;AAE7E,qDAA+D;AAG/D,yDAA4E;AAC5E,sEAAmE;AAEnE,6FAAgG;AAChG,2FAA8F;AAC9F,+DAAyE;AACzE,qHAGoE;AAEpE,mDAAgE;AAChE,6CAAqE;AACrE,kDAAkD;AAgBlD,SAAS,oBAAoB,CAAC,KAAiB,EAAE,QAAkB,EAAE,EAAE,IAAI,EAAE,GAAG,EAAoC;IAClH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAA,6BAAqB,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxD,OAAO,aAAa,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,GAAG,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,YAAY,QAAQ,GAAG,CAAC;AAC3F,CAAC;AAED,SAAS,UAAU,CAAC,IAAmB,EAAE,MAAc;IAErD,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,8BAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5D,OAAO;QACL,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;QAClB,MAAM;KACP,CAAC;AACJ,CAAC;AAED,MAAM,oBAAqB,SAAQ,eAAK,CAAC,SAA2B;IAClE,MAAM,CAAC,WAAW,GAAG,aAAa,CAAC;IAEnC,MAAM;QACJ,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7G,IAAI,UAAU;YAAE,OAAO,IAAI,CAAC;QAC5B,MAAM,SAAS,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC;QACrG,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC;QACtG,MAAM,UAAU,GAAG,2BAA2B,OAAO,EAAE,CAAC;QAExD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QACxC,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC7E,IAAI,CAAC,IAAA,wBAAa,EAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;YACtC,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC1D,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO,CACL,uCAAK,SAAS,EAAC,gBAAgB,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE;YAC/C;gBACE,4CAAU,EAAE,EAAE,UAAU;oBACtB,wCAAM,CAAC,EAAC,GAAG,EAAC,CAAC,EAAC,GAAG,EAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAI,CACjD,CACN;YAEN,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9B,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;gBACvB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACpC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACpC,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;gBAClF,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC;gBAEtF,MAAM,0BAA0B,GAAG,IAAA,4BAAmB,EACpD,IAAA,0CAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAC1C,KAAK,CAAC,KAAK,CAAC,IAAI,CACjB,CAAC;gBACF,MAAM,4BAA4B,GAAG,IAAA,4BAAmB,EACtD,IAAA,0CAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAC1C,KAAK,CAAC,KAAK,CAAC,MAAM,CACnB,CAAC;gBACF,MAAM,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;gBAC/E,MAAM,EAAE,CAAC,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;gBAE7G,OAAO,CACL,qCACE,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,aAAa,EACxB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,UAAU,GAAG,CAAC,CAAC,CAAC,SAAS;oBAEtE,wCACE,CAAC,EAAE,kBAAkB,EACrB,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,YAAY,uBAAuB,IAAI,CAAC,GAAG,EAC1E,IAAI,EAAE,0BAA0B,EAChC,MAAM,EAAE,4BAA4B,EACpC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,EACpC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,GAC5B,CACA,CACL,CAAC;YACJ,CAAC,CAAC;YAED,qBAAqB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;gBACvB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACpC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACpC,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;gBAClF,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC;gBAEvF,IAAI,IAAA,0BAAe,EAAC,IAAI,CAAC,EAAE,CAAC;oBAE1B,MAAM,SAAS,GAAG,IAAA,4BAAmB,EACnC,IAAA,0CAAiB,EACf,IAAI,CAAC,UAAU,KAAK,kBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CACxF,EACD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CACzB,CAAC;oBACF,MAAM,WAAW,GAAG,IAAA,4BAAmB,EACrC,IAAA,0CAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAC1C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAC3B,CAAC;oBACF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBACjE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAE/C,OAAO,CACL,qCACE,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,aAAa,EACxB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,UAAU,GAAG,CAAC,CAAC,CAAC,SAAS;wBAEtE,wCACE,CAAC,EAAE,CAAC,EACJ,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,YAAY,MAAM,IAAI,CAAC,GAAG,EACzD,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAC5C,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,GACpC,CACA,CACL,CAAC;gBACJ,CAAC;gBAED,OAAO,CACL,wCACE,GAAG,EAAE,OAAO,EACZ,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,IAAI,CAAC,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,SAAS,EAAE,aAAa,EACxB,SAAS,EAAC,6BAA6B,EACvC,QAAQ,EAAE,QAAQ,UAAU,GAAG,GAC/B,CACH,CAAC;YACJ,CAAC,CAAC,CACE,CACP,CAAC;IACJ,CAAC;;AAGH,MAAM,eAAe,GAAG,CAAC,KAAuB,EAAoB,EAAE;IACpE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAClC,IAAI,IAAA,6DAAgC,EAAC,KAAK,CAAC,KAAK,uCAAU,CAAC,WAAW,EAAE,CAAC;QACvE,OAAO;YACL,WAAW,EAAE,KAAK;YAClB,OAAO;YACP,MAAM;YACN,UAAU,EAAE,KAAK;YACjB,qBAAqB,EAAE,EAAE;YACzB,iBAAiB,EAAE,EAAE;YACrB,cAAc,EAAE;gBACd,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,MAAM,EAAE,CAAC;aACV;YACD,eAAe,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;YACzD,aAAa,EAAE,CAAC;YAChB,KAAK,EAAE,yBAAW,CAAC,WAAW;YAC9B,WAAW,EAAE,EAAE;SAChB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,MAAM;QACN,UAAU,EAAE,IAAA,gCAAkB,EAAC,KAAK,CAAC;QACrC,qBAAqB,EAAE,IAAA,kEAA2B,EAAC,KAAK,CAAC;QACzD,iBAAiB,EAAE,IAAA,mEAA4B,EAAC,KAAK,CAAC;QACtD,cAAc,EAAE,IAAA,uDAA6B,EAAC,KAAK,CAAC;QACpD,eAAe,EAAE,IAAA,yDAA8B,EAAC,KAAK,CAAC,CAAC,eAAe;QACtE,aAAa,EAAE,IAAA,6CAAwB,EAAC,KAAK,CAAC;QAC9C,KAAK,EAAE,IAAA,uCAAqB,EAAC,KAAK,CAAC,CAAC,WAAW;QAC/C,WAAW,EAAE,IAAA,kCAAsB,EAAC,KAAK,CAAC;KAC3C,CAAC;AACJ,CAAC,CAAC;AAGW,QAAA,WAAW,GAAG,IAAA,qBAAO,EAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -12,10 +12,10 @@ const specs_1 = require("../utils/specs");
|
|
|
12
12
|
const PADDING = 1;
|
|
13
13
|
const FONT_SIZE_FACTOR = 0.7;
|
|
14
14
|
function renderBars(measureText, orderIndex, dataSeries, xScale, yScale, panel, chartRotation, minBarHeight, color, isBandedSpec, sharedSeriesStyle, displayValueSettings, styleAccessor, stackMode) {
|
|
15
|
-
const { fontSize, fontFamily } = sharedSeriesStyle.displayValue;
|
|
16
15
|
const initialBarTuple = { barGeometries: [], indexedGeometryMap: new indexed_geometry_map_1.IndexedGeometryMap() };
|
|
17
16
|
const y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
18
17
|
const y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
|
|
18
|
+
const seriesIdentifier = (0, series_1.getSeriesIdentifierFromDataSeries)(dataSeries);
|
|
19
19
|
return dataSeries.data.reduce((barTuple, datum) => {
|
|
20
20
|
const xScaled = xScale.scale(datum.x);
|
|
21
21
|
if (!xScale.isValueInDomain(datum.x) || Number.isNaN(xScaled)) {
|
|
@@ -30,41 +30,18 @@ function renderBars(measureText, orderIndex, dataSeries, xScale, yScale, panel,
|
|
|
30
30
|
const yScreenSpaceCoord = Math.min(y1Scaled, y0Scaled) +
|
|
31
31
|
(isBandedSpec ? -addedMinBarHeight / 2 : -addedMinBarHeight * ((y1 ?? 0) >= 0 ? 1 : 0));
|
|
32
32
|
const height = yDiff + addedMinBarHeight;
|
|
33
|
-
const seriesIdentifier = (0, series_1.getSeriesIdentifierFromDataSeries)(dataSeries);
|
|
34
33
|
const seriesStyle = getBarStyleOverrides(datum, seriesIdentifier, sharedSeriesStyle, styleAccessor);
|
|
35
34
|
const maxPixelWidth = (0, common_1.clamp)(seriesStyle.rect.widthRatio ?? 1, 0, 1) * xScale.bandwidth;
|
|
36
35
|
const minPixelWidth = (0, common_1.clamp)(seriesStyle.rect.widthPixel ?? 0, 0, maxPixelWidth);
|
|
37
36
|
const width = (0, common_1.clamp)(seriesStyle.rect.widthPixel ?? xScale.bandwidth, minPixelWidth, maxPixelWidth);
|
|
38
37
|
const x = xScaled + xScale.bandwidth * orderIndex + xScale.bandwidth / 2 - width / 2;
|
|
39
38
|
const y1Value = (0, points_1.getDatumYValue)(datum, false, isBandedSpec, stackMode);
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
const { displayValueWidth, fixedFontScale } = computeBoxWidth(displayValueText ?? '', {
|
|
43
|
-
padding: PADDING,
|
|
44
|
-
fontSize,
|
|
45
|
-
fontFamily,
|
|
46
|
-
measureText,
|
|
47
|
-
});
|
|
48
|
-
const isHorizontalRotation = chartRotation % 180 === 0;
|
|
49
|
-
const referenceWidth = Math.max(isHorizontalRotation ? displayValueWidth : fixedFontScale, 1);
|
|
50
|
-
const textScalingFactor = getFinalFontScalingFactor((width * FONT_SIZE_FACTOR) / referenceWidth, fixedFontScale, fontSize);
|
|
51
|
-
const overflowConstraints = new Set(displayValueSettings?.overflowConstraints ?? [
|
|
52
|
-
specs_1.LabelOverflowConstraint.ChartEdges,
|
|
53
|
-
specs_1.LabelOverflowConstraint.BarGeometry,
|
|
54
|
-
]);
|
|
55
|
-
const bboxWidthFactor = isHorizontalRotation ? textScalingFactor : 1;
|
|
56
|
-
const displayValue = displayValueText && displayValueSettings?.showValueLabel
|
|
57
|
-
? {
|
|
58
|
-
fontScale: textScalingFactor,
|
|
59
|
-
fontSize: fixedFontScale,
|
|
60
|
-
text: displayValueText,
|
|
61
|
-
width: bboxWidthFactor * displayValueWidth,
|
|
62
|
-
height: textScalingFactor * fixedFontScale,
|
|
63
|
-
overflowConstraints,
|
|
64
|
-
}
|
|
65
|
-
: undefined;
|
|
39
|
+
const shouldDisplayValue = displayValueSettings?.showValueLabel &&
|
|
40
|
+
!(displayValueSettings?.isAlternatingValueLabel && barGeometries.length % 2);
|
|
66
41
|
const barGeometry = {
|
|
67
|
-
displayValue
|
|
42
|
+
displayValue: shouldDisplayValue
|
|
43
|
+
? computeDisplayValue(y1Value, sharedSeriesStyle, measureText, chartRotation, width, displayValueSettings)
|
|
44
|
+
: undefined,
|
|
68
45
|
x,
|
|
69
46
|
y: yScreenSpaceCoord,
|
|
70
47
|
transform: { x: 0, y: 0 },
|
|
@@ -95,8 +72,40 @@ function renderBars(measureText, orderIndex, dataSeries, xScale, yScale, panel,
|
|
|
95
72
|
return barTuple;
|
|
96
73
|
}, initialBarTuple);
|
|
97
74
|
}
|
|
75
|
+
function computeDisplayValue(y1Value, sharedSeriesStyle, measureText, chartRotation, width, displayValueSettings) {
|
|
76
|
+
const { fontSize, fontFamily } = sharedSeriesStyle.displayValue;
|
|
77
|
+
const displayValueText = displayValueSettings.valueFormatter(y1Value);
|
|
78
|
+
if (displayValueText.length === 0) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const { displayValueWidth, fixedFontScale } = computeBoxWidth(displayValueText, {
|
|
82
|
+
padding: PADDING,
|
|
83
|
+
fontSize,
|
|
84
|
+
fontFamily,
|
|
85
|
+
measureText,
|
|
86
|
+
});
|
|
87
|
+
const isHorizontalRotation = chartRotation % 180 === 0;
|
|
88
|
+
const referenceWidth = Math.max(isHorizontalRotation ? displayValueWidth : fixedFontScale, 1);
|
|
89
|
+
const textScalingFactor = getFinalFontScalingFactor((width * FONT_SIZE_FACTOR) / referenceWidth, fixedFontScale, fontSize);
|
|
90
|
+
const overflowConstraints = new Set(displayValueSettings?.overflowConstraints ?? [
|
|
91
|
+
specs_1.LabelOverflowConstraint.ChartEdges,
|
|
92
|
+
specs_1.LabelOverflowConstraint.BarGeometry,
|
|
93
|
+
]);
|
|
94
|
+
const bboxWidthFactor = isHorizontalRotation ? textScalingFactor : 1;
|
|
95
|
+
return {
|
|
96
|
+
fontScale: textScalingFactor,
|
|
97
|
+
fontSize: fixedFontScale,
|
|
98
|
+
text: displayValueText,
|
|
99
|
+
width: bboxWidthFactor * displayValueWidth,
|
|
100
|
+
height: textScalingFactor * fixedFontScale,
|
|
101
|
+
overflowConstraints,
|
|
102
|
+
};
|
|
103
|
+
}
|
|
98
104
|
function computeBoxWidth(text, { padding, fontSize, fontFamily, measureText, }) {
|
|
99
105
|
const fixedFontScale = Math.max(typeof fontSize === 'number' ? fontSize : fontSize.min, 1);
|
|
106
|
+
if (text.length === 0) {
|
|
107
|
+
return { fixedFontScale, displayValueWidth: 0 };
|
|
108
|
+
}
|
|
100
109
|
const computedDisplayValueWidth = measureText(text, { fontFamily, fontWeight: 'normal', fontStyle: 'normal', fontVariant: 'normal' }, fixedFontScale).width;
|
|
101
110
|
if (typeof fontSize !== 'number') {
|
|
102
111
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bars.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bars.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bars.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bars.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,25 +27,25 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
|
|
|
27
27
|
const yDefined = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|
|
28
28
|
const needSorting = !markSizeOptions.enabled;
|
|
29
29
|
let style = (0, point_style_1.buildPointGeometryStyles)(color, pointStyle);
|
|
30
|
-
|
|
30
|
+
const seriesIdentifier = (0, series_1.getSeriesIdentifierFromDataSeries)(dataSeries);
|
|
31
31
|
const { pointGeometries, minDistanceBetweenPoints } = dataSeries.data.reduce((acc, datum, dataIndex) => {
|
|
32
32
|
const { x: xValue, mark } = datum;
|
|
33
|
-
const prev = dataSeries.data[dataIndex - 1];
|
|
34
|
-
const next = dataSeries.data[dataIndex + 1];
|
|
35
33
|
if (!xScale.isValueInDomain(xValue))
|
|
36
34
|
return acc;
|
|
37
35
|
const x = xScale.scale(xValue);
|
|
38
36
|
if (!(0, common_1.isFiniteNumber)(x))
|
|
39
37
|
return acc;
|
|
38
|
+
const prev = dataSeries.data[dataIndex - 1];
|
|
39
|
+
const next = dataSeries.data[dataIndex + 1];
|
|
40
40
|
if ((0, common_1.isFiniteNumber)(acc.prevX) && !(0, utils_1.isDatumFilled)(datum)) {
|
|
41
41
|
acc.minDistanceBetweenPoints = Math.min(acc.minDistanceBetweenPoints, Math.abs(x - acc.prevX));
|
|
42
42
|
}
|
|
43
43
|
acc.prevX = x;
|
|
44
44
|
const yDatumKeyNames = isBandedSpec ? ['y0', 'y1'] : ['y1'];
|
|
45
|
-
const seriesIdentifier = (0, series_1.getSeriesIdentifierFromDataSeries)(dataSeries);
|
|
46
45
|
const isPointIsolated = considerIsolatedPoints
|
|
47
46
|
? isIsolatedPoint(dataIndex, dataSeries.data.length, datum, isBandedSpec, y1Fn, y0Fn, prev, next)
|
|
48
47
|
: false;
|
|
48
|
+
let styleOverrides = undefined;
|
|
49
49
|
if (styleAccessor) {
|
|
50
50
|
styleOverrides = getPointStyleOverrides(datum, seriesIdentifier, isPointIsolated, styleAccessor);
|
|
51
51
|
style = (0, point_style_1.buildPointGeometryStyles)(color, pointStyle, styleOverrides);
|
|
@@ -77,6 +77,7 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
|
|
|
77
77
|
seriesIdentifier,
|
|
78
78
|
panel,
|
|
79
79
|
isolated: isPointIsolated,
|
|
80
|
+
seriesType: dataSeries.seriesType,
|
|
80
81
|
};
|
|
81
82
|
indexedGeometryMap.set(pointGeometry, geometryType);
|
|
82
83
|
if ((0, common_1.isFiniteNumber)(y) &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":";;AA4BA,kDAEC;AAGD,oCAuHC;AAGD,wDAmBC;AAUD,wCAiBC;AAYD,kCA4BC;AAzOD,+CAAyD;AAEzD,mCAAqH;AAIrH,kDAA8D;AAE9D,yEAAiF;AAGjF,sDAA6D;AAE7D,wEAAiF;AAEjF,4CAAoE;AAEpE,0CAA2C;AAG3C,SAAgB,mBAAmB,CAAC,eAAuB;IACzD,OAAO,eAAe,GAAG,GAAG,CAAC;AAC/B,CAAC;AAGD,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAAmC,EACnC,MAAuB,EACvB,KAAiB,EACjB,KAAY,EACZ,UAAsB,EACtB,sBAA+B,EAC/B,YAAqB,EACrB,eAAgC,EAChC,eAAwB,EACxB,aAAkC;IAMlC,MAAM,kBAAkB,GAAG,IAAI,yCAAkB,EAAE,CAAC;IACpD,MAAM,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,GAAG,EAAE,CAAC,CAAC,CAAC;IACZ,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,mCAAY,CAAC,OAAO,CAAC,CAAC,CAAC,mCAAY,CAAC,MAAM,CAAC;IAElF,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnD,MAAM,WAAW,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC;IAE7C,IAAI,KAAK,GAAG,IAAA,sCAAwB,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACxD,
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,12 @@ exports.isDatumFilled = isDatumFilled;
|
|
|
5
5
|
exports.getClippedRanges = getClippedRanges;
|
|
6
6
|
exports.getGeometryStateStyle = getGeometryStateStyle;
|
|
7
7
|
exports.isPointOnGeometry = isPointOnGeometry;
|
|
8
|
+
exports.isLineAreaPointWithinPanel = isLineAreaPointWithinPanel;
|
|
8
9
|
exports.isYValueDefinedFn = isYValueDefinedFn;
|
|
9
10
|
exports.getY1ScaledValueFn = getY1ScaledValueFn;
|
|
10
11
|
exports.getY0ScaledValueFn = getY0ScaledValueFn;
|
|
11
12
|
const types_1 = require("../../../scales/types");
|
|
13
|
+
const specs_1 = require("../../../specs");
|
|
12
14
|
const common_1 = require("../../../utils/common");
|
|
13
15
|
const geometry_1 = require("../../../utils/geometry");
|
|
14
16
|
function getYDatumValueFn(valueName = 'y1') {
|
|
@@ -82,6 +84,18 @@ function isPointOnGeometry(xCoordinate, yCoordinate, indexedGeometry, buffer) {
|
|
|
82
84
|
return false;
|
|
83
85
|
return (0, common_1.isWithinRange)([y, y + height])(yCoordinate);
|
|
84
86
|
}
|
|
87
|
+
function isLineAreaPointWithinPanel(spec, indexedGeometry) {
|
|
88
|
+
const isLineOrAreaPoint = (0, geometry_1.isPointGeometry)(indexedGeometry) && ((0, specs_1.isLineSeriesSpec)(spec) || (0, specs_1.isAreaSeriesSpec)(spec));
|
|
89
|
+
if (!isLineOrAreaPoint)
|
|
90
|
+
return false;
|
|
91
|
+
const { x, y, transform } = indexedGeometry;
|
|
92
|
+
const { width, height } = indexedGeometry.panel;
|
|
93
|
+
const gx = x + transform.x;
|
|
94
|
+
const gy = y + transform.y;
|
|
95
|
+
if (!(0, common_1.isWithinRange)([0, width])(gx))
|
|
96
|
+
return false;
|
|
97
|
+
return (0, common_1.isWithinRange)([0, height])(gy);
|
|
98
|
+
}
|
|
85
99
|
const getScaleTypeValueValidator = (yScale) => {
|
|
86
100
|
if (!(0, types_1.isLogarithmicScale)(yScale))
|
|
87
101
|
return () => true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/utils.ts"],"names":[],"mappings":"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"}
|