Merge branch 'main' into delayed_geom_defaults

Author: teunbrand

NAMESPACE

@@ -461,7 +461,6 @@ export(guides)
 export(has_flipped_aes)
 export(is.Coord)
 export(is.coord)
-export(is.element)
 export(is.facet)
 export(is.geom)
 export(is.ggplot)
@@ -475,6 +474,7 @@ export(is.position)
 export(is.scale)
 export(is.stat)
 export(is.theme)
+export(is.theme_element)
 export(label_both)
 export(label_bquote)
 export(label_context)

NEWS.md

@@ -2,6 +2,8 @@
 
 * (internal) Using `after_scale()` in the `Geom*$default_aes()` field is now
   evaluated in the context of data (@teunbrand, #6135)
+* Fixed bug where binned scales wouldn't simultaneously accept transformations
+  and function-limits (@teunbrand, #6144).
 * Fixed bug where the `ggplot2::`-prefix did not work with `stage()` 
   (@teunbrand, #6104).
 * New `get_labs()` function for retrieving completed plot labels 

R/backports.R

@@ -67,6 +67,6 @@ on_load({
     as.mask <- grid::as.mask
   }
   if ("linearGradient" %in% getNamespaceExports("grid")) {
-    linearGradient <- grid::linearGradient()
+    linearGradient <- grid::linearGradient
   }
 })

R/facet-.R

@@ -237,8 +237,8 @@ Facet <- ggproto("Facet", NULL,
     # Set panel names
     table$layout$name <- paste(
       "panel",
-      rep(seq_len(dim[2]), dim[1]),
-      rep(seq_len(dim[1]), each = dim[2]),
+      rep(seq_len(dim[2]), each = dim[1]),
+      rep(seq_len(dim[1]), dim[2]),
       sep = "-"
     )
 

R/geom-defaults.R

@@ -11,7 +11,17 @@
 #' @keywords internal
 #' @note
 #' Please note that geom defaults can be set *en masse* via the `theme(geom)`
-#' argument.
+#' argument. The guidelines for when to use which function are as follows:
+#'
+#' * If you want to change defaults for all geoms in all plots, use
+#'   `theme_update(geom = element_geom(...))`.
+#' * If you want to change defaults for all geoms in a single plot, use
+#'   `+ theme(geom = element_geom(...))`.
+#' * If you want to change defaults for one geom in all plots, use
+#'   `update_geom_defaults()`.
+#' * If you want to change settings for one geom in a single plot, use fixed
+#'   aesthetic parameters in a layer, like so: `geom_point(colour = "red")`.
+#'
 #' @export
 #' @examples
 #'

R/geom-histogram.R

@@ -17,6 +17,12 @@
 #' one change at a time. You may need to look at a few options to uncover
 #' the full story behind your data.
 #'
+#' By default, the _height_ of the bars represent the counts within each bin.
+#' However, there are situations where this behavior might produce misleading
+#' plots (e.g., when non-equal-width bins are used), in which case it might be
+#' preferable to have the _area_ of the bars represent the counts (by setting
+#' `aes(y = after_stat(count / width))`). See example below.
+#'
 #' In addition to `geom_histogram()`, you can create a histogram plot by using
 #' `scale_x_binned()` with [geom_bar()]. This method by default plots tick marks
 #' in between each bar.
@@ -63,6 +69,18 @@
 #' ggplot(diamonds, aes(price, after_stat(density), colour = cut)) +
 #'   geom_freqpoly(binwidth = 500)
 #'
+#'
+#' # When using the non-equal-width bins, we should set the area of the bars to
+#' # represent the counts (not the height).
+#' # Here we're using 10 equi-probable bins:
+#' price_bins <- quantile(diamonds$price, probs = seq(0, 1, length = 11))
+#'
+#' ggplot(diamonds, aes(price)) +
+#'   geom_histogram(breaks = price_bins, color = "black") # misleading (height = count)
+#'
+#' ggplot(diamonds, aes(price, after_stat(count / width))) +
+#'   geom_histogram(breaks = price_bins, color = "black") # area = count
+#'
 #' if (require("ggplot2movies")) {
 #' # Often we don't want the height of the bar to represent the
 #' # count of observations, but the sum of some other variable.

R/guide-.R

@@ -381,7 +381,7 @@ Guide <- ggproto(
   # Renders tickmarks
   build_ticks = function(key, elements, params, position = params$position,
                          length = elements$ticks_length) {
-    if (!is.element(elements)) {
+    if (!is.theme_element(elements)) {
       elements <- elements$ticks
     }
     if (!inherits(elements, "element_line")) {

R/plot-build.R

@@ -288,7 +288,7 @@ ggplot_gtable.ggplot_built <- function(data) {
   plot_margin <- calc_element("plot.margin", theme)
   plot_table  <- gtable_add_padding(plot_table, plot_margin)
 
-  if (is.element(theme$plot.background)) {
+  if (is.theme_element(theme$plot.background)) {
     plot_table <- gtable_add_grob(plot_table,
       element_render(theme, "plot.background"),
       t = 1, l = 1, b = -1, r = -1, name = "background", z = -Inf)

R/scale-.R

@@ -319,7 +319,7 @@ binned_scale <- function(aesthetics, scale_name = deprecated(), palette, name =
   }
 
   transform <- as.transform(transform)
-  if (!is.null(limits)) {
+  if (!is.null(limits) && !is.function(limits)) {
     limits <- transform$transform(limits)
   }
 

R/theme-elements.R

@@ -204,7 +204,7 @@ element_geom <- function(
 
 #' @export
 #' @rdname is_tests
-is.element <- function(x) inherits(x, "element")
+is.theme_element <- function(x) inherits(x, "element")
 
 #' @export
 print.element <- function(x, ...) utils::str(x)