Skip to content

Commit fbab319

Browse files
gogonzogogonzo
committed
spec -> picks
1 parent c91a8ee commit fbab319

16 files changed

+70
-70
lines changed

‎R/tm_a_pca_picks.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ui_a_pca.picks <- function(id,
127127
tags$label("Encodings", class = "text-primary"),
128128
teal::teal_nav_item(
129129
label = tags$strong("Data selection"),
130-
teal.transform::picks_ui(id = ns("dat"), spec = dat)
130+
teal.transform::picks_ui(id = ns("dat"), picks = dat)
131131
),
132132
bslib::accordion(
133133
open = TRUE,
@@ -232,7 +232,7 @@ srv_a_pca.picks <- function(id, data, dat, plot_height, plot_width, ggplot2_args
232232
moduleServer(id, function(input, output, session) {
233233
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
234234

235-
selectors <- teal.transform::picks_srv(spec = list(dat = dat), data = data)
235+
selectors <- teal.transform::picks_srv(picks = list(dat = dat), data = data)
236236

237237
qenv <- reactive({
238238
validate_input(

‎R/tm_a_regression_picks.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ ui_a_regression.picks <- function(id,
150150
tags$label("Encodings", class = "text-primary"), tags$br(),
151151
teal::teal_nav_item(
152152
label = tags$strong("Response variable"),
153-
teal.transform::picks_ui(id = ns("response"), spec = response)
153+
teal.transform::picks_ui(id = ns("response"), picks = response)
154154
),
155155
teal::teal_nav_item(
156156
label = tags$strong("Regressor variables"),
157-
teal.transform::picks_ui(id = ns("regressor"), spec = regressor)
157+
teal.transform::picks_ui(id = ns("regressor"), picks = regressor)
158158
),
159159
radioButtons(
160160
ns("plot_type"),
@@ -183,7 +183,7 @@ ui_a_regression.picks <- function(id,
183183
),
184184
min = 1, max = 10, value = 9, ticks = FALSE, step = .1
185185
),
186-
teal.transform::picks_ui(id = ns("outlier"), spec = outlier)
186+
teal.transform::picks_ui(id = ns("outlier"), picks = outlier)
187187
),
188188
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(decorators, "plot")),
189189
bslib::accordion(
@@ -247,7 +247,7 @@ srv_a_regression.picks <- function(id,
247247
ns <- session$ns
248248

249249
selectors <- teal.transform::picks_srv(
250-
spec = list(response = response, regressor = regressor, outlier = outlier),
250+
picks = list(response = response, regressor = regressor, outlier = outlier),
251251
data = data
252252
)
253253

‎R/tm_g_association.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,16 @@ tm_g_association <- function(label = "Association",
135135
variables(
136136
choices = tidyselect::where(is.numeric) |
137137
teal.transform::is_categorical(min.len = 2, max.len = 10),
138-
selected = 1
138+
selected = 1L
139139
),
140-
values(selected = tidyselect::everything(), multiple = TRUE)
140+
values()
141141
),
142142
vars = picks(
143143
datasets(),
144144
variables(
145145
choices = tidyselect::where(is.numeric) |
146146
teal.transform::is_categorical(min.len = 2, max.len = 10),
147-
selected = 2, # todo: make sure that is doesn't fail in teal.transform
147+
selected = 2L, # todo: make sure that is doesn't fail in teal.transform
148148
multiple = TRUE
149149
),
150150
values()

‎R/tm_g_association_picks.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tm_g_association.picks <- function(label = "Association",
55
variables(
66
choices = tidyselect::where(is.numeric) |
77
teal.transform::is_categorical(min.len = 2, max.len = 10),
8-
selected = 1
8+
selected = 1L
99
),
1010
values()
1111
),
@@ -14,7 +14,7 @@ tm_g_association.picks <- function(label = "Association",
1414
variables(
1515
choices = tidyselect::where(is.numeric) |
1616
teal.transform::is_categorical(min.len = 2, max.len = 10),
17-
selected = 2,
17+
selected = 2L,
1818
multiple = TRUE
1919
)
2020
),
@@ -102,11 +102,11 @@ ui_g_association.picks <- function(id,
102102
tags$label("Encodings", class = "text-primary"),
103103
teal::teal_nav_item(
104104
label = tags$strong("Reference variable"),
105-
teal.transform::picks_ui(id = ns("ref"), spec = ref)
105+
teal.transform::picks_ui(id = ns("ref"), picks = ref)
106106
),
107107
teal::teal_nav_item(
108108
label = tags$strong("Associated variables"),
109-
teal.transform::picks_ui(id = ns("vars"), spec = vars)
109+
teal.transform::picks_ui(id = ns("vars"), picks = vars)
110110
),
111111
checkboxInput(ns("association"), "Association with reference variable", value = show_association),
112112
checkboxInput(ns("show_dist"), "Scaled frequencies", value = FALSE),
@@ -157,7 +157,7 @@ srv_g_association.picks <- function(id,
157157
moduleServer(id, function(input, output, session) {
158158
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
159159

160-
selectors <- teal.transform::picks_srv(spec = list(ref = ref, vars = vars), data = data)
160+
selectors <- teal.transform::picks_srv(picks = list(ref = ref, vars = vars), data = data)
161161

162162
validated_q <- reactive({
163163
obj <- req(data())

‎R/tm_g_bivariate.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,15 @@ tm_g_bivariate <- function(label = "Bivariate Plots",
154154
variables(
155155
choices = tidyselect::where(is.numeric) |
156156
teal.transform::is_categorical(min.len = 2, max.len = 10),
157-
selected = 1
157+
selected = 1L
158158
)
159159
),
160160
y = picks(
161161
datasets(),
162162
variables(
163163
choices = tidyselect::where(is.numeric) |
164164
teal.transform::is_categorical(min.len = 2, max.len = 10),
165-
selected = 2
165+
selected = 2L
166166
)
167167
),
168168
row_facet = NULL,

‎R/tm_g_bivariate_picks.R‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ tm_g_bivariate.picks <- function(label = "Bivariate Plots",
55
variables(
66
choices = tidyselect::where(is.numeric) |
77
teal.transform::is_categorical(min.len = 2, max.len = 10),
8-
selected = 1
8+
selected = 1L
99
),
10-
values(selected = tidyselect::everything(), multiple = TRUE)
10+
values()
1111
),
1212
y = picks(
1313
datasets(),
1414
variables(
1515
choices = tidyselect::where(is.numeric) |
1616
teal.transform::is_categorical(min.len = 2, max.len = 10),
17-
selected = 2
17+
selected = 2L
1818
),
19-
values(selected = tidyselect::everything(), multiple = TRUE)
19+
values()
2020
),
2121
row_facet = NULL,
2222
col_facet = NULL,
@@ -151,11 +151,11 @@ ui_g_bivariate.picks <- function(id,
151151
encoding = shiny::tagList(
152152
teal::teal_nav_item(
153153
label = tags$strong("X variable"),
154-
teal.transform::picks_ui(id = ns("x"), spec = x)
154+
teal.transform::picks_ui(id = ns("x"), picks = x)
155155
),
156156
teal::teal_nav_item(
157157
label = tags$strong("Y variable"),
158-
teal.transform::picks_ui(id = ns("y"), spec = y)
158+
teal.transform::picks_ui(id = ns("y"), picks = y)
159159
),
160160
conditionalPanel(
161161
condition =
@@ -176,7 +176,7 @@ ui_g_bivariate.picks <- function(id,
176176
teal::teal_nav_item(
177177
tags$div(
178178
tags$strong("Row facetting variable"),
179-
teal.transform::picks_ui(id = ns("row_facet"), spec = row_facet),
179+
teal.transform::picks_ui(id = ns("row_facet"), picks = row_facet),
180180
checkboxInput(ns("free_x_scales"), "free x scales", value = free_x_scales)
181181
)
182182
)
@@ -185,7 +185,7 @@ ui_g_bivariate.picks <- function(id,
185185
teal::teal_nav_item(
186186
tags$div(
187187
tags$strong("Column facetting variable"),
188-
teal.transform::picks_ui(id = ns("col_facet"), spec = col_facet),
188+
teal.transform::picks_ui(id = ns("col_facet"), picks = col_facet),
189189
checkboxInput(ns("free_y_scales"), "free y scales", value = free_y_scales)
190190
)
191191
)
@@ -199,11 +199,11 @@ ui_g_bivariate.picks <- function(id,
199199
conditionalPanel(
200200
condition = paste0("input['", ns("coloring"), "']"),
201201
tags$div(
202-
teal.transform::picks_ui(id = ns("color"), spec = color), # label = "Outline color by variable"
203-
teal.transform::picks_ui(id = ns("fill"), spec = fill), # label = "Outline color by variable"
202+
teal.transform::picks_ui(id = ns("color"), picks = color), # label = "Outline color by variable"
203+
teal.transform::picks_ui(id = ns("fill"), picks = fill), # label = "Outline color by variable"
204204
tags$div(
205205
id = ns("size_settings"),
206-
teal.transform::picks_ui(id = ns("size"), spec = size) # label = "Size of points by variable (only if x and y are numeric)"
206+
teal.transform::picks_ui(id = ns("size"), picks = size) # label = "Size of points by variable (only if x and y are numeric)"
207207
)
208208
)
209209
)
@@ -271,7 +271,7 @@ srv_g_bivariate.picks <- function(id,
271271

272272
ns <- session$ns
273273
selectors <- teal.transform::picks_srv(
274-
spec = list(
274+
picks = list(
275275
x = x,
276276
y = y,
277277
row_facet = row_facet,

‎R/tm_g_distribution.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#' dist_var = picks(
7575
#' datasets("iris"),
7676
#' variables(tidyselect::where(is.numeric)),
77-
#' values(selected = "Petal.Length")
77+
#' values()
7878
#' )
7979
#' )
8080
#' )

‎R/tm_g_distribution_picks.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tm_g_distribution.picks <- function(label = "Distribution Module",
33
dist_var = picks(
44
datasets(),
55
variables(where(is.numeric)),
6-
values(selected = tidyselect::everything())
6+
values()
77
),
88
strata_var = NULL,
99
group_var = NULL,
@@ -121,13 +121,13 @@ ui_g_distribution.picks <- function(id,
121121
tags$label("Encodings", class = "text-primary"),
122122
teal::teal_nav_item(
123123
label = tags$strong("Variable"),
124-
teal.transform::picks_ui(id = ns("dist_var"), spec = dist_var)
124+
teal.transform::picks_ui(id = ns("dist_var"), picks = dist_var)
125125
),
126126
if (!is.null(group_var)) {
127127
tagList(
128128
teal::teal_nav_item(
129129
label = tags$strong("Group by:"),
130-
teal.transform::picks_ui(id = ns("group_var"), spec = group_var)
130+
teal.transform::picks_ui(id = ns("group_var"), picks = group_var)
131131
),
132132
uiOutput(ns("scales_types_ui"))
133133
)
@@ -136,7 +136,7 @@ ui_g_distribution.picks <- function(id,
136136
tagList(
137137
teal::teal_nav_item(
138138
label = tags$strong("Stratify by:"),
139-
teal.transform::picks_ui(id = ns("strata_var"), spec = strata_var)
139+
teal.transform::picks_ui(id = ns("strata_var"), picks = strata_var)
140140
)
141141
)
142142
},
@@ -213,7 +213,7 @@ srv_g_distribution.picks <- function(id,
213213

214214

215215
selectors <- teal.transform::picks_srv(
216-
spec = list(dist_var = dist_var, strata_var = strata_var, group_var = group_var),
216+
picks = list(dist_var = dist_var, strata_var = strata_var, group_var = group_var),
217217
data = data
218218
)
219219

‎R/tm_g_response.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ tm_g_response <- function(label = "Response Plot",
161161
datasets(),
162162
variables(
163163
choices = teal.transform::is_categorical(min.len = 2, max.len = 10),
164-
selected = 2
164+
selected = 2L
165165
),
166166
values()
167167
),

‎R/tm_g_response_picks.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,22 @@ ui_g_response.picks <- function(id,
9898
tags$label("Encodings", class = "text-primary"),
9999
teal::teal_nav_item(
100100
label = tags$strong("Response variable"),
101-
teal.transform::picks_ui(id = ns("response"), spec = response)
101+
teal.transform::picks_ui(id = ns("response"), picks = response)
102102
),
103103
teal::teal_nav_item(
104104
label = tags$strong("X variable"),
105-
teal.transform::picks_ui(id = ns("x"), spec = x)
105+
teal.transform::picks_ui(id = ns("x"), picks = x)
106106
),
107107
if (!is.null(row_facet)) {
108108
teal::teal_nav_item(
109109
label = tags$strong("Row facetting"),
110-
teal.transform::picks_ui(id = ns("row_facet"), spec = row_facet)
110+
teal.transform::picks_ui(id = ns("row_facet"), picks = row_facet)
111111
)
112112
},
113113
if (!is.null(col_facet)) {
114114
teal::teal_nav_item(
115115
label = tags$strong("Column facetting"),
116-
teal.transform::picks_ui(id = ns("col_facet"), spec = col_facet)
116+
teal.transform::picks_ui(id = ns("col_facet"), picks = col_facet)
117117
)
118118
},
119119
shinyWidgets::radioGroupButtons(
@@ -163,7 +163,7 @@ srv_g_response.picks <- function(id,
163163
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
164164

165165
selectors <- teal.transform::picks_srv(
166-
spec = list(
166+
picks = list(
167167
response = response,
168168
x = x,
169169
row_facet = row_facet,

0 commit comments

Comments
 (0)