fix trace processing if number of subplots >= 10

Author: alyst

R/layers2traces.R

@@ -57,14 +57,18 @@ layers2traces <- function(data, prestats_data, layout, p) {
     # if so, set name/legendgroup/showlegend
     isDiscrete <- names(d) %in% paste0(names(discreteScales), "_plotlyDomain")
     if (length(trs) > 1 && sum(isDiscrete) >= 1) {
-      nms <- names(trs)
+      nms <- strsplit(names(trs), "@%&", fixed = TRUE)
       # ignore "non-discrete" scales that we've split on
-      for (w in seq_len(sum(names(d) %in% c("PANEL", split_on(d))))) {
-        nms <- sub("^[^@%&]@%&", "", nms)
-      }
-      nms <- strsplit(nms, "@%&")
+      n_ignore <- sum(names(d) %in% c("PANEL", split_on(d)))
       nms <- vapply(nms, function(x) {
-        if (length(x) > 1) paste0("(", paste0(x, collapse = ","), ")") else x
+        n_x <- length(x)
+        if (n_x > n_ignore + 1) {
+          paste0("(", paste0(x[(n_ignore+1):n_x], collapse = ","), ")")
+        } else if (n_x > n_ignore) {
+          x[[n_ignore+1]]
+        } else {
+          NA
+        }
       }, character(1))
       trs <- Map(function(x, y) {
         x$name <- y