chore: Move component deps back to page functions (#885)

rstudio · Nov 2, 2023 · f7c45f1 · f7c45f1
1 parent b5ab607
commit f7c45f1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/R/bs-dependencies.R b/R/bs-dependencies.R
@@ -146,7 +146,6 @@ bs_theme_dependencies <- function(
         meta = list(viewport = "width=device-width, initial-scale=1, shrink-to-fit=no")
       )
     ),
-    if (version >= 5) component_dependencies(),
     htmlDependencies(out_file)
   ))
 }

diff --git a/R/page.R b/R/page.R
@@ -25,7 +25,8 @@ page <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
       tags$body(...),
       title = title,
       theme = theme,
-      lang = lang
+      lang = lang,
+      component_dependencies()
     ),
     theme = theme
   )
@@ -37,7 +38,13 @@ page <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
 #' @export
 page_fluid <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
   as_page(
-    shiny::fluidPage(..., title = title, theme = theme, lang = lang),
+    shiny::fluidPage(
+      ...,
+      title = title,
+      theme = theme,
+      lang = lang,
+      component_dependencies()
+    ),
     theme = theme
   )
 }
@@ -49,7 +56,13 @@ page_fluid <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
 #' @export
 page_fixed <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
   as_page(
-    shiny::fixedPage(..., title = title, theme = theme, lang = lang),
+    shiny::fixedPage(
+      ...,
+      title = title,
+      theme = theme,
+      lang = lang,
+      component_dependencies()
+    ),
     theme = theme
   )
 }

diff --git a/tests/testthat/_snaps/page/card.html b/tests/testthat/_snaps/page/card.html
@@ -7,13 +7,13 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 <link href="lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
 <script src="lib/bootstrap/bootstrap.bundle.min.js"></script>
-<script src="lib/bslib-component-js/components.min.js"></script>
-<script src="lib/bslib-component-js/web-components.min.js" type="module"></script>
-<link href="lib/bslib-component-css/components.css" rel="stylesheet" />
 <script src="lib/bs3compat/transition.js"></script>
 <script src="lib/bs3compat/tabs.js"></script>
 <script src="lib/bs3compat/bs3compat.js"></script>
 <link href="lib/htmltools-fill/fill.css" rel="stylesheet" />
+<script src="lib/bslib-component-js/components.min.js"></script>
+<script src="lib/bslib-component-js/web-components.min.js" type="module"></script>
+<link href="lib/bslib-component-css/components.css" rel="stylesheet" />
 <script src="lib/bslib-tag-require/tag-require.js"></script>
 
 </head>
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,7 +146,6 @@ bs_theme_dependencies <- function( @@
             meta = list(viewport = "width=device-width, initial-scale=1, shrink-to-fit=no")
           )
         ),
-        if (version >= 5) component_dependencies(),
         htmlDependencies(out_file)
       ))
     }
@@ Expand Down @@