Raise error for showSelected2 aesthetic/parameter usage

R/z_animintHelpers.R

@@ -173,13 +173,30 @@ hjust2anchor <- function(hjust){
   }
 }
 
+#' @param params Named list of layer parameters
+#' @return NULL if valid, stops with error if invalid showSelected variant found
+validateShowSelectedParams <- function(params) {
+  if (is.null(params) || length(params) == 0 || is.null(names(params))) {
+    return(NULL)
+  }
+  param_names <- names(params)
+  # Match any parameter that starts with "showSelected" but is not "showSelected"
+  invalid_showSelected <- param_names[grepl("^showSelected.+", param_names)]
+  invalid_showSelected <- setdiff(invalid_showSelected, "showSelected")
+
+  if (length(invalid_showSelected) > 0) {
+    stop("Use of clickSelects and showSelected as aesthetics has been deprecated. Please use them as parameters instead.",
+         call. = FALSE)
+  }
+}
 
 #' Get all parameters for a layer
 #'
 #' @param l A single layer of the plot
 #' @return All parameters in the layer
 getLayerParams <- function(l){
   params <- c(l$geom_params, l$stat_params, l$aes_params, l$extra_params)
+  validateShowSelectedParams(params)
   if("chunk_vars" %in% names(params) && is.null(params[["chunk_vars"]])){
     params[["chunk_vars"]] <- character()
   }

inst/examples/Climate-selected.R

@@ -95,7 +95,7 @@ viz$scatterNow <- ggplot()+
              clickSelects="id", showSelected="time2",
              data=climate, alpha=dot.alpha)+
   geom_point(aes_string(x=var.names[[1]], y=var.names[[2]]),
-             showSelected2="id", showSelected="time2",
+             showSelected=c("id","time2"),
              data=climate, colour="black", fill=selected.color)
 for(var.name in var.names){
   long.name <- long.names[[var.name]]
@@ -140,7 +140,7 @@ viz$scatterHere <- ggplot()+
              data=climate, alpha=dot.alpha)
   ##+
   geom_point(aes_string(x=var.names[[1]], y=var.names[[2]]),
-             showSelected2="time2", showSelected="id",
+             showSelected=c("time2","id"),
              data=climate, color="black", fill="white")
 viz$width <-
   structure(as.list(rep(400, length(viz))),

tests/testthat/test-compiler-plot-named-timexxx.R

@@ -13,7 +13,7 @@ viz <-
                     data=not.na)+
        geom_text(aes(life.expectancy, fertility.rate, label=country),
                  data=not.na,
-                     showSelected="country", showSelected2="year")+
+                     showSelected=c("country", "year"))+
        scale_size_animint(breaks=10^(5:9))+
        make_text(WorldBank, 55, 9, "year"),
 
@@ -64,4 +64,3 @@ test_that("plot named time is NOT OK", {
     animint2dir(bad, open.browser=FALSE)
   }, "time option list needs ms, variable")
 })
-

tests/testthat/test-compiler-save-separate-chunks.R

@@ -324,4 +324,4 @@ test_that("save separate chunks for non-spatial geoms with nest_order not being
   must.have <- c("x", "xend", "y", "yend", "group")
   expect_true(all(must.have %in% names(varied.data)))
   unlink(out.dir, recursive = TRUE)
-})
+})

tests/testthat/test-renderer1-WorldBank-NA.R

@@ -95,4 +95,4 @@ test_that("bars render with time", {
   num.vec <- as.numeric(at.mat[c("x", "width", "y", "height"), ])
   expect_true(0 < ncol(at.mat))
   expect_true(all(is.finite(num.vec)))
-})
+})