Skip to content

Dplyr 1.0 #1821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 24, 2020
Merged

Dplyr 1.0 #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9a63ed0
update dplyr functions to use non-standard evaluation
Jun 23, 2020
faaad0b
Typo: unquote rlang::sym
julistanley Jun 23, 2020
7223031
Same fix as previous commit (d2bc92395bd4c5a393616dd605e679035323a15f)
Jun 23, 2020
a214b28
missed an add --> .add
Jun 23, 2020
ff08bf4
lapply(vars, sym)-->syms(vars)
julistanley Jun 23, 2020
b7b94ef
Revert imports.R
Jun 23, 2020
07ce795
Use group_by_add; dots_as_quosures
Jun 23, 2020
38dce09
as_quosure --> new_quosure
julistanley Jun 23, 2020
0fd2d87
Remove redundant add arguments to group_by_add
Jun 23, 2020
10c3a78
Proper registration plotly methods for dplyr generics
cpsievert Jul 21, 2020
121012a
ensure that crosstalk set attribute is preserved when applying dplyr …
cpsievert Jul 24, 2020
027554d
make highlight_key() an S3 generic that understands plotly objects
cpsievert Jul 24, 2020
e9c3f77
review feedback
cpsievert Jul 24, 2020
e3a96df
clean-up docs
cpsievert Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Imports:
hexbin,
RColorBrewer,
dplyr,
vctrs,
tibble,
lazyeval (>= 0.2.0),
rlang,
Expand Down Expand Up @@ -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:
Expand Down
17 changes: 4 additions & 13 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion R/add.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions R/ggplotly.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion R/imports.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
15 changes: 15 additions & 0 deletions R/onLoad.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
2 changes: 1 addition & 1 deletion R/plotly_build.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!!!
Expand Down
Loading