Set fill aesthetic to mice colors

R/ggmice.R

@@ -7,9 +7,11 @@
 #' equivalent to [`ggplot2::ggplot`] output, with a few important exceptions:
 #'
 #' - The theme is set to [`ggmice::theme_mice`].
-#' - The color scale is set to the [`mice::mdc`] colors.
+#' - The color and fill scales are set to the [`mice::mdc`] colors (see below).
 #' - The `colour` aesthetic is set to `.where`, an internally defined variable which distinguishes
 #' observed data from missing data or imputed data (for incomplete and imputed data, respectively).
+#' - The `fill` aesthetic is set to `.where`, an internally defined variable which distinguishes
+#' observed data from missing data or imputed data (for incomplete and imputed data, respectively).
 #'
 #' @examples
 #' dat <- mice::nhanes
@@ -48,6 +50,14 @@
       )
     )
   }
+  if (!is.null(mapping$fill)) {
+    cli::cli_warn(
+      c(
+        "The aes() argument 'fill' has a special use in ggmice() and will be overwritten.",
+        "i" = "Try using 'shape' or 'linetype' for additional mapping, or use faceting."
+      )
+    )
+  }
 
   # extract variable names from mapping object
   if (is.data.frame(data)) {
@@ -91,7 +101,7 @@
       )
     }
     mice_mapping <-
-      utils::modifyList(mapping, ggplot2::aes(colour = .where))
+      utils::modifyList(mapping, ggplot2::aes(colour = .where, fill = .where))
     mice_colors <-
       c("observed" = "#006CC2B3",
         "missing" = "#B61A51B3")
@@ -107,8 +117,8 @@
           .imp = 0,
           .id = rownames(data$data),
           data$data
         )[!miss_xy,],
         data.frame(.where = "imputed", mice::complete(data, action = "long"))[where_xy,]
       ),
       .where = factor(
         .where,
@@ -118,7 +128,7 @@
       .imp = factor(.imp, levels = 0:data$m, ordered = TRUE)
     )
     mice_mapping <-
-      utils::modifyList(mapping, ggplot2::aes(colour = .where))
+      utils::modifyList(mapping, ggplot2::aes(colour = .where, fill = .where))
     mice_colors <-
       c("observed" = "#006CC2B3",
         "imputed" = "#B61A51B3")
@@ -127,13 +137,18 @@
   # create plot
   gg <- ggplot2::ggplot(data = mice_data, mapping = mice_mapping) +
     ggplot2::scale_color_manual(values = mice_colors,
+                                na.value = "#B61A51B3",
                                 name = "",
                                 drop = FALSE) +
+    ggplot2::scale_fill_manual(values = mice_colors,
+                               na.value = "#B61A51B3",
+                               name = "",
+                               drop = FALSE) +
     theme_mice()
 
   # edit plot to display missing values on the axes
   if (is.data.frame(data) &&
       !is.null(mapping$x) && !is.null(mapping$y)) {
     gg <- gg +
       ggplot2::coord_cartesian(clip = "off")
     if (!is.null(mapping$x)) {
@@ -187,14 +202,14 @@
     mapping_out <- mapping_text
   }
   if ((mice::is.mids(data) &&
        mapping_text %in% c(".id", ".imp", ".where"))) {
     mapping_out <- NULL
   }
   if (!is.null(mapping_in) &&
       mapping_text %nin% c(vrbs, ".id", ".imp", ".where")) {
     mapping_out <- vrbs[stringr::str_detect(mapping_text, vrbs)]
     if (identical(mapping_out, character(0)) ||
         inherits(try(dplyr::mutate(mapping_data,
                                    !!rlang::parse_quo(mapping_text, env = rlang::current_env())),
                      silent = TRUE)
                  ,