Commit bcf2a21

dereckmezquitacpsievert

and

authored

Bug fix: allow empty Vlines and Hlines as ggplot2 does (#2252)

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

1 parent 3f1030b commit bcf2a21Copy full SHA for bcf2a21

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	* Closed #2208: `ggplotly()` no longer errors given a `geom_area()` with 1 or less data points (error introduced by new behavior in ggplot2 v3.4.0). (#2209)
`20`	`20`	* Closed #2220: `ggplotly()` no longer errors on `stat_summary(geom = "crossbar")`. (#2222)
`21`	`21`	* Closed #2212: `ggplotly()` no longer removes legends when setting guide properties via `guides(aes = guide_xxx(...))`.
	`22`	+* Closed #1947: `ggplotly()` now correctly handles `geom_vline`/`geom_hline` with empty data. Previously, if `geom_vline`/`geom_hline` was passed an empty data frame, it would result in an error. The plot is drawn even if no lines are found; this is the same behavior as `ggplot2`.
`22`	`23`
`23`	`24`	`# 4.10.1`
`24`	`25`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,9 @@ to_basic.GeomHline <- function(data, prestats_data, layout, params, p, ...) {`
`448`	`448`	`data = layout$layout, cols = paste0(x, c("_min", "_max")), values_to = x, names_to = "variable"`
`449`	`449`	`)`
`450`	`450`	`lay <- as.data.frame(lay)`
`451`		`- data <- merge(lay[c("PANEL", x)], data, by = "PANEL")`
	`451`	`+ if (nrow(data) > 0) {`
	`452`	`+ data <- merge(lay[c("PANEL", x)], data, by = "PANEL")`
	`453`	`+ }`
`452`	`454`	`data[["x"]] <- data[[x]]`
`453`	`455`	`data[["y"]] <- data$yintercept`
`454`	`456`	`prefix_class(data, c("GeomHline", "GeomPath"))`
`@@ -465,7 +467,9 @@ to_basic.GeomVline <- function(data, prestats_data, layout, params, p, ...) {`
`465`	`467`	`data = layout$layout, cols = paste0(y, c("_min", "_max")), values_to = y, names_to = "variable"`
`466`	`468`	`)`
`467`	`469`	`lay <- as.data.frame(lay)`
`468`		`- data <- merge(lay[c("PANEL", y)], data, by = "PANEL")`
	`470`	`+ if (nrow(data) > 0) {`
	`471`	`+ data <- merge(lay[c("PANEL", y)], data, by = "PANEL")`
	`472`	`+ }`
`469`	`473`	`data[["y"]] <- data[[y]]`
`470`	`474`	`data[["x"]] <- data$xintercept`
`471`	`475`	`prefix_class(data, c("GeomVline", "GeomPath"))`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,3 +97,8 @@ test_that("hline works with coord_flip", {`
`97`	`97`	`expect_equivalent(l$data[[2]]$x, c(5, 5))`
`98`	`98`	`expect_equivalent(l$data[[2]]$y, c(5.95, 6.05))`
`99`	`99`	`})`
	`100`	`+`
	`101`	`+test_that("geom_vline/geom_hline does not throw an error with ggplotly when no lines are found", {`
	`102`	`+ p3 <- ggplot(df) + geom_hline(aes(yintercept = x), data = data.frame(x = 1)[F, , drop = FALSE])`
	`103`	`+ expect_error(plotly::ggplotly(p3), NA)`
	`104`	`+})`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,3 +46,8 @@ test_that("vline works with coord_flip", {`
`46`	`46`	`expect_equivalent(l$data[[2]]$x, c(5.95, 6.05))`
`47`	`47`	`expect_equivalent(l$data[[2]]$y, c(5, 5))`
`48`	`48`	`})`
	`49`	`+`
	`50`	`+test_that("geom_vline/geom_hline does not throw an error with ggplotly when no lines are found", {`
	`51`	`+ p <- ggplot(df) + geom_vline(aes(xintercept = x), data = data.frame(x = 1)[F, , drop = FALSE])`
	`52`	`+ expect_error(plotly::ggplotly(p), NA)`
	`53`	`+})`

Comments

(0)