Fix carpet indexing bug

Author: rreusser

src/plots/plots.js

@@ -700,19 +700,23 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
         }
 
         if(Registry.traceIs(fullTrace, 'carpetDependent')) {
-            carpetDependents.push(fullTrace._expandedIndex);
+            carpetDependents.push(i);
         }
     }
 
-
     for(i = 0; i < carpetDependents.length; i++) {
         fullTrace = dataOut[carpetDependents[i]];
+
+        if(!fullTrace.visible) continue;
+
         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/carpet/lookup_carpetid.js

@@ -17,6 +17,9 @@ module.exports = function(gd, trace) {
     var firstAxis;
     for(var i = 0; i < n; i++) {
         var maybeCarpet = gd._fullData[i];
+
+        if(maybeCarpet.index === trace.index) continue;
+
         if(maybeCarpet.type === 'carpet') {
             if(!firstAxis) {
                 firstAxis = maybeCarpet;