Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into cam/7523/switch-col…
…or-library
  • Loading branch information
camdecoster committed Nov 17, 2025
commit fe7b6077f29eaba8da737f139310e7c8b7e245be
4 changes: 2 additions & 2 deletions src/components/drawing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ function gradientWithBounds(sel, gd, gradientID, type, colorscale, prop, start,
stops.exit().remove();
stops.enter().append('stop');

stops.each(function(d) {
stops.each(function (d) {
d3.select(this).attr({
offset: d[0] + '%',
'stop-color': Color.rgb(d[1]),
Expand Down Expand Up @@ -816,7 +816,7 @@ drawing.pattern = function (
patternTransform: isLegend ? 'scale(0.8)' : ''
});

if(bgcolor) {
if (bgcolor) {
var bgRGB = Color.rgb(bgcolor);
var bgAlpha = Color.opacity(bgcolor);

Expand Down
7 changes: 1 addition & 6 deletions src/traces/heatmap/plot.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,12 +542,7 @@ module.exports = function (gd, plotinfo, cdheatmaps, heatmapLayer) {

var fontColor = font.color;
if (!fontColor || fontColor === 'auto') {
fontColor = Color.contrast(
d.z === undefined ? gd._fullLayout.plot_bgcolor :
'rgba(' +
sclFunc(d.z).map(Math.round).join() +
')'
);
fontColor = Color.contrast(d.z === undefined ? gd._fullLayout.plot_bgcolor : `rgba(${sclFunc(d.z).map(Math.round).join()})`);
}

thisLabel
Expand Down
22 changes: 2 additions & 20 deletions test/image/mocks/gl2d_parcoords_style_labels.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
{
"data": [
{
"type": "parcoords",
"labelfont": {
"color": "rgba(255,0,0,0.5)",
"family": "Arial, sans-serif",
"size": 16
},
"rangefont": {
"color": "rgb(0, 131, 161)",
"family": "Times New Roman",
"size": 8
},
"tickfont": {
"color": "green",
"family": "'Open sans', verdana, arial, sans-serif",
"size": 12
},
"dimensions": [
"data": [
{
"type": "parcoords",
"labelfont": {
Expand All @@ -26,7 +8,7 @@
"size": 16
},
"rangefont": {
"color": "hsv(191,191,63)",
"color": "rgb(0, 131, 161)",
"family": "Times New Roman",
"size": 8
},
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.