inline is.sec_axis()

teunbrand · teunbrand · commit 1bdc20d2dc48 · 2024-08-01T16:57:16.000+02:00
diff --git a/R/axis-secondary.R b/R/axis-secondary.R
@@ -124,10 +124,6 @@ dup_axis <- function(transform = identity, name = derive(), breaks = derive(),
   sec_axis(transform, trans = trans, name, breaks, labels, guide)
 }
 
-is.sec_axis <- function(x) {
-  inherits(x, "AxisSecondary")
-}
-
 set_sec_axis <- function(sec.axis, scale) {
   if (!is.waive(sec.axis)) {
     if (scale$is_discrete()) {
@@ -136,7 +132,7 @@ set_sec_axis <- function(sec.axis, scale) {
       }
     }
     if (is.formula(sec.axis)) sec.axis <- sec_axis(sec.axis)
-    if (!is.sec_axis(sec.axis)) {
+    if (!inherits(sec.axis, "AxisSecondary")) {
       cli::cli_abort("Secondary axes must be specified using {.fn sec_axis}.")
     }
     scale$secondary.axis <- sec.axis

Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,6 @@ dup_axis <- function(transform = identity, name = derive(), breaks = derive(),`
`124`	`124`	`sec_axis(transform, trans = trans, name, breaks, labels, guide)`
`125`	`125`	`}`
`126`	`126`
`127`		`-is.sec_axis <- function(x) {`
`128`		`- inherits(x, "AxisSecondary")`
`129`		`-}`
`130`		`-`
`131`	`127`	`set_sec_axis <- function(sec.axis, scale) {`
`132`	`128`	`if (!is.waive(sec.axis)) {`
`133`	`129`	`if (scale$is_discrete()) {`
`@@ -136,7 +132,7 @@ set_sec_axis <- function(sec.axis, scale) {`
`136`	`132`	`}`
`137`	`133`	`}`
`138`	`134`	`if (is.formula(sec.axis)) sec.axis <- sec_axis(sec.axis)`
`139`		`- if (!is.sec_axis(sec.axis)) {`
	`135`	`+ if (!inherits(sec.axis, "AxisSecondary")) {`
`140`	`136`	`cli::cli_abort("Secondary axes must be specified using {.fn sec_axis}.")`
`141`	`137`	`}`
`142`	`138`	`scale$secondary.axis <- sec.axis`