Resolve conflicts

Merge branch 'master' of https://github.com/ropensci/plotly into ropensci-master

# Conflicts:
#	DESCRIPTION
#	R/sysdata.rda
#	inst/docker/Dockerfile.vtest
#	inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

Author: chschan

.gitignore

@@ -17,3 +17,5 @@ rsconnect/
 revdep/
 travis_debug.R
 .httr-oauth
+tests/testthat/Rplots.pdf
+inst/examples/shiny/event_data/tests/shinytest/mytest-current/

DESCRIPTION

@@ -15,6 +15,8 @@ Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "marianne.corvellec@igdore.org", comment = c(ORCID = "0000-0002-1994-3581")),
     person("Pedro", "Despouy", role = "aut",
     email = "pedro@plot.ly"),
+    person("Salim", "Brüggemann", role = "ctb",
+    email = "salim-b@pm.me", comment = c(ORCID = "0000-0002-5329-5987")),
     person("Plotly Technologies Inc.", role = "cph"))
 License: MIT + file LICENSE
 Description: Create interactive web graphics from 'ggplot2' graphs and/or a custom interface to the (MIT-licensed) JavaScript library 'plotly.js' inspired by the grammar of graphics.
@@ -33,11 +35,11 @@ Imports:
     viridisLite,
     base64enc,
     htmltools (>= 0.3.6),
-    htmlwidgets (>= 1.3),
+    htmlwidgets (>= 1.5.2.9001),
     tidyr,
-    hexbin,
     RColorBrewer,
     dplyr,
+    vctrs,
     tibble,
     lazyeval (>= 0.2.0),
     rlang,
@@ -48,6 +50,7 @@ Imports:
 Suggests:
     MASS,
     maps,
+    hexbin,
     ggthemes,
     GGally,
     testthat,
@@ -70,12 +73,13 @@ Suggests:
     IRdisplay,
     processx,
     plotlyGeoAssets,
-    forcats
+    forcats,
+    thematic,
+    palmerpenguins
 LazyData: true
-<<<<<<< HEAD
-RoxygenNote: 7.0.2
-=======
-RoxygenNote: 7.1.0
->>>>>>> c19594b1fb54b28952895344fec3ad0060a1c646
+RoxygenNote: 7.1.1
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
+Remotes: 
+  rstudio/thematic,
+  Displayr/htmlwidgets

NAMESPACE

@@ -3,11 +3,7 @@
 S3method(api_create,data.frame)
 S3method(api_create,ggplot)
 S3method(api_create,plotly)
-S3method(arrange_,plotly)
-S3method(distinct_,plotly)
-S3method(do_,plotly)
 S3method(embed_notebook,plotly)
-S3method(filter_,plotly)
 S3method(fortify,SharedData)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
@@ -25,12 +21,11 @@ S3method(ggplotly,"NULL")
 S3method(ggplotly,ggmatrix)
 S3method(ggplotly,ggplot)
 S3method(ggplotly,plotly)
-S3method(group_by_,plotly)
-S3method(groups,plotly)
+S3method(highlight_key,default)
+S3method(highlight_key,plotly)
 S3method(layout,matrix)
 S3method(layout,plotly)
 S3method(layout,shiny.tag.list)
-S3method(mutate_,plotly)
 S3method(plotly_build,"NULL")
 S3method(plotly_build,gg)
 S3method(plotly_build,list)
@@ -40,10 +35,6 @@ S3method(print,api_grid)
 S3method(print,api_grid_local)
 S3method(print,api_plot)
 S3method(print,plotly_data)
-S3method(rename_,plotly)
-S3method(select_,plotly)
-S3method(slice_,plotly)
-S3method(summarise_,plotly)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomAnnotationMap)
 S3method(to_basic,GeomArea)
@@ -78,8 +69,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(TeX)
 export(add_annotations)
@@ -259,6 +248,8 @@ importFrom(lazyeval,is_formula)
 importFrom(lazyeval,is_lang)
 importFrom(magrittr,"%>%")
 importFrom(purrr,transpose)
+importFrom(rlang,"!!!")
+importFrom(rlang,"!!")
 importFrom(rlang,eval_tidy)
 importFrom(stats,complete.cases)
 importFrom(stats,is.leaf)

NEWS.md

@@ -40,16 +40,32 @@ This is minor patch release with a few minor bug fixes and updates test expectat
 
 ## Changes to plotly.js
 
-* This version of the R package upgrades the version of the underlying plotly.js library from v1.52.2 to v1.54.1. This includes many bug fixes and improvements. The [plotly.js release page](https://github.com/plotly/plotly.js/releases) has the full list of changes.
+* This version of the R package upgrades the version of the underlying plotly.js library from v1.52.2 to v1.57.1. This includes many bug fixes and improvements. The [plotly.js release page](https://github.com/plotly/plotly.js/releases) has the full list of changes.
+
+## NEW FEATURES
+
+* `renderPlotly()` now works well with `shiny::bindCache()`, meaning that plotly graphs can now be persistently cached in Shiny apps with `renderPlotly(expr) %>% shiny::bindCache()` (#1879).
+
+* `ggplotly()` now works well with the [**thematic** package](https://rstudio.github.io/thematic). That is, it can now correctly translate **ggplot2** styling that derives from **thematic**. Note that, in order to use **thematic**'s auto theming in Shiny with `ggplotly()`, you need **shiny** v1.5.0 (or higher) and **htmlwidgets** v1.5.2.9000 (or higher). Relatedly, if these versions are available, one may now also call `getCurrentOutputInfo()` inside `renderPlotly()` to get CSS styles of the output container (#1801 and #1802).
 
 ## IMPROVEMENTS
 
-* All HTTP requests are now retried upon failure (#1656)
+* All HTTP requests are now retried upon failure (#1656, @jameslamb).
+
+* R linebreaks (`\n`) in _factor labels_ are now translated to HTML linebreaks (`<br />`), too. Before, this conversion was only done for colums of type character. ([#1700](https://github.com/ropensci/plotly/pull/1700), @salim-b).
 
 ## BUG FIXES
 
+* When R's `POSIXt` class is serialized to JSON, the time of day is now correctly preserved (in plotly.js expected `'yyyy-mm-dd HH:MM:SS.ssssss'` format). This should fix a whole host of issues where date-times were being rounded. (#1871, @FlukeAndFeather).
+
+* `ggplotly()` now handles discrete axes of a `facet_wrap` and `facet_grid` correctly when there is only one category in panels > 1 (#1577 and #1720).
+
+* `ggplotly()` now correctly accounts for linebreaks in tick label text when computing plot margins (#1791, @trekonom).
+
 * `ggplotly()` now handles `element_blank()` and `factor()` labels in positional scales correctly (#1731 and #1772).
 
+* `ggplotly()` now handles missing `y` aesthetic in `geom_errorbar()` (#1779, @trekonom).
+
 # 4.9.2.1
 
 This is minor patch release with a few minor bug fixes and updates test expectations in anticipation of new R 4.0 defaults.

R/add.R

@@ -334,7 +334,7 @@ add_sf <- function(p, ..., x = ~x, y = ~y, data = NULL, inherit = TRUE) {
       y = y,
       `_bbox` = bbox,
       set = set,
-      data = if ("group" %in% names(d[[i]])) group_by_(d[[i]], "group", add = TRUE) else d[[i]], 
+      data = if ("group" %in% names(d[[i]])) group_by_add(d[[i]], !!rlang::sym("group")) else d[[i]], 
       inherit = inherit
     )
     args <- modify_list(args, attrs)