Skip to content

Get ggplotly() playing nicely with thematic #1801

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
cpsievert merged 7 commits into from
Jun 25, 2020
Merged

Get ggplotly() playing nicely with thematic #1801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85818b1
Pull plotly's custom ggplot_build into a function and hook into thema…
cpsievert Jun 23, 2020
9c864d6
add thematic to suggests and use it only when loaded
cpsievert Jun 25, 2020
6113185
update shinytest tests
cpsievert Jun 25, 2020
9114b8a
Go back to the assign() based approach
cpsievert Jun 25, 2020
c5a8a2f
bust cache
cpsievert Jun 25, 2020
deaa381
CRAN version of crosstalk
cpsievert Jun 25, 2020
af9a229
add visual tests
cpsievert Jun 25, 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
Prev Previous commit
Next Next commit
add thematic to suggests and use it only when loaded
  • Loading branch information
@cpsievert
cpsievert committed Jun 25, 2020
commit 9c864d617dddf35d898285ab4d5d850e395e4367
4 changes: 3 additions & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ Suggests:
IRdisplay,
processx,
plotlyGeoAssets,
forcats
forcats,
thematic
LazyData: true
RoxygenNote: 7.1.0
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
Remotes: rstudio/thematic
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 @@ -424,8 +424,8 @@ gg2list <- function(p, width = NULL, height = NULL,
}

# Allow thematic to add new defaults to the plot object based on it's theme
ggthematic_build <- getFromNamespace("ggthematic_build", "thematic")
built <- if (is.function(ggthematic_build)) {
built <- if (isNamespaceLoaded("thematic")) {
ggthematic_build <- getFromNamespace("ggthematic_build", "thematic")
ggthematic_build(p, ggplotly_build, thematic::thematic_get_theme(resolve = TRUE))
} else {
ggplotly_build(p)
Expand Down