Skip to content

Commit

Permalink
* added chroma.noHueAsZero() to change the global behavior for colors…
Browse files Browse the repository at this point in the history 
… with no hue (like black, white or grays) in color spaces which work internally with hue values (like LCH, HSL, ...). By default these colors returned a NaN hue value, but this behavior can now be changed to output always zero by using "chroma.noHueAsZero(true)" first at any time. See [Issue 322](gka#322)

* minor improvements to documentation

Signed-off-by: regorxxx <[email protected]>
  • Loading branch information
@regorxxx
regorxxx committed Feb 4, 2024
1 parent 12620f5 commit 189b80e
Show file tree
Hide file tree
Showing 33 changed files with 550 additions and 302 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## Changelog

### unreleased
* added chroma.noHueAsZero() to change the global behavior for colors with no hue (like black, white or grays) in color spaces which work internally with hue values (like LCH, HSL, ...). By default these colors returned a NaN hue value, but this behavior can now be changed to output always zero by using "chroma.noHueAsZero(true)" first at any time. See [Issue 322](https://github.com/gka/chroma.js/issues/322)
* added weights for every component at chroma.distance()
* improved support for OKLCH colors using chroma.average() or chroma.distance()
* minor improvements to documentation

### 2.7.0
* added chroma.brewer.getPalettes() to retrieve all available palettes (keys). [ColorBrewer](http://colorbrewer2.org/) schemes (scales) are divided into palettes according to their type
Expand Down
53 changes: 33 additions & 20 deletions chroma-light.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,17 +225,18 @@

var Color_1 = Color$g;

var chroma$8 = function () {
var chroma$a = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

return new (Function.prototype.bind.apply( chroma$8.Color, [ null ].concat( args) ));
return new (Function.prototype.bind.apply( chroma$a.Color, [ null ].concat( args) ));
};

chroma$8.Color = Color_1;
chroma$8.version = '2.7.0';
chroma$a.Color = Color_1;
chroma$a.version = '2.7.0';
chroma$a.hueNaN = true; // Whether treat black/white as having NaN hue or zero on specific color spaces (LCH, ...)

var chroma_1 = chroma$8;
var chroma_1 = chroma$a;

var unpack$d = utils.unpack;
var last$3 = utils.last;
Expand Down Expand Up @@ -270,6 +271,7 @@
var hsl2css_1 = hsl2css$1;

var unpack$c = utils.unpack;
var chroma$9 = chroma_1;

/*
* supported arguments:
Expand Down Expand Up @@ -300,7 +302,7 @@

if (max === min){
s = 0;
h = Number.NaN;
h = chroma$9.hueNaN ? Number.NaN : 0;
} else {
s = l < 0.5 ? (max - min) / (max + min) : (max - min) / (2 - max - min);
}
Expand All @@ -311,6 +313,7 @@

h *= 60;
if (h < 0) { h += 360; }
else if (!chroma$9.hueNaN && isNaN(h)) {h = 0;}
if (args.length>3 && args[3]!==undefined) { return [h,s,l,args[3]]; }
return [h,s,l];
};
Expand Down Expand Up @@ -494,7 +497,7 @@

var css2rgb_1 = css2rgb$1;

var chroma$7 = chroma_1;
var chroma$8 = chroma_1;
var Color$f = Color_1;
var input$6 = input$8;
var type$a = utils.type;
Expand All @@ -506,7 +509,7 @@
return rgb2css(this._rgb, mode);
};

chroma$7.css = function () {
chroma$8.css = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand Down Expand Up @@ -611,7 +614,7 @@

var hex2rgb_1 = hex2rgb;

var chroma$6 = chroma_1;
var chroma$7 = chroma_1;
var Color$e = Color_1;
var type$9 = utils.type;
var input$5 = input$8;
Expand All @@ -622,7 +625,7 @@
return rgb2hex(this._rgb, mode);
};

chroma$6.hex = function () {
chroma$7.hex = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand All @@ -644,7 +647,7 @@

var unpack$8 = utils.unpack;
var type$8 = utils.type;
var chroma$5 = chroma_1;
var chroma$6 = chroma_1;
var Color$d = Color_1;
var input$4 = input$8;

Expand All @@ -654,7 +657,7 @@
return rgb2hsl(this._rgb);
};

chroma$5.hsl = function () {
chroma$6.hsl = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand Down Expand Up @@ -779,7 +782,7 @@

var unpack$5 = utils.unpack;
var type$7 = utils.type;
var chroma$4 = chroma_1;
var chroma$5 = chroma_1;
var Color$c = Color_1;
var input$3 = input$8;

Expand All @@ -789,7 +792,7 @@
return rgb2lab(this._rgb);
};

chroma$4.lab = function () {
chroma$5.lab = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand Down Expand Up @@ -893,7 +896,7 @@

var unpack$2 = utils.unpack;
var type$6 = utils.type;
var chroma$3 = chroma_1;
var chroma$4 = chroma_1;
var Color$b = Color_1;
var input$2 = input$8;

Expand All @@ -903,7 +906,7 @@
return rgb2oklab(this._rgb);
};

chroma$3.oklab = function () {
chroma$4.oklab = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand All @@ -925,7 +928,7 @@
}
});

var chroma$2 = chroma_1;
var chroma$3 = chroma_1;
var Color$a = Color_1;
var input$1 = input$8;
var unpack$1 = utils.unpack;
Expand All @@ -947,7 +950,7 @@
});
};

chroma$2.rgb = function () {
chroma$3.rgb = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand Down Expand Up @@ -1019,7 +1022,7 @@

var and2rgb_1 = and2rgb;

var chroma$1 = chroma_1;
var chroma$2 = chroma_1;
var Color$9 = Color_1;
var input = input$8;
var type$3 = utils.type;
Expand All @@ -1030,7 +1033,7 @@
return rgb2and(this._rgb, mode);
};

chroma$1.android = function () {
chroma$2.android = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

Expand Down Expand Up @@ -1252,6 +1255,15 @@
}
};

var chroma$1 = chroma_1;

var nohueaszero = function (bNoHueAsZero) {
if ( bNoHueAsZero === void 0 ) bNoHueAsZero=false;

chroma$1.hueNaN = !bNoHueAsZero; // Whether treat black/white/gray as having NaN hue or Zero on specific color spaces (LCH, ...)
return !chroma$1.hueNaN;
};

var chroma = chroma_1;

// feel free to comment out anything to rollup
Expand Down Expand Up @@ -1282,6 +1294,7 @@

// other utility methods
chroma.valid = valid;
chroma.noHueAsZero = nohueaszero;

var indexLight = chroma;

Expand Down
2 changes: 1 addition & 1 deletion chroma-light.min.js
View file

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions chroma-ultra-light.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,17 +225,18 @@

var Color_1 = Color$6;

var chroma$5 = function () {
var chroma$6 = function () {
var args = [], len = arguments.length;
while ( len-- ) args[ len ] = arguments[ len ];

return new (Function.prototype.bind.apply( chroma$5.Color, [ null ].concat( args) ));
return new (Function.prototype.bind.apply( chroma$6.Color, [ null ].concat( args) ));
};

chroma$5.Color = Color_1;
chroma$5.version = '2.7.0';
chroma$6.Color = Color_1;
chroma$6.version = '2.7.0';
chroma$6.hueNaN = true; // Whether treat black/white as having NaN hue or zero on specific color spaces (LCH, ...)

var chroma_1 = chroma$5;
var chroma_1 = chroma$6;

var unpack$6 = utils.unpack;
var last$3 = utils.last;
Expand Down Expand Up @@ -270,6 +271,7 @@
var hsl2css_1 = hsl2css$1;

var unpack$5 = utils.unpack;
var chroma$5 = chroma_1;

/*
* supported arguments:
Expand Down Expand Up @@ -300,7 +302,7 @@

if (max === min){
s = 0;
h = Number.NaN;
h = chroma$5.hueNaN ? Number.NaN : 0;
} else {
s = l < 0.5 ? (max - min) / (max + min) : (max - min) / (2 - max - min);
}
Expand All @@ -311,6 +313,7 @@

h *= 60;
if (h < 0) { h += 360; }
else if (!chroma$5.hueNaN && isNaN(h)) {h = 0;}
if (args.length>3 && args[3]!==undefined) { return [h,s,l,args[3]]; }
return [h,s,l];
};
Expand Down
2 changes: 1 addition & 1 deletion chroma-ultra-light.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 189b80e

Please sign in to comment.