Proper fix for the hue change when dragging to left edge

zefoy · Jun 7, 2017 · efd23ec · efd23ec
1 parent 9cabb9d
commit efd23ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/lib/color-picker.component.ts b/src/lib/color-picker.component.ts
@@ -175,9 +175,6 @@ export class ColorPickerComponent implements OnInit, AfterViewInit {
             hsva = this.service.stringToHsva(value, false);
         }
         if (hsva) {
-            if (!emit && hsva && this.hsva) {
-                hsva.h = this.hsva.h;
-            }
             this.hsva = hsva;
             this.update(emit);
         }

diff --git a/src/lib/color-picker.directive.ts b/src/lib/color-picker.directive.ts
@@ -1,4 +1,4 @@
-import { OnInit, OnChanges, Directive, Input, Output, EventEmitter, ElementRef, ViewContainerRef, ReflectiveInjector, ComponentFactoryResolver } from '@angular/core';
+import { OnInit, OnChanges, Directive, Input, Output, EventEmitter, ElementRef, ViewContainerRef, ReflectiveInjector, ComponentFactoryResolver, ChangeDetectorRef } from '@angular/core';
 
 import { ColorPickerService } from './color-picker.service';
 import { ColorPickerComponent } from './color-picker.component';
@@ -44,7 +44,7 @@ export class ColorPickerDirective implements OnInit, OnChanges {
     private created: boolean;
     private ignoreChanges: boolean = false;
 
-    constructor(private vcRef: ViewContainerRef, private el: ElementRef, private service: ColorPickerService, private cfr: ComponentFactoryResolver) {
+    constructor(private vcRef: ViewContainerRef, private el: ElementRef, private service: ColorPickerService, private cfr: ComponentFactoryResolver, private cdr: ChangeDetectorRef) {
         this.created = false;
     }
 
@@ -76,7 +76,11 @@ export class ColorPickerDirective implements OnInit, OnChanges {
         if (hsva == null) {
             hsva = this.service.stringToHsva(this.cpFallbackColor);
         }
-        this.colorPickerChange.emit(this.service.outputFormat(hsva, this.cpOutputFormat, this.cpAlphaChannel === 'hex8'));
+        let color = this.service.outputFormat(hsva, this.cpOutputFormat, this.cpAlphaChannel === 'hex8');
+        if (color !== this.colorPicker) {
+            this.colorPickerChange.emit(color);
+            this.cdr.detectChanges();
+        }
     }
 
     onClick() {