ThomasKnecht
diff --git a/‎DESCRIPTION
Lines changed: 3 additions & 1 deletion b/‎DESCRIPTION
Lines changed: 3 additions & 1 deletion
diff --git a/‎NAMESPACE
Lines changed: 2 additions & 0 deletions b/‎NAMESPACE
Lines changed: 2 additions & 0 deletions
diff --git a/‎NEWS.md
Lines changed: 2 additions & 0 deletions b/‎NEWS.md
Lines changed: 2 additions & 0 deletions
diff --git a/‎R/position-nudgestack.R
Lines changed: 115 additions & 0 deletions b/‎R/position-nudgestack.R
Lines changed: 115 additions & 0 deletions
diff --git a/‎man/ggplot2-ggproto.Rd
Lines changed: 10 additions & 9 deletions b/‎man/ggplot2-ggproto.Rd
Lines changed: 10 additions & 9 deletions
diff --git a/‎man/position_dodge.Rd
Lines changed: 1 addition & 0 deletions b/‎man/position_dodge.Rd
Lines changed: 1 addition & 0 deletions
diff --git a/‎man/position_identity.Rd
Lines changed: 1 addition & 0 deletions b/‎man/position_identity.Rd
Lines changed: 1 addition & 0 deletions
diff --git a/‎man/position_jitter.Rd
Lines changed: 1 addition & 0 deletions b/‎man/position_jitter.Rd
Lines changed: 1 addition & 0 deletions
diff --git a/‎man/position_jitterdodge.Rd
Lines changed: 1 addition & 0 deletions b/‎man/position_jitterdodge.Rd
Lines changed: 1 addition & 0 deletions
diff --git a/‎man/position_nudge.Rd
Lines changed: 1 addition & 0 deletions b/‎man/position_nudge.Rd
Lines changed: 1 addition & 0 deletions
diff --git a/‎man/position_nudgestack.Rd
Lines changed: 44 additions & 0 deletions b/‎man/position_nudgestack.Rd
Lines changed: 44 additions & 0 deletions
diff --git a/‎man/position_stack.Rd
Lines changed: 1 addition & 0 deletions b/‎man/position_stack.Rd
Lines changed: 1 addition & 0 deletions
@@ -55,7 +55,8 @@ Suggests:
     sf (>= 0.7-3),
     svglite (>= 1.2.0.9001),
     testthat (>= 2.1.0),
-    vdiffr (>= 0.3.0)
+    vdiffr (>= 0.3.0),
+    tsbox
 Enhances: sp
 License: GPL-2 | file LICENSE
 URL: http://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
@@ -182,6 +183,7 @@ Collate:
     'position-jitter.r'
     'position-jitterdodge.R'
     'position-nudge.R'
+    'position-nudgestack.R'
     'position-stack.r'
     'quick-plot.r'
     'range.r'
 
@@ -204,6 +204,7 @@ export(PositionIdentity)
 export(PositionJitter)
 export(PositionJitterdodge)
 export(PositionNudge)
+export(PositionNudgeStack)
 export(PositionStack)
 export(Scale)
 export(ScaleBinned)
@@ -432,6 +433,7 @@ export(position_identity)
 export(position_jitter)
 export(position_jitterdodge)
 export(position_nudge)
+export(position_nudgestack)
 export(position_stack)
 export(qplot)
 export(quickplot)
 
@@ -1,5 +1,7 @@
 # ggplot2 (development version)
 
+* Added `position_nudgestack()`, which allows to nudge stacked columns. (@ThomasKnecht )
+
 * A new scale type has been added, that allows binning of aesthetics at the 
   scale level. It has versions for both position and non-position aesthetics and
   comes with two new guides (`guide_bins` and `guide_coloursteps`) (@thomasp85, #3096)
 
@@ -0,0 +1,115 @@
+#' Simultaneously nudge and stack
+#'
+#' This is primarily used for set stacked columns between the ticks on the
+#' x-axis.
+#'
+#' @family position adjustments
+#' @param x,y Amount of vertical and horizontal distance to move.
+#' @param vjust Vertical adjustment for geoms that have a position
+#'   (like points or lines), not a dimension (like bars or areas). Set to
+#'   `0` to align with the bottom, `0.5` for the middle,
+#'   and `1` (the default) for the top.
+#' @param reverse If `TRUE`, will reverse the default stacking order.
+#'   This is useful if you're rotating both the plot and legend.
+#' @export
+#' @examples
+#' ESM <- tsbox::ts_tbl(EuStockMarkets)
+#'
+#' ESM_prep <- ESM %>%
+#'   dplyr::mutate(time = as.Date(paste0(format(time, "%Y-%m"), "-1"))) %>%
+#'   dplyr::group_by(id, time) %>%
+#'   dplyr::summarize(value = mean(value)) %>%
+#'   dplyr::filter(time >= "1995-01-01" & time < "1998-01-01")
+#'
+#' ggplot(data = ESM_prep, mapping = aes(x = time, y = value, fill = id)) +
+#'   geom_col(position = position_nudgestack(x = 15))
+position_nudgestack <- function(x = 0, y = 0, vjust = 1, reverse = FALSE) {
+  ggproto(NULL, PositionNudgeStack,
+    x = x,
+    y = y,
+    vjust = vjust,
+    reverse = reverse
+  )
+}
+
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
+#' @export
+PositionNudgeStack <- ggproto("PositionNudgeStack", Position,
+  x = 0,
+  y = 0,
+  vjust = 1,
+  fill = FALSE,
+  reverse = FALSE,
+
+  setup_params = function(self, data) {
+    list(
+      x = self$x,
+      y = self$y,
+      var = if (!is.null(self$var)) self$var else stack_var(data),
+      fill = self$fill,
+      vjust = self$vjust,
+      reverse = self$reverse
+    )
+  },
+
+  setup_data = function(self, data, params) {
+    if (is.null(params$var)) {
+      return(data)
+    }
+
+    data$ymax <- switch(params$var,
+      y = data$y,
+      ymax = ifelse(data$ymax == 0, data$ymin, data$ymax)
+    )
+
+    remove_missing(
+      data,
+      vars = c("x", "xmin", "xmax", "y"),
+      name = "position_stack"
+    )
+  },
+
+  compute_layer = function(self, data, params, layout) {
+    if (is.null(params$var)) {
+      return(data)
+    }
+
+    negative <- data$ymax < 0
+    negative[is.na(negative)] <- FALSE
+
+    neg <- data[negative, , drop = FALSE]
+    pos <- data[!negative, , drop = FALSE]
+
+    if (any(negative)) {
+      neg <- collide(neg, NULL, "position_stack", pos_stack,
+        vjust = params$vjust,
+        fill = params$fill,
+        reverse = params$reverse
+      )
+    }
+    if (any(!negative)) {
+      pos <- collide(pos, NULL, "position_stack", pos_stack,
+        vjust = params$vjust,
+        fill = params$fill,
+        reverse = params$reverse
+      )
+    }
+
+    data <- rbind(neg, pos)[match(seq_len(nrow(data)), c(which(negative), which(!negative))), ]
+
+    # transform only the dimensions for which non-zero nudging is requested
+    if (any(params$x != 0)) {
+      if (any(params$y != 0)) {
+        transform_position(data, function(x) x + params$x, function(y) y + params$y)
+      } else {
+        transform_position(data, function(x) x + params$x, NULL)
+      }
+    } else if (any(params$y != 0)) {
+      transform_position(data, NULL, function(y) y + params$y)
+    } else {
+      data # if both x and y are 0 we don't need to transform
+    }
+  }
+)