Skip to content

Commit 0e41ea1

Browse files
committed
Add opacity support for colorscale interpolation
1 parent 99d3fb8 commit 0e41ea1

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/components/colorscale/make_scale_function.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@ module.exports = function makeScaleFunction(scl, cmin, cmax) {
2626
for(var i = 0; i < N; i++) {
2727
si = scl[i];
2828
domain[i] = cmin + si[0] * (cmax - cmin);
29-
range[i] = si[1];
29+
range[i] = tinycolor(si[1]).toRgb();
3030
}
3131

3232
var sclFunc = d3.scale.linear()
3333
.domain(domain)
34-
.interpolate(d3.interpolateRgb)
34+
.interpolate(d3.interpolateObject)
3535
.range(range);
3636

3737
return function(v) {
3838
if(isNumeric(v)) {
39-
var sclVal = Lib.constrain(v, cmin, cmax);
40-
return sclFunc(sclVal);
39+
var sclVal = Lib.constrain(v, cmin, cmax),
40+
colorObj = sclFunc(sclVal);
41+
42+
return tinycolor(colorObj).toRgbString();
4143
}
4244
else if(tinycolor(v).isValid()) return v;
4345
else return Color.defaultLine;

0 commit comments

Comments
 (0)