Merge branch 'master' into feature/proxy

Author: cpsievert

NEWS.md

@@ -9,6 +9,8 @@
 
 ## BUG FIXES
 
+* The default sizing in `ggplotly()` is no longer fixed to the device size inside RStudio. Fixes #1033.
+* `event_data("plotly_relayout")` no longer fires `NULL` for any event. Fixes #1039.
 
 
 # 4.7.0

R/ggplotly.R

@@ -172,11 +172,10 @@ gg2list <- function(p, width = NULL, height = NULL,
   # https://github.com/att/rcloud.htmlwidgets/issues/2
 
   # Note that we never have to open a non-interactive device 
-  # in RStudio since it ships with one...
+  # in RStudio since it ships with one. Plus, calling dev.size()
+  # adds it to dev.list() & should ensure grid can query the correct device size
   rStudioDevSize <- if (is_rstudio()) grDevices::dev.size("px")
-  width <- width %||% rStudioDevSize[1]
-  height <- height %||% rStudioDevSize[2]
-  # note that calling dev.size() (inside RStudio) will add it to the list
+  
   if (is.null(grDevices::dev.list())) {
     dev_fun <- if (system.file(package = "Cairo") != "") {
       Cairo::Cairo
@@ -198,7 +197,6 @@ gg2list <- function(p, width = NULL, height = NULL,
     on.exit(grDevices::dev.off(), add = TRUE)
   }
 
-  
   # check the value of dynamicTicks
   dynamicValues <- c(FALSE, TRUE, "x", "y")
   if (length(setdiff(dynamicTicks, dynamicValues))) {