From dca52d575e0e283daeec28c0ff516bc8dab1e8d4 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:39:52 -0700
Subject: [PATCH] [v10.0.x] XYChart: Point size editor should reflect correct
 default (5) (#71229)

XYChart: Point size editor should reflect correct default (5) (#71126)

fix(xychart): reconcile point size editors

(cherry picked from commit d92d3ede794a770dd23b82b7e176673422fa0305)

Co-authored-by: Ihor Yeromin <yeryomin.igor@gmail.com>
---
 public/app/plugins/panel/xychart/config.ts     | 4 +++-
 public/app/plugins/panel/xychart/models.gen.ts | 4 +++-
 public/app/plugins/panel/xychart/scatter.ts    | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/panel/xychart/config.ts b/public/app/plugins/panel/xychart/config.ts
index 3ce34627253..a8a260d5abc 100644
--- a/public/app/plugins/panel/xychart/config.ts
+++ b/public/app/plugins/panel/xychart/config.ts
@@ -12,6 +12,8 @@ import { LineStyleEditor } from '../timeseries/LineStyleEditor';
 
 import { ScatterFieldConfig, ScatterShow } from './types';
 
+export const DEFAULT_POINT_SIZE = 5;
+
 export function getScatterFieldConfig(cfg: ScatterFieldConfig): SetFieldConfigOptionsArgs<ScatterFieldConfig> {
   return {
     standardOptions: {
@@ -44,7 +46,7 @@ export function getScatterFieldConfig(cfg: ScatterFieldConfig): SetFieldConfigOp
         .addSliderInput({
           path: 'pointSize.fixed',
           name: 'Point size',
-          defaultValue: cfg.pointSize?.fixed,
+          defaultValue: cfg.pointSize?.fixed ?? DEFAULT_POINT_SIZE,
           settings: {
             min: 1,
             max: 100,
diff --git a/public/app/plugins/panel/xychart/models.gen.ts b/public/app/plugins/panel/xychart/models.gen.ts
index ffbc557b909..1dcde9abd06 100644
--- a/public/app/plugins/panel/xychart/models.gen.ts
+++ b/public/app/plugins/panel/xychart/models.gen.ts
@@ -14,6 +14,8 @@ import {
   DimensionSupplier,
 } from 'app/features/dimensions';
 
+import { DEFAULT_POINT_SIZE } from './config';
+
 // export enum ScatterLineMode {
 //   None = 'none',
 //   Linear = 'linear',
@@ -61,7 +63,7 @@ export const defaultScatterConfig: ScatterFieldConfig = {
     fill: 'solid',
   },
   pointSize: {
-    fixed: 5,
+    fixed: DEFAULT_POINT_SIZE,
     min: 1,
     max: 20,
   },
diff --git a/public/app/plugins/panel/xychart/scatter.ts b/public/app/plugins/panel/xychart/scatter.ts
index d4c9896d94d..470fad03cb5 100644
--- a/public/app/plugins/panel/xychart/scatter.ts
+++ b/public/app/plugins/panel/xychart/scatter.ts
@@ -28,6 +28,7 @@ import { findFieldIndex, getScaledDimensionForField } from 'app/features/dimensi
 
 import { pointWithin, Quadtree, Rect } from '../barchart/quadtree';
 
+import { DEFAULT_POINT_SIZE } from './config';
 import { isGraphable } from './dims';
 import {
   DimensionValues,
@@ -140,7 +141,7 @@ function getScatterSeries(
   // Size configs
   //----------------
   let pointSizeHints = dims.pointSizeConfig;
-  let pointSizeFixed = dims.pointSizeConfig?.fixed ?? y.config.custom?.pointSize?.fixed ?? 5;
+  let pointSizeFixed = dims.pointSizeConfig?.fixed ?? y.config.custom?.pointSize?.fixed ?? DEFAULT_POINT_SIZE;
   let pointSize: DimensionValues<number> = () => pointSizeFixed;
   if (dims.pointSizeIndex) {
     pointSize = (frame) => {