From d6edbf6ccca88196df555500bfd177c5d3c6253c Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Tue, 28 Jan 2025 13:13:35 +0100 Subject: [PATCH] Revert "transparent theme (#5018)" This reverts commit f9b97036ea2580ae097a26625917b437fc7a515a. --- NAMESPACE | 1 - R/theme-defaults.R | 35 ------- man/ggtheme.Rd | 11 --- tests/testthat/_snaps/prohibited-functions.md | 4 - .../_snaps/theme/theme-transparent-large.svg | 92 ------------------- .../_snaps/theme/theme-transparent.svg | 92 ------------------- tests/testthat/test-theme.R | 6 -- 7 files changed, 241 deletions(-) delete mode 100644 tests/testthat/_snaps/theme/theme-transparent-large.svg delete mode 100644 tests/testthat/_snaps/theme/theme-transparent.svg diff --git a/NAMESPACE b/NAMESPACE index 690b9fb0ed..dd8395ddf7 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -737,7 +737,6 @@ export(theme_sub_panel) export(theme_sub_plot) export(theme_sub_strip) export(theme_test) -export(theme_transparent) export(theme_update) export(theme_void) export(transform_position) diff --git a/R/theme-defaults.R b/R/theme-defaults.R index e6efd2a783..ae12697de1 100644 --- a/R/theme-defaults.R +++ b/R/theme-defaults.R @@ -501,41 +501,6 @@ theme_classic <- function(base_size = 11, base_family = "", ) } -#' @export -#' @rdname ggtheme -theme_transparent <- function(base_size = 11, base_family = "", - header_family = NULL, - base_line_size = base_size / 22, - base_rect_size = base_size / 22, - ink = "black", paper = alpha(ink, 0)) { - force(ink) - # Based on theme_bw - theme_grey( - base_size = base_size, - base_family = base_family, - header_family = header_family, - base_line_size = base_line_size, - base_rect_size = base_rect_size, - ink = ink, paper = paper - ) %+replace% - theme( - panel.background = element_blank(), - plot.background = element_blank(), - legend.background = element_blank(), - legend.key = element_blank(), - # theme_bw specifications - panel.border = element_rect(fill = NA, colour = col_mix(ink, paper, 0.20)), - # make gridlines dark, same contrast with white as in theme_grey - panel.grid = element_line(colour = col_mix(ink, paper, 0.92)), - # contour strips to match panel contour - strip.background = element_rect( - fill = col_mix(ink, paper, 0.85), - colour = col_mix(ink, paper, 0.20), - ), - complete = TRUE - ) -} - #' @export #' @rdname ggtheme theme_void <- function(base_size = 11, base_family = "", diff --git a/man/ggtheme.Rd b/man/ggtheme.Rd index 57dd519355..e86accb182 100644 --- a/man/ggtheme.Rd +++ b/man/ggtheme.Rd @@ -9,7 +9,6 @@ \alias{theme_dark} \alias{theme_minimal} \alias{theme_classic} -\alias{theme_transparent} \alias{theme_void} \alias{theme_test} \title{Complete themes} @@ -94,16 +93,6 @@ theme_classic( paper = "white" ) -theme_transparent( - base_size = 11, - base_family = "", - header_family = NULL, - base_line_size = base_size/22, - base_rect_size = base_size/22, - ink = "black", - paper = alpha(ink, 0) -) - theme_void( base_size = 11, base_family = "", diff --git a/tests/testthat/_snaps/prohibited-functions.md b/tests/testthat/_snaps/prohibited-functions.md index 4612a484bf..6f875fd697 100644 --- a/tests/testthat/_snaps/prohibited-functions.md +++ b/tests/testthat/_snaps/prohibited-functions.md @@ -213,10 +213,6 @@ [1] "base_size" "base_family" "header_family" "base_line_size" [5] "base_rect_size" - $theme_transparent - [1] "base_size" "base_family" "header_family" "base_line_size" - [5] "base_rect_size" - $theme_void [1] "base_size" "base_family" "header_family" "base_line_size" [5] "base_rect_size" diff --git a/tests/testthat/_snaps/theme/theme-transparent-large.svg b/tests/testthat/_snaps/theme/theme-transparent-large.svg deleted file mode 100644 index ebf6962840..0000000000 --- a/tests/testthat/_snaps/theme/theme-transparent-large.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - - - - - -1.0 -1.5 -2.0 -2.5 -3.0 -1.0 -1.5 -2.0 -2.5 -3.0 - - - - - -x -y -z - - -a -b -theme_transparent_large - - diff --git a/tests/testthat/_snaps/theme/theme-transparent.svg b/tests/testthat/_snaps/theme/theme-transparent.svg deleted file mode 100644 index 067326449a..0000000000 --- a/tests/testthat/_snaps/theme/theme-transparent.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - - - - - -1.0 -1.5 -2.0 -2.5 -3.0 -1.0 -1.5 -2.0 -2.5 -3.0 - - - - - -x -y -z - - -a -b -theme_transparent - - diff --git a/tests/testthat/test-theme.R b/tests/testthat/test-theme.R index eba47a0c75..17f4f3d25a 100644 --- a/tests/testthat/test-theme.R +++ b/tests/testthat/test-theme.R @@ -361,7 +361,6 @@ test_that("all elements in complete themes have inherit.blank=TRUE", { expect_true(inherit_blanks(theme_linedraw())) expect_true(inherit_blanks(theme_minimal())) expect_true(inherit_blanks(theme_void())) - expect_true(inherit_blanks(theme_transparent())) }) test_that("elements can be merged", { @@ -508,9 +507,6 @@ test_that("provided themes explicitly define all elements", { t <- theme_test() expect_true(all(names(t) %in% elements)) - - t <- theme_transparent() - expect_true(all(names(t) %in% elements)) }) test_that("Theme elements are checked during build", { @@ -758,7 +754,6 @@ test_that("themes don't change without acknowledgement", { expect_doppelganger("theme_light", plot + theme_light()) expect_doppelganger("theme_void", plot + theme_void()) expect_doppelganger("theme_linedraw", plot + theme_linedraw()) - expect_doppelganger("theme_transparent", plot + theme_transparent()) }) test_that("themes look decent at larger base sizes", { @@ -775,7 +770,6 @@ test_that("themes look decent at larger base sizes", { expect_doppelganger("theme_light_large", plot + theme_light(base_size = 33)) expect_doppelganger("theme_void_large", plot + theme_void(base_size = 33)) expect_doppelganger("theme_linedraw_large", plot + theme_linedraw(base_size = 33)) - expect_doppelganger("theme_transparent_large", plot + theme_transparent(base_size = 33)) }) test_that("setting 'spacing' and 'margins' affect the whole plot", {