Skip to content

Commit

Permalink
prepare for cran
Browse files Browse the repository at this point in the history
  • Loading branch information
pvictor committed Feb 6, 2022
1 parent 5aee584 commit 02bc552
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 26 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: shinyWidgets
Title: Custom Inputs Widgets for Shiny
Version: 0.6.3.9000
Version: 0.6.4
Authors@R: c(
person("Victor", "Perrier", email = "[email protected]", role = c("aut", "cre", "cph")),
person("Fanny", "Meyer", role = "aut"),
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
shinyWidgets (unreleased)
shinyWidgets 0.6.4
======================

### Bug fixes
* Revert `bootstrap-switch-js` to 3.3.4 to fix bug when `value = TRUE`.
* Fixed a bug in `colorSelectorInput()` causing not returning an input value.



Expand Down
19 changes: 9 additions & 10 deletions R/dependencies.R
Original file line number Diff line number Diff line change
Expand Up @@ -353,29 +353,28 @@ html_dependency_sweetalert2 <- function(theme = c("sweetalert2",
# Non exported ------------------------------------------------------------

html_dependency_picker_bs <- function(theme) {
if (!bslib::is_bs_theme(theme) || identical(bslib::theme_version(theme), "3")) {
return(htmlDependency(
if (identical(bslib::theme_version(theme), "5")) {
htmlDependency(
name = "bootstrap-select",
version = "1.13.8",
version = "1.14.0",
package = "shinyWidgets",
src = c(href = "shinyWidgets/bootstrap-select", file = "assets/bootstrap-select"),
src = c(href = "shinyWidgets/bootstrap-select-1.14.0-beta2", file = "assets/bootstrap-select-1.14.0-beta2"),
script = c("js/bootstrap-select.min.js"),
stylesheet = c("css/bootstrap-select.min.css")
))
)
} else {
return(htmlDependency(
htmlDependency(
name = "bootstrap-select",
version = "1.14.0",
version = "1.13.8",
package = "shinyWidgets",
src = c(href = "shinyWidgets/bootstrap-select-1.14.0-beta2", file = "assets/bootstrap-select-1.14.0-beta2"),
src = c(href = "shinyWidgets/bootstrap-select", file = "assets/bootstrap-select"),
script = c("js/bootstrap-select.min.js"),
stylesheet = c("css/bootstrap-select.min.css")
))
)
}
}
html_dependency_picker <- function() {
bslib::bs_dependency_defer(html_dependency_picker_bs)

}

html_dependency_airdatepicker <- function() {
Expand Down
15 changes: 8 additions & 7 deletions R/input-airDatepicker.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#' @title Air Date Picker Input
#'
#' @description An alternative to \code{dateInput} to select single, multiple or date range.
#' @description An alternative to [shiny::dateInput()] to select single, multiple or date range.
#' And two alias to select months or years.
#'
#' @param inputId The \code{input} slot that will be used to access the value.
Expand Down Expand Up @@ -49,12 +49,13 @@
#' @param toggleSelected When \code{TRUE}, in range mode, it's not possible to select the same date as start and end.
#' @param ... Arguments passed to \code{airDatepickerInput}.
#'
#' @note Since shinyWidgets 0.5.2 there's no more conflicts with \code{dateInput}.
#' @note Since shinyWidgets 0.5.2 there's no more conflicts with [shiny::dateInput()].
#'
#' @return a \code{Date} object or a \code{POSIXct} in UTC timezone.
#'
#' @seealso See \code{\link{updateAirDateInput}} for updating slider value server-side.
#' And \code{\link{demoAirDatepicker}} for examples.
#' @seealso
#' * [demoAirDatepicker()] for demo apps
#' * [updateAirDateInput()] for updating from server
#'
#' @name airDatepicker
#'
Expand Down Expand Up @@ -335,14 +336,14 @@ airYearpickerInput <- function(inputId, label = NULL, value = NULL, ...) {



#' Change the value of \code{\link{airDatepickerInput}} on the client
#' Change the value of [airDatepickerInput()] on the client
#'
#' @param session The \code{session} object passed to function given to \code{shinyServer}.
#' @param session The `session` object passed to function given to `shinyServer`.
#' @param inputId The id of the input object.
#' @param label The label to set for the input object.
#' @param value The value to set for the input object.
#' @param clear Logical, clear all previous selected dates.
#' @param options Options to update, see available ones here: \url{http://t1m0n.name/air-datepicker/docs/}.
#' @param options Options to update, see available ones in [JavaScript documentation](https://air-datepicker.com/docs)
#' @param show,hide Show / hide datepicker.
#'
#' @export
Expand Down
10 changes: 6 additions & 4 deletions man/airDatepicker.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/updateAirDateInput.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 02bc552

Please sign in to comment.