Skip to content

Commit

Permalink
fix(gauge):conditional gauge numberFormatter (#1769)
Browse files Browse the repository at this point in the history
* fix(gauge):conditional gauge numberFormatter

* fix(gauge):added type check for data value
  • Loading branch information
RiyaJethwa committed Feb 29, 2024
1 parent c7543ab commit 505bc5f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 9 deletions.
31 changes: 26 additions & 5 deletions packages/core/src/components/graphs/gauge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,19 @@ export class Gauge extends Component {
.merge(valueNumber as any)
.style('font-size', `${fontSize}px`)
.attr('text-anchor', 'middle')
.text((d: any) => localeNumberFormatter(Number(numberFormatter(d)), localeCode))
.text((d: any) => {
let value
if (d !== null && d !== undefined) {
value = Number(d.toFixed(2)) % 1 !== 0 ? d.toFixed(2) : d.toFixed()
} else {
value = 0
}
if (numberFormatter) {
return numberFormatter(value)
} else {
return localeNumberFormatter(Number(value), localeCode)
}
})

// add the percentage symbol beside the valueNumber
const { width: valueNumberWidth } = DOMUtils.getSVGElementSize(
Expand Down Expand Up @@ -287,10 +299,19 @@ export class Gauge extends Component {
.merge(deltaNumber)
.attr('text-anchor', 'middle')
.style('font-size', `${deltaFontSize(radius)}px`)
.text(
(d: any) =>
`${localeNumberFormatter(Number(numberFormatter(d)), localeCode)}${gaugeSymbol}`
)
.text((d: any) => {
let value
if (d !== null && d !== undefined) {
value = Number(d.toFixed(2)) % 1 !== 0 ? d.toFixed(2) : d.toFixed()
} else {
value = 0
}
if (numberFormatter) {
return `${numberFormatter(value)}${gaugeSymbol}`
} else {
return `${localeNumberFormatter(Number(value), localeCode)}${gaugeSymbol}`
}
})

// Add the caret for the delta number
const { width: deltaNumberWidth } = DOMUtils.getSVGElementSize(
Expand Down
4 changes: 0 additions & 4 deletions packages/core/src/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -661,10 +661,6 @@ const gaugeChart: GaugeChartOptions = merge({}, chart, {
numberSpacing: 10,
deltaFontSize: (radius: number) => radius / 8,
valueFontSize: (radius: number) => radius / 2.5,
numberFormatter: (value: number) =>
Number(value.toFixed(2)) % 1 !== 0
? value.toFixed(2).toLocaleString()
: value.toFixed().toLocaleString(),
alignment: Alignments.LEFT
}
} as GaugeChartOptions)
Expand Down

0 comments on commit 505bc5f

Please sign in to comment.