fix issues with hslaString and copying iro.Color instances

fixes #194 and #193
jaames · Jul 5, 2021 · 22d2c0e · 22d2c0e
1 parent 1825363
commit 22d2c0e
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ### Changelog
 
+#### 5.5.2
+
+##### Fixes
+
+- Fixed an issue where the alpha channel wasn't being copied over when creating a new iro.Color instance from the value of an old one (see https://github.com/jaames/iro.js/issues/193)
+- Fixed an issue where the iro.Color hslaString attribute wasn't returning a hsla string (see https://github.com/jaames/iro.js/issues/194)
+
 #### 5.5.1
 
 ##### Fixes

diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -7,7 +7,7 @@ import { IroBox } from './Box';
 import { IroWheel } from './Wheel';
 import { IroColorPicker } from './ColorPicker';
 declare namespace iro {
-    const version = "5.5.1";
+    const version = "5.5.2";
     type Color = IroColor;
     const Color: typeof IroColor;
     type ColorPicker = IroColorPicker;

diff --git a/dist/iro.es.js b/dist/iro.es.js
@@ -1,5 +1,5 @@
 /*!
- * iro.js v5.5.1
+ * iro.js v5.5.2
  * 2016-2021 James Daniel
  * Licensed under MPL 2.0
  * github.com/jaames/iro.js
@@ -157,7 +157,7 @@ function () {
       }
     } else if (typeof value === 'object') {
       if (value instanceof IroColor) {
-        this.hsv = value.hsv;
+        this.hsva = value.hsva;
       } else if ('r' in value && 'g' in value && 'b' in value) {
         this.rgb = value;
       } else if ('h' in value && 's' in value && 'v' in value) {
@@ -685,7 +685,7 @@ function () {
     key: "hslaString",
     get: function get() {
       var hsla = this.hsla;
-      return "hsl(" + hsla.h + ", " + hsla.s + "%, " + hsla.l + "%, " + hsla.a + ")";
+      return "hsla(" + hsla.h + ", " + hsla.s + "%, " + hsla.l + "%, " + hsla.a + ")";
     },
     set: function set(value) {
       this.hslString = value;
@@ -1283,6 +1283,7 @@ function IroHandle(props) {
     var cx = radius;
     var cy = radius;
     return (h("svg", { className: ("IroHandle IroHandle--" + (props.index) + " " + (props.isActive ? 'IroHandle--isActive' : '')), style: {
+            '-webkit-tap-highlight-color': 'rgba(0, 0, 0, 0);',
             transform: ("translate(" + (cssValue(props.x)) + ", " + (cssValue(props.y)) + ")"),
             willChange: 'transform',
             top: cssValue(-radius),
@@ -1760,7 +1761,7 @@ var IroColorPickerWidget = createWidget(IroColorPicker);
 
 var iro;
 (function (iro) {
-    iro.version = "5.5.1"; // replaced by @rollup/plugin-replace; see rollup.config.js
+    iro.version = "5.5.2"; // replaced by @rollup/plugin-replace; see rollup.config.js
     iro.Color = IroColor;
     iro.ColorPicker = IroColorPickerWidget;
     var ui;

diff --git a/dist/iro.js b/dist/iro.js
@@ -1,5 +1,5 @@
 /*!
- * iro.js v5.5.1
+ * iro.js v5.5.2
  * 2016-2021 James Daniel
  * Licensed under MPL 2.0
  * github.com/jaames/iro.js
@@ -163,7 +163,7 @@
         }
       } else if (typeof value === 'object') {
         if (value instanceof IroColor) {
-          this.hsv = value.hsv;
+          this.hsva = value.hsva;
         } else if ('r' in value && 'g' in value && 'b' in value) {
           this.rgb = value;
         } else if ('h' in value && 's' in value && 'v' in value) {
@@ -691,7 +691,7 @@
       key: "hslaString",
       get: function get() {
         var hsla = this.hsla;
-        return "hsl(" + hsla.h + ", " + hsla.s + "%, " + hsla.l + "%, " + hsla.a + ")";
+        return "hsla(" + hsla.h + ", " + hsla.s + "%, " + hsla.l + "%, " + hsla.a + ")";
       },
       set: function set(value) {
         this.hslString = value;
@@ -1289,6 +1289,7 @@
       var cx = radius;
       var cy = radius;
       return (h("svg", { className: ("IroHandle IroHandle--" + (props.index) + " " + (props.isActive ? 'IroHandle--isActive' : '')), style: {
+              '-webkit-tap-highlight-color': 'rgba(0, 0, 0, 0);',
               transform: ("translate(" + (cssValue(props.x)) + ", " + (cssValue(props.y)) + ")"),
               willChange: 'transform',
               top: cssValue(-radius),
@@ -1766,7 +1767,7 @@
 
   var iro;
   (function (iro) {
-      iro.version = "5.5.1"; // replaced by @rollup/plugin-replace; see rollup.config.js
+      iro.version = "5.5.2"; // replaced by @rollup/plugin-replace; see rollup.config.js
       iro.Color = IroColor;
       iro.ColorPicker = IroColorPickerWidget;
       var ui;

diff --git a/dist/iro.js.map b/dist/iro.js.map
diff --git a/dist/iro.min.js b/dist/iro.min.js
diff --git a/docs/.vuepress/theme/js/iro.es.js b/docs/.vuepress/theme/js/iro.es.js
@@ -1,5 +1,5 @@
 /*!
- * iro.js v5.5.1
+ * iro.js v5.5.2
  * 2016-2021 James Daniel
  * Licensed under MPL 2.0
  * github.com/jaames/iro.js
@@ -157,7 +157,7 @@ function () {
       }
     } else if (typeof value === 'object') {
       if (value instanceof IroColor) {
-        this.hsv = value.hsv;
+        this.hsva = value.hsva;
       } else if ('r' in value && 'g' in value && 'b' in value) {
         this.rgb = value;
       } else if ('h' in value && 's' in value && 'v' in value) {
@@ -685,7 +685,7 @@ function () {
     key: "hslaString",
     get: function get() {
       var hsla = this.hsla;
-      return "hsl(" + hsla.h + ", " + hsla.s + "%, " + hsla.l + "%, " + hsla.a + ")";
+      return "hsla(" + hsla.h + ", " + hsla.s + "%, " + hsla.l + "%, " + hsla.a + ")";
     },
     set: function set(value) {
       this.hslString = value;
@@ -1283,6 +1283,7 @@ function IroHandle(props) {
     var cx = radius;
     var cy = radius;
     return (h("svg", { className: ("IroHandle IroHandle--" + (props.index) + " " + (props.isActive ? 'IroHandle--isActive' : '')), style: {
+            '-webkit-tap-highlight-color': 'rgba(0, 0, 0, 0);',
             transform: ("translate(" + (cssValue(props.x)) + ", " + (cssValue(props.y)) + ")"),
             willChange: 'transform',
             top: cssValue(-radius),
@@ -1760,7 +1761,7 @@ var IroColorPickerWidget = createWidget(IroColorPicker);
 
 var iro;
 (function (iro) {
-    iro.version = "5.5.1"; // replaced by @rollup/plugin-replace; see rollup.config.js
+    iro.version = "5.5.2"; // replaced by @rollup/plugin-replace; see rollup.config.js
     iro.Color = IroColor;
     iro.ColorPicker = IroColorPickerWidget;
     var ui;

diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@jaames/iro",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "Modular, design-conscious color picker widget for JavaScript",
   "module": "dist/iro.es.js",
   "main": "dist/iro.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@irojs/iro-core": "^1.2.0",
+    "@irojs/iro-core": "^1.2.1",
     "preact": "^10.0.0"
   },
   "devDependencies": {