fix for scheme + range

Author: mbostock

src/scales/quantitative.js

@@ -55,8 +55,8 @@ export function ScaleQ(key, scale, channels, {
   round,
   range = registry.get(key) === radius ? inferRadialRange(channels, domain) : registry.get(key) === opacity ? unit : undefined,
   type,
-  scheme = type === "cyclical" ? "rainbow" : "turbo",
-  interpolate = registry.get(key) === color ? (range !== undefined ? interpolateRgb : quantitativeScheme(scheme)) : round ? interpolateRound : interpolateNumber,
+  scheme,
+  interpolate = registry.get(key) === color ? (scheme == null && range !== undefined ? interpolateRgb : quantitativeScheme(scheme !== undefined ? scheme : type === "cyclical" ? "rainbow" : "turbo")) : round ? interpolateRound : interpolateNumber,
   reverse,
   inset = 0
 }) {

test/scales/scales-test.js

@@ -1180,6 +1180,32 @@ it("plot(…).scale(name) reflects the given custom interpolator", async () => {
   });
 });
 
+it("plot(…).scale('color') allows a range to be specified in conjunction with a scheme", async () => {
+  const gistemp = await d3.csv("data/gistemp.csv", d3.autoType);
+  const plot = Plot.dot(gistemp, {x: "Date", fill: "Anomaly"}).plot({color: {range: [0, 0.5], scheme: "cool"}});
+  assert.deepStrictEqual(plot.scale("color"), {
+    type: "linear",
+    domain: [-0.78, 1.35],
+    range: [0, 0.5],
+    interpolate: d3.interpolateCool,
+    clamp: false,
+    label: "Anomaly"
+  });
+});
+
+it("plot(…).scale('color') allows a range to be specified in conjunction with a single-argument interpolator", async () => {
+  const gistemp = await d3.csv("data/gistemp.csv", d3.autoType);
+  const plot = Plot.dot(gistemp, {x: "Date", fill: "Anomaly"}).plot({color: {range: [0, 0.5], interpolate: d3.interpolateCool}});
+  assert.deepStrictEqual(plot.scale("color"), {
+    type: "linear",
+    domain: [-0.78, 1.35],
+    range: [0, 0.5],
+    interpolate: d3.interpolateCool,
+    clamp: false,
+    label: "Anomaly"
+  });
+});
+
 it("plot(…).scale('color') promotes the given scheme option to an interpolator for quantitative scales", () => {
   assert.strictEqual(Plot.dotX([], {fill: "x"}).plot().scale("color").interpolate, d3.interpolateTurbo);
   assert.strictEqual(Plot.dotX([], {fill: "x"}).plot({color: {scheme: "warm"}}).scale("color").interpolate, d3.interpolateWarm);