use is_theme()

Author: teunbrand

R/theme.R

@@ -584,12 +584,12 @@ is.theme <- function(x) {
 
 # check whether theme is complete
 is_theme_complete <- function(x) {
-  is.theme(x) && isTRUE(x@complete)
+  is_theme(x) && isTRUE(x@complete)
 }
 
 # check whether theme should be validated
 is_theme_validate <- function(x) {
-  !is.theme(x) || isTRUE(x@validate)
+  !is_theme(x) || isTRUE(x@validate)
 }
 
 check_theme <- function(theme, tree = get_element_tree(), call = caller_env()) {
@@ -703,7 +703,7 @@ add_theme <- function(t1, t2, t2name, call = caller_env()) {
     }
   )
 
-  if (!is.theme(t1) && is.list(t1)) {
+  if (!is_theme(t1) && is.list(t1)) {
     t1 <- theme(!!!t1)
   }
 

tests/testthat/_snaps/4.5/theme.md

@@ -0,0 +1,8 @@
+# modifying theme element properties with + operator works
+
+    Code
+      theme_grey() + "asdf"
+    Condition
+      Error:
+      ! Can't add `"asdf"` to a theme object.
+

tests/testthat/test-theme.R

@@ -19,7 +19,7 @@ test_that("modifying theme element properties with + operator works", {
   t <- theme_grey() + theme(axis.title.x = element_text(colour = 'red', margin = margin()))
   expect_identical(t$axis.title.x, element_text(colour = 'red', margin = margin(), vjust = 1))
   # Make sure the theme class didn't change or get dropped
-  expect_s3_class(t, "theme")
+  expect_s7_class(t, class_theme)
   # Make sure the element class didn't change or get dropped
   expect_s3_class(t$axis.title.x, "element")
   expect_s3_class(t$axis.title.x, "element_text")
@@ -107,7 +107,7 @@ test_that("replacing theme elements with %+replace% operator works", {
   t <- theme_grey() %+replace% theme(axis.title.x = element_text(colour = 'red'))
   expect_identical(t$axis.title.x, element_text(colour = 'red'))
   # Make sure the class didn't change or get dropped
-  expect_s3_class(t, "theme")
+  expect_s7_class(t, class_theme)
 
   # Changing an intermediate node works
   t <- theme_grey() %+replace% theme(axis.title = element_text(colour = 'red'))