Skip to content

Commit 6603eb5

Browse files
committed
Use S7::method() for element getters/setters
1 parent 2efa829 commit 6603eb5

File tree

2 files changed

+33
-43
lines changed

2 files changed

+33
-43
lines changed

NAMESPACE

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
S3method("$","ggplot2::element")
43
S3method("$","ggplot2::gg")
54
S3method("$","ggplot2::theme")
65
S3method("$",ggproto)
76
S3method("$",ggproto_parent)
8-
S3method("$<-","ggplot2::element")
97
S3method("$<-","ggplot2::gg")
108
S3method("$<-","ggplot2::mapping")
11-
S3method("[","ggplot2::element")
129
S3method("[","ggplot2::gg")
1310
S3method("[","ggplot2::mapping")
1411
S3method("[",mapped_discrete)
15-
S3method("[<-","ggplot2::element")
1612
S3method("[<-","ggplot2::gg")
1713
S3method("[<-","ggplot2::mapping")
1814
S3method("[<-",mapped_discrete)
19-
S3method("[[","ggplot2::element")
2015
S3method("[[","ggplot2::gg")
2116
S3method("[[",ggproto)
22-
S3method("[[<-","ggplot2::element")
2317
S3method("[[<-","ggplot2::gg")
2418
S3method("[[<-","ggplot2::mapping")
2519
S3method(.DollarNames,ggproto)

R/theme-elements.R

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -383,44 +383,40 @@ rel <- function(x) {
383383
structure(x, class = "rel")
384384
}
385385

386-
#' @export
387-
`$.ggplot2::element` <- function(x, i) {
388-
# deprecate_soft0("4.1.0", I("`<ggplot2::element>$i`"), I("`<ggplot2::element>@i`"))
389-
`[[`(S7::props(x), i)
390-
}
391-
392-
#' @export
393-
`[.ggplot2::element` <- function(x, i) {
394-
# deprecate_soft0("4.1.0", I("`<gglot2::element>[i]`"), I("`S7::props(<ggplot2::element>, i)`"))
395-
`[`(S7::props(x), i)
396-
}
397-
398-
#' @export
399-
`[[.ggplot2::element` <- function(x, i) {
400-
# deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]]`"), I("`S7::prop(<ggplot2::element>, i)`"))
401-
`[[`(S7::props(x), i)
402-
}
403-
404-
#' @export
405-
`$<-.ggplot2::element` <- function(x, i, value) {
406-
# deprecate_soft0("4.1.0", I("`<ggplot2::element>$i <- value`"), I("`<ggplot2::element>@i <- value`"))
407-
S7::props(x) <- `[[<-`(S7::props(x), i, value)
408-
x
409-
}
410-
411-
#' @export
412-
`[<-.ggplot2::element` <- function(x, i, value) {
413-
# deprecate_soft0("4.1.0", I("`<ggplot2::element>[i] <- value`"), I("`S7::props(<ggplot2::element>)[i] <- value`"))
414-
S7::props(x) <- `[<-`(S7::props(x), i, value)
415-
x
416-
}
386+
# Element getter methods
387+
local({
388+
S7::method(`$`, element) <- function(x, i) {
389+
# deprecate_soft0("4.1.0", I("`<ggplot2::element>$i`"), I("`<ggplot2::element>@i`"))
390+
`[[`(S7::props(x), i)
391+
}
392+
S7::method(`[`, element) <- function(x, i) {
393+
# deprecate_soft0("4.1.0", I("`<gglot2::element>[i]`"), I("`S7::props(<ggplot2::element>, i)`"))
394+
`[`(S7::props(x), i)
395+
}
396+
S7::method(`[[`, element) <- function(x, i) {
397+
# deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]]`"), I("`S7::prop(<ggplot2::element>, i)`"))
398+
`[[`(S7::props(x), i)
399+
}
400+
})
417401

418-
#' @export
419-
`[[<-.ggplot2::element` <- function(x, i, value) {
420-
# deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]] <- value`"), I("S7::prop(<ggplot2::element>, i) <- value"))
421-
S7::props(x) <- `[[<-`(S7::props(x), i, value)
422-
x
423-
}
402+
# Element setter methods
403+
local({
404+
S7::method(`$<-`, element) <- function(x, i, value) {
405+
# deprecate_soft0("4.1.0", I("`<ggplot2::element>$i <- value`"), I("`<ggplot2::element>@i <- value`"))
406+
S7::props(x) <- `[[<-`(S7::props(x), i, value)
407+
x
408+
}
409+
S7::method(`[<-`, element) <- function(x, i, value) {
410+
# deprecate_soft0("4.1.0", I("`<ggplot2::element>[i] <- value`"), I("`S7::props(<ggplot2::element>)[i] <- value`"))
411+
S7::props(x) <- `[<-`(S7::props(x), i, value)
412+
x
413+
}
414+
S7::method(`[[<-`, element) <- function(x, i, value) {
415+
# deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]] <- value`"), I("S7::prop(<ggplot2::element>, i) <- value"))
416+
S7::props(x) <- `[[<-`(S7::props(x), i, value)
417+
x
418+
}
419+
})
424420

425421
#' @export
426422
print.rel <- function(x, ...) print(noquote(paste(x, " *", sep = "")))

0 commit comments

Comments
 (0)