Allow partial labelling of marks

thomasp85 · Jan 18, 2024 · 4d24824 · 4d24824
1 parent 6f1f8d8
commit 4d24824
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,8 @@
 
 * Fixed a bug that would cause reordering of data in some geoms (#314)
 * The concaveman package is no longer a dependency for `geom_mark_hull()` (#308)
+* Setting both label and description to `NA` will now turn off label drawing for
+  that mark completely while still drawing the mark
 
 # ggforce 0.4.1
 

diff --git a/R/mark_circle.R b/R/mark_circle.R
@@ -332,6 +332,7 @@ circEncGrob <- function(x = c(0, 0.5, 1, 0.5), y = c(0.5, 1, 0.5, 0), id = NULL,
   )
   if (!is.null(label)) {
     label <- lapply(seq_len(nrow(label)), function(i) {
+      if (is.na(label$label[i] %||% NA) && is.na(label$description[i] %||% NA)) return(zeroGrob())
       grob <- labelboxGrob(label$label[i], 0, 0, label$description[i],
         gp = label.gp, pad = label.margin, width = label.width,
         min.width = label.minwidth, hjust = label.hjust

diff --git a/R/mark_ellipse.R b/R/mark_ellipse.R
@@ -261,6 +261,7 @@ ellipEncGrob <- function(x = c(0, 0.5, 1, 0.5), y = c(0.5, 1, 0.5, 0), id = NULL
   )
   if (!is.null(label)) {
     label <- lapply(seq_len(nrow(label)), function(i) {
+      if (is.na(label$label[i] %||% NA) && is.na(label$description[i] %||% NA)) return(zeroGrob())
       grob <- labelboxGrob(label$label[i], 0, 0, label$description[i],
         gp = label.gp, pad = label.margin, width = label.width,
         min.width = label.minwidth, hjust = label.hjust

diff --git a/R/mark_hull.R b/R/mark_hull.R
@@ -246,6 +246,7 @@ hullEncGrob <- function(x = c(0, 0.5, 1, 0.5), y = c(0.5, 1, 0.5, 0), id = NULL,
   )
   if (!is.null(label)) {
     label <- lapply(seq_len(nrow(label)), function(i) {
+      if (is.na(label$label[i] %||% NA) && is.na(label$description[i] %||% NA)) return(zeroGrob())
       grob <- labelboxGrob(label$label[i], 0, 0, label$description[i],
         gp = label.gp, pad = label.margin, width = label.width,
         min.width = label.minwidth, hjust = label.hjust

diff --git a/R/mark_rect.R b/R/mark_rect.R
@@ -243,6 +243,7 @@ rectEncGrob <- function(x = c(0, 0.5, 1, 0.5), y = c(0.5, 1, 0.5, 0), id = NULL,
   )
   if (!is.null(label)) {
     label <- lapply(seq_len(nrow(label)), function(i) {
+      if (is.na(label$label[i] %||% NA) && is.na(label$description[i] %||% NA)) return(zeroGrob())
       grob <- labelboxGrob(label$label[i], 0, 0, label$description[i],
         gp = label.gp, pad = label.margin, width = label.width,
         min.width = label.minwidth, hjust = label.hjust