Skip to content

Commit a928fad

Browse files
committed
Revert "Change entry-point for dependencies to be bs_theme_dependencies() instead of page() constructors"
This reverts commit 147462a from #810
1 parent b5ab607 commit a928fad

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

R/bs-dependencies.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ bs_theme_dependencies <- function(
146146
meta = list(viewport = "width=device-width, initial-scale=1, shrink-to-fit=no")
147147
)
148148
),
149-
if (version >= 5) component_dependencies(),
150149
htmlDependencies(out_file)
151150
))
152151
}

R/page.R

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ page <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
2525
tags$body(...),
2626
title = title,
2727
theme = theme,
28-
lang = lang
28+
lang = lang,
29+
component_dependencies()
2930
),
3031
theme = theme
3132
)
@@ -37,7 +38,13 @@ page <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
3738
#' @export
3839
page_fluid <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
3940
as_page(
40-
shiny::fluidPage(..., title = title, theme = theme, lang = lang),
41+
shiny::fluidPage(
42+
...,
43+
title = title,
44+
theme = theme,
45+
lang = lang,
46+
component_dependencies()
47+
),
4148
theme = theme
4249
)
4350
}
@@ -49,7 +56,13 @@ page_fluid <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
4956
#' @export
5057
page_fixed <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
5158
as_page(
52-
shiny::fixedPage(..., title = title, theme = theme, lang = lang),
59+
shiny::fixedPage(
60+
...,
61+
title = title,
62+
theme = theme,
63+
lang = lang,
64+
component_dependencies()
65+
),
5366
theme = theme
5467
)
5568
}

0 commit comments

Comments
 (0)