Dplyr 1.0 (#1821)

* update dplyr functions to use non-standard evaluation

* Typo: unquote rlang::sym

For some reason, all tests passed without catching this mistake, but I think I should have had a !! here.

* Same fix as previous commit (d2bc923)

* missed an add --> .add

* lapply(vars, sym)-->syms(vars)

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>

* Revert imports.R

* Use group_by_add; dots_as_quosures

* as_quosure --> new_quosure

As is done here https://github.com/r-lib/rlang/blob/64df8e3f/R/compat-lazyeval.R#L51

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>

* Remove redundant add arguments to group_by_add

* Proper registration plotly methods for dplyr generics

* ensure that crosstalk set attribute is preserved when applying dplyr transforms, closes #1825, closes #1799

* make highlight_key() an S3 generic that understands plotly objects

* review feedback

* clean-up docs

Co-authored-by: julianstanley <stanley.ju@husky.neu.edu>
Co-authored-by: Julian Stanley <julianst@mit.edu>

Author: 3 people

DESCRIPTION

@@ -40,6 +40,7 @@ Imports:
     hexbin,
     RColorBrewer,
     dplyr,
+    vctrs,
     tibble,
     lazyeval (>= 0.2.0),
     rlang,
@@ -75,7 +76,7 @@ Suggests:
     forcats,
     thematic
 LazyData: true
-RoxygenNote: 7.1.0
+RoxygenNote: 7.1.1
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 Remotes: 

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)

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)

R/ggplotly.R

@@ -517,7 +517,7 @@ gg2list <- function(p, width = NULL, height = NULL,
       )
     }
     # anchor X axis to the lowest plot in its column
-    layout$layout <- dplyr::group_by_(layout$layout, "xaxis")
+    layout$layout <- dplyr::group_by(layout$layout, !!rlang::sym("xaxis"))
     layout$layout <-  dplyr::mutate(layout$layout, xanchor = max(as.integer(yaxis)))
   }
   layout$layout <- as.data.frame(layout$layout)
@@ -1112,7 +1112,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   # translate group aesthetics to data attributes
   return_dat <- Map(function(x, y) {
     if (is.null(y[["group"]])) return(x)
-    dplyr::group_by_(x, y[["group"]])
+    dplyr::group_by(x, !!rlang::as_quosure(y[["group"]]))
   }, return_dat, mappingFormulas)
 
   # don't need to add group as an attribute anymore

R/imports.R

@@ -14,7 +14,7 @@
 #' @importFrom purrr transpose
 #' @importFrom tools file_ext file_path_sans_ext
 #' @importFrom data.table as.data.table setorderv
-#' @importFrom rlang eval_tidy
+#' @importFrom rlang eval_tidy !! !!!
 NULL
 
 

R/onLoad.R

@@ -0,0 +1,15 @@
+.onLoad <- function(...) {
+  # These generics are defined in R/plotly_data.R
+  dplyr_generics <- c(
+    "groups", "ungroup", "group_by", "summarise", "mutate", "do", "arrange",
+    "select", "filter", "distinct", "slice", "rename", "transmute"
+  )
+  dplyr_generics <- paste0("dplyr::", dplyr_generics)
+  for (generic in dplyr_generics) {
+    vctrs::s3_register(generic, "plotly")
+    if (generic %in% c("dplyr::groups", "dplyr::ungroup")) {
+      next
+    }
+    vctrs::s3_register(paste0(generic, "_"), "plotly")
+  }
+}

R/plotly_build.R

@@ -561,7 +561,7 @@ train_data <- function(data, trace) {
     idx2 <- seq.int(2, NROW(dat), by = 2)
     dat[idx2, "x"] <- data[["xend"]]
     dat[idx2, "y"] <- data[["yend"]]
-    data <- dplyr::group_by_(dat, ".plotlyGroupIndex", add = TRUE)
+    data <- group_by_add(dat, !!rlang::sym(".plotlyGroupIndex"))
   }
 
   # TODO: a lot more geoms!!!