xaxis color for bar charts fixes #39

apexcharts · Aug 22, 2018 · 3fba322 · 3fba322
1 parent 022f242
commit 3fba322
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/dist/apexcharts.min.js b/dist/apexcharts.min.js
diff --git a/src/modules/axes/XAxis.js b/src/modules/axes/XAxis.js
@@ -128,7 +128,7 @@ class XAxis {
           text: '',
           textAnchor: 'middle',
           fontSize: this.xaxisFontSize,
-          foreColor: this.xaxisForeColors[i],
+          foreColor: Array.isArray(this.xaxisForeColors) ? this.xaxisForeColors[i] : this.xaxisForeColors,
           cssClass: 'apexcharts-xaxis-label ' + w.config.xaxis.labels.style.cssClass
         })
 
@@ -400,19 +400,6 @@ class XAxis {
       }
     }
 
-    if (xAxisTexts.length > 0) {
-      let firstLabelPos = xAxisTexts[0].getBBox()
-      let lastLabelPos = xAxisTexts[xAxisTexts.length - 1].getBBox()
-
-      if (firstLabelPos.x < -25) {
-        xAxisTexts[0].parentNode.removeChild(xAxisTexts[0])
-      }
-
-      if (lastLabelPos.x + lastLabelPos.width > w.globals.gridWidth) {
-        xAxisTexts[xAxisTexts.length - 1].parentNode.removeChild(xAxisTexts[xAxisTexts.length - 1])
-      }
-    }
-
     if (yAxisTextsInversed.length > 0) {
       // truncate y axis in bar chart
       let firstLabelPosX = yAxisTextsInversed[yAxisTextsInversed.length - 1].getBBox()

diff --git a/src/modules/axes/YAxis.js b/src/modules/axes/YAxis.js
@@ -12,8 +12,10 @@ class YAxis {
     this.w = ctx.w
 
     this.xaxisFontSize = this.w.config.xaxis.labels.style.fontSize
-    this.isBarHorizontal = !!((this.w.config.chart.type === 'bar' &&
-    this.w.config.plotOptions.bar.horizontal))
+    this.isBarHorizontal = !!(this.w.config.chart.type === 'bar' &&
+      this.w.config.plotOptions.bar.horizontal)
+
+    this.xaxisForeColors = this.w.config.xaxis.labels.style.colors
 
     this.xAxisoffX = 0
     if (this.w.config.xaxis.position === 'bottom') {
@@ -163,6 +165,7 @@ class YAxis {
           y: this.xAxisoffX + w.config.xaxis.labels.offsetY + 30,
           text: '',
           textAnchor: 'middle',
+          foreColor: Array.isArray(this.xaxisForeColors) ? this.xaxisForeColors[realIndex] : this.xaxisForeColors,
           fontSize: this.xaxisFontSize,
           cssClass: 'apexcharts-xaxis-label ' + w.config.xaxis.labels.style.cssClass
         })