@elastic/charts 37.0.0 → 38.0.3

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.
Files changed (239) hide show
  1. package/CHANGELOG.md +51 -0
  2. package/NOTICE.txt +21 -0
  3. package/dist/chart_types/goal_chart/layout/viewmodel/geoms.js +20 -10
  4. package/dist/chart_types/goal_chart/layout/viewmodel/geoms.js.map +1 -1
  5. package/dist/chart_types/goal_chart/layout/viewmodel/utils.d.ts +2 -0
  6. package/dist/chart_types/goal_chart/layout/viewmodel/utils.d.ts.map +1 -0
  7. package/dist/chart_types/goal_chart/layout/viewmodel/utils.js +37 -0
  8. package/dist/chart_types/goal_chart/layout/viewmodel/utils.js.map +1 -0
  9. package/dist/chart_types/goal_chart/state/selectors/scenegraph.js +5 -13
  10. package/dist/chart_types/goal_chart/state/selectors/scenegraph.js.map +1 -1
  11. package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.js +5 -7
  12. package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.js.map +1 -1
  13. package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.js +1 -3
  14. package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.js.map +1 -1
  15. package/dist/chart_types/heatmap/state/selectors/get_x_axis_right_overflow.js +10 -19
  16. package/dist/chart_types/heatmap/state/selectors/get_x_axis_right_overflow.js.map +1 -1
  17. package/dist/chart_types/heatmap/state/selectors/scenegraph.js +1 -1
  18. package/dist/chart_types/heatmap/state/selectors/scenegraph.js.map +1 -1
  19. package/dist/chart_types/partition_chart/layout/config.js +1 -1
  20. package/dist/chart_types/partition_chart/layout/config.js.map +1 -1
  21. package/dist/chart_types/partition_chart/layout/viewmodel/fill_text_layout.js +5 -4
  22. package/dist/chart_types/partition_chart/layout/viewmodel/fill_text_layout.js.map +1 -1
  23. package/dist/chart_types/partition_chart/layout/viewmodel/scenegraph.js +1 -1
  24. package/dist/chart_types/partition_chart/layout/viewmodel/scenegraph.js.map +1 -1
  25. package/dist/chart_types/wordcloud/state/selectors/scenegraph.js +1 -4
  26. package/dist/chart_types/wordcloud/state/selectors/scenegraph.js.map +1 -1
  27. package/dist/chart_types/xy_chart/annotations/line/dimensions.js +14 -13
  28. package/dist/chart_types/xy_chart/annotations/line/dimensions.js.map +1 -1
  29. package/dist/chart_types/xy_chart/annotations/rect/dimensions.js +11 -13
  30. package/dist/chart_types/xy_chart/annotations/rect/dimensions.js.map +1 -1
  31. package/dist/chart_types/xy_chart/annotations/utils.js +5 -7
  32. package/dist/chart_types/xy_chart/annotations/utils.js.map +1 -1
  33. package/dist/chart_types/xy_chart/axes/axes_sizes.js +80 -35
  34. package/dist/chart_types/xy_chart/axes/axes_sizes.js.map +1 -1
  35. package/dist/chart_types/xy_chart/crosshair/crosshair_utils.js +2 -2
  36. package/dist/chart_types/xy_chart/crosshair/crosshair_utils.js.map +1 -1
  37. package/dist/chart_types/xy_chart/domains/x_domain.js +1 -1
  38. package/dist/chart_types/xy_chart/domains/x_domain.js.map +1 -1
  39. package/dist/chart_types/xy_chart/legend/legend.js +10 -19
  40. package/dist/chart_types/xy_chart/legend/legend.js.map +1 -1
  41. package/dist/chart_types/xy_chart/renderer/canvas/axes/tick_label.js +1 -1
  42. package/dist/chart_types/xy_chart/renderer/canvas/axes/tick_label.js.map +1 -1
  43. package/dist/chart_types/xy_chart/renderer/canvas/panels/title.js +4 -2
  44. package/dist/chart_types/xy_chart/renderer/canvas/panels/title.js.map +1 -1
  45. package/dist/chart_types/xy_chart/renderer/canvas/renderers.js +2 -2
  46. package/dist/chart_types/xy_chart/renderer/canvas/renderers.js.map +1 -1
  47. package/dist/chart_types/xy_chart/renderer/canvas/xy_chart.js +2 -2
  48. package/dist/chart_types/xy_chart/renderer/canvas/xy_chart.js.map +1 -1
  49. package/dist/chart_types/xy_chart/renderer/dom/cursor_band.d.ts +2 -0
  50. package/dist/chart_types/xy_chart/renderer/dom/cursor_band.d.ts.map +1 -0
  51. package/dist/chart_types/xy_chart/renderer/dom/cursor_band.js +87 -0
  52. package/dist/chart_types/xy_chart/renderer/dom/cursor_band.js.map +1 -0
  53. package/dist/chart_types/xy_chart/renderer/dom/cursor_crossline.d.ts +2 -0
  54. package/dist/chart_types/xy_chart/renderer/dom/cursor_crossline.d.ts.map +1 -0
  55. package/dist/chart_types/xy_chart/renderer/dom/{crosshair.js → cursor_crossline.js} +11 -37
  56. package/dist/chart_types/xy_chart/renderer/dom/cursor_crossline.js.map +1 -0
  57. package/dist/chart_types/xy_chart/renderer/dom/cursor_line.d.ts +2 -0
  58. package/dist/chart_types/xy_chart/renderer/dom/cursor_line.d.ts.map +1 -0
  59. package/dist/chart_types/xy_chart/renderer/dom/cursor_line.js +89 -0
  60. package/dist/chart_types/xy_chart/renderer/dom/cursor_line.js.map +1 -0
  61. package/dist/chart_types/xy_chart/rendering/area.js +11 -33
  62. package/dist/chart_types/xy_chart/rendering/area.js.map +1 -1
  63. package/dist/chart_types/xy_chart/rendering/bars.js +8 -9
  64. package/dist/chart_types/xy_chart/rendering/bars.js.map +1 -1
  65. package/dist/chart_types/xy_chart/rendering/line.js +4 -13
  66. package/dist/chart_types/xy_chart/rendering/line.js.map +1 -1
  67. package/dist/chart_types/xy_chart/rendering/point_style.js +2 -4
  68. package/dist/chart_types/xy_chart/rendering/point_style.js.map +1 -1
  69. package/dist/chart_types/xy_chart/rendering/points.js +9 -24
  70. package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
  71. package/dist/chart_types/xy_chart/rendering/utils.js +20 -31
  72. package/dist/chart_types/xy_chart/rendering/utils.js.map +1 -1
  73. package/dist/chart_types/xy_chart/specs/axis.d.ts +2 -2
  74. package/dist/chart_types/xy_chart/specs/axis.d.ts.map +1 -1
  75. package/dist/chart_types/xy_chart/specs/axis.js +2 -3
  76. package/dist/chart_types/xy_chart/specs/axis.js.map +1 -1
  77. package/dist/chart_types/xy_chart/state/chart_state.js +6 -2
  78. package/dist/chart_types/xy_chart/state/chart_state.js.map +1 -1
  79. package/dist/chart_types/xy_chart/state/selectors/compute_annotations.js +10 -12
  80. package/dist/chart_types/xy_chart/state/selectors/compute_annotations.js.map +1 -1
  81. package/dist/chart_types/xy_chart/state/selectors/compute_axes_geometries.js +5 -20
  82. package/dist/chart_types/xy_chart/state/selectors/compute_axes_geometries.js.map +1 -1
  83. package/dist/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.js +75 -40
  84. package/dist/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.js.map +1 -1
  85. package/dist/chart_types/xy_chart/state/selectors/compute_chart_dimensions.js +2 -4
  86. package/dist/chart_types/xy_chart/state/selectors/compute_chart_dimensions.js.map +1 -1
  87. package/dist/chart_types/xy_chart/state/selectors/compute_legend.js +1 -1
  88. package/dist/chart_types/xy_chart/state/selectors/compute_legend.js.map +1 -1
  89. package/dist/chart_types/xy_chart/state/selectors/compute_series_domains.js +2 -4
  90. package/dist/chart_types/xy_chart/state/selectors/compute_series_domains.js.map +1 -1
  91. package/dist/chart_types/xy_chart/state/selectors/compute_series_geometries.js +4 -4
  92. package/dist/chart_types/xy_chart/state/selectors/compute_series_geometries.js.map +1 -1
  93. package/dist/chart_types/xy_chart/state/selectors/get_axis_styles.js +4 -15
  94. package/dist/chart_types/xy_chart/state/selectors/get_axis_styles.js.map +1 -1
  95. package/dist/chart_types/xy_chart/state/selectors/get_brush_area.js +2 -3
  96. package/dist/chart_types/xy_chart/state/selectors/get_brush_area.js.map +1 -1
  97. package/dist/chart_types/xy_chart/state/selectors/get_chart_type_description.js +1 -2
  98. package/dist/chart_types/xy_chart/state/selectors/get_chart_type_description.js.map +1 -1
  99. package/dist/chart_types/xy_chart/state/selectors/get_cursor_band.js +6 -6
  100. package/dist/chart_types/xy_chart/state/selectors/get_cursor_band.js.map +1 -1
  101. package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js +1 -1
  102. package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js.map +1 -1
  103. package/dist/chart_types/xy_chart/state/selectors/get_elements_at_cursor_pos.js +1 -1
  104. package/dist/chart_types/xy_chart/state/selectors/get_elements_at_cursor_pos.js.map +1 -1
  105. package/dist/chart_types/xy_chart/state/selectors/get_grid_lines.js +2 -4
  106. package/dist/chart_types/xy_chart/state/selectors/get_grid_lines.js.map +1 -1
  107. package/dist/chart_types/xy_chart/state/selectors/get_projected_scaled_values.js +1 -1
  108. package/dist/chart_types/xy_chart/state/selectors/get_projected_scaled_values.js.map +1 -1
  109. package/dist/chart_types/xy_chart/state/selectors/get_series_color_map.js.map +1 -1
  110. package/dist/chart_types/xy_chart/state/selectors/get_specs.js +2 -1
  111. package/dist/chart_types/xy_chart/state/selectors/get_specs.js.map +1 -1
  112. package/dist/chart_types/xy_chart/state/selectors/get_tooltip_position.js +2 -3
  113. package/dist/chart_types/xy_chart/state/selectors/get_tooltip_position.js.map +1 -1
  114. package/dist/chart_types/xy_chart/state/selectors/get_tooltip_snap.js +1 -4
  115. package/dist/chart_types/xy_chart/state/selectors/get_tooltip_snap.js.map +1 -1
  116. package/dist/chart_types/xy_chart/state/selectors/get_tooltip_values_highlighted_geoms.js +5 -7
  117. package/dist/chart_types/xy_chart/state/selectors/get_tooltip_values_highlighted_geoms.js.map +1 -1
  118. package/dist/chart_types/xy_chart/state/selectors/is_brush_available.js +1 -6
  119. package/dist/chart_types/xy_chart/state/selectors/is_brush_available.js.map +1 -1
  120. package/dist/chart_types/xy_chart/state/selectors/is_brushing.js +1 -6
  121. package/dist/chart_types/xy_chart/state/selectors/is_brushing.js.map +1 -1
  122. package/dist/chart_types/xy_chart/state/selectors/is_tooltip_snap_enabled.js +1 -4
  123. package/dist/chart_types/xy_chart/state/selectors/is_tooltip_snap_enabled.js.map +1 -1
  124. package/dist/chart_types/xy_chart/state/selectors/is_tooltip_visible.js +2 -2
  125. package/dist/chart_types/xy_chart/state/selectors/on_brush_end_caller.js +10 -6
  126. package/dist/chart_types/xy_chart/state/selectors/on_brush_end_caller.js.map +1 -1
  127. package/dist/chart_types/xy_chart/state/selectors/on_click_caller.js +4 -5
  128. package/dist/chart_types/xy_chart/state/selectors/on_click_caller.js.map +1 -1
  129. package/dist/chart_types/xy_chart/state/selectors/on_element_out_caller.js +7 -12
  130. package/dist/chart_types/xy_chart/state/selectors/on_element_out_caller.js.map +1 -1
  131. package/dist/chart_types/xy_chart/state/selectors/on_element_over_caller.js +10 -16
  132. package/dist/chart_types/xy_chart/state/selectors/on_element_over_caller.js.map +1 -1
  133. package/dist/chart_types/xy_chart/state/selectors/on_pointer_move_caller.js +10 -33
  134. package/dist/chart_types/xy_chart/state/selectors/on_pointer_move_caller.js.map +1 -1
  135. package/dist/chart_types/xy_chart/state/selectors/visible_ticks.d.ts +2 -0
  136. package/dist/chart_types/xy_chart/state/selectors/visible_ticks.d.ts.map +1 -0
  137. package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js +223 -0
  138. package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js.map +1 -0
  139. package/dist/chart_types/xy_chart/state/utils/spec.js +5 -4
  140. package/dist/chart_types/xy_chart/state/utils/spec.js.map +1 -1
  141. package/dist/chart_types/xy_chart/state/utils/utils.js +32 -51
  142. package/dist/chart_types/xy_chart/state/utils/utils.js.map +1 -1
  143. package/dist/chart_types/xy_chart/tooltip/tooltip.js +3 -4
  144. package/dist/chart_types/xy_chart/tooltip/tooltip.js.map +1 -1
  145. package/dist/chart_types/xy_chart/utils/axis_utils.js +43 -130
  146. package/dist/chart_types/xy_chart/utils/axis_utils.js.map +1 -1
  147. package/dist/chart_types/xy_chart/utils/dimensions.js +27 -23
  148. package/dist/chart_types/xy_chart/utils/dimensions.js.map +1 -1
  149. package/dist/chart_types/xy_chart/utils/fill_series.js +3 -1
  150. package/dist/chart_types/xy_chart/utils/fill_series.js.map +1 -1
  151. package/dist/chart_types/xy_chart/utils/get_linear_ticks.d.ts +2 -0
  152. package/dist/chart_types/xy_chart/utils/get_linear_ticks.d.ts.map +1 -0
  153. package/dist/chart_types/xy_chart/utils/get_linear_ticks.js +99 -0
  154. package/dist/chart_types/xy_chart/utils/get_linear_ticks.js.map +1 -0
  155. package/dist/chart_types/xy_chart/utils/grid_lines.js +3 -4
  156. package/dist/chart_types/xy_chart/utils/grid_lines.js.map +1 -1
  157. package/dist/chart_types/xy_chart/utils/panel_utils.js +2 -3
  158. package/dist/chart_types/xy_chart/utils/panel_utils.js.map +1 -1
  159. package/dist/chart_types/xy_chart/utils/scales.js +1 -2
  160. package/dist/chart_types/xy_chart/utils/scales.js.map +1 -1
  161. package/dist/chart_types/xy_chart/utils/series.js +8 -12
  162. package/dist/chart_types/xy_chart/utils/series.js.map +1 -1
  163. package/dist/chart_types/xy_chart/utils/specs.d.ts +2 -3
  164. package/dist/chart_types/xy_chart/utils/specs.d.ts.map +1 -1
  165. package/dist/chart_types/xy_chart/utils/specs.js.map +1 -1
  166. package/dist/components/legend/legend.js.map +1 -1
  167. package/dist/components/legend/position_style.js +2 -2
  168. package/dist/components/legend/position_style.js.map +1 -1
  169. package/dist/components/legend/style_utils.js.map +1 -1
  170. package/dist/components/portal/tooltip_portal.js +1 -1
  171. package/dist/components/portal/tooltip_portal.js.map +1 -1
  172. package/dist/components/portal/utils.js +1 -1
  173. package/dist/components/portal/utils.js.map +1 -1
  174. package/dist/index.d.ts +1 -1
  175. package/dist/index.d.ts.map +1 -1
  176. package/dist/index.js +1 -3
  177. package/dist/index.js.map +1 -1
  178. package/dist/scales/constants.d.ts +4 -0
  179. package/dist/scales/constants.d.ts.map +1 -1
  180. package/dist/scales/constants.js +1 -0
  181. package/dist/scales/constants.js.map +1 -1
  182. package/dist/scales/index.d.ts +2 -2
  183. package/dist/scales/index.d.ts.map +1 -1
  184. package/dist/scales/index.js +1 -3
  185. package/dist/scales/index.js.map +1 -1
  186. package/dist/scales/scale_band.js +3 -16
  187. package/dist/scales/scale_band.js.map +1 -1
  188. package/dist/scales/scale_continuous.d.ts +1 -40
  189. package/dist/scales/scale_continuous.d.ts.map +1 -1
  190. package/dist/scales/scale_continuous.js +150 -225
  191. package/dist/scales/scale_continuous.js.map +1 -1
  192. package/dist/scales/types.d.ts +19 -1
  193. package/dist/scales/types.d.ts.map +1 -1
  194. package/dist/specs/constants.d.ts.map +1 -1
  195. package/dist/specs/constants.js +1 -1
  196. package/dist/specs/constants.js.map +1 -1
  197. package/dist/specs/settings.d.ts +4 -11
  198. package/dist/specs/settings.d.ts.map +1 -1
  199. package/dist/specs/settings.js +7 -14
  200. package/dist/specs/settings.js.map +1 -1
  201. package/dist/state/selectors/get_chart_theme.js +4 -4
  202. package/dist/state/selectors/get_chart_theme.js.map +1 -1
  203. package/dist/state/selectors/get_legend_size.js.map +1 -1
  204. package/dist/state/selectors/is_external_tooltip_visible.js +1 -1
  205. package/dist/state/selectors/is_external_tooltip_visible.js.map +1 -1
  206. package/dist/state/utils.js +3 -19
  207. package/dist/state/utils.js.map +1 -1
  208. package/dist/theme.scss +24 -3
  209. package/dist/theme_dark.css +1 -1
  210. package/dist/theme_light.css +1 -1
  211. package/dist/theme_only_dark.css +1 -1
  212. package/dist/theme_only_light.css +1 -1
  213. package/dist/utils/bbox/canvas_text_bbox_calculator.js +0 -2
  214. package/dist/utils/bbox/canvas_text_bbox_calculator.js.map +1 -1
  215. package/dist/utils/common.d.ts.map +1 -1
  216. package/dist/utils/common.js +17 -42
  217. package/dist/utils/common.js.map +1 -1
  218. package/dist/utils/data/formatters.d.ts.map +1 -1
  219. package/dist/utils/data/formatters.js +3 -6
  220. package/dist/utils/data/formatters.js.map +1 -1
  221. package/dist/utils/series_sort.d.ts.map +1 -1
  222. package/dist/utils/series_sort.js +13 -21
  223. package/dist/utils/series_sort.js.map +1 -1
  224. package/dist/utils/themes/merge_utils.d.ts +3 -2
  225. package/dist/utils/themes/merge_utils.d.ts.map +1 -1
  226. package/dist/utils/themes/merge_utils.js +3 -3
  227. package/dist/utils/themes/merge_utils.js.map +1 -1
  228. package/package.json +1 -1
  229. package/dist/chart_types/xy_chart/renderer/dom/crosshair.d.ts +0 -2
  230. package/dist/chart_types/xy_chart/renderer/dom/crosshair.d.ts.map +0 -1
  231. package/dist/chart_types/xy_chart/renderer/dom/crosshair.js.map +0 -1
  232. package/dist/chart_types/xy_chart/state/selectors/compute_grid_lines.d.ts +0 -2
  233. package/dist/chart_types/xy_chart/state/selectors/compute_grid_lines.d.ts.map +0 -1
  234. package/dist/chart_types/xy_chart/state/selectors/compute_grid_lines.js +0 -13
  235. package/dist/chart_types/xy_chart/state/selectors/compute_grid_lines.js.map +0 -1
  236. package/dist/chart_types/xy_chart/state/selectors/is_chart_animatable.d.ts +0 -2
  237. package/dist/chart_types/xy_chart/state/selectors/is_chart_animatable.d.ts.map +0 -1
  238. package/dist/chart_types/xy_chart/state/selectors/is_chart_animatable.js +0 -10
  239. package/dist/chart_types/xy_chart/state/selectors/is_chart_animatable.js.map +0 -1
@@ -0,0 +1,89 @@
1
+ "use strict";
2
+ var __extends = (this && this.__extends) || (function () {
3
+ var extendStatics = function (d, b) {
4
+ extendStatics = Object.setPrototypeOf ||
5
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
+ return extendStatics(d, b);
8
+ };
9
+ return function (d, b) {
10
+ if (typeof b !== "function" && b !== null)
11
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
+ extendStatics(d, b);
13
+ function __() { this.constructor = d; }
14
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
+ };
16
+ })();
17
+ var __assign = (this && this.__assign) || function () {
18
+ __assign = Object.assign || function(t) {
19
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
20
+ s = arguments[i];
21
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
22
+ t[p] = s[p];
23
+ }
24
+ return t;
25
+ };
26
+ return __assign.apply(this, arguments);
27
+ };
28
+ var __importDefault = (this && this.__importDefault) || function (mod) {
29
+ return (mod && mod.__esModule) ? mod : { "default": mod };
30
+ };
31
+ Object.defineProperty(exports, "__esModule", { value: true });
32
+ exports.CursorLine = void 0;
33
+ var react_1 = __importDefault(require("react"));
34
+ var react_redux_1 = require("react-redux");
35
+ var specs_1 = require("../../../../specs");
36
+ var constants_1 = require("../../../../specs/constants");
37
+ var get_chart_rotation_1 = require("../../../../state/selectors/get_chart_rotation");
38
+ var get_chart_theme_1 = require("../../../../state/selectors/get_chart_theme");
39
+ var get_internal_is_intialized_1 = require("../../../../state/selectors/get_internal_is_intialized");
40
+ var get_settings_specs_1 = require("../../../../state/selectors/get_settings_specs");
41
+ var light_theme_1 = require("../../../../utils/themes/light_theme");
42
+ var get_cursor_band_1 = require("../../state/selectors/get_cursor_band");
43
+ function canRenderBand(type, visible, fromExternalEvent) {
44
+ return visible && (type === constants_1.TooltipType.Crosshairs || type === constants_1.TooltipType.VerticalCursor || fromExternalEvent);
45
+ }
46
+ var CursorLineComponent = (function (_super) {
47
+ __extends(CursorLineComponent, _super);
48
+ function CursorLineComponent() {
49
+ return _super !== null && _super.apply(this, arguments) || this;
50
+ }
51
+ CursorLineComponent.prototype.render = function () {
52
+ var _a = this.props, _b = _a.theme.crosshair, band = _b.band, line = _b.line, cursorPosition = _a.cursorPosition, tooltipType = _a.tooltipType, fromExternalEvent = _a.fromExternalEvent, isLine = _a.isLine;
53
+ if (!cursorPosition || !canRenderBand(tooltipType, band.visible, fromExternalEvent) || !isLine) {
54
+ return null;
55
+ }
56
+ var x = cursorPosition.x, y = cursorPosition.y, width = cursorPosition.width, height = cursorPosition.height;
57
+ var strokeWidth = line.strokeWidth, stroke = line.stroke, dash = line.dash;
58
+ var strokeDasharray = (dash !== null && dash !== void 0 ? dash : []).join(' ');
59
+ return (react_1.default.createElement("svg", { className: "echCrosshair__cursor", width: "100%", height: "100%" },
60
+ react_1.default.createElement("line", __assign({}, { x1: x, x2: x + width, y1: y, y2: y + height, strokeWidth: strokeWidth, stroke: stroke, strokeDasharray: strokeDasharray }))));
61
+ };
62
+ CursorLineComponent.displayName = 'CursorLine';
63
+ return CursorLineComponent;
64
+ }(react_1.default.Component));
65
+ var mapStateToProps = function (state) {
66
+ if ((0, get_internal_is_intialized_1.getInternalIsInitializedSelector)(state) !== get_internal_is_intialized_1.InitStatus.Initialized) {
67
+ return {
68
+ theme: light_theme_1.LIGHT_THEME,
69
+ chartRotation: 0,
70
+ tooltipType: constants_1.TooltipType.None,
71
+ isLine: false,
72
+ };
73
+ }
74
+ var settings = (0, get_settings_specs_1.getSettingsSpecSelector)(state);
75
+ var cursorBandPosition = (0, get_cursor_band_1.getCursorBandPositionSelector)(state);
76
+ var fromExternalEvent = cursorBandPosition === null || cursorBandPosition === void 0 ? void 0 : cursorBandPosition.fromExternalEvent;
77
+ var tooltipType = (0, specs_1.getTooltipType)(settings, fromExternalEvent);
78
+ var isLine = (cursorBandPosition === null || cursorBandPosition === void 0 ? void 0 : cursorBandPosition.width) === 0 || (cursorBandPosition === null || cursorBandPosition === void 0 ? void 0 : cursorBandPosition.height) === 0;
79
+ return {
80
+ theme: (0, get_chart_theme_1.getChartThemeSelector)(state),
81
+ chartRotation: (0, get_chart_rotation_1.getChartRotationSelector)(state),
82
+ cursorPosition: cursorBandPosition,
83
+ tooltipType: tooltipType,
84
+ fromExternalEvent: fromExternalEvent,
85
+ isLine: isLine,
86
+ };
87
+ };
88
+ exports.CursorLine = (0, react_redux_1.connect)(mapStateToProps)(CursorLineComponent);
89
+ //# sourceMappingURL=cursor_line.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cursor_line.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/dom/cursor_line.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,gDAA0B;AAC1B,2CAAsC;AAGtC,2CAAmD;AACnD,yDAA0D;AAE1D,qFAA0F;AAC1F,+EAAoF;AACpF,qGAAsH;AACtH,qFAAyF;AAEzF,oEAAmE;AAEnE,yEAAsF;AAWtF,SAAS,aAAa,CAAC,IAAiB,EAAE,OAAgB,EAAE,iBAA2B;IACrF,OAAO,OAAO,IAAI,CAAC,IAAI,KAAK,uBAAW,CAAC,UAAU,IAAI,IAAI,KAAK,uBAAW,CAAC,cAAc,IAAI,iBAAiB,CAAC,CAAC;AAClH,CAAC;AAED;IAAkC,uCAAgC;IAAlE;;IA0BA,CAAC;IAvBC,oCAAM,GAAN;QACQ,IAAA,KAQF,IAAI,CAAC,KAAK,EANV,uBAAyB,EAAZ,IAAI,UAAA,EAAE,IAAI,UAAA,EAEzB,cAAc,oBAAA,EACd,WAAW,iBAAA,EACX,iBAAiB,uBAAA,EACjB,MAAM,YACM,CAAC;QAEf,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE;YAC9F,OAAO,IAAI,CAAC;SACb;QACO,IAAA,CAAC,GAAuB,cAAc,EAArC,EAAE,CAAC,GAAoB,cAAc,EAAlC,EAAE,KAAK,GAAa,cAAc,MAA3B,EAAE,MAAM,GAAK,cAAc,OAAnB,CAAoB;QACvC,IAAA,WAAW,GAAmB,IAAI,YAAvB,EAAE,MAAM,GAAW,IAAI,OAAf,EAAE,IAAI,GAAK,IAAI,KAAT,CAAU;QAC3C,IAAM,eAAe,GAAG,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,CACL,uCAAK,SAAS,EAAC,sBAAsB,EAAC,KAAK,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM;YAC9D,mDAAU,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,EAAE,WAAW,aAAA,EAAE,MAAM,QAAA,EAAE,eAAe,iBAAA,EAAE,EAAI,CAC/F,CACP,CAAC;IACJ,CAAC;IAxBM,+BAAW,GAAG,YAAY,CAAC;IAyBpC,0BAAC;CAAA,AA1BD,CAAkC,eAAK,CAAC,SAAS,GA0BhD;AAED,IAAM,eAAe,GAAG,UAAC,KAAuB;IAC9C,IAAI,IAAA,6DAAgC,EAAC,KAAK,CAAC,KAAK,uCAAU,CAAC,WAAW,EAAE;QACtE,OAAO;YACL,KAAK,EAAE,yBAAW;YAClB,aAAa,EAAE,CAAC;YAChB,WAAW,EAAE,uBAAW,CAAC,IAAI;YAC7B,MAAM,EAAE,KAAK;SACd,CAAC;KACH;IACD,IAAM,QAAQ,GAAG,IAAA,4CAAuB,EAAC,KAAK,CAAC,CAAC;IAChD,IAAM,kBAAkB,GAAG,IAAA,+CAA6B,EAAC,KAAK,CAAC,CAAC;IAChE,IAAM,iBAAiB,GAAG,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,iBAAiB,CAAC;IAChE,IAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAChE,IAAM,MAAM,GAAG,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,KAAK,MAAK,CAAC,IAAI,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,MAAK,CAAC,CAAC;IAEnF,OAAO;QACL,KAAK,EAAE,IAAA,uCAAqB,EAAC,KAAK,CAAC;QACnC,aAAa,EAAE,IAAA,6CAAwB,EAAC,KAAK,CAAC;QAC9C,cAAc,EAAE,kBAAkB;QAClC,WAAW,aAAA;QACX,iBAAiB,mBAAA;QACjB,MAAM,QAAA;KACP,CAAC;AACJ,CAAC,CAAC;AAGW,QAAA,UAAU,GAAG,IAAA,qBAAO,EAAC,eAAe,CAAC,CAAC,mBAAmB,CAAC,CAAC"}
@@ -7,15 +7,16 @@ var points_1 = require("./points");
7
7
  var utils_1 = require("./utils");
8
8
  function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, isStacked, pointStyleAccessor, hasFit) {
9
9
  if (isStacked === void 0) { isStacked = false; }
10
- var y1Fn = (0, utils_1.getY1ScaledValueOrThrowFn)(yScale);
11
- var y0Fn = (0, utils_1.getY0ScaledValueOrThrowFn)(yScale);
10
+ var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
11
+ var y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
12
12
  var definedFn = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
13
13
  var y1DatumAccessor = (0, utils_1.getYDatumValueFn)();
14
14
  var y0DatumAccessor = (0, utils_1.getYDatumValueFn)('y0');
15
15
  var pathGenerator = (0, d3_shape_1.area)()
16
16
  .x(function (_a) {
17
+ var _b;
17
18
  var x = _a.x;
18
- return xScale.scaleOrThrow(x) - xScaleOffset;
19
+ return ((_b = xScale.scale(x)) !== null && _b !== void 0 ? _b : NaN) - xScaleOffset;
19
20
  })
20
21
  .y1(y1Fn)
21
22
  .y0(y0Fn)
@@ -24,39 +25,16 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
24
25
  })
25
26
  .curve((0, curves_1.getCurveFactory)(curve));
26
27
  var clippedRanges = (0, utils_1.getClippedRanges)(dataSeries.data, xScale, xScaleOffset);
27
- var y1Line;
28
- try {
29
- y1Line = pathGenerator.lineY1()(dataSeries.data);
30
- }
31
- catch (_a) {
32
- y1Line = null;
33
- }
34
28
  var lines = [];
35
- if (y1Line) {
29
+ var y0Line = hasY0Accessors && pathGenerator.lineY0()(dataSeries.data);
30
+ var y1Line = pathGenerator.lineY1()(dataSeries.data);
31
+ if (y1Line)
36
32
  lines.push(y1Line);
37
- }
38
- if (hasY0Accessors) {
39
- var y0Line = void 0;
40
- try {
41
- y0Line = pathGenerator.lineY0()(dataSeries.data);
42
- }
43
- catch (_b) {
44
- y0Line = null;
45
- }
46
- if (y0Line) {
47
- lines.push(y0Line);
48
- }
49
- }
50
- var _c = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, pointStyleAccessor, false), pointGeometries = _c.pointGeometries, indexedGeometryMap = _c.indexedGeometryMap;
51
- var areaPath;
52
- try {
53
- areaPath = pathGenerator(dataSeries.data) || '';
54
- }
55
- catch (_d) {
56
- areaPath = '';
57
- }
33
+ if (y0Line)
34
+ lines.push(y0Line);
35
+ var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, pointStyleAccessor, false), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
58
36
  var areaGeometry = {
59
- area: areaPath,
37
+ area: pathGenerator(dataSeries.data) || '',
60
38
  lines: lines,
61
39
  points: pointGeometries,
62
40
  color: color,
@@ -1 +1 @@
1
- {"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":"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"}
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,cAAuB,EACvB,YAAoB,EACpB,WAA4B,EAC5B,eAAgC,EAChC,SAAiB,EACjB,kBAAuC,EACvC,MAAgB;IAFhB,0BAAA,EAAA,iBAAiB;IAOjB,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,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1G,CAAC,CAAC;SACD,KAAK,CAAC,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC,CAAC;IAEjC,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,cAAc,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACzE,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,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,KAAK,CACN,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,eAAe,EAAE,WAAW,CAAC,IAAI;QACjC,mBAAmB,EAAE,WAAW,CAAC,IAAI;QACrC,gBAAgB,EAAE,WAAW,CAAC,KAAK;QACnC,SAAS,WAAA;QACT,aAAa,eAAA;QACb,iBAAiB,EAAE,CAAC,MAAM;KAC3B,CAAC;IACF,OAAO;QACL,YAAY,cAAA;QACZ,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AApFD,gCAoFC"}
@@ -18,6 +18,7 @@ var common_1 = require("../../../utils/common");
18
18
  var geometry_1 = require("../../../utils/geometry");
19
19
  var indexed_geometry_map_1 = require("../utils/indexed_geometry_map");
20
20
  var specs_1 = require("../utils/specs");
21
+ var points_1 = require("./points");
21
22
  var PADDING = 1;
22
23
  var FONT_SIZE_FACTOR = 0.7;
23
24
  function renderBars(orderIndex, dataSeries, xScale, yScale, panel, chartRotation, minBarHeight, color, sharedSeriesStyle, displayValueSettings, styleAccessor, stackMode) {
@@ -29,7 +30,7 @@ function renderBars(orderIndex, dataSeries, xScale, yScale, panel, chartRotation
29
30
  return dataSeries.data.reduce(function (barTuple, datum) {
30
31
  var _a, _b, _c, _d, _e, _f;
31
32
  var xScaled = xScale.scale(datum.x);
32
- if (!xScale.isValueInDomain(datum.x) || xScaled === null) {
33
+ if (!xScale.isValueInDomain(datum.x) || Number.isNaN(xScaled)) {
33
34
  return barTuple;
34
35
  }
35
36
  var barGeometries = barTuple.barGeometries, indexedGeometryMap = barTuple.indexedGeometryMap;
@@ -40,12 +41,12 @@ function renderBars(orderIndex, dataSeries, xScale, yScale, panel, chartRotation
40
41
  ? yScale.range[isInvertedY ? 1 : 0]
41
42
  : yScale.scale(y0)
42
43
  : yScale.scale(y0 === null ? 0 : y0);
43
- var finiteHeight = (0, common_1.isNil)(y0Scaled) || (0, common_1.isNil)(rawY) ? 0 : y0Scaled - rawY;
44
+ var finiteHeight = y0Scaled - rawY || 0;
44
45
  var absHeight = Math.abs(finiteHeight);
45
46
  var height = absHeight === 0 ? absHeight : Math.max(minBarHeight, absHeight);
46
47
  var heightExtension = height - absHeight;
47
48
  var isUpsideDown = finiteHeight < 0;
48
- var finiteY = (0, common_1.isNil)(y0Scaled) || (0, common_1.isNil)(rawY) ? 0 : rawY;
49
+ var finiteY = Number.isNaN(y0Scaled + rawY) ? 0 : rawY;
49
50
  var y = isUpsideDown ? finiteY - height + heightExtension : finiteY - heightExtension;
50
51
  var seriesIdentifier = {
51
52
  key: dataSeries.key,
@@ -61,8 +62,8 @@ function renderBars(orderIndex, dataSeries, xScale, yScale, panel, chartRotation
61
62
  var minPixelWidth = (0, common_1.clamp)((_b = seriesStyle.rect.widthPixel) !== null && _b !== void 0 ? _b : 0, 0, maxPixelWidth);
62
63
  var width = (0, common_1.clamp)((_c = seriesStyle.rect.widthPixel) !== null && _c !== void 0 ? _c : xScale.bandwidth, minPixelWidth, maxPixelWidth);
63
64
  var x = xScaled + xScale.bandwidth * orderIndex + xScale.bandwidth / 2 - width / 2;
64
- var originalY1Value = stackMode === specs_1.StackMode.Percentage ? ((0, common_1.isNil)(y1) ? null : y1 - (y0 !== null && y0 !== void 0 ? y0 : 0)) : initialY1;
65
- var formattedDisplayValue = (_d = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.valueFormatter) === null || _d === void 0 ? void 0 : _d.call(displayValueSettings, originalY1Value);
65
+ var y1Value = (0, points_1.getDatumYValue)(datum, false, false, stackMode);
66
+ var formattedDisplayValue = (_d = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.valueFormatter) === null || _d === void 0 ? void 0 : _d.call(displayValueSettings, y1Value);
66
67
  var displayValueText = (displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.isAlternatingValueLabel) && barGeometries.length % 2 ? undefined : formattedDisplayValue;
67
68
  var _g = computeBoxWidth(displayValueText !== null && displayValueText !== void 0 ? displayValueText : '', { padding: PADDING, fontSize: fontSize, fontFamily: fontFamily, textMeasure: textMeasure, width: width }, displayValueSettings), displayValueWidth = _g.displayValueWidth, fixedFontScale = _g.fixedFontScale;
68
69
  var isHorizontalRotation = chartRotation % 180 === 0;
@@ -92,7 +93,7 @@ function renderBars(orderIndex, dataSeries, xScale, yScale, panel, chartRotation
92
93
  width: width,
93
94
  height: height,
94
95
  color: color,
95
- value: { x: datum.x, y: originalY1Value, mark: null, accessor: geometry_1.BandedAccessorType.Y1, datum: datum.datum },
96
+ value: { x: datum.x, y: y1Value, mark: null, accessor: geometry_1.BandedAccessorType.Y1, datum: datum.datum },
96
97
  seriesIdentifier: seriesIdentifier,
97
98
  seriesStyle: seriesStyle,
98
99
  panel: panel,
@@ -142,9 +143,7 @@ function getBarStyleOverrides(datum, seriesIdentifier, seriesStyle, styleAccesso
142
143
  if (typeof styleOverride === 'string') {
143
144
  return __assign(__assign({}, seriesStyle), { rect: __assign(__assign({}, seriesStyle.rect), { fill: styleOverride }) });
144
145
  }
145
- return (0, common_1.mergePartial)(seriesStyle, styleOverride, {
146
- mergeOptionalPartialValues: true,
147
- });
146
+ return (0, common_1.mergePartial)(seriesStyle, styleOverride);
148
147
  }
149
148
  exports.getBarStyleOverrides = getBarStyleOverrides;
150
149
  //# sourceMappingURL=bars.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bars.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bars.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bars.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,uDAAsD;AACtD,+FAA+F;AAC/F,gDAA4D;AAE5D,oDAA0E;AAE1E,sEAAmE;AAEnE,wCAAwG;AACxG,mCAA0C;AAE1C,IAAM,OAAO,GAAG,CAAC,CAAC;AAClB,IAAM,gBAAgB,GAAG,GAAG,CAAC;AAQ7B,SAAgB,UAAU,CACxB,UAAkB,EAClB,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,aAAqB,EACrB,YAAoB,EACpB,KAAY,EACZ,iBAAiC,EACjC,oBAAuC,EACvC,aAAgC,EAChC,SAAqB;IAEf,IAAA,KAA2B,iBAAiB,CAAC,YAAY,EAAvD,QAAQ,cAAA,EAAE,UAAU,gBAAmC,CAAC;IAChE,IAAM,eAAe,GAAa,EAAE,aAAa,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,yCAAkB,EAAE,EAAc,CAAC;IAClH,IAAM,MAAM,GAAG,MAAM,CAAC,IAAI,KAAK,qBAAS,CAAC,GAAG,CAAC;IAC7C,IAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,OAAO,IAAA,6CAAe,EAAC,UAAC,WAAW;QACjC,OAAA,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,UAAC,QAAkB,EAAE,KAAK;;YAC/C,IAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;gBAC7D,OAAO,QAAQ,CAAC;aACjB;YACO,IAAA,aAAa,GAAyB,QAAQ,cAAjC,EAAE,kBAAkB,GAAK,QAAQ,mBAAb,CAAc;YAC/C,IAAA,EAAE,GAA4B,KAAK,GAAjC,EAAE,EAAE,GAAwB,KAAK,GAA7B,EAAE,SAAS,GAAa,KAAK,UAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,CAAW;YAC5C,IAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAEtF,IAAM,QAAQ,GAAG,MAAM;gBACrB,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI;oBACvB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAEvC,IAAM,YAAY,GAAG,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC;YAC1C,IAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACzC,IAAM,MAAM,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAC/E,IAAM,eAAe,GAAG,MAAM,GAAG,SAAS,CAAC;YAC3C,IAAM,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC;YACtC,IAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzD,IAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,OAAO,GAAG,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,OAAO,GAAG,eAAe,CAAC;YAExF,IAAM,gBAAgB,GAA4B;gBAChD,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;gBACzC,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;gBAC/D,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;aAC5D,CAAC;YAEF,IAAM,WAAW,GAAG,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAC;YAEpG,IAAM,aAAa,GAAG,IAAA,cAAK,EAAC,MAAA,WAAW,CAAC,IAAI,CAAC,UAAU,mCAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;YACvF,IAAM,aAAa,GAAG,IAAA,cAAK,EAAC,MAAA,WAAW,CAAC,IAAI,CAAC,UAAU,mCAAI,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;YAEhF,IAAM,KAAK,GAAG,IAAA,cAAK,EAAC,MAAA,WAAW,CAAC,IAAI,CAAC,UAAU,mCAAI,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;YACnG,IAAM,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;YAErF,IAAM,OAAO,GAAG,IAAA,uBAAc,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;YAC/D,IAAM,qBAAqB,GAAG,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,cAAc,+CAApC,oBAAoB,EAAmB,OAAO,CAAC,CAAC;YAG9E,IAAM,gBAAgB,GACpB,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,uBAAuB,KAAI,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC;YAE1G,IAAA,KAAwC,eAAe,CAC3D,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE,EACtB,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,UAAA,EAAE,UAAU,YAAA,EAAE,WAAW,aAAA,EAAE,KAAK,OAAA,EAAE,EAC9D,oBAAoB,CACrB,EAJO,iBAAiB,uBAAA,EAAE,cAAc,oBAIxC,CAAC;YAEF,IAAM,oBAAoB,GAAG,aAAa,GAAG,GAAG,KAAK,CAAC,CAAC;YAEvD,IAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;YAE9F,IAAM,iBAAiB,GAAG,yBAAyB,CACjD,CAAC,KAAK,GAAG,gBAAgB,CAAC,GAAG,cAAc,EAC3C,cAAc,EACd,QAAQ,CACT,CAAC;YACF,IAAM,mBAAmB,GAAiC,IAAI,GAAG,CAC/D,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,mBAAmB,mCAAI;gBAC3C,+BAAuB,CAAC,UAAU;gBAClC,+BAAuB,CAAC,WAAW;aACpC,CACF,CAAC;YAGF,IAAM,eAAe,GAAG,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YAErE,IAAM,YAAY,GAChB,gBAAgB,KAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,cAAc,CAAA;gBACtD,CAAC,CAAC;oBACE,SAAS,EAAE,iBAAiB;oBAC5B,QAAQ,EAAE,cAAc;oBACxB,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,eAAe,GAAG,iBAAiB;oBAC1C,MAAM,EAAE,iBAAiB,GAAG,cAAc;oBAC1C,mBAAmB,qBAAA;oBACnB,yBAAyB,EAAE,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,yBAAyB,mCAAI,KAAK;iBACpF;gBACH,CAAC,CAAC,SAAS,CAAC;YAEhB,IAAM,WAAW,GAAgB;gBAC/B,YAAY,cAAA;gBACZ,CAAC,GAAA;gBACD,CAAC,GAAA;gBACD,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;gBACzB,KAAK,OAAA;gBACL,MAAM,QAAA;gBACN,KAAK,OAAA;gBACL,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,6BAAkB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;gBAClG,gBAAgB,kBAAA;gBAChB,WAAW,aAAA;gBACX,KAAK,OAAA;aACN,CAAC;YACF,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEpC,IAAI,EAAE,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,MAAK,SAAS,EAAE;gBACjE,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACjC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC,EAAE,eAAe,CAAC;IA1GnB,CA0GmB,CACpB,CAAC;AACJ,CAAC;AA/HD,gCA+HC;AAMD,SAAS,eAAe,CACtB,IAAY,EACZ,EAYC,EACD,oBAAkD;QAZhD,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,UAAU,gBAAA,EACV,WAAW,iBAAA,EACX,KAAK,WAAA;IAUP,IAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAE3F,IAAM,yBAAyB,GAAG,WAAW,CAAC,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC;IACrG,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,OAAO;YACL,cAAc,gBAAA;YACd,iBAAiB,EAAE,yBAAyB;SAC7C,CAAC;KACH;IACD,OAAO;QACL,cAAc,gBAAA;QACd,iBAAiB,EACf,oBAAoB,IAAI,oBAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,yBAAyB;KAC7G,CAAC;AACJ,CAAC;AAMD,SAAS,yBAAyB,CAChC,KAAa,EACb,aAAqB,EACrB,MAAqC;IAErC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAE9B,OAAO,CAAC,CAAC;KACV;IACD,IAAM,aAAa,GAAG,KAAK,GAAG,aAAa,CAAC;IAC5C,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG,EAAE;QAC9B,OAAO,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC;KACnC;IACD,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG,EAAE;QAE9B,OAAO,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC;KACnC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAGD,SAAgB,oBAAoB,CAClC,KAAsB,EACtB,gBAAyC,EACzC,WAA2B,EAC3B,aAAgC;IAEhC,IAAM,aAAa,GAAG,aAAa,IAAI,aAAa,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAE9E,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,6BAAY,WAAW,KAAE,IAAI,wBAAO,WAAW,CAAC,IAAI,KAAE,IAAI,EAAE,aAAa,OAAK;KAC/E;IAED,OAAO,IAAA,qBAAY,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AAClD,CAAC;AAjBD,oDAiBC"}
@@ -6,30 +6,21 @@ var curves_1 = require("../../../utils/curves");
6
6
  var points_1 = require("./points");
7
7
  var utils_1 = require("./utils");
8
8
  function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, pointStyleAccessor, hasFit) {
9
- var y1Fn = (0, utils_1.getY1ScaledValueOrThrowFn)(yScale);
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)();
12
12
  var pathGenerator = (0, d3_shape_1.line)()
13
13
  .x(function (_a) {
14
14
  var x = _a.x;
15
- return xScale.scaleOrThrow(x) - xScaleOffset;
15
+ return xScale.scale(x) - xScaleOffset;
16
16
  })
17
17
  .y(y1Fn)
18
- .defined(function (datum) {
19
- return definedFn(datum, y1Accessor);
20
- })
18
+ .defined(function (datum) { return definedFn(datum, y1Accessor); })
21
19
  .curve((0, curves_1.getCurveFactory)(curve));
22
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;
23
21
  var clippedRanges = (0, utils_1.getClippedRanges)(dataSeries.data, xScale, xScaleOffset);
24
- var linePath;
25
- try {
26
- linePath = pathGenerator(dataSeries.data) || '';
27
- }
28
- catch (_b) {
29
- linePath = '';
30
- }
31
22
  var lineGeometry = {
32
- line: linePath,
23
+ line: pathGenerator(dataSeries.data) || '',
33
24
  points: pointGeometries,
34
25
  color: color,
35
26
  transform: {
@@ -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,iCAMiB;AAGjB,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,kBAAuC,EACvC,MAAgB;IAKhB,IAAM,IAAI,GAAG,IAAA,iCAAyB,EAAC,MAAM,CAAC,CAAC;IAC/C,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,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY;IAArC,CAAqC,CAAC;SACnD,CAAC,CAAC,IAAI,CAAC;SACP,OAAO,CAAC,UAAC,KAAK;QACb,OAAO,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC,CAAC;SACD,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,kBAAkB,CACnB,EAXO,eAAe,qBAAA,EAAE,kBAAkB,wBAW1C,CAAC;IAEF,IAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAC9E,IAAI,QAAgB,CAAC;IAErB,IAAI;QACF,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACjD;IAAC,WAAM;QAEN,QAAQ,GAAG,EAAE,CAAC;KACf;IAED,IAAM,YAAY,GAAG;QACnB,IAAI,EAAE,QAAQ;QACd,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,eAAe,EAAE,WAAW,CAAC,IAAI;QACjC,gBAAgB,EAAE,WAAW,CAAC,KAAK;QACnC,aAAa,eAAA;QACb,iBAAiB,EAAE,CAAC,MAAM;KAC3B,CAAC;IACF,OAAO;QACL,YAAY,cAAA;QACZ,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AA/ED,gCA+EC"}
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,kBAAuC,EACvC,MAAgB;IAKhB,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,kBAAkB,CACnB,EAXO,eAAe,qBAAA,EAAE,kBAAkB,wBAW1C,CAAC;IAEF,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,eAAe,EAAE,WAAW,CAAC,IAAI;QACjC,gBAAgB,EAAE,WAAW,CAAC,KAAK;QACnC,aAAa,eAAA;QACb,iBAAiB,EAAE,CAAC,MAAM;KAC3B,CAAC;IACF,OAAO;QACL,YAAY,cAAA;QACZ,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AArED,gCAqEC"}
@@ -6,12 +6,10 @@ var common_1 = require("../../../utils/common");
6
6
  var theme_1 = require("../../../utils/themes/theme");
7
7
  function buildPointGeometryStyles(color, themePointStyle, overrides) {
8
8
  var _a;
9
- var pointStyle = (0, common_1.mergePartial)(themePointStyle, overrides, { mergeOptionalPartialValues: true });
9
+ var pointStyle = (0, common_1.mergePartial)(themePointStyle, overrides);
10
10
  var opacityFn = function (opacity) { return opacity * pointStyle.opacity; };
11
11
  return {
12
- fill: {
13
- color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(color, pointStyle.fill)), opacityFn),
14
- },
12
+ fill: { color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(color, pointStyle.fill)), opacityFn) },
15
13
  stroke: {
16
14
  color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(color, pointStyle.stroke)), opacityFn),
17
15
  width: pointStyle.strokeWidth,
@@ -1 +1 @@
1
- {"version":3,"file":"point_style.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/point_style.ts"],"names":[],"mappings":";;;AAQA,iFAAiG;AACjG,gDAA0E;AAE1E,qDAAqE;AAGrE,SAAgB,wBAAwB,CACtC,KAAa,EACb,eAA2B,EAC3B,SAA+B;;IAE/B,IAAM,UAAU,GAAG,IAAA,qBAAY,EAAC,eAAe,EAAE,SAAS,EAAE,EAAE,0BAA0B,EAAE,IAAI,EAAE,CAAC,CAAC;IAElG,IAAM,SAAS,GAAc,UAAC,OAAO,IAAK,OAAA,OAAO,GAAG,UAAU,CAAC,OAAO,EAA5B,CAA4B,CAAC;IAEvE,OAAO;QACL,IAAI,EAAE;YACJ,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC;SAC5F;QACD,MAAM,EAAE;YACN,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC;YAC7F,KAAK,EAAE,UAAU,CAAC,WAAW;SAC9B;QACD,KAAK,EAAE,MAAA,UAAU,CAAC,KAAK,mCAAI,kBAAU,CAAC,MAAM;KAC7C,CAAC;AACJ,CAAC;AAnBD,4DAmBC"}
1
+ {"version":3,"file":"point_style.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/point_style.ts"],"names":[],"mappings":";;;AAQA,iFAAiG;AACjG,gDAA0E;AAE1E,qDAAqE;AAGrE,SAAgB,wBAAwB,CACtC,KAAa,EACb,eAA2B,EAC3B,SAA+B;;IAE/B,IAAM,UAAU,GAAG,IAAA,qBAAY,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAM,SAAS,GAAc,UAAC,OAAO,IAAK,OAAA,OAAO,GAAG,UAAU,CAAC,OAAO,EAA5B,CAA4B,CAAC;IACvE,OAAO;QACL,IAAI,EAAE,EAAE,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE;QACrG,MAAM,EAAE;YACN,KAAK,EAAE,IAAA,wCAAe,EAAC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC;YAC7F,KAAK,EAAE,UAAU,CAAC,WAAW;SAC9B;QACD,KAAK,EAAE,MAAA,UAAU,CAAC,KAAK,mCAAI,kBAAU,CAAC,MAAM;KAC7C,CAAC;AACJ,CAAC;AAfD,4DAeC"}
@@ -25,7 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
25
25
  return to.concat(ar || Array.prototype.slice.call(from));
26
26
  };
27
27
  Object.defineProperty(exports, "__esModule", { value: true });
28
- exports.getRadiusFn = exports.getPointStyleOverrides = exports.renderPoints = void 0;
28
+ exports.getRadiusFn = exports.getDatumYValue = exports.getPointStyleOverrides = exports.renderPoints = void 0;
29
29
  var common_1 = require("../../../utils/common");
30
30
  var geometry_1 = require("../../../utils/geometry");
31
31
  var indexed_geometry_map_1 = require("../utils/indexed_geometry_map");
@@ -39,32 +39,24 @@ function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyl
39
39
  ? getRadiusFn(dataSeries.data, pointStyle.strokeWidth, markSizeOptions.ratio)
40
40
  : function () { return 0; };
41
41
  var geometryType = spatial ? indexed_geometry_map_1.GeometryType.spatial : indexed_geometry_map_1.GeometryType.linear;
42
- var y1Fn = (0, utils_1.getY1ScaledValueOrThrowFn)(yScale);
43
- var y0Fn = (0, utils_1.getY0ScaledValueOrThrowFn)(yScale);
42
+ var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
43
+ var y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
44
44
  var yDefined = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
45
45
  var pointGeometries = dataSeries.data.reduce(function (acc, datum, dataIndex) {
46
46
  var xValue = datum.x, mark = datum.mark;
47
47
  var prev = dataSeries.data[dataIndex - 1];
48
48
  var next = dataSeries.data[dataIndex + 1];
49
- if (!xScale.isValueInDomain(xValue)) {
49
+ if (!xScale.isValueInDomain(xValue))
50
50
  return acc;
51
- }
52
51
  var x = xScale.scale(xValue);
53
- if (x === null) {
52
+ if (Number.isNaN(x))
54
53
  return acc;
55
- }
56
54
  var points = [];
57
55
  var yDatumKeyNames = hasY0Accessors ? ['y0', 'y1'] : ['y1'];
58
56
  yDatumKeyNames.forEach(function (yDatumKeyName, keyIndex) {
59
57
  var _a;
60
58
  var valueAccessor = (0, utils_1.getYDatumValueFn)(yDatumKeyName);
61
- var y;
62
- try {
63
- y = yDatumKeyName === 'y1' ? y1Fn(datum) : y0Fn(datum);
64
- }
65
- catch (_b) {
66
- y = null;
67
- }
59
+ var y = yDatumKeyName === 'y1' ? y1Fn(datum) : y0Fn(datum);
68
60
  var originalY = getDatumYValue(datum, keyIndex === 0, hasY0Accessors, dataSeries.stackMode);
69
61
  var seriesIdentifier = {
70
62
  key: dataSeries.key,
@@ -131,18 +123,11 @@ exports.getPointStyleOverrides = getPointStyleOverrides;
131
123
  function getDatumYValue(_a, lookingForY0, isBandChart, stackMode) {
132
124
  var y1 = _a.y1, y0 = _a.y0, initialY1 = _a.initialY1, initialY0 = _a.initialY0;
133
125
  if (isBandChart) {
134
- return stackMode === specs_1.StackMode.Percentage
135
- ?
136
- lookingForY0
137
- ? y0
138
- : y1
139
- :
140
- lookingForY0
141
- ? initialY0
142
- : initialY1;
126
+ return stackMode === specs_1.StackMode.Percentage ? (lookingForY0 ? y0 : y1) : lookingForY0 ? initialY0 : initialY1;
143
127
  }
144
- return stackMode === specs_1.StackMode.Percentage ? (y1 !== null && y1 !== void 0 ? y1 : 0) - (y0 !== null && y0 !== void 0 ? y0 : 0) : initialY1;
128
+ return stackMode === specs_1.StackMode.Percentage ? ((0, common_1.isNil)(y1) || (0, common_1.isNil)(initialY1) ? null : y1 - (y0 !== null && y0 !== void 0 ? y0 : 0)) : initialY1;
145
129
  }
130
+ exports.getDatumYValue = getDatumYValue;
146
131
  function getRadiusFn(data, lineWidth, markSizeRatio) {
147
132
  if (markSizeRatio === void 0) { markSizeRatio = 50; }
148
133
  if (data.length === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/points.ts"],"names":[],"mappings":"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"}
@@ -25,8 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
25
25
  return to.concat(ar || Array.prototype.slice.call(from));
26
26
  };
27
27
  Object.defineProperty(exports, "__esModule", { value: true });
28
- exports.getY0ScaledValueOrThrowFn = exports.getY1ScaledValueOrThrowFn = exports.CHROME_PINCH_BUG_EPSILON = exports.isYValueDefinedFn = exports.isPointOnGeometry = exports.getGeometryStateStyle = exports.getClippedRanges = exports.isDatumFilled = exports.getYDatumValueFn = void 0;
29
- var scale_continuous_1 = require("../../../scales/scale_continuous");
28
+ exports.getY0ScaledValueFn = exports.getY1ScaledValueFn = exports.CHROME_PINCH_BUG_EPSILON = exports.isYValueDefinedFn = exports.isPointOnGeometry = exports.getGeometryStateStyle = exports.getClippedRanges = exports.isDatumFilled = exports.getYDatumValueFn = void 0;
30
29
  var types_1 = require("../../../scales/types");
31
30
  var common_1 = require("../../../utils/common");
32
31
  var geometry_1 = require("../../../utils/geometry");
@@ -57,9 +56,8 @@ function getClippedRanges(dataset, xScale, xScaleOffset) {
57
56
  return [[xScale.range[0], xScale.range[1]]];
58
57
  return dataset.reduce(function (acc, data) {
59
58
  var xScaled = xScale.scale(data.x);
60
- if (xScaled === null) {
59
+ if (Number.isNaN(xScaled))
61
60
  return acc;
62
- }
63
61
  var xValue = xScaled - xScaleOffset + xScale.bandwidth / 2;
64
62
  if (isDatumFilled(data)) {
65
63
  var endXValue = xScale.range[1] - xScale.bandwidth * (2 / 3);
@@ -128,10 +126,8 @@ exports.isPointOnGeometry = isPointOnGeometry;
128
126
  var getScaleTypeValueValidator = function (yScale) {
129
127
  if (!(0, types_1.isLogarithmicScale)(yScale))
130
128
  return function () { return true; };
131
- var domainPolarity = (0, scale_continuous_1.getDomainPolarity)(yScale.domain);
132
- return function (yValue) {
133
- return !((domainPolarity >= 0 && yValue <= 0) || (domainPolarity < 0 && yValue >= 0));
134
- };
129
+ var domainPolarity = getDomainPolarity(yScale.domain);
130
+ return function (yValue) { return domainPolarity === Math.sign(yValue); };
135
131
  };
136
132
  var DEFAULT_ZERO_BASELINE = 0;
137
133
  function isYValueDefinedFn(yScale, xScale) {
@@ -144,39 +140,32 @@ function isYValueDefinedFn(yScale, xScale) {
144
140
  exports.isYValueDefinedFn = isYValueDefinedFn;
145
141
  exports.CHROME_PINCH_BUG_EPSILON = 0.5;
146
142
  function chromeRenderBugBuffer(y1, y0) {
147
- var diff = Math.abs(y1 - y0);
148
- return diff <= exports.CHROME_PINCH_BUG_EPSILON ? 0.5 : 0;
143
+ return Math.abs(y1 - y0) <= exports.CHROME_PINCH_BUG_EPSILON ? 0.5 : 0;
149
144
  }
150
- function getY1ScaledValueOrThrowFn(yScale) {
145
+ function getY1ScaledValueFn(yScale) {
151
146
  var datumAccessor = getYDatumValueFn();
152
- var scaleY0Value = getY0ScaledValueOrThrowFn(yScale);
147
+ var scaleY0Value = getY0ScaledValueFn(yScale);
153
148
  return function (datum) {
154
- var y1Value = yScale.scaleOrThrow(datumAccessor(datum));
149
+ var y1Value = yScale.scale(datumAccessor(datum));
155
150
  var y0Value = scaleY0Value(datum);
156
151
  return y1Value - chromeRenderBugBuffer(y1Value, y0Value);
157
152
  };
158
153
  }
159
- exports.getY1ScaledValueOrThrowFn = getY1ScaledValueOrThrowFn;
160
- function getY0ScaledValueOrThrowFn(yScale) {
161
- var isLogScale = (0, types_1.isLogarithmicScale)(yScale);
162
- var domainPolarity = (0, scale_continuous_1.getDomainPolarity)(yScale.domain);
154
+ exports.getY1ScaledValueFn = getY1ScaledValueFn;
155
+ function getY0ScaledValueFn(yScale) {
156
+ var domainPolarity = getDomainPolarity(yScale.domain);
163
157
  var logBaseline = domainPolarity >= 0 ? Math.min.apply(Math, __spreadArray([], __read(yScale.domain), false)) : Math.max.apply(Math, __spreadArray([], __read(yScale.domain), false));
164
158
  return function (_a) {
165
159
  var y0 = _a.y0;
166
- if (y0 === null) {
167
- if (isLogScale) {
168
- return yScale.scaleOrThrow(logBaseline);
169
- }
170
- return yScale.scaleOrThrow(DEFAULT_ZERO_BASELINE);
171
- }
172
- if (isLogScale) {
173
- if ((domainPolarity >= 0 && y0 <= 0) || (domainPolarity < 0 && y0 >= 0)) {
174
- return yScale.scaleOrThrow(logBaseline);
175
- }
176
- return yScale.scaleOrThrow(y0);
177
- }
178
- return yScale.scaleOrThrow(y0);
160
+ return (0, types_1.isLogarithmicScale)(yScale)
161
+ ? y0 === null || domainPolarity !== Math.sign(y0)
162
+ ? yScale.scale(logBaseline)
163
+ : yScale.scale(y0)
164
+ : yScale.scale(y0 === null ? DEFAULT_ZERO_BASELINE : y0);
179
165
  };
180
166
  }
181
- exports.getY0ScaledValueOrThrowFn = getY0ScaledValueOrThrowFn;
167
+ exports.getY0ScaledValueFn = getY0ScaledValueFn;
168
+ function getDomainPolarity(domain) {
169
+ return Math.sign(Math.sign(domain[0]) + Math.sign(domain[1]));
170
+ }
182
171
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/utils.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  import React from 'react';
2
2
  import { AxisSpec } from '../utils/specs';
3
- declare type SpecRequired = Pick<AxisSpec, 'id'>;
4
- declare type SpecOptionals = Partial<Omit<AxisSpec, 'chartType' | 'specType' | 'seriesType' | 'id'>>;
5
3
  /** @public */
6
4
  export declare const Axis: React.FunctionComponent<SpecRequired & SpecOptionals>;
5
+ declare type SpecRequired = Pick<AxisSpec, 'id'>;
6
+ declare type SpecOptionals = Partial<Omit<AxisSpec, 'chartType' | 'specType' | 'seriesType' | 'id'>>;
7
7
  export {};
8
8
  //# sourceMappingURL=axis.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"axis.d.ts","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/specs/axis.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EAAE,QAAQ,EAAqB,MAAM,gBAAgB,CAAC;AAY7D,aAAK,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACzC,aAAK,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC;AAE7F,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,iBAAiB,CAAC,YAAY,GAAG,aAAa,CAItE,CAAC"}
1
+ {"version":3,"file":"axis.d.ts","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/specs/axis.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EAAE,QAAQ,EAAqB,MAAM,gBAAgB,CAAC;AAE7D,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,iBAAiB,CAAC,YAAY,GAAG,aAAa,CAUtE,CAAC;AAEF,aAAK,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACzC,aAAK,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC"}
@@ -6,7 +6,7 @@ var constants_1 = require("../../../specs/constants");
6
6
  var spec_factory_1 = require("../../../state/spec_factory");
7
7
  var common_1 = require("../../../utils/common");
8
8
  var specs_1 = require("../utils/specs");
9
- var defaultProps = {
9
+ exports.Axis = (0, spec_factory_1.getConnect)()((0, spec_factory_1.specComponentFactory)({
10
10
  chartType: __1.ChartType.XYAxis,
11
11
  specType: constants_1.SpecType.Axis,
12
12
  groupId: specs_1.DEFAULT_GLOBAL_ID,
@@ -14,6 +14,5 @@ var defaultProps = {
14
14
  showOverlappingTicks: false,
15
15
  showOverlappingLabels: false,
16
16
  position: common_1.Position.Left,
17
- };
18
- exports.Axis = (0, spec_factory_1.getConnect)()((0, spec_factory_1.specComponentFactory)(defaultProps));
17
+ }));
19
18
  //# sourceMappingURL=axis.js.map