Skip to content

Commit b3693b4

Browse files
committed
Use alpha in more places
1 parent 0aaf967 commit b3693b4

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/components/drawing/index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,11 @@ function gradientWithBounds(sel, gd, gradientID, type, colorscale, prop, start,
514514
stops.enter().append('stop');
515515

516516
stops.each(function (d) {
517+
var c = Color.color(d[1]);
517518
d3.select(this).attr({
518519
offset: d[0] + '%',
519520
'stop-color': Color.rgb(d[1]),
520-
'stop-opacity': Color.opacity(d[1])
521+
'stop-opacity': c.alpha()
521522
});
522523
});
523524
});
@@ -583,8 +584,9 @@ drawing.pattern = function (
583584
var patternTag;
584585
var patternAttrs = {};
585586

587+
var fgC = Color.color(fgcolor);
586588
var fgRGB = Color.rgb(fgcolor);
587-
var fgAlpha = Color.opacity(fgcolor);
589+
var fgAlpha = fgC.alpha();
588590
var opacity = fgopacity * fgAlpha;
589591

590592
switch (shape) {
@@ -817,8 +819,9 @@ drawing.pattern = function (
817819
});
818820

819821
if (bgcolor) {
822+
var bgC = Color.color(bgcolor);
820823
var bgRGB = Color.rgb(bgcolor);
821-
var bgAlpha = Color.opacity(bgcolor);
824+
var bgAlpha = bgC.alpha();
822825

823826
var rects = el.selectAll('rect').data([0]);
824827
rects.exit().remove();

src/traces/sankey/render.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,9 @@ function linkModel(d, l, i) {
311311
pointNumber: l.pointNumber,
312312
link: l,
313313
rgb: Color.rgb(l.color),
314-
alpha: Color.opacity(l.color),
314+
alpha: Color.color(l.color).alpha(),
315315
hoverRgb: Color.rgb(l.hovercolor),
316-
hoverAlpha: Color.opacity(l.hovercolor),
316+
hoverAlpha: Color.color(l.hovercolor).alpha(),
317317
linkPath: linkPath,
318318
linkLineColor: d.linkLineColor,
319319
linkLineWidth: d.linkLineWidth,
@@ -575,7 +575,7 @@ function nodeModel(d, n) {
575575
horizontal: d.horizontal,
576576
darkBackground: Color.color(n.color).isDark(),
577577
rgb: Color.rgb(n.color),
578-
alpha: Color.opacity(n.color),
578+
alpha: Color.color(n.color).alpha(),
579579
valueFormat: d.valueFormat,
580580
valueSuffix: d.valueSuffix,
581581
sankey: d.sankey,

0 commit comments

Comments
 (0)