Skip to content

Commit b4f5d89

Browse files
authored
Update dependency @elastic/charts to v16.0.2 (#52619) (#53978)
1 parent 43edc78 commit b4f5d89

File tree

45 files changed

+247
-601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+247
-601
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"**/isomorphic-git/**/base64-js": "^1.2.1",
8787
"**/image-diff/gm/debug": "^2.6.9",
8888
"**/react-dom": "^16.12.0",
89+
"**/react": "^16.12.0",
8990
"**/react-test-renderer": "^16.12.0",
9091
"**/deepmerge": "^4.2.2",
9192
"**/serialize-javascript": "^2.1.1"
@@ -110,7 +111,7 @@
110111
"dependencies": {
111112
"@babel/core": "^7.5.5",
112113
"@babel/register": "^7.7.0",
113-
"@elastic/charts": "^14.0.0",
114+
"@elastic/charts": "^16.0.2",
114115
"@elastic/datemath": "5.0.2",
115116
"@elastic/ems-client": "1.0.5",
116117
"@elastic/eui": "17.3.1",

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ import {
3030
Chart,
3131
HistogramBarSeries,
3232
GeometryValue,
33-
getAnnotationId,
34-
getAxisId,
35-
getSpecId,
3633
LineAnnotation,
3734
Position,
3835
ScaleType,
@@ -237,34 +234,34 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
237234
theme={chartsTheme}
238235
/>
239236
<Axis
240-
id={getAxisId('discover-histogram-left-axis')}
237+
id="discover-histogram-left-axis"
241238
position={Position.Left}
242239
ticks={5}
243240
title={chartData.yAxisLabel}
244241
/>
245242
<Axis
246-
id={getAxisId('discover-histogram-bottom-axis')}
243+
id="discover-histogram-bottom-axis"
247244
position={Position.Bottom}
248245
title={chartData.xAxisLabel}
249246
tickFormat={this.formatXValue}
250247
ticks={10}
251248
/>
252249
<LineAnnotation
253-
annotationId={getAnnotationId('line-annotation')}
250+
id="line-annotation"
254251
domainType={AnnotationDomainTypes.XDomain}
255252
dataValues={lineAnnotationData}
256253
hideTooltips={true}
257254
style={lineAnnotationStyle}
258255
/>
259256
<RectAnnotation
260257
dataValues={rectAnnotations}
261-
annotationId={getAnnotationId('rect-annotation')}
258+
id="rect-annotation"
262259
zIndex={2}
263260
style={rectAnnotationStyle}
264261
hideTooltips={true}
265262
/>
266263
<HistogramBarSeries
267-
id={getSpecId('discover-histogram')}
264+
id="discover-histogram"
268265
xScaleType={ScaleType.Time}
269266
yScaleType={ScaleType.Linear}
270267
xAccessor="x"

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/__mocks__/@elastic/charts.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,5 @@ export const ScaleType = {
3838
Time: 'time',
3939
};
4040

41-
export const getSpecId = x => `id:${x}`;
42-
export const getGroupId = x => `groupId:${x}`;
43-
4441
export const BarSeries = () => null;
4542
export const AreaSeries = () => null;

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919

2020
import React from 'react';
21-
import { getSpecId, getGroupId, ScaleType, AreaSeries } from '@elastic/charts';
22-
import { getSeriesColors, getAreaStyles } from '../utils/series_styles';
21+
import { ScaleType, AreaSeries } from '@elastic/charts';
22+
import { getAreaStyles } from '../utils/series_styles';
2323
import { ChartsEntities } from '../model/charts';
2424
import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES } from '../../../constants';
2525

@@ -41,9 +41,9 @@ export function AreaSeriesDecorator({
4141
useDefaultGroupDomain,
4242
sortIndex,
4343
}) {
44-
const id = getSpecId(seriesId);
45-
const groupId = getGroupId(seriesGroupId);
46-
const customSeriesColors = getSeriesColors(color, id);
44+
const id = seriesId;
45+
const groupId = seriesGroupId;
46+
const customSeriesColors = [color];
4747
const areaSeriesStyle = getAreaStyles({ points, lines, color });
4848

4949
const seriesSettings = {

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919

2020
import React from 'react';
21-
import { getSpecId, getGroupId, ScaleType, BarSeries } from '@elastic/charts';
22-
import { getSeriesColors, getBarStyles } from '../utils/series_styles';
21+
import { ScaleType, BarSeries } from '@elastic/charts';
22+
import { getBarStyles } from '../utils/series_styles';
2323
import { ChartsEntities } from '../model/charts';
2424
import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES } from '../../../constants';
2525

@@ -40,9 +40,9 @@ export function BarSeriesDecorator({
4040
useDefaultGroupDomain,
4141
sortIndex,
4242
}) {
43-
const id = getSpecId(seriesId);
44-
const groupId = getGroupId(seriesGroupId);
45-
const customSeriesColors = getSeriesColors(color, id);
43+
const id = seriesId;
44+
const groupId = seriesGroupId;
45+
const customSeriesColors = [color];
4646
const barSeriesStyle = getBarStyles(bars, color);
4747

4848
const seriesSettings = {

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ import {
2525
Chart,
2626
Position,
2727
Settings,
28-
getAxisId,
29-
getGroupId,
3028
DARK_THEME,
3129
LIGHT_THEME,
32-
getAnnotationId,
3330
AnnotationDomainTypes,
3431
LineAnnotation,
3532
TooltipType,
@@ -75,7 +72,7 @@ export const TimeSeries = ({
7572
const chartRef = useRef();
7673
const updateCursor = (_, cursor) => {
7774
if (chartRef.current) {
78-
chartRef.current.dispatchExternalCursorEvent(cursor);
75+
chartRef.current.dispatchExternalPointerEvent(cursor);
7976
}
8077
};
8178

@@ -99,7 +96,7 @@ export const TimeSeries = ({
9996
legendPosition={legendPosition}
10097
onBrushEnd={onBrush}
10198
animateData={false}
102-
onCursorUpdate={handleCursorUpdate}
99+
onPointerUpdate={handleCursorUpdate}
103100
theme={
104101
hasBarChart
105102
? {}
@@ -126,7 +123,7 @@ export const TimeSeries = ({
126123
return (
127124
<LineAnnotation
128125
key={id}
129-
annotationId={getAnnotationId(id)}
126+
id={id}
130127
domainType={AnnotationDomainTypes.XDomain}
131128
dataValues={dataValues}
132129
marker={<EuiIcon type={ICON_TYPES_MAP[icon] || 'asterisk'} />}
@@ -213,8 +210,8 @@ export const TimeSeries = ({
213210
{yAxis.map(({ id, groupId, position, tickFormatter, domain, hide }) => (
214211
<Axis
215212
key={groupId}
216-
groupId={getGroupId(groupId)}
217-
id={getAxisId(id)}
213+
groupId={groupId}
214+
id={id}
218215
position={position}
219216
domain={domain}
220217
hide={hide}
@@ -225,7 +222,7 @@ export const TimeSeries = ({
225222
))}
226223

227224
<Axis
228-
id={getAxisId('bottom')}
225+
id="bottom"
229226
position={Position.Bottom}
230227
title={xAxisLabel}
231228
tickFormat={xAxisFormatter}

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/__snapshots__/series_styles.test.js.snap

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,3 @@ export const getBarStyles = ({ show = true, lineWidth = 0, fill = 1 }, color) =>
5656
},
5757
},
5858
});
59-
60-
export const getSeriesColors = (color, specId) => {
61-
const map = new Map();
62-
const seriesColorsValues = { specId, colorValues: [] };
63-
64-
map.set(seriesColorsValues, color);
65-
66-
return map;
67-
};

0 commit comments

Comments
 (0)