Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow selection of minimum and maximum view mode #3702

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Allow selection of minimum and maximum view mode #3702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f41b257
Allow selection of minimum and maximum view mode
MEO265 Sep 16, 2022
399ba47
Merge branch 'main' into dateInput-functionality-extension
MEO265 Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions R/input-date.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@
#' or a string in `yyyy-mm-dd` format.
#' @param daysofweekdisabled Days of the week that should be disabled. Should be
#' a integer vector with values from 0 (Sunday) to 6 (Saturday).
#' @param minview The minimum limit for the view mode. Can be "days" (the default),
#' "months", "years", or "decades". The day is set to the 1st for “months”,
#' the month is set to January for “years”, the year is set to the first year
#' from the decade for “decades”, and the year is set to the first from the
#' millennium for “centuries”.
#' @param maxview The maximum limit for the view mode. Can be "days", "months",
#' "years", or "decades" (the default). The day is set to the 1st for “months”,
#' the month is set to January for “years”, the year is set to the first year
#' from the decade for “decades”, and the year is set to the first from the
#' millennium for “centuries”.
#'
#' @family input elements
#' @seealso [dateRangeInput()], [updateDateInput()]
Expand Down Expand Up @@ -94,7 +104,8 @@
dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
format = "yyyy-mm-dd", startview = "month", weekstart = 0,
language = "en", width = NULL, autoclose = TRUE,
datesdisabled = NULL, daysofweekdisabled = NULL) {
datesdisabled = NULL, daysofweekdisabled = NULL,
minview = "days", maxview = "centuries") {

value <- dateYMD(value, "value")
min <- dateYMD(min, "min")
Expand Down Expand Up @@ -126,7 +137,9 @@ dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
# Ensure NULL is not sent as `{}` but as 'null'
jsonlite::toJSON(datesdisabled, null = 'null'),
`data-date-days-of-week-disabled` =
jsonlite::toJSON(daysofweekdisabled, null = 'null')
jsonlite::toJSON(daysofweekdisabled, null = 'null'),
`data-date-min-view-mode` = minview,
`data-date-max-view-mode` = maxview
),
datePickerDependency()
)
Expand Down