allow merging <S3> + <S3>

teunbrand · teunbrand · commit 2429d31e0949 · 2025-06-18T15:53:19.000+02:00
diff --git a/R/theme.R b/R/theme.R
@@ -980,7 +980,7 @@ combine_elements <- function(e1, e2) {
   # Backward compatbility
   # TODO: deprecate next release cycle
   is_old_element <- !S7::S7_inherits(e1) && inherits(e1, "element")
-  if (is_old_element && is_theme_element(e2)) {
+  if (is_old_element && (is_theme_element(e2) || inherits(e2, "element"))) {
     return(combine_s3_elements(e1, e2))
   }
 

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,7 @@ combine_elements <- function(e1, e2) {`
`980`	`980`	`# Backward compatbility`
`981`	`981`	`# TODO: deprecate next release cycle`
`982`	`982`	`is_old_element <- !S7::S7_inherits(e1) && inherits(e1, "element")`
`983`		`- if (is_old_element && is_theme_element(e2)) {`
	`983`	`+ if (is_old_element && (is_theme_element(e2) \|\| inherits(e2, "element"))) {`
`984`	`984`	`return(combine_s3_elements(e1, e2))`
`985`	`985`	`}`
`986`	`986`