Merge pull request #4646 from cocarmon/fix/4645

Fix issue 4645
apexcharts · Aug 17, 2024 · 476df9e · 476df9e
2 parents c69f253 + 8929322
commit 476df9e
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/charts/common/treemap/Helpers.js b/src/charts/common/treemap/Helpers.js
@@ -61,14 +61,22 @@ export default class TreemapHelpers {
     let utils = new Utils()
 
     if (w.config.plotOptions[chartType].enableShades) {
+      // The shadeColor function may return either an RGB or a hex color value
+      // However, hexToRgba requires the input to be in hex format
+      // The ternary operator checks if the color is in RGB format, and if so, converts it to hex
       if (this.w.config.theme.mode === 'dark') {
+        const shadeColor = utils.shadeColor(
+          colorShadePercent * -1,
+          colorProps.color
+        )
         color = Utils.hexToRgba(
-          utils.shadeColor(colorShadePercent * -1, colorProps.color),
+          Utils.isColorHex(shadeColor) ? shadeColor : Utils.rgb2hex(shadeColor),
           w.config.fill.opacity
         )
       } else {
+        const shadeColor = utils.shadeColor(colorShadePercent, colorProps.color)
         color = Utils.hexToRgba(
-          utils.shadeColor(colorShadePercent, colorProps.color),
+          Utils.isColorHex(shadeColor) ? shadeColor : Utils.rgb2hex(shadeColor),
           w.config.fill.opacity
         )
       }
@@ -132,7 +140,7 @@ export default class TreemapHelpers {
     return {
       color,
       foreColor,
-      percent
+      percent,
     }
   }
 
@@ -148,7 +156,7 @@ export default class TreemapHelpers {
 
     if (dataLabelsConfig.enabled) {
       elDataLabelsWrap = graphics.group({
-        class: 'apexcharts-data-labels'
+        class: 'apexcharts-data-labels',
       })
 
       const offX = dataLabelsConfig.offsetX
@@ -167,7 +175,7 @@ export default class TreemapHelpers {
         color: colorProps.foreColor,
         parent: elDataLabelsWrap,
         fontSize,
-        dataLabelsConfig
+        dataLabelsConfig,
       })
     }