Merge branch 'main' into pimp_my_legend_keys

Author: teunbrand

DESCRIPTION

@@ -52,6 +52,7 @@ Suggests:
     ggplot2movies,
     hexbin,
     Hmisc,
+    hms,
     knitr,
     mapproj,
     maps,

NEWS.md

@@ -11,6 +11,7 @@
 * Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
 * `draw_key_polygon()` and `draw_key_timeseries()` now reflect the 
   `outline.type` parameter (@teunbrand, #6649).
+* `stat_boxplot()` treats `width` as an optional aesthetic (@Yunuuuu, #6575)
 
 # ggplot2 4.0.0
 

R/geom-count.R

@@ -3,7 +3,7 @@ NULL
 
 #' Count overlapping points
 #'
-#' This is a variant [geom_point()] that counts the number of
+#' This is a variant of [geom_point()] that counts the number of
 #' observations at each location, then maps the count to point area. It
 #' useful when you have discrete data and overplotting.
 #'

R/guides-.R

@@ -659,7 +659,8 @@ Guides <- ggproto(
       if (!stretch_spacing) {
         spacing <- convertWidth(spacing, "cm")
       }
-      heights <- unit(height_cm(lapply(heights, sum)), "cm")
+
+      total_height <- max(inject(unit.c(!!!lapply(heights, sum))))
 
       if (stretch_x || stretch_spacing) {
         widths   <- redistribute_null_units(widths, spacing, margin, "width")
@@ -672,14 +673,14 @@ Guides <- ggproto(
       # Set global justification
       vp <- viewport(
         x = global_xjust, y = global_yjust, just = global_just,
-        height = max(heights),
+        height = total_height,
         width  = vp_width
       )
 
       # Initialise gtable as legends in a row
       guides <- gtable_row(
         name = "guides", grobs = grobs,
-        widths = widths, height = max(heights),
+        widths = widths, height = total_height,
         vp = vp
       )
 
@@ -701,7 +702,7 @@ Guides <- ggproto(
       if (!stretch_spacing) {
         spacing <- convertWidth(spacing, "cm")
       }
-      widths  <- unit(width_cm(lapply(widths, sum)), "cm")
+      total_width <- max(inject(unit.c(!!!lapply(widths, sum))))
 
       if (stretch_y || stretch_spacing) {
         heights   <- redistribute_null_units(heights, spacing, margin, "height")
@@ -715,13 +716,13 @@ Guides <- ggproto(
       vp <- viewport(
         x = global_xjust, y = global_yjust, just = global_just,
         height = vp_height,
-        width =  max(widths)
+        width =  total_width
       )
 
       # Initialise gtable as legends in a column
       guides <- gtable_col(
         name = "guides", grobs = grobs,
-        width = max(widths), heights = heights,
+        width = total_width, heights = heights,
         vp = vp
       )
 

R/stat-boxplot.R

@@ -5,6 +5,7 @@
 StatBoxplot <- ggproto("StatBoxplot", Stat,
   required_aes = c("y|x"),
   non_missing_aes = "weight",
+  optional_aes = "width",
   # either the x or y aesthetic will get dropped during
   # statistical transformation, depending on the orientation
   dropped_aes = c("x", "y", "weight"),
@@ -69,9 +70,11 @@ StatBoxplot <- ggproto("StatBoxplot", Stat,
     if (any(outliers)) {
       stats[c(1, 5)] <- range(c(stats[2:4], data$y[!outliers]), na.rm = TRUE)
     }
-
-    if (vec_unique_count(data$x) > 1)
+    if (length(data$width) > 0L) {
+      width <- data$width[1L]
+    } else if (vec_unique_count(data$x) > 1) {
       width <- diff(range(data$x)) * 0.9
+    }
 
     df <- data_frame0(!!!as.list(stats))
     df$outliers <- list(data$y[outliers])