Merge remote-tracking branch 'upstream/main' into fix/issue-3959-guide-axis-other-coords

Author: yutannihilation

DESCRIPTION

@@ -43,6 +43,7 @@ Imports:
     scales (>= 1.2.0),
     stats,
     tibble,
+    vctrs (>= 0.4.1),
     withr (>= 2.0.0)
 Suggests:
     covr,
@@ -79,7 +80,7 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.0.9000
 Collate: 
     'ggproto.r'
     'ggplot-global.R'
@@ -230,6 +231,7 @@ Collate:
     'scale-view.r'
     'scale-viridis.r'
     'scales-.r'
+    'stat-align.R'
     'stat-bin.r'
     'stat-bin2d.r'
     'stat-bindot.r'

NAMESPACE

@@ -4,23 +4,20 @@ S3method("$",ggproto)
 S3method("$",ggproto_parent)
 S3method("$<-",uneval)
 S3method("+",gg)
-S3method("[",mapped_discrete)
 S3method("[",uneval)
-S3method("[<-",mapped_discrete)
 S3method("[<-",uneval)
 S3method("[[",ggproto)
 S3method("[[<-",uneval)
 S3method(.DollarNames,ggproto)
-S3method(as.data.frame,mapped_discrete)
 S3method(as.list,ggproto)
 S3method(autolayer,default)
 S3method(autoplot,default)
-S3method(c,mapped_discrete)
 S3method(drawDetails,zeroGrob)
 S3method(element_grob,element_blank)
 S3method(element_grob,element_line)
 S3method(element_grob,element_rect)
 S3method(element_grob,element_text)
+S3method(format,ggplot2_mapped_discrete)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
 S3method(fortify,"NULL")
@@ -142,6 +139,30 @@ S3method(scale_type,sfc)
 S3method(single_value,default)
 S3method(single_value,factor)
 S3method(summary,ggplot)
+S3method(vec_arith,ggplot2_mapped_discrete)
+S3method(vec_arith.ggplot2_mapped_discrete,MISSING)
+S3method(vec_arith.ggplot2_mapped_discrete,default)
+S3method(vec_arith.ggplot2_mapped_discrete,ggplot2_mapped_discrete)
+S3method(vec_arith.ggplot2_mapped_discrete,numeric)
+S3method(vec_arith.numeric,ggplot2_mapped_discrete)
+S3method(vec_cast,character.ggplot2_mapped_discrete)
+S3method(vec_cast,double.ggplot2_mapped_discrete)
+S3method(vec_cast,factor.ggplot2_mapped_discrete)
+S3method(vec_cast,ggplot2_mapped_discrete.double)
+S3method(vec_cast,ggplot2_mapped_discrete.factor)
+S3method(vec_cast,ggplot2_mapped_discrete.ggplot2_mapped_discrete)
+S3method(vec_cast,ggplot2_mapped_discrete.integer)
+S3method(vec_cast,integer.ggplot2_mapped_discrete)
+S3method(vec_math,ggplot2_mapped_discrete)
+S3method(vec_ptype2,character.ggplot2_mapped_discrete)
+S3method(vec_ptype2,double.ggplot2_mapped_discrete)
+S3method(vec_ptype2,factor.ggplot2_mapped_discrete)
+S3method(vec_ptype2,ggplot2_mapped_discrete.character)
+S3method(vec_ptype2,ggplot2_mapped_discrete.double)
+S3method(vec_ptype2,ggplot2_mapped_discrete.factor)
+S3method(vec_ptype2,ggplot2_mapped_discrete.ggplot2_mapped_discrete)
+S3method(vec_ptype2,ggplot2_mapped_discrete.integer)
+S3method(vec_ptype2,integer.ggplot2_mapped_discrete)
 S3method(widthDetails,titleGrob)
 S3method(widthDetails,zeroGrob)
 export("%+%")
@@ -231,6 +252,7 @@ export(ScaleDiscrete)
 export(ScaleDiscreteIdentity)
 export(ScaleDiscretePosition)
 export(Stat)
+export(StatAlign)
 export(StatBin)
 export(StatBin2d)
 export(StatBindot)
@@ -609,6 +631,7 @@ export(should_stop)
 export(stage)
 export(standardise_aes_names)
 export(stat)
+export(stat_align)
 export(stat_bin)
 export(stat_bin2d)
 export(stat_bin_2d)
@@ -668,6 +691,7 @@ export(update_geom_defaults)
 export(update_labels)
 export(update_stat_defaults)
 export(vars)
+export(vec_arith.ggplot2_mapped_discrete)
 export(waiver)
 export(wrap_dims)
 export(xlab)
@@ -679,6 +703,7 @@ import(grid)
 import(gtable)
 import(rlang)
 import(scales)
+import(vctrs)
 importFrom(glue,glue)
 importFrom(glue,glue_collapse)
 importFrom(lifecycle,deprecated)

NEWS.md

@@ -1,5 +1,12 @@
 # ggplot2 (development version)
 
+* Added `stat_align()` to align data without common x-coordinates prior to
+  stacking. This is now the default stat for `geom_area()` (@thomasp85, #4850)
+
+* Fix a bug in `stat_contour_filled()` where break value differences below a 
+  certain number of digits would cause the computations to fail (@thomasp85, 
+  #4874)
+
 * `stage()` now properly refers to the values without scale transformations for
   the stage of `after_stat`. If your code requires the scaled version of the
   values for some reason, you have to apply the same transformation by yourself,

R/aes.r

@@ -179,7 +179,7 @@ rename_aes <- function(x) {
   names(x) <- standardise_aes_names(names(x))
   duplicated_names <- names(x)[duplicated(names(x))]
   if (length(duplicated_names) > 0L) {
-    cli::cli_warn("Duplicated aesthetics after name standardisation: {.field {unique(duplicated_names)}}")
+    cli::cli_warn("Duplicated aesthetics after name standardisation: {.field {unique0(duplicated_names)}}")
   }
   x
 }

R/annotation-custom.r

@@ -73,7 +73,11 @@ GeomCustomAnn <- ggproto("GeomCustomAnn", Geom,
     if (!inherits(coord, "CoordCartesian")) {
       cli::cli_abort("{.fn annotation_custom} only works with {.fn coord_cartesian}")
     }
-    corners <- new_data_frame(list(x = c(xmin, xmax), y = c(ymin, ymax)), n = 2)
+    corners <- data_frame0(
+      x = c(xmin, xmax),
+      y = c(ymin, ymax),
+      .size = 2
+    )
     data <- coord$transform(corners, panel_params)
 
     x_rng <- range(data$x, na.rm = TRUE)

R/annotation-logticks.r

@@ -213,7 +213,7 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
       }
     }
 
-    gTree(children = do.call("gList", ticks))
+    gTree(children = inject(gList(!!!ticks)))
   },
 
   default_aes = aes(colour = "black", size = 0.5, linetype = 1, alpha = 1)
@@ -254,7 +254,12 @@ calc_logticks <- function(base = 10, ticks_per_base = base - 1,
   longtick_after_base <- floor(ticks_per_base/2)
   tickend[ cycleIdx == longtick_after_base ] <- midend
 
-  tickdf <- new_data_frame(list(value = ticks, start = start, end = tickend), n = length(ticks))
+  tickdf <- data_frame0(
+    value = ticks,
+    start = start,
+    end = tickend,
+    .size = length(ticks)
+  )
 
   return(tickdf)
 }

R/annotation-map.r

@@ -93,7 +93,7 @@ GeomAnnotationMap <- ggproto("GeomAnnotationMap", GeomMap,
     # must be sequential integers
     coords <- coord_munch(coord, map, panel_params)
     coords$group <- coords$group %||% coords$id
-    grob_id <- match(coords$group, unique(coords$group))
+    grob_id <- match(coords$group, unique0(coords$group))
 
     polygonGrob(coords$x, coords$y, default.units = "native",
       id = grob_id,

R/annotation-raster.r

@@ -76,7 +76,11 @@ GeomRasterAnn <- ggproto("GeomRasterAnn", Geom,
     if (!inherits(coord, "CoordCartesian")) {
       cli::cli_abort("{.fn annotation_raster} only works with {.fn coord_cartesian}")
     }
-    corners <- new_data_frame(list(x = c(xmin, xmax), y = c(ymin, ymax)), n = 2)
+    corners <- data_frame0(
+      x = c(xmin, xmax),
+      y = c(ymin, ymax),
+      .size = 2
+    )
     data <- coord$transform(corners, panel_params)
 
     x_rng <- range(data$x, na.rm = TRUE)

R/annotation.r

@@ -57,7 +57,7 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL,
 
   # Check that all aesthetic have compatible lengths
   lengths <- vapply(aesthetics, length, integer(1))
-  n <- unique(lengths)
+  n <- unique0(lengths)
 
   # if there is more than one unique length, ignore constants
   if (length(n) > 1L) {
@@ -71,7 +71,7 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL,
     cli::cli_abort("Unequal parameter lengths: {details}")
   }
 
-  data <- new_data_frame(position, n = n)
+  data <- data_frame0(!!!position, .size = n)
   layer(
     geom = geom,
     params = list(

R/axis-secondary.R

@@ -193,7 +193,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     full_range <- self$transform_range(old_range)
 
     # Test for monotonicity
-    if (length(unique(sign(diff(full_range)))) != 1)
+    if (length(unique0(sign(diff(full_range)))) != 1)
       cli::cli_abort("Transformation for secondary axes must be monotonic")
   },