Fix carpet/legendonly interaction and isolate mode

Author: rreusser

src/components/legend/draw.js

@@ -510,7 +510,8 @@ function handleClick(g, gd, numClicks) {
 
         for(i = 0; i < fullData.length; i++) {
             allTraces.push(i);
-            traceVisibility.push('legendonly');
+            // For carpet traces in particular, push the current visibility. For others, legendonly:
+            traceVisibility.push(Registry.traceIs(fullData[i], 'notLegendIsolatable') ? fullData[i].visible : 'legendonly');
         }
 
         if(legendgroup === '') {
@@ -542,9 +543,7 @@ function handleClick(g, gd, numClicks) {
             }
             var visibilityUpdates = [];
             for(i = 0; i < fullData.length; i++) {
-                if(!Registry.traceIs(fullData[i], 'notLegendIsolatable')) {
-                    visibilityUpdates.push(allTraces[i]);
-                }
+                visibilityUpdates.push(allTraces[i]);
             }
             Plotly.restyle(gd, 'visible', traceVisibility, visibilityUpdates);
         }

src/plots/plots.js

@@ -709,6 +709,10 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
         fullTrace = dataOut[carpetDependents[i]];
         var carpetAxis = carpetIndex[fullTrace.carpetid];
         fullTrace._carpet = carpetAxis;
+        if(!carpetAxis || !carpetAxis.visible) {
+            fullTrace.visible = false;
+            continue;
+        }
         fullTrace.xaxis = carpetAxis.xaxis;
         fullTrace.yaxis = carpetAxis.yaxis;
     }

src/traces/contourcarpet/calc.js

@@ -28,7 +28,7 @@ var lookupCarpet = require('../carpet/lookup_carpetid');
 // contour maps, because the makeBoundArray calls are too entangled
 module.exports = function calc(gd, trace) {
     var carpet = trace.carpet = lookupCarpet(gd, trace);
-    if(!carpet || !carpet.visible) return;
+    if(!carpet || !carpet.visible || carpet.visible === 'legendonly') return;
 
     if(!trace.a || !trace.b) {
         // Look up the original incoming carpet data:

src/traces/contourcarpet/plot.js

@@ -40,7 +40,7 @@ function plotOne(gd, plotinfo, cd) {
     var carpet = trace.carpet = lookupCarpet(gd, trace);
     var carpetcd = gd.calcdata[carpet.index][0];
 
-    if(!carpet.visible) return;
+    if(!carpet.visible || carpet.visible === 'legendonly') return;
 
     var a = cd[0].a;
     var b = cd[0].b;