feat: support named palcolor and keep the order (pwwang/scplotter#12)

pwwang · Nov 21, 2024 · 9b4c9c3 · 9b4c9c3
1 parent 38fc906
commit 9b4c9c3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -40,6 +40,7 @@ Imports:
     cowplot,
     zoo
 Suggests:
+    testthat,
     ComplexHeatmap,
     clustree,
     gglogger,

diff --git a/R/theming.R b/R/theming.R
@@ -197,13 +197,17 @@ palette_this <- function(
         n_x <- nlevels(x)
         if (isTRUE(attr(palcolor, "type") == "continuous")) {
             color <- colorRampPalette(palcolor)(n_x)
+            names(color) <- levels(x)
+        } else if (!is.null(names(palcolor))) {
+            color <- palcolor[intersect(names(palcolor), levels(x))]
         } else {
             color <- ifelse(rep(n_x, n_x) <= pal_n,
                 palcolor[1:n_x],
                 colorRampPalette(palcolor)(n_x)
             )
+            names(color) <- levels(x)
         }
-        names(color) <- levels(x)
+
         if (any(is.na(x))) {
             color <- c(color, setNames(NA_color, "NA"))
         }

diff --git a/man/LinePlot.Rd b/man/LinePlot.Rd
diff --git a/man/ScatterPlot.Rd b/man/ScatterPlot.Rd