From e3f779b9e2ba1fcaf8d0d2495805b8e0386b9ae7 Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Tue, 2 Nov 2021 11:41:25 -0500 Subject: [PATCH 1/2] fix crosshair theme and style issues --- package.json | 2 +- .../application/visualizations/views/timeseries/index.js | 3 --- yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index fc10156a49baf..de34647d7418b 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace", "@elastic/apm-rum": "^5.9.1", "@elastic/apm-rum-react": "^1.3.1", - "@elastic/charts": "38.0.1", + "@elastic/charts": "38.0.2", "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^7.16.0-canary.4", "@elastic/ems-client": "7.16.0", diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js index 2158283bb80d5..cf9ba585db8a6 100644 --- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js +++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js @@ -152,9 +152,6 @@ export const TimeSeries = ({ onPointerUpdate={handleCursorUpdate} theme={[ { - crosshair: { - ...chartTheme.crosshair, - }, axes: { tickLabel: { padding: { diff --git a/yarn.lock b/yarn.lock index c8a65473a7be2..c5880ecdda9dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2337,10 +2337,10 @@ dependencies: object-hash "^1.3.0" -"@elastic/charts@38.0.1": - version "38.0.1" - resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-38.0.1.tgz#9c1db7e0f1de869e0b2b505e192bbb9d62d60dc8" - integrity sha512-i9mIA3Ji9jSjuFDtuh9gV1xpCl3sbBEDgJiOgLVt04pr/qZH2W+tr3AV5yHvjsR7Te0Pmh/Cm5wLBvFKaI1nIA== +"@elastic/charts@38.0.2": + version "38.0.2" + resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-38.0.2.tgz#70eff5f97bca60a10cb2b376175618ee4309d351" + integrity sha512-8CfLxXHtbAVz2K6HejS05Mg7oolIRamgC1pvhMNLHhI4PClY03Icymap/RoWSiuzR0FhX6Hqkeu7uD0HIR/bWg== dependencies: "@popperjs/core" "^2.4.0" chroma-js "^2.1.0" From 46c74b6d31353bef834804411ac0804e7c8dc202 Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Wed, 3 Nov 2021 09:25:23 -0500 Subject: [PATCH 2/2] remove unneeded theme crosshair override --- src/plugins/vis_types/xy/public/components/xy_settings.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/plugins/vis_types/xy/public/components/xy_settings.tsx b/src/plugins/vis_types/xy/public/components/xy_settings.tsx index f920d405dd482..b8b0b8525f3b6 100644 --- a/src/plugins/vis_types/xy/public/components/xy_settings.tsx +++ b/src/plugins/vis_types/xy/public/components/xy_settings.tsx @@ -113,9 +113,6 @@ export const XYSettings: FC = ({ barSeriesStyle: { ...valueLabelsStyling, }, - crosshair: { - ...theme.crosshair, - }, legend: { labelOptions: { maxLines: truncateLegend ? maxLegendLines ?? 1 : 0 }, },