Refactor handleClick() signature to be consistent with handleTitleClick

alexshoe · alexshoe · commit 0cde8081d611 · 2026-02-05T13:29:57.000-05:00
diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js
@@ -520,7 +520,14 @@ function getTraceWidth(d, legendObj, textGap) {
 }
 
 function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
+     var fullLayout = gd._fullLayout;
     var trace = legendItem.data()[0][0].trace;
+    var legendId = trace.legend || 'legend';
+    var legendObj = fullLayout[legendId];
+
+    var itemClick = legendObj.itemclick;
+    var itemDoubleClick = legendObj.itemdoubleclick;
+
     var evtData = {
         event: evt,
         node: legendItem.node(),
@@ -531,7 +538,7 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
         frames: gd._transitionData._frames,
         config: gd._context,
         fullData: gd._fullData,
-        fullLayout: gd._fullLayout
+        fullLayout: fullLayout
     };
 
     if(trace._group) {
@@ -545,15 +552,17 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
         if(clickVal === false) return;
         legend._clickTimeout = setTimeout(function() {
             if(!gd._fullLayout) return;
-            handleClick(legendItem, gd, numClicks);
+            if(itemClick) handleClick(legendItem, gd, legendObj, itemClick);
         }, gd._context.doubleClickDelay);
     } else if(numClicks === 2) {
         if(legend._clickTimeout) clearTimeout(legend._clickTimeout);
         gd._legendMouseDownTime = 0;
 
         var dblClickVal = Events.triggerHandler(gd, 'plotly_legenddoubleclick', evtData);
         // Activate default double click behaviour only when both single click and double click values are not false
-        if(dblClickVal !== false && clickVal !== false) handleClick(legendItem, gd, numClicks);
+        if(dblClickVal !== false && clickVal !== false && itemDoubleClick) {
+            handleClick(legendItem, gd, legendObj, itemDoubleClick);
+        }
     }
 }
 
@@ -1136,4 +1145,3 @@ function getYanchor(legendObj) {
         Lib.isMiddleAnchor(legendObj) ? 'middle' :
         'top';
 }
-
diff --git a/src/components/legend/handle_click.js b/src/components/legend/handle_click.js
@@ -7,36 +7,24 @@ var helpers = require('./helpers');
 
 var SHOWISOLATETIP = true;
 
-exports.handleClick = function handleClick(g, gd, numClicks) {
+exports.handleClick = function handleClick(g, gd, legendObj, mode) {
     var fullLayout = gd._fullLayout;
 
     if(gd._dragged || gd._editing) return;
 
-
-    const legendItem = g.data()[0][0];
+    var legendItem = g.data()[0][0];
     if(legendItem.groupTitle && legendItem.noClick) return;
 
-    const legendId = legendItem.trace.legend || 'legend';
-    const legendObj = fullLayout[legendId];
-
-    const itemClick = legendObj.itemclick;
-    const itemDoubleClick = legendObj.itemdoubleclick;
-    const groupClick = legendObj.groupclick;
+    var groupClick = legendObj.groupclick;
 
-    if(numClicks === 1 && itemClick === 'toggle' && itemDoubleClick === 'toggleothers' &&
+    // Show isolate tip on first single click when default behavior is active
+    if(mode === 'toggle' && legendObj.itemdoubleclick === 'toggleothers' &&
         SHOWISOLATETIP && gd.data && gd._context.showTips
     ) {
         Lib.notifier(Lib._(gd, 'Double-click on legend to isolate one trace'), 'long');
         SHOWISOLATETIP = false;
-    } else {
-        SHOWISOLATETIP = false;
     }
 
-    var mode;
-    if(numClicks === 1) mode = itemClick;
-    else if(numClicks === 2) mode = itemDoubleClick;
-    if(!mode) return;
-
     var toggleGroup = groupClick === 'togglegroup';
 
     var hiddenSlices = fullLayout.hiddenlabels ?
