Moved function definition

rstudio · Apr 8, 2024 · 2ad1562 · 2ad1562
1 parent 4e63a46
commit 2ad1562
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/R/shiny.R b/R/shiny.R
@@ -99,15 +99,7 @@ renderDataTable = function(
 
   exprFunc = shiny::exprToFunction(expr, env, quoted = TRUE)
   argFunc = shiny::exprToFunction(list(..., server = server), parent.frame(), quoted = FALSE)
-  widgetFunc = function() {
-    opts = options(DT.datatable.shiny = TRUE); on.exit(options(opts), add = TRUE)
-    instance = exprFunc()
-    if (promises::is.promising(instance)) {
-      promises::then(instance, processWidget)
-    } else {
-      processWidget(instance)
-    }
-  }
+
   processWidget = function(instance) {
     args = argFunc()
     server = args$server; args$server = NULL # the last element is `server`
@@ -167,6 +159,16 @@ renderDataTable = function(
     instance
   }
 
+  widgetFunc = function() {
+    opts = options(DT.datatable.shiny = TRUE); on.exit(options(opts), add = TRUE)
+    instance = exprFunc()
+    if (promises::is.promising(instance)) {
+      promises::then(instance, processWidget)
+    } else {
+      processWidget(instance)
+    }
+  }
+
   renderFunc = htmlwidgets::shinyRenderWidget(
     widgetFunc(), dataTableOutput, environment(), FALSE
   )