merge conflicts

Author: cpsievert

DESCRIPTION

@@ -21,7 +21,7 @@ URL: https://plot.ly/r, https://cpsievert.github.io/plotly_book/, https://github
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     R (>= 3.2.0),
-    ggplot2 (> 2.1.0)
+    ggplot2 (> 2.1.1)
 Imports:
     scales,
     httr,
@@ -38,7 +38,6 @@ Imports:
     tibble,
     lazyeval (>= 0.2.0),
     crosstalk,
-    colourpicker,
     purrr
 Suggests:
     MASS,
@@ -59,4 +58,6 @@ Suggests:
     listviewer,
     dendextend
 LazyData: true
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
+Remotes:
+  tidyverse/ggplot2

NAMESPACE

@@ -1,9 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(arrange_,plotly)
-S3method(distinct_,plotly)
-S3method(do_,plotly)
-S3method(filter_,plotly)
 S3method(fortify,SharedData)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
@@ -20,22 +16,15 @@ S3method(ggplot,plotly)
 S3method(ggplotly,ggmatrix)
 S3method(ggplotly,ggplot)
 S3method(ggplotly,plotly)
-S3method(group_by_,plotly)
-S3method(groups,plotly)
 S3method(layout,matrix)
 S3method(layout,plotly)
 S3method(layout,shiny.tag.list)
-S3method(mutate_,plotly)
 S3method(plotly_build,gg)
 S3method(plotly_build,list)
 S3method(plotly_build,plotly)
 S3method(print,api_grid)
 S3method(print,api_grid_local)
 S3method(print,api_plot)
-S3method(rename_,plotly)
-S3method(select_,plotly)
-S3method(slice_,plotly)
-S3method(summarise_,plotly)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomArea)
 S3method(to_basic,GeomBoxplot)
@@ -63,8 +52,6 @@ S3method(to_basic,GeomTile)
 S3method(to_basic,GeomViolin)
 S3method(to_basic,GeomVline)
 S3method(to_basic,default)
-S3method(transmute_,plotly)
-S3method(ungroup,plotly)
 export("%>%")
 export(add_annotations)
 export(add_area)
@@ -95,28 +82,34 @@ export(animation_opts)
 export(animation_slider)
 export(arrange)
 export(arrange_)
+export(arrange_.plotly)
 export(as.widget)
 export(as_widget)
 export(colorbar)
 export(config)
 export(distinct)
 export(distinct_)
+export(distinct_.plotly)
 export(do)
 export(do_)
+export(do_.plotly)
 export(download_grid)
 export(download_plot)
 export(embed_notebook)
 export(event_data)
 export(export)
 export(filter)
 export(filter_)
+export(filter_.plotly)
 export(geom2trace)
 export(get_figure)
 export(gg2list)
 export(ggplotly)
 export(group_by)
 export(group_by_)
+export(group_by_.plotly)
 export(groups)
+export(groups.plotly)
 export(hide_colorbar)
 export(hide_guides)
 export(hide_legend)
@@ -127,6 +120,7 @@ export(last_plot)
 export(layout)
 export(mutate)
 export(mutate_)
+export(mutate_.plotly)
 export(offline)
 export(overwrite_grid)
 export(overwrite_plot)
@@ -146,28 +140,32 @@ export(rangeslider)
 export(remove_typedarray_polyfill)
 export(rename)
 export(rename_)
+export(rename_.plotly)
 export(renderPlotly)
 export(schema)
 export(select)
 export(select_)
+export(select_.plotly)
 export(signup)
 export(slice)
 export(slice_)
+export(slice_.plotly)
 export(style)
 export(subplot)
 export(summarise)
 export(summarise_)
+export(summarise_.plotly)
 export(toRGB)
 export(toWebGL)
 export(to_basic)
 export(transmute)
 export(transmute_)
+export(transmute_.plotly)
 export(ungroup)
+export(ungroup.plotly)
 export(upload_grid)
 export(upload_plot)
 import(ggplot2)
-importFrom(Cairo,Cairo)
-importFrom(colourpicker,colourWidget)
 importFrom(dplyr,arrange)
 importFrom(dplyr,arrange_)
 importFrom(dplyr,distinct)
@@ -199,8 +197,10 @@ importFrom(grDevices,extendrange)
 importFrom(graphics,layout)
 importFrom(htmltools,browsable)
 importFrom(htmltools,tagList)
+importFrom(htmltools,tags)
 importFrom(htmlwidgets,createWidget)
 importFrom(htmlwidgets,onRender)
+importFrom(htmlwidgets,prependContent)
 importFrom(htmlwidgets,saveWidget)
 importFrom(htmlwidgets,shinyRenderWidget)
 importFrom(htmlwidgets,shinyWidgetOutput)

NEWS.md

@@ -9,6 +9,7 @@
 * `ggplotly()` gains a new argument, `dynamicTicks`, which allows axis ticks to update upon zoom/pan interactions (fixes #485).
 * Added support for the `GeomCol` and `GeomDotplot` **ggplot2** geoms.
 * Sensible sizing and positioning defaults are now provided for subplots multiple colorbars.
+* R linebreaks are translated to HTML linebreaks (i.e., '\n' translates to '<br />') (fixes #851).
 * Added a `plot_dendro()` function for a quick and dirty interactive dendrogram with support for hierarchial selection. For more, see -- <https://cpsievert.github.io/plotly_book/linking-views-without-shiny.html#nested-selections>
 
 ## BUG FIXES
@@ -17,7 +18,7 @@
 
 ## CHANGES
 
-* Upgraded to plotly.js v1.20.5 -- https://github.com/plotly/plotly.js/releases/tag/v1.20.5
+* Upgraded to plotly.js v1.22.0 -- https://github.com/plotly/plotly.js/releases/tag/v1.22.0
 * `HTMLwidgets.renderValue()` now calls `Plotly.redraw()` instead of `Plotly.newPlot()`. (thanks @AleksandrIanevski)
 * A TypedArray polyfill is now included by default, and the function `remove_typedarray_polyfill()` was added to make it easy to remove it. Fixes #824.
 * If no graphics device is already open, `ggplotly()` now tries to open/close a Cairo graphics device, then a bitmap (png/jpeg) device. If neither is available, it errors. This helps to ensure that a *screen* device is never opened by `ggplotly()` (which fixes #829). Furthermore, if `width`/`height` is not specified *and* no graphics device is currently open, a default of 640/480 is used for width/height of the device. 

R/ggplotly.R

@@ -219,9 +219,8 @@ gg2list <- function(p, width = NULL, height = NULL,
 
   # Initialise panels, add extra data for margins & missing facetting
   # variables, and add on a PANEL variable to data
-  layout <- ggfun("create_layout")(plot$facet)
-  data <- layout$setup(layer_data, plot$data, plot$plot_env, plot$coordinates)
-  data <- layout$map(data)
+  layout <- ggfun("create_layout")(plot$facet, plot$coordinates)
+  data <- layout$setup(layer_data, plot$data, plot$plot_env)
 
   # save the domain of the group for display in tooltips
   groupDomains <- Map(function(x, y) {
@@ -344,6 +343,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   # displayed, or does it include the range of underlying data
   layout$reset_scales()
   layout$train_position(data, scale_x(), scale_y())
+  layout$setup_panel_params()
   data <- layout$map_position(data)
 
   # Train and map non-position scales
@@ -364,9 +364,6 @@ gg2list <- function(p, width = NULL, height = NULL,
     data <- lapply(data, ggfun("scales_map_df"), scales = npscales)
   }
 
-  # Train coordinate system
-  layout$train_ranges(plot$coordinates)
-  
   # Fill in defaults etc.
   data <- by_layer(function(l, d) l$compute_geom_2(d))
 
@@ -410,51 +407,51 @@ gg2list <- function(p, width = NULL, height = NULL,
   # https://github.com/plotly/plotly.js/blob/dd1547/src/components/modebar/index.js#L171
   gglayout$margin$t <- gglayout$margin$t + 16
 
-  # important stuff like layout$panel_ranges is already flipped, but
+  # important stuff like layout$panel_params is already flipped, but
   # plot$scales/plot$labels/data aren't. We flip x/y trace data at the very end
   # and scales in the axis loop below.
   if (inherits(plot$coordinates, "CoordFlip")) {
     plot$labels[c("x", "y")] <- plot$labels[c("y", "x")]
   }
 
   # important panel summary stats
-  nPanels <- nrow(layout$panel_layout)
-  nRows <- max(layout$panel_layout$ROW)
-  nCols <- max(layout$panel_layout$COL)
+  nPanels <- nrow(layout$layout)
+  nRows <- max(layout$layout$ROW)
+  nCols <- max(layout$layout$COL)
 
   # panel -> plotly.js axis/anchor info
   # (assume a grid layout by default)
-  layout$panel_layout$xaxis <- layout$panel_layout$COL
-  layout$panel_layout$yaxis <- layout$panel_layout$ROW
-  layout$panel_layout$xanchor <- nRows
-  layout$panel_layout$yanchor <- 1
+  layout$layout$xaxis <- layout$layout$COL
+  layout$layout$yaxis <- layout$layout$ROW
+  layout$layout$xanchor <- nRows
+  layout$layout$yanchor <- 1
   if (inherits(plot$facet, "FacetWrap")) {
     if (plot$facet$params$free$x) {
-      layout$panel_layout$xaxis <- layout$panel_layout$PANEL
-      layout$panel_layout$xanchor <- layout$panel_layout$ROW
+      layout$layout$xaxis <- layout$layout$PANEL
+      layout$layout$xanchor <- layout$layout$ROW
     }
     if (plot$facet$params$free$y) {
-      layout$panel_layout$yaxis <- layout$panel_layout$PANEL
-      layout$panel_layout$yanchor <- layout$panel_layout$COL
-      layout$panel_layout$xanchor <- nPanels
+      layout$layout$yaxis <- layout$layout$PANEL
+      layout$layout$yanchor <- layout$layout$COL
+      layout$layout$xanchor <- nPanels
     }
     if (plot$facet$params$free$x && plot$facet$params$free$y) {
-      layout$panel_layout$xaxis <- layout$panel_layout$PANEL
-      layout$panel_layout$yaxis <- layout$panel_layout$PANEL
-      layout$panel_layout$xanchor <- layout$panel_layout$PANEL
-      layout$panel_layout$yanchor <- layout$panel_layout$PANEL
+      layout$layout$xaxis <- layout$layout$PANEL
+      layout$layout$yaxis <- layout$layout$PANEL
+      layout$layout$xanchor <- layout$layout$PANEL
+      layout$layout$yanchor <- layout$layout$PANEL
     }
   }
   # format the axis/anchor to a format plotly.js respects
-  layout$panel_layout$xaxis <- paste0("xaxis", sub("^1$", "", layout$panel_layout$xaxis))
-  layout$panel_layout$yaxis <- paste0("yaxis", sub("^1$", "", layout$panel_layout$yaxis))
-  layout$panel_layout$xanchor <- paste0("y", sub("^1$", "", layout$panel_layout$xanchor))
-  layout$panel_layout$yanchor <- paste0("x", sub("^1$", "", layout$panel_layout$yanchor))
+  layout$layout$xaxis <- paste0("xaxis", sub("^1$", "", layout$layout$xaxis))
+  layout$layout$yaxis <- paste0("yaxis", sub("^1$", "", layout$layout$yaxis))
+  layout$layout$xanchor <- paste0("y", sub("^1$", "", layout$layout$xanchor))
+  layout$layout$yanchor <- paste0("x", sub("^1$", "", layout$layout$yanchor))
   # for some layers2traces computations, we need the range of each panel
-  layout$panel_layout$x_min <- sapply(layout$panel_ranges, function(z) min(z$x.range))
-  layout$panel_layout$x_max <- sapply(layout$panel_ranges, function(z) max(z$x.range))
-  layout$panel_layout$y_min <- sapply(layout$panel_ranges, function(z) min(z$y.range))
-  layout$panel_layout$y_max <- sapply(layout$panel_ranges, function(z) max(z$y.range))
+  layout$layout$x_min <- sapply(layout$panel_params, function(z) min(z$x.range))
+  layout$layout$x_max <- sapply(layout$panel_params, function(z) max(z$x.range))
+  layout$layout$y_min <- sapply(layout$panel_params, function(z) min(z$y.range))
+  layout$layout$y_max <- sapply(layout$panel_params, function(z) max(z$y.range))
 
   # layers -> plotly.js traces
   plot$tooltip <- tooltip
@@ -464,7 +461,7 @@ gg2list <- function(p, width = NULL, height = NULL,
 
   # reattach crosstalk key-set attribute
   data <- Map(function(x, y) structure(x, set = y), data, sets)
-  traces <- layers2traces(data, prestats_data, layout$panel_layout, plot)
+  traces <- layers2traces(data, prestats_data, layout$layout, plot)
 
   # default to just the text in hover info, mainly because of this
   # https://github.com/plotly/plotly.js/issues/320
@@ -509,7 +506,7 @@ gg2list <- function(p, width = NULL, height = NULL,
       )
       # allocate enough space for the _longest_ text label
       axisTextX <- theme[["axis.text.x"]] %||% theme[["axis.text"]]
-      labz <- unlist(lapply(layout$panel_ranges, "[[", "x.labels"))
+      labz <- unlist(lapply(layout$panel_params, "[[", "x.labels"))
       lab <- labz[which.max(nchar(labz))]
       panelMarginY <- panelMarginY + axisTicksX +
         bbox(lab, axisTextX$angle, unitConvert(axisTextX, "npc", "height"))[["height"]]
@@ -521,7 +518,7 @@ gg2list <- function(p, width = NULL, height = NULL,
       )
       # allocate enough space for the _longest_ text label
       axisTextY <- theme[["axis.text.y"]] %||% theme[["axis.text"]]
-      labz <- unlist(lapply(layout$panel_ranges, "[[", "y.labels"))
+      labz <- unlist(lapply(layout$panel_params, "[[", "y.labels"))
       lab <- labz[which.max(nchar(labz))]
       panelMarginX <- panelMarginX + axisTicksY +
         bbox(lab, axisTextY$angle, unitConvert(axisTextY, "npc", "width"))[["width"]]
@@ -534,7 +531,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   doms <- get_domains(nPanels, nRows, margins)
 
   for (i in seq_len(nPanels)) {
-    lay <- layout$panel_layout[i, ]
+    lay <- layout$layout[i, ]
     for (xy in c("x", "y")) {
       # find axis specific theme elements that inherit from their parent
       theme_el <- function(el) {
@@ -549,8 +546,8 @@ gg2list <- function(p, width = NULL, height = NULL,
 
       axisName <- lay[, paste0(xy, "axis")]
       anchor <- lay[, paste0(xy, "anchor")]
-      rng <- layout$panel_ranges[[i]]
-      # stuff like layout$panel_ranges is already flipped, but scales aren't
+      rng <- layout$panel_params[[i]]
+      # stuff like layout$panel_params is already flipped, but scales aren't
       sc <- if (inherits(plot$coordinates, "CoordFlip")) {
         scales$get_scales(setdiff(c("x", "y"), xy))
       } else {
@@ -598,6 +595,7 @@ gg2list <- function(p, width = NULL, height = NULL,
         if (i == 1) {
           traces <- lapply(traces, function(z) { z[[xy]] <- z[[xy]] * 86400000; z })
         }
+        axisObj$type <- "date"
       }
       # tickvals are currently on 0-1 scale, but we want them on data scale
       axisObj$tickvals <- scales::rescale(
@@ -930,7 +928,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   l$attrs <- setNames(mappingFormulas, ids)
   l$attrs <- lapply(l$attrs, function(x) structure(x, class = "plotly_eval"))
   # the build step removes the first attrs if no type exists
-  l$attrs[[1]][["type"]] <- "ggplotly"
+  l$attrs[[1]][["type"]] <- l$data[[1]][["type"]] %||% "scatter"
 
   l$cur_data <- ids[[layerData]]
   l$visdat <- setNames(lapply(return_dat, function(x) function(y) x), ids)