Fix #306

thomasp85 · Jan 18, 2024 · 1b970b5 · 1b970b5
1 parent bdb7e39
commit 1b970b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,9 @@
   that mark completely while still drawing the mark
 * Fix a bug in `geom_mark_rect()` where the mark would not be shown in all 
   panels (#307)
+* Fixed a bug in the `geom_mark_*()` geoms where having `NA` values in the 
+  `filter` aesthetic would lead to weird errors. `NA` is now treated as `FALSE`
+  (#306)
 
 # ggforce 0.4.1
 

diff --git a/R/mark_circle.R b/R/mark_circle.R
@@ -140,6 +140,7 @@ NULL
 GeomMarkCircle <- ggproto('GeomMarkCircle', GeomShape,
   setup_data = function(self, data, params) {
     if (!is.null(data$filter)) {
+      data$filter <- ifelse(is.na(data$filter), FALSE, data$filter)
       self$removed <- data[!data$filter, c('x', 'y', 'PANEL')]
       data <- data[data$filter, ]
     }

diff --git a/R/mark_rect.R b/R/mark_rect.R
@@ -75,6 +75,7 @@ NULL
 GeomMarkRect <- ggproto('GeomMarkRect', GeomMarkCircle,
   setup_data = function(self, data, params) {
     if (!is.null(data$filter)) {
+      data$filter <- ifelse(is.na(data$filter), FALSE, data$filter)
       self$removed <- data[!data$filter, c('x', 'y', 'PANEL')]
       data <- data[data$filter, ]
     }