better autosizing rules

Author: cpsievert

R/plotly.R

@@ -139,10 +139,10 @@ plot_ly <- function(data = data.frame(), ..., type = NULL,
     # we always deal with a _list_ of traces and _list_ of layouts 
     # since they can each have different data
     layout = list(
-        width = width, 
-        height = height,
-        # sane margin defaults (mainly for RStudio)
-        margin = list(b = 40, l = 60, t = 25, r = 10)
+      width = width, 
+      height = height,
+      # sane margin defaults (mainly for RStudio)
+      margin = list(b = 40, l = 60, t = 25, r = 10)
     ),
     source = source
   )
@@ -228,7 +228,7 @@ plot_geo <- function(data = data.frame(), ...) {
 #' 
 
 as_widget <- function(x, ...) {
-  if (inherits(x, "htmlwidget")) return(x)
+  if (inherits(x, "htmlwidget")) x <- x[["x"]]
   # add plotly class mainly for printing method
   # customize the JSON serializer (for htmlwidgets)
   attr(x, 'TOJSON_FUNC') <- to_JSON

R/plotly_build.R

@@ -327,7 +327,8 @@ plotly_build.plotly <- function(p) {
   p <- verify_webgl(p)
   # make sure plots don't get sent out of the network (for enterprise)
   p$x$base_url <- get_domain()
-  p
+  
+  as_widget(p)
 }
 
 # ----------------------------------------------------------------

inst/htmlwidgets/plotly.js

@@ -14,9 +14,9 @@ HTMLWidgets.widget({
   },
 
   resize: function(el, width, height, instance) {
-    if (instance.autosize) {
-      Plotly.relayout(el.id, {width: width, height: height});
-    }
+    var width = instance.width || width;
+    var height = instance.height || height;
+    Plotly.relayout(el.id, {width: width, height: height});
   },  
 
   renderValue: function(el, x, instance) {
@@ -30,14 +30,16 @@ HTMLWidgets.widget({
     }
 
     var graphDiv = document.getElementById(el.id);
+    var layout = x.layout || {};
 
     // if no plot exists yet, create one with a particular configuration
     if (!instance.plotly) {
-      var plot = Plotly.plot(graphDiv, x.data, x.layout, x.config);
+      var plot = Plotly.plot(graphDiv, x.data, layout, x.config);
       instance.plotly = true;
-      instance.autosize = x.layout.autosize;
+      instance.height = layout.height;
+      instance.width = layout.width;
     } else {
-      var plot = Plotly.newPlot(graphDiv, x.data, x.layout);
+      var plot = Plotly.newPlot(graphDiv, x.data, layout);
     }
 
     sendEventData = function(eventType) {