culori - npm Package Compare versions

Comparing version 0.2.24 to 0.2.25

build/culori.js

@@ -994,4 +994,4 @@ (function (global, factory) {
 
-	var interpolate = function interpolate(a, b, t) {
-		return a === undefined || b === undefined ? undefined : a + t * (b - a);
+	var interpolate = function interpolate(a, b, t, k) {
+		return a === undefined || b === undefined ? undefined : a + t * (k === 'h' ? (b - a) * Math.min(Math.abs(b - a), Math.abs(b - 360 - a)) : b - a);
 	};
@@ -1016,3 +1016,3 @@
 			return map({ mode: mode }, function (k) {
-				return i === classes ? colorA[k] : interpolate(colorA[k], colorB[k], tt);
+				return i === classes ? colorA[k] : interpolate(colorA[k], colorB[k], tt, k);
 			});
@@ -1019,0 +1019,0 @@ };

build/culori.min.js

@@ -1,1 +0,1 @@
-!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a():"function"==typeof define&&define.amd?define(a):e.culori=a()}(this,function(){"use strict";function e(e){var a=e.h,r=e.s,n=e.v,t=e.alpha;(a%=360)<0&&(a+=360);var o=Math.abs(a/60%2-1),i=void 0;switch(Math.floor(a/60)){case 0:i={r:n,g:n*(1-r*o),b:n*(1-r)};break;case 1:i={r:n*(1-r*o),g:n,b:n*(1-r)};break;case 2:i={r:n*(1-r),g:n,b:n*(1-r*o)};break;case 3:i={r:n*(1-r),g:n*(1-r*o),b:n};break;case 4:i={r:n*(1-r*o),g:n*(1-r),b:n};break;case 5:i={r:n,g:n*(1-r),b:n*(1-r*o)}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}function a(e){var a=e.r,r=e.g,n=e.b,t=e.alpha,o=Math.max(a,r,n),i=Math.min(a,r,n),l={mode:"hsv",s:0===o?0:1-i/o,v:o};return o-i!=0&&(l.h=60*(o===a?(r-n)/(o-i)+6*(r<n):o===r?(n-a)/(o-i)+2:(a-r)/(o-i)+4)),void 0!==t&&(l.alpha=t),l}var r=function(e){var a=e.l,r=e.a,n=e.b,t=e.alpha,o={mode:"lch",l:a,c:Math.sqrt(r*r+n*n),h:180*Math.atan2(n,r)/Math.PI};return o.h<0&&(o.h+=360),void 0!==t&&(o.alpha=t),o},n=function(e){var a=e.l,r=e.c,n=e.h,t=e.alpha,o={mode:"lab",l:a,a:r*Math.cos(n/180*Math.PI),b:r*Math.sin(n/180*Math.PI)};return void 0!==t&&(o.alpha=t),o},t=Math.pow(29,3)/Math.pow(3,3),o=Math.pow(6,3)/Math.pow(29,3),i=function(e){return e>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e},l=function(e){var a,r,n,l,h=function(e){var a=e.x,r=e.y,n=e.z;return{r:i(3.1338561*a-1.6168667*r-.4906146*n),g:i(-.9787684*a+1.9161415*r+.033454*n),b:i(.0719453*a-.2289914*r+1.4052427*n)}}((r=(a=e).l,n=a.a/500+(r+16)/116,l=(r+16)/116-a.b/200,{x:.9642*(Math.pow(n,3)>o?Math.pow(n,3):(116*n-16)/t),y:1*(r>8?Math.pow((r+16)/116,3):r/t),z:.82521*(Math.pow(l,3)>o?Math.pow(l,3):(116*l-16)/t)}));return h.mode="rgb",void 0!==e.alpha&&(h.alpha=e.alpha),h},h=function(e){return e<.04045?e/12.92:Math.pow((e+.055)/1.055,2.4)},s=Math.pow(29,3)/Math.pow(3,3),u=Math.pow(6,3)/Math.pow(29,3),d=function(e){return e>u?Math.cbrt(e):(s*e+16)/116},b=function(e){var a,r,n,t,o=function(e){var a=e.x,r=e.y,n=e.z,t=d(a/.9642),o=d(r/1);return{l:116*o-16,a:500*(t-o),b:200*(o-d(n/.82521))}}((r=(a=e).r,n=a.g,t=a.b,{x:.4360747*(r=h(r))+.3850649*(n=h(n))+.1430804*(t=h(t)),y:.2225045*r+.7168786*n+.0606169*t,z:.0139322*r+.0971045*n+.7141733*t}));return o.mode="lab",void 0!==e.alpha&&(o.alpha=e.alpha),o},c={hsi:{rgb:function(e){var a=e.h,r=e.s,n=e.i,t=e.alpha;a=(a<0?a+360:a)%360;var o=Math.abs(a/60%2-1),i=void 0;switch(Math.floor(a/60)){case 0:i={r:n*(1+r*(3/(2-o)-1)),g:n*(1+r*(3*(1-o)/(2-o)-1)),b:n*(1-r)};break;case 1:i={r:n*(1+r*(3*(1-o)/(2-o)-1)),g:n*(1+r*(3/(2-o)-1)),b:n*(1-r)};break;case 2:i={r:n*(1-r),g:n*(1+r*(3/(2-o)-1)),b:n*(1+r*(3*(1-o)/(2-o)-1))};break;case 3:i={r:n*(1-r),g:n*(1+r*(3*(1-o)/(2-o)-1)),b:n*(1+r*(3/(2-o)-1))};break;case 4:i={r:n*(1+r*(3*(1-o)/(2-o)-1)),g:n*(1-r),b:n*(1+r*(3/(2-o)-1))};break;case 5:i={r:n*(1+r*(3/(2-o)-1)),g:n*(1-r),b:n*(1+r*(3*(1-o)/(2-o)-1))}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}},hsl:{rgb:function(e){var a=e.h,r=e.s,n=e.l,t=e.alpha;a=(a<0?a+360:a)%360;var o=n+r*(n<.5?n:1-n),i=o-2*(o-n)*Math.abs(a/60%2-1),l=void 0;switch(Math.floor(a/60)){case 0:l={r:o,g:i,b:2*n-o};break;case 1:l={r:i,g:o,b:2*n-o};break;case 2:l={r:2*n-o,g:o,b:i};break;case 3:l={r:2*n-o,g:i,b:o};break;case 4:l={r:i,g:2*n-o,b:o};break;case 5:l={r:o,g:2*n-o,b:i}}return l.mode="rgb",void 0!==t&&(l.alpha=t),l}},hsv:{rgb:e},hwb:{rgb:function(a){var r=a.h,n=a.w,t=a.b,o=a.alpha;if(n+t>1){var i=n+t;n/=i,t/=i}return e({h:r,s:1===t?1:1-n/(1-t),v:1-t,alpha:o})}},lab:{lch:r,rgb:l},lch:{lab:n,rgb:function(e){return l(n(e))}},rgb:{hsi:function(e){var a=e.r,r=e.g,n=e.b,t=e.alpha,o=Math.max(a,r,n),i=Math.min(a,r,n),l={mode:"hsi",s:a+r+n===0?0:1-3*i/(a+r+n),i:(a+r+n)/3};return o-i!=0&&(l.h=60*(o===a?(r-n)/(o-i)+6*(r<n):o===r?(n-a)/(o-i)+2:(a-r)/(o-i)+4)),void 0!==t&&(l.alpha=t),l},hsl:function(e){var a=e.r,r=e.g,n=e.b,t=e.alpha,o=Math.max(a,r,n),i=Math.min(a,r,n),l={mode:"hsl",s:o===i?0:(o-i)/(1-Math.abs(o+i-1)),l:.5*(o+i)};return o-i!=0&&(l.h=60*(o===a?(r-n)/(o-i)+6*(r<n):o===r?(n-a)/(o-i)+2:(a-r)/(o-i)+4)),void 0!==t&&(l.alpha=t),l},hsv:a,hwb:function(e){var r=a(e);if(void 0!==r){var n={mode:"hwb",w:(1-r.s)*r.v,b:1-r.v};return void 0!==r.h&&(n.h=r.h),void 0!==r.alpha&&(n.alpha=r.alpha),n}},lab:b,lch:function(e){return r(b(e))}}},g=function(e,a){return void 0!==e?e.mode===a?e:c[e.mode][a]?c[e.mode][a](e):"rgb"===mode?c[e.mode].rgb(e):c.rgb[a](c[e.mode].rgb(e)):void 0},p=function(e,a){if("number"==typeof e)return 3===a?{mode:"rgb",r:(e>>8&15|e>>4&240)/255,g:(e>>4&15|240&e)/255,b:(15&e|e<<4&240)/255}:4===a?{mode:"rgb",r:(e>>12&15|e>>8&240)/255,g:(e>>8&15|e>>4&240)/255,b:(e>>4&15|240&e)/255,alpha:(15&e|e<<4&240)/255}:6===a?{mode:"rgb",r:(e>>16&255)/255,g:(e>>8&255)/255,b:(255&e)/255}:8===a?{mode:"rgb",r:(e>>24&255)/255,g:(e>>16&255)/255,b:(e>>8&255)/255,alpha:(255&e)/255}:void 0},v={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074},m=function(e){return"string"==typeof e&&p(v[e.toLowerCase()],6)||void 0},f=(/([+-]?\d*\.?\d+(?:[eE][+-]?\d+)?)/+"").replace(/^\/|\/$/g,""),w=f+"%",y="(?:"+f+"%|"+f+")",k="(?:"+f+"(deg|grad|rad|turn)|"+f+")",M="\\s*,\\s*",x="\\s+",$=new RegExp("^rgba?\\(\\s*"+f+M+f+M+f+"\\s*(?:,\\s*"+y+"\\s*)?\\)$"),E=new RegExp("^rgba?\\(\\s*"+w+M+w+M+w+"\\s*(?:,\\s*"+y+"\\s*)?\\)$"),R=new RegExp("^rgba?\\(\\s*"+f+x+f+x+f+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),q=new RegExp("^rgba?\\(\\s*"+w+x+w+x+w+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),j=new RegExp("^hsla?\\(\\s*"+k+M+w+M+w+"\\s*(?:,\\s*"+y+"\\s*)?\\)$"),z=new RegExp("^hsla?\\(\\s*"+k+x+w+x+w+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),O=/^#?([0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{4}|[0-9a-f]{3})$/i,S=new RegExp("^hwb\\(\\s*"+k+x+w+x+w+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),I=new RegExp("^lab\\(\\s*"+f+x+f+x+f+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),P=new RegExp("^lch\\(\\s*"+f+x+f+x+k+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),H=new RegExp("^gray\\(\\s*"+f+"()()\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),N=function(e){var a;return(a=e.match(O))?p(parseInt(a[1],16),a[1].length):void 0},C=function(e){var a=void 0,r=void 0;if(a=e.match($)||e.match(R))r={mode:"rgb",r:a[1]/255,g:a[2]/255,b:a[3]/255};else{if(!(a=e.match(E)||e.match(q)))return;r={mode:"rgb",r:a[1]/100,g:a[2]/100,b:a[3]/100}}return void 0!==a[4]?r.alpha=a[4]/100:void 0!==a[5]&&(r.alpha=+a[5]),r},L=function(e,a){switch(a){case"deg":return+e;case"rad":return e/Math.PI*180;case"grad":return e/10*9;case"turn":return 360*e}},A=function(e){if("string"==typeof e){var a=e.match(j)||e.match(z);if(a){var r={mode:"hsl",h:void 0===a[3]?L(a[1],a[2]):+a[3],s:Math.min(Math.max(0,a[4]/100),1),l:Math.min(Math.max(0,a[5]/100),1)};return void 0!==a[6]?r.alpha=a[6]/100:void 0!==a[7]&&(r.alpha=a[7]/255),r}}},B=function(e){if("string"==typeof e){var a=e.match(S);if(a){var r={mode:"hwb",h:void 0===a[3]?L(a[1],a[2]):+a[3],w:a[4]/100,b:a[5]/100};if(r.w+r.b>1){var n=r.w+r.b;r.w/=n,r.b/=n}return void 0!==a[6]?r.alpha=a[6]/100:void 0!==a[7]&&(r.alpha=a[7]/255),r}}},D=function(e){return N(e)||C(e)||A(e)||m(e)||("transparent"===e?p(0,8):void 0)||B(e)||function(e){var a=void 0,r=void 0;if(a=e.match(I))r={mode:"lab",l:+a[1],a:+a[2],b:+a[3]};else{if(!(a=e.match(H)))return;r={mode:"lab",l:+a[1],a:0,b:0}}return void 0!==a[4]?r.alpha=a[4]/100:void 0!==a[5]&&(r.alpha=+a[5]),r}(e)||function(e){var a=e.match(P);if(a){var r={mode:"lch",l:+a[1],c:Math.max(0,+a[2]),h:void 0===a[5]?L(a[3],a[4]):+a[5]};return void 0!==a[6]?r.alpha=a[6]/100:void 0!==a[7]&&(r.alpha=+a[7]),r}}(e)},F="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},G=Object.assign||function(e){for(var a=1;a<arguments.length;a++){var r=arguments[a];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},J=function(e,a){return"object"!==(void 0===e?"undefined":F(e))?D(e):void 0===e.mode?G({},e,{mode:a}):e},K=function(e){return g(J(e,"rgb"),"rgb")},Q=function(e,a){return Math.round(e*(a=Math.pow(10,a)))/a};function T(e){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:4;if(void 0!==e)return"number"==typeof e?Q(e,a):"string"==typeof e?e:"object"===(void 0===e?"undefined":F(e))?Object.keys(e).reduce(function(a,r){return a[r]=T(e[r]),a},{}):void 0}var U=function(e){return Math.round(255*Math.max(0,Math.min(e,1)))},V={rgb:["r","g","b","alpha"],hsl:["h","s","l","alpha"],hsv:["h","s","v","alpha"],hsi:["h","s","i","alpha"],lab:["l","a","b","alpha"],lch:["l","c","h","alpha"],hwb:["h","w","b","alpha"]},W=function(e,a){var r=V[e.mode].reduce(function(r,n){var t=a(n,e[n]);return void 0!==t&&(r[n]=t),r},{});return r.mode=e.mode,r},X=function(e){return K(e)},Y=Object.freeze({hsl:function(e){return g(J(e,"hsl"),"hsl")},hsv:function(e){return g(J(e,"hsv"),"hsv")},hsi:function(e){return g(J(e,"hsi"),"hsi")},hwb:function(e){return g(J(e,"hwb"),"hwb")},rgb:K,lab:function(e){return g(J(e,"lab"),"lab")},lch:function(e){return g(J(e,"lch"),"lch")},css:function(e){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"rgb",r=K(e),n=U(r.r),t=U(r.g),o=U(r.b);return"hex"===a?"#"+(1<<24|n<<16|t<<8|o).toString(16).slice(1):"rgb"===a?void 0===r.alpha||1===r.alpha?"rgb("+n+", "+t+", "+o+")":"rgba("+n+", "+t+", "+o+", "+T(r.alpha,2)+")":void 0},convert:g,prepare:J,round:T,parse:D,parseNumber:p,parseNamed:m,parseHex:N,parseRgb:C,parseHsl:A,parseHwb:B,named:v,map:W,interpolate:function(e){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"rgb";if(!(e.length<2)){var r=e.length-1,n=e.map(function(e){return g(J(e,a),a)});return function(e){var t=Math.min(Math.max(0,e),1)*r,o=Math.floor(t),i=n[o],l=n[o+1],h=t-o;return W({mode:a},function(e){return o===r?i[e]:(a=i[e],n=l[e],void 0===a||void 0===n?void 0:a+h*(n-a));var a,n})}}},swatches:function(e){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:2;if(a<2)return a<1?[e(0),e(1)]:[e(.5)];for(var r=[],n=0;n<a;n++)r.push(e(n/(a-1)));return r},default:X});return Object.assign(X,Y),X});
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):a.culori=e()}(this,function(){"use strict";function a(a){var e=a.h,r=a.s,n=a.v,t=a.alpha;(e%=360)<0&&(e+=360);var o=Math.abs(e/60%2-1),i=void 0;switch(Math.floor(e/60)){case 0:i={r:n,g:n*(1-r*o),b:n*(1-r)};break;case 1:i={r:n*(1-r*o),g:n,b:n*(1-r)};break;case 2:i={r:n*(1-r),g:n,b:n*(1-r*o)};break;case 3:i={r:n*(1-r),g:n*(1-r*o),b:n};break;case 4:i={r:n*(1-r*o),g:n*(1-r),b:n};break;case 5:i={r:n,g:n*(1-r),b:n*(1-r*o)}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}function e(a){var e=a.r,r=a.g,n=a.b,t=a.alpha,o=Math.max(e,r,n),i=Math.min(e,r,n),h={mode:"hsv",s:0===o?0:1-i/o,v:o};return o-i!=0&&(h.h=60*(o===e?(r-n)/(o-i)+6*(r<n):o===r?(n-e)/(o-i)+2:(e-r)/(o-i)+4)),void 0!==t&&(h.alpha=t),h}var r=function(a){var e=a.l,r=a.a,n=a.b,t=a.alpha,o={mode:"lch",l:e,c:Math.sqrt(r*r+n*n),h:180*Math.atan2(n,r)/Math.PI};return o.h<0&&(o.h+=360),void 0!==t&&(o.alpha=t),o},n=function(a){var e=a.l,r=a.c,n=a.h,t=a.alpha,o={mode:"lab",l:e,a:r*Math.cos(n/180*Math.PI),b:r*Math.sin(n/180*Math.PI)};return void 0!==t&&(o.alpha=t),o},t=Math.pow(29,3)/Math.pow(3,3),o=Math.pow(6,3)/Math.pow(29,3),i=function(a){return a>.0031308?1.055*Math.pow(a,1/2.4)-.055:12.92*a},h=function(a){var e,r,n,h,l=function(a){var e=a.x,r=a.y,n=a.z;return{r:i(3.1338561*e-1.6168667*r-.4906146*n),g:i(-.9787684*e+1.9161415*r+.033454*n),b:i(.0719453*e-.2289914*r+1.4052427*n)}}((r=(e=a).l,n=e.a/500+(r+16)/116,h=(r+16)/116-e.b/200,{x:.9642*(Math.pow(n,3)>o?Math.pow(n,3):(116*n-16)/t),y:1*(r>8?Math.pow((r+16)/116,3):r/t),z:.82521*(Math.pow(h,3)>o?Math.pow(h,3):(116*h-16)/t)}));return l.mode="rgb",void 0!==a.alpha&&(l.alpha=a.alpha),l},l=function(a){return a<.04045?a/12.92:Math.pow((a+.055)/1.055,2.4)},s=Math.pow(29,3)/Math.pow(3,3),u=Math.pow(6,3)/Math.pow(29,3),d=function(a){return a>u?Math.cbrt(a):(s*a+16)/116},b=function(a){var e,r,n,t,o=function(a){var e=a.x,r=a.y,n=a.z,t=d(e/.9642),o=d(r/1);return{l:116*o-16,a:500*(t-o),b:200*(o-d(n/.82521))}}((r=(e=a).r,n=e.g,t=e.b,{x:.4360747*(r=l(r))+.3850649*(n=l(n))+.1430804*(t=l(t)),y:.2225045*r+.7168786*n+.0606169*t,z:.0139322*r+.0971045*n+.7141733*t}));return o.mode="lab",void 0!==a.alpha&&(o.alpha=a.alpha),o},c={hsi:{rgb:function(a){var e=a.h,r=a.s,n=a.i,t=a.alpha;e=(e<0?e+360:e)%360;var o=Math.abs(e/60%2-1),i=void 0;switch(Math.floor(e/60)){case 0:i={r:n*(1+r*(3/(2-o)-1)),g:n*(1+r*(3*(1-o)/(2-o)-1)),b:n*(1-r)};break;case 1:i={r:n*(1+r*(3*(1-o)/(2-o)-1)),g:n*(1+r*(3/(2-o)-1)),b:n*(1-r)};break;case 2:i={r:n*(1-r),g:n*(1+r*(3/(2-o)-1)),b:n*(1+r*(3*(1-o)/(2-o)-1))};break;case 3:i={r:n*(1-r),g:n*(1+r*(3*(1-o)/(2-o)-1)),b:n*(1+r*(3/(2-o)-1))};break;case 4:i={r:n*(1+r*(3*(1-o)/(2-o)-1)),g:n*(1-r),b:n*(1+r*(3/(2-o)-1))};break;case 5:i={r:n*(1+r*(3/(2-o)-1)),g:n*(1-r),b:n*(1+r*(3*(1-o)/(2-o)-1))}}return i.mode="rgb",void 0!==t&&(i.alpha=t),i}},hsl:{rgb:function(a){var e=a.h,r=a.s,n=a.l,t=a.alpha;e=(e<0?e+360:e)%360;var o=n+r*(n<.5?n:1-n),i=o-2*(o-n)*Math.abs(e/60%2-1),h=void 0;switch(Math.floor(e/60)){case 0:h={r:o,g:i,b:2*n-o};break;case 1:h={r:i,g:o,b:2*n-o};break;case 2:h={r:2*n-o,g:o,b:i};break;case 3:h={r:2*n-o,g:i,b:o};break;case 4:h={r:i,g:2*n-o,b:o};break;case 5:h={r:o,g:2*n-o,b:i}}return h.mode="rgb",void 0!==t&&(h.alpha=t),h}},hsv:{rgb:a},hwb:{rgb:function(e){var r=e.h,n=e.w,t=e.b,o=e.alpha;if(n+t>1){var i=n+t;n/=i,t/=i}return a({h:r,s:1===t?1:1-n/(1-t),v:1-t,alpha:o})}},lab:{lch:r,rgb:h},lch:{lab:n,rgb:function(a){return h(n(a))}},rgb:{hsi:function(a){var e=a.r,r=a.g,n=a.b,t=a.alpha,o=Math.max(e,r,n),i=Math.min(e,r,n),h={mode:"hsi",s:e+r+n===0?0:1-3*i/(e+r+n),i:(e+r+n)/3};return o-i!=0&&(h.h=60*(o===e?(r-n)/(o-i)+6*(r<n):o===r?(n-e)/(o-i)+2:(e-r)/(o-i)+4)),void 0!==t&&(h.alpha=t),h},hsl:function(a){var e=a.r,r=a.g,n=a.b,t=a.alpha,o=Math.max(e,r,n),i=Math.min(e,r,n),h={mode:"hsl",s:o===i?0:(o-i)/(1-Math.abs(o+i-1)),l:.5*(o+i)};return o-i!=0&&(h.h=60*(o===e?(r-n)/(o-i)+6*(r<n):o===r?(n-e)/(o-i)+2:(e-r)/(o-i)+4)),void 0!==t&&(h.alpha=t),h},hsv:e,hwb:function(a){var r=e(a);if(void 0!==r){var n={mode:"hwb",w:(1-r.s)*r.v,b:1-r.v};return void 0!==r.h&&(n.h=r.h),void 0!==r.alpha&&(n.alpha=r.alpha),n}},lab:b,lch:function(a){return r(b(a))}}},g=function(a,e){return void 0!==a?a.mode===e?a:c[a.mode][e]?c[a.mode][e](a):"rgb"===mode?c[a.mode].rgb(a):c.rgb[e](c[a.mode].rgb(a)):void 0},p=function(a,e){if("number"==typeof a)return 3===e?{mode:"rgb",r:(a>>8&15|a>>4&240)/255,g:(a>>4&15|240&a)/255,b:(15&a|a<<4&240)/255}:4===e?{mode:"rgb",r:(a>>12&15|a>>8&240)/255,g:(a>>8&15|a>>4&240)/255,b:(a>>4&15|240&a)/255,alpha:(15&a|a<<4&240)/255}:6===e?{mode:"rgb",r:(a>>16&255)/255,g:(a>>8&255)/255,b:(255&a)/255}:8===e?{mode:"rgb",r:(a>>24&255)/255,g:(a>>16&255)/255,b:(a>>8&255)/255,alpha:(255&a)/255}:void 0},v={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074},m=function(a){return"string"==typeof a&&p(v[a.toLowerCase()],6)||void 0},f=(/([+-]?\d*\.?\d+(?:[eE][+-]?\d+)?)/+"").replace(/^\/|\/$/g,""),w=f+"%",y="(?:"+f+"%|"+f+")",M="(?:"+f+"(deg|grad|rad|turn)|"+f+")",k="\\s*,\\s*",x="\\s+",$=new RegExp("^rgba?\\(\\s*"+f+k+f+k+f+"\\s*(?:,\\s*"+y+"\\s*)?\\)$"),E=new RegExp("^rgba?\\(\\s*"+w+k+w+k+w+"\\s*(?:,\\s*"+y+"\\s*)?\\)$"),R=new RegExp("^rgba?\\(\\s*"+f+x+f+x+f+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),q=new RegExp("^rgba?\\(\\s*"+w+x+w+x+w+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),j=new RegExp("^hsla?\\(\\s*"+M+k+w+k+w+"\\s*(?:,\\s*"+y+"\\s*)?\\)$"),z=new RegExp("^hsla?\\(\\s*"+M+x+w+x+w+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),O=/^#?([0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{4}|[0-9a-f]{3})$/i,S=new RegExp("^hwb\\(\\s*"+M+x+w+x+w+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),I=new RegExp("^lab\\(\\s*"+f+x+f+x+f+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),P=new RegExp("^lch\\(\\s*"+f+x+f+x+M+"\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),H=new RegExp("^gray\\(\\s*"+f+"()()\\s*(?:\\/\\s*"+y+"\\s*)?\\)$"),N=function(a){var e;return(e=a.match(O))?p(parseInt(e[1],16),e[1].length):void 0},C=function(a){var e=void 0,r=void 0;if(e=a.match($)||a.match(R))r={mode:"rgb",r:e[1]/255,g:e[2]/255,b:e[3]/255};else{if(!(e=a.match(E)||a.match(q)))return;r={mode:"rgb",r:e[1]/100,g:e[2]/100,b:e[3]/100}}return void 0!==e[4]?r.alpha=e[4]/100:void 0!==e[5]&&(r.alpha=+e[5]),r},L=function(a,e){switch(e){case"deg":return+a;case"rad":return a/Math.PI*180;case"grad":return a/10*9;case"turn":return 360*a}},A=function(a){if("string"==typeof a){var e=a.match(j)||a.match(z);if(e){var r={mode:"hsl",h:void 0===e[3]?L(e[1],e[2]):+e[3],s:Math.min(Math.max(0,e[4]/100),1),l:Math.min(Math.max(0,e[5]/100),1)};return void 0!==e[6]?r.alpha=e[6]/100:void 0!==e[7]&&(r.alpha=e[7]/255),r}}},B=function(a){if("string"==typeof a){var e=a.match(S);if(e){var r={mode:"hwb",h:void 0===e[3]?L(e[1],e[2]):+e[3],w:e[4]/100,b:e[5]/100};if(r.w+r.b>1){var n=r.w+r.b;r.w/=n,r.b/=n}return void 0!==e[6]?r.alpha=e[6]/100:void 0!==e[7]&&(r.alpha=e[7]/255),r}}},D=function(a){return N(a)||C(a)||A(a)||m(a)||("transparent"===a?p(0,8):void 0)||B(a)||function(a){var e=void 0,r=void 0;if(e=a.match(I))r={mode:"lab",l:+e[1],a:+e[2],b:+e[3]};else{if(!(e=a.match(H)))return;r={mode:"lab",l:+e[1],a:0,b:0}}return void 0!==e[4]?r.alpha=e[4]/100:void 0!==e[5]&&(r.alpha=+e[5]),r}(a)||function(a){var e=a.match(P);if(e){var r={mode:"lch",l:+e[1],c:Math.max(0,+e[2]),h:void 0===e[5]?L(e[3],e[4]):+e[5]};return void 0!==e[6]?r.alpha=e[6]/100:void 0!==e[7]&&(r.alpha=+e[7]),r}}(a)},F="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a},G=Object.assign||function(a){for(var e=1;e<arguments.length;e++){var r=arguments[e];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(a[n]=r[n])}return a},J=function(a,e){return"object"!==(void 0===a?"undefined":F(a))?D(a):void 0===a.mode?G({},a,{mode:e}):a},K=function(a){return g(J(a,"rgb"),"rgb")},Q=function(a,e){return Math.round(a*(e=Math.pow(10,e)))/e};function T(a){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:4;if(void 0!==a)return"number"==typeof a?Q(a,e):"string"==typeof a?a:"object"===(void 0===a?"undefined":F(a))?Object.keys(a).reduce(function(e,r){return e[r]=T(a[r]),e},{}):void 0}var U=function(a){return Math.round(255*Math.max(0,Math.min(a,1)))},V={rgb:["r","g","b","alpha"],hsl:["h","s","l","alpha"],hsv:["h","s","v","alpha"],hsi:["h","s","i","alpha"],lab:["l","a","b","alpha"],lch:["l","c","h","alpha"],hwb:["h","w","b","alpha"]},W=function(a,e){var r=V[a.mode].reduce(function(r,n){var t=e(n,a[n]);return void 0!==t&&(r[n]=t),r},{});return r.mode=a.mode,r},X=function(a){return K(a)},Y=Object.freeze({hsl:function(a){return g(J(a,"hsl"),"hsl")},hsv:function(a){return g(J(a,"hsv"),"hsv")},hsi:function(a){return g(J(a,"hsi"),"hsi")},hwb:function(a){return g(J(a,"hwb"),"hwb")},rgb:K,lab:function(a){return g(J(a,"lab"),"lab")},lch:function(a){return g(J(a,"lch"),"lch")},css:function(a){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"rgb",r=K(a),n=U(r.r),t=U(r.g),o=U(r.b);return"hex"===e?"#"+(1<<24|n<<16|t<<8|o).toString(16).slice(1):"rgb"===e?void 0===r.alpha||1===r.alpha?"rgb("+n+", "+t+", "+o+")":"rgba("+n+", "+t+", "+o+", "+T(r.alpha,2)+")":void 0},convert:g,prepare:J,round:T,parse:D,parseNumber:p,parseNamed:m,parseHex:N,parseRgb:C,parseHsl:A,parseHwb:B,named:v,map:W,interpolate:function(a){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"rgb";if(!(a.length<2)){var r=a.length-1,n=a.map(function(a){return g(J(a,e),e)});return function(a){var t=Math.min(Math.max(0,a),1)*r,o=Math.floor(t),i=n[o],h=n[o+1],l=t-o;return W({mode:e},function(a){return o===r?i[a]:function(a,e,r,n){return void 0===a||void 0===e?void 0:a+r*("h"===n?(e-a)*Math.min(Math.abs(e-a),Math.abs(e-360-a)):e-a)}(i[a],h[a],l,a)})}}},swatches:function(a){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:2;if(e<2)return e<1?[a(0),a(1)]:[a(.5)];for(var r=[],n=0;n<e;n++)r.push(a(n/(e-1)));return r},default:X});return Object.assign(X,Y),X});

build/index.js

@@ -988,4 +988,4 @@ // Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Converting_to_RGB
 
-var interpolate = function interpolate(a, b, t) {
-	return a === undefined || b === undefined ? undefined : a + t * (b - a);
+var interpolate = function interpolate(a, b, t, k) {
+	return a === undefined || b === undefined ? undefined : a + t * (k === 'h' ? (b - a) * Math.min(Math.abs(b - a), Math.abs(b - 360 - a)) : b - a);
 };
@@ -1010,3 +1010,3 @@
 		return map({ mode: mode }, function (k) {
-			return i === classes ? colorA[k] : interpolate(colorA[k], colorB[k], tt);
+			return i === classes ? colorA[k] : interpolate(colorA[k], colorB[k], tt, k);
 		});
@@ -1013,0 +1013,0 @@ };

package.json

 {
   "name": "culori",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "main": "build/culori.js",
@@ -5,0 +5,0 @@ "module": "build/index.js",

src/api/interpolate.js

@@ -5,4 +5,5 @@ import convert from './convert';
 
-const interpolate = (a, b, t) => 
-	a === undefined || b === undefined ? undefined : a + t * (b - a);
+const interpolate = (a, b, t, k) => 
+	a === undefined || b === undefined ? undefined : a + t * (
+		k === 'h' ? (b - a) * Math.min(Math.abs(b-a), Math.abs(b-360-a)) : (b - a));
 
@@ -21,4 +22,4 @@ export default (colors, mode = 'rgb') => {
 			tt = (cls - i);
-		return map({ mode: mode }, k => i === classes ? colorA[k] : interpolate(colorA[k], colorB[k], tt));
+		return map({ mode: mode }, k => i === classes ? colorA[k] : interpolate(colorA[k], colorB[k], tt, k));
 	};
 };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

100281

increased by0.31%

Lines of code

2809

increased by0.04%

No dependency changes