Merge pull request #4326 from plotly/fix-subbundles

Fix plotlyjs sub-bundles

Author: etpinard

shelly/plotlyjs/static/plotlyjs/src/graph_obj.js

@@ -150,6 +150,7 @@ plots.registerSubplot = function(subplotType, attr, idRoot, attributes) {
 
 // TODO separate the 'find subplot' step from the 'get subplot ids' step
 plots.getSubplotIds = function getSubplotIds(layout, type) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
 
     // layout must be 'fullLayout' here
     if(type === 'cartesian') {
@@ -170,6 +171,8 @@ plots.getSubplotIds = function getSubplotIds(layout, type) {
 };
 
 plots.getSubplotIdsInData = function getSubplotsInData(data, type) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
+
     var attr = plots.subplotsRegistry[type].attr,
         subplotIds = [],
         trace;
@@ -185,6 +188,8 @@ plots.getSubplotIdsInData = function getSubplotsInData(data, type) {
 };
 
 plots.getSubplotData = function getSubplotData(data, type, subplotId) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
+
     var attr = plots.subplotsRegistry[type].attr,
         subplotData = [],
         trace;

shelly/plotlyjs/static/plotlyjs/src/plotschema.js

@@ -264,15 +264,23 @@ function getSubplotRegistry(traceType) {
 function handleSubplotObjs(layoutAttributes) {
     var subplotsRegistry = Plotly.Plots.subplotsRegistry;
 
-    var gl3dRegex = subplotsRegistry.gl3d.attrRegex,
-        geoRegex = subplotsRegistry.geo.attrRegex,
-        xaxisRegex = subplotsRegistry.cartesian.attrRegex.x,
-        yaxisRegex = subplotsRegistry.cartesian.attrRegex.y;
-
     Object.keys(layoutAttributes).forEach(function(k) {
-        if(gl3dRegex.test(k) || geoRegex.test(k) || xaxisRegex.test(k) || yaxisRegex.test(k)) {
-             layoutAttributes[k][IS_SUBPLOT_OBJ] = true;
-        }
+        Object.keys(subplotsRegistry).forEach(function(subplotType) {
+            var subplotRegistry = subplotsRegistry[subplotType],
+                isSubplotObj;
+
+            if(subplotType === 'cartesian') {
+                isSubplotObj = (
+                    subplotRegistry.attrRegex.x.test(k) ||
+                    subplotRegistry.attrRegex.y.test(k)
+                );
+            }
+            else {
+                isSubplotObj = subplotRegistry.attrRegex.test(k);
+            }
+
+            if(isSubplotObj) layoutAttributes[k][IS_SUBPLOT_OBJ] = true;
+        });
     });
 
     return layoutAttributes;