From ab8b69c54c10fa23d02243feb1de0564d1ffa00a Mon Sep 17 00:00:00 2001 From: Juliette Engelaere-Lefebvre Date: Fri, 26 Jul 2024 11:24:07 +0200 Subject: [PATCH] =?UTF-8?q?bug=20fix=20numericInput=5Fdsfr=200=20errors=20?= =?UTF-8?q?=E2=9C=94=20|=200=20warnings=20=E2=9C=94=20|=204=20notes=20?= =?UTF-8?q?=E2=9C=96=20#155?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DESCRIPTION | 2 +- NEWS.md | 6 ++++++ R/numericinput_dsfr.R | 3 +-- R/updatenumericinput_dsfr.R | 3 +-- dev/flat_composants/flat_numericInput.Rmd | 6 ++---- inst/v1.9.3/composant/numericinput.html | 2 +- man/numericInput_dsfr.Rd | 3 +-- man/updateNumericInput_dsfr.Rd | 3 +-- tests/testthat/snapshot/numericInput_dsfr.Rda | Bin 365 -> 359 bytes .../snapshot/numericInput_dsfr_template.Rda | Bin 454 -> 449 bytes 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a5a85315..ebd91a42 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 979bc3f2..c2b27e17 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 2129c057..34cd964e 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 cb7f84ba..17dd3174 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 0d7162cb..7c91c12d 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 eda17dd8..831ab1da 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 5010d7af..0ac4e895 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 d44e456f..37c8c466 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 48d3d0b20873d159241918e74247d1c73d3fc3f9..daece6ac96e1fc9974bf8ace648ae9e734d9e4b2 100644 GIT binary patch literal 359 zcmV-t0hs+@YGO4V%UNI&K7B>=ccUQ7h@knEYz{==RRZ zcr#7neL(+Npj&-u+++DhHq4Z1tkR>mS^DsP?PMb@&Mh9LI1^+ooF3NrlYK9)aM_tn z_!VW}AzqtZwSqKbmWUd;Il|4AxNlt5g`o??rXkkCe_R89HU`?lVK4kI{}+WJZmWL; F002eWrZ)fp literal 365 zcmV-z0h0b7iwFP!000002DMVbO2a@9ooo`@1QbP2o_g>kM5-tK0gs*(1o5y*w(UZ) z37bu6Z+^LTlg?^)8ww%@7AEh_&b*y@uQ34l5D)@>s6z-}o*$EYjh*)dz^OhS1Q2!q zIbQ;hjv@|qQm#c?GRZS8>Q*`I)l4Qmp3G&{){|zz#Tt>U5{h!cBxo5scS1o+)?gum zAmO>8vw}7q{izQs8WbHCG-U$p*LzEw0lMpV*|G5*!|$?ctk zcvCFmeL(+Nq?>(d+=ISJt5)R6P^Y7}Y4Y%X?Vuyn<|b=6?QCbEXNs*9TGJ$0(~tM9 zxTHmE7U7p%e1~*pR@Eq04>@8~>%}o?u0(y~vdT@lK&@+L?fb_x@Mm9;4IH+@|JMHk L;Q1C!egpsjP+_jD diff --git a/tests/testthat/snapshot/numericInput_dsfr_template.Rda b/tests/testthat/snapshot/numericInput_dsfr_template.Rda index 02af9e51f4fdb7bae15bd62feae11d652862814b..f4e3ee16e2d0f8f5b45a4d3750fdf13b9c1d1be3 100644 GIT binary patch literal 449 zcmV;y0Y3g8iwFP!000002F+DLOT#b}&e{%L!6EGCDdZ?@^Qf@Ro8ZNZih_8^+HMQ9 zNomuu`K$c}&etrJHl5;STMHrmn!GRH%X@wA)kO%|$gwPBx8W7FpP%mf*YK?epoNf? z&oJzBg&ov^xij+F5;K2H5SW%0oP~@+nBA>$KC0_nygb5OCOZ+COqm}TTiaep(^T)Z zD*Rf6x1b62WRL*(GDy2Ti-LrCjK`T|zM=ntV8uQrv!t)K^yi7lVw^4*U+XWP;F2;P zBxK@ZJPPSF2uo%PlhP%$Hg(6X&7aQNoBjBAR;Zhaq=E8I)Qw_%1YwR8QW$bB^6(DT zjj2d0(YTqB?GU`AVHO-rS~usp{Y3gP;)o;08zY6TjuJ3a$|=FA4B|#;`KT4TN{NG1 zn?ilVF_pjvk$k)A-@IQ!Rm+zn;X|J3bR<}=<1JJsoJN3Tu##1-i8~rXbC|e?@xIzJ za#2Og=+%3bK27Pp_xIEbb{=9B*{AoUdsrT{^|fwiZhA<;TnS@?O68<|2e_1-reZsG#YKoK#g5g-|?rB+KlF?Giys0~y1 zIL_}@jGR;M1&