Fix #3498 Restore data order after collide (#3680)

Author: thomasp85

R/position-collide.r

@@ -38,10 +38,11 @@ collide <- function(data, width = NULL, name, strategy,
   # Reorder by x position, then on group. The default stacking order reverses
   # the group in order to match the legend order.
   if (reverse) {
-    data <- data[order(data$xmin, data$group), ]
+    ord <- order(data$xmin, data$group)
   } else {
-    data <- data[order(data$xmin, -data$group), ]
+    ord <- order(data$xmin, -data$group)
   }
+  data <- data[ord, ]
 
   # Check for overlap
   intervals <- as.numeric(t(unique(data[c("xmin", "xmax")])))
@@ -54,15 +55,15 @@ collide <- function(data, width = NULL, name, strategy,
   }
 
   if (!is.null(data$ymax)) {
-    dapply(data, "xmin", strategy, ..., width = width)
+    data <- dapply(data, "xmin", strategy, ..., width = width)
   } else if (!is.null(data$y)) {
     data$ymax <- data$y
     data <- dapply(data, "xmin", strategy, ..., width = width)
     data$y <- data$ymax
-    data
   } else {
     abort("Neither y nor ymax defined")
   }
+  data[match(seq_along(ord), ord), ]
 }
 
 # Alternate version of collide() used by position_dodge2()

tests/figs/deps.txt

@@ -1,3 +1,3 @@
 - vdiffr-svg-engine: 1.0
-- vdiffr: 0.3.0
+- vdiffr: 0.3.1
 - freetypeharfbuzz: 0.2.5

tests/figs/position-stack/area-stacking.svg

@@ -1,6 +1,6 @@
 context("position_stack")
 
-test_that("data is sorted prior to stacking", {
+test_that("data keeps its order after stacking", {
   df <- data_frame(
     x = rep(c(1:10), 3),
     var = rep(c("a", "b", "c"), 10),
@@ -9,7 +9,8 @@ test_that("data is sorted prior to stacking", {
   p <- ggplot(df, aes(x = x, y = y, fill = var)) +
     geom_area(position = "stack")
   dat <- layer_data(p)
-  expect_true(all(dat$group == 3:1))
+  expect_true(all(dat$group == rep(1:3, each = 10)))
+  expect_true(all(dat$x == df$x))
 })
 
 test_that("negative and positive values are handled separately", {
@@ -21,8 +22,8 @@ test_that("negative and positive values are handled separately", {
   p <- ggplot(df, aes(x, y, fill = factor(g))) + geom_col()
   dat <- layer_data(p)
 
-  expect_equal(dat$ymin[dat$x == 1], c(0, -1, 1))
-  expect_equal(dat$ymax[dat$x == 1], c(1, 0, 2))
+  expect_equal(dat$ymin[dat$x == 1], c(1, -1, 0))
+  expect_equal(dat$ymax[dat$x == 1], c(2, 0, 1))
 
   expect_equal(dat$ymin[dat$x == 2], c(0, -3))
   expect_equal(dat$ymax[dat$x == 2], c(2, 0))
@@ -49,12 +50,25 @@ test_that("data with no extent is stacked correctly", {
   p0 <- base + geom_text(aes(label = y), position = position_stack(vjust = 0))
   p1 <- base + geom_text(aes(label = y), position = position_stack(vjust = 1))
 
-  expect_equal(layer_data(p0)$y, c(-75, -115))
-  expect_equal(layer_data(p1)$y, c(0, -75))
+  expect_equal(layer_data(p0)$y, c(-115, -75))
+  expect_equal(layer_data(p1)$y, c(-75, 0))
 })
 
 test_that("position_stack() can stack correctly when ymax is NA", {
   df <- data_frame(x = c(1, 1), y = c(1, 1))
   p <- ggplot(df, aes(x, y, ymax = NA_real_)) + geom_point(position = "stack")
   expect_equal(layer_data(p)$y, c(1, 2))
 })
+
+# Visual tests ------------------------------------------------------------
+
+test_that("Stacking produces the expected output", {
+  data <- data_frame(
+    x = rep(1:4, each = 2),
+    category = rep(c("A","B"), 4),
+    value = c(0, 0, 2, 1, 3, 6, -4, 3)
+  )
+  p <- ggplot(data, aes(x = x, y = value, fill = category)) +
+    geom_area(stat = "identity")
+  expect_doppelganger("Area stacking", p)
+})

tests/figs/scales-breaks-and-labels/functional-limits.svg

@@ -8,6 +8,6 @@ test_that("can control whether to preserve total or individual width", {
   p_single <- ggplot(df, aes(x, fill = y)) +
     geom_bar(position = position_dodge(preserve = "single"), width = 1)
 
-  expect_equal(layer_data(p_total)$x, c(1, 2.25, 1.75))
-  expect_equal(layer_data(p_single)$x, c(0.75, 2.25, 1.75))
+  expect_equal(layer_data(p_total)$x, c(1, 1.75, 2.25))
+  expect_equal(layer_data(p_single)$x, c(0.75, 1.75, 2.25))
 })