Improve tests and type safety

plotly · cpsievert · Nov 2, 2021 · Oct 12, 2021 · Oct 12, 2021 · Oct 12, 2021
commit 391ba4c62e11f6d8e04c76eb3138baa289fe9f43
diff --git a/R/layers2traces.R b/R/layers2traces.R
@@ -613,33 +613,35 @@ to_basic.GeomQuantile <- function(data, prestats_data, layout, params, p, ...){
  dat
 }

+# ggalluvial::GeomStratum
 #' @export
-to_basic.GeomStratum <- function (data, ...) {
+to_basic.GeomStratum <- function(data, ...) {
  to_basic.GeomRect(data, ...)
 }

+# ggalluvial::GeomAlluvium
 #' @export 
-to_basic.GeomAlluvium <- function (data, ...) {
-  prefix_class(transform_alluvium(data), "GeomPolygon") 
-}
-
-# transform the alluvium data into the corresponding polygons
-transform_alluvium <- function(data) {
+to_basic.GeomAlluvium <- function(data, ...) {
  data <- data[order(data$x), ]

-  if(unique(data$colour) == 0) data$colour <- NULL
+  cols <- unique(data$colour)
+  if (length(cols) == 1 && cols[1] == 0) {
+    data$colour <- NULL
+  }
+
+  unused_aes <- !names(data) %in% c("x", "y", "ymin", "ymax")

-  unused_aes <- ! names(data) %in% c("x", "y", "ymin", "ymax")
-
  row_number <- nrow(data)
-
+  
  data_rev <- data[rev(seq_len(row_number)), ]
-
-  structure(rbind(
+  
+  d <- structure(rbind(
    cbind(x = data$x, y = data$ymin, data[unused_aes]),
    cbind(x = data$x[row_number], y = data$ymin[row_number], data[row_number, unused_aes]),
    cbind(x = data_rev$x, y = data_rev$ymax, data_rev[unused_aes])
  ), class = class(data))
+
+  prefix_class(d, "GeomPolygon") 
 }

 #' @export