Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added condition to hide donut total label if hideLabel flag is set per issue #4370 #4516

Closed
wants to merge 3 commits into from
Closed

Added condition to hide donut total label if hideLabel flag is set per issue #4370 #4516

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf67b7
Added condition to hide donut total label if hideLabel flag is set
halfpeeled Jun 9, 2024
7fac9d4
Added comments to additions in Pie.js
halfpeeled Jun 9, 2024
1cc2a04
Merge branch 'main' into feature/issue_4370
halfpeeled Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/charts/Pie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,15 @@ class Pie {
this.centerX,
this.centerY,
w.globals.radialSize / 1.25 +
w.config.plotOptions.pie.dataLabels.offset,
w.config.plotOptions.pie.dataLabels.offset,
(startAngle + angle / 2) % this.fullAngle
)
} else if (this.chartType === 'donut') {
labelPosition = Utils.polarToCartesian(
this.centerX,
this.centerY,
(w.globals.radialSize + this.donutSize) / 2 +
w.config.plotOptions.pie.dataLabels.offset,
w.config.plotOptions.pie.dataLabels.offset,
(startAngle + angle / 2) % this.fullAngle
)
}
Expand Down Expand Up @@ -368,7 +368,7 @@ class Pie {
if (
angle !== 0 &&
w.config.plotOptions.pie.dataLabels.minAngleToShowLabel <
sectorAngleArr[i]
sectorAngleArr[i]
) {
let formatter = w.config.dataLabels.formatter
if (formatter !== undefined) {
Expand Down Expand Up @@ -666,7 +666,7 @@ class Pie {
if (
Math.ceil(endDeg) >=
this.fullAngle +
(this.w.config.plotOptions.pie.startAngle % this.fullAngle)
(this.w.config.plotOptions.pie.startAngle % this.fullAngle)
) {
endDeg =
this.fullAngle +
Expand Down Expand Up @@ -763,8 +763,8 @@ class Pie {
const yLabel = helpers.drawYAxisTexts(
this.centerX,
this.centerY -
circleSize +
parseInt(w.config.yaxis[0].labels.style.fontSize, 10) / 2,
circleSize +
parseInt(w.config.yaxis[0].labels.style.fontSize, 10) / 2,
i,
yTexts[i]
)
Expand Down Expand Up @@ -793,7 +793,8 @@ class Pie {
dataLabelsGroup.node.style.opacity = opts.opacity

let x = opts.centerX
let y = opts.centerY
// Adjust the y value if hideLabel flag is set
let y = this.donutDataLabels.total.hideLabel ? (opts.centerY - (opts.centerY / 6)) : opts.centerY

let labelColor, valueColor

Expand Down Expand Up @@ -821,7 +822,8 @@ class Pie {
labelFontSize = dataLabelsConfig.total.fontSize
labelFontFamily = dataLabelsConfig.total.fontFamily
labelFontWeight = dataLabelsConfig.total.fontWeight
name = dataLabelsConfig.total.label
// Assign total label only if hideLabel flag is not set
name = this.donutDataLabels.total.hideLabel ? '' : dataLabelsConfig.total.label
val = dataLabelsConfig.total.formatter(w)
} else {
if (w.globals.series.length === 1) {
Expand Down Expand Up @@ -917,7 +919,8 @@ class Pie {
}

const isTotal = name === labelsConfig.total.label
name = labelsConfig.name.formatter(name, isTotal, w)
// Assign total label only if hideLabel flag is not set
name = this.donutDataLabels.total.hideLabel ? '' : labelsConfig.name.formatter(name, isTotal, w)

if (elLabel !== null) {
elLabel.textContent = name
Expand Down