bar datalabels improvement

apexcharts · Dec 1, 2023 · 2c0fb38 · 2c0fb38
1 parent 03d799f
commit 2c0fb38
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/charts/BarStacked.js b/src/charts/BarStacked.js
@@ -85,7 +85,7 @@ class BarStacked extends Bar {
       })
 
       let elGoalsMarkers = this.graphics.group({
-        class: 'apexcharts-bar-goals-markers'        
+        class: 'apexcharts-bar-goals-markers',
       })
 
       let barHeight = 0

diff --git a/src/charts/common/bar/DataLabels.js b/src/charts/common/bar/DataLabels.js
@@ -146,6 +146,7 @@ export default class BarDataLabels {
       totalDataLabels = this.drawTotalDataLabels({
         x: dataLabelsPos.totalDataLabelsX,
         y: dataLabelsPos.totalDataLabelsY,
+        barWidth,
         realIndex,
         textAnchor: dataLabelsPos.totalDataLabelsAnchor,
         val: this.getStackedTotalDataLabel({ realIndex, j }),
@@ -606,10 +607,12 @@ export default class BarDataLabels {
     x,
     y,
     val,
+    barWidth,
     realIndex,
     textAnchor,
     barTotalDataLabelsConfig,
   }) {
+    const w = this.w
     const graphics = new Graphics(this.barCtx.ctx)
 
     let totalDataLabelText
@@ -621,7 +624,11 @@ export default class BarDataLabels {
       this.barCtx.lastActiveBarSerieIndex === realIndex
     ) {
       totalDataLabelText = graphics.drawText({
-        x: x,
+        x:
+          x -
+          (w.globals.seriesGroups.length
+            ? barWidth / w.globals.seriesGroups.length
+            : 0),
         y: y,
         foreColor: barTotalDataLabelsConfig.style.color,
         text: val,

diff --git a/src/modules/DataLabels.js b/src/modules/DataLabels.js
@@ -217,8 +217,8 @@ class DataLabels {
     if (correctedLabels.textRects) {
       // fixes #2264
       if (
-        x < -10 - correctedLabels.textRects.width ||
-        x > w.globals.gridWidth + correctedLabels.textRects.width + 10
+        x < -20 - correctedLabels.textRects.width ||
+        x > w.globals.gridWidth + correctedLabels.textRects.width + 30
       ) {
         // datalabels fall outside drawing area, so draw a blank label
         text = ''