diff --git a/DESCRIPTION b/DESCRIPTION index 4705ddb..06bf7dd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -34,4 +34,4 @@ Enhances: VignetteBuilder: knitr Encoding: UTF-8 -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.3 diff --git a/NAMESPACE b/NAMESPACE index 160e645..88ce033 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,6 +3,8 @@ S3method(as.tags,htmlwidget) S3method(print,htmlwidget) S3method(print,suppress_viewer) +S3method(widgetDependencies,character) +S3method(widgetDependencies,htmlwidget) export(JS) export(JSEvals) export(appendContent) @@ -17,6 +19,7 @@ export(setWidgetIdSeed) export(shinyRenderWidget) export(shinyWidgetOutput) export(sizingPolicy) +export(widgetDependencies) import(htmltools) importFrom(utils,browseURL) importFrom(utils,file.edit) diff --git a/NEWS.md b/NEWS.md index 8176f72..598dc16 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # htmlwidgets (development version) +* Added `widgetDependencies()`, an S3 generic for retrieving all HTML dependencies from a widget name (character) or object (htmlwidget). The htmlwidget method includes runtime dependencies passed via `createWidget(dependencies = ...)`, which were previously not accessible through the public API. `getDependency()` is now deprecated in favour of `widgetDependencies()`. (#255) + * Moved `{rmarkdown}` from `Imports` to `Suggests`. It's now only required when calling `saveWidget(selfcontained = TRUE)`. (#455) * htmlwidgets hex sticker added diff --git a/R/htmlwidgets.R b/R/htmlwidgets.R index 460c5d7..204cbc8 100644 --- a/R/htmlwidgets.R +++ b/R/htmlwidgets.R @@ -207,12 +207,7 @@ toHTML <- function(x, standalone = FALSE, knitrOptions = NULL) { } ) - deps <- c( - widget_dependencies(name, package), - x$dependencies - ) - - browsable(attachDependencies(html, deps, append = TRUE)) + browsable(attachDependencies(html, widgetDependencies(x), append = TRUE)) } lookup_func <- function(name, package) { @@ -318,10 +313,6 @@ widgetF_html <- function(name, package, id, style, class, inline = FALSE, ...) { ## End unit test support functions ################################# -widget_dependencies <- function(name, package){ - getDependency(name, package) -} - # Generates a