Changes to make redrawObjs work by convention

Wayne Douglas · Wayne Douglas · commit 23fdd7034f14 · 2018-07-19T09:17:01.000Z
diff --git a/src/components/annotations/index.js b/src/components/annotations/index.js
@@ -15,7 +15,8 @@ var clickModule = require('./click');
 module.exports = {
     moduleType: 'component',
     name: 'annotations',
-
+    isDrawable: true,
+    
     layoutAttributes: require('./attributes'),
     supplyLayoutDefaults: require('./defaults'),
     includeBasePlot: require('../../plots/cartesian/include_components')('annotations'),
diff --git a/src/components/images/index.js b/src/components/images/index.js
@@ -11,12 +11,14 @@
 module.exports = {
     moduleType: 'component',
     name: 'images',
-
+    isDrawable: true,
+    
     layoutAttributes: require('./attributes'),
     supplyLayoutDefaults: require('./defaults'),
     includeBasePlot: require('../../plots/cartesian/include_components')('images'),
 
     draw: require('./draw'),
+    drawOne: require('./draw'),
 
     convertCoords: require('./convert_coords')
 };
diff --git a/src/components/shapes/index.js b/src/components/shapes/index.js
@@ -14,6 +14,7 @@ var drawModule = require('./draw');
 module.exports = {
     moduleType: 'component',
     name: 'shapes',
+    isDrawable: true,
 
     layoutAttributes: require('./attributes'),
     supplyLayoutDefaults: require('./defaults'),
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js
@@ -615,9 +615,11 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         // annotations and shapes 'draw' method is slow,
         // use the finer-grained 'drawOne' method instead
 
-        redrawObjs(gd._fullLayout.annotations || [], Registry.getComponentMethod('annotations', 'drawOne'));
-        redrawObjs(gd._fullLayout.shapes || [], Registry.getComponentMethod('shapes', 'drawOne'));
-        redrawObjs(gd._fullLayout.images || [], Registry.getComponentMethod('images', 'draw'), true);
+        var componentsNeedingRedraw = Registry.getModules('component', true);
+        componentsNeedingRedraw.forEach(function(item){
+            // only issue here is that we cam't short circuit images
+            redrawObjs(gd._fullLayout[item.name] || [], Registry.getComponentMethod(item.name, 'drawOne'));
+        });
     }
 
     function doubleClick() {
diff --git a/src/plots/cartesian/transition_axes.js b/src/plots/cartesian/transition_axes.js
@@ -108,9 +108,11 @@ module.exports = function transitionAxes(gd, newLayout, transitionOpts, makeOnCo
             }
         }
 
-        redrawObjs(fullLayout.annotations || [], Registry.getComponentMethod('annotations', 'drawOne'));
-        redrawObjs(fullLayout.shapes || [], Registry.getComponentMethod('shapes', 'drawOne'));
-        redrawObjs(fullLayout.images || [], Registry.getComponentMethod('images', 'draw'), true);
+        var componentsNeedingRedraw = Registry.getModules('component', true);
+        componentsNeedingRedraw.forEach(function(item){
+            // only issue here is that we cam't short circuit images
+            redrawObjs(gd._fullLayout[item.name] || [], Registry.getComponentMethod(item.name, 'drawOne'));
+        });
     }
 
     if(!affectedSubplots.length) {
@@ -142,9 +144,11 @@ module.exports = function transitionAxes(gd, newLayout, transitionOpts, makeOnCo
             }
         }
 
-        redrawObjs(fullLayout.annotations || [], Registry.getComponentMethod('annotations', 'drawOne'));
-        redrawObjs(fullLayout.shapes || [], Registry.getComponentMethod('shapes', 'drawOne'));
-        redrawObjs(fullLayout.images || [], Registry.getComponentMethod('images', 'draw'), true);
+        var componentsNeedingRedraw = Registry.getModules('component', true);
+        componentsNeedingRedraw.forEach(function(item){
+            // only issue here is that we cam't short circuit images
+            redrawObjs(gd._fullLayout[item.name] || [], Registry.getComponentMethod(item.name, 'drawOne'));
+        });
     }
 
     function unsetSubplotTransform(subplot) {
diff --git a/src/registry.js b/src/registry.js

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,11 @@ module.exports = function transitionAxes(gd, newLayout, transitionOpts, makeOnCo`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- redrawObjs(fullLayout.annotations \|\| [], Registry.getComponentMethod('annotations', 'drawOne'));`
`112`		`- redrawObjs(fullLayout.shapes \|\| [], Registry.getComponentMethod('shapes', 'drawOne'));`
`113`		`- redrawObjs(fullLayout.images \|\| [], Registry.getComponentMethod('images', 'draw'), true);`
	`111`	`+ var componentsNeedingRedraw = Registry.getModules('component', true);`
	`112`	`+ componentsNeedingRedraw.forEach(function(item){`
	`113`	`+ // only issue here is that we cam't short circuit images`
	`114`	`+ redrawObjs(gd._fullLayout[item.name] \|\| [], Registry.getComponentMethod(item.name, 'drawOne'));`
	`115`	`+ });`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`if(!affectedSubplots.length) {`
`@@ -142,9 +144,11 @@ module.exports = function transitionAxes(gd, newLayout, transitionOpts, makeOnCo`
`142`	`144`	`}`
`143`	`145`	`}`
`144`	`146`
`145`		`- redrawObjs(fullLayout.annotations \|\| [], Registry.getComponentMethod('annotations', 'drawOne'));`
`146`		`- redrawObjs(fullLayout.shapes \|\| [], Registry.getComponentMethod('shapes', 'drawOne'));`
`147`		`- redrawObjs(fullLayout.images \|\| [], Registry.getComponentMethod('images', 'draw'), true);`
	`147`	`+ var componentsNeedingRedraw = Registry.getModules('component', true);`
	`148`	`+ componentsNeedingRedraw.forEach(function(item){`
	`149`	`+ // only issue here is that we cam't short circuit images`
	`150`	`+ redrawObjs(gd._fullLayout[item.name] \|\| [], Registry.getComponentMethod(item.name, 'drawOne'));`
	`151`	`+ });`
`148`	`152`	`}`
`149`	`153`
`150`	`154`	`function unsetSubplotTransform(subplot) {`