@@ -421,7 +421,10 @@ to_basic.GeomAbline <- function(data, prestats_data, layout, params, p, ...) {
421
421
data $ group <- interaction(
422
422
data [! grepl(" group" , names(data )) & ! vapply(data , anyNA , logical (1 ))]
423
423
)
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 )
425
428
data <- merge(lay [c(" PANEL" , " x" )], data , by = " PANEL" )
426
429
data [[" y" ]] <- with(data , intercept + slope * x )
427
430
prefix_class(data , c(" GeomHline" , " GeomPath" ))
@@ -434,7 +437,10 @@ to_basic.GeomHline <- function(data, prestats_data, layout, params, p, ...) {
434
437
data [! grepl(" group" , names(data )) & ! vapply(data , anyNA , logical (1 ))]
435
438
)
436
439
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 )
438
444
data <- merge(lay [c(" PANEL" , x )], data , by = " PANEL" )
439
445
data [[" x" ]] <- data [[x ]]
440
446
data [[" y" ]] <- data $ yintercept
@@ -448,7 +454,10 @@ to_basic.GeomVline <- function(data, prestats_data, layout, params, p, ...) {
448
454
data [! grepl(" group" , names(data )) & ! vapply(data , anyNA , logical (1 ))]
449
455
)
450
456
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 )
452
461
data <- merge(lay [c(" PANEL" , y )], data , by = " PANEL" )
453
462
data [[" y" ]] <- data [[y ]]
454
463
data [[" x" ]] <- data $ xintercept
@@ -495,7 +504,10 @@ to_basic.GeomLinerange <- function(data, prestats_data, layout, params, p, ...)
495
504
496
505
# reshape data so that x/y reflect path data
497
506
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 )
499
511
data <- data [order(data $ group ), ]
500
512
# fix the hovertext (by removing the "irrelevant" aesthetic)
501
513
recodeMap <- p $ mapping [dplyr :: recode(data [[" recodeVariable" ]], " ymax" = " ymin" , " ymin" = " ymax" )]
0 commit comments