better handle alpha values

christian-bromann · Jul 5, 2018 · 0b35575 · 0b35575
1 parent 395b7e4
commit 0b35575
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -28,7 +28,7 @@ var rgb2hex = module.exports = function rgb2hex(color) {
     /**
      * parse input
      */
-    var digits = /(.*?)rgb(a)??\((\d{1,3}),(\d{1,3}),(\d{1,3})(,[01]??\.([0-9]{0,3}))??\)/.exec(strippedColor);
+    var digits = /(.*?)rgb(a)??\((\d{1,3}),(\d{1,3}),(\d{1,3})(,(1|0??\.([0-9]{0,3})))??\)/.exec(strippedColor);
 
     if(!digits) {
         // or throw error if input isn't a valid rgb(a) color

diff --git a/rgb2hex.js b/rgb2hex.js
@@ -21,7 +21,7 @@
         /**
          * parse input
          */
-        var digits = /(.*?)rgb(a)??\((\d{1,3}),(\d{1,3}),(\d{1,3})(,[01]??\.([0-9]{0,3}))??\)/.exec(strippedColor);
+        var digits = /(.*?)rgb(a)??\((\d{1,3}),(\d{1,3}),(\d{1,3})(,(1|0??\.([0-9]{0,3})))??\)/.exec(strippedColor);
 
         if(!digits) {
             // or throw error if input isn't a valid rgb(a) color

diff --git a/rgb2hex.min.js b/rgb2hex.min.js
diff --git a/test/rgb2hex.test.js b/test/rgb2hex.test.js
@@ -80,7 +80,7 @@ describe('rgb2hex should', () => {
         })
 
         it('by limiting alpha value to 1', () => {
-            var input = 'rgba(12,173,22,1.67)'
+            var input = 'rgba(236,68,44,1)'
             expect(rgb2hex(input).alpha).not.toBeGreaterThan(1)
         })
 
@@ -95,6 +95,8 @@ describe('rgb2hex should', () => {
             expect(() => rgb2hex(input)).toThrow(invalidErrorMessage(input))
             input = 'rgbaaaaaa(113, 54, 4, .33)'
             expect(() => rgb2hex(input)).toThrow(invalidErrorMessage(input))
+            input = 'rgba(12,173,22,1.67)'
+            expect(() => rgb2hex(input)).toThrow(invalidErrorMessage(input))
         })
     })