From 3844fe1a7ea0816890f97c14a87025dc5732de85 Mon Sep 17 00:00:00 2001
From: Fredric Johansson <fredric@fredricj.se>
Date: Wed, 16 Feb 2022 10:20:54 +0100
Subject: [PATCH 1/2] Support hovertemplate on hoveron: fills

Scatter trace currently doesn't hovertemplate on hoveron: fills. Change this to allow hovertemplate on fills when mode=='lines'
---
 src/traces/scatter/defaults.js | 2 +-
 src/traces/scatter/hover.js    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/traces/scatter/defaults.js b/src/traces/scatter/defaults.js
index 0450df06fa9..a3029f69475 100644
--- a/src/traces/scatter/defaults.js
+++ b/src/traces/scatter/defaults.js
@@ -76,7 +76,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         dfltHoverOn.push('fills');
     }
     coerce('hoveron', dfltHoverOn.join('+') || 'points');
-    if(traceOut.hoveron !== 'fills') coerce('hovertemplate');
+    coerce('hovertemplate', false);
     var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
     errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'y'});
     errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'x', inherit: 'y'});
diff --git a/src/traces/scatter/hover.js b/src/traces/scatter/hover.js
index c86a5b902f8..138e876ebe6 100644
--- a/src/traces/scatter/hover.js
+++ b/src/traces/scatter/hover.js
@@ -184,7 +184,10 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
             else if(Color.opacity((trace.line || {}).color)) {
                 color = trace.line.color;
             }
-
+            var hovertemplate = false;
+            if (trace.mode === 'lines') {
+                hovertemplate = trace.hovertemplate
+            }
             Lib.extendFlat(pointData, {
                 // never let a 2D override 1D type as closest point
                 // also: no spikeDistance, it's not allowed for fills
@@ -194,7 +197,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
                 y0: yAvg,
                 y1: yAvg,
                 color: color,
-                hovertemplate: false
+                hovertemplate: hovertemplate,
             });
 
             delete pointData.index;

From a0a1bce4e634cb53585612c3be17877bba72d3e2 Mon Sep 17 00:00:00 2001
From: Fredric Johansson <fredric@fredricj.se>
Date: Wed, 23 Feb 2022 11:24:26 +0100
Subject: [PATCH 2/2] Adjust codestyle

---
 src/traces/scatter/hover.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/traces/scatter/hover.js b/src/traces/scatter/hover.js
index 138e876ebe6..2414dbf0b08 100644
--- a/src/traces/scatter/hover.js
+++ b/src/traces/scatter/hover.js
@@ -185,8 +185,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
                 color = trace.line.color;
             }
             var hovertemplate = false;
-            if (trace.mode === 'lines') {
-                hovertemplate = trace.hovertemplate
+            if(trace.mode === 'lines') {
+                hovertemplate = trace.hovertemplate;
             }
             Lib.extendFlat(pointData, {
                 // never let a 2D override 1D type as closest point