append old uneval class

Author: teunbrand

R/all-classes.R

@@ -95,7 +95,9 @@ class_mapping <- S7::new_class(
   constructor = function(x, env = globalenv()) {
     check_object(x, is.list, "a {.cls list}")
     x <- lapply(x, new_aesthetic, env = env)
-    S7::new_object(x)
+    x <- S7::new_object(x)
+    class(x) <- union(c("ggplot2::mapping", "uneval"), class(x))
+    x
   }
 )
 

R/labels.R

@@ -29,6 +29,7 @@ setup_plot_labels <- function(plot, layers, data) {
     if (inherits(mapping, "unlabelled")) {
       next
     }
+    mapping <- mapping[have_name(mapping)]
 
     mapping <- strip_stage(mapping)
     mapping <- strip_dots(mapping, strip_pronoun = TRUE)

R/layer.R

@@ -202,7 +202,8 @@ layer <- function(geom = NULL, stat = NULL,
 validate_mapping <- function(mapping, call = caller_env()) {
   # Upgrade any old S3 input to new S7 input
   # TODO: deprecate this after a while
-  if (inherits(mapping, "uneval") && is.list(mapping)) {
+  is_old_mapping <- !S7::S7_inherits(mapping) && inherits(mapping, "uneval")
+  if (is_old_mapping && is.list(mapping)) {
     mapping <- aes(!!!mapping)
   }