@elastic/charts 70.0.1 → 70.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/chart_types/flame_chart/render/common.js.map +1 -1
- package/dist/chart_types/flame_chart/render/draw_canvas.js +1 -3
- package/dist/chart_types/flame_chart/render/draw_canvas.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/is_tooltip_visible.js +2 -1
- package/dist/chart_types/heatmap/state/selectors/is_tooltip_visible.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/on_brush_end_caller.js +3 -2
- package/dist/chart_types/heatmap/state/selectors/on_brush_end_caller.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/on_element_click_caller.js +3 -2
- package/dist/chart_types/heatmap/state/selectors/on_element_click_caller.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/tooltip.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/tooltip.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js +44 -36
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js +18 -18
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/points.js +7 -4
- package/dist/chart_types/xy_chart/renderer/canvas/points.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js +2 -2
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/area.js +25 -3
- package/dist/chart_types/xy_chart/renderer/canvas/styles/area.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/bar.js +3 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/bar.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/styles/line.js +15 -4
- package/dist/chart_types/xy_chart/renderer/canvas/styles/line.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/area.js +1 -1
- package/dist/chart_types/xy_chart/rendering/area.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/bubble.js +1 -1
- package/dist/chart_types/xy_chart/rendering/bubble.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/line.js +1 -1
- package/dist/chart_types/xy_chart/rendering/line.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/point_style.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/points.js +23 -17
- package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_series.js +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_highlighted_series.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/on_brush_end_caller.js +4 -2
- package/dist/chart_types/xy_chart/state/selectors/on_brush_end_caller.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/on_click_caller.js +6 -4
- package/dist/chart_types/xy_chart/state/selectors/on_click_caller.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js +15 -8
- package/dist/chart_types/xy_chart/state/selectors/visible_ticks.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/texture.js +2 -2
- package/dist/chart_types/xy_chart/utils/texture.js.map +1 -1
- package/dist/components/chart_container.js +13 -15
- package/dist/components/chart_container.js.map +1 -1
- package/dist/specs/settings.d.ts +83 -13
- package/dist/specs/settings.d.ts.map +1 -1
- package/dist/specs/settings.js.map +1 -1
- package/dist/state/actions/mouse.js.map +1 -1
- package/dist/state/reducers/interactions.js +2 -0
- package/dist/state/reducers/interactions.js.map +1 -1
- package/dist/state/selectors/get_key_pressed.d.ts +2 -0
- package/dist/state/selectors/get_key_pressed.d.ts.map +1 -0
- package/dist/state/selectors/get_key_pressed.js +8 -0
- package/dist/state/selectors/get_key_pressed.js.map +1 -0
- package/dist/state/utils/get_initial_pointer_state.js +2 -0
- package/dist/state/utils/get_initial_pointer_state.js.map +1 -1
- package/dist/state/utils.js +2 -0
- package/dist/state/utils.js.map +1 -1
- package/dist/theme_dark.css +1 -1
- package/dist/theme_light.css +1 -1
- package/dist/theme_only_dark.css +1 -1
- package/dist/theme_only_light.css +1 -1
- package/dist/utils/geometry.d.ts.map +1 -1
- package/dist/utils/geometry.js +12 -0
- package/dist/utils/geometry.js.map +1 -1
- package/dist/utils/keys.d.ts +16 -0
- package/dist/utils/keys.d.ts.map +1 -0
- package/dist/utils/keys.js +9 -0
- package/dist/utils/keys.js.map +1 -0
- package/dist/utils/themes/amsterdam_dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/amsterdam_dark_theme.js +8 -0
- package/dist/utils/themes/amsterdam_dark_theme.js.map +1 -1
- package/dist/utils/themes/amsterdam_light_theme.d.ts.map +1 -1
- package/dist/utils/themes/amsterdam_light_theme.js +8 -0
- package/dist/utils/themes/amsterdam_light_theme.js.map +1 -1
- package/dist/utils/themes/base_colors.js +34 -8
- package/dist/utils/themes/base_colors.js.map +1 -1
- package/dist/utils/themes/dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/dark_theme.js +25 -0
- package/dist/utils/themes/dark_theme.js.map +1 -1
- package/dist/utils/themes/legacy_dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/legacy_dark_theme.js +8 -0
- package/dist/utils/themes/legacy_dark_theme.js.map +1 -1
- package/dist/utils/themes/legacy_light_theme.d.ts.map +1 -1
- package/dist/utils/themes/legacy_light_theme.js +8 -0
- package/dist/utils/themes/legacy_light_theme.js.map +1 -1
- package/dist/utils/themes/light_theme.d.ts.map +1 -1
- package/dist/utils/themes/light_theme.js +25 -0
- package/dist/utils/themes/light_theme.js.map +1 -1
- package/dist/utils/themes/theme.d.ts +44 -2
- package/dist/utils/themes/theme.d.ts.map +1 -1
- package/dist/utils/themes/theme.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/chart_types/flame_chart/render/common.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/chart_types/flame_chart/render/common.ts"],"names":[],"mappings":";;;AAYa,QAAA,kBAAkB,GAAG,GAAG,CAAC;AAMzB,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAMlC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAG3B,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAE,EAAE,CAClD,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,qBAAqB,CAAC,CAAC;AAD7D,QAAA,WAAW,eACkD"}
|
|
@@ -10,13 +10,11 @@ const TEXT_PAD_LEFT = 4;
|
|
|
10
10
|
const TEXT_PAD_RIGHT = 4;
|
|
11
11
|
const MIN_TEXT_LENGTH = 0;
|
|
12
12
|
const ROW_OFFSET_Y = 0.45;
|
|
13
|
-
const MAX_FONT_HEIGHT_RATIO = 1;
|
|
14
|
-
const MAX_FONT_SIZE = 12;
|
|
15
13
|
const mix = (a = 1, b = 1, x = 1) => (1 - x) * a + x * b;
|
|
16
14
|
const drawCanvas2d = (ctx, logicalTime, cssWidth, cssHeight, cssOffsetX, cssOffsetY, dpr, columnarGeomData, rowHeight, [focusLoX, focusHiX, focusLoY, focusHiY], color) => {
|
|
17
15
|
const zoomedRowHeight = rowHeight / Math.abs(focusHiY - focusLoY);
|
|
18
16
|
const rowHeightPx = zoomedRowHeight * cssHeight;
|
|
19
|
-
const fontSize =
|
|
17
|
+
const fontSize = zoomedRowHeight * cssHeight - 2 * common_1.BOX_GAP_VERTICAL;
|
|
20
18
|
const minTextLengthCssPix = MIN_TEXT_LENGTH * fontSize;
|
|
21
19
|
const minRectWidthForTextInCssPix = minTextLengthCssPix + TEXT_PAD_LEFT + TEXT_PAD_RIGHT;
|
|
22
20
|
const minRectWidth = minRectWidthForTextInCssPix / cssWidth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draw_canvas.js","sourceRoot":"","sources":["../../../../src/chart_types/flame_chart/render/draw_canvas.ts"],"names":[],"mappings":";;;AAQA,qCAA6E;AAC7E,uFAA+E;AAC/E,2DAA8D;AAI9D,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;AACxF,MAAM,SAAS,GAA0B,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC;AAElE,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,YAAY,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"draw_canvas.js","sourceRoot":"","sources":["../../../../src/chart_types/flame_chart/render/draw_canvas.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,9 @@ exports.isTooltipVisibleSelector = (0, create_selector_1.createCustomCachedSelec
|
|
|
15
15
|
isPinnable: false,
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
+
const tooltipInfoIsVisible = tooltipInfo.values.some(({ isVisible }) => isVisible);
|
|
18
19
|
return {
|
|
19
|
-
visible:
|
|
20
|
+
visible: tooltipInfoIsVisible || pinned,
|
|
20
21
|
displayOnly: tooltipInfo.values.every(({ displayOnly }) => displayOnly),
|
|
21
22
|
isExternal: false,
|
|
22
23
|
isPinnable: tooltipInfo.values.length > 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is_tooltip_visible.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/is_tooltip_visible.ts"],"names":[],"mappings":";;;AAQA,uCAAmD;AACnD,2DAA0D;AAE1D,uEAA+E;AAC/E,6GAAuG;AACvG,mFAAsF;AAGzE,QAAA,wBAAwB,GAAG,IAAA,4CAA0B,EAChE,CAAC,yCAAsB,EAAE,gCAAsB,EAAE,0DAA0B,CAAC,EAC5E,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAqB,EAAE;IACvD,IAAI,IAAI,KAAK,uBAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,KAAK;YACjB,WAAW,EAAE,KAAK;YAClB,UAAU,EAAE,KAAK;SAClB,CAAC;IACJ,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"is_tooltip_visible.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/is_tooltip_visible.ts"],"names":[],"mappings":";;;AAQA,uCAAmD;AACnD,2DAA0D;AAE1D,uEAA+E;AAC/E,6GAAuG;AACvG,mFAAsF;AAGzE,QAAA,wBAAwB,GAAG,IAAA,4CAA0B,EAChE,CAAC,yCAAsB,EAAE,gCAAsB,EAAE,0DAA0B,CAAC,EAC5E,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAqB,EAAE;IACvD,IAAI,IAAI,KAAK,uBAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,KAAK;YACjB,WAAW,EAAE,KAAK;YAClB,UAAU,EAAE,KAAK;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,oBAAoB,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;IAEnF,OAAO;QACL,OAAO,EAAE,oBAAoB,IAAI,MAAM;QACvC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC;QACvE,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;KAC1C,CAAC;AACJ,CAAC,CACF,CAAC"}
|
|
@@ -5,6 +5,7 @@ const get_picked_cells_1 = require("./get_picked_cells");
|
|
|
5
5
|
const is_brush_available_1 = require("./is_brush_available");
|
|
6
6
|
const __1 = require("../../..");
|
|
7
7
|
const create_selector_1 = require("../../../../state/create_selector");
|
|
8
|
+
const get_key_pressed_1 = require("../../../../state/selectors/get_key_pressed");
|
|
8
9
|
const get_last_drag_1 = require("../../../../state/selectors/get_last_drag");
|
|
9
10
|
const get_settings_spec_1 = require("../../../../state/selectors/get_settings_spec");
|
|
10
11
|
const events_1 = require("../../../../utils/events");
|
|
@@ -18,7 +19,7 @@ function createOnBrushEndCaller() {
|
|
|
18
19
|
prevProps = null;
|
|
19
20
|
return;
|
|
20
21
|
}
|
|
21
|
-
selector = (0, create_selector_1.createCustomCachedSelector)([get_last_drag_1.getLastDragSelector, get_settings_spec_1.getSettingsSpecSelector, get_picked_cells_1.getPickedCells], (lastDrag, { onBrushEnd }, pickedCells) => {
|
|
22
|
+
selector = (0, create_selector_1.createCustomCachedSelector)([get_last_drag_1.getLastDragSelector, get_settings_spec_1.getSettingsSpecSelector, get_picked_cells_1.getPickedCells, get_key_pressed_1.getKeyPressedSelector], (lastDrag, { onBrushEnd }, pickedCells, keyPressed) => {
|
|
22
23
|
const nextProps = {
|
|
23
24
|
lastDrag,
|
|
24
25
|
onBrushEnd,
|
|
@@ -27,7 +28,7 @@ function createOnBrushEndCaller() {
|
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
29
30
|
if (lastDrag !== null && (0, events_1.hasDragged)(prevProps, nextProps)) {
|
|
30
|
-
onBrushEnd(pickedCells);
|
|
31
|
+
onBrushEnd(pickedCells, { keyPressed });
|
|
31
32
|
}
|
|
32
33
|
prevProps = nextProps;
|
|
33
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"on_brush_end_caller.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/on_brush_end_caller.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"on_brush_end_caller.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/on_brush_end_caller.ts"],"names":[],"mappings":";;AA8BA,wDAoCC;AAxDD,yDAAoD;AACpD,6DAA0D;AAC1D,gCAAqC;AAGrC,uEAA+E;AAE/E,iFAAoF;AACpF,6EAAgF;AAChF,qFAAwF;AAExF,qDAAsD;AAStD,SAAgB,sBAAsB;IACpC,IAAI,SAAS,GAA0B,IAAI,CAAC;IAC5C,IAAI,QAAQ,GAID,IAAI,CAAC;IAEhB,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,aAAS,CAAC,OAAO,EAAE,CAAC;YAC/D,IAAI,CAAC,IAAA,uCAAkB,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,QAAQ,GAAG,IAAI,CAAC;gBAChB,SAAS,GAAG,IAAI,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,QAAQ,GAAG,IAAA,4CAA0B,EACnC,CAAC,mCAAmB,EAAE,2CAAuB,EAAE,iCAAc,EAAE,uCAAqB,CAAC,EACrF,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,UAAU,EAAQ,EAAE;gBAC1D,MAAM,SAAS,GAAmB;oBAChC,QAAQ;oBACR,UAAU;iBACX,CAAC;gBACF,IAAI,CAAC,UAAU,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;oBACxC,OAAO;gBACT,CAAC;gBACD,IAAI,QAAQ,KAAK,IAAI,IAAI,IAAA,mBAAU,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;oBAC1D,UAAU,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;gBAC1C,CAAC;gBACD,SAAS,GAAG,SAAS,CAAC;YACxB,CAAC,CACF,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -5,6 +5,7 @@ const get_heatmap_spec_1 = require("./get_heatmap_spec");
|
|
|
5
5
|
const picked_shapes_1 = require("./picked_shapes");
|
|
6
6
|
const __1 = require("../../..");
|
|
7
7
|
const create_selector_1 = require("../../../../state/create_selector");
|
|
8
|
+
const get_key_pressed_1 = require("../../../../state/selectors/get_key_pressed");
|
|
8
9
|
const get_last_click_1 = require("../../../../state/selectors/get_last_click");
|
|
9
10
|
const get_settings_spec_1 = require("../../../../state/selectors/get_settings_spec");
|
|
10
11
|
const is_clicking_1 = require("../../../../state/utils/is_clicking");
|
|
@@ -14,7 +15,7 @@ function createOnElementClickCaller() {
|
|
|
14
15
|
let selector = null;
|
|
15
16
|
return (state) => {
|
|
16
17
|
if (selector === null && state.chartType === __1.ChartType.Heatmap) {
|
|
17
|
-
selector = (0, create_selector_1.createCustomCachedSelector)([get_heatmap_spec_1.getHeatmapSpecSelector, get_last_click_1.getLastClickSelector, get_settings_spec_1.getSettingsSpecSelector, picked_shapes_1.getPickedShapes], (spec, lastClick, settings, pickedShapes) => {
|
|
18
|
+
selector = (0, create_selector_1.createCustomCachedSelector)([get_heatmap_spec_1.getHeatmapSpecSelector, get_last_click_1.getLastClickSelector, get_settings_spec_1.getSettingsSpecSelector, picked_shapes_1.getPickedShapes, get_key_pressed_1.getKeyPressedSelector], (spec, lastClick, settings, pickedShapes, keyPressed) => {
|
|
18
19
|
if (!spec) {
|
|
19
20
|
return;
|
|
20
21
|
}
|
|
@@ -33,7 +34,7 @@ function createOnElementClickCaller() {
|
|
|
33
34
|
key: `spec{${spec.id}}`,
|
|
34
35
|
},
|
|
35
36
|
]);
|
|
36
|
-
settings.onElementClick(elements);
|
|
37
|
+
settings.onElementClick(elements, { keyPressed });
|
|
37
38
|
}
|
|
38
39
|
prevClick = lastClick;
|
|
39
40
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"on_element_click_caller.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/on_element_click_caller.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"on_element_click_caller.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/on_element_click_caller.ts"],"names":[],"mappings":";;AAgCA,gEAoCC;AA1DD,yDAA4D;AAC5D,mDAAkD;AAClD,gCAAqC;AAIrC,uEAA+E;AAE/E,iFAAoF;AACpF,+EAAkF;AAClF,qFAAwF;AACxF,qEAAiE;AAEjE,wEAAmE;AASnE,SAAgB,0BAA0B;IACxC,IAAI,SAAS,GAAwB,IAAI,CAAC;IAC1C,IAAI,QAAQ,GAA4C,IAAI,CAAC;IAC7D,OAAO,CAAC,KAAuB,EAAE,EAAE;QACjC,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,aAAS,CAAC,OAAO,EAAE,CAAC;YAC/D,QAAQ,GAAG,IAAA,4CAA0B,EACnC,CAAC,yCAAsB,EAAE,qCAAoB,EAAE,2CAAuB,EAAE,+BAAe,EAAE,uCAAqB,CAAC,EAC/G,CAAC,IAAI,EAAE,SAA8B,EAAE,QAAsB,EAAE,YAAY,EAAE,UAAU,EAAQ,EAAE;gBAC/F,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;oBAC7B,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,IAAA,+BAAa,EAAC,YAAY,CAAC,EAAE,CAAC;oBACjC,OAAO;gBACT,CAAC;gBACD,MAAM,sBAAsB,GAAG,YAAY,CAAC,MAAM,CAAC;gBACnD,IAAI,sBAAsB,GAAG,CAAC,IAAI,IAAA,wBAAU,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;oBACnE,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAA2B,CAAC,KAAK,EAAE,EAAE,CAAC;wBACrE,KAAK;wBACL;4BACE,MAAM,EAAE,IAAI,CAAC,EAAE;4BACf,GAAG,EAAE,QAAQ,IAAI,CAAC,EAAE,GAAG;yBACxB;qBACF,CAAC,CAAC;oBACH,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;gBACpD,CAAC;gBACD,SAAS,GAAG,SAAS,CAAC;YACxB,CAAC,CACF,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -71,7 +71,7 @@ exports.getTooltipInfoSelector = (0, create_selector_1.createCustomCachedSelecto
|
|
|
71
71
|
label: '',
|
|
72
72
|
color: colors_1.Colors.Transparent.keyword,
|
|
73
73
|
isHighlighted: false,
|
|
74
|
-
isVisible:
|
|
74
|
+
isVisible: pickedShapes.text.length > 0,
|
|
75
75
|
seriesIdentifier: {
|
|
76
76
|
specId: spec.id,
|
|
77
77
|
key: spec.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tooltip.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/tooltip.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tooltip.js","sourceRoot":"","sources":["../../../../../src/chart_types/heatmap/state/selectors/tooltip.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,48 +7,56 @@ const path_1 = require("./primitives/path");
|
|
|
7
7
|
const area_1 = require("./styles/area");
|
|
8
8
|
const line_1 = require("./styles/line");
|
|
9
9
|
const panel_transform_1 = require("./utils/panel_transform");
|
|
10
|
-
const color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
11
10
|
const canvas_1 = require("../../../../renderers/canvas");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
11
|
+
const geometry_1 = require("../../../../utils/geometry");
|
|
12
|
+
function renderAreas(ctx, imgCanvas, areas, rotation, renderingArea, highlightedLegendItem) {
|
|
13
|
+
const sortedRenderingAreas = areas.reduce((acc, area) => {
|
|
14
|
+
const highlightState = (0, geometry_1.getGeometryHighlightState)(area.value.seriesIdentifier.key, highlightedLegendItem);
|
|
15
|
+
acc[highlightState][area.value.isStacked ? 'stacked' : 'nonStacked'][area.value.isStacked ? 'unshift' : 'push'](area);
|
|
16
|
+
return acc;
|
|
17
|
+
}, {
|
|
18
|
+
dimmed: { stacked: [], nonStacked: [] },
|
|
19
|
+
focused: { stacked: [], nonStacked: [] },
|
|
20
|
+
default: { stacked: [], nonStacked: [] },
|
|
21
|
+
});
|
|
16
22
|
(0, canvas_1.withContext)(ctx, () => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderAreaLines(ctx, geom, sharedStyle, clippings, highlightedLegendItem), { area: clippings, shouldClip: true });
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
areas.forEach(({ panel, value: { style, seriesIdentifier, points, hasFit, minPointDistance } }) => {
|
|
27
|
-
const geometryStyle = (0, utils_1.getGeometryStateStyle)(seriesIdentifier, sharedStyle, highlightedLegendItem);
|
|
28
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, points, geometryStyle, style.point, style.line.strokeWidth, minPointDistance, style.pointVisibilityMinDistance, hasFit && points.length > 1), { area: (0, panel_clipping_1.getPanelClipping)(panel, rotation), shouldClip: points[0]?.value.mark !== null });
|
|
29
|
-
});
|
|
23
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.default.stacked, 'default');
|
|
24
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.default.nonStacked, 'default');
|
|
25
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.dimmed.stacked, 'dimmed');
|
|
26
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.dimmed.nonStacked, 'dimmed');
|
|
27
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.focused.stacked, 'focused');
|
|
28
|
+
renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, sortedRenderingAreas.focused.nonStacked, 'focused');
|
|
30
29
|
});
|
|
31
30
|
}
|
|
32
|
-
function
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
31
|
+
function renderAreasGroup(ctx, imgCanvas, rotation, renderingArea, areas, highlighedState) {
|
|
32
|
+
areas.forEach(({ panel, value: geom }) => {
|
|
33
|
+
const clippings = (0, panel_clipping_1.getPanelClipping)(panel, rotation);
|
|
34
|
+
if (geom.style.area.visible) {
|
|
35
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderArea(ctx, imgCanvas, geom, clippings, highlighedState), { area: clippings, shouldClip: true });
|
|
36
|
+
}
|
|
37
|
+
if (geom.style.line.visible) {
|
|
38
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderAreaLines(ctx, geom, clippings, highlighedState), { area: clippings, shouldClip: true });
|
|
39
|
+
}
|
|
40
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, geom.points, highlighedState, geom.style.point, geom.style.line.strokeWidth, geom.minPointDistance, geom.style.pointVisibilityMinDistance, geom.hasFit && geom.points.length > 1), { area: clippings, shouldClip: geom.points[0]?.value.mark !== null });
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
function renderArea(ctx, imgCanvas, geometry, clippings, highlightState) {
|
|
44
|
+
const { area, color, transform, style, clippedRanges, shouldClip } = geometry;
|
|
45
|
+
const areaFill = (0, area_1.buildAreaStyles)(ctx, imgCanvas, color, style.area, highlightState);
|
|
46
|
+
const fitAreaFillThemeStyle = { ...style.fit.area, dimmed: style.area.dimmed };
|
|
47
|
+
const fitAreaFill = (0, area_1.buildAreaStyles)(ctx, imgCanvas, color, fitAreaFillThemeStyle, highlightState);
|
|
41
48
|
(0, path_1.renderAreaPath)(ctx, transform, area, areaFill, fitAreaFill, clippedRanges, clippings, shouldClip && style.fit.area.visible);
|
|
42
49
|
}
|
|
43
|
-
function renderAreaLines(ctx, geometry,
|
|
44
|
-
const { lines, color,
|
|
45
|
-
const
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
50
|
+
function renderAreaLines(ctx, geometry, clippings, highlightState) {
|
|
51
|
+
const { lines, color, transform, style, clippedRanges, shouldClip } = geometry;
|
|
52
|
+
const lineStyle = (0, line_1.buildLineStyles)(color, style.line, highlightState);
|
|
53
|
+
const fitLineThemeStyle = {
|
|
54
|
+
...style.fit.line,
|
|
55
|
+
strokeWidth: style.line.strokeWidth,
|
|
56
|
+
dimmed: style.line.dimmed,
|
|
57
|
+
focused: style.line.focused,
|
|
51
58
|
};
|
|
52
|
-
(0,
|
|
59
|
+
const fitLineStyle = (0, line_1.buildLineStyles)(color, fitLineThemeStyle, highlightState);
|
|
60
|
+
(0, path_1.renderLinePaths)(ctx, transform, lines, lineStyle, fitLineStyle, clippedRanges, clippings, shouldClip && style.fit.line.visible);
|
|
53
61
|
}
|
|
54
62
|
//# sourceMappingURL=areas.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"areas.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/areas.ts"],"names":[],"mappings":";;AA2BA,
|
|
1
|
+
{"version":3,"file":"areas.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/areas.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,32 +7,32 @@ const points_1 = require("./points");
|
|
|
7
7
|
const path_1 = require("./primitives/path");
|
|
8
8
|
const line_1 = require("./styles/line");
|
|
9
9
|
const panel_transform_1 = require("./utils/panel_transform");
|
|
10
|
-
const color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
11
10
|
const canvas_1 = require("../../../../renderers/canvas");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
function renderLines(ctx, lines, sharedStyle, rotation, renderingArea, highlightedLegendItem) {
|
|
11
|
+
const geometry_1 = require("../../../../utils/geometry");
|
|
12
|
+
function renderLines(ctx, lines, rotation, renderingArea, highlightedLegendItem) {
|
|
15
13
|
(0, canvas_1.withContext)(ctx, () => {
|
|
16
|
-
lines
|
|
14
|
+
lines
|
|
15
|
+
.map(({ panel, value }) => {
|
|
16
|
+
return {
|
|
17
|
+
panel,
|
|
18
|
+
line: value,
|
|
19
|
+
highlightState: (0, geometry_1.getGeometryHighlightState)(value.seriesIdentifier.key, highlightedLegendItem),
|
|
20
|
+
};
|
|
21
|
+
})
|
|
22
|
+
.sort(({ highlightState }) => (highlightState === 'dimmed' ? -1 : 1))
|
|
23
|
+
.forEach(({ panel, line, highlightState }) => {
|
|
17
24
|
const clippings = (0, panel_clipping_1.getPanelClipping)(panel, rotation);
|
|
18
25
|
if (line.style.line.visible) {
|
|
19
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderLine(ctx, line,
|
|
26
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => renderLine(ctx, line, clippings, highlightState), { area: clippings, shouldClip: true });
|
|
20
27
|
}
|
|
21
|
-
|
|
22
|
-
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, line.points, geometryStyle, line.style.point, line.style.line.strokeWidth, line.minPointDistance, line.style.pointVisibilityMinDistance, line.hasFit && line.points.length > 1), { area: clippings, shouldClip: line.points[0]?.value.mark !== null });
|
|
28
|
+
(0, panel_transform_1.withPanelTransform)(ctx, panel, rotation, renderingArea, () => (0, points_1.renderPoints)(ctx, line.points, highlightState, line.style.point, line.style.line.strokeWidth, line.minPointDistance, line.style.pointVisibilityMinDistance, line.hasFit && line.points.length > 1), { area: clippings, shouldClip: line.points[0]?.value.mark !== null });
|
|
23
29
|
});
|
|
24
30
|
});
|
|
25
31
|
}
|
|
26
|
-
function renderLine(ctx, line,
|
|
27
|
-
const { color, transform,
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const fitLineStrokeColor = style.fit.line.stroke === common_1.ColorVariant.Series ? color : style.fit.line.stroke;
|
|
31
|
-
const fitLineStroke = {
|
|
32
|
-
dash: style.fit.line.dash,
|
|
33
|
-
width: style.line.strokeWidth,
|
|
34
|
-
color: (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)(fitLineStrokeColor), (opacity) => opacity * geometryStyle.opacity * style.fit.line.opacity),
|
|
35
|
-
};
|
|
32
|
+
function renderLine(ctx, line, clippings, highlightState) {
|
|
33
|
+
const { color, transform, style, clippedRanges, shouldClip } = line;
|
|
34
|
+
const lineStroke = (0, line_1.buildLineStyles)(color, style.line, highlightState);
|
|
35
|
+
const fitLineStroke = (0, line_1.buildLineStyles)(color, { ...style.fit.line, strokeWidth: style.line.strokeWidth, dimmed: style.line.dimmed, focused: style.line.focused }, highlightState);
|
|
36
36
|
(0, path_1.renderLinePaths)(ctx, transform, [line.line], lineStroke, fitLineStroke, clippedRanges, clippings, shouldClip && style.fit.line.visible);
|
|
37
37
|
}
|
|
38
38
|
function drawPolarLine(ctx, angle, radius, length, center = { x: 0, y: 0 }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/lines.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/lines.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,14 @@ const shapes_1 = require("./primitives/shapes");
|
|
|
7
7
|
const panel_transform_1 = require("./utils/panel_transform");
|
|
8
8
|
const color_library_wrappers_1 = require("../../../../common/color_library_wrappers");
|
|
9
9
|
const points_1 = require("../../rendering/points");
|
|
10
|
-
function renderPoints(ctx, points,
|
|
10
|
+
function renderPoints(ctx, points, highlightState, pointStyle, lineStrokeWidth, seriesMinPointDistance, pointsDistanceVisibilityThreshold, hasConnectingLine) {
|
|
11
11
|
const isHiddenOnAuto = pointStyle.visible === 'auto' && seriesMinPointDistance < pointsDistanceVisibilityThreshold;
|
|
12
12
|
const hideDataPoints = pointStyle.visible === 'never' || isHiddenOnAuto;
|
|
13
13
|
const hideIsolatedDataPoints = hasConnectingLine && hideDataPoints;
|
|
14
14
|
const useIsolatedPointRadius = hideDataPoints && !hasConnectingLine;
|
|
15
|
+
const opacity = highlightState === 'dimmed' && 'opacity' in pointStyle.dimmed ? pointStyle.dimmed.opacity : pointStyle.opacity;
|
|
16
|
+
const dimmedFill = highlightState === 'dimmed' && 'fill' in pointStyle.dimmed ? (0, color_library_wrappers_1.colorToRgba)(pointStyle.dimmed.fill) : undefined;
|
|
17
|
+
const dimmedStroke = highlightState === 'dimmed' && 'stroke' in pointStyle.dimmed ? (0, color_library_wrappers_1.colorToRgba)(pointStyle.dimmed.stroke) : undefined;
|
|
15
18
|
points.forEach(({ x, y, radius, transform, style, isolated }) => {
|
|
16
19
|
if ((isolated && hideIsolatedDataPoints) || (!isolated && hideDataPoints)) {
|
|
17
20
|
return;
|
|
@@ -19,12 +22,12 @@ function renderPoints(ctx, points, { opacity }, pointStyle, lineStrokeWidth, ser
|
|
|
19
22
|
const coordinates = {
|
|
20
23
|
x: x + transform.x,
|
|
21
24
|
y: y + transform.y,
|
|
22
|
-
radius: isolated
|
|
25
|
+
radius: isolated && useIsolatedPointRadius ? (0, points_1.isolatedPointRadius)(lineStrokeWidth) : radius,
|
|
23
26
|
};
|
|
24
|
-
const fill = { color: (0, color_library_wrappers_1.overrideOpacity)(style.fill.color, (fillOpacity) => fillOpacity * opacity) };
|
|
27
|
+
const fill = { color: (0, color_library_wrappers_1.overrideOpacity)(dimmedFill ?? style.fill.color, (fillOpacity) => fillOpacity * opacity) };
|
|
25
28
|
const stroke = {
|
|
26
29
|
...style.stroke,
|
|
27
|
-
color: (0, color_library_wrappers_1.overrideOpacity)(style.stroke.color, (fillOpacity) => fillOpacity * opacity),
|
|
30
|
+
color: (0, color_library_wrappers_1.overrideOpacity)(dimmedStroke ?? style.stroke.color, (fillOpacity) => fillOpacity * opacity),
|
|
28
31
|
};
|
|
29
32
|
(0, shapes_1.renderShape)(ctx, style.shape, coordinates, fill, stroke);
|
|
30
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/points.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/points.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,8 +40,8 @@ function renderXYChartCanvas2d(ctx, dpr, props, animationState) {
|
|
|
40
40
|
}, locale),
|
|
41
41
|
() => (0, annotations_1.renderAnnotations)(ctx, aCtx, annotationDimensions, annotationSpecs, rotation, renderingArea, sharedStyle, hoveredAnnotationIds, lineAnnotationStyle, rectAnnotationStyle, true),
|
|
42
42
|
() => (0, bars_1.renderBars)(ctx, imgCanvas, geometries.bars, sharedStyle, rotation, renderingArea, highlightedLegendItem),
|
|
43
|
-
() => (0, areas_1.renderAreas)(ctx, imgCanvas, geometries.areas,
|
|
44
|
-
() => (0, lines_1.renderLines)(ctx, geometries.lines,
|
|
43
|
+
() => (0, areas_1.renderAreas)(ctx, imgCanvas, geometries.areas, rotation, renderingArea, highlightedLegendItem),
|
|
44
|
+
() => (0, lines_1.renderLines)(ctx, geometries.lines, rotation, renderingArea, highlightedLegendItem),
|
|
45
45
|
() => (0, bubbles_1.renderBubbles)(ctx, geometries.bubbles, sharedStyle, rotation, renderingArea, highlightedLegendItem),
|
|
46
46
|
() => geometries.bars.forEach(({ value: bars, panel }) => (0, bar_1.renderBarValues)(ctx, {
|
|
47
47
|
bars,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,34 @@ exports.buildAreaStyles = buildAreaStyles;
|
|
|
4
4
|
const color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
5
5
|
const common_1 = require("../../../../../utils/common");
|
|
6
6
|
const texture_1 = require("../../../utils/texture");
|
|
7
|
-
function buildAreaStyles(ctx, imgCanvas,
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
function buildAreaStyles(ctx, imgCanvas, seriesColor, themeAreaStyle, highlightState) {
|
|
8
|
+
const isDimmed = highlightState === 'dimmed';
|
|
9
|
+
const fillColor = isDimmed && 'fill' in themeAreaStyle.dimmed ? themeAreaStyle.dimmed.fill : seriesColor;
|
|
10
|
+
const opacity = isDimmed && 'opacity' in themeAreaStyle.dimmed
|
|
11
|
+
? themeAreaStyle.dimmed.opacity * themeAreaStyle.opacity
|
|
12
|
+
: themeAreaStyle.opacity;
|
|
13
|
+
const texture = themeAreaStyle.texture
|
|
14
|
+
? (0, texture_1.getTextureStyles)(ctx, imgCanvas, seriesColor, 1, getTextureStyleFromFocusState(themeAreaStyle.texture, themeAreaStyle.dimmed, highlightState))
|
|
15
|
+
: undefined;
|
|
16
|
+
const color = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(fillColor, themeAreaStyle.fill)), (currentColorOpacity) => currentColorOpacity * opacity);
|
|
10
17
|
return {
|
|
11
18
|
color,
|
|
12
19
|
texture,
|
|
13
20
|
};
|
|
14
21
|
}
|
|
22
|
+
function getTextureStyleFromFocusState(textureStyle, themeDimmedStyle, highlightState) {
|
|
23
|
+
if (highlightState !== 'dimmed') {
|
|
24
|
+
return textureStyle;
|
|
25
|
+
}
|
|
26
|
+
if ('opacity' in themeDimmedStyle) {
|
|
27
|
+
return {
|
|
28
|
+
...textureStyle,
|
|
29
|
+
opacity: (textureStyle.opacity ?? 1) * themeDimmedStyle.opacity,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
...textureStyle,
|
|
34
|
+
opacity: themeDimmedStyle.texture.opacity,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
15
37
|
//# sourceMappingURL=area.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/area.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/area.ts"],"names":[],"mappings":";;AA4BA,0CAiCC;AArDD,yFAA4F;AAI5F,wDAAkE;AAGlE,oDAA0D;AAa1D,SAAgB,eAAe,CAC7B,GAA6B,EAC7B,SAA4B,EAC5B,WAAiC,EACjC,cAAyB,EACzB,cAAsC;IAEtC,MAAM,QAAQ,GAAG,cAAc,KAAK,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,QAAQ,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IACzG,MAAM,OAAO,GACX,QAAQ,IAAI,SAAS,IAAI,cAAc,CAAC,MAAM;QAC5C,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO;QACxD,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;IAE7B,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO;QACpC,CAAC,CAAC,IAAA,0BAAgB,EACd,GAAG,EACH,SAAS,EACT,WAAW,EACX,CAAC,EACD,6BAA6B,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC,CAC7F;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,KAAK,GAAG,IAAA,wCAAe,EAC3B,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,EAChE,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,GAAG,OAAO,CACvD,CAAC;IAEF,OAAO;QACL,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,YAA4B,EAC5B,gBAAqC,EACrC,cAAsC;IAEtC,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,SAAS,IAAI,gBAAgB,EAAE,CAAC;QAClC,OAAO;YACL,GAAG,YAAY;YACf,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO;SAChE,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,YAAY;QACf,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO;KAC1C,CAAC;AACJ,CAAC"}
|
|
@@ -5,7 +5,9 @@ const color_library_wrappers_1 = require("../../../../../common/color_library_wr
|
|
|
5
5
|
const common_1 = require("../../../../../utils/common");
|
|
6
6
|
const texture_1 = require("../../../utils/texture");
|
|
7
7
|
function buildBarStyle(ctx, imgCanvas, baseColor, themeRectStyle, themeRectBorderStyle, geometryStateStyle, rect) {
|
|
8
|
-
const texture =
|
|
8
|
+
const texture = themeRectStyle.texture
|
|
9
|
+
? (0, texture_1.getTextureStyles)(ctx, imgCanvas, baseColor, geometryStateStyle.opacity, themeRectStyle.texture)
|
|
10
|
+
: undefined;
|
|
9
11
|
const fillColor = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(baseColor, themeRectStyle.fill)), (opacity) => opacity * themeRectStyle.opacity * geometryStateStyle.opacity);
|
|
10
12
|
const fill = {
|
|
11
13
|
color: fillColor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/bar.ts"],"names":[],"mappings":";;AAsBA,
|
|
1
|
+
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/bar.ts"],"names":[],"mappings":";;AAsBA,sCAiCC;AA/CD,yFAA4F;AAE5F,wDAAkE;AAElE,oDAA0D;AAU1D,SAAgB,aAAa,CAC3B,GAA6B,EAC7B,SAA4B,EAC5B,SAAiB,EACjB,cAAyB,EACzB,oBAAqC,EACrC,kBAAsC,EACtC,IAAU;IAEV,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO;QACpC,CAAC,CAAC,IAAA,0BAAgB,EAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC;QACjG,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,SAAS,GAAG,IAAA,wCAAe,EAC/B,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,EAChE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAC3E,CAAC;IACF,MAAM,IAAI,GAAS;QACjB,KAAK,EAAE,SAAS;QAChB,OAAO;KACR,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,wCAAe,EACjC,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,SAAS,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC,EACxE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,kBAAkB,CAAC,OAAO,GAAG,CAAC,oBAAoB,CAAC,aAAa,IAAI,cAAc,CAAC,OAAO,CAAC,CACnH,CAAC;IACF,MAAM,MAAM,GAAW;QACrB,KAAK,EAAE,WAAW;QAClB,KAAK,EACH,oBAAoB,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,oBAAoB,CAAC,WAAW;YAC5E,CAAC,CAAC,oBAAoB,CAAC,WAAW;YAClC,CAAC,CAAC,CAAC;KACR,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -3,11 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildLineStyles = buildLineStyles;
|
|
4
4
|
const color_library_wrappers_1 = require("../../../../../common/color_library_wrappers");
|
|
5
5
|
const common_1 = require("../../../../../utils/common");
|
|
6
|
-
function buildLineStyles(
|
|
7
|
-
const
|
|
6
|
+
function buildLineStyles(seriesColor, themeLineStyle, highlightState) {
|
|
7
|
+
const isDimmed = highlightState === 'dimmed';
|
|
8
|
+
const isFocused = highlightState === 'focused';
|
|
9
|
+
const strokeColor = isDimmed && 'stroke' in themeLineStyle.dimmed ? themeLineStyle.dimmed.stroke : seriesColor;
|
|
10
|
+
const opacity = isDimmed && 'opacity' in themeLineStyle.dimmed
|
|
11
|
+
? themeLineStyle.dimmed.opacity * themeLineStyle.opacity
|
|
12
|
+
: themeLineStyle.opacity;
|
|
13
|
+
const width = isDimmed && 'strokeWidth' in themeLineStyle.dimmed
|
|
14
|
+
? themeLineStyle.dimmed.strokeWidth
|
|
15
|
+
: isFocused && 'strokeWidth' in themeLineStyle.focused
|
|
16
|
+
? themeLineStyle.focused.strokeWidth
|
|
17
|
+
: themeLineStyle.strokeWidth;
|
|
18
|
+
const color = (0, color_library_wrappers_1.overrideOpacity)((0, color_library_wrappers_1.colorToRgba)((0, common_1.getColorFromVariant)(strokeColor, themeLineStyle.stroke)), (currentColorOpacity) => currentColorOpacity * opacity);
|
|
8
19
|
return {
|
|
9
|
-
color
|
|
10
|
-
width
|
|
20
|
+
color,
|
|
21
|
+
width,
|
|
11
22
|
dash: themeLineStyle.dash,
|
|
12
23
|
};
|
|
13
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/line.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/styles/line.ts"],"names":[],"mappings":";;AAsBA,0CA8BC;AA5CD,yFAA4F;AAE5F,wDAAkE;AAYlE,SAAgB,eAAe,CAC7B,WAAmB,EACnB,cAAyB,EACzB,cAAsC;IAEtC,MAAM,QAAQ,GAAG,cAAc,KAAK,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,cAAc,KAAK,SAAS,CAAC;IAE/C,MAAM,WAAW,GAAG,QAAQ,IAAI,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/G,MAAM,OAAO,GACX,QAAQ,IAAI,SAAS,IAAI,cAAc,CAAC,MAAM;QAC5C,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO;QACxD,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;IAE7B,MAAM,KAAK,GACT,QAAQ,IAAI,aAAa,IAAI,cAAc,CAAC,MAAM;QAChD,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW;QACnC,CAAC,CAAC,SAAS,IAAI,aAAa,IAAI,cAAc,CAAC,OAAO;YACpD,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW;YACpC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC;IAEnC,MAAM,KAAK,GAAG,IAAA,wCAAe,EAC3B,IAAA,oCAAW,EAAC,IAAA,4BAAmB,EAAC,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,EACpE,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,GAAG,OAAO,CACvD,CAAC;IACF,OAAO;QACL,KAAK;QACL,KAAK;QACL,IAAI,EAAE,cAAc,CAAC,IAAI;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -28,7 +28,7 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBa
|
|
|
28
28
|
lines.push(y1Line);
|
|
29
29
|
if (y0Line)
|
|
30
30
|
lines.push(y0Line);
|
|
31
|
-
const { pointGeometries, indexedGeometryMap, minDistanceBetweenPoints } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point,
|
|
31
|
+
const { pointGeometries, indexedGeometryMap, minDistanceBetweenPoints } = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point, true, isBandedSpec, markSizeOptions, false, pointStyleAccessor);
|
|
32
32
|
const areaGeometry = {
|
|
33
33
|
area: pathGenerator(dataSeries.data) || '',
|
|
34
34
|
lines,
|