Use pkgdown for reference page generation (#2651)

* Add _pkgdown.yml, remove inst/staticdocs/index.r

* Update pkgdown.yml

* Fix pkgdown (nee staticdocs) test so that it fails as it should

* Fix pkgdown test by adding shinyServer and shinyUI to list of intentionally unindexed functions

* Remove old staticdocs test

* Fix "Boilerplate" section of reference docs

* Fix CMD CHECK

* Fix typo

* Use file-based test in get_exported()

* Skip pkgdown check on CRAN

* Fix typo in pkgdown test

.travis.yml

@@ -19,6 +19,7 @@ matrix:
       r: release
     - name: "Development Release Check"
       r: devel
+
 sudo: false
 cache: packages
 notifications:

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.3.2.9001
+Version: 1.4.0
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -65,16 +65,16 @@ Depends:
 Imports:
     utils,
     grDevices,
-    httpuv (>= 1.5.0),
+    httpuv (>= 1.5.2),
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
     digest,
-    htmltools (>= 0.3.6),
+    htmltools (>= 0.4.0),
     R6 (>= 2.0),
     sourcetools,
-    later (>= 0.7.2),
-    promises (>= 1.0.1),
+    later (>= 1.0.0),
+    promises (>= 1.1.0),
     tools,
     crayon,
     rlang (>= 0.4.0),
@@ -88,7 +88,8 @@ Suggests:
     rmarkdown,
     ggplot2,
     reactlog (>= 1.0.0),
-    magrittr
+    magrittr,
+    yaml
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
 Collate:
@@ -96,6 +97,7 @@ Collate:
     'bookmark-state-local.R'
     'stack.R'
     'bookmark-state.R'
+    'bootstrap-deprecated.R'
     'bootstrap-layout.R'
     'globals.R'
     'conditions.R'

NAMESPACE

@@ -26,7 +26,9 @@ S3method(format,reactiveExpr)
 S3method(format,reactiveVal)
 S3method(names,reactivevalues)
 S3method(print,reactive)
+S3method(print,reactivevalues)
 S3method(print,shiny.appobj)
+S3method(print,shiny.render.function)
 S3method(str,reactivevalues)
 export("conditionStackTrace<-")
 export(..stacktraceoff..)
@@ -132,6 +134,7 @@ export(isRunning)
 export(isTruthy)
 export(isolate)
 export(key_missing)
+export(loadSupport)
 export(mainPanel)
 export(makeReactiveBinding)
 export(markRenderFunction)
@@ -249,6 +252,8 @@ export(tag)
 export(tagAppendAttributes)
 export(tagAppendChild)
 export(tagAppendChildren)
+export(tagGetAttribute)
+export(tagHasAttribute)
 export(tagList)
 export(tagSetChildren)
 export(tags)

NEWS.md

@@ -1,32 +1,46 @@
-shiny 1.3.2.9001
-=======
+shiny 1.4.0
+===========
 
-## Changes
+## Full changelog
 
-* Resolved [#1433](https://github.com/rstudio/shiny/issues/1433): `plotOutput()`'s coordmap info now includes discrete axis limits for **ggplot2** plots. As a result, any **shinytest** tests that contain **ggplot2** plots with discrete axes (that were recorded before this change) will now report differences that can safely be updated. This new coordmap info was added to correctly infer what data points are within an input brush and/or near input click/hover in scenarios where a non-trivial discrete axis scale is involved (e.g., whenever `scale_[x/y]_discrete(limits = ...)` and/or free scales across multiple discrete axes are used). ([#2410](https://github.com/rstudio/shiny/pull/2410))
+### Breaking changes
+
+* Resolved [#2554](https://github.com/rstudio/shiny/issues/2554): Upgraded jQuery from v.1.12.4 to v3.4.1 and bootstrap from v3.3.7 to v3.4.1. ([#2557](https://github.com/rstudio/shiny/pull/2557)). Since the jQuery upgrade may introduce breaking changes to user code, there is an option to switch back to the old version by setting `options(shiny.jquery.version = 1)`. If you've hard-coded `shared/jquery[.min].js` in the HTML of your Shiny app, in order to downgrade, you'll have to change that filepath to `shared/legacy/jquery[.min].js`.
 
 ### Improvements
 
+* Resolved [#1433](https://github.com/rstudio/shiny/issues/1433): `plotOutput()`'s coordmap info now includes discrete axis limits for **ggplot2** plots. As a result, any **shinytest** tests that contain **ggplot2** plots with discrete axes (that were recorded before this change) will now report differences that can safely be updated. This new coordmap info was added to correctly infer what data points are within an input brush and/or near input click/hover in scenarios where a non-trivial discrete axis scale is involved (e.g., whenever `scale_[x/y]_discrete(limits = ...)` and/or free scales across multiple discrete axes are used). ([#2410](https://github.com/rstudio/shiny/pull/2410))
+
 * Resolved [#2402](https://github.com/rstudio/shiny/issues/2402): An informative warning is now thrown for mis-specified (date) strings in `dateInput()`, `updateDateInput()`, `dateRangeInput()`, and `updateDateRangeInput()`. ([#2403](https://github.com/rstudio/shiny/pull/2403))
 
+* If the `shiny.autoload.r` option is set to `TRUE`, all files ending in `.r` or `.R` contained in a directory named `R/` adjacent to your application are sourced when your app is started. This will become the default Shiny behavior in a future release ([#2547](https://github.com/rstudio/shiny/pull/2547))
+
 * Resolved [#2442](https://github.com/rstudio/shiny/issues/2442): The `shiny:inputchanged` JavaScript event now triggers on the related input element instead of `document`. Existing event listeners bound to `document` will still detect the event due to event bubbling. ([#2446](https://github.com/rstudio/shiny/pull/2446))
 
 * Fixed [#1393](https://github.com/rstudio/shiny/issues/1393), [#2223](https://github.com/rstudio/shiny/issues/2223): For plots with any interactions enabled, the image is no longer draggable. ([#2460](https://github.com/rstudio/shiny/pull/2460))
 
-* Partially resolved [#2423](https://github.com/rstudio/shiny/issues/2423): Reactivity in Shiny leaked some memory, because R can leak memory whenever a new symbols is interned, which happens whenever a new name/key is used in an environment. R now uses the fastmap package, which avoids this problem. ([#2429](https://github.com/rstudio/shiny/pull/2429))
-
 * Resolved [#2469](https://github.com/rstudio/shiny/issues/2469): `renderText` now takes a `sep` argument that is passed to `cat`. ([#2497](https://github.com/rstudio/shiny/pull/2497))
 
 * Added `resourcePaths()` and `removeResourcePaths()` functions. ([#2459](https://github.com/rstudio/shiny/pull/2459))
 
-* Resolved [#2515](https://github.com/rstudio/shiny/issues/2515): `selectInput()` now deals appropriately with named factors. ([#2524](https://github.com/rstudio/shiny/pull/2524))
-
 * Resolved [#2433](https://github.com/rstudio/shiny/issues/2433): An informative warning is now thrown if subdirectories of the app's `www/` directory are masked by other resource prefixes and/or the same resource prefix is mapped to different local file paths. ([#2434](https://github.com/rstudio/shiny/pull/2434))
 
+* Resolved [#2478](https://github.com/rstudio/shiny/issues/2478): `cmd + shift + f3` and `ctrl + shift + f3` can now be used to add a reactlog mark. If reactlog keybindings are used and the reactlog is not enabled, an error page is displayed showing how to enable reactlog recordings. ([#2560](https://github.com/rstudio/shiny/pull/2560))
+
 ### Bug fixes
 
+* Partially resolved [#2423](https://github.com/rstudio/shiny/issues/2423): Reactivity in Shiny leaked some memory, because R can leak memory whenever a new symbols is interned, which happens whenever a new name/key is used in an environment. R now uses the fastmap package, which avoids this problem. ([#2429](https://github.com/rstudio/shiny/pull/2429))
+
+* Fixed [#2267](https://github.com/rstudio/shiny/issues/2267): Fixed a memory leak with `invalidateLater`. ([#2555](https://github.com/rstudio/shiny/pull/2555))
+
+* Fixed [#1548](https://github.com/rstudio/shiny/issues/1548): The `reactivePoll` function leaked an observer; that is the observer would continue to exist even if the `reactivePoll` object was no longer accessible. [#2522](https://github.com/rstudio/shiny/pull/2522)
+
 * Fixed [#2116](https://github.com/rstudio/shiny/issues/2116): Fixed an issue where dynamic tabs could not be added when on a hosted platform. ([#2545](https://github.com/rstudio/shiny/pull/2545))
 
+* Resolved [#2515](https://github.com/rstudio/shiny/issues/2515): `selectInput()` and `selectizeInput()` now deal appropriately with named factors. Note that `updateSelectInput()` and `updateSelectizeInput()` **do not** yet handle factors; their behavior is unchanged. ([#2524](https://github.com/rstudio/shiny/pull/2524), [#2540](https://github.com/rstudio/shiny/pull/2540), [#2625](https://github.com/rstudio/shiny/pull/2625))
+
+* Resolved [#2471](https://github.com/rstudio/shiny/issues/2471): Large file uploads to a Windows computer were slow. ([#2579](https://github.com/rstudio/shiny/pull/2579))
+
 * Fixed [#2387](https://github.com/rstudio/shiny/issues/2387): Updating a `sliderInput()`'s type from numeric to date no longer changes the rate policy from debounced to immediate. More generally, updating an input binding with a new type should (no longer) incorrectly alter the input rate policy. ([#2404](https://github.com/rstudio/shiny/pull/2404))
 
 * Fixed [#868](https://github.com/rstudio/shiny/issues/868): If an input is initialized with a `NULL` label, it can now be updated with a string. Moreover, if an input label is initialized with a string, it can now be removed by updating with `label=character(0)` (similar to how `choices` and `selected` can be cleared in `updateSelectInput()`). ([#2406](https://github.com/rstudio/shiny/pull/2406))
@@ -37,14 +51,16 @@ shiny 1.3.2.9001
 
 * Fixed [#2233](https://github.com/rstudio/shiny/issues/2233): `verbatimTextOutput()` produced wrapped text on Safari, but the text should not be wrapped. ([#2353](https://github.com/rstudio/shiny/pull/2353))
 
+* Fixed [#2335](https://github.com/rstudio/shiny/issues/2335): When `dateInput()`'s `value` was unspecified, and `max` and/or `min` was set to `Sys.Date()`, the value was not being set properly. ([#2526](https://github.com/rstudio/shiny/pull/2526))
+
+* Fixed [#2591](https://github.com/rstudio/shiny/issues/2591): Providing malformed date-strings to `min` or `max` no longer results in JS errors for `dateInput()` and `dateRangeInput()`. ([#2592](https://github.com/rstudio/shiny/pull/2592))
+
 * Fixed [rstudio/reactlog#36](https://github.com/rstudio/reactlog/issues/36): Changes to reactive values not displaying accurately in reactlog. ([#2424](https://github.com/rstudio/shiny/pull/2424))
 
+* Fixed [#2598](https://github.com/rstudio/shiny/issues/2598): Showcase files don't appear with a wide window. ([#2582](https://github.com/rstudio/shiny/pull/2582))
+
 * Fixed [#2329](https://github.com/rstudio/shiny/issues/2329), [#1817](https://github.com/rstudio/shiny/issues/1817): These bugs were reported as fixed in Shiny 1.3.0 but were not actually fixed because some JavaScript changes were accidentally not included in the release. The fix resolves issues that occur when `withProgressBar()` or bookmarking are combined with the [networkD3](https://christophergandrud.github.io/networkD3/) package's Sankey plot.
 
-### Library updates
-
-* Resolved [#2554](https://github.com/rstudio/shiny/issues/2554): Upgraded bootstrap to v3.4.1 and jQuery to v3.4.1. ([#2557](https://github.com/rstudio/shiny/pull/2557))
-
 
 shiny 1.3.2
 ===========
@@ -615,7 +631,7 @@ There are many more minor features, small improvements, and bug fixes than we ca
 
 *    **Code Diagnostics**: if there is an error parsing `ui.R`, `server.R`, `app.R`, or `global.R`, Shiny will search the code for missing commas, extra commas, and unmatched braces, parens, and brackets, and will print out messages pointing out those problems. ([#1126](https://github.com/rstudio/shiny/pull/1126))
 
-*    **Reactlog visualization**: by default, the [`showReactLog()` function](http://shiny.rstudio.com/reference/shiny/latest/showReactLog.html) (which brings up the reactive graph) also displays the time that each reactive and observer were active for:
+*    **Reactlog visualization**: by default, the [`showReactLog()` function](http://shiny.rstudio.com/reference/shiny/latest/reactlog.html) (which brings up the reactive graph) also displays the time that each reactive and observer were active for:
 
       <p align="center">
       <img src="http://shiny.rstudio.com/images/reactlog.png" alt="modal-dialog" width="75%"/>

R/app.R

@@ -14,7 +14,9 @@
 #'
 #' @param ui The UI definition of the app (for example, a call to
 #'   `fluidPage()` with nested controls)
-#' @param server A server function
+#' @param server A function with three parameters: `input`, `output`, and
+#'   `session`. The function is called once for each session ensuring that each
+#'   app is independent.
 #' @param onStart A function that will be called before the app is actually run.
 #'   This is only needed for `shinyAppObj`, since in the `shinyAppDir`
 #'   case, a `global.R` file can be used for this purpose.
@@ -68,10 +70,10 @@
 #'   runApp(app)
 #' }
 #' @export
-shinyApp <- function(ui=NULL, server=NULL, onStart=NULL, options=list(),
+shinyApp <- function(ui, server, onStart=NULL, options=list(),
                      uiPattern="/", enableBookmarking=NULL) {
-  if (is.null(server)) {
-    stop("`server` missing from shinyApp")
+  if (!is.function(server)) {
+    stop("`server` must be a function", call. = FALSE)
   }
 
   # Ensure that the entire path is a match
@@ -139,10 +141,23 @@ shinyAppFile <- function(appFile, options=list()) {
 
 # This reads in an app dir in the case that there's a server.R (and ui.R/www)
 # present, and returns a shiny.appobj.
+# appDir must be a normalized (absolute) path, not a relative one
 shinyAppDir_serverR <- function(appDir, options=list()) {
   # Most of the complexity here comes from needing to hot-reload if the .R files
   # change on disk, or are created, or are removed.
 
+  # In an upcoming version of shiny, this option will go away and the new behavior will be used.
+  if (getOption("shiny.autoload.r", FALSE)) {
+    # new behavior
+
+    # Create a child env which contains all the helpers and will be the shared parent
+    # of the ui.R and server.R load.
+    sharedEnv <- new.env(parent = globalenv())
+  } else {
+    # old behavior, default
+    sharedEnv <- globalenv()
+  }
+
   # uiHandlerSource is a function that returns an HTTP handler for serving up
   # ui.R as a webpage. The "cachedFuncWithFile" call makes sure that the closure
   # we're creating here only gets executed when ui.R's contents change.
@@ -153,7 +168,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
         # If not, then take the last expression that's returned from ui.R.
         .globals$ui <- NULL
         on.exit(.globals$ui <- NULL, add = FALSE)
-        ui <- sourceUTF8(uiR, envir = new.env(parent = globalenv()))
+        ui <- sourceUTF8(uiR, envir = new.env(parent = sharedEnv))
         if (!is.null(.globals$ui)) {
           ui <- .globals$ui[[1]]
         }
@@ -183,7 +198,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
       # server.R.
       .globals$server <- NULL
       on.exit(.globals$server <- NULL, add = TRUE)
-      result <- sourceUTF8(serverR, envir = new.env(parent = globalenv()))
+      result <- sourceUTF8(serverR, envir = new.env(parent = sharedEnv))
       if (!is.null(.globals$server)) {
         result <- .globals$server[[1]]
       }
@@ -214,8 +229,13 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
     oldwd <<- getwd()
     setwd(appDir)
     monitorHandle <<- initAutoReloadMonitor(appDir)
-    if (file.exists(file.path.ci(appDir, "global.R")))
-      sourceUTF8(file.path.ci(appDir, "global.R"))
+    # TODO: we should support hot reloading on global.R and R/*.R changes.
+    if (getOption("shiny.autoload.r", FALSE)) {
+      loadSupport(appDir, renv=sharedEnv, globalrenv=globalenv())
+    }  else {
+      if (file.exists(file.path.ci(appDir, "global.R")))
+        sourceUTF8(file.path.ci(appDir, "global.R"))
+    }
   }
   onStop <- function() {
     setwd(oldwd)
@@ -288,18 +308,66 @@ initAutoReloadMonitor <- function(dir) {
   obs$destroy
 }
 
+#' Load an app's supporting R files
+#'
+#' Loads all of the supporting R files of a Shiny application. Specifically,
+#' this function loads any top-level supporting `.R` files in the `R/` directory
+#' adjacent to the `app.R`/`server.R`/`ui.R` files.
+#'
+#' At the moment, this function is "opt-in" and only called if the option
+#' `shiny.autoload.r` is set to `TRUE`.
+#'
+#' @details The files are sourced in alphabetical order (as determined by
+#'   [list.files]). `global.R` is evaluated before the supporting R files in the
+#'   `R/` directory.
+#' @param appDir The application directory
+#' @param renv The environmeny in which the files in the `R/` directory should
+#'   be evaluated.
+#' @param globalrenv The environment in which `global.R` should be evaluated. If
+#'   `NULL`, `global.R` will not be evaluated at all.
+#' @export
+loadSupport <- function(appDir, renv=new.env(parent=globalenv()), globalrenv=globalenv()){
+  if (!is.null(globalrenv)){
+    # Evaluate global.R, if it exists.
+    if (file.exists(file.path.ci(appDir, "global.R"))){
+      sourceUTF8(file.path.ci(appDir, "global.R"), envir=globalrenv)
+    }
+  }
+
+  helpersDir <- file.path(appDir, "R")
+  helpers <- list.files(helpersDir, pattern="\\.[rR]$", recursive=FALSE, full.names=TRUE)
+
+  lapply(helpers, sourceUTF8, envir=renv)
+
+  invisible(renv)
+}
+
 # This reads in an app dir for a single-file application (e.g. app.R), and
 # returns a shiny.appobj.
+# appDir must be a normalized (absolute) path, not a relative one
 shinyAppDir_appR <- function(fileName, appDir, options=list())
 {
   fullpath <- file.path.ci(appDir, fileName)
 
+  # In an upcoming version of shiny, this option will go away and the new behavior will be used.
+  if (getOption("shiny.autoload.r", FALSE)) {
+    # new behavior
+
+    # Create a child env which contains all the helpers and will be the shared parent
+    # of the ui.R and server.R load.
+    sharedEnv <- new.env(parent = globalenv())
+  } else {
+    # old behavior, default
+    sharedEnv <- globalenv()
+  }
+
+
   # This sources app.R and caches the content. When appObj() is called but
   # app.R hasn't changed, it won't re-source the file. But if called and
   # app.R has changed, it'll re-source the file and return the result.
   appObj <- cachedFuncWithFile(appDir, fileName, case.sensitive = FALSE,
     function(appR) {
-      result <- sourceUTF8(fullpath, envir = new.env(parent = globalenv()))
+      result <- sourceUTF8(fullpath, envir = new.env(parent = sharedEnv))
 
       if (!is.shiny.appobj(result))
         stop("app.R did not return a shiny.appobj object.")
@@ -342,6 +410,10 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
   onStart <- function() {
     oldwd <<- getwd()
     setwd(appDir)
+    # TODO: we should support hot reloading on R/*.R changes.
+    if (getOption("shiny.autoload.r", FALSE)) {
+      loadSupport(appDir, renv=sharedEnv, globalrenv=NULL)
+    }
     monitorHandle <<- initAutoReloadMonitor(appDir)
     if (!is.null(appObj()$onStart)) appObj()$onStart()
   }
@@ -376,26 +448,34 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
 }
 
 
-#' @rdname shinyApp
+#' Shiny App object
+#'
+#' Internal methods for the `shiny.appobj` S3 class.
+#'
+#' @keywords internal
+#' @name shiny.appobj
+NULL
+
+#' @rdname shiny.appobj
 #' @param x Object to convert to a Shiny app.
 #' @export
 as.shiny.appobj <- function(x) {
   UseMethod("as.shiny.appobj", x)
 }
 
-#' @rdname shinyApp
+#' @rdname shiny.appobj
 #' @export
 as.shiny.appobj.shiny.appobj <- function(x) {
   x
 }
 
-#' @rdname shinyApp
+#' @rdname shiny.appobj
 #' @export
 as.shiny.appobj.list <- function(x) {
   shinyApp(ui = x$ui, server = x$server)
 }
 
-#' @rdname shinyApp
+#' @rdname shiny.appobj
 #' @export
 as.shiny.appobj.character <- function(x) {
   if (identical(tolower(tools::file_ext(x)), "r"))
@@ -404,13 +484,13 @@ as.shiny.appobj.character <- function(x) {
     shinyAppDir(x)
 }
 
-#' @rdname shinyApp
+#' @rdname shiny.appobj
 #' @export
 is.shiny.appobj <- function(x) {
   inherits(x, "shiny.appobj")
 }
 
-#' @rdname shinyApp
+#' @rdname shiny.appobj
 #' @param ... Additional parameters to be passed to print.
 #' @export
 print.shiny.appobj <- function(x, ...) {
@@ -425,7 +505,7 @@ print.shiny.appobj <- function(x, ...) {
   do.call("runApp", args)
 }
 
-#' @rdname shinyApp
+#' @rdname shiny.appobj
 #' @method as.tags shiny.appobj
 #' @export
 as.tags.shiny.appobj <- function(x, ...) {

R/bootstrap-deprecated.R

@@ -0,0 +1,47 @@
+#' Create a page with a sidebar
+#'
+#' **DEPRECATED**: use [fluidPage()] and [sidebarLayout()] instead.
+#'
+#' @param headerPanel The [headerPanel] with the application title
+#' @param sidebarPanel The [sidebarPanel] containing input controls
+#' @param mainPanel The [mainPanel] containing outputs
+#' @keywords internal
+#' @return A UI defintion that can be passed to the [shinyUI] function
+#' @export
+pageWithSidebar <- function(headerPanel,
+                            sidebarPanel,
+                            mainPanel) {
+
+  bootstrapPage(
+    # basic application container divs
+    div(
+      class="container-fluid",
+      div(class="row",
+          headerPanel
+      ),
+      div(class="row",
+          sidebarPanel,
+          mainPanel
+      )
+    )
+  )
+}
+
+#' Create a header panel
+#'
+#' **DEPRECATED**: use [titlePanel()] instead.
+#'
+#' @param title An application title to display
+#' @param windowTitle The title that should be displayed by the browser window.
+#'   Useful if `title` is not a string.
+#' @return A headerPanel that can be passed to [pageWithSidebar]
+#' @keywords internal
+#' @export
+headerPanel <- function(title, windowTitle=title) {
+  tagList(
+    tags$head(tags$title(windowTitle)),
+    div(class="col-sm-12",
+      h1(title)
+    )
+  )
+}

R/bootstrap-layout.R

@@ -28,7 +28,8 @@
 #'   Shiny-Application-Layout-Guide](http://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fluid
 #'   pages.
 #'
-#' @seealso [column()], [sidebarLayout()]
+#' @family layout functions
+#' @seealso [column()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -130,6 +131,8 @@ fluidRow <- function(...) {
 #'   Shiny Application Layout Guide](http://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fixed
 #'   pages.
 #'
+#' @family layout functions
+#'
 #' @seealso [column()]
 #'
 #' @examples
@@ -243,7 +246,6 @@ column <- function(width, ..., offset = 0) {
 #'   `title` tag within the head. You can also specify a page title
 #'   explicitly using the `title` parameter of the top-level page function.
 #'
-#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
@@ -263,16 +265,23 @@ titlePanel <- function(title, windowTitle=title) {
 
 #' Layout a sidebar and main area
 #'
-#' Create a layout with a sidebar and main area. The sidebar is displayed with a
-#' distinct background color and typically contains input controls. The main
+#' Create a layout (`sidebarLayout()`) with a sidebar (`sidebarPanel()`) and
+#' main area (`mainPanel()`). The sidebar is displayed with a distinct
+#' background color and typically contains input controls. The main
 #' area occupies 2/3 of the horizontal width and typically contains outputs.
 #'
-#' @param sidebarPanel The [sidebarPanel] containing input controls
-#' @param mainPanel The [mainPanel] containing outputs
+#' @param sidebarPanel The `sidebarPanel()` containing input controls.
+#' @param mainPanel The `mainPanel()` containing outputs.
 #' @param position The position of the sidebar relative to the main area ("left"
-#'   or "right")
+#'   or "right").
 #' @param fluid `TRUE` to use fluid layout; `FALSE` to use fixed
 #'   layout.
+#' @param width The width of the sidebar and main panel. By default, the
+#'   sidebar takes up 1/3 of the width, and the main panel 2/3. The total
+#'   width must be 12 or less.
+#' @param ... Output elements to include in the sidebar/main panel.
+#'
+#' @family layout functions
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -337,6 +346,24 @@ sidebarLayout <- function(sidebarPanel,
     fixedRow(firstPanel, secondPanel)
 }
 
+#' @export
+#' @rdname sidebarLayout
+sidebarPanel <- function(..., width = 4) {
+  div(class=paste0("col-sm-", width),
+    tags$form(class="well",
+      ...
+    )
+  )
+}
+
+#' @export
+#' @rdname sidebarLayout
+mainPanel <- function(..., width = 8) {
+  div(class=paste0("col-sm-", width),
+    ...
+  )
+}
+
 #' Lay out UI elements vertically
 #'
 #' Create a container that includes one or more rows of content (each element
@@ -346,7 +373,7 @@ sidebarLayout <- function(sidebarPanel,
 #' @param fluid `TRUE` to use fluid layout; `FALSE` to use fixed
 #'   layout.
 #'
-#' @seealso [fluidPage()], [flowLayout()]
+#' @family layout functions
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -384,7 +411,7 @@ verticalLayout <- function(..., fluid = TRUE) {
 #' @param cellArgs Any additional attributes that should be used for each cell
 #'   of the layout.
 #'
-#' @seealso [verticalLayout()]
+#' @family layout functions
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -440,6 +467,8 @@ inputPanel <- function(...) {
 #' @param cellArgs Any additional attributes that should be used for each cell
 #'   of the layout.
 #'
+#' @family layout functions
+#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {

R/bootstrap.R

@@ -130,6 +130,8 @@ basicPage <- function(...) {
 #' @param bootstrap If `TRUE`, load the Bootstrap CSS library.
 #' @param theme URL to alternative Bootstrap stylesheet.
 #'
+#' @family layout functions
+#'
 #' @examples
 #' fillPage(
 #'   tags$style(type = "text/css",
@@ -178,61 +180,6 @@ collapseSizes <- function(padding) {
     collapse = " ")
 }
 
-#' Create a page with a sidebar
-#'
-#' Create a Shiny UI that contains a header with the application title, a
-#' sidebar for input controls, and a main area for output.
-#'
-#' @param headerPanel The [headerPanel] with the application title
-#' @param sidebarPanel The [sidebarPanel] containing input controls
-#' @param mainPanel The [mainPanel] containing outputs
-
-#' @return A UI defintion that can be passed to the [shinyUI] function
-#'
-#' @note This function is deprecated. You should use [fluidPage()]
-#' along with [sidebarLayout()] to implement a page with a sidebar.
-#'
-#' @examples
-#' # Define UI
-#' pageWithSidebar(
-#'
-#'   # Application title
-#'   headerPanel("Hello Shiny!"),
-#'
-#'   # Sidebar with a slider input
-#'   sidebarPanel(
-#'     sliderInput("obs",
-#'                 "Number of observations:",
-#'                 min = 0,
-#'                 max = 1000,
-#'                 value = 500)
-#'   ),
-#'
-#'   # Show a plot of the generated distribution
-#'   mainPanel(
-#'     plotOutput("distPlot")
-#'   )
-#' )
-#' @export
-pageWithSidebar <- function(headerPanel,
-                            sidebarPanel,
-                            mainPanel) {
-
-  bootstrapPage(
-    # basic application container divs
-    div(
-      class="container-fluid",
-      div(class="row",
-          headerPanel
-      ),
-      div(class="row",
-          sidebarPanel,
-          mainPanel
-      )
-    )
-  )
-}
-
 #' Create a page with a top level navigation bar
 #'
 #' Create a page that contains a top level navigation bar that can be used to
@@ -288,6 +235,8 @@ pageWithSidebar <- function(headerPanel,
 #'   [updateNavbarPage()], [insertTab()],
 #'   [showTab()]
 #'
+#' @family layout functions
+#'
 #' @examples
 #' navbarPage("App Title",
 #'   tabPanel("Plot"),
@@ -408,27 +357,6 @@ navbarMenu <- function(title, ..., menuName = title, icon = NULL) {
             class = "shiny.navbarmenu")
 }
 
-#' Create a header panel
-#'
-#' Create a header panel containing an application title.
-#'
-#' @param title An application title to display
-#' @param windowTitle The title that should be displayed by the browser window.
-#'   Useful if `title` is not a string.
-#' @return A headerPanel that can be passed to [pageWithSidebar]
-#'
-#' @examples
-#' headerPanel("Hello Shiny!")
-#' @export
-headerPanel <- function(title, windowTitle=title) {
-  tagList(
-    tags$head(tags$title(windowTitle)),
-    div(class="col-sm-12",
-      h1(title)
-    )
-  )
-}
-
 #' Create a well panel
 #'
 #' Creates a panel with a slightly inset border and grey background. Equivalent
@@ -441,59 +369,6 @@ wellPanel <- function(...) {
   div(class="well", ...)
 }
 
-#' Create a sidebar panel
-#'
-#' Create a sidebar panel containing input controls that can in turn be passed
-#' to [sidebarLayout()].
-#'
-#' @param ... UI elements to include on the sidebar
-#' @param width The width of the sidebar. For fluid layouts this is out of 12
-#'   total units; for fixed layouts it is out of whatever the width of the
-#'   sidebar's parent column is.
-#' @return A sidebar that can be passed to [sidebarLayout()]
-#'
-#' @examples
-#' # Sidebar with controls to select a dataset and specify
-#' # the number of observations to view
-#' sidebarPanel(
-#'   selectInput("dataset", "Choose a dataset:",
-#'               choices = c("rock", "pressure", "cars")),
-#'
-#'   numericInput("obs", "Observations:", 10)
-#' )
-#' @export
-sidebarPanel <- function(..., width = 4) {
-  div(class=paste0("col-sm-", width),
-    tags$form(class="well",
-      ...
-    )
-  )
-}
-
-#' Create a main panel
-#'
-#' Create a main panel containing output elements that can in turn be passed to
-#' [sidebarLayout()].
-#'
-#' @param ... Output elements to include in the main panel
-#' @param width The width of the main panel. For fluid layouts this is out of 12
-#'   total units; for fixed layouts it is out of whatever the width of the main
-#'   panel's parent column is.
-#' @return A main panel that can be passed to [sidebarLayout()].
-#'
-#' @examples
-#' # Show the caption and plot of the requested variable against mpg
-#' mainPanel(
-#'    h3(textOutput("caption")),
-#'    plotOutput("mpgPlot")
-#' )
-#' @export
-mainPanel <- function(..., width = 8) {
-  div(class=paste0("col-sm-", width),
-    ...
-  )
-}
-
 #' Conditional Panel
 #'
 #' Creates a panel that is visible or not, depending on the value of a
@@ -589,7 +464,8 @@ helpText <- function(...) {
 
 #' Create a tab panel
 #'
-#' Create a tab panel that can be included within a [tabsetPanel()].
+#' Create a tab panel that can be included within a [tabsetPanel()] or
+#' a [navbarPage()].
 #'
 #' @param title Display title for tab
 #' @param ... UI elements to include within the tab

R/globals.R

@@ -16,7 +16,9 @@ register_s3_method <- function(pkg, generic, class, fun = NULL) {
     registerS3method(generic, class, fun, envir = asNamespace(pkg))
   }
 
-  # Always register hook in case package is later unloaded & reloaded
+  # Always register hook in case pkg is loaded at some
+  # point the future (or, potentially, but less commonly,
+  # unloaded & reloaded)
   setHook(
     packageEvent(pkg, "onLoad"),
     function(...) {
@@ -25,6 +27,37 @@ register_s3_method <- function(pkg, generic, class, fun = NULL) {
   )
 }
 
+register_upgrade_message <- function(pkg, version) {
+  # Is an out-dated version of this package installed?
+  needs_upgrade <- function() {
+    if (system.file(package = pkg) == "")
+      return(FALSE)
+    if (utils::packageVersion(pkg) >= version)
+      return(FALSE)
+    TRUE
+  }
+
+  msg <- sprintf(
+    "This version of Shiny is designed to work with '%s' >= %s.
+    Please upgrade via install.packages('%s').",
+    pkg, version, pkg
+  )
+
+  if (pkg %in% loadedNamespaces() && needs_upgrade()) {
+    packageStartupMessage(msg)
+  }
+
+  # Always register hook in case pkg is loaded at some
+  # point the future (or, potentially, but less commonly,
+  # unloaded & reloaded)
+  setHook(
+    packageEvent(pkg, "onLoad"),
+    function(...) {
+      if (needs_upgrade()) packageStartupMessage(msg)
+    }
+  )
+}
+
 .onLoad <- function(libname, pkgname) {
   # R's lazy-loading package scheme causes the private seed to be cached in the
   # package itself, making our PRNG completely deterministic. This line resets
@@ -36,18 +69,10 @@ register_s3_method <- function(pkg, generic, class, fun = NULL) {
   register_s3_method("knitr", "knit_print", "reactive")
   register_s3_method("knitr", "knit_print", "shiny.appobj")
   register_s3_method("knitr", "knit_print", "shiny.render.function")
-}
 
-.onAttach <- function(libname, pkgname) {
-  # Check for htmlwidgets version, if installed. As of Shiny 0.12.0 and
-  # htmlwidgets 0.4, both packages switched from RJSONIO to jsonlite. Because of
-  # this change, Shiny 0.12.0 will work only with htmlwidgets >= 0.4, and vice
-  # versa.
-  if (system.file(package = "htmlwidgets") != "" &&
-      utils::packageVersion("htmlwidgets") < "0.4") {
-    packageStartupMessage(
-      "This version of Shiny is designed to work with htmlwidgets >= 0.4. ",
-      "Please upgrade your version of htmlwidgets."
-    )
-  }
+  # Shiny 1.4.0 bumps jQuery 1.x to 3.x, which caused a problem
+  # with static-rendering of htmlwidgets, and htmlwidgets 1.5
+  # includes a fix for this problem
+  # https://github.com/rstudio/shiny/issues/2630
+  register_upgrade_message("htmlwidgets", 1.5)
 }

R/htmltools.R

@@ -1,7 +1,11 @@
-#' @export a br code div em h1 h2 h3 h4 h5 h6 hr HTML img p pre span strong
-#' @export includeCSS includeHTML includeMarkdown includeScript includeText
-#' @export is.singleton singleton
-#' @export tag tagAppendAttributes tagAppendChild tagAppendChildren tagList tags tagSetChildren withTags
+#' @import htmltools
+#' @export tags p h1 h2 h3 h4 h5 h6 a br div span pre code img strong em hr
+#' @export tag tagList tagAppendAttributes tagHasAttribute tagGetAttribute tagAppendChild tagAppendChildren tagSetChildren
+#' @export HTML
+#' @export includeHTML includeText includeMarkdown includeCSS includeScript
+#' @export singleton is.singleton
 #' @export validateCssUnit
-#' @export htmlTemplate suppressDependencies
+#' @export htmlTemplate
+#' @export suppressDependencies
+#' @export withTags
 NULL

R/input-action.R

@@ -37,6 +37,13 @@
 #' }
 #'
 #' @seealso [observeEvent()] and [eventReactive()]
+#'
+#' @section Server value:
+#' An integer of class `"shinyActionButtonValue"`. This class differs from
+#' ordinary integers in that a value of 0 is considered "falsy".
+#' This implies two things:
+#'   * Event handlers (e.g., [observeEvent()], [eventReactive()]) won't execute on initial load.
+#'   * Input validation (e.g., [req()], [need()]) will fail on initial load.
 #' @export
 actionButton <- function(inputId, label, icon = NULL, width = NULL, ...) {
 

R/input-checkbox.R

@@ -22,6 +22,10 @@
 #' }
 #' shinyApp(ui, server)
 #' }
+#'
+#' @section Server value:
+#' `TRUE` if checked, `FALSE` otherwise.
+#'
 #' @export
 checkboxInput <- function(inputId, label, value = FALSE, width = NULL) {
 

R/input-checkboxgroup.R

@@ -67,6 +67,9 @@
 #'
 #' shinyApp(ui, server)
 #' }
+#' @section Server value:
+#' Character vector of values corresponding to the boxes that are checked.
+#'
 #' @export
 checkboxGroupInput <- function(inputId, label, choices = NULL, selected = NULL,
   inline = FALSE, width = NULL, choiceNames = NULL, choiceValues = NULL) {

R/input-date.R

@@ -86,6 +86,10 @@
 #'
 #' shinyApp(ui, server = function(input, output) { })
 #' }
+#'
+#' @section Server value:
+#' A [Date] vector of length 1.
+#'
 #' @export
 dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
   format = "yyyy-mm-dd", startview = "month", weekstart = 0,

R/input-daterange.R

@@ -70,6 +70,10 @@
 #'
 #' shinyApp(ui, server = function(input, output) { })
 #' }
+#'
+#' @section Server value:
+#' A [Date] vector of length 2.
+#'
 #' @export
 dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
     min = NULL, max = NULL, format = "yyyy-mm-dd", startview = "month",

R/input-file.R

@@ -3,21 +3,7 @@
 #' Create a file upload control that can be used to upload one or more files.
 #'
 #' Whenever a file upload completes, the corresponding input variable is set
-#' to a dataframe. This dataframe contains one row for each selected file, and
-#' the following columns:
-#' \describe{
-#'   \item{`name`}{The filename provided by the web browser. This is
-#'   **not** the path to read to get at the actual data that was uploaded
-#'   (see
-#'   `datapath` column).}
-#'   \item{`size`}{The size of the uploaded data, in
-#'   bytes.}
-#'   \item{`type`}{The MIME type reported by the browser (for example,
-#'   `text/plain`), or empty string if the browser didn't know.}
-#'   \item{`datapath`}{The path to a temp file that contains the data that was
-#'   uploaded. This file may be deleted if the user performs another upload
-#'   operation.}
-#' }
+#' to a dataframe. See the `Server value` section.
 #'
 #' @family input elements
 #'
@@ -71,6 +57,23 @@
 #'
 #' shinyApp(ui, server)
 #' }
+#'
+#' @section Server value:
+#' A `data.frame` that contains one row for each selected file, and following columns:
+#' \describe{
+#'   \item{`name`}{The filename provided by the web browser. This is
+#'   **not** the path to read to get at the actual data that was uploaded
+#'   (see
+#'   `datapath` column).}
+#'   \item{`size`}{The size of the uploaded data, in
+#'   bytes.}
+#'   \item{`type`}{The MIME type reported by the browser (for example,
+#'   `text/plain`), or empty string if the browser didn't know.}
+#'   \item{`datapath`}{The path to a temp file that contains the data that was
+#'   uploaded. This file may be deleted if the user performs another upload
+#'   operation.}
+#' }
+#'
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
   width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {

R/input-numeric.R

@@ -24,6 +24,10 @@
 #' }
 #' shinyApp(ui, server)
 #' }
+#'
+#' @section Server value:
+#' A numeric vector of length 1.
+#'
 #' @export
 numericInput <- function(inputId, label, value, min = NA, max = NA, step = NA,
   width = NULL) {

R/input-password.R

@@ -8,6 +8,10 @@
 #' @family input elements
 #' @seealso [updateTextInput()]
 #'
+#' @section Server value:
+#' A character string of the password input. The default value is `""`
+#' unless `value` is provided.
+#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {

R/input-radiobuttons.R

@@ -80,6 +80,10 @@
 #'
 #' shinyApp(ui, server)
 #' }
+#'
+#' @section Server value:
+#' A character string containing the value of the selected button.
+#'
 #' @export
 radioButtons <- function(inputId, label, choices = NULL, selected = NULL,
   inline = FALSE, width = NULL, choiceNames = NULL, choiceValues = NULL) {

R/input-select.R

@@ -3,33 +3,32 @@
 #' Create a select list that can be used to choose a single or multiple items
 #' from a list of values.
 #'
-#' By default, `selectInput()` and `selectizeInput()` use the
-#' JavaScript library \pkg{selectize.js}
-#' (<https://github.com/selectize/selectize.js>) instead of the basic
-#' select input element. To use the standard HTML select input element, use
-#' `selectInput()` with `selectize=FALSE`.
+#' By default, `selectInput()` and `selectizeInput()` use the JavaScript library
+#' \pkg{selectize.js} (<https://github.com/selectize/selectize.js>) instead of
+#' the basic select input element. To use the standard HTML select input
+#' element, use `selectInput()` with `selectize=FALSE`.
 #'
-#' In selectize mode, if the first element in `choices` has a value of
-#' `""`, its name will be treated as a placeholder prompt. For example:
+#' In selectize mode, if the first element in `choices` has a value of `""`, its
+#' name will be treated as a placeholder prompt. For example:
 #' `selectInput("letter", "Letter", c("Choose one" = "", LETTERS))`
 #'
 #' @inheritParams textInput
 #' @param choices List of values to select from. If elements of the list are
 #'   named, then that name --- rather than the value --- is displayed to the
 #'   user. It's also possible to group related inputs by providing a named list
-#'   whose elements are (either named or unnamed) lists, vectors, or factors. In this
-#'   case, the outermost names will be used as the group labels (leveraging the
-#'   `<optgroup>` HTML tag) for the elements in the respective sublist. See the
-#'   example section for a small demo of this feature.
-#' @param selected The initially selected value (or multiple values if
-#'   `multiple = TRUE`). If not specified then defaults to the first value
-#'   for single-select lists and no values for multiple select lists.
+#'   whose elements are (either named or unnamed) lists, vectors, or factors. In
+#'   this case, the outermost names will be used as the group labels (leveraging
+#'   the `<optgroup>` HTML tag) for the elements in the respective sublist. See
+#'   the example section for a small demo of this feature.
+#' @param selected The initially selected value (or multiple values if `multiple
+#'   = TRUE`). If not specified then defaults to the first value for
+#'   single-select lists and no values for multiple select lists.
 #' @param multiple Is selection of multiple items allowed?
 #' @param selectize Whether to use \pkg{selectize.js} or not.
 #' @param size Number of items to show in the selection box; a larger number
 #'   will result in a taller box. Not compatible with `selectize=TRUE`.
-#'   Normally, when `multiple=FALSE`, a select input will be a drop-down
-#'   list, but when `size` is set, it will be a box instead.
+#'   Normally, when `multiple=FALSE`, a select input will be a drop-down list,
+#'   but when `size` is set, it will be a box instead.
 #' @return A select list control that can be added to a UI definition.
 #'
 #' @family input elements
@@ -72,6 +71,11 @@
 #'   }
 #' )
 #' }
+#'
+#' @section Server value: A vector of character strings, usually of length
+#'   1, with the value of the selected items. When `multiple=TRUE` and
+#'   nothing is selected, this value will be `NULL`.
+#'
 #' @export
 selectInput <- function(inputId, label, choices, selected = NULL,
   multiple = FALSE, selectize = TRUE, width = NULL,
@@ -225,18 +229,6 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 #' Create a select list that can be used to choose a single or multiple items
 #' from the column names of a data frame.
 #'
-#' The resulting server `input` value will be returned as:
-#' \itemize{
-#'   \item a symbol if `multiple = FALSE`.  The `input` value should be
-#'         used with rlang's [rlang::!!()]. For example,
-#'         `ggplot2::aes(!!input$variable)`.
-#'   \item a list of symbols if `multiple = TRUE`. The `input` value
-#'         should be used with rlang's [rlang::!!!()] to expand
-#'         the symbol list as individual arguments. For example,
-#'         `dplyr::select(mtcars, !!!input$variabls)` which is
-#'         equivalent to `dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])`.
-#' }
-#'
 #' By default, `varSelectInput()` and `selectizeInput()` use the
 #' JavaScript library \pkg{selectize.js}
 #' (<https://github.com/selectize/selectize.js>) to instead of the basic
@@ -249,6 +241,19 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 #'
 #' @family input elements
 #' @seealso [updateSelectInput()]
+#'
+#' @section Server value:
+#' The resulting server `input` value will be returned as:
+#'
+#'  * A symbol if `multiple = FALSE`. The `input` value should be
+#'  used with rlang's [rlang::!!()]. For example,
+#'  `ggplot2::aes(!!input$variable)`.
+#'  * A list of symbols if `multiple = TRUE`. The `input` value
+#'  should be used with rlang's [rlang::!!!()] to expand
+#'  the symbol list as individual arguments. For example,
+#'  `dplyr::select(mtcars, !!!input$variabls)` which is
+#'  equivalent to `dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])`.
+#'
 #' @examples
 #'
 #' ## Only run examples in interactive R sessions

R/input-slider.R

@@ -70,6 +70,10 @@
 #' # Complete app with UI and server components
 #' shinyApp(ui, server)
 #' }
+#'
+#' @section Server value:
+#' A number, or in the case of slider range, a vector of two numbers.
+#'
 #' @export
 sliderInput <- function(inputId, label, min, max, value, step = NULL,
                         round = FALSE, format = NULL, locale = NULL,

R/input-text.R

@@ -28,6 +28,11 @@
 #' }
 #' shinyApp(ui, server)
 #' }
+#'
+#' @section Server value:
+#' A character string of the text input. The default value is `""`
+#' unless `value` is provided.
+#'
 #' @export
 textInput <- function(inputId, label, value = "", width = NULL,
   placeholder = NULL) {

R/input-textarea.R

@@ -35,6 +35,11 @@
 #' shinyApp(ui, server)
 #'
 #' }
+#'
+#' @section Server value:
+#' A character string of the text input. The default value is `""`
+#' unless `value` is provided.
+#'
 #' @export
 textAreaInput <- function(inputId, label, value = "", width = NULL, height = NULL,
   cols = NULL, rows = NULL, placeholder = NULL, resize = NULL) {

R/input-utils.R

@@ -92,7 +92,10 @@ generateOptions <- function(inputId, selected, inline, type = 'checkbox',
 
 # True when a choice list item represents a group of related inputs.
 isGroup <- function(choice) {
-  length(choice) > 1 || !is.null(names(choice))
+  is.list(choice) ||
+    !is.null(names(choice)) ||
+    length(choice) > 1 ||
+    length(choice) == 0
 }
 
 # True when choices is a list and contains at least one group of related inputs.
@@ -131,6 +134,10 @@ processFlatChoices <- function(choices) {
 processGroupedChoices <- function(choices) {
   # We assert choices is a list, since only a list may contain a group.
   stopifnot(is.list(choices))
+  # The list might be unnamed by this point. We add default names of "" so that
+  # names(choices) is not zero-length and mapply can work. Within mapply, we
+  # error if any group's name is ""
+  choices <- asNamed(choices)
   choices <- mapply(function(name, choice) {
     choiceIsGroup <- isGroup(choice)
     if (choiceIsGroup && name == "") {

R/middleware-shiny.R

@@ -3,7 +3,27 @@ NULL
 
 reactLogHandler <- function(req) {
   if (! rLog$isLogging()) {
-    return(NULL)
+    if (
+      identical(req$PATH_INFO, "/reactlog/mark") ||
+      identical(req$PATH_INFO, "/reactlog")
+    ) {
+      # is not logging, but is a reactlog path...
+
+      return(
+        httpResponse(
+          # Not Implemented
+          # - The server either does not recognize the request method, or it lacks the ability to fulfil the request.
+          status = 501,
+          content_type = "text/plain; charset=utf-8",
+          content = "To enable reactlog, set the following option before running the application: \n\noptions(shiny.reactlog = TRUE)"
+        )
+      )
+
+    } else {
+      # continue on like normal
+      return(NULL)
+    }
+
   }
 
   if (identical(req$PATH_INFO, "/reactlog/mark")) {
@@ -37,6 +57,7 @@ reactLogHandler <- function(req) {
     ))
 
   } else {
+    # continue on like normal
     return(NULL)
   }
 }

R/middleware.R

@@ -199,6 +199,9 @@ staticHandler <- function(root) {
     if (path == '/')
       path <- '/index.html'
 
+    if (grepl('\\', path, fixed = TRUE))
+      return(NULL)
+
     abs.path <- resolve(root, path)
     if (is.null(abs.path))
       return(NULL)

R/notifications.R

@@ -12,11 +12,13 @@
 #'   disappear.
 #' @param closeButton If `TRUE`, display a button which will make the
 #'   notification disappear when clicked. If `FALSE` do not display.
-#' @param id An ID string. This can be used to change the contents of an
-#'   existing message with `showNotification`, or to remove it with
-#'   `removeNotification`. If not provided, one will be generated
-#'   automatically. If an ID is provided and there does not currently exist a
-#'   notification with that ID, a new notification will be created with that ID.
+#' @param id A unique identifier for the notification.
+#'
+#'   `id` is optional for `showNotification()`: Shiny will automatically create
+#'   one if needed. If you do supply it, Shiny will update an existing
+#'   notification if it exists, otherwise it will create a new one.
+#'
+#'   `id` is required for `removeNotification()`.
 #' @param type A string which controls the color of the notification. One of
 #'   "default" (gray), "message" (blue), "warning" (yellow), or "error" (red).
 #' @param session Session object to send notification to.
@@ -97,10 +99,8 @@ showNotification <- function(ui, action = NULL, duration = 5,
 
 #' @rdname showNotification
 #' @export
-removeNotification <- function(id = NULL, session = getDefaultReactiveDomain()) {
-  if (is.null(id)) {
-    stop("id is required.")
-  }
+removeNotification <- function(id, session = getDefaultReactiveDomain()) {
+  force(id)
   session$sendNotification("remove", id)
   id
 }

R/reactives.R

@@ -590,6 +590,14 @@ checkName <- function(x) {
   )
 }
 
+#' @export
+print.reactivevalues <- function(x, ...) {
+  impl <- .subset2(x, "impl")
+  cat_line("<ReactiveValues>")
+  cat_line("  Values:   ", paste0(impl$.values$keys(sort = TRUE), collapse = ", "))
+  cat_line("  Readonly: ", .subset2(x, "readonly"))
+}
+
 #' Checks whether an object is a reactivevalues object
 #'
 #' Checks whether its argument is a reactivevalues object.
@@ -1611,12 +1619,16 @@ invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
   ctx <- getCurrentContext()
   rLog$invalidateLater(ctx$.reactId, ctx$id, millis, session)
 
+  clear_on_ended_callback <- function() {}
+
   timerHandle <- scheduleTask(millis, function() {
     if (is.null(session)) {
       ctx$invalidate()
       return(invisible())
     }
 
+    clear_on_ended_callback()
+
     if (!session$isClosed()) {
       session$cycleStartAction(function() {
         ctx$invalidate()
@@ -1627,7 +1639,13 @@ invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
   })
 
   if (!is.null(session)) {
-    session$onEnded(timerHandle)
+    # timerHandle is a callback that clears the scheduled task. It gets
+    # registered with session$onEnded() each time invalidateLater() is called.
+    # So, to prevent these callbacks from building up and leaking memory, we
+    # need to deregister the onEnded(timerHandle) callback each time when the
+    # scheduled task executes; after the task executes, the timerHandle()
+    # function is essentially a no-op, so we can deregister it.
+    clear_on_ended_callback <- session$onEnded(timerHandle)
   }
 
   invisible()
@@ -1715,7 +1733,18 @@ reactivePoll <- function(intervalMillis, session, checkFunc, valueFunc) {
 
   rv <- reactiveValues(cookie = isolate(checkFunc()))
 
-  observe({
+  re_finalized <- FALSE
+
+  o <- observe({
+    # When no one holds a reference to the reactive returned from
+    # reactivePoll, destroy and remove the observer so that it doesn't keep
+    # firing and hold onto resources.
+    if (re_finalized) {
+      o$destroy()
+      rm(o, envir = parent.env(environment()))
+      return()
+    }
+
     rv$cookie <- checkFunc()
     invalidateLater(intervalMillis(), session)
   })
@@ -1728,6 +1757,14 @@ reactivePoll <- function(intervalMillis, session, checkFunc, valueFunc) {
 
   }, label = NULL)
 
+  reg.finalizer(attr(re, "observable"), function(e) {
+    re_finalized <<- TRUE
+  })
+
+  # So that the observer and finalizer function don't (indirectly) hold onto a
+  # reference to `re` and thus prevent it from getting GC'd.
+  on.exit(rm(re))
+
   return(re)
 }
 

R/render-plot.R

@@ -22,13 +22,17 @@
 #'   expedite the rendering of identical plots.
 #'
 #' @param expr An expression that generates a plot.
-#' @param width,height The width/height of the rendered plot, in pixels; or
-#'   `'auto'` to use the `offsetWidth`/`offsetHeight` of the HTML
-#'   element that is bound to this plot. You can also pass in a function that
-#'   returns the width/height in pixels or `'auto'`; in the body of the
-#'   function you may reference reactive values and functions. When rendering an
-#'   inline plot, you must provide numeric values (in pixels) to both
-#'   `width` and `height`.
+#' @param width,height Height and width can be specified in three ways:
+#'   * `"auto"`, the default, uses the size specified by [plotOutput()]
+#'      (i.e. the `offsetWidth`/`offsetHeight`` of the HTML element bound to
+#'      this plot.)
+#'  * An integer, defining the width/height in pixels.
+#'  * A function that returns the width/height in pixels (or `"auto"`).
+#'    The function is executed in a reactive context so that you can refer to
+#'    reactive values and expression to make the width/height reactive.
+#'
+#'   When rendering an inline plot, you must provide numeric values (in pixels)
+#'   to both \code{width} and \code{height}.
 #' @param res Resolution of resulting plot, in pixels per inch. This value is
 #'   passed to [grDevices::png()]. Note that this affects the resolution of PNG
 #'   rendering in R; it won't change the actual ppi of the browser.

R/server.R

@@ -85,24 +85,25 @@ addResourcePath <- function(prefix, directoryPath) {
     }
   )
 
-  # Often times overwriting a resource path is "what you want",
-  # but sometimes it can lead to difficult to diagnose issues
-  # (e.g. an implict dependency might set a resource path that
-  # conflicts with what you, the app author, are trying to register)
-  # Note that previous versions of shiny used to warn about this case,
-  # but it was eventually removed since it caused confusion (#567).
-  # It seems a good comprimise is to throw a more information message.
-  if (prefix %in% names(.globals$resourcePaths)) {
-    existingPath <- .globals$resourcePaths[[prefix]]$path
-    if (normalizedPath != existingPath) {
-      message(
-        "The resource path '", prefix, "' used to point to ",
-        existingPath, ", but it now points to ", normalizedPath, ". ",
-        "If your app doesn't work as expected, you may want to ",
-        "choose a different prefix name."
-      )
-    }
-  }
+  # # Often times overwriting a resource path is "what you want",
+  # # but sometimes it can lead to difficult to diagnose issues
+  # # (e.g. an implict dependency might set a resource path that
+  # # conflicts with what you, the app author, are trying to register)
+  # # Note that previous versions of shiny used to warn about this case,
+  # # but it was eventually removed since it caused confusion (#567).
+  # # It seems a good compromise is to throw a more information message.
+  # if (getOption("shiny.resourcePathChanges", FALSE) &&
+  #     prefix %in% names(.globals$resourcePaths)) {
+  #   existingPath <- .globals$resourcePaths[[prefix]]$path
+  #   if (normalizedPath != existingPath) {
+  #     message(
+  #       "The resource path '", prefix, "' used to point to ",
+  #       existingPath, ", but it now points to ", normalizedPath, ". ",
+  #       "If your app doesn't work as expected, you may want to ",
+  #       "choose a different prefix name."
+  #     )
+  #   }
+  # }
 
   # If a shiny app is currently running, dynamically register this path with
   # the corresponding httpuv server object.
@@ -540,7 +541,7 @@ startApp <- function(appObj, port, host, quiet) {
     if (length(resourceConflicts)) {
       warning(
         "Found subdirectories of your app's www/ directory that ",
-        "conflict with other resource URL prefixes.",
+        "conflict with other resource URL prefixes. ",
         "Consider renaming these directories: '",
         paste0("www/", resourceConflicts, collapse = "', '"), "'",
         call. = FALSE
@@ -986,7 +987,6 @@ runApp <- function(appDir=getwd(),
     captureStackTraces({
       while (!.globals$stopped) {
         ..stacktracefloor..(serviceApp())
-        Sys.sleep(0.001)
       }
     })
   )

R/shiny-options.R

@@ -16,20 +16,103 @@ getShinyOption <- function(name, default = NULL) {
 
 #' Get or set Shiny options
 #'
-#' `getShinyOption` retrieves the value of a Shiny option.
-#' `shinyOptions` sets the value of Shiny options; it can also be used to
-#' return a list of all currently-set Shiny options.
+#' `getShinyOption()` retrieves the value of a Shiny option. `shinyOptions()`
+#' sets the value of Shiny options; it can also be used to return a list of all
+#' currently-set Shiny options.
 #'
-#' There is a global option set, which is available by default. When a Shiny
-#' application is run with [runApp()], that option set is duplicated
-#' and the new option set is available for getting or setting values. If options
-#' are set from global.R, app.R, ui.R, or server.R, or if they are set from
-#' inside the server function, then the options will be scoped to the
+#' @section Scope:
+#' There is a global option set which is available by default. When a Shiny
+#' application is run with [runApp()], that option set is duplicated and the
+#' new option set is available for getting or setting values. If options
+#' are set from `global.R`, `app.R`, `ui.R`, or `server.R`, or if they are set
+#' from inside the server function, then the options will be scoped to the
 #' application. When the application exits, the new option set is discarded and
 #' the global option set is restored.
 #'
-#' @param ... Options to set, with the form `name = value`.
+#' @section Options:
+#' There are a number of global options that affect Shiny's behavior. These can
+#' be set globally with `options()` or locally (for a single app) with
+#' `shinyOptions()`.
 #'
+#' \describe{
+#'   \item{shiny.autoreload (defaults to `FALSE`)}{If `TRUE` when a Shiny app is launched, the
+#'     app directory will be continually monitored for changes to files that
+#'     have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
+#'     changes are detected, all connected Shiny sessions are reloaded. This
+#'     allows for fast feedback loops when tweaking Shiny UI.
+#'
+#'     Since monitoring for changes is expensive (we simply poll for last
+#'     modified times), this feature is intended only for development.
+#'
+#'     You can customize the file patterns Shiny will monitor by setting the
+#'     shiny.autoreload.pattern option. For example, to monitor only ui.R:
+#'     `options(shiny.autoreload.pattern = glob2rx("ui.R"))`
+#'
+#'     The default polling interval is 500 milliseconds. You can change this
+#'     by setting e.g. `options(shiny.autoreload.interval = 2000)` (every
+#'     two seconds).}
+#'   \item{shiny.deprecation.messages (defaults to `TRUE`)}{This controls whether messages for
+#'     deprecated functions in Shiny will be printed. See
+#'     [shinyDeprecated()] for more information.}
+#'   \item{shiny.error (defaults to `NULL`)}{This can be a function which is called when an error
+#'     occurs. For example, `options(shiny.error=recover)` will result a
+#'     the debugger prompt when an error occurs.}
+#'   \item{shiny.fullstacktrace (defaults to `FALSE`)}{Controls whether "pretty" (`FALSE`) or full
+#'     stack traces (`TRUE`) are dumped to the console when errors occur during Shiny app execution.
+#'     Pretty stack traces attempt to only show user-supplied code, but this pruning can't always
+#'     be done 100\% correctly.}
+#'   \item{shiny.host (defaults to `"127.0.0.1"`)}{The IP address that Shiny should listen on. See
+#'     [runApp()] for more information.}
+#'   \item{shiny.jquery.version (defaults to `3`)}{The major version of jQuery to use.
+#'   Currently only values of `3` or `1` are supported. If `1`, then jQuery 1.12.4 is used. If `3`,
+#'   then jQuery 3.4.1 is used.}
+#'   \item{shiny.json.digits (defaults to `16`)}{The number of digits to use when converting
+#'     numbers to JSON format to send to the client web browser.}
+#'   \item{shiny.launch.browser (defaults to `interactive()`)}{A boolean which controls the default behavior
+#'     when an app is run. See [runApp()] for more information.}
+#'   \item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
+#'     web request size, which serves as a size limit for file uploads.}
+#'   \item{shiny.minified (defaults to `TRUE`)}{By default
+#'     Whether or not to include Shiny's JavaScript as a minified (`shiny.min.js`)
+#'     or un-minified (`shiny.js`) file. The un-minified version is larger,
+#'     but can be helpful for development and debugging.}
+#'   \item{shiny.port (defaults to a random open port)}{A port number that Shiny will listen on. See
+#'     [runApp()] for more information.}
+#'   \item{shiny.reactlog (defaults to `FALSE`)}{If `TRUE`, enable logging of reactive events,
+#'     which can be viewed later with the [reactlogShow()] function.
+#'     This incurs a substantial performance penalty and should not be used in
+#'     production.}
+#'   \item{shiny.sanitize.errors (defaults to `FALSE`)}{If `TRUE`, then normal errors (i.e.
+#'     errors not wrapped in `safeError`) won't show up in the app; a simple
+#'     generic error message is printed instead (the error and strack trace printed
+#'     to the console remain unchanged). If you want to sanitize errors in general, but you DO want a
+#'     particular error `e` to get displayed to the user, then set this option
+#'     to `TRUE` and use `stop(safeError(e))` for errors you want the
+#'     user to see.}
+#'   \item{shiny.stacktraceoffset (defaults to `TRUE`)}{If `TRUE`, then Shiny's printed stack
+#'     traces will display srcrefs one line above their usual location. This is
+#'     an arguably more intuitive arrangement for casual R users, as the name
+#'     of a function appears next to the srcref where it is defined, rather than
+#'     where it is currently being called from.}
+#'   \item{shiny.suppressMissingContextError (defaults to `FALSE`)}{Normally, invoking a reactive
+#'     outside of a reactive context (or [isolate()]) results in
+#'     an error. If this is `TRUE`, don't error in these cases. This
+#'     should only be used for debugging or demonstrations of reactivity at the
+#'     console.}
+#'   \item{shiny.testmode (defaults to `FALSE`)}{If `TRUE`, then various features for testing Shiny
+#'     applications are enabled.}
+#'   \item{shiny.trace (defaults to `FALSE`)}{Print messages sent between the R server and the web
+#'     browser client to the R console. This is useful for debugging. Possible
+#'     values are `"send"` (only print messages sent to the client),
+#'     `"recv"` (only print messages received by the server), `TRUE`
+#'     (print all messages), or `FALSE` (default; don't print any of these
+#'     messages).}
+#'   \item{shiny.usecairo (defaults to `TRUE`)}{This is used to disable graphical rendering by the
+#'     Cairo package, if it is installed. See [plotPNG()] for more
+#'     information.}
+#' }
+#' @param ... Options to set, with the form `name = value`.
+#' @aliases shiny-options
 #' @examples
 #' \dontrun{
 #' shinyOptions(myOption = 10)

R/shiny.R

@@ -28,91 +28,6 @@ NULL
 #' @import methods
 NULL
 
-
-#' Global options for Shiny
-#'
-#' There are a number of global options that affect Shiny's behavior. These can
-#' be set with (for example) `options(shiny.trace=TRUE)`.
-#'
-#' \describe{
-#'   \item{shiny.launch.browser}{A boolean which controls the default behavior
-#'     when an app is run. See [runApp()] for more information.}
-#'   \item{shiny.port}{A port number that Shiny will listen on. See
-#'     [runApp()] for more information.}
-#'   \item{shiny.trace}{Print messages sent between the R server and the web
-#'     browser client to the R console. This is useful for debugging. Possible
-#'     values are `"send"` (only print messages sent to the client),
-#'     `"recv"` (only print messages received by the server), `TRUE`
-#'     (print all messages), or `FALSE` (default; don't print any of these
-#'     messages).}
-#'   \item{shiny.autoreload}{If `TRUE` when a Shiny app is launched, the
-#'     app directory will be continually monitored for changes to files that
-#'     have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
-#'     changes are detected, all connected Shiny sessions are reloaded. This
-#'     allows for fast feedback loops when tweaking Shiny UI.
-#'
-#'     Since monitoring for changes is expensive (we simply poll for last
-#'     modified times), this feature is intended only for development.
-#'
-#'     You can customize the file patterns Shiny will monitor by setting the
-#'     shiny.autoreload.pattern option. For example, to monitor only ui.R:
-#'     `options(shiny.autoreload.pattern = glob2rx("ui.R"))`
-#'
-#'     The default polling interval is 500 milliseconds. You can change this
-#'     by setting e.g. `options(shiny.autoreload.interval = 2000)` (every
-#'     two seconds).}
-#'   \item{shiny.reactlog}{If `TRUE`, enable logging of reactive events,
-#'     which can be viewed later with the [reactlogShow()] function.
-#'     This incurs a substantial performance penalty and should not be used in
-#'     production.}
-#'   \item{shiny.usecairo}{This is used to disable graphical rendering by the
-#'     Cairo package, if it is installed. See [plotPNG()] for more
-#'     information.}
-#'   \item{shiny.maxRequestSize}{This is a number which specifies the maximum
-#'     web request size, which serves as a size limit for file uploads. If
-#'     unset, the maximum request size defaults to 5MB.}
-#'   \item{shiny.suppressMissingContextError}{Normally, invoking a reactive
-#'     outside of a reactive context (or [isolate()]) results in
-#'     an error. If this is `TRUE`, don't error in these cases. This
-#'     should only be used for debugging or demonstrations of reactivity at the
-#'     console.}
-#'   \item{shiny.host}{The IP address that Shiny should listen on. See
-#'     [runApp()] for more information.}
-#'   \item{shiny.json.digits}{The number of digits to use when converting
-#'     numbers to JSON format to send to the client web browser.}
-#'   \item{shiny.minified}{If this is `TRUE` or unset (the default), then
-#'     Shiny will use minified JavaScript (`shiny.min.js`). If
-#'     `FALSE`, then Shiny will use the un-minified JavaScript
-#'     (`shiny.js`); this can be useful during development.}
-#'   \item{shiny.error}{This can be a function which is called when an error
-#'     occurs. For example, `options(shiny.error=recover)` will result a
-#'     the debugger prompt when an error occurs.}
-#'   \item{shiny.table.class}{CSS class names to use for tables.}
-#'   \item{shiny.deprecation.messages}{This controls whether messages for
-#'     deprecated functions in Shiny will be printed. See
-#'     [shinyDeprecated()] for more information.}
-#'   \item{shiny.fullstacktrace}{Controls whether "pretty" or full stack traces
-#'     are dumped to the console when errors occur during Shiny app execution.
-#'     The default is `FALSE` (pretty stack traces).}
-#'   \item{shiny.stacktraceoffset}{If `TRUE`, then Shiny's printed stack
-#'     traces will display srcrefs one line above their usual location. This is
-#'     an arguably more intuitive arrangement for casual R users, as the name
-#'     of a function appears next to the srcref where it is defined, rather than
-#'     where it is currently being called from.}
-#'   \item{shiny.sanitize.errors}{If `TRUE`, then normal errors (i.e.
-#'     errors not wrapped in `safeError`) won't show up in the app; a simple
-#'     generic error message is printed instead (the error and strack trace printed
-#'     to the console remain unchanged). The default is `FALSE` (unsanitized
-#'     errors).If you want to sanitize errors in general, but you DO want a
-#'     particular error `e` to get displayed to the user, then set this option
-#'     to `TRUE` and use `stop(safeError(e))` for errors you want the
-#'     user to see.}
-#'   \item{shiny.testmode}{If `TRUE`, then enable features for testing Shiny
-#'     applications. If `FALSE` (the default), do not enable those features.
-#'   }
-#' }
-#' @name shiny-options
-NULL
 createUniqueId <- function(bytes, prefix = "", suffix = "") {
   withPrivateSeed({
     paste(
@@ -1629,8 +1544,14 @@ ShinySession <- R6Class(
     reactlog = function(logEntry) {
       # Use sendCustomMessage instead of sendMessage, because the handler in
       # shiny-showcase.js only has access to public API of the Shiny object.
-      if (private$showcase)
-        self$sendCustomMessage("reactlog", logEntry)
+      if (private$showcase) {
+        srcref <- logEntry$srcref
+        srcfile <- logEntry$srcfile
+        if (!is.null(srcref) && !is.null(srcfile)) {
+          # only send needed information, not all of reactlog info.
+          self$sendCustomMessage("showcase-src", list(srcref = srcref, srcfile = srcfile))
+        }
+      }
     },
     reload = function() {
       private$sendMessage(reload = TRUE)

R/shinyui.R

@@ -42,9 +42,28 @@ renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
     )
   }
 
+  jquery <- function() {
+    version <- getOption("shiny.jquery.version", 3)
+    if (version == 3) {
+      return(htmlDependency(
+        "jquery", "3.4.1",
+        c(href = "shared"),
+        script = "jquery.min.js"
+      ))
+    }
+    if (version == 1) {
+      return(htmlDependency(
+        "jquery", "1.12.4",
+        c(href = "shared/legacy"),
+        script = "jquery.min.js"
+      ))
+    }
+    stop("Unsupported version of jQuery: ", version)
+  }
+
   shiny_deps <- list(
     htmlDependency("json2", "2014.02.04", c(href="shared"), script = "json2-min.js"),
-    htmlDependency("jquery", "3.4.1", c(href="shared"), script = "jquery.min.js"),
+    jquery(),
     htmlDependency("shiny", utils::packageVersion("shiny"), c(href="shared"),
       script = if (getOption("shiny.minified", TRUE)) "shiny.min.js" else "shiny.js",
       stylesheet = "shiny.css")

R/shinywrappers.R

@@ -52,6 +52,11 @@ markRenderFunction <- function(uiFunc, renderFunc, outputArgs = list()) {
             hasExecuted = hasExecuted)
 }
 
+#' @export
+print.shiny.render.function <- function(x, ...) {
+  cat_line("<shiny.render.function>")
+}
+
 #' Implement render functions
 #'
 #' @param func A function without parameters, that returns user data. If the

R/utils.R

@@ -1800,3 +1800,8 @@ constantTimeEquals <- function(raw1, raw2) {
 
   sum(as.integer(xor(raw1, raw2))) == 0
 }
+
+cat_line <- function(...) {
+  cat(paste(..., "\n", collapse = ""))
+}
+

README.md

@@ -61,7 +61,7 @@ The Javascript code in Shiny is minified using tools that run on Node.js. See th
 
 ## Guidelines for contributing
 
-We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](CONTRIBUTING.md) file for detailed guidelines of how to contribute.
+We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](https://github.com/rstudio/shiny/blob/master/.github/CONTRIBUTING.md) file for detailed guidelines of how to contribute.
 
 ## License
 

appveyor.yml

@@ -16,6 +16,9 @@ cache:
 # Adapt as necessary starting from here
 
 build_script:
+  - travis-tool.sh install_github rstudio/htmltools@rc-v0.4.0
+  - travis-tool.sh install_github rstudio/promises@rc-v1.1.0
+  - travis-tool.sh install_github r-lib/later@rc-v1.0.0
   - travis-tool.sh install_deps
 
 test_script:

inst/_pkgdown.yml

@@ -0,0 +1,217 @@
+# NOTE: The main Shiny site, https://shiny.rstudio.com/, is not a pkgdown site.
+# However, as part of the build process for that site
+# (rstudio/shiny-dev-center), we do use pkgdown to generate the function
+# reference index pages for each release. This file configures the look of
+# those pages for releases from 1.4 onward.  Prior to 1.4, staticdocs from
+# https://github.com/r-lib/pkgdown/releases/tag/old was used and
+# inst/staticdocs/index.r was its configuration.
+template:
+  # NOTE: These templates live in shiny-dev-center
+  path: _pkgdown_templates
+reference:
+  - title: UI Layout
+    desc: Functions for laying out the user interface for your application.
+    contents:
+      - absolutePanel
+      - bootstrapPage
+      - column
+      - conditionalPanel
+      - fillPage
+      - fillRow
+      - fixedPage
+      - fluidPage
+      - helpText
+      - icon
+      - navbarPage
+      - navlistPanel
+      - sidebarLayout
+      - tabPanel
+      - tabsetPanel
+      - titlePanel
+      - inputPanel
+      - flowLayout
+      - splitLayout
+      - verticalLayout
+      - wellPanel
+      - withMathJax
+  - title: UI Inputs
+    desc: Functions for creating user interface elements that prompt the user for input values or interaction.
+    contents:
+      - actionButton
+      - checkboxGroupInput
+      - checkboxInput
+      - dateInput
+      - dateRangeInput
+      - fileInput
+      - numericInput
+      - radioButtons
+      - selectInput
+      - varSelectInput
+      - sliderInput
+      - submitButton
+      - textInput
+      - textAreaInput
+      - passwordInput
+      - modalButton
+      - updateActionButton
+      - updateCheckboxGroupInput
+      - updateCheckboxInput
+      - updateDateInput
+      - updateDateRangeInput
+      - updateNumericInput
+      - updateRadioButtons
+      - updateSelectInput
+      - updateSliderInput
+      - updateTabsetPanel
+      - insertTab
+      - showTab
+      - updateTextInput
+      - updateTextAreaInput
+      - updateQueryString
+      - getQueryString
+  - title: UI Outputs
+    desc: Functions for creating user interface elements that, in conjunction with rendering functions, display different kinds of output from your application.
+    contents:
+      - htmlOutput
+      - plotOutput
+      - outputOptions
+      - tableOutput
+      - textOutput
+      - verbatimTextOutput
+      - downloadButton
+      - Progress
+      - withProgress
+      - modalDialog
+      - urlModal
+      - showModal
+      - showNotification
+  - title: Interface builder functions
+    desc: A sub-library for writing HTML using R functions. These functions form the foundation on which the higher level user interface functions are built, and can also be used in your Shiny UI to provide custom HTML, CSS, and JavaScript.
+    contents:
+      - builder
+      - HTML
+      - include
+      - singleton
+      - tag
+      - validateCssUnit
+      - withTags
+      - htmlTemplate
+      - bootstrapLib
+      - suppressDependencies
+      - insertUI
+      - removeUI
+  - title: Rendering functions
+    desc: Functions that you use in your application's server side code, assigning them to outputs that appear in your user interface.
+    contents:
+      - renderPlot
+      - renderCachedPlot
+      - renderText
+      - renderPrint
+      - renderDataTable
+      - renderImage
+      - renderTable
+      - renderUI
+      - downloadHandler
+      - createRenderFunction
+  - title: Reactive programming
+    desc: A sub-library that provides reactive programming facilities for R.
+    contents:
+      - reactive
+      - observe
+      - observeEvent
+      - reactiveVal
+      - reactiveValues
+      - reactiveValuesToList
+      - is.reactivevalues
+      - isolate
+      - invalidateLater
+      - debounce
+      - reactlog
+      - makeReactiveBinding
+      - reactiveFileReader
+      - reactivePoll
+      - reactiveTimer
+      - domains
+      - freezeReactiveValue
+  - title: Boilerplate
+    desc: Functions that are required boilerplate in ui.R and server.R.
+    contents:
+      - shinyUI
+      - shinyServer
+  - title: Running
+    desc: Functions that are used to run or stop Shiny applications.
+    contents:
+      - runApp
+      - runGadget
+      - runExample
+      - runGadget
+      - runUrl
+      - stopApp
+      - viewer
+      - isRunning
+      - loadSupport
+  - title: Bookmarking state
+    desc: Functions that are used for bookmarking and restoring state.
+    contents:
+      - bookmarkButton
+      - enableBookmarking
+      - setBookmarkExclude
+      - showBookmarkUrlModal
+      - onBookmark
+  - title: Extending Shiny
+    desc: Functions that are intended to be called by third-party packages that extend Shiny.
+    contents:
+      - createWebDependency
+      - resourcePaths
+      - registerInputHandler
+      - removeInputHandler
+      - markRenderFunction
+  - title: Utility functions
+    desc: Miscellaneous utilities that may be useful to advanced users or when extending Shiny.
+    contents:
+      - req
+      - validate
+      - session
+      - shinyOptions
+      - safeError
+      - onFlush
+      - restoreInput
+      - applyInputHandlers
+      - exprToFunction
+      - installExprFunction
+      - parseQueryString
+      - getCurrentOutputInfo
+      - plotPNG
+      - sizeGrowthRatio
+      - exportTestValues
+      - setSerializer
+      - snapshotExclude
+      - snapshotPreprocessInput
+      - snapshotPreprocessOutput
+      - markOutputAttrs
+      - repeatable
+      - shinyDeprecated
+      - serverInfo
+      - onStop
+      - diskCache
+      - memoryCache
+      - reexports
+  - title: Plot interaction
+    desc: Functions related to interactive plots
+    contents:
+      - brushedPoints
+      - brushOpts
+      - clickOpts
+      - dblclickOpts
+      - hoverOpts
+      - nearPoints
+  - title: Modules
+    desc: Functions for modularizing Shiny apps
+    contents:
+      - NS
+      - callModule
+  - title: Embedding
+    desc: Functions that are intended for third-party packages that embed Shiny applications.
+    contents:
+      - shinyApp
+      - maskReactiveContext

inst/staticdocs/index.r

@@ -1,238 +0,0 @@
-sd_section("UI Layout",
-  "Functions for laying out the user interface for your application.",
-  c(
-    "absolutePanel",
-    "bootstrapPage",
-    "column",
-    "conditionalPanel",
-    "fillPage",
-    "fillRow",
-    "fixedPage",
-    "fluidPage",
-    "headerPanel",
-    "helpText",
-    "icon",
-    "mainPanel",
-    "navbarPage",
-    "navlistPanel",
-    "pageWithSidebar",
-    "sidebarLayout",
-    "sidebarPanel",
-    "tabPanel",
-    "tabsetPanel",
-    "titlePanel",
-    "inputPanel",
-    "flowLayout",
-    "splitLayout",
-    "verticalLayout",
-    "wellPanel",
-    "withMathJax"
-  )
-)
-sd_section("UI Inputs",
-  "Functions for creating user interface elements that prompt the user for input values or interaction.",
-  c(
-    "actionButton",
-    "checkboxGroupInput",
-    "checkboxInput",
-    "dateInput",
-    "dateRangeInput",
-    "fileInput",
-    "numericInput",
-    "radioButtons",
-    "selectInput",
-    "varSelectInput",
-    "sliderInput",
-    "submitButton",
-    "textInput",
-    "textAreaInput",
-    "passwordInput",
-    "modalButton",
-    "updateActionButton",
-    "updateCheckboxGroupInput",
-    "updateCheckboxInput",
-    "updateDateInput",
-    "updateDateRangeInput",
-    "updateNumericInput",
-    "updateRadioButtons",
-    "updateSelectInput",
-    "updateSliderInput",
-    "updateTabsetPanel",
-    "insertTab",
-    "showTab",
-    "updateTextInput",
-    "updateTextAreaInput",
-    "updateQueryString",
-    "getQueryString"
-  )
-)
-sd_section("UI Outputs",
-  "Functions for creating user interface elements that, in conjunction with rendering functions, display different kinds of output from your application.",
-  c(
-    "htmlOutput",
-    "plotOutput",
-    "outputOptions",
-    "tableOutput",
-    "textOutput",
-    "verbatimTextOutput",
-    "downloadButton",
-    "Progress",
-    "withProgress",
-    "modalDialog",
-    "urlModal",
-    "showModal",
-    "showNotification"
-  )
-)
-sd_section("Interface builder functions",
-  "A sub-library for writing HTML using R functions. These functions form the foundation on which the higher level user interface functions are built, and can also be used in your Shiny UI to provide custom HTML, CSS, and JavaScript.",
-  c(
-    "builder",
-    "HTML",
-    "include",
-    "singleton",
-    "tag",
-    "validateCssUnit",
-    "withTags",
-    "htmlTemplate",
-    "bootstrapLib",
-    "suppressDependencies",
-    "insertUI",
-    "removeUI"
-  )
-)
-sd_section("Rendering functions",
-  "Functions that you use in your application's server side code, assigning them to outputs that appear in your user interface.",
-  c(
-    "renderPlot",
-    "renderCachedPlot",
-    "renderText",
-    "renderPrint",
-    "renderDataTable",
-    "renderImage",
-    "renderTable",
-    "renderUI",
-    "downloadHandler",
-    "createRenderFunction"
-  )
-)
-sd_section("Reactive programming",
-  "A sub-library that provides reactive programming facilities for R.",
-  c(
-    "reactive",
-    "observe",
-    "observeEvent",
-    "reactiveVal",
-    "reactiveValues",
-    "reactiveValuesToList",
-    "is.reactivevalues",
-    "isolate",
-    "invalidateLater",
-    "debounce",
-    "reactlog",
-    "makeReactiveBinding",
-    "reactiveFileReader",
-    "reactivePoll",
-    "reactiveTimer",
-    "domains",
-    "freezeReactiveValue"
-  )
-)
-sd_section("Boilerplate",
-  "Functions that are required boilerplate in ui.R and server.R.",
-  c(
-    "shinyUI",
-    "shinyServer"
-  )
-)
-sd_section("Running",
-  "Functions that are used to run or stop Shiny applications.",
-  c(
-    "runApp",
-    "runGadget",
-    "runExample",
-    "runGadget",
-    "runUrl",
-    "stopApp",
-    "viewer",
-    "isRunning"
-  )
-)
-sd_section("Bookmarking state",
-  "Functions that are used for bookmarking and restoring state.",
-  c(
-    "bookmarkButton",
-    "enableBookmarking",
-    "setBookmarkExclude",
-    "showBookmarkUrlModal",
-    "onBookmark"
-  )
-)
-sd_section("Extending Shiny",
-  "Functions that are intended to be called by third-party packages that extend Shiny.",
-  c(
-    "createWebDependency",
-    "resourcePaths",
-    "registerInputHandler",
-    "removeInputHandler",
-    "markRenderFunction"
-  )
-)
-sd_section("Utility functions",
-  "Miscellaneous utilities that may be useful to advanced users or when extending Shiny.",
-  c(
-    "req",
-    "validate",
-    "session",
-    "shinyOptions",
-    "safeError",
-    "onFlush",
-    "restoreInput",
-    "applyInputHandlers",
-    "exprToFunction",
-    "installExprFunction",
-    "parseQueryString",
-    "getCurrentOutputInfo",
-    "plotPNG",
-    "sizeGrowthRatio",
-    "exportTestValues",
-    "setSerializer",
-    "snapshotExclude",
-    "snapshotPreprocessInput",
-    "snapshotPreprocessOutput",
-    "markOutputAttrs",
-    "repeatable",
-    "shinyDeprecated",
-    "serverInfo",
-    "shiny-options",
-    "onStop",
-    "diskCache",
-    "memoryCache",
-    "reexports"
-  )
-)
-sd_section("Plot interaction",
-  "Functions related to interactive plots",
-  c(
-    "brushedPoints",
-    "brushOpts",
-    "clickOpts",
-    "dblclickOpts",
-    "hoverOpts",
-    "nearPoints"
-  )
-)
-sd_section("Modules",
-  "Functions for modularizing Shiny apps",
-  c(
-    "NS",
-    "callModule"
-  )
-)
-sd_section("Embedding",
-  "Functions that are intended for third-party packages that embed Shiny applications.",
-  c(
-    "shinyApp",
-    "maskReactiveContext"
-  )
-)

inst/www/shared/ionrangeslider/js/ion.rangeSlider.js

@@ -1723,7 +1723,12 @@
             if (this.has_tab_index) {
                 this.$cache.input.prop("tabindex", -1);
             } else {
-                this.$cache.input.removeProp("tabindex");
+                try {
+                    this.$cache.input.removeProp("tabindex");
+                } catch(e) {
+                    // Do nothing (PhantomJS can throw an error with the
+                    // above, #2587)
+                }
             }
 
             this.has_tab_index = !this.has_tab_index;

inst/www/shared/legacy/jquery-AUTHORS.txt

@@ -0,0 +1,266 @@
+Authors ordered by first contribution.
+
+John Resig <jeresig@gmail.com>
+Gilles van den Hoven <gilles0181@gmail.com>
+Michael Geary <mike@geary.com>
+Stefan Petre <stefan.petre@gmail.com>
+Yehuda Katz <wycats@gmail.com>
+Corey Jewett <cj@syntheticplayground.com>
+Klaus Hartl <klaus.hartl@googlemail.com>
+Franck Marcia <franck.marcia@gmail.com>
+Jörn Zaefferer <joern.zaefferer@gmail.com>
+Paul Bakaus <paul.bakaus@googlemail.com>
+Brandon Aaron <brandon.aaron@gmail.com>
+Mike Alsup <malsup@gmail.com>
+Dave Methvin <dave.methvin@gmail.com>
+Ed Engelhardt <edengelhardt@gmail.com>
+Sean Catchpole <littlecooldude@gmail.com>
+Paul Mclanahan <pmclanahan@gmail.com>
+David Serduke <davidserduke@gmail.com>
+Richard D. Worth <rdworth@gmail.com>
+Scott González <scott.gonzalez@gmail.com>
+Ariel Flesler <aflesler@gmail.com>
+Jon Evans <jon@springyweb.com>
+TJ Holowaychuk <tj@vision-media.ca>
+Michael Bensoussan <mickey@seesmic.com>
+Robert Katić <robert.katic@gmail.com>
+Louis-Rémi Babé <lrbabe@gmail.com>
+Earle Castledine <mrspeaker@gmail.com>
+Damian Janowski <damian.janowski@gmail.com>
+Rich Dougherty <rich@rd.gen.nz>
+Kim Dalsgaard <kim@kimdalsgaard.com>
+Andrea Giammarchi <andrea.giammarchi@gmail.com>
+Mark Gibson <jollytoad@gmail.com>
+Karl Swedberg <kswedberg@gmail.com>
+Justin Meyer <justinbmeyer@gmail.com>
+Ben Alman <cowboy@rj3.net>
+James Padolsey <cla@padolsey.net>
+David Petersen <public@petersendidit.com>
+Batiste Bieler <batiste.bieler@gmail.com>
+Alexander Farkas <info@corrupt-system.de>
+Rick Waldron <waldron.rick@gmail.com>
+Filipe Fortes <filipe@fortes.com>
+Neeraj Singh <neerajdotname@gmail.com>
+Paul Irish <paul.irish@gmail.com>
+Iraê Carvalho <irae@irae.pro.br>
+Matt Curry <matt@pseudocoder.com>
+Michael Monteleone <michael@michaelmonteleone.net>
+Noah Sloan <noah.sloan@gmail.com>
+Tom Viner <github@viner.tv>
+Douglas Neiner <doug@pixelgraphics.us>
+Adam J. Sontag <ajpiano@ajpiano.com>
+Dave Reed <dareed@microsoft.com>
+Ralph Whitbeck <ralph.whitbeck@gmail.com>
+Carl Fürstenberg <azatoth@gmail.com>
+Jacob Wright <jacwright@gmail.com>
+J. Ryan Stinnett <jryans@gmail.com>
+unknown <Igen005@.upcorp.ad.uprr.com>
+temp01 <temp01irc@gmail.com>
+Heungsub Lee <h@subl.ee>
+Colin Snover <colin@alpha.zetafleet.com>
+Ryan W Tenney <ryan@10e.us>
+Pinhook <contact@pinhooklabs.com>
+Ron Otten <r.j.g.otten@gmail.com>
+Jephte Clain <Jephte.Clain@univ-reunion.fr>
+Anton Matzneller <obhvsbypqghgc@gmail.com>
+Alex Sexton <AlexSexton@gmail.com>
+Dan Heberden <danheberden@gmail.com>
+Henri Wiechers <hwiechers@gmail.com>
+Russell Holbrook <russell.holbrook@patch.com>
+Julian Aubourg <aubourg.julian@gmail.com>
+Gianni Alessandro Chiappetta <gianni@runlevel6.org>
+Scott Jehl <scott@scottjehl.com>
+James Burke <jrburke@gmail.com>
+Jonas Pfenniger <jonas@pfenniger.name>
+Xavi Ramirez <xavi.rmz@gmail.com>
+Jared Grippe <jared@deadlyicon.com>
+Sylvester Keil <sylvester@keil.or.at>
+Brandon Sterne <bsterne@mozilla.com>
+Mathias Bynens <mathias@qiwi.be>
+Timmy Willison <timmywillisn@gmail.com>
+Corey Frang <gnarf@gnarf.net>
+Digitalxero <digitalxero>
+Anton Kovalyov <anton@kovalyov.net>
+David Murdoch <musicisair@yahoo.com>
+Josh Varner <josh.varner@gmail.com>
+Charles McNulty <cmcnulty@kznf.com>
+Jordan Boesch <jboesch26@gmail.com>
+Jess Thrysoee <jess@thrysoee.dk>
+Michael Murray <m@murz.net>
+Lee Carpenter <elcarpie@gmail.com>
+Alexis Abril <me@alexisabril.com>
+Rob Morgan <robbym@gmail.com>
+John Firebaugh <john_firebaugh@bigfix.com>
+Sam Bisbee <sam@sbisbee.com>
+Gilmore Davidson <gilmoreorless@gmail.com>
+Brian Brennan <me@brianlovesthings.com>
+Xavier Montillet <xavierm02.net@gmail.com>
+Daniel Pihlstrom <sciolist.se@gmail.com>
+Sahab Yazdani <sahab.yazdani+github@gmail.com>
+avaly <github-com@agachi.name>
+Scott Hughes <hi@scott-hughes.me>
+Mike Sherov <mike.sherov@gmail.com>
+Greg Hazel <ghazel@gmail.com>
+Schalk Neethling <schalk@ossreleasefeed.com>
+Denis Knauf <Denis.Knauf@gmail.com>
+Timo Tijhof <krinklemail@gmail.com>
+Steen Nielsen <swinedk@gmail.com>
+Anton Ryzhov <anton@ryzhov.me>
+Shi Chuan <shichuanr@gmail.com>
+Berker Peksag <berker.peksag@gmail.com>
+Toby Brain <tobyb@freshview.com>
+Matt Mueller <mattmuelle@gmail.com>
+Justin <drakefjustin@gmail.com>
+Daniel Herman <daniel.c.herman@gmail.com>
+Oleg Gaidarenko <markelog@gmail.com>
+Richard Gibson <richard.gibson@gmail.com>
+Rafaël Blais Masson <rafbmasson@gmail.com>
+cmc3cn <59194618@qq.com>
+Joe Presbrey <presbrey@gmail.com>
+Sindre Sorhus <sindresorhus@gmail.com>
+Arne de Bree <arne@bukkie.nl>
+Vladislav Zarakovsky <vlad.zar@gmail.com>
+Andrew E Monat <amonat@gmail.com>
+Oskari <admin@o-programs.com>
+Joao Henrique de Andrade Bruni <joaohbruni@yahoo.com.br>
+tsinha <tsinha@Anthonys-MacBook-Pro.local>
+Matt Farmer <matt@frmr.me>
+Trey Hunner <treyhunner@gmail.com>
+Jason Moon <jmoon@socialcast.com>
+Jeffery To <jeffery.to@gmail.com>
+Kris Borchers <kris.borchers@gmail.com>
+Vladimir Zhuravlev <private.face@gmail.com>
+Jacob Thornton <jacobthornton@gmail.com>
+Chad Killingsworth <chadkillingsworth@missouristate.edu>
+Nowres Rafid <nowres.rafed@gmail.com>
+David Benjamin <davidben@mit.edu>
+Uri Gilad <antishok@gmail.com>
+Chris Faulkner <thefaulkner@gmail.com>
+Elijah Manor <elijah.manor@gmail.com>
+Daniel Chatfield <chatfielddaniel@gmail.com>
+Nikita Govorov <nikita.govorov@gmail.com>
+Wesley Walser <wwalser@atlassian.com>
+Mike Pennisi <mike@mikepennisi.com>
+Markus Staab <markus.staab@redaxo.de>
+Dave Riddle <david@joyvuu.com>
+Callum Macrae <callum@lynxphp.com>
+Benjamin Truyman <bentruyman@gmail.com>
+James Huston <james@jameshuston.net>
+Erick Ruiz de Chávez <erickrdch@gmail.com>
+David Bonner <dbonner@cogolabs.com>
+Akintayo Akinwunmi <aakinwunmi@judge.com>
+MORGAN <morgan@morgangraphics.com>
+Ismail Khair <ismail.khair@gmail.com>
+Carl Danley <carldanley@gmail.com>
+Mike Petrovich <michael.c.petrovich@gmail.com>
+Greg Lavallee <greglavallee@wapolabs.com>
+Daniel Gálvez <dgalvez@editablething.com>
+Sai Lung Wong <sai.wong@huffingtonpost.com>
+Tom H Fuertes <TomFuertes@gmail.com>
+Roland Eckl <eckl.roland@googlemail.com>
+Jay Merrifield <fracmak@gmail.com>
+Allen J Schmidt Jr <cobrasoft@gmail.com>
+Jonathan Sampson <jjdsampson@gmail.com>
+Marcel Greter <marcel.greter@ocbnet.ch>
+Matthias Jäggli <matthias.jaeggli@gmail.com>
+David Fox <dfoxinator@gmail.com>
+Yiming He <yiminghe@gmail.com>
+Devin Cooper <cooper.semantics@gmail.com>
+Paul Ramos <paul.b.ramos@gmail.com>
+Rod Vagg <rod@vagg.org>
+Bennett Sorbo <bsorbo@gmail.com>
+Sebastian Burkhard <sebi.burkhard@gmail.com>
+nanto <nanto@moon.email.ne.jp>
+Danil Somsikov <danilasomsikov@gmail.com>
+Ryunosuke SATO <tricknotes.rs@gmail.com>
+Jean Boussier <jean.boussier@gmail.com>
+Adam Coulombe <me@adam.co>
+Andrew Plummer <plummer.andrew@gmail.com>
+Mark Raddatz <mraddatz@gmail.com>
+Dmitry Gusev <dmitry.gusev@gmail.com>
+Michał Gołębiowski <m.goleb@gmail.com>
+Nguyen Phuc Lam <ruado1987@gmail.com>
+Tom H Fuertes <tomfuertes@gmail.com>
+Brandon Johnson <bjohn465+github@gmail.com>
+Jason Bedard <jason+jquery@jbedard.ca>
+Kyle Robinson Young <kyle@dontkry.com>
+Renato Oliveira dos Santos <ros3@cin.ufpe.br>
+Chris Talkington <chris@talkingtontech.com>
+Eddie Monge <eddie@eddiemonge.com>
+Terry Jones <terry@jon.es>
+Jason Merino <jasonmerino@gmail.com>
+Jeremy Dunck <jdunck@gmail.com>
+Chris Price <price.c@gmail.com>
+Amey Sakhadeo <me@ameyms.com>
+Anthony Ryan <anthonyryan1@gmail.com>
+Dominik D. Geyer <dominik.geyer@gmail.com>
+George Kats <katsgeorgeek@gmail.com>
+Lihan Li <frankieteardrop@gmail.com>
+Ronny Springer <springer.ronny@gmail.com>
+Marian Sollmann <marian.sollmann@cargomedia.ch>
+Corey Frang <gnarf37@gmail.com>
+Chris Antaki <ChrisAntaki@gmail.com>
+Noah Hamann <njhamann@gmail.com>
+David Hong <d.hong@me.com>
+Jakob Stoeck <jakob@pokermania.de>
+Christopher Jones <christopherjonesqed@gmail.com>
+Forbes Lindesay <forbes@lindesay.co.uk>
+John Paul <john@johnkpaul.com>
+S. Andrew Sheppard <andrew@wq.io>
+Leonardo Balter <leonardo.balter@gmail.com>
+Roman Reiß <me@silverwind.io>
+Benjy Cui <benjytrys@gmail.com>
+Rodrigo Rosenfeld Rosas <rr.rosas@gmail.com>
+John Hoven <hovenj@gmail.com>
+Christian Kosmowski <ksmwsk@gmail.com>
+Liang Peng <poppinlp@gmail.com>
+TJ VanToll <tj.vantoll@gmail.com>
+Senya Pugach <upisfree@outlook.com>
+Aurelio De Rosa <aurelioderosa@gmail.com>
+Nazar Mokrynskyi <nazar@mokrynskyi.com>
+Arthur Verschaeve <contact@arthurverschaeve.be>
+Dan Hart <danhart@notonthehighstreet.com>
+Scott González <scott.gonzalez@gmail.com>
+Zheming Sun <mescodasun@gmail.com>
+Bin Xin <rhyzix@gmail.com>
+David Corbacho <davidcorbacho@gmail.com>
+Veaceslav Grimalschi <grimalschi@yandex.ru>
+Daniel Husar <dano.husar@gmail.com>
+Jason Bedard <jason+github@jbedard.ca>
+Ben Toews <mastahyeti@gmail.com>
+Aditya Raghavan <araghavan3@gmail.com>
+Nicolas HENRY <icewil@gmail.com>
+Norman Xu <homyu.shinn@gmail.com>
+Anne-Gaelle Colom <coloma@westminster.ac.uk>
+Victor Homyakov <vkhomyackov@gmail.com>
+George Mauer <gmauer@gmail.com>
+Leonardo Braga <leonardo.braga@gmail.com>
+Stephen Edgar <stephen@netweb.com.au>
+Thomas Tortorini <thomastortorini@gmail.com>
+Winston Howes <winstonhowes@gmail.com>
+Jon Hester <jon.d.hester@gmail.com>
+Alexander O'Mara <me@alexomara.com>
+Bastian Buchholz <buchholz.bastian@googlemail.com>
+Arthur Stolyar <nekr.fabula@gmail.com>
+Calvin Metcalf <calvin.metcalf@gmail.com>
+Mu Haibao <mhbseal@163.com>
+Richard McDaniel <rm0026@uah.edu>
+Chris Rebert <github@rebertia.com>
+Gilad Peleg <giladp007@gmail.com>
+Martin Naumann <martin@geekonaut.de>
+Bruno Pérel <brunoperel@gmail.com>
+Reed Loden <reed@reedloden.com>
+Daniel Nill <daniellnill@gmail.com>
+Yongwoo Jeon <yongwoo.jeon@navercorp.com>
+Sean Henderson <seanh.za@gmail.com>
+Adrian Olek <adrianolek@gmail.com>
+Richard Kraaijenhagen <stdin+git@riichard.com>
+Gary Ye <garysye@gmail.com>
+Christian Grete <webmaster@christiangrete.com>
+Liza Ramo <liza.h.ramo@gmail.com>
+Joelle Fleurantin <joasqueeniebee@gmail.com>
+Julian Alexander Murillo <julian.alexander.murillo@gmail.com>
+Jun Sun <klsforever@gmail.com>
+Devin Wilson <dwilson6.github@gmail.com>
+Todor Prikumov <tono_pr@abv.bg>
+Zack Hall <zackhall@outlook.com>

inst/www/shared/shiny-showcase.js

@@ -83,6 +83,8 @@
       el.id = "srcref_" + srcref;
       var ref = srcref;
       var code = document.getElementById(srcfile.replace(/\./g, "_") + "_code");
+      // if there is no code file (might be a shiny file), quit early
+      if (!code) return;
       var start = findTextPoint(code, ref[0], ref[4]);
       var end = findTextPoint(code, ref[2], ref[5]);
 
@@ -117,7 +119,7 @@
 
   // If this is the main Shiny window, wire up our custom message handler.
   if (window.Shiny) {
-    Shiny.addCustomMessageHandler('reactlog', function(message) {
+    Shiny.addCustomMessageHandler('showcase-src', function(message) {
       if (message.srcref && message.srcfile) {
         highlightSrcref(message.srcref, message.srcfile);
       }
@@ -148,6 +150,8 @@
       }
     }
 
+    // hide the new element before doing anything to it
+    $(newHostElement).hide();
     $(currentHostElement).fadeOut(animateCodeMs, function() {
       var tabs = document.getElementById("showcase-code-tabs");
       currentHostElement.removeChild(tabs);
@@ -160,7 +164,7 @@
         document.getElementById("showcase-code-content").removeAttribute("style");
       }
 
-      $(newHostElement).fadeIn();
+      $(newHostElement).fadeIn(animateCodeMs);
       if (!above) {
         // remove the applied width and zoom on the app container, and
         // scroll smoothly down to the code's new home
@@ -189,7 +193,6 @@
     if (above) {
       $(document.body).animate({ scrollTop: 0 }, animateCodeMs);
     }
-    $(newHostElement).hide();
     isCodeAbove = above;
     setAppCodeSxsWidths(above && animate);
     $(window).trigger("resize");
@@ -267,4 +270,3 @@
   if (window.hljs)
     hljs.initHighlightingOnLoad();
 })();
-

inst/www/shared/shiny.js

@@ -12,7 +12,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
   var exports = window.Shiny = window.Shiny || {};
 
-  exports.version = "1.3.2.9001"; // Version number inserted by Grunt
+  exports.version = "1.4.0"; // Version number inserted by Grunt
 
   var origPushState = window.history.pushState;
   window.history.pushState = function () {
@@ -611,7 +611,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         return;
       }
       this.lastSentValues[inputName] = { jsonValue: jsonValue, inputType: inputType };
-      this.target.setInput(name, value, opts);
+      this.target.setInput(nameType, value, opts);
     };
     this.reset = function () {
       var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -626,10 +626,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       for (var inputName in values) {
         if (values.hasOwnProperty(inputName)) {
           var _splitInputNameType2 = splitInputNameType(inputName),
-              _name = _splitInputNameType2.name,
+              name = _splitInputNameType2.name,
               inputType = _splitInputNameType2.inputType;
 
-          cacheValues[_name] = {
+          cacheValues[name] = {
             jsonValue: JSON.stringify(values[inputName]),
             inputType: inputType
           };
@@ -658,7 +658,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       $(opts.el).trigger(evt);
 
       if (!evt.isDefaultPrevented()) {
-        name = evt.name;
+        var name = evt.name;
         if (evt.inputType !== '') name += ':' + evt.inputType;
 
         // Most opts aren't passed along to lower levels in the input decorator
@@ -713,13 +713,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
   };
   (function () {
     this.setInput = function (nameType, value, opts) {
-      if (/^\./.test(nameType)) this.target.setInput(nameType, value, opts);else this.pendingInput[name] = { value: value, opts: opts };
+      if (/^\./.test(nameType)) this.target.setInput(nameType, value, opts);else this.pendingInput[nameType] = { value: value, opts: opts };
     };
     this.submit = function () {
-      for (var name in this.pendingInput) {
-        if (this.pendingInput.hasOwnProperty(name)) {
-          var input = this.pendingInput[name];
-          this.target.setInput(name, input.value, input.opts);
+      for (var nameType in this.pendingInput) {
+        if (this.pendingInput.hasOwnProperty(nameType)) {
+          var _pendingInput$nameTyp = this.pendingInput[nameType],
+              value = _pendingInput$nameTyp.value,
+              opts = _pendingInput$nameTyp.opts;
+
+          this.target.setInput(nameType, value, opts);
         }
       }
     };
@@ -2999,9 +3002,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       var e2 = $.Event(newEventType, {
         which: e.which,
         pageX: e.pageX,
-        pageY: e.pageY,
-        offsetX: e.offsetX,
-        offsetY: e.offsetY
+        pageY: e.pageY
       });
 
       $el.trigger(e2);
@@ -3048,7 +3049,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         // If second click is too far away, it doesn't count as a double
         // click. Instead, immediately trigger a mousedown2 for the previous
         // click, and set this click as a new first click.
-        if (pending_e && Math.abs(pending_e.offsetX - e.offsetX) > 2 || Math.abs(pending_e.offsetY - e.offsetY) > 2) {
+        if (pending_e && Math.abs(pending_e.pageX - e.pageX) > 2 || Math.abs(pending_e.pageY - e.pageY) > 2) {
 
           triggerPendingMousedown2();
           scheduleMousedown2(e);
@@ -4920,18 +4921,33 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       if (date === undefined) return;
       if (date === null) {
         $(el).bsDatepicker('setStartDate', null);
-      } else {
-        date = this._newDate(date);
-        date = this._UTCDateAsLocal(date);
-        if (!isNaN(date)) {
-          // Workaround for https://github.com/eternicode/bootstrap-datepicker/issues/2010
-          // If the start date when there's a two-digit year format, it will set
-          // the date value to null. So we'll save the value, set the start
-          // date, and the restore the value.
-          var curValue = $(el).bsDatepicker('getUTCDate');
-          $(el).bsDatepicker('setStartDate', date);
-          $(el).bsDatepicker('setUTCDate', curValue);
-        }
+        return;
+      }
+
+      date = this._newDate(date);
+      // If date parsing fails, do nothing
+      if (date === null) return;
+
+      date = this._UTCDateAsLocal(date);
+      if (isNaN(date)) return;
+      // Workaround for https://github.com/eternicode/bootstrap-datepicker/issues/2010
+      // If the start date when there's a two-digit year format, it will set
+      // the date value to null. So we'll save the value, set the start
+      // date, and the restore the value.
+      var curValue = $(el).bsDatepicker('getUTCDate');
+      $(el).bsDatepicker('setStartDate', date);
+      $(el).bsDatepicker('setUTCDate', curValue);
+
+      // Workaround for https://github.com/rstudio/shiny/issues/2335
+      // We only set the start date *after* the value in this special
+      // case so we don't effect the intended behavior of having a blank
+      // value when it falls outside the start date
+      if (typeof date.toDateString !== 'function') return;
+      if (typeof curValue.toDateString !== 'function') return;
+      if (date.toDateString() === curValue.toDateString()) {
+        $(el).bsDatepicker('setStartDate', null);
+        $(el).bsDatepicker('setUTCDate', curValue);
+        $(el).bsDatepicker('setStartDate', date);
       }
     },
     // Given an unambiguous date string or a Date object, set the max (end) date
@@ -4940,15 +4956,28 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       if (date === undefined) return;
       if (date === null) {
         $(el).bsDatepicker('setEndDate', null);
-      } else {
-        date = this._newDate(date);
-        date = this._UTCDateAsLocal(date);
-        if (!isNaN(date)) {
-          // Workaround for same issue as in _setMin.
-          var curValue = $(el).bsDatepicker('getUTCDate');
-          $(el).bsDatepicker('setEndDate', date);
-          $(el).bsDatepicker('setUTCDate', curValue);
-        }
+        return;
+      }
+
+      date = this._newDate(date);
+      // If date parsing fails, do nothing
+      if (date === null) return;
+
+      date = this._UTCDateAsLocal(date);
+      if (isNaN(date)) return;
+
+      // Workaround for same issue as in _setMin.
+      var curValue = $(el).bsDatepicker('getUTCDate');
+      $(el).bsDatepicker('setEndDate', date);
+      $(el).bsDatepicker('setUTCDate', curValue);
+
+      // Workaround for same issue as in _setMin.
+      if (typeof date.toDateString !== 'function') return;
+      if (typeof curValue.toDateString !== 'function') return;
+      if (date.toDateString() === curValue.toDateString()) {
+        $(el).bsDatepicker('setEndDate', null);
+        $(el).bsDatepicker('setUTCDate', curValue);
+        $(el).bsDatepicker('setEndDate', date);
       }
     },
     // Given a date string of format yyyy-mm-dd, return a Date object with
@@ -6565,7 +6594,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     initialValues['.clientdata_url_hash'] = window.location.hash;
 
     $(window).on('hashchange', function (e) {
-      inputs.setInput('.clientdata_url_hash', location.hash);
+      inputs.setInput('.clientdata_url_hash', window.location.hash);
     });
 
     // The server needs to know what singletons were rendered as part of
@@ -6631,7 +6660,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
   });
 
   $(document).on('keydown', function (e) {
-    if (e.which !== 115 || !e.ctrlKey && !e.metaKey || e.shiftKey || e.altKey) return;
+    if (
+    // if not one of the key combos below
+    !(
+    // cmd/ctrl + fn + f4
+    e.which === 115 && (e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey ||
+    // cmd/ctrl + shift + fn + f3
+    e.which === 114 && (e.ctrlKey || e.metaKey) && e.shiftKey && !e.altKey)) {
+      return;
+    }
+
     var url = 'reactlog/mark?w=' + window.escape(exports.shinyapp.config.workerId) + "&s=" + window.escape(exports.shinyapp.config.sessionId);
 
     // send notification
@@ -6644,6 +6682,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         html: html,
         closeButton: true
       });
+    }).fail(function () {
+      // found returned error while marking, should open webpage
+      window.open(url);
     });
 
     e.preventDefault();

man/HTML.Rd

@@ -20,5 +20,5 @@ not to perform HTML escaping on it.
 \examples{
 el <- div(HTML("I like <u>turtles</u>"))
 cat(as.character(el))
-}
 
+}

man/actionButton.Rd

@@ -26,6 +26,17 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
 Creates an action button or link whose value is initially zero, and increments by one
 each time it is pressed.
 }
+\section{Server value}{
+
+An integer of class \code{"shinyActionButtonValue"}. This class differs from
+ordinary integers in that a value of 0 is considered "falsy".
+This implies two things:
+\itemize{
+\item Event handlers (e.g., \code{\link[=observeEvent]{observeEvent()}}, \code{\link[=eventReactive]{eventReactive()}}) won't execute on initial load.
+\item Input validation (e.g., \code{\link[=req]{req()}}, \code{\link[=need]{need()}}) will fail on initial load.
+}
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {

man/builder.Rd

@@ -1,67 +1,73 @@
 \name{builder}
-\alias{a}
-\alias{br}
 \alias{builder}
-\alias{code}
-\alias{div}
-\alias{em}
+\alias{tags}
+\alias{p}
 \alias{h1}
 \alias{h2}
 \alias{h3}
 \alias{h4}
 \alias{h5}
 \alias{h6}
-\alias{hr}
-\alias{img}
-\alias{p}
-\alias{pre}
+\alias{a}
+\alias{br}
+\alias{div}
 \alias{span}
+\alias{pre}
+\alias{code}
+\alias{img}
 \alias{strong}
-\alias{tags}
+\alias{em}
+\alias{hr}
 \title{HTML Builder Functions}
 \usage{
 tags
 
-p(...)
+p(..., .noWS = NULL)
 
-h1(...)
+h1(..., .noWS = NULL)
 
-h2(...)
+h2(..., .noWS = NULL)
 
-h3(...)
+h3(..., .noWS = NULL)
 
-h4(...)
+h4(..., .noWS = NULL)
 
-h5(...)
+h5(..., .noWS = NULL)
 
-h6(...)
+h6(..., .noWS = NULL)
 
-a(...)
+a(..., .noWS = NULL)
 
-br(...)
+br(..., .noWS = NULL)
 
-div(...)
+div(..., .noWS = NULL)
 
-span(...)
+span(..., .noWS = NULL)
 
-pre(...)
+pre(..., .noWS = NULL)
 
-code(...)
+code(..., .noWS = NULL)
 
-img(...)
+img(..., .noWS = NULL)
 
-strong(...)
+strong(..., .noWS = NULL)
 
-em(...)
+em(..., .noWS = NULL)
 
-hr(...)
+hr(..., .noWS = NULL)
 }
 \arguments{
 \item{...}{Attributes and children of the element. Named arguments become
 attributes, and positional arguments become children. Valid children are
-tags, single-character character vectors (which become text nodes), and raw
-HTML (see \code{\link{HTML}}). You can also pass lists that contain tags,
-text nodes, and HTML.}
+tags, single-character character vectors (which become text nodes), raw
+HTML (see \code{\link{HTML}}), and \code{html_dependency} objects. You can
+also pass lists that contain tags, text nodes, or HTML. To use boolean
+attributes, use a named argument with a \code{NA} value. (see example)}
+
+\item{.noWS}{A character vector used to omit some of the whitespace that
+would normally be written around this tag. Valid options include
+\code{before}, \code{after}, \code{outside}, \code{after-begin}, and
+\code{before-end}. Any number of these options can be specified.}
 }
 \description{
 Simple functions for constructing HTML documents.
@@ -75,7 +81,7 @@ Dedicated functions are available for the most common HTML tags that do not
 conflict with common R functions.
 
 The result from these functions is a tag object, which can be converted using
-\code{\link[base]{as.character}()}.
+\code{\link{as.character}()}.
 }
 \examples{
 doc <- tags$html(
@@ -92,5 +98,27 @@ doc <- tags$html(
   )
 )
 cat(as.character(doc))
-}
 
+# create an html5 audio tag with controls.
+# controls is a boolean attributes
+audio_tag <- tags$audio(
+  controls = NA,
+  tags$source(
+    src = "myfile.wav",
+    type = "audio/wav"
+  )
+)
+cat(as.character(audio_tag))
+
+# suppress the whitespace between tags
+oneline <- tags$span(
+  tags$strong("I'm strong", .noWS="outside")
+)
+cat(as.character(oneline))
+}
+\references{
+\itemize{
+   \item W3C html specification about boolean attributes
+   \url{https://www.w3.org/TR/html5/infrastructure.html#sec-boolean-attributes}
+ }
+}

man/checkboxGroupInput.Rd

@@ -44,6 +44,11 @@ Create a group of checkboxes that can be used to toggle multiple choices
 independently. The server will receive the input as a character vector of the
 selected values.
 }
+\section{Server value}{
+
+Character vector of values corresponding to the boxes that are checked.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {

man/checkboxInput.Rd

@@ -22,6 +22,11 @@ A checkbox control that can be added to a UI definition.
 \description{
 Create a checkbox that can be used to specify logical values.
 }
+\section{Server value}{
+
+\code{TRUE} if checked, \code{FALSE} otherwise.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -35,6 +40,7 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
+
 }
 \seealso{
 \code{\link[=checkboxGroupInput]{checkboxGroupInput()}}, \code{\link[=updateCheckboxInput]{updateCheckboxInput()}}

man/dateInput.Rd

@@ -75,6 +75,11 @@ the browser. It allows the following values:
 \item \code{DD} Full weekday name
 }
 }
+\section{Server value}{
+
+A \link{Date} vector of length 1.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -110,6 +115,7 @@ ui <- fluidPage(
 
 shinyApp(ui, server = function(input, output) { })
 }
+
 }
 \seealso{
 \code{\link[=dateRangeInput]{dateRangeInput()}}, \code{\link[=updateDateInput]{updateDateInput()}}

man/dateRangeInput.Rd

@@ -75,6 +75,11 @@ the browser. It allows the following values:
 \item \code{DD} Full weekday name
 }
 }
+\section{Server value}{
+
+A \link{Date} vector of length 2.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -114,6 +119,7 @@ ui <- fluidPage(
 
 shinyApp(ui, server = function(input, output) { })
 }
+
 }
 \seealso{
 \code{\link[=dateInput]{dateInput()}}, \code{\link[=updateDateRangeInput]{updateDateRangeInput()}}

man/fileInput.Rd

@@ -33,8 +33,11 @@ Create a file upload control that can be used to upload one or more files.
 }
 \details{
 Whenever a file upload completes, the corresponding input variable is set
-to a dataframe. This dataframe contains one row for each selected file, and
-the following columns:
+to a dataframe. See the \code{Server value} section.
+}
+\section{Server value}{
+
+A \code{data.frame} that contains one row for each selected file, and following columns:
 \describe{
 \item{\code{name}}{The filename provided by the web browser. This is
 \strong{not} the path to read to get at the actual data that was uploaded
@@ -49,6 +52,7 @@ uploaded. This file may be deleted if the user performs another upload
 operation.}
 }
 }
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -89,6 +93,7 @@ server <- function(input, output) {
 
 shinyApp(ui, server)
 }
+
 }
 \seealso{
 Other input elements: \code{\link{actionButton}},

man/fillPage.Rd

@@ -82,3 +82,10 @@ fillPage(
   )
 )
 }
+\seealso{
+Other layout functions: \code{\link{fixedPage}},
+  \code{\link{flowLayout}}, \code{\link{fluidPage}},
+  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
+  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
+}
+\concept{layout functions}

man/fixedPage.Rd

@@ -66,4 +66,10 @@ shinyApp(ui, server = function(input, output) { })
 }
 \seealso{
 \code{\link[=column]{column()}}
+
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{flowLayout}}, \code{\link{fluidPage}},
+  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
+  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
 }
+\concept{layout functions}

man/flowLayout.Rd

@@ -32,5 +32,9 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-\code{\link[=verticalLayout]{verticalLayout()}}
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{fixedPage}}, \code{\link{fluidPage}},
+  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
+  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
 }
+\concept{layout functions}

man/fluidPage.Rd

@@ -99,5 +99,11 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-\code{\link[=column]{column()}}, \code{\link[=sidebarLayout]{sidebarLayout()}}
+\code{\link[=column]{column()}}
+
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{fixedPage}}, \code{\link{flowLayout}},
+  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
+  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
 }
+\concept{layout functions}

man/headerPanel.Rd

@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/bootstrap.R
+% Please edit documentation in R/bootstrap-deprecated.R
 \name{headerPanel}
 \alias{headerPanel}
 \title{Create a header panel}
@@ -16,8 +16,6 @@ Useful if \code{title} is not a string.}
 A headerPanel that can be passed to \link{pageWithSidebar}
 }
 \description{
-Create a header panel containing an application title.
-}
-\examples{
-headerPanel("Hello Shiny!")
+\strong{DEPRECATED}: use \code{\link[=titlePanel]{titlePanel()}} instead.
 }
+\keyword{internal}

man/htmlTemplate.Rd

@@ -27,4 +27,3 @@ complete HTML document, then the returned object will also have class
 \seealso{
 \code{\link{renderDocument}}
 }
-

man/include.Rd

@@ -1,10 +1,10 @@
 \name{include}
 \alias{include}
-\alias{includeCSS}
 \alias{includeHTML}
-\alias{includeMarkdown}
-\alias{includeScript}
 \alias{includeText}
+\alias{includeMarkdown}
+\alias{includeCSS}
+\alias{includeScript}
 \title{Include Content From a File}
 \usage{
 includeHTML(path)
@@ -19,8 +19,8 @@ includeScript(path, ...)
 }
 \arguments{
 \item{path}{The path of the file to be included. It is highly recommended to
-  use a relative path (the base path being the Shiny application directory),
-  not an absolute path.}
+use a relative path (the base path being the Shiny application directory),
+not an absolute path.}
 
 \item{...}{Any additional attributes to be applied to the generated tag.}
 }
@@ -42,4 +42,3 @@ large literal R string.
 The \code{includeMarkdown} function requires the \code{markdown}
   package.
 }
-

man/knitr_methods_htmltools.Rd

@@ -1,22 +0,0 @@
-\name{knit_print.html}
-\alias{knit_print.html}
-\alias{knit_print.shiny.tag}
-\alias{knit_print.shiny.tag.list}
-\title{Knitr S3 methods}
-\usage{
-knit_print.shiny.tag(x, ...)
-
-knit_print.html(x, ...)
-
-knit_print.shiny.tag.list(x, ...)
-}
-\arguments{
-\item{x}{Object to knit_print}
-
-\item{...}{Additional knit_print arguments}
-}
-\description{
-These S3 methods are necessary to allow HTML tags to print themselves in
-knitr/rmarkdown documents.
-}
-

man/loadSupport.Rd

@@ -0,0 +1,31 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/app.R
+\name{loadSupport}
+\alias{loadSupport}
+\title{Load an app's supporting R files}
+\usage{
+loadSupport(appDir, renv = new.env(parent = globalenv()),
+  globalrenv = globalenv())
+}
+\arguments{
+\item{appDir}{The application directory}
+
+\item{renv}{The environmeny in which the files in the \code{R/} directory should
+be evaluated.}
+
+\item{globalrenv}{The environment in which \code{global.R} should be evaluated. If
+\code{NULL}, \code{global.R} will not be evaluated at all.}
+}
+\description{
+Loads all of the supporting R files of a Shiny application. Specifically,
+this function loads any top-level supporting \code{.R} files in the \code{R/} directory
+adjacent to the \code{app.R}/\code{server.R}/\code{ui.R} files.
+}
+\details{
+At the moment, this function is "opt-in" and only called if the option
+\code{shiny.autoload.r} is set to \code{TRUE}.
+
+The files are sourced in alphabetical order (as determined by
+\link{list.files}). \code{global.R} is evaluated before the supporting R files in the
+\code{R/} directory.
+}

man/mainPanel.Rd

@@ -1,29 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/bootstrap.R
-\name{mainPanel}
-\alias{mainPanel}
-\title{Create a main panel}
-\usage{
-mainPanel(..., width = 8)
-}
-\arguments{
-\item{...}{Output elements to include in the main panel}
-
-\item{width}{The width of the main panel. For fluid layouts this is out of 12
-total units; for fixed layouts it is out of whatever the width of the main
-panel's parent column is.}
-}
-\value{
-A main panel that can be passed to \code{\link[=sidebarLayout]{sidebarLayout()}}.
-}
-\description{
-Create a main panel containing output elements that can in turn be passed to
-\code{\link[=sidebarLayout]{sidebarLayout()}}.
-}
-\examples{
-# Show the caption and plot of the requested variable against mpg
-mainPanel(
-   h3(textOutput("caption")),
-   plotOutput("mpgPlot")
-)
-}

man/navbarPage.Rd

@@ -105,4 +105,10 @@ navbarPage("App Title",
 \code{\link[=tabPanel]{tabPanel()}}, \code{\link[=tabsetPanel]{tabsetPanel()}},
 \code{\link[=updateNavbarPage]{updateNavbarPage()}}, \code{\link[=insertTab]{insertTab()}},
 \code{\link[=showTab]{showTab()}}
+
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{fixedPage}}, \code{\link{flowLayout}},
+  \code{\link{fluidPage}}, \code{\link{sidebarLayout}},
+  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
 }
+\concept{layout functions}

man/numericInput.Rd

@@ -29,6 +29,11 @@ A numeric input control that can be added to a UI definition.
 \description{
 Create an input control for entry of numeric values
 }
+\section{Server value}{
+
+A numeric vector of length 1.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -42,6 +47,7 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
+
 }
 \seealso{
 \code{\link[=updateNumericInput]{updateNumericInput()}}

man/pageWithSidebar.Rd

@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/bootstrap.R
+% Please edit documentation in R/bootstrap-deprecated.R
 \name{pageWithSidebar}
 \alias{pageWithSidebar}
 \title{Create a page with a sidebar}
@@ -17,32 +17,6 @@ pageWithSidebar(headerPanel, sidebarPanel, mainPanel)
 A UI defintion that can be passed to the \link{shinyUI} function
 }
 \description{
-Create a Shiny UI that contains a header with the application title, a
-sidebar for input controls, and a main area for output.
-}
-\note{
-This function is deprecated. You should use \code{\link[=fluidPage]{fluidPage()}}
-along with \code{\link[=sidebarLayout]{sidebarLayout()}} to implement a page with a sidebar.
-}
-\examples{
-# Define UI
-pageWithSidebar(
-
-  # Application title
-  headerPanel("Hello Shiny!"),
-
-  # Sidebar with a slider input
-  sidebarPanel(
-    sliderInput("obs",
-                "Number of observations:",
-                min = 0,
-                max = 1000,
-                value = 500)
-  ),
-
-  # Show a plot of the generated distribution
-  mainPanel(
-    plotOutput("distPlot")
-  )
-)
+\strong{DEPRECATED}: use \code{\link[=fluidPage]{fluidPage()}} and \code{\link[=sidebarLayout]{sidebarLayout()}} instead.
 }
+\keyword{internal}

man/passwordInput.Rd

@@ -27,6 +27,12 @@ A text input control that can be added to a UI definition.
 \description{
 Create an password control for entry of passwords.
 }
+\section{Server value}{
+
+A character string of the password input. The default value is \code{""}
+unless \code{value} is provided.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {

man/radioButtons.Rd

@@ -49,6 +49,11 @@ the radio buttons to have no options selected by using \code{selected = characte
 to return to that state once they've made a selection. Instead, consider
 having the first of your choices be \code{c("None selected" = "")}.
 }
+\section{Server value}{
+
+A character string containing the value of the selected button.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -98,6 +103,7 @@ server <- function(input, output) {
 
 shinyApp(ui, server)
 }
+
 }
 \seealso{
 \code{\link[=updateRadioButtons]{updateRadioButtons()}}

man/renderPlot.Rd

@@ -11,13 +11,19 @@ renderPlot(expr, width = "auto", height = "auto", res = 72, ...,
 \arguments{
 \item{expr}{An expression that generates a plot.}
 
-\item{width, height}{The width/height of the rendered plot, in pixels; or
-\code{'auto'} to use the \code{offsetWidth}/\code{offsetHeight} of the HTML
-element that is bound to this plot. You can also pass in a function that
-returns the width/height in pixels or \code{'auto'}; in the body of the
-function you may reference reactive values and functions. When rendering an
-inline plot, you must provide numeric values (in pixels) to both
-\code{width} and \code{height}.}
+\item{width, height}{Height and width can be specified in three ways:
+\itemize{
+\item \code{"auto"}, the default, uses the size specified by \code{\link[=plotOutput]{plotOutput()}}
+(i.e. the \code{offsetWidth}/`offsetHeight`` of the HTML element bound to
+this plot.)
+\item An integer, defining the width/height in pixels.
+\item A function that returns the width/height in pixels (or \code{"auto"}).
+The function is executed in a reactive context so that you can refer to
+reactive values and expression to make the width/height reactive.
+}
+
+When rendering an inline plot, you must provide numeric values (in pixels)
+to both \code{width} and \code{height}.}
 
 \item{res}{Resolution of resulting plot, in pixels per inch. This value is
 passed to \code{\link[grDevices:png]{grDevices::png()}}. Note that this affects the resolution of PNG

man/selectInput.Rd

@@ -18,14 +18,13 @@ selectizeInput(inputId, ..., options = NULL, width = NULL)
 \item{choices}{List of values to select from. If elements of the list are
 named, then that name --- rather than the value --- is displayed to the
 user. It's also possible to group related inputs by providing a named list
-whose elements are (either named or unnamed) lists, vectors, or factors. In this
-case, the outermost names will be used as the group labels (leveraging the
-\code{<optgroup>} HTML tag) for the elements in the respective sublist. See the
-example section for a small demo of this feature.}
+whose elements are (either named or unnamed) lists, vectors, or factors. In
+this case, the outermost names will be used as the group labels (leveraging
+the \code{<optgroup>} HTML tag) for the elements in the respective sublist. See
+the example section for a small demo of this feature.}
 
-\item{selected}{The initially selected value (or multiple values if
-\code{multiple = TRUE}). If not specified then defaults to the first value
-for single-select lists and no values for multiple select lists.}
+\item{selected}{The initially selected value (or multiple values if \code{multiple = TRUE}). If not specified then defaults to the first value for
+single-select lists and no values for multiple select lists.}
 
 \item{multiple}{Is selection of multiple items allowed?}
 
@@ -36,8 +35,8 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
 
 \item{size}{Number of items to show in the selection box; a larger number
 will result in a taller box. Not compatible with \code{selectize=TRUE}.
-Normally, when \code{multiple=FALSE}, a select input will be a drop-down
-list, but when \code{size} is set, it will be a box instead.}
+Normally, when \code{multiple=FALSE}, a select input will be a drop-down list,
+but when \code{size} is set, it will be a box instead.}
 
 \item{...}{Arguments passed to \code{selectInput()}.}
 
@@ -54,14 +53,13 @@ Create a select list that can be used to choose a single or multiple items
 from a list of values.
 }
 \details{
-By default, \code{selectInput()} and \code{selectizeInput()} use the
-JavaScript library \pkg{selectize.js}
-(\url{https://github.com/selectize/selectize.js}) instead of the basic
-select input element. To use the standard HTML select input element, use
-\code{selectInput()} with \code{selectize=FALSE}.
+By default, \code{selectInput()} and \code{selectizeInput()} use the JavaScript library
+\pkg{selectize.js} (\url{https://github.com/selectize/selectize.js}) instead of
+the basic select input element. To use the standard HTML select input
+element, use \code{selectInput()} with \code{selectize=FALSE}.
 
-In selectize mode, if the first element in \code{choices} has a value of
-\code{""}, its name will be treated as a placeholder prompt. For example:
+In selectize mode, if the first element in \code{choices} has a value of \code{""}, its
+name will be treated as a placeholder prompt. For example:
 \code{selectInput("letter", "Letter", c("Choose one" = "", LETTERS))}
 }
 \note{
@@ -74,6 +72,12 @@ value when it is a single choice input and the empty string is not in the
 \code{choices} argument. This is to keep compatibility with
 \code{selectInput(..., selectize = FALSE)}.
 }
+\section{Server value}{
+ A vector of character strings, usually of length
+1, with the value of the selected items. When \code{multiple=TRUE} and
+nothing is selected, this value will be \code{NULL}.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -111,6 +115,7 @@ shinyApp(
   }
 )
 }
+
 }
 \seealso{
 \code{\link[=updateSelectInput]{updateSelectInput()}} \code{\link[=varSelectInput]{varSelectInput()}}

man/shiny-options.Rd

@@ -1,88 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/shiny.R
-\name{shiny-options}
-\alias{shiny-options}
-\title{Global options for Shiny}
-\description{
-There are a number of global options that affect Shiny's behavior. These can
-be set with (for example) \code{options(shiny.trace=TRUE)}.
-}
-\details{
-\describe{
-\item{shiny.launch.browser}{A boolean which controls the default behavior
-when an app is run. See \code{\link[=runApp]{runApp()}} for more information.}
-\item{shiny.port}{A port number that Shiny will listen on. See
-\code{\link[=runApp]{runApp()}} for more information.}
-\item{shiny.trace}{Print messages sent between the R server and the web
-browser client to the R console. This is useful for debugging. Possible
-values are \code{"send"} (only print messages sent to the client),
-\code{"recv"} (only print messages received by the server), \code{TRUE}
-(print all messages), or \code{FALSE} (default; don't print any of these
-messages).}
-\item{shiny.autoreload}{If \code{TRUE} when a Shiny app is launched, the
-app directory will be continually monitored for changes to files that
-have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
-changes are detected, all connected Shiny sessions are reloaded. This
-allows for fast feedback loops when tweaking Shiny UI.
-
-Since monitoring for changes is expensive (we simply poll for last
-modified times), this feature is intended only for development.
-
-You can customize the file patterns Shiny will monitor by setting the
-shiny.autoreload.pattern option. For example, to monitor only ui.R:
-\code{options(shiny.autoreload.pattern = glob2rx("ui.R"))}
-
-The default polling interval is 500 milliseconds. You can change this
-by setting e.g. \code{options(shiny.autoreload.interval = 2000)} (every
-two seconds).}
-\item{shiny.reactlog}{If \code{TRUE}, enable logging of reactive events,
-which can be viewed later with the \code{\link[=reactlogShow]{reactlogShow()}} function.
-This incurs a substantial performance penalty and should not be used in
-production.}
-\item{shiny.usecairo}{This is used to disable graphical rendering by the
-Cairo package, if it is installed. See \code{\link[=plotPNG]{plotPNG()}} for more
-information.}
-\item{shiny.maxRequestSize}{This is a number which specifies the maximum
-web request size, which serves as a size limit for file uploads. If
-unset, the maximum request size defaults to 5MB.}
-\item{shiny.suppressMissingContextError}{Normally, invoking a reactive
-outside of a reactive context (or \code{\link[=isolate]{isolate()}}) results in
-an error. If this is \code{TRUE}, don't error in these cases. This
-should only be used for debugging or demonstrations of reactivity at the
-console.}
-\item{shiny.host}{The IP address that Shiny should listen on. See
-\code{\link[=runApp]{runApp()}} for more information.}
-\item{shiny.json.digits}{The number of digits to use when converting
-numbers to JSON format to send to the client web browser.}
-\item{shiny.minified}{If this is \code{TRUE} or unset (the default), then
-Shiny will use minified JavaScript (\code{shiny.min.js}). If
-\code{FALSE}, then Shiny will use the un-minified JavaScript
-(\code{shiny.js}); this can be useful during development.}
-\item{shiny.error}{This can be a function which is called when an error
-occurs. For example, \code{options(shiny.error=recover)} will result a
-the debugger prompt when an error occurs.}
-\item{shiny.table.class}{CSS class names to use for tables.}
-\item{shiny.deprecation.messages}{This controls whether messages for
-deprecated functions in Shiny will be printed. See
-\code{\link[=shinyDeprecated]{shinyDeprecated()}} for more information.}
-\item{shiny.fullstacktrace}{Controls whether "pretty" or full stack traces
-are dumped to the console when errors occur during Shiny app execution.
-The default is \code{FALSE} (pretty stack traces).}
-\item{shiny.stacktraceoffset}{If \code{TRUE}, then Shiny's printed stack
-traces will display srcrefs one line above their usual location. This is
-an arguably more intuitive arrangement for casual R users, as the name
-of a function appears next to the srcref where it is defined, rather than
-where it is currently being called from.}
-\item{shiny.sanitize.errors}{If \code{TRUE}, then normal errors (i.e.
-errors not wrapped in \code{safeError}) won't show up in the app; a simple
-generic error message is printed instead (the error and strack trace printed
-to the console remain unchanged). The default is \code{FALSE} (unsanitized
-errors).If you want to sanitize errors in general, but you DO want a
-particular error \code{e} to get displayed to the user, then set this option
-to \code{TRUE} and use \code{stop(safeError(e))} for errors you want the
-user to see.}
-\item{shiny.testmode}{If \code{TRUE}, then enable features for testing Shiny
-applications. If \code{FALSE} (the default), do not enable those features.
-}
-}
-}

man/shiny.appobj.Rd

@@ -0,0 +1,36 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/app.R
+\name{shiny.appobj}
+\alias{shiny.appobj}
+\alias{as.shiny.appobj}
+\alias{as.shiny.appobj.shiny.appobj}
+\alias{as.shiny.appobj.list}
+\alias{as.shiny.appobj.character}
+\alias{is.shiny.appobj}
+\alias{print.shiny.appobj}
+\alias{as.tags.shiny.appobj}
+\title{Shiny App object}
+\usage{
+as.shiny.appobj(x)
+
+\method{as.shiny.appobj}{shiny.appobj}(x)
+
+\method{as.shiny.appobj}{list}(x)
+
+\method{as.shiny.appobj}{character}(x)
+
+is.shiny.appobj(x)
+
+\method{print}{shiny.appobj}(x, ...)
+
+\method{as.tags}{shiny.appobj}(x, ...)
+}
+\arguments{
+\item{x}{Object to convert to a Shiny app.}
+
+\item{...}{Additional parameters to be passed to print.}
+}
+\description{
+Internal methods for the \code{shiny.appobj} S3 class.
+}
+\keyword{internal}

man/shinyApp.Rd

@@ -4,41 +4,22 @@
 \alias{shinyApp}
 \alias{shinyAppDir}
 \alias{shinyAppFile}
-\alias{as.shiny.appobj}
-\alias{as.shiny.appobj.shiny.appobj}
-\alias{as.shiny.appobj.list}
-\alias{as.shiny.appobj.character}
-\alias{is.shiny.appobj}
-\alias{print.shiny.appobj}
-\alias{as.tags.shiny.appobj}
 \title{Create a Shiny app object}
 \usage{
-shinyApp(ui = NULL, server = NULL, onStart = NULL,
-  options = list(), uiPattern = "/", enableBookmarking = NULL)
+shinyApp(ui, server, onStart = NULL, options = list(),
+  uiPattern = "/", enableBookmarking = NULL)
 
 shinyAppDir(appDir, options = list())
 
 shinyAppFile(appFile, options = list())
-
-as.shiny.appobj(x)
-
-\method{as.shiny.appobj}{shiny.appobj}(x)
-
-\method{as.shiny.appobj}{list}(x)
-
-\method{as.shiny.appobj}{character}(x)
-
-is.shiny.appobj(x)
-
-\method{print}{shiny.appobj}(x, ...)
-
-\method{as.tags}{shiny.appobj}(x, ...)
 }
 \arguments{
 \item{ui}{The UI definition of the app (for example, a call to
 \code{fluidPage()} with nested controls)}
 
-\item{server}{A server function}
+\item{server}{A function with three parameters: \code{input}, \code{output}, and
+\code{session}. The function is called once for each session ensuring that each
+app is independent.}
 
 \item{onStart}{A function that will be called before the app is actually run.
 This is only needed for \code{shinyAppObj}, since in the \code{shinyAppDir}
@@ -66,10 +47,6 @@ See \code{\link[=enableBookmarking]{enableBookmarking()}} for more information.}
 file and either ui.R or www/index.html)}
 
 \item{appFile}{Path to a .R file containing a Shiny application}
-
-\item{x}{Object to convert to a Shiny app.}
-
-\item{...}{Additional parameters to be passed to print.}
 }
 \value{
 An object that represents the app. Printing the object or passing it

man/shinyOptions.Rd

@@ -3,6 +3,7 @@
 \name{getShinyOption}
 \alias{getShinyOption}
 \alias{shinyOptions}
+\alias{shiny-options}
 \title{Get or set Shiny options}
 \usage{
 getShinyOption(name, default = NULL)
@@ -17,19 +18,106 @@ shinyOptions(...)
 \item{...}{Options to set, with the form \code{name = value}.}
 }
 \description{
-\code{getShinyOption} retrieves the value of a Shiny option.
-\code{shinyOptions} sets the value of Shiny options; it can also be used to
-return a list of all currently-set Shiny options.
+\code{getShinyOption()} retrieves the value of a Shiny option. \code{shinyOptions()}
+sets the value of Shiny options; it can also be used to return a list of all
+currently-set Shiny options.
 }
-\details{
-There is a global option set, which is available by default. When a Shiny
-application is run with \code{\link[=runApp]{runApp()}}, that option set is duplicated
-and the new option set is available for getting or setting values. If options
-are set from global.R, app.R, ui.R, or server.R, or if they are set from
-inside the server function, then the options will be scoped to the
+\section{Scope}{
+
+There is a global option set which is available by default. When a Shiny
+application is run with \code{\link[=runApp]{runApp()}}, that option set is duplicated and the
+new option set is available for getting or setting values. If options
+are set from \code{global.R}, \code{app.R}, \code{ui.R}, or \code{server.R}, or if they are set
+from inside the server function, then the options will be scoped to the
 application. When the application exits, the new option set is discarded and
 the global option set is restored.
 }
+
+\section{Options}{
+
+There are a number of global options that affect Shiny's behavior. These can
+be set globally with \code{options()} or locally (for a single app) with
+\code{shinyOptions()}.
+
+\describe{
+\item{shiny.autoreload (defaults to \code{FALSE})}{If \code{TRUE} when a Shiny app is launched, the
+app directory will be continually monitored for changes to files that
+have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
+changes are detected, all connected Shiny sessions are reloaded. This
+allows for fast feedback loops when tweaking Shiny UI.\preformatted{Since monitoring for changes is expensive (we simply poll for last
+modified times), this feature is intended only for development.
+
+You can customize the file patterns Shiny will monitor by setting the
+shiny.autoreload.pattern option. For example, to monitor only ui.R:
+`options(shiny.autoreload.pattern = glob2rx("ui.R"))`
+
+The default polling interval is 500 milliseconds. You can change this
+by setting e.g. `options(shiny.autoreload.interval = 2000)` (every
+two seconds).}
+}
+
+\item{shiny.deprecation.messages (defaults to \code{TRUE})}{This controls whether messages for
+deprecated functions in Shiny will be printed. See
+\code{\link[=shinyDeprecated]{shinyDeprecated()}} for more information.}
+\item{shiny.error (defaults to \code{NULL})}{This can be a function which is called when an error
+occurs. For example, \code{options(shiny.error=recover)} will result a
+the debugger prompt when an error occurs.}
+\item{shiny.fullstacktrace (defaults to \code{FALSE})}{Controls whether "pretty" (\code{FALSE}) or full
+stack traces (\code{TRUE}) are dumped to the console when errors occur during Shiny app execution.
+Pretty stack traces attempt to only show user-supplied code, but this pruning can't always
+be done 100\% correctly.}
+\item{shiny.host (defaults to \code{"127.0.0.1"})}{The IP address that Shiny should listen on. See
+\code{\link[=runApp]{runApp()}} for more information.}
+\item{shiny.jquery.version (defaults to \code{3})}{The major version of jQuery to use.
+Currently only values of \code{3} or \code{1} are supported. If \code{1}, then jQuery 1.12.4 is used. If \code{3},
+then jQuery 3.4.1 is used.}
+\item{shiny.json.digits (defaults to \code{16})}{The number of digits to use when converting
+numbers to JSON format to send to the client web browser.}
+\item{shiny.launch.browser (defaults to \code{interactive()})}{A boolean which controls the default behavior
+when an app is run. See \code{\link[=runApp]{runApp()}} for more information.}
+\item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
+web request size, which serves as a size limit for file uploads.}
+\item{shiny.minified (defaults to \code{TRUE})}{By default
+Whether or not to include Shiny's JavaScript as a minified (\code{shiny.min.js})
+or un-minified (\code{shiny.js}) file. The un-minified version is larger,
+but can be helpful for development and debugging.}
+\item{shiny.port (defaults to a random open port)}{A port number that Shiny will listen on. See
+\code{\link[=runApp]{runApp()}} for more information.}
+\item{shiny.reactlog (defaults to \code{FALSE})}{If \code{TRUE}, enable logging of reactive events,
+which can be viewed later with the \code{\link[=reactlogShow]{reactlogShow()}} function.
+This incurs a substantial performance penalty and should not be used in
+production.}
+\item{shiny.sanitize.errors (defaults to \code{FALSE})}{If \code{TRUE}, then normal errors (i.e.
+errors not wrapped in \code{safeError}) won't show up in the app; a simple
+generic error message is printed instead (the error and strack trace printed
+to the console remain unchanged). If you want to sanitize errors in general, but you DO want a
+particular error \code{e} to get displayed to the user, then set this option
+to \code{TRUE} and use \code{stop(safeError(e))} for errors you want the
+user to see.}
+\item{shiny.stacktraceoffset (defaults to \code{TRUE})}{If \code{TRUE}, then Shiny's printed stack
+traces will display srcrefs one line above their usual location. This is
+an arguably more intuitive arrangement for casual R users, as the name
+of a function appears next to the srcref where it is defined, rather than
+where it is currently being called from.}
+\item{shiny.suppressMissingContextError (defaults to \code{FALSE})}{Normally, invoking a reactive
+outside of a reactive context (or \code{\link[=isolate]{isolate()}}) results in
+an error. If this is \code{TRUE}, don't error in these cases. This
+should only be used for debugging or demonstrations of reactivity at the
+console.}
+\item{shiny.testmode (defaults to \code{FALSE})}{If \code{TRUE}, then various features for testing Shiny
+applications are enabled.}
+\item{shiny.trace (defaults to \code{FALSE})}{Print messages sent between the R server and the web
+browser client to the R console. This is useful for debugging. Possible
+values are \code{"send"} (only print messages sent to the client),
+\code{"recv"} (only print messages received by the server), \code{TRUE}
+(print all messages), or \code{FALSE} (default; don't print any of these
+messages).}
+\item{shiny.usecairo (defaults to \code{TRUE})}{This is used to disable graphical rendering by the
+Cairo package, if it is installed. See \code{\link[=plotPNG]{plotPNG()}} for more
+information.}
+}
+}
+
 \examples{
 \dontrun{
 shinyOptions(myOption = 10)

man/showNotification.Rd

@@ -9,7 +9,7 @@ showNotification(ui, action = NULL, duration = 5, closeButton = TRUE,
   id = NULL, type = c("default", "message", "warning", "error"),
   session = getDefaultReactiveDomain())
 
-removeNotification(id = NULL, session = getDefaultReactiveDomain())
+removeNotification(id, session = getDefaultReactiveDomain())
 }
 \arguments{
 \item{ui}{Content of message.}
@@ -26,11 +26,13 @@ disappear.}
 \item{closeButton}{If \code{TRUE}, display a button which will make the
 notification disappear when clicked. If \code{FALSE} do not display.}
 
-\item{id}{An ID string. This can be used to change the contents of an
-existing message with \code{showNotification}, or to remove it with
-\code{removeNotification}. If not provided, one will be generated
-automatically. If an ID is provided and there does not currently exist a
-notification with that ID, a new notification will be created with that ID.}
+\item{id}{A unique identifier for the notification.
+
+\code{id} is optional for \code{showNotification()}: Shiny will automatically create
+one if needed. If you do supply it, Shiny will update an existing
+notification if it exists, otherwise it will create a new one.
+
+\code{id} is required for \code{removeNotification()}.}
 
 \item{type}{A string which controls the color of the notification. One of
 "default" (gray), "message" (blue), "warning" (yellow), or "error" (red).}

man/sidebarLayout.Rd

@@ -2,25 +2,38 @@
 % Please edit documentation in R/bootstrap-layout.R
 \name{sidebarLayout}
 \alias{sidebarLayout}
+\alias{sidebarPanel}
+\alias{mainPanel}
 \title{Layout a sidebar and main area}
 \usage{
 sidebarLayout(sidebarPanel, mainPanel, position = c("left", "right"),
   fluid = TRUE)
+
+sidebarPanel(..., width = 4)
+
+mainPanel(..., width = 8)
 }
 \arguments{
-\item{sidebarPanel}{The \link{sidebarPanel} containing input controls}
+\item{sidebarPanel}{The \code{sidebarPanel()} containing input controls.}
 
-\item{mainPanel}{The \link{mainPanel} containing outputs}
+\item{mainPanel}{The \code{mainPanel()} containing outputs.}
 
 \item{position}{The position of the sidebar relative to the main area ("left"
-or "right")}
+or "right").}
 
 \item{fluid}{\code{TRUE} to use fluid layout; \code{FALSE} to use fixed
 layout.}
+
+\item{...}{Output elements to include in the sidebar/main panel.}
+
+\item{width}{The width of the sidebar and main panel. By default, the
+sidebar takes up 1/3 of the width, and the main panel 2/3. The total
+width must be 12 or less.}
 }
 \description{
-Create a layout with a sidebar and main area. The sidebar is displayed with a
-distinct background color and typically contains input controls. The main
+Create a layout (\code{sidebarLayout()}) with a sidebar (\code{sidebarPanel()}) and
+main area (\code{mainPanel()}). The sidebar is displayed with a distinct
+background color and typically contains input controls. The main
 area occupies 2/3 of the horizontal width and typically contains outputs.
 }
 \examples{
@@ -63,3 +76,10 @@ server <- function(input, output) {
 shinyApp(ui, server)
 }
 }
+\seealso{
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{fixedPage}}, \code{\link{flowLayout}},
+  \code{\link{fluidPage}}, \code{\link{navbarPage}},
+  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
+}
+\concept{layout functions}

man/sidebarPanel.Rd

@@ -1,32 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/bootstrap.R
-\name{sidebarPanel}
-\alias{sidebarPanel}
-\title{Create a sidebar panel}
-\usage{
-sidebarPanel(..., width = 4)
-}
-\arguments{
-\item{...}{UI elements to include on the sidebar}
-
-\item{width}{The width of the sidebar. For fluid layouts this is out of 12
-total units; for fixed layouts it is out of whatever the width of the
-sidebar's parent column is.}
-}
-\value{
-A sidebar that can be passed to \code{\link[=sidebarLayout]{sidebarLayout()}}
-}
-\description{
-Create a sidebar panel containing input controls that can in turn be passed
-to \code{\link[=sidebarLayout]{sidebarLayout()}}.
-}
-\examples{
-# Sidebar with controls to select a dataset and specify
-# the number of observations to view
-sidebarPanel(
-  selectInput("dataset", "Choose a dataset:",
-              choices = c("rock", "pressure", "cars")),
-
-  numericInput("obs", "Observations:", 10)
-)
-}

man/singleton.Rd

@@ -1,6 +1,6 @@
 \name{singleton}
-\alias{is.singleton}
 \alias{singleton}
+\alias{is.singleton}
 \title{Include content only once}
 \usage{
 singleton(x, value = TRUE)
@@ -18,4 +18,3 @@ be included in the generated document only once, yet may appear in the
 document-generating code more than once. Only the first appearance of the
 content (in document order) will be used.
 }
-

man/sliderInput.Rd

@@ -93,6 +93,11 @@ or list of tags (using \code{\link[=tag]{tag()}} and friends), or raw HTML (usin
 \description{
 Constructs a slider widget to select a numeric value from a range.
 }
+\section{Server value}{
+
+A number, or in the case of slider range, a vector of two numbers.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -115,6 +120,7 @@ server <- function(input, output) {
 # Complete app with UI and server components
 shinyApp(ui, server)
 }
+
 }
 \seealso{
 \code{\link[=updateSliderInput]{updateSliderInput()}}

man/splitLayout.Rd

@@ -61,3 +61,10 @@ ui <- splitLayout(
 shinyApp(ui, server)
 }
 }
+\seealso{
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{fixedPage}}, \code{\link{flowLayout}},
+  \code{\link{fluidPage}}, \code{\link{navbarPage}},
+  \code{\link{sidebarLayout}}, \code{\link{verticalLayout}}
+}
+\concept{layout functions}

man/suppressDependencies.Rd

@@ -19,4 +19,3 @@ HTML template.
 
 \code{\link[htmltools]{htmlDependency}}
 }
-

man/tabPanel.Rd

@@ -22,7 +22,8 @@ valid when using a \code{tabPanel} within a \code{\link[=navbarPage]{navbarPage(
 A tab that can be passed to \code{\link[=tabsetPanel]{tabsetPanel()}}
 }
 \description{
-Create a tab panel that can be included within a \code{\link[=tabsetPanel]{tabsetPanel()}}.
+Create a tab panel that can be included within a \code{\link[=tabsetPanel]{tabsetPanel()}} or
+a \code{\link[=navbarPage]{navbarPage()}}.
 }
 \examples{
 # Show a tabset that includes a plot, summary, and

man/tag.Rd

@@ -1,9 +1,11 @@
 \name{tag}
 \alias{tag}
+\alias{tagList}
 \alias{tagAppendAttributes}
+\alias{tagHasAttribute}
+\alias{tagGetAttribute}
 \alias{tagAppendChild}
 \alias{tagAppendChildren}
-\alias{tagList}
 \alias{tagSetChildren}
 \title{HTML Tag Object}
 \usage{
@@ -11,15 +13,30 @@ tagList(...)
 
 tagAppendAttributes(tag, ...)
 
+tagHasAttribute(tag, attr)
+
+tagGetAttribute(tag, attr)
+
 tagAppendChild(tag, child)
 
 tagAppendChildren(tag, ..., list = NULL)
 
 tagSetChildren(tag, ..., list = NULL)
 
-tag(`_tag_name`, varArgs)
+tag(`_tag_name`, varArgs, .noWS = NULL)
 }
 \arguments{
+\item{...}{Unnamed items that comprise this list of tags.}
+
+\item{tag}{A tag to append child elements to.}
+
+\item{attr}{The name of an attribute.}
+
+\item{child}{A child element to append to a parent tag.}
+
+\item{list}{An optional list of elements. Can be used with or instead of the
+\code{...} items.}
+
 \item{_tag_name}{HTML tag name}
 
 \item{varArgs}{List of attributes and children of the element. Named list
@@ -28,18 +45,14 @@ children are tags, single-character character vectors (which become text
 nodes), and raw HTML (see \code{\link{HTML}}). You can also pass lists that
 contain tags, text nodes, and HTML.}
 
-\item{tag}{A tag to append child elements to.}
-
-\item{child}{A child element to append to a parent tag.}
-
-\item{...}{Unnamed items that comprise this list of tags.}
-
-\item{list}{An optional list of elements. Can be used with or instead of the
-\code{...} items.}
+\item{.noWS}{Character vector used to omit some of the whitespace that would
+normally be written around this tag. Valid options include \code{before},
+\code{after}, \code{outside}, \code{after-begin}, and \code{before-end}.
+Any number of these options can be specified.}
 }
 \value{
 An HTML tag object that can be rendered as HTML using
-  \code{\link[base]{as.character}()}.
+  \code{\link{as.character}()}.
 }
 \description{
 \code{tag()} creates an HTML tag definition. Note that all of the valid HTML5
@@ -60,5 +73,10 @@ x <- list(tags$h1("Title"),
           tags$h2("Header text"),
           tags$p("Text here"))
 tagList(x)
-}
 
+# suppress the whitespace between tags
+oneline <- tag("span",
+  tag("strong", "Super strong", .noWS="outside")
+)
+cat(as.character(oneline))
+}

man/textAreaInput.Rd

@@ -45,6 +45,12 @@ A textarea input control that can be added to a UI definition.
 \description{
 Create a textarea input control for entry of unstructured text values.
 }
+\section{Server value}{
+
+A character string of the text input. The default value is \code{""}
+unless \code{value} is provided.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -59,6 +65,7 @@ server <- function(input, output) {
 shinyApp(ui, server)
 
 }
+
 }
 \seealso{
 \code{\link[=updateTextAreaInput]{updateTextAreaInput()}}

man/textInput.Rd

@@ -27,6 +27,12 @@ A text input control that can be added to a UI definition.
 \description{
 Create an input control for entry of unstructured text values
 }
+\section{Server value}{
+
+A character string of the text input. The default value is \code{""}
+unless \code{value} is provided.
+}
+
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -40,6 +46,7 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
+
 }
 \seealso{
 \code{\link[=updateTextInput]{updateTextInput()}}

man/updateSelectInput.Rd

@@ -30,14 +30,13 @@ updateVarSelectizeInput(session, inputId, label = NULL, data = NULL,
 \item{choices}{List of values to select from. If elements of the list are
 named, then that name --- rather than the value --- is displayed to the
 user. It's also possible to group related inputs by providing a named list
-whose elements are (either named or unnamed) lists, vectors, or factors. In this
-case, the outermost names will be used as the group labels (leveraging the
-\code{<optgroup>} HTML tag) for the elements in the respective sublist. See the
-example section for a small demo of this feature.}
+whose elements are (either named or unnamed) lists, vectors, or factors. In
+this case, the outermost names will be used as the group labels (leveraging
+the \code{<optgroup>} HTML tag) for the elements in the respective sublist. See
+the example section for a small demo of this feature.}
 
-\item{selected}{The initially selected value (or multiple values if
-\code{multiple = TRUE}). If not specified then defaults to the first value
-for single-select lists and no values for multiple select lists.}
+\item{selected}{The initially selected value (or multiple values if \code{multiple = TRUE}). If not specified then defaults to the first value for
+single-select lists and no values for multiple select lists.}
 
 \item{options}{A list of options. See the documentation of \pkg{selectize.js}
 for possible options (character option values inside \code{\link[base:I]{base::I()}} will

man/validateCssUnit.Rd

@@ -22,10 +22,12 @@ Single element numeric vectors are returned as a character vector with the
 number plus a suffix of \code{"px"}.
 
 Single element character vectors must be \code{"auto"} or \code{"inherit"},
-or a number. If the number has a suffix, it must be valid: \code{px},
-\code{\%}, \code{em}, \code{pt}, \code{in}, \code{cm}, \code{mm}, \code{ex},
-or \code{pc}. If the number has no suffix, the suffix \code{"px"} is
-appended.
+a number, or a length calculated by the \code{"calc"} CSS function.
+If the number has a suffix, it must be valid: \code{px},
+\code{\%}, \code{ch}, \code{em}, \code{rem}, \code{pt}, \code{in}, \code{cm},
+\code{mm}, \code{ex}, \code{pc}, \code{vh}, \code{vw}, \code{vmin}, or
+\code{vmax}.
+If the number has no suffix, the suffix \code{"px"} is appended.
 
 Any other value will cause an error to be thrown.
 }
@@ -33,4 +35,3 @@ Any other value will cause an error to be thrown.
 validateCssUnit("10\%")
 validateCssUnit(400)  #treated as '400px'
 }
-

man/varSelectInput.Rd

@@ -17,9 +17,8 @@ varSelectizeInput(inputId, ..., options = NULL, width = NULL)
 
 \item{data}{A data frame. Used to retrieve the column names as choices for a \code{\link[=selectInput]{selectInput()}}}
 
-\item{selected}{The initially selected value (or multiple values if
-\code{multiple = TRUE}). If not specified then defaults to the first value
-for single-select lists and no values for multiple select lists.}
+\item{selected}{The initially selected value (or multiple values if \code{multiple = TRUE}). If not specified then defaults to the first value for
+single-select lists and no values for multiple select lists.}
 
 \item{multiple}{Is selection of multiple items allowed?}
 
@@ -30,8 +29,8 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
 
 \item{size}{Number of items to show in the selection box; a larger number
 will result in a taller box. Not compatible with \code{selectize=TRUE}.
-Normally, when \code{multiple=FALSE}, a select input will be a drop-down
-list, but when \code{size} is set, it will be a box instead.}
+Normally, when \code{multiple=FALSE}, a select input will be a drop-down list,
+but when \code{size} is set, it will be a box instead.}
 
 \item{...}{Arguments passed to \code{varSelectInput()}.}
 
@@ -48,18 +47,6 @@ Create a select list that can be used to choose a single or multiple items
 from the column names of a data frame.
 }
 \details{
-The resulting server \code{input} value will be returned as:
-\itemize{
-\item a symbol if \code{multiple = FALSE}.  The \code{input} value should be
-used with rlang's \code{\link[rlang:!!]{rlang::!!()}}. For example,
-\code{ggplot2::aes(!!input$variable)}.
-\item a list of symbols if \code{multiple = TRUE}. The \code{input} value
-should be used with rlang's \code{\link[rlang:!!!]{rlang::!!!()}} to expand
-the symbol list as individual arguments. For example,
-\code{dplyr::select(mtcars, !!!input$variabls)} which is
-equivalent to \code{dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])}.
-}
-
 By default, \code{varSelectInput()} and \code{selectizeInput()} use the
 JavaScript library \pkg{selectize.js}
 (\url{https://github.com/selectize/selectize.js}) to instead of the basic
@@ -76,6 +63,21 @@ value when it is a single choice input and the empty string is not in the
 \code{choices} argument. This is to keep compatibility with
 \code{selectInput(..., selectize = FALSE)}.
 }
+\section{Server value}{
+
+The resulting server \code{input} value will be returned as:
+\itemize{
+\item A symbol if \code{multiple = FALSE}. The \code{input} value should be
+used with rlang's \code{\link[rlang:!!]{rlang::!!()}}. For example,
+\code{ggplot2::aes(!!input$variable)}.
+\item A list of symbols if \code{multiple = TRUE}. The \code{input} value
+should be used with rlang's \code{\link[rlang:!!!]{rlang::!!!()}} to expand
+the symbol list as individual arguments. For example,
+\code{dplyr::select(mtcars, !!!input$variabls)} which is
+equivalent to \code{dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])}.
+}
+}
+
 \examples{
 
 ## Only run examples in interactive R sessions

man/verticalLayout.Rd

@@ -31,5 +31,9 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-\code{\link[=fluidPage]{fluidPage()}}, \code{\link[=flowLayout]{flowLayout()}}
+Other layout functions: \code{\link{fillPage}},
+  \code{\link{fixedPage}}, \code{\link{flowLayout}},
+  \code{\link{fluidPage}}, \code{\link{navbarPage}},
+  \code{\link{sidebarLayout}}, \code{\link{splitLayout}}
 }
+\concept{layout functions}

man/withTags.Rd

@@ -34,5 +34,6 @@ withTags(
     p("text")
   )
 )
-}
 
+
+}

srcjs/init_shiny.js

@@ -457,7 +457,7 @@ function initShiny() {
   initialValues['.clientdata_url_hash'] = window.location.hash;
 
   $(window).on('hashchange', function(e) {
-    inputs.setInput('.clientdata_url_hash', location.hash);
+    inputs.setInput('.clientdata_url_hash', window.location.hash);
   });
 
   // The server needs to know what singletons were rendered as part of

srcjs/input_binding_date.js

@@ -139,19 +139,35 @@ $.extend(dateInputBinding, {
       return;
     if (date === null) {
       $(el).bsDatepicker('setStartDate', null);
+      return;
+    }
 
-    } else {
-      date = this._newDate(date);
-      date = this._UTCDateAsLocal(date);
-      if (!isNaN(date)) {
-        // Workaround for https://github.com/eternicode/bootstrap-datepicker/issues/2010
-        // If the start date when there's a two-digit year format, it will set
-        // the date value to null. So we'll save the value, set the start
-        // date, and the restore the value.
-        var curValue = $(el).bsDatepicker('getUTCDate');
-        $(el).bsDatepicker('setStartDate', date);
-        $(el).bsDatepicker('setUTCDate', curValue);
-      }
+    date = this._newDate(date);
+    // If date parsing fails, do nothing
+    if (date === null)
+      return;
+
+    date = this._UTCDateAsLocal(date);
+    if (isNaN(date))
+      return;
+    // Workaround for https://github.com/eternicode/bootstrap-datepicker/issues/2010
+    // If the start date when there's a two-digit year format, it will set
+    // the date value to null. So we'll save the value, set the start
+    // date, and the restore the value.
+    var curValue = $(el).bsDatepicker('getUTCDate');
+    $(el).bsDatepicker('setStartDate', date);
+    $(el).bsDatepicker('setUTCDate', curValue);
+
+    // Workaround for https://github.com/rstudio/shiny/issues/2335
+    // We only set the start date *after* the value in this special
+    // case so we don't effect the intended behavior of having a blank
+    // value when it falls outside the start date
+    if (typeof date.toDateString !== 'function') return;
+    if (typeof curValue.toDateString !== 'function') return;
+    if (date.toDateString() === curValue.toDateString()) {
+      $(el).bsDatepicker('setStartDate', null);
+      $(el).bsDatepicker('setUTCDate', curValue);
+      $(el).bsDatepicker('setStartDate', date);
     }
   },
   // Given an unambiguous date string or a Date object, set the max (end) date
@@ -161,16 +177,30 @@ $.extend(dateInputBinding, {
       return;
     if (date === null) {
       $(el).bsDatepicker('setEndDate', null);
+      return;
+    }
 
-    } else {
-      date = this._newDate(date);
-      date = this._UTCDateAsLocal(date);
-      if (!isNaN(date)) {
-        // Workaround for same issue as in _setMin.
-        var curValue = $(el).bsDatepicker('getUTCDate');
-        $(el).bsDatepicker('setEndDate', date);
-        $(el).bsDatepicker('setUTCDate', curValue);
-      }
+    date = this._newDate(date);
+    // If date parsing fails, do nothing
+    if (date === null)
+      return;
+
+    date = this._UTCDateAsLocal(date);
+    if (isNaN(date))
+      return;
+
+    // Workaround for same issue as in _setMin.
+    var curValue = $(el).bsDatepicker('getUTCDate');
+    $(el).bsDatepicker('setEndDate', date);
+    $(el).bsDatepicker('setUTCDate', curValue);
+
+    // Workaround for same issue as in _setMin.
+    if (typeof date.toDateString !== 'function') return;
+    if (typeof curValue.toDateString !== 'function') return;
+    if (date.toDateString() === curValue.toDateString()) {
+      $(el).bsDatepicker('setEndDate', null);
+      $(el).bsDatepicker('setUTCDate', curValue);
+      $(el).bsDatepicker('setEndDate', date);
     }
   },
   // Given a date string of format yyyy-mm-dd, return a Date object with

srcjs/input_rate.js

@@ -238,7 +238,7 @@ var InputNoResendDecorator = function(target, initialValues) {
       return;
     }
     this.lastSentValues[inputName] = { jsonValue, inputType };
-    this.target.setInput(name, value, opts);
+    this.target.setInput(nameType, value, opts);
   };
   this.reset = function(values = {}) {
     // Given an object with flat name-value format:
@@ -281,7 +281,7 @@ var InputEventDecorator = function(target) {
     $(opts.el).trigger(evt);
 
     if (!evt.isDefaultPrevented()) {
-      name = evt.name;
+      let name = evt.name;
       if (evt.inputType !== '') name += ':' + evt.inputType;
 
       // Most opts aren't passed along to lower levels in the input decorator
@@ -345,13 +345,13 @@ var InputDeferDecorator = function(target) {
     if (/^\./.test(nameType))
       this.target.setInput(nameType, value, opts);
     else
-      this.pendingInput[name] = { value, opts };
+      this.pendingInput[nameType] = { value, opts };
   };
   this.submit = function() {
-    for (var name in this.pendingInput) {
-      if (this.pendingInput.hasOwnProperty(name)) {
-        let input = this.pendingInput[name];
-        this.target.setInput(name, input.value, input.opts);
+    for (var nameType in this.pendingInput) {
+      if (this.pendingInput.hasOwnProperty(nameType)) {
+        let { value, opts } = this.pendingInput[nameType];
+        this.target.setInput(nameType, value, opts);
       }
     }
   };

srcjs/output_binding_image.js

@@ -656,9 +656,7 @@ imageutils.createClickInfo = function($el, dblclickId, dblclickDelay) {
     var e2 = $.Event(newEventType, {
       which:   e.which,
       pageX:   e.pageX,
-      pageY:   e.pageY,
-      offsetX: e.offsetX,
-      offsetY: e.offsetY
+      pageY:   e.pageY
     });
 
     $el.trigger(e2);
@@ -707,8 +705,8 @@ imageutils.createClickInfo = function($el, dblclickId, dblclickDelay) {
       // click. Instead, immediately trigger a mousedown2 for the previous
       // click, and set this click as a new first click.
       if (pending_e &&
-          Math.abs(pending_e.offsetX - e.offsetX) > 2 ||
-          Math.abs(pending_e.offsetY - e.offsetY) > 2) {
+          Math.abs(pending_e.pageX - e.pageX) > 2 ||
+          Math.abs(pending_e.pageY - e.pageY) > 2) {
 
         triggerPendingMousedown2();
         scheduleMousedown2(e);

srcjs/reactlog.js

@@ -9,8 +9,18 @@ $(document).on('keydown', function(e) {
 
 
 $(document).on('keydown', function(e) {
-  if (e.which !== 115 || (!e.ctrlKey && !e.metaKey) || (e.shiftKey || e.altKey))
+  if (
+    // if not one of the key combos below
+    !(
+      // cmd/ctrl + fn + f4
+      (e.which === 115 && (e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey) ||
+      // cmd/ctrl + shift + fn + f3
+      (e.which === 114 && (e.ctrlKey || e.metaKey) && e.shiftKey && !e.altKey)
+    )
+  ) {
     return;
+  }
+
   var url = 'reactlog/mark?w=' + window.escape(exports.shinyapp.config.workerId) +
     "&s=" + window.escape(exports.shinyapp.config.sessionId);
 
@@ -24,6 +34,9 @@ $(document).on('keydown', function(e) {
       html: html,
       closeButton: true,
     });
+  }).fail(function() {
+    // found returned error while marking, should open webpage
+    window.open(url);
   });
 
   e.preventDefault();