add moduleHasFillgradient option to fillColorDefaults

plotly · Mar 5, 2024 · a2400f1 · a2400f1
1 parent d9bd365
commit a2400f1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/src/traces/scatter/defaults.js b/src/traces/scatter/defaults.js
@@ -72,7 +72,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     // We handle that case in some hacky code inside handleStackDefaults.
     coerce('fill', stackGroupOpts ? stackGroupOpts.fillDflt : 'none');
     if(traceOut.fill !== 'none') {
-        handleFillColorDefaults(traceIn, traceOut, defaultColor, coerce);
+        handleFillColorDefaults(traceIn, traceOut, defaultColor, coerce, {
+            moduleHasFillgradient: true
+        });
         if(!subTypes.hasLines(traceOut)) handleLineShapeDefaults(traceIn, traceOut, coerce);
         coercePattern(coerce, 'fillpattern', traceOut.fillcolor, false);
     }

diff --git a/src/traces/scatter/fillcolor_defaults.js b/src/traces/scatter/fillcolor_defaults.js
@@ -12,7 +12,9 @@ function averageColors(colorscale) {
     return color;
 }
 
-module.exports = function fillColorDefaults(traceIn, traceOut, defaultColor, coerce) {
+module.exports = function fillColorDefaults(traceIn, traceOut, defaultColor, coerce, opts) {
+    if(!opts) opts = {};
+
     var inheritColorFromMarker = false;
 
     if(traceOut.marker) {
@@ -28,18 +30,20 @@ module.exports = function fillColorDefaults(traceIn, traceOut, defaultColor, coe
     }
 
     var averageGradientColor;
-    var gradientOrientation = coerce('fillgradient.type');
-    if(gradientOrientation !== 'none') {
-        coerce('fillgradient.start');
-        coerce('fillgradient.stop');
-        var gradientColorscale = coerce('fillgradient.colorscale');
-
-        // if a fillgradient is specified, we use the average gradient color
-        // to specify fillcolor after all other more specific candidates
-        // are considered, but before the global default color.
-        // fillcolor affects the background color of the hoverlabel in this case.
-        if(gradientColorscale) {
-            averageGradientColor = averageColors(gradientColorscale);
+    if(opts.moduleHasFillgradient) {
+        var gradientOrientation = coerce('fillgradient.type');
+        if(gradientOrientation !== 'none') {
+            coerce('fillgradient.start');
+            coerce('fillgradient.stop');
+            var gradientColorscale = coerce('fillgradient.colorscale');
+
+            // if a fillgradient is specified, we use the average gradient color
+            // to specify fillcolor after all other more specific candidates
+            // are considered, but before the global default color.
+            // fillcolor affects the background color of the hoverlabel in this case.
+            if(gradientColorscale) {
+                averageGradientColor = averageColors(gradientColorscale);
+            }
         }
     }