Merge branch 'main' of https://github.com/apexcharts/apexcharts.js

apexcharts · Oct 15, 2024 · 483c471 · 483c471
2 parents 2d23049 + 387a4bf
commit 483c471
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/charts/common/bar/Helpers.js b/src/charts/common/bar/Helpers.js
@@ -251,7 +251,7 @@ export default class Helpers {
       w.config.plotOptions.bar.borderRadius <= 0
 
     const numSeries = series.length
-    const numColumns = series[0].length
+    const numColumns = series[0]?.length | 0
     const output = Array.from({ length: numSeries }, () =>
       Array(numColumns).fill(alwaysApplyRadius ? 'top' : 'none')
     )

diff --git a/src/modules/Fill.js b/src/modules/Fill.js
@@ -150,6 +150,9 @@ class Fill {
     } else {
       if (fillColor.indexOf('rgba') > -1) {
         fillOpacity = Utils.getOpacityFromRGBA(fillColor)
+      } else {
+        // if rgb color, apply opacity
+        defaultColor = Utils.hexToRgba(Utils.rgb2hex(fillColor), fillOpacity)
       }
     }
     if (opts.opacity) fillOpacity = opts.opacity