Updated colors to handle isDark correctly for label colrs

Chirag-ION · Chirag-ION · commit bf9f9158c68d · 2021-08-05T13:01:38.000+05:30
Added support for custom legend tooltips
diff --git a/src/components/color/index.js b/src/components/color/index.js
@@ -74,9 +74,14 @@ color.contrast = function(cstr, lightAmount, darkAmount) {
 
     if(tc.getAlpha() !== 1) tc = tinycolor(color.combine(cstr, background));
 
-    var newColor = tc.isDark() ?
-        (lightAmount ? tc.lighten(lightAmount) : background) :
-        (darkAmount ? tc.darken(darkAmount) : defaultLine);
+    //isDark logic updated to match with Less contrast function as tinycolor rely on brightness instead of luminance
+
+    var isDark = (tc.getLuminance() < 0.43);
+
+    // changing color to match ION specific contrast color black and white
+    var newColor = isDark ?
+        (lightAmount ? tc.lighten(lightAmount) : "#fff") :
+        (darkAmount ? tc.darken(darkAmount) : "#000");
 
     return newColor.toString();
 };
diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js
@@ -397,13 +397,16 @@ function drawTexts(g, gd, opts) {
     var maxNameLength = opts._maxNameLength;
 
     var name;
+    var legendTooltip;
     if(!opts.entries) {
         name = isPieLike ? legendItem.label : trace.name;
+        legendTooltip = (isPieLike ? legendItem.labelTooltip : trace.legendtooltip) || name;
         if(trace._meta) {
             name = Lib.templateString(name, trace._meta);
         }
     } else {
         name = legendItem.text;
+        legendTooltip = legendItem.labelTooltip || name;
     }
 
     var textEl = Lib.ensureSingle(g, 'text', 'legendtext');
@@ -417,7 +420,8 @@ function drawTexts(g, gd, opts) {
         .call(Drawing.font, opts.font)
         .text(isEditable ? ensureLength(name, maxNameLength) : legendLabel);
 
-    Lib.ensureSingle(g, 'title').text(name.replace("<br>", "\n"));
+    
+    Lib.ensureSingle(g, 'title').text(legendTooltip.replace("<br>", "\n"));
 
     svgTextUtils.positionText(textEl, constants.textGap, 0);
 
diff --git a/src/components/legend/get_legend_data.js b/src/components/legend/get_legend_data.js
@@ -52,10 +52,12 @@ module.exports = function getLegendData(calcdata, opts) {
 
             for(j = 0; j < cd.length; j++) {
                 var labelj = cd[j].label;
+                var labeltooltipj = cd[j].labelTooltip;
 
                 if(!slicesShown[lgroup][labelj]) {
                     addOneItem(lgroup, {
                         label: labelj,
+                        labelTooltip: labeltooltipj,
                         color: cd[j].color,
                         i: cd[j].i,
                         trace: trace,
diff --git a/src/plots/attributes.js b/src/plots/attributes.js
@@ -53,6 +53,15 @@ module.exports = {
             'when toggling legend items.'
         ].join(' ')
     },
+    legendtooltip: {
+        valType: 'string',
+        role: 'info',
+        dflt: '',
+        editType: 'style',
+        description: [
+            'Sets the legend tooltip to be displayed on hover'
+        ].join(' ')
+    },
     opacity: {
         valType: 'number',
         role: 'style',
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1332,6 +1332,7 @@ plots.supplyTraceDefaults = function(traceIn, traceOut, colorIndex, layout, trac
             );
 
             coerce('legendgroup');
+            coerce('legendtooltip');
 
             traceOut._dfltShowLegend = true;
         } else {
diff --git a/src/traces/pie/attributes.js b/src/traces/pie/attributes.js
@@ -36,6 +36,14 @@ module.exports = {
             'non-empty entry among all occurrences of the label.'
         ].join(' ')
     },
+    labeltooltips: {
+        valType: 'data_array',
+        editType: 'calc',
+        description: [
+            'Sets the legend tooltips.',
+            
+        ].join(' ')
+    },
     // equivalent of x0 and dx, if label is missing
     label0: {
         valType: 'number',
diff --git a/src/traces/pie/calc.js b/src/traces/pie/calc.js
@@ -22,6 +22,7 @@ function calc(gd, trace) {
     var hiddenLabels = fullLayout.hiddenlabels || [];
 
     var labels = trace.labels;
+    var labelTooltips = trace.labeltooltips;
     var colors = trace.marker.colors || [];
     var vals = trace.values;
     var len = trace._length;
@@ -42,7 +43,7 @@ function calc(gd, trace) {
     var isAggregated = false;
 
     for(i = 0; i < len; i++) {
-        var v, label, hidden;
+        var v, label, labelTooltip, hidden;
         if(hasValues) {
             v = vals[i];
             if(!isNumeric(v)) continue;
@@ -53,6 +54,8 @@ function calc(gd, trace) {
         label = labels[i];
         if(label === undefined || label === '') label = i;
         label = String(label);
+        
+        labelTooltip = labelTooltips && labelTooltips[i] || null;
 
         var thisLabelIndex = allThisTraceLabels[label];
         if(thisLabelIndex === undefined) {
@@ -65,6 +68,7 @@ function calc(gd, trace) {
             cd.push({
                 v: v,
                 label: label,
+                labelTooltip: labelTooltip,
                 color: pullColor(colors[i], label),
                 i: i,
                 pts: [i],
diff --git a/src/traces/pie/defaults.js b/src/traces/pie/defaults.js
@@ -62,6 +62,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
         coerce('label0');
         coerce('dlabel');
     }
+    coerce('labeltooltips');
 
     if(!len) {
         traceOut.visible = false;
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
@@ -1127,6 +1127,7 @@ function formatSliceLabel(gd, pt, cd0) {
         return {
             label: pt.label,
             value: pt.v,
+            labeltooltip: pt.labeltooltip,
             valueLabel: helpers.formatPieValue(pt.v, fullLayout.separators),
             percent: pt.v / cd0.vTotal,
             percentLabel: helpers.formatPiePercent(pt.v / cd0.vTotal, fullLayout.separators),

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {`
`62`	`62`	`coerce('label0');`
`63`	`63`	`coerce('dlabel');`
`64`	`64`	`}`
	`65`	`+ coerce('labeltooltips');`
`65`	`66`
`66`	`67`	`if(!len) {`
`67`	`68`	`traceOut.visible = false;`