Skip to content

Commit c134d2f

Browse files
committed
Fix corner cases "all" and NULL
1 parent 572f7b8 commit c134d2f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

R/tm_data_table.R

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ tm_data_table <- function(label = "Data Table",
136136
ui = ui_page_data_table,
137137
datanames = datanames,
138138
server_args = list(
139-
datanames = datanames,
139+
datanames = if (is.null(datanames)) "all" else datanames,
140140
variables_selected = variables_selected,
141141
dt_args = dt_args,
142142
dt_options = dt_options,
@@ -199,9 +199,10 @@ srv_page_data_table <- function(id,
199199
if_filtered <- reactive(as.logical(input$if_filtered))
200200
if_distinct <- reactive(as.logical(input$if_distinct))
201201

202-
datanames <- Filter(function(name) {
202+
datanames <- Filter(function(name) {
203203
is.data.frame(isolate(data())[[name]])
204-
}, datanames)
204+
}, if (identical(datanames, "all")) names(isolate(data())) else datanames)
205+
205206

206207
output$dataset_table <- renderUI({
207208
do.call(

0 commit comments

Comments
 (0)