@elastic/charts 70.1.0 → 70.1.1
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/xy_chart/renderer/canvas/areas.js +44 -36
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js +18 -18
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/points.js +7 -4
- package/dist/chart_types/xy_chart/renderer/canvas/points.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js +2 -2
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/area.js +25 -3
- package/dist/chart_types/xy_chart/renderer/canvas/styles/area.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/bar.js +3 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/bar.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/line.js +15 -4
- package/dist/chart_types/xy_chart/renderer/canvas/styles/line.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/area.js +1 -1
- package/dist/chart_types/xy_chart/rendering/area.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/bubble.js +1 -1
- package/dist/chart_types/xy_chart/rendering/bubble.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/line.js +1 -1
- package/dist/chart_types/xy_chart/rendering/line.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/point_style.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/points.js +23 -17
- package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_series.js +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_series.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js +15 -8
- package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/texture.js +2 -2
- package/dist/chart_types/xy_chart/utils/texture.js.map +1 -1
- package/dist/theme_dark.css +1 -1
- package/dist/theme_light.css +1 -1
- package/dist/theme_only_dark.css +1 -1
- package/dist/theme_only_light.css +1 -1
- package/dist/utils/geometry.d.ts.map +1 -1
- package/dist/utils/geometry.js +12 -0
- 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 +8 -0
- 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 +8 -0
- package/dist/utils/themes/amsterdam_light_theme.js.map +1 -1
- package/dist/utils/themes/base_colors.js +34 -8
- 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 +25 -0
- 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 +8 -0
- 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 +8 -0
- 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 +25 -0
- package/dist/utils/themes/light_theme.js.map +1 -1
- package/dist/utils/themes/theme.d.ts +44 -2
- package/dist/utils/themes/theme.d.ts.map +1 -1
- package/dist/utils/themes/theme.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,48 +7,56 @@ const path_1 = require("./primitives/path");
|
|
|
7
7
|
const area_1 = require("./styles/area");
|
|
8
8
|
const line_1 = require("./styles/line");
|
|
9
9
|
const panel_transform_1 = require("./utils/panel_transform");
|
|
10
|
-
const color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
11
10
|
const canvas_1 = require("../../../../renderers/canvas");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
11
|
+
const geometry_1 = require("../../../../utils/geometry");
|
|
12
|
+
function renderAreas(ctx, imgCanvas, areas, rotation, renderingArea, highlightedLegendItem) {
|
|
13
|
+
const sortedRenderingAreas = areas.reduce((acc, area) => {
|
|
14
|
+
const highlightState = (0, geometry_1.getGeometryHighlightState)(area.value.seriesIdentifier.key, highlightedLegendItem);
|
|
15
|
+
acc[highlightState][area.value.isStacked ? 'stacked' : 'nonStacked'][area.value.isStacked ? 'unshift' : 'push'](area);
|
|
16
|
+
return acc;
|
|
17
|
+
}, {
|
|
18
|
+
dimmed: { stacked: [], nonStacked: [] },
|
|
19
|
+
focused: { stacked: [], nonStacked: [] },
|
|
20
|
+
default: { stacked: [], nonStacked: [] },
|
|
21
|
+
});
|
|
16
22
|
(0, canvas_1.withContext)(ctx, () => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderAreaLines(ctx, geom, sharedStyle, clippings, highlightedLegendItem), { area: clippings, shouldClip: true });
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
areas.forEach(({ panel, value: { style, seriesIdentifier, points, hasFit, minPointDistance } }) => {
|
|
27
|
-
const geometryStyle = (0, utils_1.getGeometryStateStyle)(seriesIdentifier, sharedStyle, highlightedLegendItem);
|
|
28
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, points, geometryStyle, style.point, style.line.strokeWidth, minPointDistance, style.pointVisibilityMinDistance, hasFit && points.length > 1), { area: (0, panel_clipping_1.getPanelClipping)(panel, rotation), shouldClip: points[0]?.value.mark !== null });
|
|
29
|
-
});
|
|
23
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.default.stacked, 'default');
|
|
24
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.default.nonStacked, 'default');
|
|
25
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.dimmed.stacked, 'dimmed');
|
|
26
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.dimmed.nonStacked, 'dimmed');
|
|
27
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.focused.stacked, 'focused');
|
|
28
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.focused.nonStacked, 'focused');
|
|
30
29
|
});
|
|
31
30
|
}
|
|
32
|
-
function
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
31
|
+
function renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, areas, highlighedState) {
|
|
32
|
+
areas.forEach(({ panel, value: geom }) => {
|
|
33
|
+
const clippings = (0, panel_clipping_1.getPanelClipping)(panel, rotation);
|
|
34
|
+
if (geom.style.area.visible) {
|
|
35
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderArea(ctx, imgCanvas, geom, clippings, highlighedState), { area: clippings, shouldClip: true });
|
|
36
|
+
}
|
|
37
|
+
if (geom.style.line.visible) {
|
|
38
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderAreaLines(ctx, geom, clippings, highlighedState), { area: clippings, shouldClip: true });
|
|
39
|
+
}
|
|
40
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, geom.points, highlighedState, geom.style.point, geom.style.line.strokeWidth, geom.minPointDistance, geom.style.pointVisibilityMinDistance, geom.hasFit && geom.points.length > 1), { area: clippings, shouldClip: geom.points[0]?.value.mark !== null });
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
function renderArea(ctx, imgCanvas, geometry, clippings, highlightState) {
|
|
44
|
+
const { area, color, transform, style, clippedRanges, shouldClip } = geometry;
|
|
45
|
+
const areaFill = (0, area_1.buildAreaStyles)(ctx, imgCanvas, color, style.area, highlightState);
|
|
46
|
+
const fitAreaFillThemeStyle = { ...style.fit.area, dimmed: style.area.dimmed };
|
|
47
|
+
const fitAreaFill = (0, area_1.buildAreaStyles)(ctx, imgCanvas, color, fitAreaFillThemeStyle, highlightState);
|
|
41
48
|
(0, path_1.renderAreaPath)(ctx, transform, area, areaFill, fitAreaFill, clippedRanges, clippings, shouldClip && style.fit.area.visible);
|
|
42
49
|
}
|
|
43
|
-
function renderAreaLines(ctx, geometry,
|
|
44
|
-
const { lines, color,
|
|
45
|
-
const
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
50
|
+
function renderAreaLines(ctx, geometry, clippings, highlightState) {
|
|
51
|
+
const { lines, color, transform, style, clippedRanges, shouldClip } = geometry;
|
|
52
|
+
const lineStyle = (0, line_1.buildLineStyles)(color, style.line, highlightState);
|
|
53
|
+
const fitLineThemeStyle = {
|
|
54
|
+
...style.fit.line,
|
|
55
|
+
strokeWidth: style.line.strokeWidth,
|
|
56
|
+
dimmed: style.line.dimmed,
|
|
57
|
+
focused: style.line.focused,
|
|
51
58
|
};
|
|
52
|
-
(0,
|
|
59
|
+
const fitLineStyle = (0, line_1.buildLineStyles)(color, fitLineThemeStyle, highlightState);
|
|
60
|
+
(0, path_1.renderLinePaths)(ctx, transform, lines, lineStyle, fitLineStyle, clippedRanges, clippings, shouldClip && style.fit.line.visible);
|
|
53
61
|
}
|
|
54
62
|
//# sourceMappingURL=areas.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"areas.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/areas.ts"],"names":[],"mappings":";;AA2BA,
|
|
1
|
+
{"version":3,"file":"areas.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/areas.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,32 +7,32 @@ const points_1 = require("./points");
|
|
|
7
7
|
const path_1 = require("./primitives/path");
|
|
8
8
|
const line_1 = require("./styles/line");
|
|
9
9
|
const panel_transform_1 = require("./utils/panel_transform");
|
|
10
|
-
const color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
11
10
|
const canvas_1 = require("../../../../renderers/canvas");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
function renderLines(ctx, lines, sharedStyle, rotation, renderingArea, highlightedLegendItem) {
|
|
11
|
+
const geometry_1 = require("../../../../utils/geometry");
|
|
12
|
+
function renderLines(ctx, lines, rotation, renderingArea, highlightedLegendItem) {
|
|
15
13
|
(0, canvas_1.withContext)(ctx, () => {
|
|
16
|
-
lines
|
|
14
|
+
lines
|
|
15
|
+
.map(({ panel, value }) => {
|
|
16
|
+
return {
|
|
17
|
+
panel,
|
|
18
|
+
line: value,
|
|
19
|
+
highlightState: (0, geometry_1.getGeometryHighlightState)(value.seriesIdentifier.key, highlightedLegendItem),
|
|
20
|
+
};
|
|
21
|
+
})
|
|
22
|
+
.sort(({ highlightState }) => (highlightState === 'dimmed' ? -1 : 1))
|
|
23
|
+
.forEach(({ panel, line, highlightState }) => {
|
|
17
24
|
const clippings = (0, panel_clipping_1.getPanelClipping)(panel, rotation);
|
|
18
25
|
if (line.style.line.visible) {
|
|
19
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderLine(ctx, line,
|
|
26
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderLine(ctx, line, clippings, highlightState), { area: clippings, shouldClip: true });
|
|
20
27
|
}
|
|
21
|
-
|
|
22
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, line.points, geometryStyle, line.style.point, line.style.line.strokeWidth, line.minPointDistance, line.style.pointVisibilityMinDistance, line.hasFit && line.points.length > 1), { area: clippings, shouldClip: line.points[0]?.value.mark !== null });
|
|
28
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, line.points, highlightState, line.style.point, line.style.line.strokeWidth, line.minPointDistance, line.style.pointVisibilityMinDistance, line.hasFit && line.points.length > 1), { area: clippings, shouldClip: line.points[0]?.value.mark !== null });
|
|
23
29
|
});
|
|
24
30
|
});
|
|
25
31
|
}
|
|
26
|
-
function renderLine(ctx, line,
|
|
27
|
-
const { color, transform,
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const fitLineStrokeColor = style.fit.line.stroke === common_1.ColorVariant.Series ? color : style.fit.line.stroke;
|
|
31
|
-
const fitLineStroke = {
|
|
32
|
-
dash: style.fit.line.dash,
|
|
33
|
-
width: style.line.strokeWidth,
|
|
34
|
-
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(fitLineStrokeColor), (opacity) => opacity * geometryStyle.opacity * style.fit.line.opacity),
|
|
35
|
-
};
|
|
32
|
+
function renderLine(ctx, line, clippings, highlightState) {
|
|
33
|
+
const { color, transform, style, clippedRanges, shouldClip } = line;
|
|
34
|
+
const lineStroke = (0, line_1.buildLineStyles)(color, style.line, highlightState);
|
|
35
|
+
const fitLineStroke = (0, line_1.buildLineStyles)(color, { ...style.fit.line, strokeWidth: style.line.strokeWidth, dimmed: style.line.dimmed, focused: style.line.focused }, highlightState);
|
|
36
36
|
(0, path_1.renderLinePaths)(ctx, transform, [line.line], lineStroke, fitLineStroke, clippedRanges, clippings, shouldClip && style.fit.line.visible);
|
|
37
37
|
}
|
|
38
38
|
function drawPolarLine(ctx, angle, radius, length, center = { x: 0, y: 0 }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/lines.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/lines.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,14 @@ 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
9
|
const points_1 = require("../../rendering/points");
|
|
10
|
-
function renderPoints(ctx, points,
|
|
10
|
+
function renderPoints(ctx, points, highlightState, pointStyle, lineStrokeWidth, seriesMinPointDistance, pointsDistanceVisibilityThreshold, hasConnectingLine) {
|
|
11
11
|
const isHiddenOnAuto = pointStyle.visible === 'auto' && seriesMinPointDistance < pointsDistanceVisibilityThreshold;
|
|
12
12
|
const hideDataPoints = pointStyle.visible === 'never' || isHiddenOnAuto;
|
|
13
13
|
const hideIsolatedDataPoints = hasConnectingLine && hideDataPoints;
|
|
14
14
|
const useIsolatedPointRadius = hideDataPoints && !hasConnectingLine;
|
|
15
|
+
const opacity = highlightState === 'dimmed' && 'opacity' in pointStyle.dimmed ? pointStyle.dimmed.opacity : pointStyle.opacity;
|
|
16
|
+
const dimmedFill = highlightState === 'dimmed' && 'fill' in pointStyle.dimmed ? (0, color_library_wrappers_1.colorToRgba)(pointStyle.dimmed.fill) : undefined;
|
|
17
|
+
const dimmedStroke = highlightState === 'dimmed' && 'stroke' in pointStyle.dimmed ? (0, color_library_wrappers_1.colorToRgba)(pointStyle.dimmed.stroke) : undefined;
|
|
15
18
|
points.forEach(({ x, y, radius, transform, style, isolated }) => {
|
|
16
19
|
if ((isolated && hideIsolatedDataPoints) || (!isolated && hideDataPoints)) {
|
|
17
20
|
return;
|
|
@@ -19,12 +22,12 @@ function renderPoints(ctx, points, { opacity }, pointStyle, lineStrokeWidth, ser
|
|
|
19
22
|
const coordinates = {
|
|
20
23
|
x: x + transform.x,
|
|
21
24
|
y: y + transform.y,
|
|
22
|
-
radius: isolated
|
|
25
|
+
radius: isolated && useIsolatedPointRadius ? (0, points_1.isolatedPointRadius)(lineStrokeWidth) : radius,
|
|
23
26
|
};
|
|
24
|
-
const fill = { color: (0, color_library_wrappers_1.overrideOpacity)(style.fill.color, (fillOpacity) => fillOpacity * opacity) };
|
|
27
|
+
const fill = { color: (0, color_library_wrappers_1.overrideOpacity)(dimmedFill ?? style.fill.color, (fillOpacity) => fillOpacity * opacity) };
|
|
25
28
|
const stroke = {
|
|
26
29
|
...style.stroke,
|
|
27
|
-
color: (0, color_library_wrappers_1.overrideOpacity)(style.stroke.color, (fillOpacity) => fillOpacity * opacity),
|
|
30
|
+
color: (0, color_library_wrappers_1.overrideOpacity)(dimmedStroke ?? style.stroke.color, (fillOpacity) => fillOpacity * opacity),
|
|
28
31
|
};
|
|
29
32
|
(0, shapes_1.renderShape)(ctx, style.shape, coordinates, fill, stroke);
|
|
30
33
|
});
|
|
@@ -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":";;AAyBA,oCA4CC;AAOD,4CAuBC;AA3FD,qDAAoD;AACpD,gDAAkD;AAClD,6DAA6D;AAC7D,sFAAyF;AAOzF,mDAA6D;AAO7D,SAAgB,YAAY,CAC1B,GAA6B,EAC7B,MAAuB,EACvB,cAAsC,EACtC,UAAsB,EACtB,eAAuB,EACvB,sBAA8B,EAC9B,iCAAyC,EACzC,iBAA0B;IAI1B,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,KAAK,MAAM,IAAI,sBAAsB,GAAG,iCAAiC,CAAC;IACnH,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,KAAK,OAAO,IAAI,cAAc,CAAC;IACxE,MAAM,sBAAsB,GAAG,iBAAiB,IAAI,cAAc,CAAC;IAEnE,MAAM,sBAAsB,GAAG,cAAc,IAAI,CAAC,iBAAiB,CAAC;IAEpE,MAAM,OAAO,GACX,cAAc,KAAK,QAAQ,IAAI,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;IAEjH,MAAM,UAAU,GACd,cAAc,KAAK,QAAQ,IAAI,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,oCAAW,EAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/G,MAAM,YAAY,GAChB,cAAc,KAAK,QAAQ,IAAI,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,oCAAW,EAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEnH,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9D,IAAI,CAAC,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC;YAC1E,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG;YAClB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YAClB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YAClB,MAAM,EAAE,QAAQ,IAAI,sBAAsB,CAAC,CAAC,CAAC,IAAA,4BAAmB,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM;SAC3F,CAAC;QAEF,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,IAAA,wCAAe,EAAC,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC;QAChH,MAAM,MAAM,GAAG;YACb,GAAG,KAAK,CAAC,MAAM;YACf,KAAK,EAAE,IAAA,wCAAe,EAAC,YAAY,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,GAAG,OAAO,CAAC;SACnG,CAAC;QACF,IAAA,oBAAW,EAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC;AAOD,SAAgB,gBAAgB,CAC9B,GAA6B,EAC7B,MAAuB,EACvB,mBAA0D,EAC1D,QAAkB,EAClB,aAAyB,EACzB,UAAmB;IAEnB,MAAM;SACH,KAAK,EAAE;SACP,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;SAC7C,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QAChF,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,GAAS,EAAE,KAAK,EAAE,IAAA,wCAAe,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC;QACxG,MAAM,MAAM,GAAW;YACrB,GAAG,KAAK,CAAC,MAAM;YACf,KAAK,EAAE,IAAA,wCAAe,EAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,GAAG,OAAO,CAAC;SACnF,CAAC;QACF,MAAM,WAAW,GAAW,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAA,oBAAW,EAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAChF,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,IAAA,iCAAgB,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;QAC1E,IAAA,oCAAkB,EAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -40,8 +40,8 @@ function renderXYChartCanvas2d(ctx, dpr, props, animationState) {
|
|
|
40
40
|
}, locale),
|
|
41
41
|
() => (0, annotations_1.renderAnnotations)(ctx, aCtx, annotationDimensions, annotationSpecs, rotation, renderingArea, sharedStyle, hoveredAnnotationIds, lineAnnotationStyle, rectAnnotationStyle, true),
|
|
42
42
|
() => (0, bars_1.renderBars)(ctx, imgCanvas, geometries.bars, sharedStyle, rotation, renderingArea, highlightedLegendItem),
|
|
43
|
-
() => (0, areas_1.renderAreas)(ctx, imgCanvas, geometries.areas,
|
|
44
|
-
() => (0, lines_1.renderLines)(ctx, geometries.lines,
|
|
43
|
+
() => (0, areas_1.renderAreas)(ctx, imgCanvas, geometries.areas, rotation, renderingArea, highlightedLegendItem),
|
|
44
|
+
() => (0, lines_1.renderLines)(ctx, geometries.lines, rotation, renderingArea, highlightedLegendItem),
|
|
45
45
|
() => (0, bubbles_1.renderBubbles)(ctx, geometries.bubbles, sharedStyle, rotation, renderingArea, highlightedLegendItem),
|
|
46
46
|
() => geometries.bars.forEach(({ value: bars, panel }) => (0, bar_1.renderBarValues)(ctx, {
|
|
47
47
|
bars,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":";;AAyBA,sDA4JC;AA5KD,6CAAkD;AAElD,+CAAkD;AAClD,mCAAsC;AACtC,iCAAoC;AACpC,uCAA0C;AAC1C,mCAAsC;AACtC,mCAAsC;AACtC,4CAA0E;AAC1E,sCAA+C;AAE/C,sDAAmD;AACnD,yDAAsF;AACtF,oEAA2E;AAG3E,SAAgB,qBAAqB,CACnC,GAA6B,EAC7B,GAAW,EACX,KAA8B,EAC9B,cAA8B;IAE9B,SAAS,MAAM,CAAC,IAAsB;QACpC,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEnD,IAAA,oBAAW,EAAC,GAAG,EAAE,GAAG,EAAE;YAEpB,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACpB,MAAM,EACJ,aAAa,EACb,cAAc,EACd,QAAQ,EACR,UAAU,EACV,eAAe,EACf,KAAK,EAAE,EACL,IAAI,EAAE,eAAe,EACrB,WAAW,EACX,cAAc,EAAE,mBAAmB,EACnC,cAAc,EAAE,mBAAmB,EACnC,cAAc,EACd,UAAU,GACX,EACD,qBAAqB,EACrB,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACT,UAAU,EACV,KAAK,EACL,UAAU,EACV,oBAAoB,EACpB,MAAM,GACP,GAAG,KAAK,CAAC;YAEV,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,aAAa,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,GAAG,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC;YAExG,IAAA,qBAAY,EAAC,GAAG,EAAE;gBAChB,GAAG,EAAE,CAAC,IAAA,oBAAW,EAAC,GAAG,EAAE,aAAa,CAAC;gBAGrC,GAAG,EAAE,CAAC,KAAK,IAAI,IAAA,yBAAgB,EAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC;gBAE3D,GAAG,EAAE,CACH,IAAA,mBAAW,EAAC,GAAG,EAAE;oBACf,SAAS;oBACT,aAAa;oBACb,iBAAiB;oBACjB,UAAU;oBACV,eAAe;iBAChB,CAAC;gBAEJ,GAAG,EAAE,CACH,IAAA,8BAAqB,EACnB,GAAG,EACH;oBACE,SAAS;oBACT,iBAAiB;oBACjB,aAAa;oBACb,KAAK;oBACL,UAAU;oBACV,eAAe;iBAChB,EACD,MAAM,CACP;gBAGH,GAAG,EAAE,CACH,IAAA,+BAAiB,EACf,GAAG,EACH,IAAI,EACJ,oBAAoB,EACpB,eAAe,EACf,QAAQ,EACR,aAAa,EACb,WAAW,EACX,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,IAAI,CACL;gBAGH,GAAG,EAAE,CAAC,IAAA,iBAAU,EAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,qBAAqB,CAAC;gBAG9G,GAAG,EAAE,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,qBAAqB,CAAC;gBAGnG,GAAG,EAAE,CAAC,IAAA,mBAAW,EAAC,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,qBAAqB,CAAC;gBAGxF,GAAG,EAAE,CAAC,IAAA,uBAAa,EAAC,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,qBAAqB,CAAC;gBAEzG,GAAG,EAAE,CACH,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CACjD,IAAA,qBAAe,EAAC,GAAG,EAAE;oBACnB,IAAI;oBACJ,KAAK;oBACL,aAAa;oBACb,QAAQ;oBACR,KAAK;oBACL,cAAc;oBACd,UAAU;iBACX,CAAC,CACH;gBAGH,GAAG,EAAE,CACH,IAAA,+BAAiB,EACf,GAAG,EACH,IAAI,EACJ,oBAAoB,EACpB,eAAe,EACf,QAAQ,EACR,aAAa,EACb,WAAW,EACX,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,KAAK,CACN;gBAGH,GAAG,EAAE,CACH,KAAK;oBACL,IAAA,oBAAW,EAAC,GAAG,EAAE,GAAG,EAAE;wBACpB,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;wBAEnD,IAAA,uBAAe,EACb,GAAG,EACH,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAClC,CAAC,EACD,EAAE,KAAK,EAAE,eAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EAClC,EAAE,KAAK,EAAE,eAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CACnD,CAAC;wBACF,MAAM,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;wBACrE,IAAI,OAAO,EAAE,CAAC;4BACZ,GAAG,CAAC,SAAS,EAAE,CAAC;4BAChB,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;4BACzB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;4BACxB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;4BACpB,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;4BAClB,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;4BACzB,GAAG,CAAC,MAAM,EAAE,CAAC;wBACf,CAAC;oBACH,CAAC,CAAC;aACL,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,IAAA,+BAAkB,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -4,12 +4,34 @@ exports.buildAreaStyles = buildAreaStyles;
|
|
|
4
4
|
const color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
5
5
|
const common_1 = require("../../../../../utils/common");
|
|
6
6
|
const texture_1 = require("../../../utils/texture");
|
|
7
|
-
function buildAreaStyles(ctx, imgCanvas,
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
function buildAreaStyles(ctx, imgCanvas, seriesColor, themeAreaStyle, highlightState) {
|
|
8
|
+
const isDimmed = highlightState === 'dimmed';
|
|
9
|
+
const fillColor = isDimmed && 'fill' in themeAreaStyle.dimmed ? themeAreaStyle.dimmed.fill : seriesColor;
|
|
10
|
+
const opacity = isDimmed && 'opacity' in themeAreaStyle.dimmed
|
|
11
|
+
? themeAreaStyle.dimmed.opacity * themeAreaStyle.opacity
|
|
12
|
+
: themeAreaStyle.opacity;
|
|
13
|
+
const texture = themeAreaStyle.texture
|
|
14
|
+
? (0, texture_1.getTextureStyles)(ctx, imgCanvas, seriesColor, 1, getTextureStyleFromFocusState(themeAreaStyle.texture, themeAreaStyle.dimmed, highlightState))
|
|
15
|
+
: undefined;
|
|
16
|
+
const color = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(fillColor, themeAreaStyle.fill)), (currentColorOpacity) => currentColorOpacity * opacity);
|
|
10
17
|
return {
|
|
11
18
|
color,
|
|
12
19
|
texture,
|
|
13
20
|
};
|
|
14
21
|
}
|
|
22
|
+
function getTextureStyleFromFocusState(textureStyle, themeDimmedStyle, highlightState) {
|
|
23
|
+
if (highlightState !== 'dimmed') {
|
|
24
|
+
return textureStyle;
|
|
25
|
+
}
|
|
26
|
+
if ('opacity' in themeDimmedStyle) {
|
|
27
|
+
return {
|
|
28
|
+
...textureStyle,
|
|
29
|
+
opacity: (textureStyle.opacity ?? 1) * themeDimmedStyle.opacity,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
...textureStyle,
|
|
34
|
+
opacity: themeDimmedStyle.texture.opacity,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
15
37
|
//# sourceMappingURL=area.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/area.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/area.ts"],"names":[],"mappings":";;AA4BA,0CAiCC;AArDD,yFAA4F;AAI5F,wDAAkE;AAGlE,oDAA0D;AAa1D,SAAgB,eAAe,CAC7B,GAA6B,EAC7B,SAA4B,EAC5B,WAAiC,EACjC,cAAyB,EACzB,cAAsC;IAEtC,MAAM,QAAQ,GAAG,cAAc,KAAK,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,QAAQ,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IACzG,MAAM,OAAO,GACX,QAAQ,IAAI,SAAS,IAAI,cAAc,CAAC,MAAM;QAC5C,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO;QACxD,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;IAE7B,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO;QACpC,CAAC,CAAC,IAAA,0BAAgB,EACd,GAAG,EACH,SAAS,EACT,WAAW,EACX,CAAC,EACD,6BAA6B,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC,CAC7F;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,KAAK,GAAG,IAAA,wCAAe,EAC3B,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,EAChE,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,GAAG,OAAO,CACvD,CAAC;IAEF,OAAO;QACL,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,YAA4B,EAC5B,gBAAqC,EACrC,cAAsC;IAEtC,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,SAAS,IAAI,gBAAgB,EAAE,CAAC;QAClC,OAAO;YACL,GAAG,YAAY;YACf,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO;SAChE,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,YAAY;QACf,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO;KAC1C,CAAC;AACJ,CAAC"}
|
|
@@ -5,7 +5,9 @@ const color_library_wrappers_1 = require("../../../../../common/color_library_wr
|
|
|
5
5
|
const common_1 = require("../../../../../utils/common");
|
|
6
6
|
const texture_1 = require("../../../utils/texture");
|
|
7
7
|
function buildBarStyle(ctx, imgCanvas, baseColor, themeRectStyle, themeRectBorderStyle, geometryStateStyle, rect) {
|
|
8
|
-
const texture =
|
|
8
|
+
const texture = themeRectStyle.texture
|
|
9
|
+
? (0, texture_1.getTextureStyles)(ctx, imgCanvas, baseColor, geometryStateStyle.opacity, themeRectStyle.texture)
|
|
10
|
+
: undefined;
|
|
9
11
|
const fillColor = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(baseColor, themeRectStyle.fill)), (opacity) => opacity * themeRectStyle.opacity * geometryStateStyle.opacity);
|
|
10
12
|
const fill = {
|
|
11
13
|
color: fillColor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/bar.ts"],"names":[],"mappings":";;AAsBA,
|
|
1
|
+
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/bar.ts"],"names":[],"mappings":";;AAsBA,sCAiCC;AA/CD,yFAA4F;AAE5F,wDAAkE;AAElE,oDAA0D;AAU1D,SAAgB,aAAa,CAC3B,GAA6B,EAC7B,SAA4B,EAC5B,SAAiB,EACjB,cAAyB,EACzB,oBAAqC,EACrC,kBAAsC,EACtC,IAAU;IAEV,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO;QACpC,CAAC,CAAC,IAAA,0BAAgB,EAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC;QACjG,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,SAAS,GAAG,IAAA,wCAAe,EAC/B,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,EAChE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAC3E,CAAC;IACF,MAAM,IAAI,GAAS;QACjB,KAAK,EAAE,SAAS;QAChB,OAAO;KACR,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,wCAAe,EACjC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,SAAS,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC,EACxE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,kBAAkB,CAAC,OAAO,GAAG,CAAC,oBAAoB,CAAC,aAAa,IAAI,cAAc,CAAC,OAAO,CAAC,CACnH,CAAC;IACF,MAAM,MAAM,GAAW;QACrB,KAAK,EAAE,WAAW;QAClB,KAAK,EACH,oBAAoB,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,oBAAoB,CAAC,WAAW;YAC5E,CAAC,CAAC,oBAAoB,CAAC,WAAW;YAClC,CAAC,CAAC,CAAC;KACR,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -3,11 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildLineStyles = buildLineStyles;
|
|
4
4
|
const color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
5
5
|
const common_1 = require("../../../../../utils/common");
|
|
6
|
-
function buildLineStyles(
|
|
7
|
-
const
|
|
6
|
+
function buildLineStyles(seriesColor, themeLineStyle, highlightState) {
|
|
7
|
+
const isDimmed = highlightState === 'dimmed';
|
|
8
|
+
const isFocused = highlightState === 'focused';
|
|
9
|
+
const strokeColor = isDimmed && 'stroke' in themeLineStyle.dimmed ? themeLineStyle.dimmed.stroke : seriesColor;
|
|
10
|
+
const opacity = isDimmed && 'opacity' in themeLineStyle.dimmed
|
|
11
|
+
? themeLineStyle.dimmed.opacity * themeLineStyle.opacity
|
|
12
|
+
: themeLineStyle.opacity;
|
|
13
|
+
const width = isDimmed && 'strokeWidth' in themeLineStyle.dimmed
|
|
14
|
+
? themeLineStyle.dimmed.strokeWidth
|
|
15
|
+
: isFocused && 'strokeWidth' in themeLineStyle.focused
|
|
16
|
+
? themeLineStyle.focused.strokeWidth
|
|
17
|
+
: themeLineStyle.strokeWidth;
|
|
18
|
+
const color = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(strokeColor, themeLineStyle.stroke)), (currentColorOpacity) => currentColorOpacity * opacity);
|
|
8
19
|
return {
|
|
9
|
-
color
|
|
10
|
-
width
|
|
20
|
+
color,
|
|
21
|
+
width,
|
|
11
22
|
dash: themeLineStyle.dash,
|
|
12
23
|
};
|
|
13
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/line.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/line.ts"],"names":[],"mappings":";;AAsBA,0CA8BC;AA5CD,yFAA4F;AAE5F,wDAAkE;AAYlE,SAAgB,eAAe,CAC7B,WAAmB,EACnB,cAAyB,EACzB,cAAsC;IAEtC,MAAM,QAAQ,GAAG,cAAc,KAAK,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,cAAc,KAAK,SAAS,CAAC;IAE/C,MAAM,WAAW,GAAG,QAAQ,IAAI,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/G,MAAM,OAAO,GACX,QAAQ,IAAI,SAAS,IAAI,cAAc,CAAC,MAAM;QAC5C,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO;QACxD,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;IAE7B,MAAM,KAAK,GACT,QAAQ,IAAI,aAAa,IAAI,cAAc,CAAC,MAAM;QAChD,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW;QACnC,CAAC,CAAC,SAAS,IAAI,aAAa,IAAI,cAAc,CAAC,OAAO;YACpD,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW;YACpC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC;IAEnC,MAAM,KAAK,GAAG,IAAA,wCAAe,EAC3B,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,EACpE,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,GAAG,OAAO,CACvD,CAAC;IACF,OAAO;QACL,KAAK;QACL,KAAK;QACL,IAAI,EAAE,cAAc,CAAC,IAAI;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -28,7 +28,7 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBa
|
|
|
28
28
|
lines.push(y1Line);
|
|
29
29
|
if (y0Line)
|
|
30
30
|
lines.push(y0Line);
|
|
31
|
-
const { pointGeometries, indexedGeometryMap, minDistanceBetweenPoints } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point,
|
|
31
|
+
const { pointGeometries, indexedGeometryMap, minDistanceBetweenPoints } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point, true, isBandedSpec, markSizeOptions, false, pointStyleAccessor);
|
|
32
32
|
const areaGeometry = {
|
|
33
33
|
area: pathGenerator(dataSeries.data) || '',
|
|
34
34
|
lines,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":";;AA0BA,
|
|
1
|
+
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":";;AA0BA,gCA8EC;AAhGD,uCAAgC;AAEhC,qCAAwC;AAExC,mCAAwH;AAIxH,kDAAwD;AAMxD,4CAAoE;AAIpE,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAAmC,EACnC,MAAuB,EACvB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,YAAqB,EACrB,YAAoB,EACpB,KAAsB,EACtB,eAAgC,EAChC,SAAkB,EAClB,MAAe,EACf,kBAAuC;IAKvC,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAC3C,MAAM,eAAe,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAA,eAAI,GAAmB;SAC1C,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;SAC5C,EAAE,CAAC,IAAI,CAAC;SACR,EAAE,CAAC,IAAI,CAAC;SACR,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACxG,CAAC,CAAC;SACD,KAAK,CAAC,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC,CAAC;IAGjC,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9E,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,YAAY,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE/B,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,GAAG,IAAA,qBAAY,EACpF,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,KAAK,CAAC,KAAK,EACX,IAAI,EACJ,YAAY,EACZ,eAAe,EACf,KAAK,EACL,kBAAkB,CACnB,CAAC;IAEF,MAAM,YAAY,GAAiB;QACjC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE;QAC1C,KAAK;QACL,MAAM,EAAE,eAAe;QACvB,KAAK;QACL,SAAS,EAAE;YACT,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,KAAK;SACT;QACD,gBAAgB,EAAE,IAAA,0CAAiC,EAAC,UAAU,CAAC;QAC/D,KAAK;QACL,SAAS;QACT,aAAa;QACb,UAAU,EAAE,MAAM;QAClB,MAAM;QACN,gBAAgB,EAAE,wBAAwB;KAC3C,CAAC;IACF,OAAO;QACL,YAAY;QACZ,kBAAkB;KACnB,CAAC;AACJ,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.renderBubble = renderBubble;
|
|
|
4
4
|
const points_1 = require("./points");
|
|
5
5
|
const series_1 = require("../utils/series");
|
|
6
6
|
function renderBubble(shift, dataSeries, xScale, yScale, color, panel, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, isMixedChart, pointStyleAccessor) {
|
|
7
|
-
const { pointGeometries, indexedGeometryMap } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point,
|
|
7
|
+
const { pointGeometries, indexedGeometryMap } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, false, hasY0Accessors, markSizeOptions, !isMixedChart, pointStyleAccessor);
|
|
8
8
|
const bubbleGeometry = {
|
|
9
9
|
points: pointGeometries,
|
|
10
10
|
color,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bubble.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bubble.ts"],"names":[],"mappings":";;AAqBA,
|
|
1
|
+
{"version":3,"file":"bubble.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bubble.ts"],"names":[],"mappings":";;AAqBA,oCA0CC;AAvDD,qCAAwC;AASxC,4CAAoE;AAIpE,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAAmC,EACnC,MAAuB,EACvB,KAAY,EACZ,KAAiB,EACjB,cAAuB,EACvB,YAAoB,EACpB,WAA8B,EAC9B,eAAgC,EAChC,YAAqB,EACrB,kBAAuC;IAKvC,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,KAAK,EACL,cAAc,EACd,eAAe,EACf,CAAC,YAAY,EACb,kBAAkB,CACnB,CAAC;IAEF,MAAM,cAAc,GAAG;QACrB,MAAM,EAAE,eAAe;QACvB,KAAK;QACL,gBAAgB,EAAE,IAAA,0CAAiC,EAAC,UAAU,CAAC;QAC/D,gBAAgB,EAAE,WAAW,CAAC,KAAK;KACpC,CAAC;IACF,OAAO;QACL,cAAc;QACd,kBAAkB;KACnB,CAAC;AACJ,CAAC"}
|
|
@@ -15,7 +15,7 @@ function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
15
15
|
.y(y1Fn)
|
|
16
16
|
.defined((datum) => definedFn(datum, y1Accessor))
|
|
17
17
|
.curve((0, curves_1.getCurveFactory)(curve));
|
|
18
|
-
const { pointGeometries, indexedGeometryMap, minDistanceBetweenPoints } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point,
|
|
18
|
+
const { pointGeometries, indexedGeometryMap, minDistanceBetweenPoints } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point, true, hasY0Accessors, markSizeOptions, false, pointStyleAccessor);
|
|
19
19
|
const clippedRanges = (0, utils_1.getClippedRanges)(dataSeries.data, xScale, xScaleOffset);
|
|
20
20
|
const lineGeometry = {
|
|
21
21
|
line: pathGenerator(dataSeries.data) || '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/line.ts"],"names":[],"mappings":";;AA0BA,
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/line.ts"],"names":[],"mappings":";;AA0BA,gCA8DC;AAhFD,uCAAgC;AAEhC,qCAAwC;AAExC,mCAAoG;AAIpG,kDAAwD;AAMxD,4CAAoE;AAIpE,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAAmC,EACnC,MAAuB,EACvB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,cAAuB,EACvB,YAAoB,EACpB,KAAsB,EACtB,eAAgC,EAChC,MAAe,EACf,kBAAuC;IAKvC,MAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAEtC,MAAM,aAAa,GAAG,IAAA,eAAI,GAAmB;SAC1C,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;SAC5C,CAAC,CAAC,IAAI,CAAC;SACP,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAChD,KAAK,CAAC,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC,CAAC;IAEjC,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,GAAG,IAAA,qBAAY,EACpF,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,KAAK,CAAC,KAAK,EACX,IAAI,EACJ,cAAc,EACd,eAAe,EACf,KAAK,EACL,kBAAkB,CACnB,CAAC;IAGF,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9E,MAAM,YAAY,GAAiB;QACjC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE;QAC1C,MAAM,EAAE,eAAe;QACvB,KAAK;QACL,SAAS,EAAE;YACT,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,CAAC;SACL;QACD,gBAAgB,EAAE,IAAA,0CAAiC,EAAC,UAAU,CAAC;QAC/D,KAAK;QACL,aAAa;QACb,UAAU,EAAE,MAAM;QAClB,MAAM;QACN,gBAAgB,EAAE,wBAAwB;KAC3C,CAAC;IACF,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,CAAC;AAC9C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"point_style.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/point_style.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"point_style.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/point_style.ts"],"names":[],"mappings":";;AAiBA,4DAeC;AAvBD,mFAAsF;AAEtF,kDAA0E;AAG1E,uDAAyD;AAGzD,SAAgB,wBAAwB,CACtC,KAAa,EACb,eAA2C,EAC3C,SAAwC;IAExC,MAAM,UAAU,GAAG,IAAA,qBAAY,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACvE,OAAO;QACL,IAAI,EAAE,EAAE,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE;QACrG,MAAM,EAAE;YACN,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC;YAC7F,KAAK,EAAE,UAAU,CAAC,WAAW;SAC9B;QACD,KAAK,EAAE,UAAU,CAAC,KAAK,IAAI,kBAAU,CAAC,MAAM;KAC7C,CAAC;AACJ,CAAC"}
|
|
@@ -16,7 +16,7 @@ const specs_1 = require("../utils/specs");
|
|
|
16
16
|
function isolatedPointRadius(lineStrokeWidth) {
|
|
17
17
|
return lineStrokeWidth + 0.5;
|
|
18
18
|
}
|
|
19
|
-
function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyle,
|
|
19
|
+
function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyle, considerIsolatedPoints, isBandedSpec, markSizeOptions, useSpatialIndex, styleAccessor) {
|
|
20
20
|
const indexedGeometryMap = new indexed_geometry_map_1.IndexedGeometryMap();
|
|
21
21
|
const getRadius = markSizeOptions.enabled
|
|
22
22
|
? getRadiusFn(dataSeries.data, pointStyle.strokeWidth, markSizeOptions.ratio)
|
|
@@ -27,7 +27,6 @@ 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
|
-
let isolatedPointStyle = (0, point_style_1.buildPointGeometryStyles)(color, isolatedPointThemeStyle);
|
|
31
30
|
let styleOverrides = undefined;
|
|
32
31
|
const { pointGeometries, minDistanceBetweenPoints } = dataSeries.data.reduce((acc, datum, dataIndex) => {
|
|
33
32
|
const { x: xValue, mark } = datum;
|
|
@@ -44,27 +43,26 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
|
|
|
44
43
|
acc.prevX = x;
|
|
45
44
|
const yDatumKeyNames = isBandedSpec ? ['y0', 'y1'] : ['y1'];
|
|
46
45
|
const seriesIdentifier = (0, series_1.getSeriesIdentifierFromDataSeries)(dataSeries);
|
|
47
|
-
const isPointIsolated =
|
|
46
|
+
const isPointIsolated = considerIsolatedPoints
|
|
47
|
+
? isIsolatedPoint(dataIndex, dataSeries.data.length, datum, isBandedSpec, y1Fn, y0Fn, prev, next)
|
|
48
|
+
: false;
|
|
48
49
|
if (styleAccessor) {
|
|
49
50
|
styleOverrides = getPointStyleOverrides(datum, seriesIdentifier, isPointIsolated, styleAccessor);
|
|
50
51
|
style = (0, point_style_1.buildPointGeometryStyles)(color, pointStyle, styleOverrides);
|
|
51
|
-
isolatedPointStyle = (0, point_style_1.buildPointGeometryStyles)(color, isolatedPointThemeStyle, styleOverrides);
|
|
52
52
|
}
|
|
53
53
|
yDatumKeyNames.forEach((yDatumKeyName, keyIndex) => {
|
|
54
54
|
const valueAccessor = (0, utils_1.getYDatumValueFn)(yDatumKeyName);
|
|
55
55
|
const y = yDatumKeyName === 'y1' ? y1Fn(datum) : y0Fn(datum);
|
|
56
56
|
const originalY = getDatumYValue(datum, keyIndex === 0, isBandedSpec, dataSeries.stackMode);
|
|
57
|
-
const radius =
|
|
58
|
-
?
|
|
59
|
-
:
|
|
60
|
-
? Math.max(getRadius(mark), pointStyle.radius)
|
|
61
|
-
: styleOverrides?.radius ?? pointStyle.radius;
|
|
57
|
+
const radius = markSizeOptions.enabled
|
|
58
|
+
? Math.max(getRadius(mark), pointStyle.radius)
|
|
59
|
+
: styleOverrides?.radius ?? pointStyle.radius;
|
|
62
60
|
const pointGeometry = {
|
|
63
61
|
x,
|
|
64
62
|
y: y === null ? NaN : y,
|
|
65
63
|
radius,
|
|
66
64
|
color,
|
|
67
|
-
style
|
|
65
|
+
style,
|
|
68
66
|
value: {
|
|
69
67
|
x: xValue,
|
|
70
68
|
y: originalY,
|
|
@@ -140,17 +138,25 @@ function getRadiusFn(data, lineWidth, markSizeRatio = 50) {
|
|
|
140
138
|
return circleRadius ? Math.sqrt(circleRadius + baseMagicNumber) + lineWidth : lineWidth;
|
|
141
139
|
};
|
|
142
140
|
}
|
|
143
|
-
function
|
|
144
|
-
return datum.filled?.
|
|
141
|
+
function isInitialDatumDefined(datum, isBandedSpec, y1Scale, y0Scale) {
|
|
142
|
+
return ((0, common_1.isNil)(datum.filled?.x) &&
|
|
143
|
+
(0, common_1.isNil)(datum.filled?.y1) &&
|
|
144
|
+
(0, common_1.isFiniteNumber)(datum.initialY1) &&
|
|
145
|
+
(0, common_1.isFiniteNumber)(y1Scale(datum)) &&
|
|
146
|
+
(isBandedSpec ? (0, common_1.isNil)(datum.filled?.y0) && (0, common_1.isFiniteNumber)(datum.initialY0) && (0, common_1.isFiniteNumber)(y0Scale(datum)) : true));
|
|
145
147
|
}
|
|
146
|
-
function isIsolatedPoint(index, length,
|
|
147
|
-
if (
|
|
148
|
+
function isIsolatedPoint(index, length, current, isBandedSpec, y1Scale, y0Scale, prev, next) {
|
|
149
|
+
if (!isInitialDatumDefined(current, isBandedSpec, y1Scale, y0Scale)) {
|
|
148
150
|
return true;
|
|
149
151
|
}
|
|
150
|
-
|
|
152
|
+
const isNextNotDefined = (0, common_1.isNil)(next) || !isInitialDatumDefined(next, isBandedSpec, y1Scale, y0Scale);
|
|
153
|
+
if (index === 0 && isNextNotDefined) {
|
|
151
154
|
return true;
|
|
152
155
|
}
|
|
153
|
-
|
|
154
|
-
|
|
156
|
+
const isPrevNotDefined = (0, common_1.isNil)(prev) || !isInitialDatumDefined(prev, isBandedSpec, y1Scale, y0Scale);
|
|
157
|
+
if (index === length - 1 && isPrevNotDefined) {
|
|
158
|
+
return true;
|
|
159
|
+
}
|
|
160
|
+
return isNextNotDefined && isPrevNotDefined;
|
|
155
161
|
}
|
|
156
162
|
//# sourceMappingURL=points.js.map
|