diff --git a/R/FilterStateChoices.R b/R/FilterStateChoices.R index 96826ae45..17429c68e 100644 --- a/R/FilterStateChoices.R +++ b/R/FilterStateChoices.R @@ -46,25 +46,25 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("ChoicesFilterState"), +#' column(4, tags$div( +#' tags$h4("ChoicesFilterState"), #' fs$ui("fs") #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState -#' textOutput("condition_choices"), shiny::tags$br(), -#' shiny::tags$h4("Unformatted state"), # display raw filter state -#' textOutput("unformatted_choices"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_choices"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState +#' textOutput("condition_choices"), tags$br(), +#' tags$h4("Unformatted state"), # display raw filter state +#' textOutput("unformatted_choices"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_choices"), tags$br() #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Programmatic filter control"), -#' actionButton("button1_choices", "set drop NA", width = "100%"), shiny::tags$br(), -#' actionButton("button2_choices", "set keep NA", width = "100%"), shiny::tags$br(), -#' actionButton("button3_choices", "set selection: a, b", width = "100%"), shiny::tags$br(), -#' actionButton("button4_choices", "deselect all", width = "100%"), shiny::tags$br(), -#' actionButton("button0_choices", "set initial state", width = "100%"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Programmatic filter control"), +#' actionButton("button1_choices", "set drop NA", width = "100%"), tags$br(), +#' actionButton("button2_choices", "set keep NA", width = "100%"), tags$br(), +#' actionButton("button3_choices", "set selection: a, b", width = "100%"), tags$br(), +#' actionButton("button4_choices", "deselect all", width = "100%"), tags$br(), +#' actionButton("button0_choices", "set initial state", width = "100%"), tags$br() #' )) #' ) #' diff --git a/R/FilterStateDate.R b/R/FilterStateDate.R index 3c28e80e7..31ed3d50a 100644 --- a/R/FilterStateDate.R +++ b/R/FilterStateDate.R @@ -47,26 +47,26 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("DateFilterState"), +#' column(4, tags$div( +#' tags$h4("DateFilterState"), #' fs$ui("fs") #' )), -#' column(4, shiny::tags$div( +#' column(4, tags$div( #' id = "outputs", # div id is needed for toggling the element -#' shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState -#' textOutput("condition_date"), shiny::tags$br(), -#' shiny::tags$h4("Unformatted state"), # display raw filter state -#' textOutput("unformatted_date"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_date"), shiny::tags$br() +#' tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState +#' textOutput("condition_date"), tags$br(), +#' tags$h4("Unformatted state"), # display raw filter state +#' textOutput("unformatted_date"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_date"), tags$br() #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Programmatic filter control"), -#' actionButton("button1_date", "set drop NA", width = "100%"), shiny::tags$br(), -#' actionButton("button2_date", "set keep NA", width = "100%"), shiny::tags$br(), -#' actionButton("button3_date", "set a range", width = "100%"), shiny::tags$br(), -#' actionButton("button4_date", "set full range", width = "100%"), shiny::tags$br(), -#' actionButton("button0_date", "set initial state", width = "100%"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Programmatic filter control"), +#' actionButton("button1_date", "set drop NA", width = "100%"), tags$br(), +#' actionButton("button2_date", "set keep NA", width = "100%"), tags$br(), +#' actionButton("button3_date", "set a range", width = "100%"), tags$br(), +#' actionButton("button4_date", "set full range", width = "100%"), tags$br(), +#' actionButton("button0_date", "set initial state", width = "100%"), tags$br() #' )) #' ) #' diff --git a/R/FilterStateDatettime.R b/R/FilterStateDatettime.R index 221e0f568..6bc6d8c81 100644 --- a/R/FilterStateDatettime.R +++ b/R/FilterStateDatettime.R @@ -47,26 +47,26 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("DatetimeFilterState"), +#' column(4, tags$div( +#' tags$h4("DatetimeFilterState"), #' fs$ui("fs") #' )), -#' column(4, shiny::tags$div( +#' column(4, tags$div( #' id = "outputs", # div id is needed for toggling the element -#' shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState -#' textOutput("condition_datetime"), shiny::tags$br(), -#' shiny::tags$h4("Unformatted state"), # display raw filter state -#' textOutput("unformatted_datetime"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_datetime"), shiny::tags$br() +#' tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState +#' textOutput("condition_datetime"), tags$br(), +#' tags$h4("Unformatted state"), # display raw filter state +#' textOutput("unformatted_datetime"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_datetime"), tags$br() #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Programmatic filter control"), -#' actionButton("button1_datetime", "set drop NA", width = "100%"), shiny::tags$br(), -#' actionButton("button2_datetime", "set keep NA", width = "100%"), shiny::tags$br(), -#' actionButton("button3_datetime", "set a range", width = "100%"), shiny::tags$br(), -#' actionButton("button4_datetime", "set full range", width = "100%"), shiny::tags$br(), -#' actionButton("button0_datetime", "set initial state", width = "100%"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Programmatic filter control"), +#' actionButton("button1_datetime", "set drop NA", width = "100%"), tags$br(), +#' actionButton("button2_datetime", "set keep NA", width = "100%"), tags$br(), +#' actionButton("button3_datetime", "set a range", width = "100%"), tags$br(), +#' actionButton("button4_datetime", "set full range", width = "100%"), tags$br(), +#' actionButton("button0_datetime", "set initial state", width = "100%"), tags$br() #' )) #' ) #' diff --git a/R/FilterStateExpr.R b/R/FilterStateExpr.R index 7fd0a5191..edfd9b48c 100644 --- a/R/FilterStateExpr.R +++ b/R/FilterStateExpr.R @@ -36,17 +36,17 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("ChoicesFilterState"), +#' column(4, tags$div( +#' tags$h4("ChoicesFilterState"), #' filter_state$ui("fs") #' )), -#' column(8, shiny::tags$div( -#' shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState -#' textOutput("condition_choices"), shiny::tags$br(), -#' shiny::tags$h4("Unformatted state"), # display raw filter state -#' textOutput("unformatted_choices"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_choices"), shiny::tags$br() +#' column(8, tags$div( +#' tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState +#' textOutput("condition_choices"), tags$br(), +#' tags$h4("Unformatted state"), # display raw filter state +#' textOutput("unformatted_choices"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_choices"), tags$br() #' )) #' ) #' diff --git a/R/FilterStateLogical.R b/R/FilterStateLogical.R index 3f93d7936..283a30585 100644 --- a/R/FilterStateLogical.R +++ b/R/FilterStateLogical.R @@ -38,25 +38,25 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("LogicalFilterState"), +#' column(4, tags$div( +#' tags$h4("LogicalFilterState"), #' fs$ui("fs") #' )), -#' column(4, shiny::tags$div( +#' column(4, tags$div( #' id = "outputs", # div id is needed for toggling the element -#' shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState -#' textOutput("condition_logical"), shiny::tags$br(), -#' shiny::tags$h4("Unformatted state"), # display raw filter state -#' textOutput("unformatted_logical"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_logical"), shiny::tags$br() +#' tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState +#' textOutput("condition_logical"), tags$br(), +#' tags$h4("Unformatted state"), # display raw filter state +#' textOutput("unformatted_logical"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_logical"), tags$br() #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Programmatic filter control"), -#' actionButton("button1_logical", "set drop NA", width = "100%"), shiny::tags$br(), -#' actionButton("button2_logical", "set keep NA", width = "100%"), shiny::tags$br(), -#' actionButton("button3_logical", "set a selection", width = "100%"), shiny::tags$br(), -#' actionButton("button0_logical", "set initial state", width = "100%"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Programmatic filter control"), +#' actionButton("button1_logical", "set drop NA", width = "100%"), tags$br(), +#' actionButton("button2_logical", "set keep NA", width = "100%"), tags$br(), +#' actionButton("button3_logical", "set a selection", width = "100%"), tags$br(), +#' actionButton("button0_logical", "set initial state", width = "100%"), tags$br() #' )) #' ) #' diff --git a/R/FilterStateRange.R b/R/FilterStateRange.R index 070246fa1..2c0f66b4e 100644 --- a/R/FilterStateRange.R +++ b/R/FilterStateRange.R @@ -50,28 +50,28 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("RangeFilterState"), +#' column(4, tags$div( +#' tags$h4("RangeFilterState"), #' fs$ui("fs") #' )), -#' column(4, shiny::tags$div( +#' column(4, tags$div( #' id = "outputs", # div id is needed for toggling the element -#' shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState -#' textOutput("condition_range"), shiny::tags$br(), -#' shiny::tags$h4("Unformatted state"), # display raw filter state -#' textOutput("unformatted_range"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_range"), shiny::tags$br() +#' tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState +#' textOutput("condition_range"), tags$br(), +#' tags$h4("Unformatted state"), # display raw filter state +#' textOutput("unformatted_range"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_range"), tags$br() #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Programmatic filter control"), -#' actionButton("button1_range", "set drop NA", width = "100%"), shiny::tags$br(), -#' actionButton("button2_range", "set keep NA", width = "100%"), shiny::tags$br(), -#' actionButton("button3_range", "set drop Inf", width = "100%"), shiny::tags$br(), -#' actionButton("button4_range", "set keep Inf", width = "100%"), shiny::tags$br(), -#' actionButton("button5_range", "set a range", width = "100%"), shiny::tags$br(), -#' actionButton("button6_range", "set full range", width = "100%"), shiny::tags$br(), -#' actionButton("button0_range", "set initial state", width = "100%"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Programmatic filter control"), +#' actionButton("button1_range", "set drop NA", width = "100%"), tags$br(), +#' actionButton("button2_range", "set keep NA", width = "100%"), tags$br(), +#' actionButton("button3_range", "set drop Inf", width = "100%"), tags$br(), +#' actionButton("button4_range", "set keep Inf", width = "100%"), tags$br(), +#' actionButton("button5_range", "set a range", width = "100%"), tags$br(), +#' actionButton("button6_range", "set full range", width = "100%"), tags$br(), +#' actionButton("button0_range", "set initial state", width = "100%"), tags$br() #' )) #' ) #' diff --git a/R/FilterStates-utils.R b/R/FilterStates-utils.R index cb205bb8b..ca41b83a4 100644 --- a/R/FilterStates-utils.R +++ b/R/FilterStates-utils.R @@ -35,7 +35,7 @@ #' #' library(shiny) #' ui <- fluidPage( -#' actionButton("clear", shiny::tags$span(icon("xmark"), "Remove all filters")), +#' actionButton("clear", tags$span(icon("xmark"), "Remove all filters")), #' rf$ui_add(id = "add"), #' rf$ui_active("states"), #' verbatimTextOutput("expr"), diff --git a/R/FilterStatesDF.R b/R/FilterStatesDF.R index c3e0110bd..82dcb7ed7 100644 --- a/R/FilterStatesDF.R +++ b/R/FilterStatesDF.R @@ -46,35 +46,35 @@ #' useShinyjs(), #' include_css_files(pattern = "filter-panel"), #' include_js_files(pattern = "count-bar-labels"), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Active filters"), +#' column(4, tags$div( +#' tags$h4("Active filters"), #' filter_states_df$ui_active("fsdf") #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Manual filter control"), -#' filter_states_df$ui_add("add_filters"), shiny::tags$br(), -#' shiny::tags$h4("Condition (i.e. call)"), # display the subset expression generated by this FilterStates -#' textOutput("call_df"), shiny::tags$br(), -#' shiny::tags$h4("Formatted state"), # display human readable filter state -#' textOutput("formatted_df"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Manual filter control"), +#' filter_states_df$ui_add("add_filters"), tags$br(), +#' tags$h4("Condition (i.e. call)"), # display the subset expression generated by this FilterStates +#' textOutput("call_df"), tags$br(), +#' tags$h4("Formatted state"), # display human readable filter state +#' textOutput("formatted_df"), tags$br() #' )), -#' column(4, shiny::tags$div( -#' shiny::tags$h4("Programmatic filter control"), -#' actionButton("button1_df", "set NUM1 < 30", width = "100%"), shiny::tags$br(), -#' actionButton("button2_df", "set NUM2 %in% c(20, 21)", width = "100%"), shiny::tags$br(), -#' actionButton("button3_df", "set CHAR1 %in% c(\"B\", \"C\", \"D\")", width = "100%"), shiny::tags$br(), -#' actionButton("button4_df", "set CHAR2 == \"F\"", width = "100%"), shiny::tags$br(), -#' actionButton("button5_df", "set DATE <= 2020-02-02", width = "100%"), shiny::tags$br(), -#' actionButton("button6_df", "set DATETIME <= 2020-02-02", width = "100%"), shiny::tags$br(), -#' shiny::tags$hr(), -#' actionButton("button7_df", "remove NUM1", width = "100%"), shiny::tags$br(), -#' actionButton("button8_df", "remove NUM2", width = "100%"), shiny::tags$br(), -#' actionButton("button9_df", "remove CHAR1", width = "100%"), shiny::tags$br(), -#' actionButton("button10_df", "remove CHAR2", width = "100%"), shiny::tags$br(), -#' actionButton("button11_df", "remove DATE", width = "100%"), shiny::tags$br(), -#' actionButton("button12_df", "remove DATETIME", width = "100%"), shiny::tags$br(), -#' shiny::tags$hr(), -#' actionButton("button0_df", "clear all filters", width = "100%"), shiny::tags$br() +#' column(4, tags$div( +#' tags$h4("Programmatic filter control"), +#' actionButton("button1_df", "set NUM1 < 30", width = "100%"), tags$br(), +#' actionButton("button2_df", "set NUM2 %in% c(20, 21)", width = "100%"), tags$br(), +#' actionButton("button3_df", "set CHAR1 %in% c(\"B\", \"C\", \"D\")", width = "100%"), tags$br(), +#' actionButton("button4_df", "set CHAR2 == \"F\"", width = "100%"), tags$br(), +#' actionButton("button5_df", "set DATE <= 2020-02-02", width = "100%"), tags$br(), +#' actionButton("button6_df", "set DATETIME <= 2020-02-02", width = "100%"), tags$br(), +#' tags$hr(), +#' actionButton("button7_df", "remove NUM1", width = "100%"), tags$br(), +#' actionButton("button8_df", "remove NUM2", width = "100%"), tags$br(), +#' actionButton("button9_df", "remove CHAR1", width = "100%"), tags$br(), +#' actionButton("button10_df", "remove CHAR2", width = "100%"), tags$br(), +#' actionButton("button11_df", "remove DATE", width = "100%"), tags$br(), +#' actionButton("button12_df", "remove DATETIME", width = "100%"), tags$br(), +#' tags$hr(), +#' actionButton("button0_df", "clear all filters", width = "100%"), tags$br() #' )) #' ) #' diff --git a/R/FilteredData-utils.R b/R/FilteredData-utils.R index 6b13df0c8..b44f5232b 100644 --- a/R/FilteredData-utils.R +++ b/R/FilteredData-utils.R @@ -95,8 +95,8 @@ eval_expr_with_msg <- function(expr, env) { #' actionButton("hide_content", label = "hide", icon = icon("xmark")), #' actionButton("show_content", label = "show", icon = icon("check")), #' actionButton("toggle_content", label = "toggle", icon = icon("angle-down")), -#' shiny::tags$br(), -#' shiny::tags$div( +#' tags$br(), +#' tags$div( #' id = "content", #' verbatimTextOutput("printout") #' ) diff --git a/R/count_labels.R b/R/count_labels.R index 38f9074dc..5e0815eb9 100644 --- a/R/count_labels.R +++ b/R/count_labels.R @@ -39,7 +39,7 @@ #' ) #' #' ui <- fluidPage( -#' shiny::tags$div( +#' tags$div( #' class = "choices_state", #' include_js_files("count-bar-labels.js"), #' include_css_files(pattern = "filter-panel"), diff --git a/man/ChoicesFilterState.Rd b/man/ChoicesFilterState.Rd index 9cae63b26..0aa4f28cc 100644 --- a/man/ChoicesFilterState.Rd +++ b/man/ChoicesFilterState.Rd @@ -46,25 +46,25 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("ChoicesFilterState"), + column(4, tags$div( + tags$h4("ChoicesFilterState"), fs$ui("fs") )), - column(4, shiny::tags$div( - shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState - textOutput("condition_choices"), shiny::tags$br(), - shiny::tags$h4("Unformatted state"), # display raw filter state - textOutput("unformatted_choices"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_choices"), shiny::tags$br() + column(4, tags$div( + tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState + textOutput("condition_choices"), tags$br(), + tags$h4("Unformatted state"), # display raw filter state + textOutput("unformatted_choices"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_choices"), tags$br() )), - column(4, shiny::tags$div( - shiny::tags$h4("Programmatic filter control"), - actionButton("button1_choices", "set drop NA", width = "100\%"), shiny::tags$br(), - actionButton("button2_choices", "set keep NA", width = "100\%"), shiny::tags$br(), - actionButton("button3_choices", "set selection: a, b", width = "100\%"), shiny::tags$br(), - actionButton("button4_choices", "deselect all", width = "100\%"), shiny::tags$br(), - actionButton("button0_choices", "set initial state", width = "100\%"), shiny::tags$br() + column(4, tags$div( + tags$h4("Programmatic filter control"), + actionButton("button1_choices", "set drop NA", width = "100\%"), tags$br(), + actionButton("button2_choices", "set keep NA", width = "100\%"), tags$br(), + actionButton("button3_choices", "set selection: a, b", width = "100\%"), tags$br(), + actionButton("button4_choices", "deselect all", width = "100\%"), tags$br(), + actionButton("button0_choices", "set initial state", width = "100\%"), tags$br() )) ) diff --git a/man/DFFilterStates.Rd b/man/DFFilterStates.Rd index ffa1efaf1..4c6d1071b 100644 --- a/man/DFFilterStates.Rd +++ b/man/DFFilterStates.Rd @@ -46,35 +46,35 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("Active filters"), + column(4, tags$div( + tags$h4("Active filters"), filter_states_df$ui_active("fsdf") )), - column(4, shiny::tags$div( - shiny::tags$h4("Manual filter control"), - filter_states_df$ui_add("add_filters"), shiny::tags$br(), - shiny::tags$h4("Condition (i.e. call)"), # display the subset expression generated by this FilterStates - textOutput("call_df"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_df"), shiny::tags$br() + column(4, tags$div( + tags$h4("Manual filter control"), + filter_states_df$ui_add("add_filters"), tags$br(), + tags$h4("Condition (i.e. call)"), # display the subset expression generated by this FilterStates + textOutput("call_df"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_df"), tags$br() )), - column(4, shiny::tags$div( - shiny::tags$h4("Programmatic filter control"), - actionButton("button1_df", "set NUM1 < 30", width = "100\%"), shiny::tags$br(), - actionButton("button2_df", "set NUM2 \%in\% c(20, 21)", width = "100\%"), shiny::tags$br(), - actionButton("button3_df", "set CHAR1 \%in\% c(\"B\", \"C\", \"D\")", width = "100\%"), shiny::tags$br(), - actionButton("button4_df", "set CHAR2 == \"F\"", width = "100\%"), shiny::tags$br(), - actionButton("button5_df", "set DATE <= 2020-02-02", width = "100\%"), shiny::tags$br(), - actionButton("button6_df", "set DATETIME <= 2020-02-02", width = "100\%"), shiny::tags$br(), - shiny::tags$hr(), - actionButton("button7_df", "remove NUM1", width = "100\%"), shiny::tags$br(), - actionButton("button8_df", "remove NUM2", width = "100\%"), shiny::tags$br(), - actionButton("button9_df", "remove CHAR1", width = "100\%"), shiny::tags$br(), - actionButton("button10_df", "remove CHAR2", width = "100\%"), shiny::tags$br(), - actionButton("button11_df", "remove DATE", width = "100\%"), shiny::tags$br(), - actionButton("button12_df", "remove DATETIME", width = "100\%"), shiny::tags$br(), - shiny::tags$hr(), - actionButton("button0_df", "clear all filters", width = "100\%"), shiny::tags$br() + column(4, tags$div( + tags$h4("Programmatic filter control"), + actionButton("button1_df", "set NUM1 < 30", width = "100\%"), tags$br(), + actionButton("button2_df", "set NUM2 \%in\% c(20, 21)", width = "100\%"), tags$br(), + actionButton("button3_df", "set CHAR1 \%in\% c(\"B\", \"C\", \"D\")", width = "100\%"), tags$br(), + actionButton("button4_df", "set CHAR2 == \"F\"", width = "100\%"), tags$br(), + actionButton("button5_df", "set DATE <= 2020-02-02", width = "100\%"), tags$br(), + actionButton("button6_df", "set DATETIME <= 2020-02-02", width = "100\%"), tags$br(), + tags$hr(), + actionButton("button7_df", "remove NUM1", width = "100\%"), tags$br(), + actionButton("button8_df", "remove NUM2", width = "100\%"), tags$br(), + actionButton("button9_df", "remove CHAR1", width = "100\%"), tags$br(), + actionButton("button10_df", "remove CHAR2", width = "100\%"), tags$br(), + actionButton("button11_df", "remove DATE", width = "100\%"), tags$br(), + actionButton("button12_df", "remove DATETIME", width = "100\%"), tags$br(), + tags$hr(), + actionButton("button0_df", "clear all filters", width = "100\%"), tags$br() )) ) diff --git a/man/DateFilterState.Rd b/man/DateFilterState.Rd index 77d6e2cda..4f10b664a 100644 --- a/man/DateFilterState.Rd +++ b/man/DateFilterState.Rd @@ -47,26 +47,26 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("DateFilterState"), + column(4, tags$div( + tags$h4("DateFilterState"), fs$ui("fs") )), - column(4, shiny::tags$div( + column(4, tags$div( id = "outputs", # div id is needed for toggling the element - shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState - textOutput("condition_date"), shiny::tags$br(), - shiny::tags$h4("Unformatted state"), # display raw filter state - textOutput("unformatted_date"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_date"), shiny::tags$br() + tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState + textOutput("condition_date"), tags$br(), + tags$h4("Unformatted state"), # display raw filter state + textOutput("unformatted_date"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_date"), tags$br() )), - column(4, shiny::tags$div( - shiny::tags$h4("Programmatic filter control"), - actionButton("button1_date", "set drop NA", width = "100\%"), shiny::tags$br(), - actionButton("button2_date", "set keep NA", width = "100\%"), shiny::tags$br(), - actionButton("button3_date", "set a range", width = "100\%"), shiny::tags$br(), - actionButton("button4_date", "set full range", width = "100\%"), shiny::tags$br(), - actionButton("button0_date", "set initial state", width = "100\%"), shiny::tags$br() + column(4, tags$div( + tags$h4("Programmatic filter control"), + actionButton("button1_date", "set drop NA", width = "100\%"), tags$br(), + actionButton("button2_date", "set keep NA", width = "100\%"), tags$br(), + actionButton("button3_date", "set a range", width = "100\%"), tags$br(), + actionButton("button4_date", "set full range", width = "100\%"), tags$br(), + actionButton("button0_date", "set initial state", width = "100\%"), tags$br() )) ) diff --git a/man/DatetimeFilterState.Rd b/man/DatetimeFilterState.Rd index 57098a384..b9053a4fd 100644 --- a/man/DatetimeFilterState.Rd +++ b/man/DatetimeFilterState.Rd @@ -47,26 +47,26 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("DatetimeFilterState"), + column(4, tags$div( + tags$h4("DatetimeFilterState"), fs$ui("fs") )), - column(4, shiny::tags$div( + column(4, tags$div( id = "outputs", # div id is needed for toggling the element - shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState - textOutput("condition_datetime"), shiny::tags$br(), - shiny::tags$h4("Unformatted state"), # display raw filter state - textOutput("unformatted_datetime"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_datetime"), shiny::tags$br() + tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState + textOutput("condition_datetime"), tags$br(), + tags$h4("Unformatted state"), # display raw filter state + textOutput("unformatted_datetime"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_datetime"), tags$br() )), - column(4, shiny::tags$div( - shiny::tags$h4("Programmatic filter control"), - actionButton("button1_datetime", "set drop NA", width = "100\%"), shiny::tags$br(), - actionButton("button2_datetime", "set keep NA", width = "100\%"), shiny::tags$br(), - actionButton("button3_datetime", "set a range", width = "100\%"), shiny::tags$br(), - actionButton("button4_datetime", "set full range", width = "100\%"), shiny::tags$br(), - actionButton("button0_datetime", "set initial state", width = "100\%"), shiny::tags$br() + column(4, tags$div( + tags$h4("Programmatic filter control"), + actionButton("button1_datetime", "set drop NA", width = "100\%"), tags$br(), + actionButton("button2_datetime", "set keep NA", width = "100\%"), tags$br(), + actionButton("button3_datetime", "set a range", width = "100\%"), tags$br(), + actionButton("button4_datetime", "set full range", width = "100\%"), tags$br(), + actionButton("button0_datetime", "set initial state", width = "100\%"), tags$br() )) ) diff --git a/man/FilterStateExpr.Rd b/man/FilterStateExpr.Rd index 7e0db3bab..bd1ede71f 100644 --- a/man/FilterStateExpr.Rd +++ b/man/FilterStateExpr.Rd @@ -36,17 +36,17 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("ChoicesFilterState"), + column(4, tags$div( + tags$h4("ChoicesFilterState"), filter_state$ui("fs") )), - column(8, shiny::tags$div( - shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState - textOutput("condition_choices"), shiny::tags$br(), - shiny::tags$h4("Unformatted state"), # display raw filter state - textOutput("unformatted_choices"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_choices"), shiny::tags$br() + column(8, tags$div( + tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState + textOutput("condition_choices"), tags$br(), + tags$h4("Unformatted state"), # display raw filter state + textOutput("unformatted_choices"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_choices"), tags$br() )) ) diff --git a/man/LogicalFilterState.Rd b/man/LogicalFilterState.Rd index db715ced1..7cd2158e8 100644 --- a/man/LogicalFilterState.Rd +++ b/man/LogicalFilterState.Rd @@ -38,25 +38,25 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("LogicalFilterState"), + column(4, tags$div( + tags$h4("LogicalFilterState"), fs$ui("fs") )), - column(4, shiny::tags$div( + column(4, tags$div( id = "outputs", # div id is needed for toggling the element - shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState - textOutput("condition_logical"), shiny::tags$br(), - shiny::tags$h4("Unformatted state"), # display raw filter state - textOutput("unformatted_logical"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_logical"), shiny::tags$br() + tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState + textOutput("condition_logical"), tags$br(), + tags$h4("Unformatted state"), # display raw filter state + textOutput("unformatted_logical"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_logical"), tags$br() )), - column(4, shiny::tags$div( - shiny::tags$h4("Programmatic filter control"), - actionButton("button1_logical", "set drop NA", width = "100\%"), shiny::tags$br(), - actionButton("button2_logical", "set keep NA", width = "100\%"), shiny::tags$br(), - actionButton("button3_logical", "set a selection", width = "100\%"), shiny::tags$br(), - actionButton("button0_logical", "set initial state", width = "100\%"), shiny::tags$br() + column(4, tags$div( + tags$h4("Programmatic filter control"), + actionButton("button1_logical", "set drop NA", width = "100\%"), tags$br(), + actionButton("button2_logical", "set keep NA", width = "100\%"), tags$br(), + actionButton("button3_logical", "set a selection", width = "100\%"), tags$br(), + actionButton("button0_logical", "set initial state", width = "100\%"), tags$br() )) ) diff --git a/man/RangeFilterState.Rd b/man/RangeFilterState.Rd index b32368d06..2db5834ac 100644 --- a/man/RangeFilterState.Rd +++ b/man/RangeFilterState.Rd @@ -50,28 +50,28 @@ ui <- fluidPage( useShinyjs(), include_css_files(pattern = "filter-panel"), include_js_files(pattern = "count-bar-labels"), - column(4, shiny::tags$div( - shiny::tags$h4("RangeFilterState"), + column(4, tags$div( + tags$h4("RangeFilterState"), fs$ui("fs") )), - column(4, shiny::tags$div( + column(4, tags$div( id = "outputs", # div id is needed for toggling the element - shiny::tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState - textOutput("condition_range"), shiny::tags$br(), - shiny::tags$h4("Unformatted state"), # display raw filter state - textOutput("unformatted_range"), shiny::tags$br(), - shiny::tags$h4("Formatted state"), # display human readable filter state - textOutput("formatted_range"), shiny::tags$br() + tags$h4("Condition (i.e. call)"), # display the condition call generated by this FilterState + textOutput("condition_range"), tags$br(), + tags$h4("Unformatted state"), # display raw filter state + textOutput("unformatted_range"), tags$br(), + tags$h4("Formatted state"), # display human readable filter state + textOutput("formatted_range"), tags$br() )), - column(4, shiny::tags$div( - shiny::tags$h4("Programmatic filter control"), - actionButton("button1_range", "set drop NA", width = "100\%"), shiny::tags$br(), - actionButton("button2_range", "set keep NA", width = "100\%"), shiny::tags$br(), - actionButton("button3_range", "set drop Inf", width = "100\%"), shiny::tags$br(), - actionButton("button4_range", "set keep Inf", width = "100\%"), shiny::tags$br(), - actionButton("button5_range", "set a range", width = "100\%"), shiny::tags$br(), - actionButton("button6_range", "set full range", width = "100\%"), shiny::tags$br(), - actionButton("button0_range", "set initial state", width = "100\%"), shiny::tags$br() + column(4, tags$div( + tags$h4("Programmatic filter control"), + actionButton("button1_range", "set drop NA", width = "100\%"), tags$br(), + actionButton("button2_range", "set keep NA", width = "100\%"), tags$br(), + actionButton("button3_range", "set drop Inf", width = "100\%"), tags$br(), + actionButton("button4_range", "set keep Inf", width = "100\%"), tags$br(), + actionButton("button5_range", "set a range", width = "100\%"), tags$br(), + actionButton("button6_range", "set full range", width = "100\%"), tags$br(), + actionButton("button0_range", "set initial state", width = "100\%"), tags$br() )) ) diff --git a/man/countBars.Rd b/man/countBars.Rd index ce52a3c9f..bfc88fd7b 100644 --- a/man/countBars.Rd +++ b/man/countBars.Rd @@ -61,7 +61,7 @@ labels <- countBars( ) ui <- fluidPage( - shiny::tags$div( + tags$div( class = "choices_state", include_js_files("count-bar-labels.js"), include_css_files(pattern = "filter-panel"), diff --git a/man/init_filter_states.Rd b/man/init_filter_states.Rd index 901c112c3..be4ebd94e 100644 --- a/man/init_filter_states.Rd +++ b/man/init_filter_states.Rd @@ -55,7 +55,7 @@ rf <- init_filter_states( library(shiny) ui <- fluidPage( - actionButton("clear", shiny::tags$span(icon("xmark"), "Remove all filters")), + actionButton("clear", tags$span(icon("xmark"), "Remove all filters")), rf$ui_add(id = "add"), rf$ui_active("states"), verbatimTextOutput("expr"), diff --git a/man/toggle_button.Rd b/man/toggle_button.Rd index 369a56892..86b4daf2f 100644 --- a/man/toggle_button.Rd +++ b/man/toggle_button.Rd @@ -46,8 +46,8 @@ ui <- fluidPage( actionButton("hide_content", label = "hide", icon = icon("xmark")), actionButton("show_content", label = "show", icon = icon("check")), actionButton("toggle_content", label = "toggle", icon = icon("angle-down")), - shiny::tags$br(), - shiny::tags$div( + tags$br(), + tags$div( id = "content", verbatimTextOutput("printout") )