public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.0.x] XYChart: Point size editor should reflect correct default (5) (#71229)

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

fix(xychart): reconcile point size editors

(cherry picked from commit d92d3ede79)

Co-authored-by: Ihor Yeromin <yeryomin.igor@gmail.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-07-07 13:39:52 -07:00
committed by GitHub
co-authored by Ihor Yeromin
parent d147af2281
commit dca52d575e
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/panel/xychart/config.ts
+3 -1
View File
@@ -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,
public/app/plugins/panel/xychart/models.gen.ts
+3 -1
View File
@@ -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,
},
public/app/plugins/panel/xychart/scatter.ts
+2 -1
View File
@@ -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) => {