@elastic/charts 40.1.0 → 41.0.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/CHANGELOG.md +50 -0
- package/NOTICE.txt +1 -1
- package/dist/chart_types/goal_chart/layout/config/config.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js +1 -1
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/geoms.js +14 -14
- package/dist/chart_types/goal_chart/layout/viewmodel/geoms.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.d.ts +1 -7
- package/dist/chart_types/goal_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.js.map +1 -1
- package/dist/chart_types/goal_chart/state/selectors/geometries.js +2 -2
- package/dist/chart_types/goal_chart/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/goal_chart/state/selectors/scenegraph.js +1 -22
- package/dist/chart_types/goal_chart/state/selectors/scenegraph.js.map +1 -1
- package/dist/chart_types/heatmap/layout/types/viewmodel_types.d.ts.map +1 -1
- package/dist/chart_types/heatmap/layout/types/viewmodel_types.js +3 -3
- package/dist/chart_types/heatmap/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.d.ts.map +1 -1
- package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.js +31 -29
- package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/canvas/canvas_renderers.js +17 -19
- package/dist/chart_types/heatmap/renderer/canvas/canvas_renderers.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/canvas/connected_component.js +2 -3
- package/dist/chart_types/heatmap/renderer/canvas/connected_component.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/dom/highlighter.js +3 -3
- package/dist/chart_types/heatmap/renderer/dom/highlighter.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/dom/highlighter_brush.js +3 -3
- package/dist/chart_types/heatmap/renderer/dom/highlighter_brush.js.map +1 -1
- package/dist/chart_types/heatmap/specs/heatmap.d.ts +18 -4
- package/dist/chart_types/heatmap/specs/heatmap.d.ts.map +1 -1
- package/dist/chart_types/heatmap/specs/heatmap.js +5 -2
- package/dist/chart_types/heatmap/specs/heatmap.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/compute_chart_dimensions.js +18 -17
- package/dist/chart_types/heatmap/state/selectors/compute_chart_dimensions.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/geometries.js +4 -6
- package/dist/chart_types/heatmap/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_brushed_highlighted_shapes.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_brushed_highlighted_shapes.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_debug_state.js +10 -2
- package/dist/chart_types/heatmap/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_grid_full_height.js +3 -9
- package/dist/chart_types/heatmap/state/selectors/get_grid_full_height.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_container_size.js +3 -3
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_container_size.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_spec.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_table.js +6 -8
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_table.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_highlighted_area.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_highlighted_area.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_picked_cells.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_picked_cells.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_x_axis_right_overflow.js +5 -5
- package/dist/chart_types/heatmap/state/selectors/get_x_axis_right_overflow.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/is_brush_available.js +5 -4
- package/dist/chart_types/heatmap/state/selectors/is_brush_available.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/on_brush_end_caller.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/picked_shapes.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/picked_shapes.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/scenegraph.js +2 -19
- package/dist/chart_types/heatmap/state/selectors/scenegraph.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/tooltip.js +5 -6
- package/dist/chart_types/heatmap/state/selectors/tooltip.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/config.d.ts +2 -0
- package/dist/chart_types/partition_chart/layout/config.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/layout/config.js +8 -8
- package/dist/chart_types/partition_chart/layout/config.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/config.d.ts +56 -0
- package/dist/chart_types/partition_chart/layout/types/config.d.ts.map +1 -0
- package/dist/chart_types/{wordcloud/layout/types/config_types.js → partition_chart/layout/types/config.js} +1 -1
- package/dist/chart_types/partition_chart/layout/types/config.js.map +1 -0
- package/dist/chart_types/partition_chart/layout/types/config_types.d.ts +6 -87
- package/dist/chart_types/partition_chart/layout/types/config_types.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/config_types.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/viewmodel_types.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/viewmodel_types.js +46 -34
- package/dist/chart_types/partition_chart/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/utils/circline_geometry.js +3 -2
- package/dist/chart_types/partition_chart/layout/utils/circline_geometry.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/fill_text_layout.js +4 -5
- package/dist/chart_types/partition_chart/layout/viewmodel/fill_text_layout.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/hierarchy_of_arrays.js +3 -4
- package/dist/chart_types/partition_chart/layout/viewmodel/hierarchy_of_arrays.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/link_text_layout.js +8 -7
- package/dist/chart_types/partition_chart/layout/viewmodel/link_text_layout.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/scenegraph.js +5 -20
- package/dist/chart_types/partition_chart/layout/viewmodel/scenegraph.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/viewmodel.js +34 -28
- package/dist/chart_types/partition_chart/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_linear_renderers.js +2 -2
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_linear_renderers.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_renderers.js +7 -9
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_renderers.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_wrapped_renderers.js +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_wrapped_renderers.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/partition.js +6 -6
- package/dist/chart_types/partition_chart/renderer/canvas/partition.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/dom/highlighter.js +7 -8
- package/dist/chart_types/partition_chart/renderer/dom/highlighter.js.map +1 -1
- package/dist/chart_types/partition_chart/specs/index.d.ts +22 -5
- package/dist/chart_types/partition_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/specs/index.js +10 -1
- package/dist/chart_types/partition_chart/specs/index.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/compute_legend.js +1 -1
- package/dist/chart_types/partition_chart/state/selectors/compute_legend.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/drilldown_active.js +4 -2
- package/dist/chart_types/partition_chart/state/selectors/drilldown_active.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/geometries.js +18 -24
- package/dist/chart_types/partition_chart/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/get_chart_type_description.js +1 -1
- package/dist/chart_types/partition_chart/state/selectors/get_chart_type_description.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/get_debug_state.js +2 -2
- package/dist/chart_types/partition_chart/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/tree.js +3 -6
- package/dist/chart_types/partition_chart/state/selectors/tree.js.map +1 -1
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.d.ts +11 -11
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.d.ts.map +1 -1
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.js +2 -4
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/wordcloud/layout/viewmodel/viewmodel.js +5 -5
- package/dist/chart_types/wordcloud/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/wordcloud/renderer/svg/connected_component.js +37 -54
- package/dist/chart_types/wordcloud/renderer/svg/connected_component.js.map +1 -1
- package/dist/chart_types/wordcloud/specs/index.d.ts +3 -20
- package/dist/chart_types/wordcloud/specs/index.d.ts.map +1 -1
- package/dist/chart_types/wordcloud/specs/index.js +1 -2
- package/dist/chart_types/wordcloud/specs/index.js.map +1 -1
- package/dist/chart_types/wordcloud/state/selectors/geometries.js +3 -2
- package/dist/chart_types/wordcloud/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/wordcloud/state/selectors/scenegraph.js +2 -16
- package/dist/chart_types/wordcloud/state/selectors/scenegraph.js.map +1 -1
- package/dist/chart_types/xy_chart/domains/y_domain.js +2 -2
- package/dist/chart_types/xy_chart/domains/y_domain.js.map +1 -1
- package/dist/chart_types/xy_chart/legend/legend.js +1 -1
- package/dist/chart_types/xy_chart/legend/legend.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js +26 -13
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js +14 -6
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/primitives/path.js +6 -21
- package/dist/chart_types/xy_chart/renderer/canvas/primitives/path.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js +2 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/values/bar.js +6 -5
- package/dist/chart_types/xy_chart/renderer/canvas/values/bar.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/area.js +6 -9
- 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 +4 -5
- package/dist/chart_types/xy_chart/rendering/line.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/points.js +5 -6
- package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js +10 -9
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/xy_chart/state/utils/utils.js +5 -5
- package/dist/chart_types/xy_chart/state/utils/utils.js.map +1 -1
- package/dist/chart_types/xy_chart/tooltip/tooltip.js +1 -1
- package/dist/chart_types/xy_chart/tooltip/tooltip.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/diverging_offsets.d.ts +2 -0
- package/dist/chart_types/xy_chart/utils/diverging_offsets.d.ts.map +1 -0
- package/dist/chart_types/xy_chart/utils/diverging_offsets.js +134 -0
- package/dist/chart_types/xy_chart/utils/diverging_offsets.js.map +1 -0
- package/dist/chart_types/xy_chart/utils/series.js +12 -10
- package/dist/chart_types/xy_chart/utils/series.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.js +1 -5
- package/dist/chart_types/xy_chart/utils/specs.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/stacked_series_utils.js +73 -69
- package/dist/chart_types/xy_chart/utils/stacked_series_utils.js.map +1 -1
- package/dist/common/color_library_wrappers.d.ts +4 -3
- package/dist/common/color_library_wrappers.d.ts.map +1 -1
- package/dist/common/color_library_wrappers.js.map +1 -1
- package/dist/common/colors.js.map +1 -1
- package/dist/common/fill_text_color.js +13 -6
- package/dist/common/fill_text_color.js.map +1 -1
- package/dist/components/accessibility/partitions_data_table.js +1 -1
- package/dist/components/accessibility/partitions_data_table.js.map +1 -1
- package/dist/index.d.ts +6 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/specs/constants.d.ts.map +1 -1
- package/dist/specs/constants.js +1 -0
- package/dist/specs/constants.js.map +1 -1
- package/dist/specs/settings.d.ts +8 -1
- package/dist/specs/settings.d.ts.map +1 -1
- package/dist/specs/settings.js.map +1 -1
- package/dist/state/selectors/get_chart_theme.js +13 -2
- package/dist/state/selectors/get_chart_theme.js.map +1 -1
- package/dist/state/selectors/get_legend_config_selector.js +2 -1
- package/dist/state/selectors/get_legend_config_selector.js.map +1 -1
- package/dist/state/selectors/get_legend_size.js +11 -2
- package/dist/state/selectors/get_legend_size.js.map +1 -1
- package/dist/utils/common.d.ts +4 -0
- package/dist/utils/common.d.ts.map +1 -1
- package/dist/utils/common.js +1 -0
- package/dist/utils/common.js.map +1 -1
- package/dist/utils/dimensions.d.ts +4 -1
- package/dist/utils/dimensions.d.ts.map +1 -1
- package/dist/utils/dimensions.js.map +1 -1
- package/dist/utils/geometry.js.map +1 -1
- package/dist/utils/themes/dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/dark_theme.js +157 -2
- package/dist/utils/themes/dark_theme.js.map +1 -1
- package/dist/utils/themes/light_theme.d.ts.map +1 -1
- package/dist/utils/themes/light_theme.js +154 -0
- package/dist/utils/themes/light_theme.js.map +1 -1
- package/dist/utils/themes/partition.d.ts +73 -0
- package/dist/utils/themes/partition.d.ts.map +1 -0
- package/dist/{chart_types/heatmap/layout/types/config_types.js → utils/themes/partition.js} +1 -1
- package/dist/utils/themes/partition.js.map +1 -0
- package/dist/utils/themes/theme.d.ts +117 -1
- package/dist/utils/themes/theme.d.ts.map +1 -1
- package/dist/utils/themes/theme.js.map +1 -1
- package/package.json +2 -2
- package/dist/chart_types/goal_chart/layout/types/config_types.d.ts +0 -22
- package/dist/chart_types/goal_chart/layout/types/config_types.d.ts.map +0 -1
- package/dist/chart_types/goal_chart/layout/types/config_types.js +0 -3
- package/dist/chart_types/goal_chart/layout/types/config_types.js.map +0 -1
- package/dist/chart_types/heatmap/layout/config/config.d.ts +0 -2
- package/dist/chart_types/heatmap/layout/config/config.d.ts.map +0 -1
- package/dist/chart_types/heatmap/layout/config/config.js +0 -92
- package/dist/chart_types/heatmap/layout/config/config.js.map +0 -1
- package/dist/chart_types/heatmap/layout/types/config_types.d.ts +0 -101
- package/dist/chart_types/heatmap/layout/types/config_types.d.ts.map +0 -1
- package/dist/chart_types/heatmap/layout/types/config_types.js.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.d.ts +0 -2
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.d.ts.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.js +0 -9
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.js.map +0 -1
- package/dist/chart_types/wordcloud/layout/config/config.d.ts +0 -2
- package/dist/chart_types/wordcloud/layout/config/config.d.ts.map +0 -1
- package/dist/chart_types/wordcloud/layout/config/config.js +0 -27
- package/dist/chart_types/wordcloud/layout/config/config.js.map +0 -1
- package/dist/chart_types/wordcloud/layout/types/config_types.d.ts +0 -17
- package/dist/chart_types/wordcloud/layout/types/config_types.d.ts.map +0 -1
- package/dist/chart_types/wordcloud/layout/types/config_types.js.map +0 -1
|
@@ -1,41 +1,26 @@
|
|
|
1
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
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
3
|
exports.renderAreaPath = exports.renderLinePaths = void 0;
|
|
15
4
|
var color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
16
5
|
var canvas_1 = require("../../../../../renderers/canvas");
|
|
17
6
|
var line_1 = require("./line");
|
|
18
|
-
function renderLinePaths(ctx, transform, linePaths, stroke, clippedRanges, clippings,
|
|
19
|
-
if (hideClippedRanges === void 0) { hideClippedRanges = false; }
|
|
7
|
+
function renderLinePaths(ctx, transform, linePaths, stroke, fitStroke, clippedRanges, clippings, shouldClip) {
|
|
20
8
|
(0, canvas_1.withClipRanges)(ctx, clippedRanges, clippings, false, function () {
|
|
21
9
|
ctx.translate(transform.x, transform.y);
|
|
22
10
|
(0, line_1.renderMultiLine)(ctx, linePaths, stroke);
|
|
23
11
|
});
|
|
24
|
-
if (clippedRanges.length > 0 &&
|
|
12
|
+
if (clippedRanges.length > 0 && shouldClip) {
|
|
25
13
|
(0, canvas_1.withClipRanges)(ctx, clippedRanges, clippings, true, function () {
|
|
26
14
|
ctx.translate(transform.x, transform.y);
|
|
27
|
-
(0, line_1.renderMultiLine)(ctx, linePaths,
|
|
15
|
+
(0, line_1.renderMultiLine)(ctx, linePaths, fitStroke);
|
|
28
16
|
});
|
|
29
17
|
}
|
|
30
18
|
}
|
|
31
19
|
exports.renderLinePaths = renderLinePaths;
|
|
32
|
-
function renderAreaPath(ctx, transform, area, fill, clippedRanges, clippings,
|
|
33
|
-
if (hideClippedRanges === void 0) { hideClippedRanges = false; }
|
|
20
|
+
function renderAreaPath(ctx, transform, area, fill, fitFill, clippedRanges, clippings, shouldClip) {
|
|
34
21
|
(0, canvas_1.withClipRanges)(ctx, clippedRanges, clippings, false, function () { return renderPathFill(ctx, area, fill, transform); });
|
|
35
|
-
if (clippedRanges.length > 0 &&
|
|
36
|
-
(0, canvas_1.withClipRanges)(ctx, clippedRanges, clippings, true, function () {
|
|
37
|
-
return renderPathFill(ctx, area, __assign(__assign({}, fill), { color: (0, color_library_wrappers_1.overrideOpacity)(fill.color, fill.color[3] / 2) }), transform);
|
|
38
|
-
});
|
|
22
|
+
if (clippedRanges.length > 0 && shouldClip) {
|
|
23
|
+
(0, canvas_1.withClipRanges)(ctx, clippedRanges, clippings, true, function () { return renderPathFill(ctx, area, fitFill, transform); });
|
|
39
24
|
}
|
|
40
25
|
}
|
|
41
26
|
exports.renderAreaPath = renderAreaPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/primitives/path.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/primitives/path.ts"],"names":[],"mappings":";;;AAQA,uFAAiF;AAEjF,0DAAiE;AAGjE,+BAAyC;AAGzC,SAAgB,eAAe,CAC7B,GAA6B,EAC7B,SAAgB,EAChB,SAAwB,EACxB,MAAc,EACd,SAAiB,EACjB,aAA4B,EAC5B,SAAe,EACf,UAAmB;IAEnB,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE;QACnD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QACxC,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,EAAE;QAC1C,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE;YAClD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACxC,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AApBD,0CAoBC;AAGD,SAAgB,cAAc,CAC5B,GAA6B,EAC7B,SAAgB,EAChB,IAAY,EACZ,IAAU,EACV,OAAa,EACb,aAA4B,EAC5B,SAAe,EACf,UAAmB;IAEnB,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE,cAAM,OAAA,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,EAA1C,CAA0C,CAAC,CAAC;IACvG,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,EAAE;QAC1C,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,cAAM,OAAA,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAA7C,CAA6C,CAAC,CAAC;KAC1G;AACH,CAAC;AAdD,wCAcC;AAED,SAAS,cAAc,CAAC,GAA6B,EAAE,IAAY,EAAE,IAAU,EAAE,EAAe;QAAb,CAAC,OAAA,EAAE,CAAC,OAAA;IACrF,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpB,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,GAAG,CAAC,SAAS,GAAG,IAAA,0CAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjB,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAClB;AACH,CAAC"}
|
|
@@ -16,7 +16,7 @@ function renderXYChartCanvas2d(ctx, dpr, clippings, props) {
|
|
|
16
16
|
var imgCanvas = document.createElement('canvas');
|
|
17
17
|
(0, canvas_1.withContext)(ctx, function () {
|
|
18
18
|
ctx.scale(dpr, dpr);
|
|
19
|
-
var renderingArea = props.renderingArea, chartTransform = props.chartTransform, rotation = props.rotation, geometries = props.geometries, geometriesIndex = props.geometriesIndex, _a = props.theme, sharedAxesStyle = _a.axes, sharedStyle = _a.sharedStyle, barSeriesStyle = _a.barSeriesStyle, highlightedLegendItem = props.highlightedLegendItem, annotationDimensions = props.annotationDimensions, annotationSpecs = props.annotationSpecs, perPanelAxisGeoms = props.perPanelAxisGeoms, perPanelGridLines = props.perPanelGridLines, axesSpecs = props.axesSpecs, axesStyles = props.axesStyles, debug = props.debug, panelGeoms = props.panelGeoms;
|
|
19
|
+
var renderingArea = props.renderingArea, chartTransform = props.chartTransform, rotation = props.rotation, geometries = props.geometries, geometriesIndex = props.geometriesIndex, _a = props.theme, sharedAxesStyle = _a.axes, sharedStyle = _a.sharedStyle, barSeriesStyle = _a.barSeriesStyle, background = _a.background, highlightedLegendItem = props.highlightedLegendItem, annotationDimensions = props.annotationDimensions, annotationSpecs = props.annotationSpecs, perPanelAxisGeoms = props.perPanelAxisGeoms, perPanelGridLines = props.perPanelGridLines, axesSpecs = props.axesSpecs, axesStyles = props.axesStyles, debug = props.debug, panelGeoms = props.panelGeoms;
|
|
20
20
|
var transform = { x: renderingArea.left + chartTransform.x, y: renderingArea.top + chartTransform.y };
|
|
21
21
|
(0, canvas_1.renderLayers)(ctx, [
|
|
22
22
|
function () { return (0, canvas_1.clearCanvas)(ctx, 'transparent'); },
|
|
@@ -84,6 +84,7 @@ function renderXYChartCanvas2d(ctx, dpr, clippings, props) {
|
|
|
84
84
|
rotation: rotation,
|
|
85
85
|
debug: debug,
|
|
86
86
|
barSeriesStyle: barSeriesStyle,
|
|
87
|
+
background: background,
|
|
87
88
|
});
|
|
88
89
|
});
|
|
89
90
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":";;;AAQA,oDAAmD;AAEnD,uDAAwG;AACxG,6CAAkD;AAClD,iCAAsC;AACtC,+BAAoC;AACpC,qCAA0C;AAC1C,iCAAsC;AACtC,iCAAsC;AACtC,0CAA0E;AAC1E,uCAAgD;AAChD,oCAA+C;AAI/C,SAAgB,qBAAqB,CACnC,GAA6B,EAC7B,GAAW,EACX,SAAe,EACf,KAA8B;IAE9B,IAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEnD,IAAA,oBAAW,EAAC,GAAG,EAAE;QAEf,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAElB,IAAA,aAAa,GAeX,KAAK,cAfM,EACb,cAAc,GAcZ,KAAK,eAdO,EACd,QAAQ,GAaN,KAAK,SAbC,EACR,UAAU,GAYR,KAAK,WAZG,EACV,eAAe,GAWb,KAAK,gBAXQ,EACf,KAUE,KAAK,
|
|
1
|
+
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ var CHART_DIRECTION = {
|
|
|
26
26
|
RightToLeft: -90,
|
|
27
27
|
};
|
|
28
28
|
function renderBarValues(ctx, props) {
|
|
29
|
-
var bars = props.bars, debug = props.debug, rotation = props.rotation, renderingArea = props.renderingArea, barSeriesStyle = props.barSeriesStyle, panel = props.panel;
|
|
29
|
+
var bars = props.bars, debug = props.debug, rotation = props.rotation, renderingArea = props.renderingArea, barSeriesStyle = props.barSeriesStyle, panel = props.panel, background = props.background;
|
|
30
30
|
var _a = barSeriesStyle.displayValue, fontFamily = _a.fontFamily, fontStyle = _a.fontStyle, fill = _a.fill, alignment = _a.alignment;
|
|
31
31
|
bars.forEach(function (bar) {
|
|
32
32
|
if (!bar.displayValue) {
|
|
@@ -34,7 +34,7 @@ function renderBarValues(ctx, props) {
|
|
|
34
34
|
}
|
|
35
35
|
var _a = bar.displayValue, text = _a.text, fontSize = _a.fontSize, fontScale = _a.fontScale, overflowConstraints = _a.overflowConstraints, isValueContainedInElement = _a.isValueContainedInElement;
|
|
36
36
|
var shadowSize = getTextBorderSize(fill);
|
|
37
|
-
var _b = getTextColors(fill, bar.color), fillColor = _b.fillColor, shadowColor = _b.shadowColor;
|
|
37
|
+
var _b = getTextColors(fill, bar.color, background), fillColor = _b.fillColor, shadowColor = _b.shadowColor;
|
|
38
38
|
var font = {
|
|
39
39
|
fontFamily: fontFamily,
|
|
40
40
|
fontStyle: fontStyle !== null && fontStyle !== void 0 ? fontStyle : 'normal',
|
|
@@ -149,7 +149,8 @@ function isOverflow(rect, chartDimensions, chartRotation) {
|
|
|
149
149
|
var cHeight = vertical ? chartDimensions.width : chartDimensions.height;
|
|
150
150
|
return rect.x < 0 || rect.x + rect.width > cWidth || rect.y < 0 || rect.y + rect.height > cHeight;
|
|
151
151
|
}
|
|
152
|
-
function getTextColors(fillDefinition, geometryColor) {
|
|
152
|
+
function getTextColors(fillDefinition, geometryColor, _a) {
|
|
153
|
+
var backgroundColor = _a.color, fallbackBGColor = _a.fallbackColor;
|
|
153
154
|
if (typeof fillDefinition === 'string') {
|
|
154
155
|
return { fillColor: fillDefinition, shadowColor: colors_1.Colors.Transparent.keyword };
|
|
155
156
|
}
|
|
@@ -159,8 +160,8 @@ function getTextColors(fillDefinition, geometryColor) {
|
|
|
159
160
|
shadowColor: fillDefinition.borderColor || colors_1.Colors.Transparent.keyword,
|
|
160
161
|
};
|
|
161
162
|
}
|
|
162
|
-
var fillColor = (0, fill_text_color_1.fillTextColor)(geometryColor);
|
|
163
|
-
var shadowColor = (0, fill_text_color_1.fillTextColor)(fillColor);
|
|
163
|
+
var fillColor = (0, fill_text_color_1.fillTextColor)(fallbackBGColor, geometryColor, backgroundColor);
|
|
164
|
+
var shadowColor = (0, fill_text_color_1.fillTextColor)(fallbackBGColor, fillColor, backgroundColor);
|
|
164
165
|
return {
|
|
165
166
|
fillColor: fillColor,
|
|
166
167
|
shadowColor: shadowColor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/values/bar.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,uDAAsD;AACtD,yEAAsE;AAGtE,sDAA+F;AAI/F,8CAA+D;AAC/D,2CAA2D;AAC3D,wCAAiD;AACjD,4DAA8D;
|
|
1
|
+
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/values/bar.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,7 @@ var d3_shape_1 = require("d3-shape");
|
|
|
5
5
|
var curves_1 = require("../../../utils/curves");
|
|
6
6
|
var points_1 = require("./points");
|
|
7
7
|
var utils_1 = require("./utils");
|
|
8
|
-
function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve,
|
|
9
|
-
if (isStacked === void 0) { isStacked = false; }
|
|
8
|
+
function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBandedSpec, xScaleOffset, style, markSizeOptions, isStacked, hasFit, pointStyleAccessor) {
|
|
10
9
|
var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
11
10
|
var y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
|
|
12
11
|
var definedFn = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|
|
@@ -21,18 +20,18 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
21
20
|
.y1(y1Fn)
|
|
22
21
|
.y0(y0Fn)
|
|
23
22
|
.defined(function (datum) {
|
|
24
|
-
return definedFn(datum, y1DatumAccessor) && (
|
|
23
|
+
return definedFn(datum, y1DatumAccessor) && (isBandedSpec ? definedFn(datum, y0DatumAccessor) : true);
|
|
25
24
|
})
|
|
26
25
|
.curve((0, curves_1.getCurveFactory)(curve));
|
|
27
26
|
var clippedRanges = (0, utils_1.getClippedRanges)(dataSeries.data, xScale, xScaleOffset);
|
|
28
27
|
var lines = [];
|
|
29
|
-
var y0Line =
|
|
28
|
+
var y0Line = isBandedSpec && pathGenerator.lineY0()(dataSeries.data);
|
|
30
29
|
var y1Line = pathGenerator.lineY1()(dataSeries.data);
|
|
31
30
|
if (y1Line)
|
|
32
31
|
lines.push(y1Line);
|
|
33
32
|
if (y0Line)
|
|
34
33
|
lines.push(y0Line);
|
|
35
|
-
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color,
|
|
34
|
+
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point, isBandedSpec, markSizeOptions, false, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
36
35
|
var areaGeometry = {
|
|
37
36
|
area: pathGenerator(dataSeries.data) || '',
|
|
38
37
|
lines: lines,
|
|
@@ -51,12 +50,10 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
51
50
|
smHorizontalAccessorValue: dataSeries.smHorizontalAccessorValue,
|
|
52
51
|
smVerticalAccessorValue: dataSeries.smVerticalAccessorValue,
|
|
53
52
|
},
|
|
54
|
-
|
|
55
|
-
seriesAreaLineStyle: seriesStyle.line,
|
|
56
|
-
seriesPointStyle: seriesStyle.point,
|
|
53
|
+
style: style,
|
|
57
54
|
isStacked: isStacked,
|
|
58
55
|
clippedRanges: clippedRanges,
|
|
59
|
-
|
|
56
|
+
shouldClip: hasFit,
|
|
60
57
|
};
|
|
61
58
|
return {
|
|
62
59
|
areaGeometry: areaGeometry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAOiB;AAGjB,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAOiB;AAGjB,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,YAAqB,EACrB,YAAoB,EACpB,KAAsB,EACtB,eAAgC,EAChC,SAAkB,EAClB,MAAe,EACf,kBAAuC;IAKvC,IAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,IAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,IAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,IAAM,eAAe,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAC3C,IAAM,eAAe,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAM,aAAa,GAAG,IAAA,eAAI,GAAmB;SAC1C,CAAC,CAAC,UAAC,EAAK;;YAAH,CAAC,OAAA;QAAO,OAAA,CAAC,MAAA,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,mCAAI,GAAG,CAAC,GAAG,YAAY,CAAA;KAAA,CAAC;SACrD,EAAE,CAAC,IAAI,CAAC;SACR,EAAE,CAAC,IAAI,CAAC;SACR,OAAO,CAAC,UAAC,KAAK;QACb,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,IAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9E,IAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAM,MAAM,GAAG,YAAY,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvE,IAAM,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;IAEzB,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,KAAK,CAAC,KAAK,EACX,YAAY,EACZ,eAAe,EACf,KAAK,EACL,kBAAkB,CACnB,EAZO,eAAe,qBAAA,EAAE,kBAAkB,wBAY1C,CAAC;IAEF,IAAM,YAAY,GAAiB;QACjC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE;QAC1C,KAAK,OAAA;QACL,MAAM,EAAE,eAAe;QACvB,KAAK,OAAA;QACL,SAAS,EAAE;YACT,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,KAAK;SACT;QACD,gBAAgB,EAAE;YAChB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;YAC/D,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;SAC5D;QACD,KAAK,OAAA;QACL,SAAS,WAAA;QACT,aAAa,eAAA;QACb,UAAU,EAAE,MAAM;KACnB,CAAC;IACF,OAAO;QACL,YAAY,cAAA;QACZ,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AAnFD,gCAmFC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.renderBubble = void 0;
|
|
4
4
|
var points_1 = require("./points");
|
|
5
5
|
function renderBubble(shift, dataSeries, xScale, yScale, color, panel, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, isMixedChart, pointStyleAccessor) {
|
|
6
|
-
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions,
|
|
6
|
+
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, !isMixedChart, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
7
7
|
var bubbleGeometry = {
|
|
8
8
|
points: pointGeometries,
|
|
9
9
|
color: color,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bubble.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bubble.ts"],"names":[],"mappings":";;;AAgBA,mCAAwC;AAIxC,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAY,EACZ,KAAiB,EACjB,cAAuB,EACvB,YAAoB,EACpB,WAA8B,EAC9B,eAAgC,EAChC,YAAqB,EACrB,kBAAuC;IAKjC,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"bubble.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bubble.ts"],"names":[],"mappings":";;;AAgBA,mCAAwC;AAIxC,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAY,EACZ,KAAiB,EACjB,cAAuB,EACvB,YAAoB,EACpB,WAA8B,EAC9B,eAAgC,EAChC,YAAqB,EACrB,kBAAuC;IAKjC,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,CAAC,YAAY,EACb,kBAAkB,CACnB,EAZO,eAAe,qBAAA,EAAE,kBAAkB,wBAY1C,CAAC;IAEF,IAAM,cAAc,GAAG;QACrB,MAAM,EAAE,eAAe;QACvB,KAAK,OAAA;QACL,gBAAgB,EAAE;YAChB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;YAC/D,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;SAC5D;QACD,gBAAgB,EAAE,WAAW,CAAC,KAAK;KACpC,CAAC;IACF,OAAO;QACL,cAAc,gBAAA;QACd,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AAjDD,oCAiDC"}
|
|
@@ -5,7 +5,7 @@ var d3_shape_1 = require("d3-shape");
|
|
|
5
5
|
var curves_1 = require("../../../utils/curves");
|
|
6
6
|
var points_1 = require("./points");
|
|
7
7
|
var utils_1 = require("./utils");
|
|
8
|
-
function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions,
|
|
8
|
+
function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, hasFit, pointStyleAccessor) {
|
|
9
9
|
var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
10
10
|
var definedFn = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|
|
11
11
|
var y1Accessor = (0, utils_1.getYDatumValueFn)();
|
|
@@ -17,7 +17,7 @@ function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
17
17
|
.y(y1Fn)
|
|
18
18
|
.defined(function (datum) { return definedFn(datum, y1Accessor); })
|
|
19
19
|
.curve((0, curves_1.getCurveFactory)(curve));
|
|
20
|
-
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
20
|
+
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, false, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
21
21
|
var clippedRanges = (0, utils_1.getClippedRanges)(dataSeries.data, xScale, xScaleOffset);
|
|
22
22
|
var lineGeometry = {
|
|
23
23
|
line: pathGenerator(dataSeries.data) || '',
|
|
@@ -36,10 +36,9 @@ function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
36
36
|
smHorizontalAccessorValue: dataSeries.smHorizontalAccessorValue,
|
|
37
37
|
smVerticalAccessorValue: dataSeries.smVerticalAccessorValue,
|
|
38
38
|
},
|
|
39
|
-
|
|
40
|
-
seriesPointStyle: seriesStyle.point,
|
|
39
|
+
style: seriesStyle,
|
|
41
40
|
clippedRanges: clippedRanges,
|
|
42
|
-
|
|
41
|
+
shouldClip: hasFit,
|
|
43
42
|
};
|
|
44
43
|
return {
|
|
45
44
|
lineGeometry: lineGeometry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/line.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAAqH;AAGrH,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,cAAuB,EACvB,YAAoB,EACpB,WAA4B,EAC5B,eAAgC,EAChC,
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/line.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAAqH;AAGrH,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,cAAuB,EACvB,YAAoB,EACpB,WAA4B,EAC5B,eAAgC,EAChC,MAAe,EACf,kBAAuC;IAKvC,IAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,IAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,IAAM,UAAU,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAEtC,IAAM,aAAa,GAAG,IAAA,eAAI,GAAmB;SAC1C,CAAC,CAAC,UAAC,EAAK;YAAH,CAAC,OAAA;QAAO,OAAA,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY;IAA9B,CAA8B,CAAC;SAC5C,CAAC,CAAC,IAAI,CAAC;SACP,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,EAA5B,CAA4B,CAAC;SAChD,KAAK,CAAC,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC,CAAC;IAE3B,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,KAAK,EACL,kBAAkB,CACnB,EAZO,eAAe,qBAAA,EAAE,kBAAkB,wBAY1C,CAAC;IAGF,IAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9E,IAAM,YAAY,GAAG;QACnB,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE;QAC1C,MAAM,EAAE,eAAe;QACvB,KAAK,OAAA;QACL,SAAS,EAAE;YACT,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,CAAC;SACL;QACD,gBAAgB,EAAE;YAChB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;YAC/D,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;SAC5D;QACD,KAAK,EAAE,WAAW;QAClB,aAAa,eAAA;QACb,UAAU,EAAE,MAAM;KACnB,CAAC;IACF,OAAO;QACL,YAAY,cAAA;QACZ,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AAtED,gCAsEC"}
|
|
@@ -32,13 +32,12 @@ var indexed_geometry_map_1 = require("../utils/indexed_geometry_map");
|
|
|
32
32
|
var specs_1 = require("../utils/specs");
|
|
33
33
|
var point_style_1 = require("./point_style");
|
|
34
34
|
var utils_1 = require("./utils");
|
|
35
|
-
function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyle,
|
|
36
|
-
if (spatial === void 0) { spatial = false; }
|
|
35
|
+
function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyle, isBandChart, markSizeOptions, useSpatialIndex, styleAccessor) {
|
|
37
36
|
var indexedGeometryMap = new indexed_geometry_map_1.IndexedGeometryMap();
|
|
38
37
|
var getRadius = markSizeOptions.enabled
|
|
39
38
|
? getRadiusFn(dataSeries.data, pointStyle.strokeWidth, markSizeOptions.ratio)
|
|
40
39
|
: function () { return 0; };
|
|
41
|
-
var geometryType =
|
|
40
|
+
var geometryType = useSpatialIndex ? indexed_geometry_map_1.GeometryType.spatial : indexed_geometry_map_1.GeometryType.linear;
|
|
42
41
|
var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
43
42
|
var y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
|
|
44
43
|
var yDefined = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|
|
@@ -52,12 +51,12 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
|
|
|
52
51
|
if (Number.isNaN(x))
|
|
53
52
|
return acc;
|
|
54
53
|
var points = [];
|
|
55
|
-
var yDatumKeyNames =
|
|
54
|
+
var yDatumKeyNames = isBandChart ? ['y0', 'y1'] : ['y1'];
|
|
56
55
|
yDatumKeyNames.forEach(function (yDatumKeyName, keyIndex) {
|
|
57
56
|
var _a;
|
|
58
57
|
var valueAccessor = (0, utils_1.getYDatumValueFn)(yDatumKeyName);
|
|
59
58
|
var y = yDatumKeyName === 'y1' ? y1Fn(datum) : y0Fn(datum);
|
|
60
|
-
var originalY = getDatumYValue(datum, keyIndex === 0,
|
|
59
|
+
var originalY = getDatumYValue(datum, keyIndex === 0, isBandChart, dataSeries.stackMode);
|
|
61
60
|
var seriesIdentifier = {
|
|
62
61
|
key: dataSeries.key,
|
|
63
62
|
specId: dataSeries.specId,
|
|
@@ -83,7 +82,7 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
|
|
|
83
82
|
x: xValue,
|
|
84
83
|
y: originalY,
|
|
85
84
|
mark: mark,
|
|
86
|
-
accessor:
|
|
85
|
+
accessor: isBandChart && keyIndex === 0 ? geometry_1.BandedAccessorType.Y0 : geometry_1.BandedAccessorType.Y1,
|
|
87
86
|
datum: datum.datum,
|
|
88
87
|
},
|
|
89
88
|
transform: {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,8 +130,9 @@ function getAxes(axesGeoms, axesSpecs, gridLines, rotation) {
|
|
|
130
130
|
}
|
|
131
131
|
function getBarsState(seriesNameMap, barGeometries) {
|
|
132
132
|
var buckets = new Map();
|
|
133
|
-
var bars = barGeometries.reduce(function (acc,
|
|
134
|
-
|
|
133
|
+
var bars = barGeometries.reduce(function (acc, _a) {
|
|
134
|
+
var value = _a.value;
|
|
135
|
+
return __spreadArray(__spreadArray([], __read(acc), false), __read(value), false);
|
|
135
136
|
}, []);
|
|
136
137
|
bars.forEach(function (_a) {
|
|
137
138
|
var _b, _c;
|
|
@@ -158,15 +159,15 @@ function getBarsState(seriesNameMap, barGeometries) {
|
|
|
158
159
|
function getLineState(seriesNameMap) {
|
|
159
160
|
return function (_a) {
|
|
160
161
|
var _b;
|
|
161
|
-
var _c = _a.value, path = _c.line, points = _c.points, color = _c.color, key = _c.seriesIdentifier.key,
|
|
162
|
+
var _c = _a.value, path = _c.line, points = _c.points, color = _c.color, key = _c.seriesIdentifier.key, style = _c.style;
|
|
162
163
|
var name = (_b = seriesNameMap.get(key)) !== null && _b !== void 0 ? _b : '';
|
|
163
164
|
return {
|
|
164
165
|
path: path,
|
|
165
166
|
color: color,
|
|
166
167
|
key: key,
|
|
167
168
|
name: name,
|
|
168
|
-
visible: hasVisibleStyle(
|
|
169
|
-
visiblePoints: hasVisibleStyle(
|
|
169
|
+
visible: hasVisibleStyle(style.line),
|
|
170
|
+
visiblePoints: hasVisibleStyle(style.point),
|
|
170
171
|
points: points.map(function (_a) {
|
|
171
172
|
var _b = _a.value, x = _b.x, y = _b.y, mark = _b.mark;
|
|
172
173
|
return ({ x: x, y: y, mark: mark });
|
|
@@ -177,7 +178,7 @@ function getLineState(seriesNameMap) {
|
|
|
177
178
|
function getAreaState(seriesNameMap) {
|
|
178
179
|
return function (_a) {
|
|
179
180
|
var _b;
|
|
180
|
-
var _c = _a.value, path = _c.area, lines = _c.lines, points = _c.points, color = _c.color, key = _c.seriesIdentifier.key,
|
|
181
|
+
var _c = _a.value, path = _c.area, lines = _c.lines, points = _c.points, color = _c.color, key = _c.seriesIdentifier.key, style = _c.style;
|
|
181
182
|
var _d = __read(lines, 2), y1Path = _d[0], y0Path = _d[1];
|
|
182
183
|
var linePoints = points.reduce(function (acc, _a) {
|
|
183
184
|
var _b = _a.value, accessor = _b.accessor, value = __rest(_b, ["accessor"]);
|
|
@@ -192,15 +193,15 @@ function getAreaState(seriesNameMap) {
|
|
|
192
193
|
y0: [],
|
|
193
194
|
y1: [],
|
|
194
195
|
});
|
|
195
|
-
var lineVisible = hasVisibleStyle(
|
|
196
|
-
var visiblePoints = hasVisibleStyle(
|
|
196
|
+
var lineVisible = hasVisibleStyle(style.line);
|
|
197
|
+
var visiblePoints = hasVisibleStyle(style.point);
|
|
197
198
|
var name = (_b = seriesNameMap.get(key)) !== null && _b !== void 0 ? _b : '';
|
|
198
199
|
return {
|
|
199
200
|
path: path,
|
|
200
201
|
color: color,
|
|
201
202
|
key: key,
|
|
202
203
|
name: name,
|
|
203
|
-
visible: hasVisibleStyle(
|
|
204
|
+
visible: hasVisibleStyle(style.area),
|
|
204
205
|
lines: {
|
|
205
206
|
y0: y0Path
|
|
206
207
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_debug_state.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/get_debug_state.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,0DAAyE;AACzE,2CAA6E;AAC7E,qEAA+E;AAC/E,qFAAyF;AAYzF,uDAAmH;AACnH,oEAAsH;AAEtH,+DAA+E;AAG/E,0CAA2E;AAC3E,qEAA0E;AAC1E,mDAAyD;AACzD,yEAA8E;AAC9E,mDAAwD;AACxD,yCAA+E;AAMlE,QAAA,qBAAqB,GAAG,IAAA,4CAA0B,EAC7D;IACE,2DAA+B;IAC/B,sCAAqB;IACrB,uDAA6B;IAC7B,qCAAoB;IACpB,gCAAoB;IACpB,4CAAuB;IACvB,sCAA0B;CAC3B,EACD,UAAC,EAAc,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAY,EAAE,WAAW;QAA3E,UAAU,gBAAA;QAA0C,QAAQ,cAAA;IAC7D,IAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC;QAC9B,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC;QACnD,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACxD,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACxD,IAAI,EAAE,YAAY,CAAC,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC;QAClD,WAAW,EAAE,mBAAmB,CAAC,WAAW,CAAC;KAC9C,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,OAAO,CACd,SAAyB,EACzB,SAAqB,EACrB,SAAsB,EACtB,QAAkB;IAElB,OAAO,SAAS,CAAC,MAAM,CACrB,UAAC,GAAG,EAAE,EAAuB;YAArB,QAAQ,cAAA,EAAE,KAAK,WAAA,EAAE,EAAE,QAAA;QACzB,IAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,UAAC,EAAQ;gBAAN,IAAI,UAAA;YAAO,OAAA,IAAI,CAAC,EAAE,KAAK,EAAE;QAAd,CAAc,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,GAAG,CAAC;SACZ;QAED,IAAM,OAAO,GACX,CAAC,IAAA,kCAAgB,EAAC,QAAQ,CAAC,IAAI,IAAA,6BAAoB,EAAC,QAAQ,CAAC,CAAC;YAC9D,CAAC,IAAA,gCAAc,EAAC,QAAQ,CAAC,IAAI,IAAA,2BAAkB,EAAC,QAAQ,CAAC,CAAC,CAAC;QAG7D,IAAM,YAAY,GAAG,IAAA,kCAAgB,EAAC,QAAQ,CAAC;YAC7C,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,EAAE;gBACjC,CAAC,CAAC,qBAAS,CAAC,MAAM;gBAClB,CAAC,CAAC,qBAAS,CAAC,OAAO;YACrB,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,EAAE;gBACpC,CAAC,CAAC,qBAAS,CAAC,OAAO;gBACnB,CAAC,CAAC,qBAAS,CAAC,MAAM,CAAC;QACrB,IAAM,YAAY,GAAG,IAAI,CAAC,YAAY;aACnC,MAAM,CAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK,KAAK,EAAE;QAAZ,CAAY,CAAC;aACnC,IAAI,CAAC,IAAA,0BAAc,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;QAElD,IAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK;QAAL,CAAK,CAAC,CAAC;QACtD,IAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK;QAAL,CAAK,CAAC,CAAC;QAEtD,IAAM,SAAS,GAAG,SAAS;aACxB,OAAO,CAAC,UAAC,EAAc;;gBAAZ,UAAU,gBAAA;YAAO,OAAA,MAAA,MAAA,UAAU,CAAC,IAAI,CAAC,UAAC,EAAU;oBAAR,MAAM,YAAA;gBAAO,OAAA,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE;YAAvB,CAAuB,CAAC,0CAAE,KAAK,mCAAI,EAAE,CAAA;SAAA,CAAC;aAClG,GAAG,CAAC,UAAC,EAAgB;gBAAV,CAAC,QAAA,EAAM,CAAC,QAAA;YAAO,OAAA,CAAC,EAAE,CAAC,GAAA,EAAE,CAAC,GAAA,EAAE,CAAC;QAAV,CAAU,CAAC,CAAC;QAEzC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC5B,EAAE,IAAA;YACF,KAAK,OAAA;YACL,QAAQ,UAAA;YACR,MAAM,QAAA;YACN,MAAM,QAAA;YACN,SAAS,WAAA;SACV,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACjB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,aAAkC,EAClC,aAA6C;IAE7C,IAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IACjD,IAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAgB,UAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"get_debug_state.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/get_debug_state.ts"],"names":[],"mappings":"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"}
|
|
@@ -284,7 +284,7 @@ function renderGeometries(dataSeries, xDomain, yScales, smVScale, smHScale, barI
|
|
|
284
284
|
? (0, common_1.mergePartial)(chartTheme.bubbleSeriesStyle, spec.bubbleSeriesStyle)
|
|
285
285
|
: chartTheme.bubbleSeriesStyle;
|
|
286
286
|
var xScaleOffset = computeXScaleOffset(xScale, enableHistogramMode);
|
|
287
|
-
var renderedBubbles = (0, bubble_1.renderBubble)((xScale.bandwidth * bubbleShift) / 2, ds, xScale, yScale, color, panel, (0,
|
|
287
|
+
var renderedBubbles = (0, bubble_1.renderBubble)((xScale.bandwidth * bubbleShift) / 2, ds, xScale, yScale, color, panel, (0, series_1.isBandedSpec)(spec), xScaleOffset, bubbleSeriesStyle, {
|
|
288
288
|
enabled: spec.markSizeAccessor !== undefined,
|
|
289
289
|
ratio: chartTheme.markSizeRatio,
|
|
290
290
|
}, isMixedChart, spec.pointStyleAccessor);
|
|
@@ -302,10 +302,10 @@ function renderGeometries(dataSeries, xDomain, yScales, smVScale, smHScale, barI
|
|
|
302
302
|
? (0, common_1.mergePartial)(chartTheme.lineSeriesStyle, spec.lineSeriesStyle)
|
|
303
303
|
: chartTheme.lineSeriesStyle;
|
|
304
304
|
var xScaleOffset = computeXScaleOffset(xScale, enableHistogramMode, spec.histogramModeAlignment);
|
|
305
|
-
var renderedLines = (0, line_1.renderLine)((xScale.bandwidth * lineShift) / 2, ds, xScale, yScale, panel, color, spec.curve || curves_1.CurveType.LINEAR, (0,
|
|
305
|
+
var renderedLines = (0, line_1.renderLine)((xScale.bandwidth * lineShift) / 2, ds, xScale, yScale, panel, color, spec.curve || curves_1.CurveType.LINEAR, (0, series_1.isBandedSpec)(spec), xScaleOffset, lineSeriesStyle, {
|
|
306
306
|
enabled: spec.markSizeAccessor !== undefined && lineSeriesStyle.point.visible,
|
|
307
307
|
ratio: chartTheme.markSizeRatio,
|
|
308
|
-
}, spec.
|
|
308
|
+
}, hasFitFnConfigured(spec.fit), spec.pointStyleAccessor);
|
|
309
309
|
geometriesIndex.merge(renderedLines.indexedGeometryMap);
|
|
310
310
|
lines.push({
|
|
311
311
|
panel: panel,
|
|
@@ -320,10 +320,10 @@ function renderGeometries(dataSeries, xDomain, yScales, smVScale, smHScale, barI
|
|
|
320
320
|
? (0, common_1.mergePartial)(chartTheme.areaSeriesStyle, spec.areaSeriesStyle)
|
|
321
321
|
: chartTheme.areaSeriesStyle;
|
|
322
322
|
var xScaleOffset = computeXScaleOffset(xScale, enableHistogramMode, spec.histogramModeAlignment);
|
|
323
|
-
var renderedAreas = (0, area_1.renderArea)((xScale.bandwidth * areaShift) / 2, ds, xScale, yScale, panel, color, spec.curve || curves_1.CurveType.LINEAR, (0,
|
|
323
|
+
var renderedAreas = (0, area_1.renderArea)((xScale.bandwidth * areaShift) / 2, ds, xScale, yScale, panel, color, spec.curve || curves_1.CurveType.LINEAR, (0, series_1.isBandedSpec)(spec), xScaleOffset, areaSeriesStyle, {
|
|
324
324
|
enabled: spec.markSizeAccessor !== undefined && areaSeriesStyle.point.visible,
|
|
325
325
|
ratio: chartTheme.markSizeRatio,
|
|
326
|
-
}, spec.stackAccessors ? spec.stackAccessors.length > 0 : false, spec.
|
|
326
|
+
}, spec.stackAccessors ? spec.stackAccessors.length > 0 : false, hasFitFnConfigured(spec.fit), spec.pointStyleAccessor);
|
|
327
327
|
geometriesIndex.merge(renderedAreas.indexedGeometryMap);
|
|
328
328
|
areas.push({
|
|
329
329
|
panel: panel,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ function formatTooltip(_a, spec, isHeader, isHighlighted, hasSingleSeries, axisS
|
|
|
47
47
|
var _b, _c;
|
|
48
48
|
var color = _a.color, _d = _a.value, x = _d.x, y = _d.y, mark = _d.mark, accessor = _d.accessor, datum = _d.datum, seriesIdentifier = _a.seriesIdentifier;
|
|
49
49
|
var label = (0, series_1.getSeriesName)(seriesIdentifier, hasSingleSeries, true, spec);
|
|
50
|
-
if ((0,
|
|
50
|
+
if ((0, series_1.isBandedSpec)(spec) && ((0, specs_1.isAreaSeriesSpec)(spec) || (0, specs_1.isBarSeriesSpec)(spec))) {
|
|
51
51
|
var _e = spec.y0AccessorFormat, y0AccessorFormat = _e === void 0 ? exports.Y0_ACCESSOR_POSTFIX : _e, _f = spec.y1AccessorFormat, y1AccessorFormat = _f === void 0 ? exports.Y1_ACCESSOR_POSTFIX : _f;
|
|
52
52
|
var formatter = accessor === geometry_1.BandedAccessorType.Y0 ? y0AccessorFormat : y1AccessorFormat;
|
|
53
53
|
label = (0, accessor_1.getAccessorFormatLabel)(formatter, label);
|