reorg internal htmlwidget config

R/uPlot.R

@@ -30,21 +30,24 @@
 #'   )
 #' )
 uPlot <- function(data, options = list(), ..., width = NULL, height = NULL, elementId = NULL) {
-
+  options <- as.list(options)
+  series_nms <- names(data)
   if (is.data.frame(data)) {
     data <- prepare_data(data)
-    if (length(options) < 1) {
-      labels <- attr(data, ".nms")
-      strokes <- rep_len(palette(), length(labels))
-      options <- prepare_options_series(label = labels, stroke = strokes)
+    series_nms <- attr(data, ".nms")
+    if (is.null(options$series)) {
+      strokes <- rep_len(palette(), length(series_nms))
+      options$series <- prepare_options_series(label = series_nms, stroke = strokes)
     }
   }
 
-
   x <- list(
-    data = data,
-    options = options,
-    ...
+    config = list(
+      data = data,
+      options = options,
+      ...
+    ),
+    series_nms = series_nms
   )
 
   htmlwidgets::createWidget(

R/utils.R

@@ -21,12 +21,10 @@ prepare_data <- function(.data) {
 
 prepare_options_series <- function(...) {
   opts <- list(...)
-  list(
-    series = lapply(
-      X = seq_along(opts[[1]]),
-      FUN = function(i) {
-        lapply(X = opts, FUN = `[[`, i)
-      }
-    )
+  lapply(
+    X = seq_along(opts[[1]]),
+    FUN = function(i) {
+      lapply(X = opts, FUN = `[[`, i)
+    }
   )
 }

srcjs/widgets/uPlot.js

@@ -114,10 +114,10 @@ HTMLWidgets.widget({
         if (typeof plot !== "undefined") {
           plot.destroy();
         }
-        options = x.options;
+        options = x.config.options;
         options.width = width;
         options.height = height;
-        data = x.data;
+        data = x.config.data;
         if (x.stacked) {
           if (!options.hooks)
             options.hooks = {};