Skip to content

Commit a4ed547

Browse files
authored
transition tidyr::gather_ -> tidyr::pivot_longer (#2125)
* transition `tidyr::gather_` -> `tidyr::pivot_longer` * add `NEWS` entry
1 parent 01582b8 commit a4ed547

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

Diff for: NEWS.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
## Improvements
2121

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

2425
# 4.10.0
2526

Diff for: R/layers2traces.R

+16-4
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,10 @@ to_basic.GeomAbline <- function(data, prestats_data, layout, params, p, ...) {
421421
data$group <- interaction(
422422
data[!grepl("group", names(data)) & !vapply(data, anyNA, logical(1))]
423423
)
424-
lay <- tidyr::gather_(layout$layout, "variable", "x", c("x_min", "x_max"))
424+
lay <- tidyr::pivot_longer(
425+
data = layout$layout, cols = c("x_min", "x_max"), values_to = "x", names_to = "variable"
426+
)
427+
lay <- as.data.frame(lay)
425428
data <- merge(lay[c("PANEL", "x")], data, by = "PANEL")
426429
data[["y"]] <- with(data, intercept + slope * x)
427430
prefix_class(data, c("GeomHline", "GeomPath"))
@@ -434,7 +437,10 @@ to_basic.GeomHline <- function(data, prestats_data, layout, params, p, ...) {
434437
data[!grepl("group", names(data)) & !vapply(data, anyNA, logical(1))]
435438
)
436439
x <- if (inherits(p$coordinates, "CoordFlip")) "y" else "x"
437-
lay <- tidyr::gather_(layout$layout, "variable", x, paste0(x, c("_min", "_max")))
440+
lay <- tidyr::pivot_longer(
441+
data = layout$layout, cols = paste0(x, c("_min", "_max")), values_to = x, names_to = "variable"
442+
)
443+
lay <- as.data.frame(lay)
438444
data <- merge(lay[c("PANEL", x)], data, by = "PANEL")
439445
data[["x"]] <- data[[x]]
440446
data[["y"]] <- data$yintercept
@@ -448,7 +454,10 @@ to_basic.GeomVline <- function(data, prestats_data, layout, params, p, ...) {
448454
data[!grepl("group", names(data)) & !vapply(data, anyNA, logical(1))]
449455
)
450456
y <- if (inherits(p$coordinates, "CoordFlip")) "x" else "y"
451-
lay <- tidyr::gather_(layout$layout, "variable", y, paste0(y, c("_min", "_max")))
457+
lay <- tidyr::pivot_longer(
458+
data = layout$layout, cols = paste0(y, c("_min", "_max")), values_to = y, names_to = "variable"
459+
)
460+
lay <- as.data.frame(lay)
452461
data <- merge(lay[c("PANEL", y)], data, by = "PANEL")
453462
data[["y"]] <- data[[y]]
454463
data[["x"]] <- data$xintercept
@@ -495,7 +504,10 @@ to_basic.GeomLinerange <- function(data, prestats_data, layout, params, p, ...)
495504

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

0 commit comments

Comments
 (0)