Fixed auto color output format, fixes #142

zefoy · Oct 23, 2018 · 7e77785 · 7e77785
1 parent 9cce111
commit 7e77785
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/lib/color-picker.component.ts b/src/lib/color-picker.component.ts
@@ -141,10 +141,6 @@ export class ColorPickerComponent implements OnInit, OnDestroy, AfterViewInit {
       this.format = ColorFormats.HEX;
     }
 
-    if (this.cpOutputFormat === 'auto') {
-      this.cpOutputFormat = (this.cpAlphaChannel !== 'disabled') ? 'rgba' : 'hex';
-    }
-
     this.listenerMouseDown = (event: any) => { this.onMouseDown(event); };
     this.listenerResize = () => { this.onResize(); };
 
@@ -258,7 +254,9 @@ export class ColorPickerComponent implements OnInit, OnDestroy, AfterViewInit {
       this.dialogArrowOffset = 0;
     }
 
-    if (cpOutputFormat === 'hex' && cpAlphaChannel !== 'always' && cpAlphaChannel !== 'forced') {
+    if (cpOutputFormat === 'hex' &&
+        cpAlphaChannel !== 'always' && cpAlphaChannel !== 'forced')
+    {
       this.cpAlphaChannel = 'disabled';
     }
   }
@@ -692,6 +690,12 @@ export class ColorPickerComponent implements OnInit, OnDestroy, AfterViewInit {
         this.hexAlpha = this.rgbaText.a;
       }
 
+      if (this.cpOutputFormat === 'auto') {
+        if (this.hsva.a < 1) {
+          this.format = this.hsva.a < 1 ? ColorFormats.RGBA : ColorFormats.HEX;
+        }
+      }
+
       this.hueSliderColor = 'rgb(' + hue.r + ',' + hue.g + ',' + hue.b + ')';
       this.alphaSliderColor = 'rgb(' + rgba.r + ',' + rgba.g + ',' + rgba.b + ')';
 

diff --git a/src/lib/color-picker.service.ts b/src/lib/color-picker.service.ts
@@ -226,6 +226,10 @@ export class ColorPickerService {
   }
 
   public outputFormat(hsva: Hsva, outputFormat: string, alphaChannel: string | null): string {
+    if (outputFormat === 'auto') {
+      outputFormat = hsva.a < 1 ? 'rgba' : 'hex';
+    }
+
     switch (outputFormat) {
       case 'hsla':
         const hsla = this.hsva2hsla(hsva);