Skip to content

Fix ggplotly error with NULL axis labs #1732

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

Closed
wants to merge 8 commits into from
Closed

Fix ggplotly error with NULL axis labs #1732

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebb017a
update shinytest baselines
cpsievert Mar 30, 2020
7d6f702
Don't count nchar of axisTitleText if it's NULL
doorisajar Mar 30, 2020
1a2d10f
Test that ggplotly succeeds with blank axis labs.
doorisajar Mar 30, 2020
3d99fad
Update ggplot first, and check NULL in plot title.
doorisajar Mar 30, 2020
e8b8865
Use rlang::is_empty to robustly check for NULL.
doorisajar Mar 31, 2020
de198b4
Revert line endings to LF.
doorisajar Mar 31, 2020
9ad0594
Explicitly specify is_empty import.
doorisajar Mar 31, 2020
8b78f47
Use length(x) != 0 instead of is_empty.
doorisajar Apr 4, 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
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 @@ -814,7 +814,7 @@ gg2list <- function(p, width = NULL, height = NULL,
bbox(axisTickText, axisObj$tickangle, axisObj$tickfont$size)[[type]] +
bbox(axisTitleText, axisTitle$angle, unitConvert(axisTitle, "pixels", type))[[type]]

if (nchar(axisTitleText) > 0) {
if (!is.null(axisTitleText) && nchar(axisTitleText) > 0) {
axisTextSize <- unitConvert(axisText, "npc", type)
axisTitleSize <- unitConvert(axisTitle, "npc", type)
offset <-
Expand All @@ -836,7 +836,7 @@ gg2list <- function(p, width = NULL, height = NULL,
}
# facets have multiple axis objects, but only one title for the plot,
# so we empty the titles and try to draw the title as an annotation
if (nchar(axisTitleText) > 0) {
if (!is.null(axisTitleText) && nchar(axisTitleText) > 0) {
# npc is on a 0-1 scale of the _entire_ device,
# but these units _should_ be wrt to the plotting region
# multiplying the offset by 2 seems to work, but this is a terrible hack
Expand Down
6 changes: 2 additions & 4 deletions inst/examples/shiny/event_data/tests/mytest-expected/001.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,21 +422,19 @@
"stylesheet": null,
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
"name": "crosstalk",
"version": "1.0.0",
"version": "1.1.0.1",
"src": {
"href": "crosstalk-1.0.0"
"href": "crosstalk-1.1.0.1"
},
"meta": null,
"script": "js/crosstalk.min.js",
"stylesheet": "css/crosstalk.css",
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
Expand Down
6 changes: 2 additions & 4 deletions inst/examples/shiny/event_data/tests/mytest-expected/002.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,21 +439,19 @@
"stylesheet": null,
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
"name": "crosstalk",
"version": "1.0.0",
"version": "1.1.0.1",
"src": {
"href": "crosstalk-1.0.0"
"href": "crosstalk-1.1.0.1"
},
"meta": null,
"script": "js/crosstalk.min.js",
"stylesheet": "css/crosstalk.css",
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
Expand Down
6 changes: 2 additions & 4 deletions inst/examples/shiny/event_data/tests/mytest-expected/003.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,21 +443,19 @@
"stylesheet": null,
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
"name": "crosstalk",
"version": "1.0.0",
"version": "1.1.0.1",
"src": {
"href": "crosstalk-1.0.0"
"href": "crosstalk-1.1.0.1"
},
"meta": null,
"script": "js/crosstalk.min.js",
"stylesheet": "css/crosstalk.css",
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
Expand Down
6 changes: 2 additions & 4 deletions inst/examples/shiny/event_data/tests/mytest-expected/004.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,21 +444,19 @@
"stylesheet": null,
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
"name": "crosstalk",
"version": "1.0.0",
"version": "1.1.0.1",
"src": {
"href": "crosstalk-1.0.0"
"href": "crosstalk-1.1.0.1"
},
"meta": null,
"script": "js/crosstalk.min.js",
"stylesheet": "css/crosstalk.css",
"head": null,
"attachment": null,
"package": null,
"all_files": true
},
{
Expand Down
5 changes: 5 additions & 0 deletions tests/testthat/test-ggplot-ggplotly.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ test_that("can access ggplot data in layout()", {
l <- ggplotly(p) %>% layout(title = ~range(date))
expect_equivalent(plotly_build(l)$x$layout$title, range(txhousing$date))
})

test_that("there is no error if axisTitleText is NULL", {
l <- ggplotly(p) %>% xlab(element_blank()) %>% ylab(element_blank()) %>% ggtitle(element_blank())
expect_true(inherits(l), "plotly")
})