Update use_afcharts

Author: Olivia-Box-Power

DESCRIPTION

@@ -29,7 +29,8 @@ Imports:
     cli,
     rlang,
     dplyr,
-    purrr
+    purrr,
+    stats
 Suggests: 
     ggtext,
     knitr,

NAMESPACE

@@ -9,3 +9,4 @@ export(scale_fill_discrete_af)
 export(theme_af)
 export(use_afcharts)
 importFrom(rlang,.data)
+importFrom(stats,setNames)

NEWS.md

@@ -4,6 +4,8 @@
 
 - `use_afcharts` gains a `reset` argument to turn off analysis function styling of charts.
 
+- `theme_af` now uses theme options set by earlier calls of `use_afcharts` by default. #51
+
 - Set the `main` colour palettes to `categorical`. The Scale_*_discrete_af functions now use the 6 colour cateogrical palette by default, rather than the 4 colour.
 
 - Added `af_dark_blue`, `af_orange` and `af_grey` to give easier access to the hex codes of these colours.

R/afcharts-package.R

@@ -3,5 +3,6 @@
 
 ## usethis namespace: start
 #' @importFrom rlang .data
+#' @importFrom stats setNames
 ## usethis namespace: end
 NULL

R/theme_af.R

@@ -14,7 +14,8 @@
 #' @param axis_text,axis_title  'x', 'y', 'xy' or 'none' to determine whether axis text and/or axis titles should be displayed.
 #'   Text defaults to 'xy', as does title. Note that axis text refers to the 'labels' under the tick marks.
 #'
-#' @param legend_title Set to 'none' to suppress legend titles.
+#' @param legend_title Set to 'none' to suppress legend titles. Defaults to
+#'   'show'.
 #'
 #' @returns ggplot2 plot theme
 #'
@@ -29,19 +30,18 @@
 #' @export
 
 
-theme_af <- function(base_size = getOption("afcharts.base_size", 14),
-                     base_line_size = NULL,
-                     base_rect_size = NULL,
-                     grid = getOption("afcharts.grid", "y"),
-                     axis = getOption("afcharts.axis", "x"),
-                     ticks = getOption("afcharts.ticks", "xy"),
-                     legend = getOption("afcharts.legend", "right"),
-                     axis_text = getOption("afcharts.axis_text", "xy"),
-                     axis_title = getOption("afcharts.axis_title", "xy"),
-                     legend_title = getOption("afcharts.axis_title", "show")) {
-
-  if (is.null(base_line_size)) base_line_size <- getOption("afcharts.base_line_size", base_size / 24)
-  if (is.null(base_rect_size)) base_rect_size <- getOption("afcharts.base_rect_size", base_size / 24)
+theme_af <- function(
+  base_size = getOption("afcharts.base_size", 14),
+  base_line_size = getOption("afcharts.base_line_size", base_size / 24),
+  base_rect_size = getOption("afcharts.base_rect_size", base_size / 24),
+  grid = getOption("afcharts.grid", "y"),
+  axis = getOption("afcharts.axis", "x"),
+  ticks = getOption("afcharts.ticks", "xy"),
+  legend = getOption("afcharts.legend", "right"),
+  axis_text = getOption("afcharts.axis_text", "xy"),
+  axis_title = getOption("afcharts.axis_title", "xy"),
+  legend_title = getOption("afcharts.legend_title", "show")
+) {
 
   grid   <- match.arg(grid, c("y", "x", "xy", "none"))
   axis   <- match.arg(axis, c("x", "y", "xy", "none"))

R/use_afcharts.R

@@ -43,10 +43,14 @@ use_afcharts <- function(default_colour =
 
     # Set options for all theme_af arguments provided in ...
 
-    theme_args <- names(formals(theme_af))
-    for (arg in intersect(names(dots), theme_args)) {
-      options(setNames(list(dots[[arg]]), paste0("afcharts.", arg)))
-    }
+    theme_args <- intersect(names(dots), names(formals(theme_af)))
+    options(
+      setNames(
+        dots[theme_args],
+        paste0("afcharts.", theme_args, recycle0 = TRUE)
+      )
+    )
+
 
     # Use afcharts theme ----
 
@@ -81,14 +85,6 @@ use_afcharts <- function(default_colour =
     # Get default base sizes used in theme
     default <- formals(theme_af)
 
-    # Update default values with those passed to use_afcharts
-    new_values <- c(...)
-    for (i in seq_along(new_values)) {
-      default <- replace(default,
-                         which(names(default) == names(new_values)[i]),
-                         new_values[i])
-    }
-
     # Evaluate base_size values for use in geom defaults
     base_size <- eval(default$base_size)
     base_line_size <- eval(default$base_line_size)
@@ -208,9 +204,12 @@ use_afcharts <- function(default_colour =
       }
 
       theme_args <- names(formals(theme_af))
-      for (arg in theme_args) {
-        options(setNames(list(NULL), paste0("afcharts.", arg)))
-      }
+      options(
+        setNames(
+          vector("list", length = length(theme_args)),
+          paste0("afcharts.", theme_args)
+        )
+      )
 
       # Turn off use_afcharts
       options("afcharts.use_afcharts" = NULL)

man/theme_af.Rd

@@ -273,25 +273,36 @@ test_that("use_afcharts works", {
 
 })
 
-# Test theme_af()
-
-test_that("theme_af() inherits arguments from use_afcharts() including defaults", {
+test_that("theme_af() inherits arguments from use_afcharts()", {
 
   use_afcharts(reset = TRUE)
-  use_afcharts(base_size = 20,
-               base_rect_size = 10,
-               grid = "x",
-               axis = "xy",
-               ticks = "none",
-               legend = "left")
+
+  use_afcharts(
+    base_size = 20,
+    base_line_size = 15,
+    base_rect_size = 10,
+    grid = "x",
+    axis = "xy",
+    ticks = "none",
+    legend = "left",
+    axis_text = "x",
+    axis_title = "y",
+    legend_title = "none"
+  )
 
   d <- subset(ggplot2::mpg, manufacturer == "ford")
 
-  plot5 <- ggplot2::ggplot(d, ggplot2::aes(x = model, fill = class)) +
+  plot1 <- ggplot2::ggplot(d, ggplot2::aes(x = model, fill = class)) +
     ggplot2::geom_bar() +
     theme_af()
 
-  expect_match_plot("use_afcharts_5", plot5)
+  expect_match_plot("use_afcharts_theme_af1", plot1)
+
+  plot2 <- ggplot2::ggplot(d, ggplot2::aes(x = model, fill = class)) +
+    ggplot2::geom_bar() +
+    theme_af(base_size = 5, legend_title = "show")
+
+  expect_match_plot("use_afcharts_theme_af2", plot2)
 
   use_afcharts(reset = TRUE)
 })