Misc plot fixes

NAMESPACE

@@ -25,6 +25,7 @@ S3method(generate_code,arrange_block)
 S3method(generate_code,block)
 S3method(generate_code,call)
 S3method(generate_code,data_block)
+S3method(generate_code,plot_block)
 S3method(generate_code,stack)
 S3method(generate_code,transform_block)
 S3method(generate_server,data_block)

R/block.R

@@ -122,6 +122,17 @@
   NextMethod()
 }
 
+#' @rdname new_block
+#' @export
+generate_code.plot_block <- function(x) {
+
+  if (!is_initialized(x)) {
+    return(quote(identity()))
+  }
+
+  NextMethod()
+}
+
 #' @rdname new_block
 #' @export
 generate_code.call <- function(x) {
@@ -155,7 +166,13 @@
 #' @param data Result from previous block
 #' @rdname new_block
 #' @export
-evaluate_block.plot_block <- evaluate_block.transform_block
+evaluate_block.plot_block <- function(x, data, ...) {
+  stopifnot(...length() == 0L)
+  eval(
+    substitute(data %>% expr, list(expr = generate_code(x))),
+    list(data = data)
+  )
+}
 
 #' @param data Result from previous block
 #' @rdname new_block

R/field.R

@@ -64,6 +64,10 @@ update_field.field <- function(x, new, env = list()) {
 
   x <- eval_set_field_value(x, env)
 
+  if (!length(new)) {
+    return(validate_field(x))
+  }
+
   value(x) <- new
 
   res <- validate_field(x)

R/ui.R

@@ -480,12 +480,19 @@ ui_input.string_field <- function(x, id, name) {
 #' @rdname generate_ui
 #' @export
 ui_input.select_field <- function(x, id, name) {
+
+  opts <- list(
+    dropdownParent = "body",
+    placeholder = "Please select an option below"
+  )
+
+  if (!isTRUE(value(x, "multiple"))) {
+    opts <- c(opts, list(maxItems = 1L))
+  }
+
   selectizeInput(
-    input_ids(x, id), name, value(x, "choices"), value(x), value(x, "multiple"),
-    options = list(
-      dropdownParent = "body",
-      placeholder = "Please select an option below"
-    )
+    input_ids(x, id), name, value(x, "choices"), value(x), multiple = TRUE,
+    options = opts
   )
 }