@elastic/charts 40.0.1 → 41.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +52 -2
- 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 +8 -12
- 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 +5 -6
- package/dist/chart_types/partition_chart/layout/config.js.map +1 -1
- 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 +30 -27
- 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_cursor_pointer.js +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_cursor_pointer.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js +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/group_data_series.d.ts +4 -1
- package/dist/chart_types/xy_chart/utils/group_data_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/utils/group_data_series.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/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 -65
- 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 +7 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -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.js +5 -1
- package/dist/utils/common.js.map +1 -1
- package/dist/utils/data/data_processing.d.ts +26 -0
- package/dist/utils/data/data_processing.d.ts.map +1 -0
- package/dist/utils/data/data_processing.js +33 -0
- package/dist/utils/data/data_processing.js.map +1 -0
- package/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 +3 -3
- 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 +0 -3
- package/dist/chart_types/wordcloud/layout/types/config_types.js.map +0 -1
|
@@ -15,9 +15,8 @@ exports.Wordcloud = exports.WeightFn = void 0;
|
|
|
15
15
|
var __1 = require("../..");
|
|
16
16
|
var constants_1 = require("../../../specs/constants");
|
|
17
17
|
var spec_factory_1 = require("../../../state/spec_factory");
|
|
18
|
-
var config_1 = require("../layout/config/config");
|
|
19
18
|
var viewmodel_types_1 = require("../layout/types/viewmodel_types");
|
|
20
19
|
Object.defineProperty(exports, "WeightFn", { enumerable: true, get: function () { return viewmodel_types_1.WeightFn; } });
|
|
21
|
-
var defaultProps = __assign(
|
|
20
|
+
var defaultProps = __assign({ chartType: __1.ChartType.Wordcloud, specType: constants_1.SpecType.Series }, viewmodel_types_1.defaultWordcloudSpec);
|
|
22
21
|
exports.Wordcloud = (0, spec_factory_1.getConnect)()((0, spec_factory_1.specComponentFactory)(defaultProps));
|
|
23
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/chart_types/wordcloud/specs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,2BAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/chart_types/wordcloud/specs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,2BAAkC;AAElC,sDAAoD;AACpD,4DAA+E;AAC/E,mEAMyC;AAQrB,yFAXlB,0BAAQ,OAWkB;AAN5B,IAAM,YAAY,cAChB,SAAS,EAAE,aAAS,CAAC,SAAS,EAC9B,QAAQ,EAAE,oBAAQ,CAAC,MAAM,IACtB,sCAAoB,CACxB,CAAC;AAcW,QAAA,SAAS,GAAmE,IAAA,yBAAU,GAAE,CACnG,IAAA,mCAAoB,EAiBlB,YAAY,CAAC,CAChB,CAAC"}
|
|
@@ -4,13 +4,14 @@ exports.geometries = void 0;
|
|
|
4
4
|
var __1 = require("../../..");
|
|
5
5
|
var constants_1 = require("../../../../specs/constants");
|
|
6
6
|
var create_selector_1 = require("../../../../state/create_selector");
|
|
7
|
+
var get_chart_theme_1 = require("../../../../state/selectors/get_chart_theme");
|
|
7
8
|
var utils_1 = require("../../../../state/utils");
|
|
8
9
|
var viewmodel_types_1 = require("../../layout/types/viewmodel_types");
|
|
9
10
|
var scenegraph_1 = require("./scenegraph");
|
|
10
11
|
var getSpecs = function (state) { return state.specs; };
|
|
11
12
|
var getParentDimensions = function (state) { return state.parentDimensions; };
|
|
12
|
-
exports.geometries = (0, create_selector_1.createCustomCachedSelector)([getSpecs, getParentDimensions], function (specs, parentDimensions) {
|
|
13
|
+
exports.geometries = (0, create_selector_1.createCustomCachedSelector)([getSpecs, get_chart_theme_1.getChartThemeSelector, getParentDimensions], function (specs, theme, parentDimensions) {
|
|
13
14
|
var wordcloudSpecs = (0, utils_1.getSpecsFromStore)(specs, __1.ChartType.Wordcloud, constants_1.SpecType.Series);
|
|
14
|
-
return wordcloudSpecs.length === 1 ? (0, scenegraph_1.render)(wordcloudSpecs[0], parentDimensions) : (0, viewmodel_types_1.nullShapeViewModel)();
|
|
15
|
+
return wordcloudSpecs.length === 1 ? (0, scenegraph_1.render)(wordcloudSpecs[0], theme, parentDimensions) : (0, viewmodel_types_1.nullShapeViewModel)();
|
|
15
16
|
});
|
|
16
17
|
//# sourceMappingURL=geometries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geometries.js","sourceRoot":"","sources":["../../../../../src/chart_types/wordcloud/state/selectors/geometries.ts"],"names":[],"mappings":";;;AAQA,8BAAqC;AACrC,yDAAuD;AAEvD,qEAA+E;AAC/E,iDAA4D;AAC5D,sEAAwF;AAExF,2CAAsC;AAEtC,IAAM,QAAQ,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,KAAK,EAAX,CAAW,CAAC;AAE1D,IAAM,mBAAmB,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,gBAAgB,EAAtB,CAAsB,CAAC;AAGnE,QAAA,UAAU,GAAG,IAAA,4CAA0B,EAClD,CAAC,QAAQ,EAAE,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"geometries.js","sourceRoot":"","sources":["../../../../../src/chart_types/wordcloud/state/selectors/geometries.ts"],"names":[],"mappings":";;;AAQA,8BAAqC;AACrC,yDAAuD;AAEvD,qEAA+E;AAC/E,+EAAoF;AACpF,iDAA4D;AAC5D,sEAAwF;AAExF,2CAAsC;AAEtC,IAAM,QAAQ,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,KAAK,EAAX,CAAW,CAAC;AAE1D,IAAM,mBAAmB,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,gBAAgB,EAAtB,CAAsB,CAAC;AAGnE,QAAA,UAAU,GAAG,IAAA,4CAA0B,EAClD,CAAC,QAAQ,EAAE,uCAAqB,EAAE,mBAAmB,CAAC,EACtD,UAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB;IAC7B,IAAM,cAAc,GAAG,IAAA,yBAAiB,EAAgB,KAAK,EAAE,aAAS,CAAC,SAAS,EAAE,oBAAQ,CAAC,MAAM,CAAC,CAAC;IACrG,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,oCAAkB,GAAE,CAAC;AACjH,CAAC,CACF,CAAC"}
|
|
@@ -1,23 +1,9 @@
|
|
|
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.render = void 0;
|
|
15
|
-
var common_1 = require("../../../../utils/common");
|
|
16
|
-
var config_1 = require("../../layout/config/config");
|
|
17
4
|
var viewmodel_1 = require("../../layout/viewmodel/viewmodel");
|
|
18
|
-
function render(spec, parentDimensions) {
|
|
19
|
-
|
|
20
|
-
return (0, viewmodel_1.shapeViewModel)(spec, (0, common_1.mergePartial)(config_1.config, __assign(__assign({}, spec.config), { width: width, height: height })));
|
|
5
|
+
function render(spec, theme, parentDimensions) {
|
|
6
|
+
return (0, viewmodel_1.shapeViewModel)(spec, theme, parentDimensions);
|
|
21
7
|
}
|
|
22
8
|
exports.render = render;
|
|
23
9
|
//# sourceMappingURL=scenegraph.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenegraph.js","sourceRoot":"","sources":["../../../../../src/chart_types/wordcloud/state/selectors/scenegraph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scenegraph.js","sourceRoot":"","sources":["../../../../../src/chart_types/wordcloud/state/selectors/scenegraph.ts"],"names":[],"mappings":";;;AAWA,8DAAkE;AAIlE,SAAgB,MAAM,CAAC,IAAmB,EAAE,KAAY,EAAE,gBAA4B;IACpF,OAAO,IAAA,0BAAc,EAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;AACvD,CAAC;AAFD,wBAEC"}
|
|
@@ -82,13 +82,13 @@ function mergeYDomainForGroup(stacked, nonStacked, hasZeroBaselineSpecs, yScaleC
|
|
|
82
82
|
var dataSeries = __spreadArray(__spreadArray([], __read(stacked), false), __read(nonStacked), false);
|
|
83
83
|
if (dataSeries.length === 0)
|
|
84
84
|
return null;
|
|
85
|
-
var _a = __read(dataSeries, 1), _b = _a[0], stackMode = _b.stackMode, spec = _b.spec;
|
|
85
|
+
var _a = __read(dataSeries, 1), _b = _a[0], isStacked = _b.isStacked, stackMode = _b.stackMode, spec = _b.spec;
|
|
86
86
|
var groupId = (0, spec_1.getSpecDomainGroupId)(spec);
|
|
87
87
|
var _c = yScaleConfig[groupId], customDomain = _c.customDomain, type = _c.type, nice = _c.nice, desiredTickCount = _c.desiredTickCount;
|
|
88
88
|
var newCustomDomain = customDomain ? __assign({}, customDomain) : { min: NaN, max: NaN };
|
|
89
89
|
var paddingUnit = newCustomDomain.paddingUnit, padding = newCustomDomain.padding, constrainPadding = newCustomDomain.constrainPadding;
|
|
90
90
|
var mergedDomain;
|
|
91
|
-
if (stackMode === specs_1.StackMode.Percentage) {
|
|
91
|
+
if (isStacked && stackMode === specs_1.StackMode.Percentage) {
|
|
92
92
|
mergedDomain = (0, domain_1.computeContinuousDataDomain)([0, 1], type, customDomain);
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"y_domain.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/domains/y_domain.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,uDAAsD;AACtD,gDAAsF;AAEtF,gDAA+C;AAC/C,2DAAmF;AAEnF,4CAA2D;AAC3D,gEAAqD;AAErD,wCAAuH;AAUvH,SAAgB,YAAY,CAAC,UAAwB,EAAE,eAAkC;IACvF,IAAM,mBAAmB,GAAG,IAAA,2BAAO,EAAC,UAAU,EAAE,UAAC,EAAQ;YAAN,IAAI,UAAA;QAAO,OAAA,IAAA,2BAAoB,EAAC,IAAI,CAAC;IAA1B,CAA0B,EAAE,IAAI,CAAC,CAAC;IAChG,OAAO,mBAAmB,CAAC,MAAM,CAAY,UAAC,GAAG,EAAE,iBAAiB;QAClE,IAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,UAAC,EAAyB;gBAAvB,SAAS,eAAA,EAAE,UAAU,gBAAA;YAAO,OAAA,SAAS,IAAI,CAAC,UAAU;QAAxB,CAAwB,CAAC,CAAC;QAClG,IAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,CAAC,UAAC,EAAyB;gBAAvB,SAAS,eAAA,EAAE,UAAU,gBAAA;YAAO,OAAA,CAAC,SAAS,IAAI,CAAC,UAAU;QAAzB,CAAyB,CAAC,CAAC;QACtG,IAAM,uBAAuB,GAAG,iBAAiB,CAAC,IAAI,CACpD,UAAC,EAA0B;gBAAxB,UAAU,gBAAA,EAAE,UAAU,gBAAA;YAAO,OAAA,UAAU,KAAK,kBAAU,CAAC,GAAG,IAAI,CAAC,UAAU,KAAK,kBAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC;QAAhF,CAAgF,CACjH,CAAC;QACF,IAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,eAAe,CAAC,CAAC;QACnG,OAAO,MAAM,CAAC,CAAC,wCAAK,GAAG,YAAE,MAAM,UAAE,CAAC,CAAC,GAAG,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAXD,oCAWC;AAED,SAAS,oBAAoB,CAC3B,OAAqB,EACrB,UAAwB,EACxB,oBAA6B,EAC7B,YAA+B;IAE/B,IAAM,UAAU,0CAAO,OAAO,kBAAK,UAAU,SAAC,CAAC;IAC/C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnC,IAAA,KAAA,
|
|
1
|
+
{"version":3,"file":"y_domain.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/domains/y_domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,7 +94,7 @@ function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs, s
|
|
|
94
94
|
dataSeries.forEach(function (series) {
|
|
95
95
|
var _a, _b;
|
|
96
96
|
var specId = series.specId, yAccessor = series.yAccessor;
|
|
97
|
-
var banded = (0, series_1.
|
|
97
|
+
var banded = (0, series_1.isBandedSpec)(series.spec);
|
|
98
98
|
var key = (0, series_1.getSeriesKey)(series, series.groupId);
|
|
99
99
|
var spec = (0, spec_1.getSpecsById)(specs, specId);
|
|
100
100
|
var dataSeriesKey = (0, series_1.getSeriesKey)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legend.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/legend/legend.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"legend.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/legend/legend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.renderAreas = void 0;
|
|
4
|
+
var color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
4
5
|
var canvas_1 = require("../../../../renderers/canvas");
|
|
6
|
+
var common_1 = require("../../../../utils/common");
|
|
5
7
|
var utils_1 = require("../../rendering/utils");
|
|
8
|
+
var texture_1 = require("../../utils/texture");
|
|
6
9
|
var points_1 = require("./points");
|
|
7
10
|
var path_1 = require("./primitives/path");
|
|
8
11
|
var area_1 = require("./styles/area");
|
|
@@ -13,19 +16,19 @@ function renderAreas(ctx, imgCanvas, props) {
|
|
|
13
16
|
(0, canvas_1.withContext)(ctx, function () {
|
|
14
17
|
areas.forEach(function (_a) {
|
|
15
18
|
var panel = _a.panel, area = _a.value;
|
|
16
|
-
var
|
|
17
|
-
if (
|
|
19
|
+
var style = area.style;
|
|
20
|
+
if (style.area.visible) {
|
|
18
21
|
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () { return renderArea(ctx, imgCanvas, area, sharedStyle, clippings, highlightedLegendItem); }, { area: clippings, shouldClip: true });
|
|
19
22
|
}
|
|
20
|
-
if (
|
|
23
|
+
if (style.line.visible) {
|
|
21
24
|
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () { return renderAreaLines(ctx, area, sharedStyle, clippings, highlightedLegendItem); }, { area: clippings, shouldClip: true });
|
|
22
25
|
}
|
|
23
26
|
});
|
|
24
27
|
areas.forEach(function (_a) {
|
|
25
28
|
var _b;
|
|
26
29
|
var panel = _a.panel, area = _a.value;
|
|
27
|
-
var
|
|
28
|
-
var visiblePoints =
|
|
30
|
+
var style = area.style, seriesIdentifier = area.seriesIdentifier, points = area.points;
|
|
31
|
+
var visiblePoints = style.point.visible ? points : points.filter(function (_a) {
|
|
29
32
|
var orphan = _a.orphan;
|
|
30
33
|
return orphan;
|
|
31
34
|
});
|
|
@@ -38,16 +41,26 @@ function renderAreas(ctx, imgCanvas, props) {
|
|
|
38
41
|
});
|
|
39
42
|
}
|
|
40
43
|
exports.renderAreas = renderAreas;
|
|
41
|
-
function renderArea(ctx, imgCanvas,
|
|
42
|
-
var area =
|
|
44
|
+
function renderArea(ctx, imgCanvas, geometry, sharedStyle, clippings, highlightedLegendItem) {
|
|
45
|
+
var area = geometry.area, color = geometry.color, transform = geometry.transform, seriesIdentifier = geometry.seriesIdentifier, style = geometry.style, clippedRanges = geometry.clippedRanges, shouldClip = geometry.shouldClip;
|
|
43
46
|
var geometryStateStyle = (0, utils_1.getGeometryStateStyle)(seriesIdentifier, sharedStyle, highlightedLegendItem);
|
|
44
|
-
var
|
|
45
|
-
|
|
47
|
+
var areaFill = (0, area_1.buildAreaStyles)(ctx, imgCanvas, color, style.area, geometryStateStyle);
|
|
48
|
+
var fitAreaFillColor = style.fit.area.fill === common_1.ColorVariant.Series ? color : style.fit.area.fill;
|
|
49
|
+
var fitAreaFill = {
|
|
50
|
+
texture: (0, texture_1.getTextureStyles)(ctx, imgCanvas, fitAreaFillColor, geometryStateStyle.opacity, style.fit.area.texture),
|
|
51
|
+
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(fitAreaFillColor), function (opacity) { return opacity * geometryStateStyle.opacity * style.fit.area.opacity; }),
|
|
52
|
+
};
|
|
53
|
+
(0, path_1.renderAreaPath)(ctx, transform, area, areaFill, fitAreaFill, clippedRanges, clippings, shouldClip && style.fit.area.visible);
|
|
46
54
|
}
|
|
47
|
-
function renderAreaLines(ctx,
|
|
48
|
-
var lines =
|
|
55
|
+
function renderAreaLines(ctx, geometry, sharedStyle, clippings, highlightedLegendItem) {
|
|
56
|
+
var lines = geometry.lines, color = geometry.color, seriesIdentifier = geometry.seriesIdentifier, transform = geometry.transform, style = geometry.style, clippedRanges = geometry.clippedRanges, shouldClip = geometry.shouldClip;
|
|
49
57
|
var geometryStateStyle = (0, utils_1.getGeometryStateStyle)(seriesIdentifier, sharedStyle, highlightedLegendItem);
|
|
50
|
-
var
|
|
51
|
-
|
|
58
|
+
var lineStyle = (0, line_1.buildLineStyles)(color, style.line, geometryStateStyle);
|
|
59
|
+
var fitLineStroke = {
|
|
60
|
+
dash: style.fit.line.dash,
|
|
61
|
+
width: style.line.strokeWidth,
|
|
62
|
+
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(style.fit.line.stroke === common_1.ColorVariant.Series ? color : style.fit.line.stroke), function (opacity) { return opacity * geometryStateStyle.opacity * style.fit.line.opacity; }),
|
|
63
|
+
};
|
|
64
|
+
(0, path_1.renderLinePaths)(ctx, transform, lines, lineStyle, fitLineStroke, clippedRanges, clippings, shouldClip && style.fit.line.visible);
|
|
52
65
|
}
|
|
53
66
|
//# 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":";;;
|
|
1
|
+
{"version":3,"file":"areas.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/areas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.renderLines = void 0;
|
|
4
|
+
var color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
4
5
|
var canvas_1 = require("../../../../renderers/canvas");
|
|
6
|
+
var common_1 = require("../../../../utils/common");
|
|
5
7
|
var utils_1 = require("../../rendering/utils");
|
|
6
8
|
var points_1 = require("./points");
|
|
7
9
|
var path_1 = require("./primitives/path");
|
|
@@ -13,11 +15,11 @@ function renderLines(ctx, props) {
|
|
|
13
15
|
lines.forEach(function (_a) {
|
|
14
16
|
var _b;
|
|
15
17
|
var panel = _a.panel, line = _a.value;
|
|
16
|
-
var
|
|
17
|
-
if (
|
|
18
|
+
var style = line.style, points = line.points;
|
|
19
|
+
if (style.line.visible) {
|
|
18
20
|
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, function () { return renderLine(ctx, line, sharedStyle, clippings, highlightedLegendItem); }, { area: clippings, shouldClip: true });
|
|
19
21
|
}
|
|
20
|
-
var visiblePoints =
|
|
22
|
+
var visiblePoints = style.point.visible ? points : points.filter(function (_a) {
|
|
21
23
|
var orphan = _a.orphan;
|
|
22
24
|
return orphan;
|
|
23
25
|
});
|
|
@@ -31,9 +33,15 @@ function renderLines(ctx, props) {
|
|
|
31
33
|
}
|
|
32
34
|
exports.renderLines = renderLines;
|
|
33
35
|
function renderLine(ctx, line, sharedStyle, clippings, highlightedLegendItem) {
|
|
34
|
-
var color = line.color, transform = line.transform, seriesIdentifier = line.seriesIdentifier,
|
|
36
|
+
var color = line.color, transform = line.transform, seriesIdentifier = line.seriesIdentifier, style = line.style, clippedRanges = line.clippedRanges, shouldClip = line.shouldClip;
|
|
35
37
|
var geometryStyle = (0, utils_1.getGeometryStateStyle)(seriesIdentifier, sharedStyle, highlightedLegendItem);
|
|
36
|
-
var
|
|
37
|
-
|
|
38
|
+
var lineStroke = (0, line_1.buildLineStyles)(color, style.line, geometryStyle);
|
|
39
|
+
var fitLineStrokeColor = style.fit.line.stroke === common_1.ColorVariant.Series ? color : style.fit.line.stroke;
|
|
40
|
+
var fitLineStroke = {
|
|
41
|
+
dash: style.fit.line.dash,
|
|
42
|
+
width: style.line.strokeWidth,
|
|
43
|
+
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(fitLineStrokeColor), function (opacity) { return opacity * geometryStyle.opacity * style.fit.line.opacity; }),
|
|
44
|
+
};
|
|
45
|
+
(0, path_1.renderLinePaths)(ctx, transform, [line.line], lineStroke, fitLineStroke, clippedRanges, clippings, shouldClip && style.fit.line.visible);
|
|
38
46
|
}
|
|
39
47
|
//# sourceMappingURL=lines.js.map
|
|
@@ -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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"}
|
|
@@ -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":"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"}
|
|
@@ -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,
|