Add checks that transforms are functions

If geom does not end in "repel" and label.fill == "" set label.fill to NA. This greatly improves performance of geom_label()
aphalo · Sep 27, 2024 · 4766536 · 4766536
1 parent 9d10403
commit 4766536
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/R/stat-label-peaks.R b/R/stat-label-peaks.R
@@ -170,6 +170,17 @@ stat_label_peaks <-
            na.rm = TRUE,
            show.legend = FALSE,
            inherit.aes = TRUE) {
+    if (!(is.function(x.label.transform) &&
+          is.function(y.label.transform) &&
+          is.function(colour.transform))) {
+      stop("'transform' arguments must be function defintions")
+    }
+
+    # for performance
+    if (!grepl("repel$", geom) && label.fill == "") {
+      label.fill <- NA_character_
+    }
+
     ggplot2::layer(
       stat = StatLabelPeaks, data = data, mapping = mapping, geom = geom,
       position = position, show.legend = show.legend, inherit.aes = inherit.aes,
@@ -293,7 +304,18 @@ stat_label_valleys <- function(mapping = NULL,
                                na.rm = TRUE,
                                show.legend = FALSE,
                                inherit.aes = TRUE) {
-    ggplot2::layer(
+  if (!(is.function(x.label.transform) &&
+        is.function(y.label.transform) &&
+        is.function(colour.transform))) {
+    stop("'transform' arguments must be function defintions")
+  }
+
+  # for performance
+  if (!grepl("repel$", geom) && label.fill == "") {
+    label.fill <- NA_character_
+  }
+
+  ggplot2::layer(
     stat = StatLabelValleys, data = data, mapping = mapping, geom = geom,
     position = position, show.legend = show.legend, inherit.aes = inherit.aes,
     params = list(span = span,

diff --git a/R/stat-peaks.R b/R/stat-peaks.R
@@ -163,6 +163,12 @@ stat_peaks <- function(mapping = NULL,
                        na.rm = FALSE,
                        show.legend = FALSE,
                        inherit.aes = TRUE) {
+  if (!(is.function(x.label.transform) &&
+        is.function(y.label.transform) &&
+        is.function(colour.transform))) {
+    stop("'transform' arguments must be function defintions")
+  }
+
   ggplot2::layer(
     stat = StatPeaks, data = data, mapping = mapping, geom = geom,
     position = position, show.legend = show.legend, inherit.aes = inherit.aes,
@@ -269,6 +275,12 @@ stat_valleys <- function(mapping = NULL,
                          na.rm = FALSE,
                          show.legend = FALSE,
                          inherit.aes = TRUE) {
+  if (!(is.function(x.label.transform) &&
+        is.function(y.label.transform) &&
+        is.function(colour.transform))) {
+    stop("'transform' arguments must be function defintions")
+  }
+
   ggplot2::layer(
     stat = StatValleys, data = data, mapping = mapping, geom = geom,
     position = position, show.legend = show.legend, inherit.aes = inherit.aes,