Skip to content

transition tidyr::gather_ -> tidyr::pivot_longer #2125

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 2 commits into from
Apr 27, 2022
Merged

transition tidyr::gather_ -> tidyr::pivot_longer #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0859261
transition `tidyr::gather_` -> `tidyr::pivot_longer`
simonpcouch Apr 27, 2022
361faf5
add `NEWS` entry
simonpcouch Apr 27, 2022
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
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
## Improvements

* `ggplotly()` does not issue warnings with `options(warnPartialMatchArgs = TRUE)` any longer. (#2046, thanks @bersbersbers)
* `ggplotly()` does not issue warnings related to use of deprecated `tidyr::gather_()` in internals. (#2125, thanks @simonpcouch)

# 4.10.0

Expand Down
20 changes: 16 additions & 4 deletions R/layers2traces.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,10 @@ to_basic.GeomAbline <- function(data, prestats_data, layout, params, p, ...) {
data$group <- interaction(
data[!grepl("group", names(data)) & !vapply(data, anyNA, logical(1))]
)
lay <- tidyr::gather_(layout$layout, "variable", "x", c("x_min", "x_max"))
lay <- tidyr::pivot_longer(
data = layout$layout, cols = c("x_min", "x_max"), values_to = "x", names_to = "variable"
)
lay <- as.data.frame(lay)
data <- merge(lay[c("PANEL", "x")], data, by = "PANEL")
data[["y"]] <- with(data, intercept + slope * x)
prefix_class(data, c("GeomHline", "GeomPath"))
Expand All @@ -434,7 +437,10 @@ to_basic.GeomHline <- function(data, prestats_data, layout, params, p, ...) {
data[!grepl("group", names(data)) & !vapply(data, anyNA, logical(1))]
)
x <- if (inherits(p$coordinates, "CoordFlip")) "y" else "x"
lay <- tidyr::gather_(layout$layout, "variable", x, paste0(x, c("_min", "_max")))
lay <- tidyr::pivot_longer(
data = layout$layout, cols = paste0(x, c("_min", "_max")), values_to = x, names_to = "variable"
)
lay <- as.data.frame(lay)
data <- merge(lay[c("PANEL", x)], data, by = "PANEL")
data[["x"]] <- data[[x]]
data[["y"]] <- data$yintercept
Expand All @@ -448,7 +454,10 @@ to_basic.GeomVline <- function(data, prestats_data, layout, params, p, ...) {
data[!grepl("group", names(data)) & !vapply(data, anyNA, logical(1))]
)
y <- if (inherits(p$coordinates, "CoordFlip")) "x" else "y"
lay <- tidyr::gather_(layout$layout, "variable", y, paste0(y, c("_min", "_max")))
lay <- tidyr::pivot_longer(
data = layout$layout, cols = paste0(y, c("_min", "_max")), values_to = y, names_to = "variable"
)
lay <- as.data.frame(lay)
data <- merge(lay[c("PANEL", y)], data, by = "PANEL")
data[["y"]] <- data[[y]]
data[["x"]] <- data$xintercept
Expand Down Expand Up @@ -495,7 +504,10 @@ to_basic.GeomLinerange <- function(data, prestats_data, layout, params, p, ...)

# reshape data so that x/y reflect path data
data$group <- seq_len(nrow(data))
data <- tidyr::gather_(data, "recodeVariable", "y", c("ymin", "ymax"))
lay <- tidyr::pivot_longer(
data = layout$layout, cols = c("ymin", "ymax"), values_to = "y", names_to = "recodeVariable"
)
lay <- as.data.frame(lay)
data <- data[order(data$group), ]
# fix the hovertext (by removing the "irrelevant" aesthetic)
recodeMap <- p$mapping[dplyr::recode(data[["recodeVariable"]], "ymax" = "ymin", "ymin" = "ymax")]
Expand Down