Fix an issue when color is string and mode is null

bijela-gora · bijela-gora · commit 7c0ff5a05c09 · 2022-04-14T23:12:21.000+02:00
diff --git a/src/map.js b/src/map.js
@@ -7,15 +7,17 @@ const mapper = (fn, mode = 'rgb', preserve_mode = false) => {
 	let conv = mode ? converter(mode) : prepare;
 	return color => {
 		let conv_color = conv(color);
-		let res = (channels || getMode(color.mode).channels).reduce(
+		let _mode = mode === null ? conv_color.mode : mode;
+		let _channels = channels || getMode(_mode).channels;
+		let res = _channels.reduce(
 			(res, ch) => {
-				let v = fn(conv_color[ch], ch, conv_color, mode);
+				let v = fn(conv_color[ch], ch, conv_color, _mode);
 				if (v !== undefined && !isNaN(v)) {
 					res[ch] = v;
 				}
 				return res;
 			},
-			{ mode }
+			{ mode: _mode }
 		);
 		if (!preserve_mode) {
 			return res;
diff --git a/test/map.test.js b/test/map.test.js
@@ -29,3 +29,23 @@ tape('gamma transfer function', t => {
 	t.equal(formatHex(brighten('#cc0033')), '#ff0070');
 	t.end();
 });
+
+tape(
+	"The mode parameter can be set to null, in which case the mapper will iterate through all the channels in the color's original color space.",
+	// https://culorijs.org/api/#mapper
+	t => {
+		let brighten = mapper(mapTransferGamma(2.2), null);
+		t.deepEqual(
+			brighten(
+				'color(--okhsv 29.2338851923426 0.9995219692256307 0.9999999999999997)'
+			),
+			{
+				mode: 'okhsv',
+				h: 64.31454742315373,
+				s: 2.198948332296388,
+				v: 2.1999999999999993
+			}
+		);
+		t.end();
+	}
+);
