Merge pull request #30 from nanxstats/ggplot2-compat

Improve backward compatibility with ggplot2 < 3.5.0

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: ggsci
 Type: Package
 Title: Scientific Journal and Sci-Fi Themed Color Palettes for 'ggplot2'
-Version: 3.0.2
+Version: 3.0.3
 Authors@R: c(
     person("Nan", "Xiao", email = "me@nanx.me", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-0250-5673")),

NEWS.md

@@ -1,3 +1,11 @@
+# ggsci 3.0.3
+
+## Improvements
+
+- Detect ggplot2 version at runtime to determine if the argument `scale_name`
+  is needed for all `discrete_scale()` calls. This ensures ggsci always works
+  regardless of the ggplot2 version installed (thanks, @flyingicedragon, #29).
+
 # ggsci 3.0.2
 
 ## Improvements

R/discrete-aaas.R

@@ -76,7 +76,11 @@ pal_aaas <- function(palette = c("default"), alpha = 1) {
 #'   scale_fill_aaas()
 scale_color_aaas <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_aaas(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_aaas(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "aaas", palette = pal_aaas(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_aaas
@@ -88,5 +92,9 @@ scale_colour_aaas <- scale_color_aaas
 #' @rdname scale_aaas
 scale_fill_aaas <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_aaas(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_aaas(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "aaas", palette = pal_aaas(palette, alpha), ...)
+  }
 }

R/discrete-cosmic.R

@@ -87,7 +87,11 @@ scale_color_cosmic <- function(
     palette = c("hallmarks_light", "hallmarks_dark", "signature_substitutions"),
     alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_cosmic(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_cosmic(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "cosmic", palette = pal_cosmic(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_cosmic
@@ -101,5 +105,9 @@ scale_fill_cosmic <- function(
     palette = c("hallmarks_light", "hallmarks_dark", "signature_substitutions"),
     alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_cosmic(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_cosmic(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "cosmic", palette = pal_cosmic(palette, alpha), ...)
+  }
 }

R/discrete-d3.R

@@ -93,7 +93,11 @@ pal_d3 <- function(palette = c("category10", "category20", "category20b", "categ
 #' p2 + scale_fill_d3(palette = "category20c")
 scale_color_d3 <- function(palette = c("category10", "category20", "category20b", "category20c"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_d3(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_d3(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "d3", palette = pal_d3(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_d3
@@ -105,5 +109,9 @@ scale_colour_d3 <- scale_color_d3
 #' @rdname scale_d3
 scale_fill_d3 <- function(palette = c("category10", "category20", "category20b", "category20c"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_d3(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_d3(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "d3", palette = pal_d3(palette, alpha), ...)
+  }
 }

R/discrete-flatui.R

@@ -86,7 +86,11 @@ pal_flatui <- function(palette = c("default", "flattastic", "aussie"), alpha = 1
 #' p2 + scale_fill_flatui(palette = "aussie")
 scale_color_flatui <- function(palette = c("default", "flattastic", "aussie"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_flatui(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_flatui(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "flatui", palette = pal_flatui(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_flatui
@@ -98,5 +102,9 @@ scale_colour_flatui <- scale_color_flatui
 #' @rdname scale_flatui
 scale_fill_flatui <- function(palette = c("default", "flattastic", "aussie"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_flatui(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_flatui(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "flatui", palette = pal_flatui(palette, alpha), ...)
+  }
 }

R/discrete-frontiers.R

@@ -79,7 +79,11 @@ pal_frontiers <- function(palette = c("default"), alpha = 1) {
 #'   scale_fill_frontiers()
 scale_color_frontiers <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_frontiers(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_frontiers(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "frontiers", palette = pal_frontiers(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_frontiers
@@ -91,5 +95,9 @@ scale_colour_frontiers <- scale_color_frontiers
 #' @rdname scale_frontiers
 scale_fill_frontiers <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_frontiers(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_frontiers(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "frontiers", palette = pal_frontiers(palette, alpha), ...)
+  }
 }

R/discrete-futurama.R

@@ -74,7 +74,11 @@ pal_futurama <- function(palette = c("planetexpress"), alpha = 1) {
 #'   scale_fill_futurama()
 scale_color_futurama <- function(palette = c("planetexpress"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_futurama(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_futurama(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "futurama", palette = pal_futurama(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_futurama
@@ -86,5 +90,9 @@ scale_colour_futurama <- scale_color_futurama
 #' @rdname scale_futurama
 scale_fill_futurama <- function(palette = c("planetexpress"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_futurama(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_futurama(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "futurama", palette = pal_futurama(palette, alpha), ...)
+  }
 }

R/discrete-igv.R

@@ -89,7 +89,11 @@ pal_igv <- function(palette = c("default", "alternating"), alpha = 1) {
 #' )
 scale_color_igv <- function(palette = c("default", "alternating"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_igv(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_igv(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "igv", palette = pal_igv(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_igv
@@ -101,5 +105,9 @@ scale_colour_igv <- scale_color_igv
 #' @rdname scale_igv
 scale_fill_igv <- function(palette = c("default", "alternating"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_igv(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_igv(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "igv", palette = pal_igv(palette, alpha), ...)
+  }
 }

R/discrete-jama.R

@@ -75,7 +75,11 @@ pal_jama <- function(palette = c("default"), alpha = 1) {
 #'   scale_fill_jama()
 scale_color_jama <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_jama(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_jama(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "jama", palette = pal_jama(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_jama
@@ -87,5 +91,9 @@ scale_colour_jama <- scale_color_jama
 #' @rdname scale_jama
 scale_fill_jama <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_jama(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_jama(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "jama", palette = pal_jama(palette, alpha), ...)
+  }
 }

R/discrete-jco.R

@@ -74,7 +74,11 @@ pal_jco <- function(palette = c("default"), alpha = 1) {
 #'   scale_fill_jco()
 scale_color_jco <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_jco(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_jco(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "jco", palette = pal_jco(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_jco
@@ -86,5 +90,9 @@ scale_colour_jco <- scale_color_jco
 #' @rdname scale_jco
 scale_fill_jco <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_jco(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_jco(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "jco", palette = pal_jco(palette, alpha), ...)
+  }
 }

R/discrete-lancet.R

@@ -75,7 +75,11 @@ pal_lancet <- function(palette = c("lanonc"), alpha = 1) {
 #'   scale_fill_lancet()
 scale_color_lancet <- function(palette = c("lanonc"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_lancet(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_lancet(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "lancet", palette = pal_lancet(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_lancet
@@ -87,5 +91,9 @@ scale_colour_lancet <- scale_color_lancet
 #' @rdname scale_lancet
 scale_fill_lancet <- function(palette = c("lanonc"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_lancet(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_lancet(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "lancet", palette = pal_lancet(palette, alpha), ...)
+  }
 }

R/discrete-locuszoom.R

@@ -79,7 +79,11 @@ pal_locuszoom <- function(palette = c("default"), alpha = 1) {
 #'   scale_fill_locuszoom()
 scale_color_locuszoom <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_locuszoom(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_locuszoom(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "locuszoom", palette = pal_locuszoom(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_locuszoom
@@ -91,5 +95,9 @@ scale_colour_locuszoom <- scale_color_locuszoom
 #' @rdname scale_locuszoom
 scale_fill_locuszoom <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_locuszoom(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_locuszoom(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "locuszoom", palette = pal_locuszoom(palette, alpha), ...)
+  }
 }

R/discrete-nejm.R

@@ -75,7 +75,11 @@ pal_nejm <- function(palette = c("default"), alpha = 1) {
 #'   scale_fill_nejm()
 scale_color_nejm <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_nejm(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_nejm(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "nejm", palette = pal_nejm(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_nejm
@@ -87,5 +91,9 @@ scale_colour_nejm <- scale_color_nejm
 #' @rdname scale_nejm
 scale_fill_nejm <- function(palette = c("default"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_nejm(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_nejm(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "nejm", palette = pal_nejm(palette, alpha), ...)
+  }
 }

R/discrete-npg.R

@@ -75,7 +75,11 @@ pal_npg <- function(palette = c("nrc"), alpha = 1) {
 #'   scale_fill_npg()
 scale_color_npg <- function(palette = c("nrc"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_npg(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_npg(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "npg", palette = pal_npg(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_npg
@@ -87,5 +91,9 @@ scale_colour_npg <- scale_color_npg
 #' @rdname scale_npg
 scale_fill_npg <- function(palette = c("nrc"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_npg(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_npg(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "npg", palette = pal_npg(palette, alpha), ...)
+  }
 }

R/discrete-rickandmorty.R

@@ -74,7 +74,11 @@ pal_rickandmorty <- function(palette = c("schwifty"), alpha = 1) {
 #'   scale_fill_rickandmorty()
 scale_color_rickandmorty <- function(palette = c("schwifty"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_rickandmorty(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_rickandmorty(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "rickandmorty", palette = pal_rickandmorty(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_rickandmorty
@@ -86,5 +90,9 @@ scale_colour_rickandmorty <- scale_color_rickandmorty
 #' @rdname scale_rickandmorty
 scale_fill_rickandmorty <- function(palette = c("schwifty"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_rickandmorty(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_rickandmorty(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "rickandmorty", palette = pal_rickandmorty(palette, alpha), ...)
+  }
 }

R/discrete-simpsons.R

@@ -74,7 +74,11 @@ pal_simpsons <- function(palette = c("springfield"), alpha = 1) {
 #'   scale_fill_simpsons()
 scale_color_simpsons <- function(palette = c("springfield"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("colour", palette = pal_simpsons(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("colour", palette = pal_simpsons(palette, alpha), ...)
+  } else {
+    discrete_scale("colour", scale_name = "simpsons", palette = pal_simpsons(palette, alpha), ...)
+  }
 }
 
 #' @export scale_colour_simpsons
@@ -86,5 +90,9 @@ scale_colour_simpsons <- scale_color_simpsons
 #' @rdname scale_simpsons
 scale_fill_simpsons <- function(palette = c("springfield"), alpha = 1, ...) {
   palette <- match.arg(palette)
-  discrete_scale("fill", palette = pal_simpsons(palette, alpha), ...)
+  if (is_ggplot2_350()) {
+    discrete_scale("fill", palette = pal_simpsons(palette, alpha), ...)
+  } else {
+    discrete_scale("fill", scale_name = "simpsons", palette = pal_simpsons(palette, alpha), ...)
+  }
 }