apply sizes in plot and image test

archmoj · archmoj · commit 877356b54dcc · 2020-03-29T20:24:29.000-04:00
diff --git a/src/plot_api/to_image.js b/src/plot_api/to_image.js
@@ -121,6 +121,13 @@ function toImage(gd, opts) {
 
     var fullOpts = {};
 
+    var template = layout.template;
+    if(Lib.isPlainObject(template)) {
+        fullOpts.template = template;
+        fullOpts._template = template.layout;
+        fullOpts._dataTemplate = template.data;
+    }
+
     function coerce(attr, dflt) {
         return Lib.coerce(opts, fullOpts, attrs, attr, dflt);
     }
@@ -169,8 +176,8 @@ function toImage(gd, opts) {
     function convert() {
         return new Promise(function(resolve, reject) {
             var svg = toSVG(clonedGd, format, scale);
-            var width = clonedGd._fullLayout.width;
-            var height = clonedGd._fullLayout.height;
+            var _width = clonedGd._fullLayout.width;
+            var _height = clonedGd._fullLayout.height;
 
             function cleanup() {
                 plotApi.purge(clonedGd);
@@ -204,8 +211,8 @@ function toImage(gd, opts) {
 
             svgToImg({
                 format: format,
-                width: width,
-                height: height,
+                width: _width,
+                height: _height,
                 scale: scale,
                 canvas: canvas,
                 svg: svg,
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1490,7 +1490,9 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
     // to pass through the autosize routine
     //
     // This behavior is subject to change in v2.
-    coerce('autosize', !(layoutIn.width && layoutIn.height));
+    var hasWidth = !!(layoutIn.width || (layoutOut._template || {}).width);
+    var hasHeight = !!(layoutIn.height || (layoutOut._template || {}).height);
+    coerce('autosize', !(hasWidth && hasHeight));
 
     coerce('width');
     coerce('height');
@@ -1501,7 +1503,7 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
     coerce('margin.pad');
     coerce('margin.autoexpand');
 
-    if(layoutIn.width && layoutIn.height) plots.sanitizeMargins(layoutOut);
+    if(hasWidth && hasHeight) plots.sanitizeMargins(layoutOut);
 
     Registry.getComponentMethod('grid', 'sizeDefaults')(layoutIn, layoutOut);
 
diff --git a/test/image/assets/get_image_request_options.js b/test/image/assets/get_image_request_options.js
@@ -23,6 +23,14 @@ module.exports = function getRequestOpts(specs) {
         scale: specs.scale || DEFAULT_SCALE
     };
 
+    var layout = figure.layout || {};
+    var tempLayout = (layout.template || {}).layout || {};
+    var autosize = layout.autosize || tempLayout.autosize;
+    if(autosize !== true) {
+        body.width = layout.width || tempLayout.width;
+        body.height = layout.height || tempLayout.height;
+    }
+
     if(specs.width) body.width = specs.width;
     if(specs.height) body.height = specs.height;
 
