From 351c20c9cb533bf819f6192714e73ee9183449f7 Mon Sep 17 00:00:00 2001 From: Marco Vettorello Date: Mon, 30 Nov 2020 17:43:08 +0100 Subject: [PATCH] fix(highlighter): show default highlighted radius with hidden dots (#926) This commit fixed the highlighted radius on a line/area point when the markAccessor is configured by the point visibility on the series is turned off fix #679 --- ...accessor-visually-looks-correct-1-snap.png | Bin 0 -> 29963 bytes ...-default-point-highlighter-size-1-snap.png | Bin 0 -> 26281 bytes .../integration/tests/line_stories.test.ts | 12 +++ .../chart_types/xy_chart/state/utils/utils.ts | 4 +- .../stories/line/13_line_mark_accessor.tsx | 79 ++++++++++++++++++ .../osd-charts/stories/line/line.stories.tsx | 1 + 6 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 packages/osd-charts/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-line-chart-line-with-mark-accessor-visually-looks-correct-1-snap.png create mode 100644 packages/osd-charts/integration/tests/__image_snapshots__/line-stories-test-ts-line-series-stories-line-with-mark-accessor-with-hidden-points-default-point-highlighter-size-1-snap.png create mode 100644 packages/osd-charts/stories/line/13_line_mark_accessor.tsx diff --git a/packages/osd-charts/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-line-chart-line-with-mark-accessor-visually-looks-correct-1-snap.png b/packages/osd-charts/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-line-chart-line-with-mark-accessor-visually-looks-correct-1-snap.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc5f8e2df54cba4d0f11125fd1ecfe6cdad06fe GIT binary patch literal 29963 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 literal 0 HcmV?d00001 diff --git a/packages/osd-charts/integration/tests/__image_snapshots__/line-stories-test-ts-line-series-stories-line-with-mark-accessor-with-hidden-points-default-point-highlighter-size-1-snap.png b/packages/osd-charts/integration/tests/__image_snapshots__/line-stories-test-ts-line-series-stories-line-with-mark-accessor-with-hidden-points-default-point-highlighter-size-1-snap.png new file mode 100644 index 0000000000000000000000000000000000000000..0b41883545b1914c6b50e120160f576a8350feb6 GIT binary patch literal 26281 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 E0Q94Hl>h($ literal 0 HcmV?d00001 diff --git a/packages/osd-charts/integration/tests/line_stories.test.ts b/packages/osd-charts/integration/tests/line_stories.test.ts index b6059c20eaa..9e9b137fbea 100644 --- a/packages/osd-charts/integration/tests/line_stories.test.ts +++ b/packages/osd-charts/integration/tests/line_stories.test.ts @@ -69,4 +69,16 @@ describe('Line series stories', () => { ); }); }); + + describe('Line with mark accessor', () => { + it('with hidden points, default point highlighter size', async () => { + await common.expectChartWithMouseAtUrlToMatchScreenshot( + 'http://localhost:9001/?path=/story/line-chart--line-with-mark-accessor&knob-markSizeRatio=10&knob-show line points=false&knob-debug=', + { left: 115, top: 170 }, + { + screenshotSelector: '#story-root', + }, + ); + }); + }); }); diff --git a/packages/osd-charts/src/chart_types/xy_chart/state/utils/utils.ts b/packages/osd-charts/src/chart_types/xy_chart/state/utils/utils.ts index a4df37f610c..bcf579410b1 100644 --- a/packages/osd-charts/src/chart_types/xy_chart/state/utils/utils.ts +++ b/packages/osd-charts/src/chart_types/xy_chart/state/utils/utils.ts @@ -544,7 +544,7 @@ function renderGeometries( xScaleOffset, lineSeriesStyle, { - enabled: spec.markSizeAccessor !== undefined, + enabled: spec.markSizeAccessor !== undefined && lineSeriesStyle.point.visible, ratio: chartTheme.markSizeRatio, }, spec.pointStyleAccessor, @@ -577,7 +577,7 @@ function renderGeometries( xScaleOffset, areaSeriesStyle, { - enabled: spec.markSizeAccessor !== undefined, + enabled: spec.markSizeAccessor !== undefined && areaSeriesStyle.point.visible, ratio: chartTheme.markSizeRatio, }, spec.stackAccessors ? spec.stackAccessors.length > 0 : false, diff --git a/packages/osd-charts/stories/line/13_line_mark_accessor.tsx b/packages/osd-charts/stories/line/13_line_mark_accessor.tsx new file mode 100644 index 00000000000..fdeb40c0b5b --- /dev/null +++ b/packages/osd-charts/stories/line/13_line_mark_accessor.tsx @@ -0,0 +1,79 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { number, boolean } from '@storybook/addon-knobs'; +import React from 'react'; + +import { Axis, Chart, Position, ScaleType, Settings, LineSeries } from '../../src'; +import { getRandomNumberGenerator } from '../../src/mocks/utils'; + +const rng = getRandomNumberGenerator(); +const bubbleData = new Array(30).fill(0).map((_, i) => ({ + x: i, + y: rng(2, 3, 2), + z: rng(0, 20), +})); + +export const Example = () => { + const markSizeRatio = number('markSizeRatio', 10, { + range: true, + min: 1, + max: 20, + step: 1, + }); + + const visible = boolean('show line points', true); + + return ( + + + + Number(d).toFixed(2)} + domain={{ max: 5 }} + /> + + + + ); +}; + +Example.text = 'testing'; diff --git a/packages/osd-charts/stories/line/line.stories.tsx b/packages/osd-charts/stories/line/line.stories.tsx index 813bd5a73a6..af10bcfeeef 100644 --- a/packages/osd-charts/stories/line/line.stories.tsx +++ b/packages/osd-charts/stories/line/line.stories.tsx @@ -38,3 +38,4 @@ export { Example as multiSeriesWithLogValues } from './9_multi_series'; export { Example as discontinuousDataPoints } from './11_discontinuous_data_points'; export { Example as testOrphanDataPoints } from './12_orphan_data_points'; export { Example as testPathOrdering } from './10_test_path_ordering'; +export { Example as lineWithMarkAccessor } from './13_line_mark_accessor';