diff --git a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-mixed-visually-looks-correct-1-snap.png b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-mixed-visually-looks-correct-1-snap.png index a457cc21a5..8b398053cf 100644 Binary files a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-mixed-visually-looks-correct-1-snap.png and b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-mixed-visually-looks-correct-1-snap.png differ diff --git a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-multiple-visually-looks-correct-1-snap.png b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-multiple-visually-looks-correct-1-snap.png index 5269775d86..c09525d430 100644 Binary files a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-multiple-visually-looks-correct-1-snap.png and b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-multiple-visually-looks-correct-1-snap.png differ diff --git a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-ordinal-visually-looks-correct-1-snap.png b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-ordinal-visually-looks-correct-1-snap.png index 2f61358a89..8a69ec5d5d 100644 Binary files a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-ordinal-visually-looks-correct-1-snap.png and b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-ordinal-visually-looks-correct-1-snap.png differ diff --git a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-simple-visually-looks-correct-1-snap.png b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-simple-visually-looks-correct-1-snap.png index e1df7e9fa4..c3ea35362f 100644 Binary files a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-simple-visually-looks-correct-1-snap.png and b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-bubble-chart-alpha-simple-visually-looks-correct-1-snap.png differ diff --git a/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/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 index f8fae38796..ed2fc7ba3d 100644 Binary files a/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 and b/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 differ diff --git a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-mixed-charts-mark-size-accessor-visually-looks-correct-1-snap.png b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-mixed-charts-mark-size-accessor-visually-looks-correct-1-snap.png index 915480f066..fdac082102 100644 Binary files a/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-mixed-charts-mark-size-accessor-visually-looks-correct-1-snap.png and b/integration/tests/__image_snapshots__/all-test-ts-baseline-visual-tests-for-all-stories-mixed-charts-mark-size-accessor-visually-looks-correct-1-snap.png differ diff --git a/integration/tests/__image_snapshots__/interactions-test-ts-interactions-tooltip-formatting-should-use-custom-mark-formatters-1-snap.png b/integration/tests/__image_snapshots__/interactions-test-ts-interactions-tooltip-formatting-should-use-custom-mark-formatters-1-snap.png index e4390546a4..b9300e4f86 100644 Binary files a/integration/tests/__image_snapshots__/interactions-test-ts-interactions-tooltip-formatting-should-use-custom-mark-formatters-1-snap.png and b/integration/tests/__image_snapshots__/interactions-test-ts-interactions-tooltip-formatting-should-use-custom-mark-formatters-1-snap.png differ diff --git a/src/chart_types/xy_chart/rendering/area.ts b/src/chart_types/xy_chart/rendering/area.ts index fdf7e5bff9..bdc7adaacc 100644 --- a/src/chart_types/xy_chart/rendering/area.ts +++ b/src/chart_types/xy_chart/rendering/area.ts @@ -107,7 +107,6 @@ export function renderArea( yScale, panel, color, - seriesStyle.line, seriesStyle.point, hasY0Accessors, markSizeOptions, diff --git a/src/chart_types/xy_chart/rendering/bubble.ts b/src/chart_types/xy_chart/rendering/bubble.ts index e7d35d2395..da3ad46b1d 100644 --- a/src/chart_types/xy_chart/rendering/bubble.ts +++ b/src/chart_types/xy_chart/rendering/bubble.ts @@ -53,7 +53,6 @@ export function renderBubble( panel, color, seriesStyle.point, - seriesStyle.point, hasY0Accessors, markSizeOptions, pointStyleAccessor, diff --git a/src/chart_types/xy_chart/rendering/line.ts b/src/chart_types/xy_chart/rendering/line.ts index c4f621ff47..23e9a7d239 100644 --- a/src/chart_types/xy_chart/rendering/line.ts +++ b/src/chart_types/xy_chart/rendering/line.ts @@ -74,7 +74,6 @@ export function renderLine( yScale, panel, color, - seriesStyle.line, seriesStyle.point, hasY0Accessors, markSizeOptions, diff --git a/src/chart_types/xy_chart/rendering/points.ts b/src/chart_types/xy_chart/rendering/points.ts index e1a59f001b..99370b0e74 100644 --- a/src/chart_types/xy_chart/rendering/points.ts +++ b/src/chart_types/xy_chart/rendering/points.ts @@ -20,7 +20,7 @@ import { Scale } from '../../../scales'; import { Color, isNil } from '../../../utils/common'; import { Dimensions } from '../../../utils/dimensions'; import { BandedAccessorType, PointGeometry } from '../../../utils/geometry'; -import { LineStyle, PointStyle } from '../../../utils/themes/theme'; +import { PointStyle } from '../../../utils/themes/theme'; import { GeometryType, IndexedGeometryMap } from '../utils/indexed_geometry_map'; import { DataSeries, DataSeriesDatum, FilledValues, XYChartSeriesIdentifier } from '../utils/series'; import { PointStyleAccessor, StackMode } from '../utils/specs'; @@ -35,8 +35,6 @@ import { YDefinedFn, } from './utils'; -const DEFAULT_RADIUS = 1; - /** @internal */ export function renderPoints( shift: number, @@ -45,7 +43,6 @@ export function renderPoints( yScale: Scale, panel: Dimensions, color: Color, - lineStyle: LineStyle, pointStyle: PointStyle, hasY0Accessors: boolean, markSizeOptions: MarkSizeOptions, @@ -113,11 +110,14 @@ export function renderPoints( const styleOverrides = getPointStyleOverrides(datum, seriesIdentifier, styleAccessor); const style = buildPointGeometryStyles(color, pointStyle, styleOverrides); const orphan = isOrphanDataPoint(dataIndex, dataSeries.data.length, yDefined, prev, next); - const radius = markSizeOptions.enabled ? getRadius(mark) : styleOverrides?.radius ?? pointStyle.radius; + // if radius is defined with the mark, limit the minimum radius to the theme radius value + const radius = markSizeOptions.enabled + ? Math.max(getRadius(mark), pointStyle.radius) + : styleOverrides?.radius ?? pointStyle.radius; const pointGeometry: PointGeometry = { x, y, - radius: Math.max(radius, DEFAULT_RADIUS), + radius, color, style, value: {