[#1114] Chart > Axis > LabelStyle 버그

################################### 1. 사용자가 rgba로 입력할 경우 입력한 투명도가 아닌 1로 고정되었던 로직 수정
ex-em · Mar 30, 2022 · 458e99f · 458e99f
1 parent 67b99d6
commit 458e99f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/components/chart/scale/scale.js b/src/components/chart/scale/scale.js
@@ -244,7 +244,15 @@ class Scale {
           && (this.options.horizontal === (this.type === 'y'))
           && selectLabelInfo?.dataIndex?.length
           && !selectLabelInfo?.dataIndex?.includes(ix);
-        ctx.fillStyle = Util.colorStringToRgba(this.labelStyle.color, isBlurredLabel ? 0.1 : 1);
+
+        const labelColor = this.labelStyle.color;
+        let defaultOpacity = 1;
+
+        if (Util.getColorStringType(labelColor) === 'RGBA') {
+          defaultOpacity = Util.getOpacity(labelColor);
+        }
+
+        ctx.fillStyle = Util.colorStringToRgba(labelColor, isBlurredLabel ? 0.1 : defaultOpacity);
 
         let labelPoint;
 

diff --git a/src/components/chart/scale/scale.step.js b/src/components/chart/scale/scale.step.js
@@ -126,7 +126,15 @@ class StepScale extends Scale {
           && (this.options.horizontal === (this.type === 'y'))
           && selectLabelInfo?.dataIndex?.length
           && !selectLabelInfo?.dataIndex?.includes(index);
-        ctx.fillStyle = Util.colorStringToRgba(this.labelStyle.color, isBlurredLabel ? 0.1 : 1);
+
+        const labelColor = this.labelStyle.color;
+        let defaultOpacity = 1;
+
+        if (Util.getColorStringType(labelColor) === 'RGBA') {
+          defaultOpacity = Util.getOpacity(labelColor);
+        }
+
+        ctx.fillStyle = Util.colorStringToRgba(labelColor, isBlurredLabel ? 0.1 : defaultOpacity);
 
         if (this.type === 'x') {
           labelPoint = this.position === 'top' ? offsetPoint - 10 : offsetPoint + 10;

diff --git a/src/components/chart/scale/scale.time.category.js b/src/components/chart/scale/scale.time.category.js
@@ -188,7 +188,15 @@ class TimeCategoryScale extends Scale {
         && (this.options.horizontal === (this.type === 'y'))
         && selectLabelInfo?.dataIndex?.length
         && !selectLabelInfo?.dataIndex?.includes(ix);
-      ctx.fillStyle = Util.colorStringToRgba(this.labelStyle.color, isBlurredLabel ? 0.1 : 1);
+
+      const labelColor = this.labelStyle.color;
+      let defaultOpacity = 1;
+
+      if (Util.getColorStringType(labelColor) === 'RGBA') {
+        defaultOpacity = Util.getOpacity(labelColor);
+      }
+
+      ctx.fillStyle = Util.colorStringToRgba(labelColor, isBlurredLabel ? 0.1 : defaultOpacity);
 
       let labelPoint;