Skip to content

Commit be1b49f

Browse files
committed
rename is_element -> is_theme_element
1 parent 19f2ed6 commit be1b49f

File tree

9 files changed

+751
-751
lines changed

9 files changed

+751
-751
lines changed

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ export(is.ggplot)
459459
export(is.ggproto)
460460
export(is.theme)
461461
export(is_coord)
462-
export(is_element)
463462
export(is_facet)
464463
export(is_geom)
465464
export(is_ggplot)
@@ -473,6 +472,7 @@ export(is_position)
473472
export(is_scale)
474473
export(is_stat)
475474
export(is_theme)
475+
export(is_theme_element)
476476
export(label_both)
477477
export(label_bquote)
478478
export(label_context)

NEWS.md

Lines changed: 740 additions & 740 deletions
Large diffs are not rendered by default.

R/guide-.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,10 @@ Guide <- ggproto(
381381
# Renders tickmarks
382382
build_ticks = function(key, elements, params, position = params$position,
383383
length = elements$ticks_length) {
384-
if (!is_element(elements)) {
384+
if (!is_theme_element(elements)) {
385385
elements <- elements$ticks
386386
}
387-
if (!is_element(elements, "line")) {
387+
if (!is_theme_element(elements, "line")) {
388388
return(zeroGrob())
389389
}
390390

R/guide-axis.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ GuideAxis <- ggproto(
240240

241241
override_elements = function(params, elements, theme) {
242242
label <- elements$text
243-
if (!is_element(label, "text")) {
243+
if (!is_theme_element(label, "text")) {
244244
return(elements)
245245
}
246246
label_overrides <- axis_label_element_overrides(

R/plot-build.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ ggplot_gtable.ggplot_built <- function(data) {
272272
plot_table <- gtable_add_rows(plot_table, theme$plot.margin[3])
273273
plot_table <- gtable_add_cols(plot_table, theme$plot.margin[4], pos = 0)
274274

275-
if (is_element(theme$plot.background)) {
275+
if (is_theme_element(theme$plot.background)) {
276276
plot_table <- gtable_add_grob(plot_table,
277277
element_render(theme, "plot.background"),
278278
t = 1, l = 1, b = -1, r = -1, name = "background", z = -Inf)

R/theme-elements.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ element_text <- function(family = NULL, face = NULL, colour = NULL,
148148

149149
#' @export
150150
#' @rdname element
151-
is_element <- function(x, type = "any") {
151+
is_theme_element <- function(x, type = "any") {
152152
switch(
153153
type %||% "any",
154154
any = inherits(x, "element"),

R/theme.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ theme <- function(...,
521521
# If complete theme set all non-blank elements to inherit from blanks
522522
if (complete) {
523523
elements <- lapply(elements, function(el) {
524-
if (is_element(el) && !is_element(el, "blank")) {
524+
if (is_theme_element(el) && !is_theme_element(el, "blank")) {
525525
el$inherit.blank <- TRUE
526526
}
527527
el
@@ -821,7 +821,7 @@ combine_elements <- function(e1, e2) {
821821
}
822822

823823
# If neither of e1 or e2 are element_* objects, return e1
824-
if (!is_element(e1) && !is_element(e2)) {
824+
if (!is_theme_element(e1) && !is_theme_element(e2)) {
825825
return(e1)
826826
}
827827

man/element.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-theme.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ test_that("element tree can be modified", {
337337
test_that("all elements in complete themes have inherit.blank=TRUE", {
338338
inherit_blanks <- function(theme) {
339339
all(vapply(theme, function(el) {
340-
if (is_element(el) && !is_element(el, "blank")) {
340+
if (is_theme_element(el) && !is_theme_element(el, "blank")) {
341341
el$inherit.blank
342342
} else {
343343
TRUE

0 commit comments

Comments
 (0)