diff --git a/DESCRIPTION b/DESCRIPTION index a5a8531..ebd91a4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: shinygouv Title: Implement the DSFR for your shiny applications -Version: 1.0.3 +Version: 1.0.4 Authors@R: c( person("Juliette", "ENGELAERE-LEFEBVRE", , "juliette.engelaere-lefebvre@developpement-durable.gouv.fr", role = c("aut", "cre")), person("Sébastien", "Rochette", , "sebastien@thinkr.fr", role = "aut", diff --git a/NEWS.md b/NEWS.md index 979bc3f..c2b27e1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# shinygouv 1.0.4 + +## Fix + +* numericInput_dsfr : correction du template qui ne fonctionnait plus avec shiny v1.8.1 + # shinygouv 1.0.3 ## Fix diff --git a/R/numericinput_dsfr.R b/R/numericinput_dsfr.R index 2129c05..34cd964 100644 --- a/R/numericinput_dsfr.R +++ b/R/numericinput_dsfr.R @@ -22,8 +22,7 @@ #' #' ui <- fluidPage_dsfr( #' header = header_dsfr( -#' intitule = "Intitule", -#' officiel = "Officiel", +#' intitule = c("Intitule", "officiel"), #' nom_site_service = "Nom du site / service", #' baseline = "baseline - precisions sur l organisation", #' class = "fr-m-1w" diff --git a/R/updatenumericinput_dsfr.R b/R/updatenumericinput_dsfr.R index cb7f84b..17dd317 100644 --- a/R/updatenumericinput_dsfr.R +++ b/R/updatenumericinput_dsfr.R @@ -22,8 +22,7 @@ #' #' ui <- fluidPage_dsfr( #' header = header_dsfr( -#' intitule = "Intitule", -#' officiel = "Officiel", +#' intitule = c("Intitule", "Officiel"), #' nom_site_service = "Nom du site / service", #' baseline = "baseline - precisions sur l organisation", #' class = "fr-m-1w" diff --git a/dev/flat_composants/flat_numericInput.Rmd b/dev/flat_composants/flat_numericInput.Rmd index 0d7162c..7c91c12 100644 --- a/dev/flat_composants/flat_numericInput.Rmd +++ b/dev/flat_composants/flat_numericInput.Rmd @@ -201,8 +201,7 @@ if (interactive()) { ui <- fluidPage_dsfr( header = header_dsfr( - intitule = "Intitule", - officiel = "Officiel", + intitule = c("Intitule", "officiel"), nom_site_service = "Nom du site / service", baseline = "baseline - precisions sur l organisation", class = "fr-m-1w" @@ -386,8 +385,7 @@ if (interactive()) { ui <- fluidPage_dsfr( header = header_dsfr( - intitule = "Intitule", - officiel = "Officiel", + intitule = c("Intitule", "Officiel"), nom_site_service = "Nom du site / service", baseline = "baseline - precisions sur l organisation", class = "fr-m-1w" diff --git a/inst/v1.9.3/composant/numericinput.html b/inst/v1.9.3/composant/numericinput.html index eda17dd..831ab1d 100644 --- a/inst/v1.9.3/composant/numericinput.html +++ b/inst/v1.9.3/composant/numericinput.html @@ -2,5 +2,5 @@ - + diff --git a/man/numericInput_dsfr.Rd b/man/numericInput_dsfr.Rd index 5010d7a..0ac4e89 100644 --- a/man/numericInput_dsfr.Rd +++ b/man/numericInput_dsfr.Rd @@ -40,8 +40,7 @@ if (interactive()) { ui <- fluidPage_dsfr( header = header_dsfr( - intitule = "Intitule", - officiel = "Officiel", + intitule = c("Intitule", "officiel"), nom_site_service = "Nom du site / service", baseline = "baseline - precisions sur l organisation", class = "fr-m-1w" diff --git a/man/updateNumericInput_dsfr.Rd b/man/updateNumericInput_dsfr.Rd index d44e456..37c8c46 100644 --- a/man/updateNumericInput_dsfr.Rd +++ b/man/updateNumericInput_dsfr.Rd @@ -43,8 +43,7 @@ if (interactive()) { ui <- fluidPage_dsfr( header = header_dsfr( - intitule = "Intitule", - officiel = "Officiel", + intitule = c("Intitule", "Officiel"), nom_site_service = "Nom du site / service", baseline = "baseline - precisions sur l organisation", class = "fr-m-1w" diff --git a/tests/testthat/snapshot/numericInput_dsfr.Rda b/tests/testthat/snapshot/numericInput_dsfr.Rda index 48d3d0b..daece6a 100644 Binary files a/tests/testthat/snapshot/numericInput_dsfr.Rda and b/tests/testthat/snapshot/numericInput_dsfr.Rda differ diff --git a/tests/testthat/snapshot/numericInput_dsfr_template.Rda b/tests/testthat/snapshot/numericInput_dsfr_template.Rda index 02af9e5..f4e3ee1 100644 Binary files a/tests/testthat/snapshot/numericInput_dsfr_template.Rda and b/tests/testthat/snapshot/numericInput_dsfr_template.Rda differ