Handle a user-supplied NULL/NA for port

.travis.yml

@@ -5,28 +5,26 @@ matrix:
       r: release
       r_packages:
         - devtools
-        - rprojroot
-      script: ./tools/documentation/checkDocsCurrent.sh
-      env:
-        # GITHUB_PAT for gh::gh calls
-        - secure: "Hk4piVNtDobLT1dQPnCOcM7sOlwNGJOU5cpvbRvOxYSgxP+Bj2MyRZMe825rdHkHbFez0h8w3tJOBf9DDBH7PC1BhhNll2+WM/WxGlkNleg8vsoH/Xopffl+2YgtWbAYZjQ2j0QYdgNn0e/TY86/ggk9qit6+gpsZ7z/HmWQuVY="
-
+        - roxygen2
+      script: ./tools/checkDocsCurrent.sh
     - name: "Javascript check"
       language: node_js
       cache: yarn
       script: ./tools/checkJSCurrent.sh
       node_js:
-        - "12"
-    - r: 3.2
-    - r: 3.3
-    - r: 3.4
-    - r: 3.5
-    - r: release
-    - r: devel
-
+        - "10"
+    - name: "Old Release Check"
+      r: oldrel
+    - name: "Current Release Check"
+      r: release
+    - name: "Development Release Check"
+      r: devel
 sudo: false
 cache: packages
 notifications:
   email:
     on_success: change
     on_failure: change
+  slack:
+    secure: QoM0+hliVC4l2HYv126AkljG/uFvgwayW9IpuB5QNqjSukM122MhMDL7ZuMB9a2vWP24juzOTXiNIymgEspfnvvAMnZwYRBNWkuot2m8HIR2B9UjQLiztFnN1EAT+P+thz8Qax9TV2SOfXb2S2ZOeZmRTVkJctxkL8heAZadIC4=
+    on_pull_requests: false

CONTRIBUTING.md

@@ -2,15 +2,13 @@ We welcome contributions to the **shiny** package. To submit a contribution:
 
 1. [Fork](https://github.com/rstudio/shiny/fork) the repository and make your changes.
 
-2. Submit a [pull request](https://help.github.com/articles/using-pull-requests).
+2. Ensure that you have signed the [individual](https://rstudioblog.files.wordpress.com/2017/05/rstudio_individual_contributor_agreement.pdf) or [corporate](https://rstudioblog.files.wordpress.com/2017/05/rstudio_corporate_contributor_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to jj@rstudio.com.
 
-3. Ensure that you have signed the contributor license agreement. It will appear as a "Check"
-   on your PR and a comment from "CLAassistant" will also appear explaining whether you have
-   yet to sign. After you sign, you can click the "Recheck" link in that comment and the check
-   will flip to reflect that you've signed.
+3. Submit a [pull request](https://help.github.com/articles/using-pull-requests).
 
 We generally do not merge pull requests that update included web libraries (such as Bootstrap or jQuery) because it is difficult for us to verify that the update is done correctly; we prefer to update these libraries ourselves.
 
+
 ## How to make changes
 
 Before you submit a pull request, please do the following:

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.4.0.9002
+Version: 1.3.2.9001
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -65,23 +65,20 @@ Depends:
 Imports:
     utils,
     grDevices,
-    httpuv (>= 1.5.2),
+    httpuv (>= 1.5.1.9002),
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
     digest,
-    htmltools (>= 0.4.0.9001),
+    htmltools (>= 0.3.6.9004),
     R6 (>= 2.0),
     sourcetools,
-    later (>= 1.0.0),
-    promises (>= 1.1.0),
+    later (>= 0.7.2),
+    promises (>= 1.0.1),
     tools,
     crayon,
     rlang (>= 0.4.0),
-    fastmap (>= 1.0.0),
-    withr,
-    commonmark (>= 1.7),
-    glue (>= 1.3.2)
+    fastmap (>= 1.0.0)
 Suggests:
     datasets,
     Cairo (>= 1.5-5),
@@ -91,18 +88,14 @@ Suggests:
     rmarkdown,
     ggplot2,
     reactlog (>= 1.0.0),
-    magrittr,
-    shinytest,
-    yaml,
-    future,
-    dygraphs
+    magrittr
 Remotes:
-    rstudio/htmltools
+    rstudio/htmltools,
+    rstudio/httpuv
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
 Collate:
     'app.R'
-    'app_template.R'
     'bookmark-state-local.R'
     'stack.R'
     'bookmark-state.R'
@@ -150,15 +143,12 @@ Collate:
     'jqueryui.R'
     'middleware-shiny.R'
     'middleware.R'
-    'timer.R'
-    'mock-session.R'
     'modal.R'
     'modules.R'
     'notifications.R'
     'priorityqueue.R'
     'progress.R'
     'react.R'
-    'reexports.R'
     'render-cached-plot.R'
     'render-plot.R'
     'render-table.R'
@@ -174,9 +164,8 @@ Collate:
     'snapshot.R'
     'tar.R'
     'test-export.R'
-    'test-server.R'
-    'test.R'
+    'timer.R'
     'update-input.R'
-RoxygenNote: 7.1.0
+RoxygenNote: 6.1.1
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NAMESPACE

@@ -1,18 +1,15 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method("$",mockclientdata)
 S3method("$",reactivevalues)
 S3method("$",session_proxy)
 S3method("$",shinyoutput)
 S3method("$<-",reactivevalues)
 S3method("$<-",session_proxy)
 S3method("$<-",shinyoutput)
-S3method("[",mockclientdata)
 S3method("[",reactivevalues)
 S3method("[",shinyoutput)
 S3method("[<-",reactivevalues)
 S3method("[<-",shinyoutput)
-S3method("[[",mockclientdata)
 S3method("[[",reactivevalues)
 S3method("[[",session_proxy)
 S3method("[[",shinyoutput)
@@ -37,7 +34,6 @@ export("conditionStackTrace<-")
 export(..stacktraceoff..)
 export(..stacktraceon..)
 export(HTML)
-export(MockShinySession)
 export(NS)
 export(Progress)
 export(a)
@@ -88,6 +84,7 @@ export(fileInput)
 export(fillCol)
 export(fillPage)
 export(fillRow)
+export(findPort)
 export(fixedPage)
 export(fixedPanel)
 export(fixedRow)
@@ -142,12 +139,10 @@ export(loadSupport)
 export(mainPanel)
 export(makeReactiveBinding)
 export(markRenderFunction)
-export(markdown)
 export(maskReactiveContext)
 export(memoryCache)
 export(modalButton)
 export(modalDialog)
-export(moduleServer)
 export(navbarMenu)
 export(navbarPage)
 export(navlistPanel)
@@ -218,7 +213,6 @@ export(runExample)
 export(runGadget)
 export(runGist)
 export(runGitHub)
-export(runTests)
 export(runUrl)
 export(safeError)
 export(selectInput)
@@ -230,7 +224,6 @@ export(setSerializer)
 export(shinyApp)
 export(shinyAppDir)
 export(shinyAppFile)
-export(shinyAppTemplate)
 export(shinyOptions)
 export(shinyServer)
 export(shinyUI)
@@ -265,7 +258,6 @@ export(tagHasAttribute)
 export(tagList)
 export(tagSetChildren)
 export(tags)
-export(testServer)
 export(textAreaInput)
 export(textInput)
 export(textOutput)
@@ -315,43 +307,3 @@ importFrom(fastmap,is.key_missing)
 importFrom(fastmap,key_missing)
 importFrom(grDevices,dev.cur)
 importFrom(grDevices,dev.set)
-importFrom(htmltools,HTML)
-importFrom(htmltools,a)
-importFrom(htmltools,br)
-importFrom(htmltools,code)
-importFrom(htmltools,div)
-importFrom(htmltools,em)
-importFrom(htmltools,h1)
-importFrom(htmltools,h2)
-importFrom(htmltools,h3)
-importFrom(htmltools,h4)
-importFrom(htmltools,h5)
-importFrom(htmltools,h6)
-importFrom(htmltools,hr)
-importFrom(htmltools,htmlTemplate)
-importFrom(htmltools,img)
-importFrom(htmltools,includeCSS)
-importFrom(htmltools,includeHTML)
-importFrom(htmltools,includeMarkdown)
-importFrom(htmltools,includeScript)
-importFrom(htmltools,includeText)
-importFrom(htmltools,is.singleton)
-importFrom(htmltools,p)
-importFrom(htmltools,pre)
-importFrom(htmltools,singleton)
-importFrom(htmltools,span)
-importFrom(htmltools,strong)
-importFrom(htmltools,suppressDependencies)
-importFrom(htmltools,tag)
-importFrom(htmltools,tagAppendAttributes)
-importFrom(htmltools,tagAppendChild)
-importFrom(htmltools,tagAppendChildren)
-importFrom(htmltools,tagGetAttribute)
-importFrom(htmltools,tagHasAttribute)
-importFrom(htmltools,tagList)
-importFrom(htmltools,tagSetChildren)
-importFrom(htmltools,tags)
-importFrom(htmltools,validateCssUnit)
-importFrom(htmltools,withTags)
-importFrom(promises,"%...!%")
-importFrom(promises,"%...>%")

NEWS.md

@@ -1,96 +1,41 @@
-shiny 1.4.0.9001
-===========
+shiny 1.3.2.9001
+=======
 
-## Full changelog
-
-### Breaking changes
-
-### New features
-
-* `runTests()` is a new function that behaves much like R CMD check. `runTests()` invokes all of the top-level R files in the tests/ directory inside an application, in that application's environment. ([#2585](https://github.com/rstudio/shiny/pull/2585))
-
-* `testServer()` and `testModule()` are two new functions for testing reactive behavior inside server functions and modules, respectively. ([#2682](https://github.com/rstudio/shiny/pull/2682), [#2764](https://github.com/rstudio/shiny/pull/2764))
-
-* The new `moduleServer` function provides a simpler interface for creating and using modules. ([#2773](https://github.com/rstudio/shiny/pull/2773))
-
-* Resolved [#2732](https://github.com/rstudio/shiny/issues/2732): `markdown()` is a new function for writing Markdown with Github extensions directly in Shiny UIs. Markdown rendering is performed by the [commonmark](https://github.com/jeroen/commonmark) package. ([#2737](https://github.com/rstudio/shiny/pull/2737))
-
-### Minor new features and improvements
-
-* Fixed [#2042](https://github.com/rstudio/shiny/issues/2042), [#2628](https://github.com/rstudio/shiny/issues/2628): In a `dateInput` and `dateRangeInput`, disabled months and years are now a lighter gray, to make it easier to see that they are disabled. ([#2690](https://github.com/rstudio/shiny/pull/2690))
-
-* `getCurrentOutputInfo()` previously threw an error when called from outside of an output; now it returns `NULL`. ([#2707](https://github.com/rstudio/shiny/pull/2707))
-
-* Added a label to observer that auto-reloads `R/` directory to avoid confusion when using `reactlog`. ([#58](https://github.com/rstudio/reactlog/issues/58))
-
-* `getDefaultReactiveDomain()` can now be called inside a `session$onSessionEnded` callback and will return the calling `session` information. ([#2757](https://github.com/rstudio/shiny/pull/2757))
-
-* Added a `'function'` class to `reactive()` and `reactiveVal()` objects. ([#2793](https://github.com/rstudio/shiny/pull/2793))
-
-### Bug fixes
-
-* Fixed [#2606](https://github.com/rstudio/shiny/issues/2606): `debounce()` would not work properly if the code in the reactive expression threw an error on the first run. ([#2652](https://github.com/rstudio/shiny/pull/2652))
-
-* Fixed [#2653](https://github.com/rstudio/shiny/issues/2653): The `dataTableOutput()` could have incorrect output if certain characters were in the column names. ([#2658](https://github.com/rstudio/shiny/pull/2658))
-
-### Documentation Updates
-
-
-shiny 1.4.0.2
-===========
-
-Minor patch release: fixed some timing-dependent tests failed intermittently on CRAN build machines.
-
-
-shiny 1.4.0.1
-===========
-
-Minor patch release to account for changes to the grid package that will be upcoming in the R 4.0 release ([#2776](https://github.com/rstudio/shiny/pull/2776)).
-
-
-shiny 1.4.0
-===========
-
-## Full changelog
-
-### 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
+## Changes
 
 * 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))
 
+### Improvements
+
 * 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))
 
-* 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 [#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 [#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))
 
-* 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))
+* 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 [#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))
 
+### Bug fixes
+
+* 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))
+
 * 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))
@@ -111,13 +56,17 @@ shiny 1.4.0
 
 * 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
 ===========
 
 ### Bug fixes
 
-* Fixed [#2385](https://github.com/rstudio/shiny/issues/2385): Static CSS/JS resources in subapps in R Markdown documents did not render properly. ([#2386](https://github.com/rstudio/shiny/pull/2386))
+* Fixed [#2285](https://github.com/rstudio/shiny/issues/2285), [#2288](https://github.com/rstudio/shiny/issues/2288): Static CSS/JS resources in subapps in R Markdown documents did not render properly. ([#2386](https://github.com/rstudio/shiny/pull/2386))
 
 * Fixed [#2280](https://github.com/rstudio/shiny/issues/2280): Shiny applications that used a www/index.html file did not serve up the index file. ([#2382](https://github.com/rstudio/shiny/pull/2382))
 
@@ -681,7 +630,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/reactlog.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/showReactLog.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

@@ -13,10 +13,7 @@
 #' object to `print()` or [runApp()].
 #'
 #' @param ui The UI definition of the app (for example, a call to
-#'   `fluidPage()` with nested controls).
-#'
-#'    If bookmarking is enabled (see `enableBookmarking`), this must be
-#'    a single argument function that returns the UI definition.
+#'   `fluidPage()` with nested controls)
 #' @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.
@@ -33,9 +30,11 @@
 #'   request. Note that the entire request path must match the regular
 #'   expression in order for the match to be considered successful.
 #' @param enableBookmarking Can be one of `"url"`, `"server"`, or
-#'   `"disable"`. The default value, `NULL`, will respect the setting from
-#'   any previous calls to  [enableBookmarking()]. See [enableBookmarking()]
-#'   for more information on bookmarking your app.
+#'   `"disable"`. This is equivalent to calling the
+#'   [enableBookmarking()] function just before calling
+#'   `shinyApp()`. With the default value (`NULL`), the app will
+#'   respect the setting from any previous calls to `enableBookmarking()`.
+#'   See [enableBookmarking()] for more information.
 #' @return An object that represents the app. Printing the object or passing it
 #'   to [runApp()] will run the app.
 #'
@@ -147,13 +146,15 @@ 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.
-  if (getOption("shiny.autoload.r", TRUE)) {
+  # 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
+    # old behavior, default
     sharedEnv <- globalenv()
   }
 
@@ -229,7 +230,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
     setwd(appDir)
     monitorHandle <<- initAutoReloadMonitor(appDir)
     # TODO: we should support hot reloading on global.R and R/*.R changes.
-    if (getOption("shiny.autoload.r", TRUE)) {
+    if (getOption("shiny.autoload.r", FALSE)) {
       loadSupport(appDir, renv=sharedEnv, globalrenv=globalenv())
     }  else {
       if (file.exists(file.path.ci(appDir, "global.R")))
@@ -284,8 +285,7 @@ initAutoReloadMonitor <- function(dir) {
     ".*\\.(r|html?|js|css|png|jpe?g|gif)$")
 
   lastValue <- NULL
-  observeLabel <- paste0("File Auto-Reload - '", basename(dir), "'")
-  obs <- observe(label = observeLabel, {
+  obs <- observe({
     files <- sort(list.files(dir, pattern = filePattern, recursive = TRUE,
       ignore.case = TRUE))
     times <- file.info(files)$mtime
@@ -314,13 +314,8 @@ initAutoReloadMonitor <- function(dir) {
 #' this function loads any top-level supporting `.R` files in the `R/` directory
 #' adjacent to the `app.R`/`server.R`/`ui.R` files.
 #'
-#' Since Shiny 1.5.0, this function is called by default when running an
-#' application. If it causes problems, there are two ways to opt out. You can
-#' either place a file named `_disable_autoload.R` in your R/ directory, or
-#' set `options(shiny.autoload.r=FALSE)`. If you set this option, it will
-#' affect any application that runs later in the same R session, potentially
-#' breaking it, so after running your application, you should unset option with
-#' `options(shiny.autoload.r=NULL)`
+#' 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
@@ -340,21 +335,8 @@ loadSupport <- function(appDir, renv=new.env(parent=globalenv()), globalrenv=glo
   }
 
   helpersDir <- file.path(appDir, "R")
-
-  disabled <- list.files(helpersDir, pattern="^_disable_autoload\\.r$", recursive=FALSE, ignore.case=TRUE)
-  if (length(disabled) > 0){
-    message("R/_disable_autoload.R detected; not loading the R/ directory automatically")
-    return(invisible(renv))
-  }
-
   helpers <- list.files(helpersDir, pattern="\\.[rR]$", recursive=FALSE, full.names=TRUE)
 
-  if (length(helpers) > 0){
-    message("Automatically loading ", length(helpers), " .R file",
-            ifelse(length(helpers) != 1, "s", ""),
-            " found in the R/ directory.\nSee https://rstd.io/shiny-autoload for more info.")
-  }
-
   lapply(helpers, sourceUTF8, envir=renv)
 
   invisible(renv)
@@ -367,12 +349,15 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
 {
   fullpath <- file.path.ci(appDir, fileName)
 
-  # In an upcoming version of shiny, this option will go away.
-  if (getOption("shiny.autoload.r", TRUE)) {
+  # 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()
   }
 
@@ -426,7 +411,7 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
     oldwd <<- getwd()
     setwd(appDir)
     # TODO: we should support hot reloading on R/*.R changes.
-    if (getOption("shiny.autoload.r", TRUE)) {
+    if (getOption("shiny.autoload.r", FALSE)) {
       loadSupport(appDir, renv=sharedEnv, globalrenv=NULL)
     }
     monitorHandle <<- initAutoReloadMonitor(appDir)

R/app_template.R

@@ -1,230 +0,0 @@
-#' Generate a Shiny application from a template
-#'
-#' This function populates a directory with files for a Shiny application.
-#'
-#' In an interactive R session, this function will, by default, prompt the user
-#' which components to add to the application.
-#'
-#' The full example application includes the following files and directories:
-#'
-#' ```
-#' appdir/
-#' |- app.R
-#' |- R
-#' |   |- my-module.R
-#' |   |-- sort.R
-#' `-- tests
-#'     |- server.R
-#'     |- server
-#'     |   |- test-mymodule.R
-#'     |   `- test-server.R
-#'     |- shinytest.R
-#'     |- shinytest
-#'     |   `- mytest.R
-#'     |- testthat.R
-#'     `-- testthat
-#'         |- helper-load.R
-#'         `- test-sort.R
-#' ```
-#'
-#' Some notes about these files:
-#' * `app.R` is the main application file.
-#' * All files in the `R/` subdirectory are automatically sourced when the
-#'   application is run.
-#' * `R/sort.R` and `R/my-module.R` are automatically sourced when
-#'   the application is run. The first contains a function `lexical_sort()`,
-#'   and the second contains code for a [Shiny module](moduleServer()) which
-#'   is used in the application.
-#' * `tests/` contains various tests for the application. You may
-#'   choose to use or remove any of them. They can be executed by the
-#'   [runTests()] function.
-#' * `tests/server.R` is a test runner for test files in
-#'   `tests/server/`.
-#' * `tests/server/test-mymodule.R` is a test for the module.
-#' * `tests/shinytest.R` is a test runner for test files in the
-#'   `tests/shinytest/` directory.
-#' * `tests/shinytest/mytest.R` is a test that uses the
-#'   [shinytest](https://rstudio.github.io/shinytest/) package to do
-#'   snapshot-based testing.
-#' * `tests/testthat.R` is a test runner for test files in the
-#'   `tests/testthat/` directory.
-#' * `tests/testthat/helper-load.R` is a helper script that is automatically
-#'   loaded before running `test-mymodule.`R. (This is performed by the testthat
-#'   package.)
-#' * `tests/testthat/test-sort.R` is a set of tests that use the
-#'   [testthat](https://testthat.r-lib.org/) package for testing.
-#'
-#' @param path Path to create new shiny application template.
-#' @param examples Either one of "default", "ask", "all", or any combination of
-#'   "app", "rdir", "module", "shinytest", "testthat", and "server". In an
-#'   interactive session, "default" falls back to "ask"; in a non-interactive
-#'   session, "default" falls back to "all". With "ask", this function will
-#'   prompt the user to select which template items will be added to the new app
-#'   directory. With "all", all template items will be added to the app
-#'   directory.
-#'
-#' @export
-shinyAppTemplate <- function(path = NULL, examples = "default")
-{
-  if (is.null(path)) {
-    stop("Please provide a `path`.")
-  }
-
-  choices <- c(
-    app       = "app.R            : Main application file",
-    rdir      = "R/sort.R         : Helper file with R code",
-    module    = "R/my-module.R    : Example module",
-    shinytest = "tests/shinytest/ : Tests using shinytest package",
-    testthat  = "tests/testthat/  : Tests using testthat",
-    server    = "tests/server/    : Tests of server and module code"
-  )
-
-  if (identical(examples, "default")) {
-    if (interactive()) {
-      examples <- "ask"
-    } else {
-      examples <- "all"
-    }
-  }
-
-  if (!identical(examples, "ask") &&
-      !identical(examples, "all") &&
-      any(! examples %in% names(choices)))
-  {
-    stop('`examples` must be one of "default", "ask", "all", or any combination of "',
-      paste(names(choices), collapse = '", "'), '".')
-  }
-
-  if (identical(examples, "ask")) {
-    response <- select_menu(
-      c(all = "All", choices),
-      title = paste0(
-        "Select which of the following to add at ", path, "/ :"
-      ),
-      msg = "Enter one or more numbers (with spaces), or an empty line to exit: \n"
-    )
-
-    examples <- names(response)
-  }
-
-  examples <- unique(examples)
-
-  if ("all" %in% examples) {
-    examples <- names(choices)
-  }
-
-  if (length(examples) == 0) {
-    return(invisible())
-  }
-
-  # Check if a directory is empty, ignoring certain files
-  dir_is_empty <- function(path) {
-    files <- list.files(path, all.files = TRUE, no.. = TRUE)
-    # Ignore .DS_Store files, which are sometimes automatically created on macOS
-    files <- setdiff(files, ".DS_Store")
-    return(length(files) != 0)
-  }
-
-  # Helper to resolve paths relative to our example
-  example_path <- function(path) {
-    system.file("app_template", path, package = "shiny")
-  }
-
-  # Copy the files for a tests/ subdirectory
-  copy_test_dir <- function(name, with_rdir, with_module) {
-    tests_dir <- file.path(path, "tests")
-    dir.create(tests_dir, showWarnings = FALSE, recursive = TRUE)
-
-    files <- dir(example_path("tests"), recursive = TRUE)
-    # Note: This is not the same as using dir(pattern = "^shinytest"), since
-    # that will not match files inside of shinytest/.
-    files <- files[grepl(paste0("^", name), files)]
-
-    # Filter out files related to R/sort.R, if applicable.
-    if (!with_rdir) {
-      files <- files[!grepl("utils", files)]
-    }
-
-    # Filter out module files, if applicable.
-    if (!with_module) {
-      files <- files[!grepl("module", files)]
-    }
-
-    # Create any subdirectories if needed
-    dirs <- setdiff(unique(dirname(files)), ".")
-    for (dir in dirs) {
-      dir.create(file.path(tests_dir, dir), showWarnings = FALSE, recursive = TRUE)
-    }
-
-    file.copy(
-      file.path(example_path("tests"), files),
-      file.path(path, "tests", files)
-    )
-  }
-
-
-  if (is.null(path)) {
-    stop("`path` is missing.")
-  }
-  if (file.exists(path) && !dir.exists(path)) {
-    stop(path, " exists but is not a directory.")
-  }
-
-  if (dir.exists(path) && dir_is_empty(path)) {
-    if (interactive()) {
-      response <- readline(paste0(
-        ensure_trailing_slash(path),
-        " is not empty. Do you want to create a Shiny app in this directory anyway? [y/n] "
-      ))
-      if (tolower(response) != "y") {
-        return(invisible())
-      }
-    }
-  } else {
-    dir.create(path)
-  }
-
-  # app.R - If "app", populate with example; otherwise use empty file.
-  app_file <- file.path(path, "app.R")
-  if ("app" %in% examples) {
-    if (file.exists(app_file)) {
-      message("Not writing ", app_file, "because file already exists.")
-
-    } else {
-      writeChar(
-        as.character(htmlTemplate(
-          example_path("app.R"),
-          rdir = "rdir" %in% examples,
-          module = "module" %in% examples
-        )),
-        con = app_file,
-        eos = NULL
-      )
-    }
-  }
-
-  # R/ dir with utils and/or module
-  r_dir <- file.path(path, "R")
-  if ("rdir" %in% examples) {
-    dir.create(r_dir, showWarnings = FALSE, recursive = TRUE)
-    file.copy(example_path("R/sort.R"), r_dir, recursive = TRUE)
-  }
-  if ("module" %in% examples) {
-    dir.create(r_dir, showWarnings = FALSE, recursive = TRUE)
-    file.copy(example_path("R/my-module.R"), r_dir, recursive = TRUE)
-  }
-
-  # tests/ dir
-  if ("shinytest" %in% examples) {
-    copy_test_dir("shinytest", "rdir" %in% examples, "module" %in% examples)
-  }
-  if ("testthat" %in% examples) {
-    copy_test_dir("testthat", "rdir" %in% examples, "module" %in% examples)
-  }
-  if ("server" %in% examples) {
-    copy_test_dir("server", "rdir" %in% examples, "module" %in% examples)
-  }
-  if ("app" %in% examples) {
-    message("Shiny application created at ", ensure_trailing_slash(path))
-  }
-}

R/bootstrap-layout.R

@@ -28,8 +28,7 @@
 #'   Shiny-Application-Layout-Guide](http://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fluid
 #'   pages.
 #'
-#' @family layout functions
-#' @seealso [column()]
+#' @seealso [column()], [sidebarLayout()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -131,8 +130,6 @@ 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
@@ -231,12 +228,8 @@ column <- function(width, ..., offset = 0) {
     stop("column width must be between 1 and 12")
 
   colClass <- paste0("col-sm-", width)
-  if (offset > 0) {
-    # offset-md-x is for bootstrap 4 forward compat
-    # (every size tier has been bumped up one level)
-    # https://github.com/twbs/bootstrap/blob/74b8fe7/docs/4.3/migration/index.html#L659
-    colClass <- paste0(colClass, " offset-md-", offset, " col-sm-offset-", offset)
-  }
+  if (offset > 0)
+    colClass <- paste0(colClass, " col-sm-offset-", offset)
   div(class = colClass, ...)
 }
 
@@ -250,6 +243,7 @@ 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()) {
@@ -285,8 +279,6 @@ titlePanel <- function(title, windowTitle=title) {
 #'   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
 #' if (interactive()) {
@@ -377,7 +369,7 @@ mainPanel <- function(..., width = 8) {
 #' @param fluid `TRUE` to use fluid layout; `FALSE` to use fixed
 #'   layout.
 #'
-#' @family layout functions
+#' @seealso [fluidPage()], [flowLayout()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -415,7 +407,7 @@ verticalLayout <- function(..., fluid = TRUE) {
 #' @param cellArgs Any additional attributes that should be used for each cell
 #'   of the layout.
 #'
-#' @family layout functions
+#' @seealso [verticalLayout()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -471,8 +463,6 @@ 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()) {
@@ -570,7 +560,7 @@ splitLayout <- function(..., cellWidths = NULL, cellArgs = list()) {
 #' @param flex Determines how space should be distributed to the cells. Can be a
 #'   single value like `1` or `2` to evenly distribute the available
 #'   space; or use a vector of numbers to specify the proportions. For example,
-#'   `flex = c(2, 3)` would cause the space to be split 40%/60% between
+#'   `flex = c(2, 3)` would cause the space to be split 40\%/60\% between
 #'   two cells. NA values will cause the corresponding cell to be sized
 #'   according to its contents (without growing or shrinking).
 #' @param width,height The total amount of width and height to use for the

R/bootstrap.R

@@ -103,7 +103,7 @@ basicPage <- function(...) {
 #' *automatic* height; that is, they determine their own height based on
 #' the height of their contained elements. However,
 #' `fillPage(plotOutput("plot", height = "100%"))` will work because
-#' `fillPage` fixes the `<body>` height at 100% of the window height.
+#' `fillPage` fixes the `<body>` height at 100\% of the window height.
 #'
 #' Note that `fillPage(plotOutput("plot"))` will not cause the plot to fill
 #' the page. Like most Shiny output widgets, `plotOutput`'s default height
@@ -130,8 +130,6 @@ 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",
@@ -235,8 +233,6 @@ collapseSizes <- function(padding) {
 #'   [updateNavbarPage()], [insertTab()],
 #'   [showTab()]
 #'
-#' @family layout functions
-#'
 #' @examples
 #' navbarPage("App Title",
 #'   tabPanel("Plot"),
@@ -793,43 +789,50 @@ buildTabItem <- function(index, tabsetId, foundSelected, tabs = NULL,
 
 #' Create a text output element
 #'
-#' Render a reactive output variable as text within an application page.
-#' `textOutput()` is usually paired with [renderText()] and puts regular text
-#' in `<div>` or `<span>`; `verbatimTextOutput()` is usually paired with
-#' [renderPrint()] and provudes fixed-width text in a `<pre>`.
-#'
-#' In both funtions, text is HTML-escaped prior to rendering.
-#'
+#' Render a reactive output variable as text within an application page. The
+#' text will be included within an HTML `div` tag by default.
 #' @param outputId output variable to read the value from
 #' @param container a function to generate an HTML element to contain the text
 #' @param inline use an inline (`span()`) or block container (`div()`)
 #'   for the output
-#' @return A output element for use in UI.
+#' @return A text output element that can be included in a panel
+#' @details Text is HTML-escaped prior to rendering. This element is often used
+#'   to display [renderText] output variables.
+#' @examples
+#' h3(textOutput("caption"))
+#' @export
+textOutput <- function(outputId, container = if (inline) span else div, inline = FALSE) {
+  container(id = outputId, class = "shiny-text-output")
+}
+
+#' Create a verbatim text output element
+#'
+#' Render a reactive output variable as verbatim text within an
+#' application page. The text will be included within an HTML `pre` tag.
+#' @param outputId output variable to read the value from
+#' @param placeholder if the output is empty or `NULL`, should an empty
+#'   rectangle be displayed to serve as a placeholder? (does not affect
+#'   behavior when the the output in nonempty)
+#' @return A verbatim text output element that can be included in a panel
+#' @details Text is HTML-escaped prior to rendering. This element is often used
+#'   with the [renderPrint] function to preserve fixed-width formatting
+#'   of printed objects.
 #' @examples
 #' ## Only run this example in interactive R sessions
 #' if (interactive()) {
 #'   shinyApp(
 #'     ui = basicPage(
 #'       textInput("txt", "Enter the text to display below:"),
-#'       textOutput("text"),
-#'       verbatimTextOutput("verb")
+#'       verbatimTextOutput("default"),
+#'       verbatimTextOutput("placeholder", placeholder = TRUE)
 #'     ),
 #'     server = function(input, output) {
-#'       output$text <- renderText({ input$txt })
-#'       output$verb <- renderText({ input$txt })
+#'       output$default <- renderText({ input$txt })
+#'       output$placeholder <- renderText({ input$txt })
 #'     }
 #'   )
 #' }
 #' @export
-textOutput <- function(outputId, container = if (inline) span else div, inline = FALSE) {
-  container(id = outputId, class = "shiny-text-output")
-}
-
-#' @param placeholder if the output is empty or `NULL`, should an empty
-#'   rectangle be displayed to serve as a placeholder? (does not affect
-#'   behavior when the the output in nonempty)
-#' @export
-#' @rdname textOutput
 verbatimTextOutput <- function(outputId, placeholder = FALSE) {
   pre(id = outputId,
       class = paste(c("shiny-text-output", if (!placeholder) "noplaceholder"),

R/cache-utils.R

@@ -1,3 +1,11 @@
+#' @importFrom fastmap key_missing
+#' @export
+fastmap::key_missing
+
+#' @importFrom fastmap is.key_missing
+#' @export
+fastmap::is.key_missing
+
 
 validate_key <- function(key) {
   if (!is.character(key) || length(key) != 1 || nchar(key) == 0) {
@@ -7,3 +15,4 @@ validate_key <- function(key) {
     stop("Invalid key: ", key, ". Only lowercase letters and numbers are allowed.")
   }
 }
+

R/globals.R

@@ -16,9 +16,7 @@ register_s3_method <- function(pkg, generic, class, fun = NULL) {
     registerS3method(generic, class, fun, envir = asNamespace(pkg))
   }
 
-  # Always register hook in case pkg is loaded at some
-  # point the future (or, potentially, but less commonly,
-  # unloaded & reloaded)
+  # Always register hook in case package is later unloaded & reloaded
   setHook(
     packageEvent(pkg, "onLoad"),
     function(...) {
@@ -27,37 +25,6 @@ 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
@@ -69,10 +36,18 @@ register_upgrade_message <- function(pkg, version) {
   register_s3_method("knitr", "knit_print", "reactive")
   register_s3_method("knitr", "knit_print", "shiny.appobj")
   register_s3_method("knitr", "knit_print", "shiny.render.function")
-
-  # 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)
+}
+
+.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."
+    )
+  }
 }

R/input-action.R

@@ -16,7 +16,7 @@
 #'
 #' ui <- fluidPage(
 #'   sliderInput("obs", "Number of observations", 0, 1000, 500),
-#'   actionButton("goButton", "Go!", class = "btn-success"),
+#'   actionButton("goButton", "Go!"),
 #'   plotOutput("distPlot")
 #' )
 #'
@@ -36,18 +36,7 @@
 #'
 #' }
 #'
-#' ## Example of adding extra class values
-#' actionButton("largeButton", "Large Primary Button", class = "btn-primary btn-lg")
-#' actionLink("infoLink", "Information Link", class = "btn-info")
-#'
 #' @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,10 +22,6 @@
 #' }
 #' 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,9 +67,6 @@
 #'
 #' 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,10 +86,6 @@
 #'
 #' 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,10 +70,6 @@
 #'
 #' 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",
@@ -96,9 +92,9 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
 
       shinyInputLabel(inputId, label),
       # input-daterange class is needed for dropdown behavior
-      div(class = "input-daterange input-group input-group-sm",
+      div(class = "input-daterange input-group",
         tags$input(
-          class = "form-control",
+          class = "input-sm form-control",
           type = "text",
           `data-date-language` = language,
           `data-date-week-start` = weekstart,
@@ -109,14 +105,9 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
           `data-initial-date` = start,
           `data-date-autoclose` = if (autoclose) "true" else "false"
         ),
-        # input-group-prepend and input-group-append are for bootstrap 4 forward compat
-        span(class = "input-group-addon input-group-prepend input-group-append",
-          span(class = "input-group-text",
-            separator
-          )
-        ),
+        span(class = "input-group-addon", separator),
         tags$input(
-          class = "form-control",
+          class = "input-sm form-control",
           type = "text",
           `data-date-language` = language,
           `data-date-week-start` = weekstart,

R/input-file.R

@@ -3,60 +3,8 @@
 #' 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. See the `Server value` section.
-#'
-#' @family input elements
-#'
-#' @inheritParams textInput
-#' @param multiple Whether the user should be allowed to select and upload
-#'   multiple files at once. **Does not work on older browsers, including
-#'   Internet Explorer 9 and earlier.**
-#' @param accept A character vector of "unique file type specifiers" which
-#'   gives the browser a hint as to the type of file the server expects.
-#'   Many browsers use this prevent the user from selecting an invalid file.
-#'
-#'   A unique file type specifier can be:
-#'   * A case insensitive extension like `.csv` or `.rds`.
-#'   * A valid MIME type, like `text/plain` or `application/pdf`
-#'   * One of `audio/*`, `video/*`, or `image/*` meaning any audio, video,
-#'     or image type, respectively.
-#' @param buttonLabel The label used on the button. Can be text or an HTML tag
-#'   object.
-#' @param placeholder The text to show before a file has been uploaded.
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fluidPage(
-#'   sidebarLayout(
-#'     sidebarPanel(
-#'       fileInput("file1", "Choose CSV File", accept = ".csv"),
-#'       checkboxInput("header", "Header", TRUE)
-#'     ),
-#'     mainPanel(
-#'       tableOutput("contents")
-#'     )
-#'   )
-#' )
-#'
-#' server <- function(input, output) {
-#'   output$contents <- renderTable({
-#'     file <- input$file1
-#'     ext <- tools::file_ext(file$datapath)
-#'
-#'     req(file)
-#'     validate(need(ext == "csv", "Please upload a csv file"))
-#'
-#'     read.csv(file$datapath, header = input$header)
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#' }
-#'
-#' @section Server value:
-#' A `data.frame` that contains one row for each selected file, and following columns:
+#' 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
@@ -71,6 +19,58 @@
 #'   operation.}
 #' }
 #'
+#' @family input elements
+#'
+#' @inheritParams textInput
+#' @param multiple Whether the user should be allowed to select and upload
+#'   multiple files at once. **Does not work on older browsers, including
+#'   Internet Explorer 9 and earlier.**
+#' @param accept A character vector of MIME types; gives the browser a hint of
+#'   what kind of files the server is expecting.
+#' @param buttonLabel The label used on the button. Can be text or an HTML tag
+#'   object.
+#' @param placeholder The text to show before a file has been uploaded.
+#'
+#' @examples
+#' ## Only run examples in interactive R sessions
+#' if (interactive()) {
+#'
+#' ui <- fluidPage(
+#'   sidebarLayout(
+#'     sidebarPanel(
+#'       fileInput("file1", "Choose CSV File",
+#'         accept = c(
+#'           "text/csv",
+#'           "text/comma-separated-values,text/plain",
+#'           ".csv")
+#'         ),
+#'       tags$hr(),
+#'       checkboxInput("header", "Header", TRUE)
+#'     ),
+#'     mainPanel(
+#'       tableOutput("contents")
+#'     )
+#'   )
+#' )
+#'
+#' server <- function(input, output) {
+#'   output$contents <- renderTable({
+#'     # input$file1 will be NULL initially. After the user selects
+#'     # and uploads a file, it will be a data frame with 'name',
+#'     # 'size', 'type', and 'datapath' columns. The 'datapath'
+#'     # column will contain the local filenames where the data can
+#'     # be found.
+#'     inFile <- input$file1
+#'
+#'     if (is.null(inFile))
+#'       return(NULL)
+#'
+#'     read.csv(inFile$datapath, header = input$header)
+#'   })
+#' }
+#'
+#' shinyApp(ui, server)
+#' }
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
   width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {
@@ -106,8 +106,7 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
     shinyInputLabel(inputId, label),
 
     div(class = "input-group",
-      # input-group-prepend is for bootstrap 4 compat
-      tags$label(class = "input-group-btn input-group-prepend",
+      tags$label(class = "input-group-btn",
         span(class = "btn btn-default btn-file",
           buttonLabel,
           inputTag
@@ -120,7 +119,7 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
 
     tags$div(
       id=paste(inputId, "_progress", sep=""),
-      class="progress active shiny-file-input-progress",
+      class="progress progress-striped active shiny-file-input-progress",
       tags$div(class="progress-bar")
     )
   )

R/input-numeric.R

@@ -24,10 +24,6 @@
 #' }
 #' 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,10 +8,6 @@
 #' @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,10 +80,6 @@
 #'
 #' 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,32 +3,33 @@
 #' 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
@@ -71,11 +72,6 @@
 #'   }
 #' )
 #' }
-#'
-#' @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,
@@ -229,6 +225,18 @@ 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
@@ -241,19 +249,6 @@ 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,10 +70,6 @@
 #' # 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,11 +28,6 @@
 #' }
 #' 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,11 +35,6 @@
 #' 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,10 +92,7 @@ generateOptions <- function(inputId, selected, inline, type = 'checkbox',
 
 # True when a choice list item represents a group of related inputs.
 isGroup <- function(choice) {
-  is.list(choice) ||
-    !is.null(names(choice)) ||
-    length(choice) > 1 ||
-    length(choice) == 0
+  length(choice) > 1 || !is.null(names(choice))
 }
 
 # True when choices is a list and contains at least one group of related inputs.
@@ -134,10 +131,6 @@ 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/insert-ui.R

@@ -1,54 +1,55 @@
-#' Insert and remove UI objects
+#' Insert UI objects
 #'
-#' These functions allow you to dynamically add and remove arbirary UI
-#' into your app, whenever you want, as many times as you want.
-#' Unlike [renderUI()], the UI generated with `insertUI()` is persistent:
-#' once it's created, it stays there until removed by `removeUI()`. Each
-#' new call to `insertUI()` creates more UI objects, in addition to
+#' Insert a UI object into the app.
+#'
+#' This function allows you to dynamically add an arbitrarily large UI
+#' object into your app, whenever you want, as many times as you want.
+#' Unlike [renderUI()], the UI generated with `insertUI`
+#' is not updatable as a whole: once it's created, it stays there. Each
+#' new call to `insertUI` creates more UI objects, in addition to
 #' the ones already there (all independent from one another). To
 #' update a part of the UI (ex: an input object), you must use the
 #' appropriate `render` function or a customized `reactive`
-#' function.
+#' function. To remove any part of your UI, use [removeUI()].
 #'
-#' It's particularly useful to pair `removeUI` with `insertUI()`, but there is
-#' no restriction on what you can use on. Any element that can be selected
-#' through a jQuery selector can be removed through this function.
+#' @param selector A string that is accepted by jQuery's selector (i.e. the
+#' string `s` to be placed in a `$(s)` jQuery call). This selector
+#' will determine the element(s) relative to which you want to insert your
+#' UI object.
 #'
-#' @param selector A string that is accepted by jQuery's selector
-#'   (i.e. the string `s` to be placed in a `$(s)` jQuery call).
-#'
-#'   For `insertUI()` this determines the element(s) relative to which you
-#'   want to insert your UI object. For `removeUI()` this determine the
-#'   element(s) to be removed. If you want to remove a Shiny input or output,
-#'   note that many of these are wrapped in `<div>`s, so you may need to use a
-#'   somewhat complex selector --- see the Examples below. (Alternatively, you
-#'   could also wrap the inputs/outputs that you want to be able to remove
-#'   easily in a `<div>` with an id.)
 #' @param where Where your UI object should go relative to the selector:
-#'   \describe{
-#'     \item{`beforeBegin`}{Before the selector element itself}
-#'     \item{`afterBegin`}{Just inside the selector element, before its
-#'     first child}
-#'     \item{`beforeEnd`}{Just inside the selector element, after its
-#'     last child (default)}
-#'     \item{`afterEnd`}{After the selector element itself}
-#'   }
-#'   Adapted from <https://developer.mozilla.org/en-US/docs/Web/API/Element/insertAdjacentHTML>.
+#' \describe{
+#'   \item{`beforeBegin`}{Before the selector element itself}
+#'   \item{`afterBegin`}{Just inside the selector element, before its
+#'   first child}
+#'   \item{`beforeEnd`}{Just inside the selector element, after its
+#'   last child (default)}
+#'   \item{`afterEnd`}{After the selector element itself}
+#' }
+#' Adapted from
+#' [here](https://developer.mozilla.org/en-US/docs/Web/API/Element/insertAdjacentHTML).
+#'
 #' @param ui The UI object you want to insert. This can be anything that
-#'   you usually put inside your apps's `ui` function. If you're inserting
-#'   multiple elements in one call, make sure to wrap them in either a
-#'   `tagList()` or a `tags$div()` (the latter option has the
-#'   advantage that you can give it an `id` to make it easier to
-#'   reference or remove it later on). If you want to insert raw html, use
-#'   `ui = HTML()`.
+#' you usually put inside your apps's `ui` function. If you're inserting
+#' multiple elements in one call, make sure to wrap them in either a
+#' `tagList()` or a `tags$div()` (the latter option has the
+#' advantage that you can give it an `id` to make it easier to
+#' reference or remove it later on). If you want to insert raw html, use
+#' `ui = HTML()`.
+#'
 #' @param multiple In case your selector matches more than one element,
-#'   `multiple` determines whether Shiny should insert the UI object
-#'   relative to all matched elements or just relative to the first
-#'   matched element (default).
-#' @param immediate Whether the UI object should be immediately inserted
-#'   or removed, or whether Shiny should wait until all outputs have been
-#'   updated and all observers have been run (default).
-#' @param session The shiny session. Advanced use only.
+#' `multiple` determines whether Shiny should insert the UI object
+#' relative to all matched elements or just relative to the first
+#' matched element (default).
+#'
+#' @param immediate Whether the UI object should be immediately inserted into
+#' the app when you call `insertUI`, or whether Shiny should wait until
+#' all outputs have been updated and all observers have been run (default).
+#'
+#' @param session The shiny session within which to call `insertUI`.
+#'
+#' @seealso [removeUI()]
+#'
 #' @examples
 #' ## Only run this example in interactive R sessions
 #' if (interactive()) {
@@ -72,26 +73,6 @@
 #' # Complete app with UI and server components
 #' shinyApp(ui, server)
 #' }
-#'
-#' if (interactive()) {
-#' # Define UI
-#' ui <- fluidPage(
-#'   actionButton("rmv", "Remove UI"),
-#'   textInput("txt", "This is no longer useful")
-#' )
-#'
-#' # Server logic
-#' server <- function(input, output, session) {
-#'   observeEvent(input$rmv, {
-#'     removeUI(
-#'       selector = "div:has(> #txt)"
-#'     )
-#'   })
-#' }
-#'
-#' # Complete app with UI and server components
-#' shinyApp(ui, server)
-#' }
 #' @export
 insertUI <- function(selector,
   where = c("beforeBegin", "afterBegin", "beforeEnd", "afterEnd"),
@@ -119,7 +100,60 @@ insertUI <- function(selector,
 }
 
 
-#' @rdname insertUI
+#' Remove UI objects
+#'
+#' Remove a UI object from the app.
+#'
+#' This function allows you to remove any part of your UI. Once `removeUI`
+#' is executed on some element, it is gone forever.
+#'
+#' While it may be a particularly useful pattern to pair this with
+#' [insertUI()] (to remove some UI you had previously inserted),
+#' there is no restriction on what you can use `removeUI` on. Any
+#' element that can be selected through a jQuery selector can be removed
+#' through this function.
+#'
+#' @param selector A string that is accepted by jQuery's selector (i.e. the
+#' string `s` to be placed in a `$(s)` jQuery call). This selector
+#' will determine the element(s) to be removed. If you want to remove a
+#' Shiny input or output, note that many of these are wrapped in `div`s,
+#' so you may need to use a somewhat complex selector --- see the Examples below.
+#' (Alternatively, you could also wrap the inputs/outputs that you want to be
+#' able to remove easily in a `div` with an id.)
+#'
+#' @param multiple In case your selector matches more than one element,
+#' `multiple` determines whether Shiny should remove all the matched
+#' elements or just the first matched element (default).
+#'
+#' @param immediate Whether the element(s) should be immediately removed from
+#' the app when you call `removeUI`, or whether Shiny should wait until
+#' all outputs have been updated and all observers have been run (default).
+#'
+#' @param session The shiny session within which to call `removeUI`.
+#'
+#' @seealso [insertUI()]
+#'
+#' @examples
+#' ## Only run this example in interactive R sessions
+#' if (interactive()) {
+#' # Define UI
+#' ui <- fluidPage(
+#'   actionButton("rmv", "Remove UI"),
+#'   textInput("txt", "This is no longer useful")
+#' )
+#'
+#' # Server logic
+#' server <- function(input, output, session) {
+#'   observeEvent(input$rmv, {
+#'     removeUI(
+#'       selector = "div:has(> #txt)"
+#'     )
+#'   })
+#' }
+#'
+#' # Complete app with UI and server components
+#' shinyApp(ui, server)
+#' }
 #' @export
 removeUI <- function(selector,
   multiple = FALSE,

R/middleware-shiny.R

@@ -3,27 +3,7 @@ NULL
 
 reactLogHandler <- function(req) {
   if (! rLog$isLogging()) {
-    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)
-    }
-
+    return(NULL)
   }
 
   if (identical(req$PATH_INFO, "/reactlog/mark")) {
@@ -57,7 +37,6 @@ reactLogHandler <- function(req) {
     ))
 
   } else {
-    # continue on like normal
     return(NULL)
   }
 }

R/mock-session.R

@@ -1,455 +0,0 @@
-# Promise helpers taken from:
-#   https://github.com/rstudio/promises/blob/master/tests/testthat/common.R
-# Block until all pending later tasks have executed
-wait_for_it <- function() {
-  while (!later::loop_empty()) {
-    later::run_now(0.1)
-  }
-}
-
-# Block until the promise is resolved/rejected. If resolved, return the value.
-# If rejected, throw (yes throw, not return) the error.
-#' @importFrom promises %...!%
-#' @importFrom promises %...>%
-extract <- function(promise) {
-  promise_value <- NULL
-  error <- NULL
-  promise %...>%
-    (function(value) promise_value <<- value) %...!%
-    (function(reason) error <<- reason)
-
-  wait_for_it()
-  if (!is.null(error))
-    stop(error)
-  else
-    promise_value
-}
-
-# TODO: is there a way to get this behavior without exporting these functions? R6?
-# TODO: clientData is documented as a reactiveValues, which this is not. Is it possible that
-#   users are currently assigning into clientData? That would not work as expected here.
-#' @noRd
-#' @export
-`$.mockclientdata` <- function(x, name) {
-  if (name == "allowDataUriScheme") { return(TRUE) }
-  if (name == "pixelratio") { return(1) }
-  if (name == "url_protocol") { return("http:") }
-  if (name == "url_hostname") { return("mocksession") }
-  if (name == "url_port") { return(1234) }
-  if (name == "url_pathname") { return("/mockpath") }
-  if (name == "url_hash") { return("#mockhash") }
-  if (name == "url_hash_initial") { return("#mockhash") }
-  if (name == "url_search") { return("?mocksearch=1") }
-
-  clientRE <- "^output_(.+)_([^_]+)$"
-  if(grepl(clientRE, name)) {
-    # TODO: use proper regex group matching here instead of redundantly parsing
-    el <- sub(clientRE, "\\1", name)
-    att <- sub(clientRE, "\\2", name)
-
-    if (att == "width") {
-      return(600)
-    } else if (att == "height") {
-      return(400)
-    } else if (att == "hidden") {
-      return(FALSE)
-    }
-  }
-  warning("Unexpected clientdata attribute accessed: ", name)
-  return(NULL)
-}
-
-#' @noRd
-#' @export
-`[[.mockclientdata` <- `$.mockclientdata`
-
-#' @noRd
-#' @export
-`[.mockclientdata` <- function(values, name) {
-  stop("Single-bracket indexing of mockclientdata is not allowed.")
-}
-
-#' @noRd
-mapNames <- function(func, ...) {
-  vals <- list(...)
-  names(vals) <- vapply(names(vals), func, character(1))
-  vals
-}
-
-#' Mock Shiny Session
-#'
-#' @description
-#' An R6 class suitable for testing that simulates the `session` parameter
-#' provided to Shiny server functions or modules.
-#'
-#' @include timer.R
-#' @export
-MockShinySession <- R6Class(
-  'MockShinySession',
-  portable = FALSE,
-  public = list(
-    #' @field env The environment associated with the session.
-    env = NULL,
-    #' @field returned The value returned by the module.
-    returned = NULL,
-    #' @field singletons Hardcoded as empty. Needed for rendering HTML (i.e. renderUI)
-    singletons = character(0),
-    #' @field clientData Mock client data that always returns a size for plots
-    clientData = structure(list(), class="mockclientdata"),
-    #' @description No-op
-    #' @param logEntry Not used
-    reactlog = function(logEntry){},
-    #' @description No-op
-    incrementBusyCount = function(){},
-    #' @field output The shinyoutputs associated with the session
-    output = NULL,
-    #' @field input The reactive inputs associated with the session
-    input = NULL,
-    #' @field userData An environment initialized as empty.
-    userData = NULL,
-    #' @field progressStack A stack of progress objects
-    progressStack = 'Stack',
-
-    #' @description Create a new MockShinySession
-    initialize = function() {
-      private$.input <- ReactiveValues$new(dedupe = FALSE, label = "input")
-      private$flushCBs <- Callbacks$new()
-      private$flushedCBs <- Callbacks$new()
-      private$endedCBs <- Callbacks$new()
-      private$timer <- MockableTimerCallbacks$new()
-      self$progressStack <- Stack$new()
-
-      self$userData <- new.env(parent=emptyenv())
-
-      # create output
-      out <- .createOutputWriter(self)
-      class(out) <- "shinyoutput"
-      self$output <- out
-
-      # Create a read-only copy of the inputs reactive.
-      self$input <- .createReactiveValues(private$.input, readonly = TRUE)
-    },
-    #' @description Define a callback to be invoked before a reactive flush
-    #' @param fun The function to invoke
-    #' @param once If `TRUE`, will only run once. Otherwise, will run every time reactives are flushed.
-    onFlush = function(fun, once=TRUE) {
-      if (!isTRUE(once)) {
-        return(private$flushCBs$register(fun))
-      } else {
-        dereg <- private$flushCBs$register(function() {
-          dereg()
-          fun()
-        })
-        return(dereg)
-      }
-    },
-    #' @description Define a callback to be invoked after a reactive flush
-    #' @param fun The function to invoke
-    #' @param once If `TRUE`, will only run once. Otherwise, will run every time reactives are flushed.
-    onFlushed = function(fun, once=TRUE) {
-      if (!isTRUE(once)) {
-        return(private$flushedCBs$register(fun))
-      } else {
-        dereg <- private$flushedCBs$register(function() {
-          dereg()
-          fun()
-        })
-        return(dereg)
-      }
-    },
-    #' @description Define a callback to be invoked when the session ends
-    #' @param sessionEndedCallback The callback to invoke when the session has ended.
-    onEnded = function(sessionEndedCallback) {
-      private$endedCBs$register(sessionEndedCallback)
-    },
-
-    #' @description Returns `FALSE` if the session has not yet been closed
-    isEnded = function(){ private$closed },
-    #' @description Returns `FALSE` if the session has not yet been closed
-    isClosed = function(){ private$closed },
-    #' @description Closes the session
-    close = function(){ private$closed <- TRUE },
-
-    #FIXME: this is wrong. Will need to be more complex.
-    #' @description Unsophisticated mock implementation that merely invokes
-    #'   the given callback immediately.
-    #' @param callback The callback ato be invoked.
-    cycleStartAction = function(callback){ callback() },
-
-    #' @description Base64-encode the given file. Needed for image rendering.
-    #' @param name Not used
-    #' @param file The file to be encoded
-    #' @param contentType The content type of the base64-encoded string
-    fileUrl = function(name, file, contentType='application/octet-stream') {
-      bytes <- file.info(file)$size
-      if (is.na(bytes))
-        return(NULL)
-
-      fileData <- readBin(file, 'raw', n=bytes)
-      b64 <- rawToBase64(fileData)
-      return(paste('data:', contentType, ';base64,', b64, sep=''))
-    },
-
-    #' @description Sets reactive values associated with the `session$inputs` object
-    #'   and flushes the reactives.
-    #' @param ... The inputs to set.
-    #' @examples
-    #' s <- MockShinySession$new()
-    #' s$setInputs(x=1, y=2)
-    setInputs = function(...) {
-      vals <- list(...)
-      mapply(names(vals), vals, FUN = function(name, value) {
-        private$.input$set(name, value)
-      })
-      private$flush()
-    },
-
-    #' @description An internal method which shouldn't be used by others.
-    #' @param millis The number of milliseconds on which to schedule a callback
-    #' @param callback The function to schedule
-    .scheduleTask = function(millis, callback) {
-      id <- private$timer$schedule(millis, callback)
-
-      # Return a deregistration callback
-      function() {
-        invisible(private$timer$unschedule(id))
-      }
-    },
-
-    #' @description Simulate the passing of time by the given number of milliseconds.
-    #' @param millis The number of milliseconds to advance time.
-    elapse = function(millis) {
-      msLeft <- millis
-
-      while (msLeft > 0){
-        t <- private$timer$timeToNextEvent()
-
-        if (is.infinite(t) || t <= 0 || msLeft < t){
-          # Either there's no good upcoming event or we can't make it to it in the allotted time.
-          break
-        }
-        msLeft <- msLeft - t
-        private$timer$elapse(t)
-
-        # timerCallbacks must run before flushReact.
-        private$timer$executeElapsed()
-        private$flush()
-      }
-
-      private$timer$elapse(msLeft)
-
-      # Run again in case our callbacks resulted in a scheduled
-      # function that needs executing.
-      private$timer$executeElapsed()
-      private$flush()
-    },
-
-    #' @description An internal method which shouldn't be used by others.
-    .now = function() {
-      # Returns elapsed time in milliseconds
-      private$timer$getElapsed()
-    },
-
-    #' @description An internal method which shouldn't be used by others.
-    #' @param name The name of the output
-    #' @param func The render definition
-    #' @param label Not used
-    defineOutput = function(name, func, label) {
-      force(name)
-
-      if (!is.null(private$outs[[name]]$obs)) {
-        private$outs[[name]]$obs$destroy()
-      }
-
-      if (is.null(func)) func <- missingOutput
-
-      if (!is.function(func))
-        stop(paste("Unexpected", class(func), "output for", name))
-
-      obs <- observe({
-        # We could just stash the promise, but we get an "unhandled promise error". This bypasses
-        prom <- NULL
-        tryCatch({
-          v <- func(self, name)
-          if (!promises::is.promise(v)){
-            # Make our sync value into a promise
-            prom <- promises::promise(function(resolve, reject){ resolve(v) })
-          } else {
-            prom <- v
-          }
-        }, error=function(e){
-          # Error running value()
-          prom <<- promises::promise(function(resolve, reject){ reject(e) })
-        })
-
-        private$outs[[name]]$promise <- hybrid_chain(
-          prom,
-          function(v){
-            list(val = v, err = NULL)
-          }, catch=function(e){
-            list(val = NULL, err = e)
-          })
-      })
-      private$outs[[name]] <- list(obs = obs, func = func, promise = NULL)
-    },
-
-    #' @description An internal method which shouldn't be used by others.
-    #' @param name The name of the output
-    getOutput = function(name) {
-      # Unlike the real outputs, we're going to return the last value rather than the unevaluated function
-      if (is.null(private$outs[[name]])) {
-        stop("The test referenced an output that hasn't been defined yet: output$", name)
-      }
-
-      if (is.null(private$outs[[name]]$promise)) {
-        # Means the output was defined but the observer hasn't had a chance to run
-        # yet. Run flushReact() now to force the observer to run.
-        flushReact()
-
-        if (is.null(private$outs[[name]]$promise)) {
-          stop("output$", name, " encountered an unexpected error resolving its promise")
-        }
-      }
-
-      # Make promise return
-      v <- extract(private$outs[[name]]$promise)
-      if (!is.null(v$err)){
-        stop(v$err)
-      } else {
-        v$val
-      }
-    },
-
-    #' @description No-op
-    #' @param name Not used
-    #' @param data Not used
-    #' @param filterFunc Not used
-    registerDataObj = function(name, data, filterFunc) {},
-    #' @description No-op
-    #' @param value Not used
-    allowReconnect = function(value) {},
-    #' @description No-op
-    reload = function() {},
-    #' @description No-op
-    #' @param brushId Not used
-    resetBrush = function(brushId) {
-      warning("session$brush isn't meaningfully mocked on the MockShinySession")
-    },
-    #' @description No-op
-    #' @param type Not used
-    #' @param message Not used
-    sendCustomMessage = function(type, message) {},
-    #' @description No-op
-    #' @param type Not used
-    #' @param message Not used
-    sendBinaryMessage = function(type, message) {},
-    #' @description No-op
-    #' @param inputId Not used
-    #' @param message Not used
-    sendInputMessage = function(inputId, message) {},
-    #' @description No-op
-    #' @param names Not used
-    setBookmarkExclude = function(names) {
-      warning("Bookmarking isn't meaningfully mocked in MockShinySession")
-    },
-    #' @description No-op
-    getBookmarkExclude = function() {
-      warning("Bookmarking isn't meaningfully mocked in MockShinySession")
-    },
-    #' @description No-op
-    #' @param fun Not used
-    onBookmark = function(fun) {},
-    #' @description No-op
-    #' @param fun Not used
-    onBookmarked = function(fun) {},
-    #' @description No-op
-    doBookmark = function() {
-      warning("Bookmarking isn't meaningfully mocked in MockShinySession")
-    },
-    #' @description No-op
-    #' @param fun Not used
-    onRestore = function(fun) {},
-    #' @description No-op
-    #' @param fun Not used
-    onRestored = function(fun) {},
-    #' @description No-op
-    exportTestValues = function() {},
-    #' @description No-op
-    #' @param input Not used
-    #' @param output Not used
-    #' @param export Not used
-    #' @param format Not used
-    getTestSnapshotUrl = function(input=TRUE, output=TRUE, export=TRUE, format="json") {},
-    #' @description Returns the given id prefixed by this namespace's id.
-    #' @param id The id to modify.
-    ns = function(id) {
-      NS(private$nsPrefix, id)
-    },
-    #' @description Trigger a reactive flush right now.
-    flushReact = function(){
-      private$flush()
-    },
-    #' @description Create and return a namespace-specific session proxy.
-    #' @param namespace Character vector indicating a namespace.
-    makeScope = function(namespace) {
-      ns <- NS(namespace)
-      createSessionProxy(
-        self,
-        input = .createReactiveValues(private$.input, readonly = TRUE, ns = ns),
-        output = structure(.createOutputWriter(self, ns = ns), class = "shinyoutput"),
-        makeScope = function(namespace) self$makeScope(ns(namespace)),
-        ns = function(namespace) ns(namespace),
-        setInputs = function(...) do.call(self$setInputs, mapNames(ns, ...))
-      )
-    },
-    #' @description Set the environment associated with a testServer() call.
-    #' @param env The environment to retain.
-    setEnv = function(env) {
-      self$env <- env
-    },
-    #' @description Set the value returned by the module call and proactively flush.
-    #' @param value The value returned from the module
-    setReturned = function(value) {
-      self$returned <- value
-      private$flush()
-      value
-    },
-    #' @description Get the value returned by the module call.
-    getReturned = function() self$returned,
-    #' @description Return a distinct character identifier for use as a proxy
-    #'   namespace.
-    genId = function() {
-      private$idCounter <- private$idCounter + 1
-      paste0("proxy", private$idCounter)
-    }
-  ),
-  private = list(
-    .input = NULL,
-    flushCBs = NULL,
-    flushedCBs = NULL,
-    endedCBs = NULL,
-    timer = NULL,
-    closed = FALSE,
-    outs = list(),
-    nsPrefix = "mock-session",
-    idCounter = 0,
-
-    flush = function(){
-      isolate(private$flushCBs$invoke(..stacktraceon = TRUE))
-      shiny:::flushReact() # namespace to avoid calling our own method
-      isolate(private$flushedCBs$invoke(..stacktraceon = TRUE))
-      later::run_now()
-    }
-  ),
-  active = list(
-    #' @field request An empty environment where the request should be. The request isn't meaningfully mocked currently.
-    request = function(value) {
-      if (!missing(value)){
-        stop("session$request can't be assigned to")
-      }
-      warning("session$request doesn't currently simulate a realistic request on MockShinySession")
-      new.env(parent=emptyenv())
-    }
-  )
-)
-

R/modules.R

@@ -36,117 +36,25 @@ createSessionProxy <- function(parentSession, ...) {
 
 `[[<-.session_proxy` <- `$<-.session_proxy`
 
-#' Shiny modules
+
+#' Invoke a Shiny module
 #'
 #' Shiny's module feature lets you break complicated UI and server logic into
 #' smaller, self-contained pieces. Compared to large monolithic Shiny apps,
 #' modules are easier to reuse and easier to reason about. See the article at
 #' <http://shiny.rstudio.com/articles/modules.html> to learn more.
 #'
-#' Starting in Shiny 1.5.0, we recommend using `moduleServer` instead of
-#' `callModule`, because the syntax is a little easier to understand, and
-#' modules created with `moduleServer` can be tested with [`testServer()`].
-#'
-#' @param module A Shiny module server function.
+#' @param module A Shiny module server function
 #' @param id An ID string that corresponds with the ID used to call the module's
-#'   UI function.
-#' @param ... For `callModule`, additional parameters to pass to module server
-#'   function.
+#'   UI function
+#' @param ... Additional parameters to pass to module server function
 #' @param session Session from which to make a child scope (the default should
-#'   almost always be used).
+#'   almost always be used)
 #'
 #' @return The return value, if any, from executing the module server function
 #' @seealso <http://shiny.rstudio.com/articles/modules.html>
-#'
-#' @examples
-#' # Define the UI for a module
-#' counterUI <- function(id, label = "Counter") {
-#'   ns <- NS(id)
-#'   tagList(
-#'     actionButton(ns("button"), label = label),
-#'     verbatimTextOutput(ns("out"))
-#'   )
-#' }
-#'
-#' # Define the server logic for a module
-#' counterServer <- function(id) {
-#'   moduleServer(
-#'     id,
-#'     function(input, output, session) {
-#'       count <- reactiveVal(0)
-#'       observeEvent(input$button, {
-#'         count(count() + 1)
-#'       })
-#'       output$out <- renderText({
-#'         count()
-#'       })
-#'       count
-#'     }
-#'   )
-#' }
-#'
-#' # Use the module in an app
-#' ui <- fluidPage(
-#'   counterUI("counter1", "Counter #1"),
-#'   counterUI("counter2", "Counter #2")
-#' )
-#' server <- function(input, output, session) {
-#'   counterServer("counter1")
-#'   counterServer("counter2")
-#' }
-#' if (interactive()) {
-#'   shinyApp(ui, server)
-#' }
-#'
-#'
-#'
-#' # If you want to pass extra parameters to the module's server logic, you can
-#' # add them to your function. In this case `prefix` is text that will be
-#' # printed before the count.
-#' counterServer2 <- function(id, prefix = NULL) {
-#'   moduleServer(
-#'     id,
-#'     function(input, output, session) {
-#'       count <- reactiveVal(0)
-#'       observeEvent(input$button, {
-#'         count(count() + 1)
-#'       })
-#'       output$out <- renderText({
-#'         paste0(prefix, count())
-#'       })
-#'       count
-#'     }
-#'   )
-#' }
-#'
-#' ui <- fluidPage(
-#'   counterUI("counter", "Counter"),
-#' )
-#' server <- function(input, output, session) {
-#'   counterServer2("counter", "The current count is: ")
-#' }
-#' if (interactive()) {
-#'   shinyApp(ui, server)
-#' }
-#'
-#' @export
-moduleServer <- function(id, module, session = getDefaultReactiveDomain()) {
-  if (inherits(session, "MockShinySession")) {
-    body(module) <- rlang::expr({
-      session$setEnv(base::environment())
-      session$setReturned({ !!!body(module) })
-    })
-  }
-  callModule(module, id, session = session)
-}
-
-
-#' @rdname moduleServer
 #' @export
 callModule <- function(module, id, ..., session = getDefaultReactiveDomain()) {
-  if (!inherits(session, c("ShinySession", "session_proxy", "MockShinySession"))) {
-    stop("session must be a ShinySession or session_proxy object.")
-  }
   childScope <- session$makeScope(id)
 
   withReactiveDomain(childScope, {

R/notifications.R

@@ -12,13 +12,11 @@
 #'   disappear.
 #' @param closeButton If `TRUE`, display a button which will make the
 #'   notification disappear when clicked. If `FALSE` do not display.
-#' @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 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 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.
@@ -99,8 +97,10 @@ showNotification <- function(ui, action = NULL, duration = 5,
 
 #' @rdname showNotification
 #' @export
-removeNotification <- function(id, session = getDefaultReactiveDomain()) {
-  force(id)
+removeNotification <- function(id = NULL, session = getDefaultReactiveDomain()) {
+  if (is.null(id)) {
+    stop("id is required.")
+  }
   session$sendNotification("remove", id)
   id
 }

R/progress.R

@@ -20,12 +20,50 @@
 #' [`shinyOptions(progress.style="old")`][shinyOptions] just once, inside the server
 #' function.
 #'
+#' **Methods**
+#'   \describe{
+#'     \item{`initialize(session, min = 0, max = 1)`}{
+#'       Creates a new progress panel (but does not display it).
+#'     }
+#'     \item{`set(value = NULL, message = NULL, detail = NULL)`}{
+#'       Updates the progress panel. When called the first time, the
+#'       progress panel is displayed.
+#'     }
+#'     \item{`inc(amount = 0.1, message = NULL, detail = NULL)`}{
+#'       Like `set`, this updates the progress panel. The difference is
+#'       that `inc` increases the progress bar by `amount`, instead
+#'       of setting it to a specific value.
+#'     }
+#'     \item{`close()`}{
+#'       Removes the progress panel. Future calls to `set` and
+#'       `close` will be ignored.
+#'     }
+#'   }
+#'
+#' @param session The Shiny session object, as provided by
+#'   `shinyServer` to the server function.
+#' @param min The value that represents the starting point of the
+#'   progress bar. Must be less than `max`.
+#' @param max The value that represents the end of the progress bar.
+#'   Must be greater than `min`.
 #' @param message A single-element character vector; the message to be
-#'   displayed to the user, or `NULL` to hide the current message (if any).
-#' @param detail A single-element character vector; the detail message to be
-#'   displayed to the user, or `NULL` to hide the current detail message (if
-#'   any). The detail message will be shown with a de-emphasized appearance
-#'   relative to `message`.
+#'   displayed to the user, or `NULL` to hide the current message
+#'   (if any).
+#' @param detail A single-element character vector; the detail message
+#'   to be displayed to the user, or `NULL` to hide the current
+#'   detail message (if any). The detail message will be shown with a
+#'   de-emphasized appearance relative to `message`.
+#' @param value A numeric value at which to set
+#'   the progress bar, relative to `min` and `max`.
+#' @param style Progress display style. If `"notification"` (the default),
+#'   the progress indicator will show using Shiny's notification API. If
+#'   `"old"`, use the same HTML and CSS used in Shiny 0.13.2 and below
+#'   (this is for backward-compatibility).
+#' @param amount Single-element numeric vector; the value at which to set
+#'   the progress bar, relative to `min` and `max`.
+#'   `NULL` hides the progress bar, if it is currently visible.
+#' @param amount For the `inc()` method, a numeric value to increment the
+#'   progress bar.
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -61,17 +99,6 @@ Progress <- R6Class(
   'Progress',
   public = list(
 
-    #' @description Creates a new progress panel (but does not display it).
-    #' @param session The Shiny session object, as provided by `shinyServer` to
-    #'   the server function.
-    #' @param min The value that represents the starting point of the progress
-    #'   bar. Must be less than `max`.
-    #' @param max The value that represents the end of the progress bar. Must be
-    #'   greater than `min`.
-    #' @param style Progress display style. If `"notification"` (the default),
-    #'   the progress indicator will show using Shiny's notification API. If
-    #'   `"old"`, use the same HTML and CSS used in Shiny 0.13.2 and below (this
-    #'   is for backward-compatibility).
     initialize = function(session = getDefaultReactiveDomain(),
       min = 0, max = 1,
       style = getShinyOption("progress.style", default = "notification"))
@@ -90,11 +117,6 @@ Progress <- R6Class(
       session$sendProgress('open', list(id = private$id, style = private$style))
     },
 
-    #' @description Updates the progress panel. When called the first time, the
-    #'   progress panel is displayed.
-    #' @param value Single-element numeric vector; the value at which to set the
-    #'   progress bar, relative to `min` and `max`. `NULL` hides the progress
-    #'   bar, if it is currently visible.
     set = function(value = NULL, message = NULL, detail = NULL) {
       if (private$closed) {
         warning("Attempting to set progress, but progress already closed.")
@@ -121,11 +143,6 @@ Progress <- R6Class(
       private$session$sendProgress('update', data)
     },
 
-    #' @description Like `set`, this updates the progress panel. The difference
-    #'   is that `inc` increases the progress bar by `amount`, instead of
-    #'   setting it to a specific value.
-    #' @param amount For the `inc()` method, a numeric value to increment the
-    #'   progress bar.
     inc = function(amount = 0.1, message = NULL, detail = NULL) {
       if (is.null(private$value))
         private$value <- private$min
@@ -134,17 +151,12 @@ Progress <- R6Class(
       self$set(value, message, detail)
     },
 
-    #' @description Returns the minimum value.
     getMin = function() private$min,
 
-    #' @description Returns the maximum value.
     getMax = function() private$max,
 
-    #' @description Returns the current value.
     getValue = function() private$value,
 
-    #' @description Removes the progress panel. Future calls to `set` and
-    #'   `close` will be ignored.
     close = function() {
       if (private$closed) {
         warning("Attempting to close progress, but progress already closed.")

R/reactives.R

@@ -222,7 +222,7 @@ reactiveVal <- function(value = NULL, label = NULL) {
         rv$set(x)
       }
     },
-    class = c("reactiveVal", "reactive", "function"),
+    class = c("reactiveVal", "reactive"),
     label = label,
     .impl = rv
   )
@@ -969,7 +969,7 @@ reactive <- function(x, env = parent.frame(), quoted = FALSE, label = NULL,
   if (length(srcref) >= 2) attr(label, "srcref") <- srcref[[2]]
   attr(label, "srcfile") <- srcFileOfRef(srcref[[1]])
   o <- Observable$new(fun, label, domain, ..stacktraceon = ..stacktraceon)
-  structure(o$getValue, observable = o, class = c("reactiveExpr", "reactive", "function"))
+  structure(o$getValue, observable = o, class = c("reactiveExpr", "reactive"))
 }
 
 # Given the srcref to a reactive expression, attempts to figure out what the
@@ -1513,16 +1513,14 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
   # reactId <- nextGlobalReactId()
   # rLog$define(reactId, paste0("timer(", intervalMs, ")"))
 
-  scheduler <- defineScheduler(session)
-
   dependents <- Map$new()
-  timerHandle <- scheduler(intervalMs, function() {
+  timerHandle <- scheduleTask(intervalMs, function() {
     # Quit if the session is closed
     if (!is.null(session) && session$isClosed()) {
       return(invisible())
     }
 
-    timerHandle <<- scheduler(intervalMs, sys.function())
+    timerHandle <<- scheduleTask(intervalMs, sys.function())
 
     doInvalidate <- function() {
       lapply(
@@ -1615,6 +1613,7 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
 #' }
 #' @export
 invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
+
   force(session)
 
   ctx <- getCurrentContext()
@@ -1622,9 +1621,7 @@ invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
 
   clear_on_ended_callback <- function() {}
 
-  scheduler <- defineScheduler(session)
-
-  timerHandle <- scheduler(millis, function() {
+  timerHandle <- scheduleTask(millis, function() {
     if (is.null(session)) {
       ctx$invalidate()
       return(invisible())
@@ -2362,24 +2359,20 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
     when = NULL # the deadline for the timer to fire; NULL if not scheduled
   )
 
-  # Responsible for tracking when r() changes.
+  # Responsible for tracking when f() changes.
   firstRun <- TRUE
   observe({
+    r()
+
     if (firstRun) {
       # During the first run we don't want to set v$when, as this will kick off
       # the timer. We only want to do that when we see r() change.
       firstRun <<- FALSE
-
-      # Ensure r() is called only after setting firstRun to FALSE since r()
-      # may throw an error
-      r()
       return()
     }
-    # This ensures r() is still tracked after firstRun
-    r()
 
     # The value (or possibly millis) changed. Start or reset the timer.
-    v$when <- getDomainTimeMs(domain) + millis()
+    v$when <- Sys.time() + millis()/1000
   }, label = "debounce tracker", domain = domain, priority = priority)
 
   # This observer is the timer. It rests until v$when elapses, then touches
@@ -2388,13 +2381,13 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
     if (is.null(v$when))
       return()
 
-    now <- getDomainTimeMs(domain)
+    now <- Sys.time()
     if (now >= v$when) {
       # Mod by 999999999 to get predictable overflow behavior
       v$trigger <- isolate(v$trigger %OR% 0) %% 999999999 + 1
       v$when <- NULL
     } else {
-      invalidateLater(v$when - now)
+      invalidateLater((v$when - now) * 1000)
     }
   }, label = "debounce timer", domain = domain, priority = priority)
 
@@ -2439,12 +2432,12 @@ throttle <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
     if (is.null(v$lastTriggeredAt)) {
       0
     } else {
-      max(0, v$lastTriggeredAt + millis() - getDomainTimeMs(domain))
+      max(0, (v$lastTriggeredAt + millis()/1000) - Sys.time()) * 1000
     }
   }
 
   trigger <- function() {
-    v$lastTriggeredAt <- getDomainTimeMs(domain)
+    v$lastTriggeredAt <- Sys.time()
     # Mod by 999999999 to get predictable overflow behavior
     v$trigger <- isolate(v$trigger) %% 999999999 + 1
     v$pending <- FALSE

R/reexports.R

@@ -1,195 +0,0 @@
-####
-# Generated by `./tools/updateReexports.R`: do not edit by hand
-# Please call `source('tools/updateReexports.R') from the root folder to update`
-####
-
-
-# fastmap key_missing.Rd -------------------------------------------------------
-
-#' @importFrom fastmap key_missing
-#' @export
-fastmap::key_missing
-
-#' @importFrom fastmap is.key_missing
-#' @export
-fastmap::is.key_missing
-
-
-
-# htmltools builder.Rd ---------------------------------------------------------
-
-#' @importFrom htmltools tags
-#' @export
-htmltools::tags
-
-#' @importFrom htmltools p
-#' @export
-htmltools::p
-
-#' @importFrom htmltools h1
-#' @export
-htmltools::h1
-
-#' @importFrom htmltools h2
-#' @export
-htmltools::h2
-
-#' @importFrom htmltools h3
-#' @export
-htmltools::h3
-
-#' @importFrom htmltools h4
-#' @export
-htmltools::h4
-
-#' @importFrom htmltools h5
-#' @export
-htmltools::h5
-
-#' @importFrom htmltools h6
-#' @export
-htmltools::h6
-
-#' @importFrom htmltools a
-#' @export
-htmltools::a
-
-#' @importFrom htmltools br
-#' @export
-htmltools::br
-
-#' @importFrom htmltools div
-#' @export
-htmltools::div
-
-#' @importFrom htmltools span
-#' @export
-htmltools::span
-
-#' @importFrom htmltools pre
-#' @export
-htmltools::pre
-
-#' @importFrom htmltools code
-#' @export
-htmltools::code
-
-#' @importFrom htmltools img
-#' @export
-htmltools::img
-
-#' @importFrom htmltools strong
-#' @export
-htmltools::strong
-
-#' @importFrom htmltools em
-#' @export
-htmltools::em
-
-#' @importFrom htmltools hr
-#' @export
-htmltools::hr
-
-
-# htmltools tag.Rd -------------------------------------------------------------
-
-#' @importFrom htmltools tag
-#' @export
-htmltools::tag
-
-#' @importFrom htmltools tagList
-#' @export
-htmltools::tagList
-
-#' @importFrom htmltools tagAppendAttributes
-#' @export
-htmltools::tagAppendAttributes
-
-#' @importFrom htmltools tagHasAttribute
-#' @export
-htmltools::tagHasAttribute
-
-#' @importFrom htmltools tagGetAttribute
-#' @export
-htmltools::tagGetAttribute
-
-#' @importFrom htmltools tagAppendChild
-#' @export
-htmltools::tagAppendChild
-
-#' @importFrom htmltools tagAppendChildren
-#' @export
-htmltools::tagAppendChildren
-
-#' @importFrom htmltools tagSetChildren
-#' @export
-htmltools::tagSetChildren
-
-
-# htmltools HTML.Rd ------------------------------------------------------------
-
-#' @importFrom htmltools HTML
-#' @export
-htmltools::HTML
-
-
-# htmltools include.Rd ---------------------------------------------------------
-
-#' @importFrom htmltools includeHTML
-#' @export
-htmltools::includeHTML
-
-#' @importFrom htmltools includeText
-#' @export
-htmltools::includeText
-
-#' @importFrom htmltools includeMarkdown
-#' @export
-htmltools::includeMarkdown
-
-#' @importFrom htmltools includeCSS
-#' @export
-htmltools::includeCSS
-
-#' @importFrom htmltools includeScript
-#' @export
-htmltools::includeScript
-
-
-# htmltools singleton.Rd -------------------------------------------------------
-
-#' @importFrom htmltools singleton
-#' @export
-htmltools::singleton
-
-#' @importFrom htmltools is.singleton
-#' @export
-htmltools::is.singleton
-
-
-# htmltools validateCssUnit.Rd -------------------------------------------------
-
-#' @importFrom htmltools validateCssUnit
-#' @export
-htmltools::validateCssUnit
-
-
-# htmltools htmlTemplate.Rd ----------------------------------------------------
-
-#' @importFrom htmltools htmlTemplate
-#' @export
-htmltools::htmlTemplate
-
-
-# htmltools suppressDependencies.Rd --------------------------------------------
-
-#' @importFrom htmltools suppressDependencies
-#' @export
-htmltools::suppressDependencies
-
-
-# htmltools withTags.Rd --------------------------------------------------------
-
-#' @importFrom htmltools withTags
-#' @export
-htmltools::withTags

R/render-plot.R

@@ -889,14 +889,6 @@ find_panel_info_non_api <- function(b, ggplot_format) {
   })
 }
 
-# Use public API for getting the unit's type (grid::unitType(), added in R 4.0)
-# https://github.com/wch/r-source/blob/f9b8a42/src/library/grid/R/unit.R#L179
-getUnitType <- function(u) {
-  tryCatch(
-    get("unitType", envir = asNamespace("grid"))(u),
-    error = function(e) attr(u, "unit", exact = TRUE)
-  )
-}
 
 # Given a gtable object, return the x and y ranges (in pixel dimensions)
 find_panel_ranges <- function(g, res) {
@@ -912,11 +904,11 @@ find_panel_ranges <- function(g, res) {
     if (inherits(x, "unit.list")) {
       # For ggplot2 <= 1.0.1
       vapply(x, FUN.VALUE = logical(1), function(u) {
-        isTRUE(getUnitType(u) == "null")
+        isTRUE(attr(u, "unit", exact = TRUE) == "null")
       })
     } else {
       # For later versions of ggplot2
-      getUnitType(x) == "null"
+      attr(x, "unit", exact = TRUE) == "null"
     }
   }
 
@@ -956,11 +948,7 @@ find_panel_ranges <- function(g, res) {
 
     # The plotting panels all are 'null' units.
     null_sizes <- rep(NA_real_, length(rel_sizes))
-    # Workaround for `[.unit` forbidding zero-length subsets
-    # https://github.com/wch/r-source/blob/f9b8a42/src/library/grid/R/unit.R#L448-L450
-    if (length(null_idx)) {
-      null_sizes[null_idx] <- as.numeric(rel_sizes[null_idx])
-    }
+    null_sizes[null_idx] <- as.numeric(rel_sizes[null_idx])
 
     # Total size allocated for panels is the total image size minus absolute
     # (non-panel) elements.

R/server.R

@@ -724,7 +724,7 @@ isRunning <- function() {
 #' }
 #' @export
 runApp <- function(appDir=getwd(),
-                   port=getOption('shiny.port'),
+                   port=getOption('shiny.port', findPort(host = host)),
                    launch.browser=getOption('shiny.launch.browser',
                                             interactive()),
                    host=getOption('shiny.host', '127.0.0.1'),
@@ -794,12 +794,12 @@ runApp <- function(appDir=getwd(),
     if (arg %in% names(appOps)) appOps[[arg]] else default
   }
 
+  if (missing(host))
+    host <- findVal("host", host %OR% '0.0.0.0')
   if (missing(port))
-    port <- findVal("port", port)
+    port <- findVal("port", port %OR% findPort(host = host))
   if (missing(launch.browser))
     launch.browser <- findVal("launch.browser", launch.browser)
-  if (missing(host))
-    host <- findVal("host", host)
   if (missing(quiet))
     quiet <- findVal("quiet", quiet)
   if (missing(display.mode))
@@ -807,8 +807,6 @@ runApp <- function(appDir=getwd(),
   if (missing(test.mode))
     test.mode <- findVal("test.mode", test.mode)
 
-  if (is.null(host) || is.na(host)) host <- '0.0.0.0'
-
   workerId(workerId)
 
   if (inShinyServer()) {
@@ -883,44 +881,6 @@ runApp <- function(appDir=getwd(),
 
   require(shiny)
 
-  # determine port if we need to
-  if (is.null(port)) {
-
-    # Try up to 20 random ports. If we don't succeed just plow ahead
-    # with the final value we tried, and let the "real" startServer
-    # somewhere down the line fail and throw the error to the user.
-    #
-    # If we (think we) succeed, save the value as .globals$lastPort,
-    # and try that first next time the user wants a random port.
-
-    for (i in 1:20) {
-      if (!is.null(.globals$lastPort)) {
-        port <- .globals$lastPort
-        .globals$lastPort <- NULL
-      }
-      else {
-        # Try up to 20 random ports
-        while (TRUE) {
-          port <- p_randomInt(3000, 8000)
-          # Reject ports in this range that are considered unsafe by Chrome
-          # http://superuser.com/questions/188058/which-ports-are-considered-unsafe-on-chrome
-          # https://github.com/rstudio/shiny/issues/1784
-          if (!port %in% c(3659, 4045, 6000, 6665:6669, 6697)) {
-            break
-          }
-        }
-      }
-
-      # Test port to see if we can use it
-      tmp <- try(startServer(host, port, list()), silent=TRUE)
-      if (!inherits(tmp, 'try-error')) {
-        stopServer(tmp)
-        .globals$lastPort <- port
-        break
-      }
-    }
-  }
-
   # Invoke user-defined onStop callbacks, before the application's internal
   # onStop callbacks.
   on.exit({
@@ -1062,7 +1022,7 @@ stopApp <- function(returnValue = invisible()) {
 #' }
 #' @export
 runExample <- function(example=NA,
-                       port=NULL,
+                       port=getOption('shiny.port', findPort(host = host)),
                        launch.browser=getOption('shiny.launch.browser',
                                                 interactive()),
                        host=getOption('shiny.host', '127.0.0.1'),
@@ -1126,7 +1086,7 @@ runExample <- function(example=NA,
 #' runGadget(shinyApp(ui, server))
 #' }
 #' @export
-runGadget <- function(app, server = NULL, port = getOption("shiny.port"),
+runGadget <- function(app, server = NULL, port = getOption("shiny.port", findPort()),
   viewer = paneViewer(), stopOnCancel = TRUE) {
 
   if (!is.shiny.appobj(app)) {
@@ -1221,6 +1181,41 @@ browserViewer <- function(browser = getOption("browser")) {
   }
 }
 
+#' Find an open TCP port
+#'
+#' Finds a random available TCP port for listening on.
+#'
+#' @param min Minimum port number.
+#' @param max Maximum port number.
+#' @param host see [httpuv::randomPort()].
+#' @param n Number of ports to try before giving up.
+#' @param cache if `TRUE`, use the last random port if it's available.
+#'
+#' @details This function automatically excludes some ports
+#' which are considered unsafe by web browsers.
+#'
+#' @seealso [httpuv::randomPort()]
+#' @export
+#' @examples
+#'
+#' findPort()
+#' findPort()
+#' findPort(cache = FALSE)
+findPort <- function(min = 3000L, max = 8000L,
+                     host = getOption("shiny.host", "127.0.0.1"),
+                     n = 20, cache = TRUE) {
+  if (cache && !is.null(.globals$lastPort))  {
+    tmp <- try(startServer(host, .globals$lastPort, list()), silent = TRUE)
+    if (!inherits(tmp, 'try-error')) {
+      stopServer(tmp)
+      return(.globals$lastPort)
+    }
+  }
+  .globals$lastPort <- withPrivateSeed(httpuv::randomPort(min, max, host, n))
+  .globals$lastPort
+}
+
+
 # Returns TRUE if we're running in Shiny Server or other hosting environment,
 # otherwise returns FALSE.
 inShinyServer <- function() {
@@ -1230,5 +1225,5 @@ inShinyServer <- function() {
 # This check was moved out of the main function body because of an issue with
 # the RStudio debugger. (#1474)
 isEmptyMessage <- function(msg) {
-  identical(as.raw(c(0x03, 0xe9)), msg)
+  identical(charToRaw("\003\xe9"), msg)
 }

R/shiny-options.R

@@ -35,81 +35,80 @@ getShinyOption <- function(name, default = NULL) {
 #' `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.
+#'   \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.
+#'     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"))`
+#'     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.}
+#'     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}{This controls whether messages for
+#'     deprecated functions in Shiny will be printed. See
+#'     [shinyDeprecated()] for more information.}
+#'   \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.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.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.launch.browser}{A boolean which controls the default behavior
+#'     when an app is run. See [runApp()] 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.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.port}{A port number that Shiny will listen on. See
+#'     [runApp()] for more information.}
+#'   \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.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.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.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.table.class}{CSS class names to use for tables.}
+#'   \item{shiny.testmode}{If `TRUE`, then enable features for testing Shiny
+#'     applications. If `FALSE` (the default), do not enable those features.}
+#'   \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.usecairo}{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

R/shiny.R

@@ -723,12 +723,6 @@ ShinySession <- R6Class(
     requestFlush = function() {
       appsNeedingFlush$set(self$token, self)
     },
-    .scheduleTask = function(millis, callback) {
-      scheduleTask(millis, callback)
-    },
-    .now = function(){
-      getTimeMs()
-    },
     rootScope = function() {
       self
     },
@@ -962,9 +956,7 @@ ShinySession <- R6Class(
         output$suspend()
       }
       # ..stacktraceon matches with the top-level ..stacktraceoff..
-      withReactiveDomain(self, {
-        private$closedCallbacks$invoke(onError = printError, ..stacktraceon = TRUE)
-      })
+      private$closedCallbacks$invoke(onError = printError, ..stacktraceon = TRUE)
     },
     isClosed = function() {
       return(self$closed)
@@ -1299,9 +1291,6 @@ ShinySession <- R6Class(
 
     getCurrentOutputInfo = function() {
       name <- private$currentOutputName
-      if (is.null(name)) {
-        return(NULL)
-      }
 
       tmp_info <- private$outputInfo[[name]] %OR% list(name = name)
 
@@ -2101,10 +2090,6 @@ outputOptions <- function(x, name, ...) {
 
 #' Get information about the output that is currently being executed.
 #'
-#' @return A list with information about the current output, including the
-#'   `name` of the output. If no output is currently being executed, this will
-#'   return `NULL`.
-#'
 #' @param session The current Shiny session.
 #'
 #' @export
@@ -2296,56 +2281,3 @@ ShinyServerTimingRecorder <- R6Class("ShinyServerTimingRecorder",
 )
 
 missingOutput <- function(...) req(FALSE)
-
-#' Insert inline Markdown
-#'
-#' This function accepts
-#' [Markdown](https://en.wikipedia.org/wiki/Markdown)-syntax text and returns
-#' HTML that may be included in Shiny UIs.
-#'
-#' Leading whitespace is trimmed from Markdown text with [glue::trim()].
-#' Whitespace trimming ensures Markdown is processed correctly even when the
-#' call to `markdown()` is indented within surrounding R code.
-#'
-#' By default, [Github extensions][commonmark::extensions] are enabled, but this
-#' can be disabled by passing `extensions = FALSE`.
-#'
-#' Markdown rendering is performed by [commonmark::markdown_html()]. Additional
-#' arguments to `markdown()` are passed as arguments to `markdown_html()`
-#'
-#' @param mds A character vector of Markdown source to convert to HTML. If the
-#'   vector has more than one element, a single-element character vector of
-#'   concatenated HTML is returned.
-#' @param extensions Enable Github syntax extensions; defaults to `TRUE`.
-#' @param .noWS Character vector used to omit some of the whitespace that would
-#'   normally be written around generated HTML. Valid options include `before`,
-#'   `after`, and `outside` (equivalent to `before` and `end`).
-#' @param ... Additional arguments to pass to [commonmark::markdown_html()].
-#'   These arguments are _[dynamic][rlang::dyn-dots]_.
-#'
-#' @return a character vector marked as HTML.
-#' @export
-#' @examples
-#' ui <- fluidPage(
-#'   markdown("
-#'     # Markdown Example
-#'
-#'     This is a markdown paragraph, and will be contained within a `<p>` tag
-#'     in the UI.
-#'
-#'     The following is an unordered list, which will be represented in the UI as
-#'     a `<ul>` with `<li>` children:
-#'
-#'     * a bullet
-#'     * another
-#'
-#'     [Links](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) work;
-#'     so does *emphasis*.
-#'
-#'     To see more of what's possible, check out [commonmark.org/help](https://commonmark.org/help).
-#'     ")
-#' )
-markdown <- function(mds, extensions = TRUE, .noWS = NULL, ...) {
-  html <- rlang::exec(commonmark::markdown_html, glue::trim(mds), extensions = extensions, ...)
-  htmltools::HTML(html, .noWS = .noWS)
-}

R/shinyui.R

@@ -42,28 +42,9 @@ 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"),
-    jquery(),
+    htmlDependency("jquery", "3.4.1", c(href="shared"), script = "jquery.min.js"),
     htmlDependency("shiny", utils::packageVersion("shiny"), c(href="shared"),
       script = if (getOption("shiny.minified", TRUE)) "shiny.min.js" else "shiny.js",
       stylesheet = "shiny.css")

R/test-server.R

@@ -1,119 +0,0 @@
-# Create a "data mask" suitable for passing to rlang::eval_tidy. Bindings in
-# `env` and bindings in the parent of `env` are merged into a single named list.
-# Bindings in `env` take precedence over bindings in the parent of `env`.
-#' @noRd
-makeMask <- function(env) {
-  stopifnot(length(rlang::env_parents(env)) > 1)
-  child <- as.list(env)
-  parent <- as.list(rlang::env_parent(env))
-  parent_only <- setdiff(names(parent), names(child))
-  append(child, parent[parent_only])
-}
-
-#' @noRd
-isModuleServer <- function(x) {
-  is.function(x) && names(formals(x))[1] == "id"
-}
-
-#' Reactive testing for Shiny server functions and modules
-#'
-#' A way to test the reactive interactions in Shiny applications. Reactive
-#' interactions are defined in the server function of applications and in
-#' modules.
-#' @param app The path to an application or module to test. In addition to
-#'   paths, applications may be represented by any object suitable for coercion
-#'   to an `appObj` by `as.shiny.appobj`. Application server functions must
-#'   include a `session` argument in order to be tested.
-#' @param expr Test code containing expectations. The test expression will run
-#'   in the server function environment, meaning that the parameters of the
-#'   server function (e.g. `input`, `output`, and `session`) will be available
-#'   along with any other values created inside of the server function.
-#' @param ... Additional arguments to pass to the module function. These
-#'   arguments are processed with [rlang::list2()] and so are
-#'   _[dynamic][rlang::dyn-dots]_. If `app` is a module, and no `id` argument is
-#'   provided, one will be generated and supplied automatically.
-#' @return The result of evaluating `expr`.
-#' @include mock-session.R
-#' @rdname testServer
-#' @examples
-#' server <- function(id, multiplier = 2, prefix = "I am ") {
-#'   moduleServer(id, function(input, output, session) {
-#'     myreactive <- reactive({
-#'       input$x * multiplier
-#'     })
-#'     output$txt <- renderText({
-#'       paste0(prefix, myreactive())
-#'     })
-#'   })
-#' }
-#'
-#' testServer(server, {
-#'   session$setInputs(x = 1)
-#'   # You're also free to use third-party
-#'   # testing packages like testthat:
-#'   #   expect_equal(myreactive(), 2)
-#'   stopifnot(myreactive() == 2)
-#'   stopifnot(output$txt == "I am 2")
-#'
-#'   session$setInputs(x = 2)
-#'   stopifnot(myreactive() == 4)
-#'   stopifnot(output$txt == "I am 4")
-#'   # Any additional arguments, below, are passed along to the module.
-#' }, multiplier = 2)
-#' @export
-testServer <- function(app, expr, ...) {
-
-  args <- rlang::list2(...)
-
-  session <- getDefaultReactiveDomain()
-
-  if (inherits(session, "MockShinySession"))
-    stop("Test expressions may not call testServer()")
-  if (inherits(session, "session_proxy")
-      && inherits(get("parent", envir = session), "MockShinySession"))
-    stop("Modules may not call testServer()")
-
-  session <- MockShinySession$new()
-  on.exit(if (!session$isClosed()) session$close())
-
-  if (isModuleServer(app)) {
-    if (!("id" %in% names(args)))
-      args[["id"]] <- session$genId()
-  } else {
-    appobj <- as.shiny.appobj(app)
-    server <- appobj$serverFuncSource()
-    if (! "session" %in% names(formals(server)))
-      stop("Tested application server functions must declare input, output, and session arguments.")
-    body(server) <- rlang::expr({
-      session$setEnv(base::environment())
-      !!!body(server)
-    })
-    app <- function() {
-      session$setReturned(server(input = session$input, output = session$output, session = session))
-    }
-    if (length(args))
-      message("Discarding unused arguments to server function")
-  }
-
-  isolate(
-    withReactiveDomain(
-      session,
-      withr::with_options(list(`shiny.allowoutputreads` = TRUE), {
-        rlang::exec(app, !!!args)
-      })
-    )
-  )
-
-  stopifnot(all(c("input", "output", "session") %in% ls(session$env)))
-
-  quosure <- rlang::enquo(expr)
-
-  isolate(
-    withReactiveDomain(
-      session,
-      withr::with_options(list(`shiny.allowoutputreads` = TRUE), {
-        rlang::eval_tidy(quosure, makeMask(session$env), rlang::caller_env())
-      })
-    )
-  )
-}

R/test.R

@@ -1,141 +0,0 @@
-#' Creates and returns run result data frame.
-#'
-#' @param file Name of the test runner file, a character vector of length 1.
-#' @param pass Whether or not the test passed, a logical vector of length 1.
-#' @param result Value (wrapped in a list) obtained by evaluating `file` or `NA`
-#'   if no value was obtained, such as with `shinytest`.
-#' @param error Error, if any, (and wrapped in a list) that was signaled during
-#'   evaluation of `file`.
-#'
-#' @return A 1-row data frame representing a single test run. `result` and
-#'   `error` are "list columns", or columns that may contain list elements.
-#' @noRd
-result_row <- function(file, pass, result, error) {
-  stopifnot(is.list(result))
-  stopifnot(is.list(error))
-  df <- data.frame(
-    file = file,
-    pass = pass,
-    result = I(result),
-    error = I(error),
-    stringsAsFactors = FALSE
-  )
-  class(df) <- c("shinytestrun", class(df))
-  df
-}
-
-#' Check to see if the given text is a shinytest
-#' Scans for the magic string of `app <- ShinyDriver$new(` as an indicator that this is a shinytest.
-#' Brought in from shinytest to avoid having to export this function.
-#' @noRd
-isShinyTest <- function(text){
-  lines <- grepl("app\\s*<-\\s*ShinyDriver\\$new\\(", text, perl=TRUE)
-  any(lines)
-}
-
-#' Runs the tests associated with this Shiny app
-#'
-#' Sources the `.R` files in the top-level of `tests/` much like `R CMD check`.
-#' These files are typically simple runners for tests nested in other
-#' directories under `tests/`.
-#'
-#' @param appDir The base directory for the application.
-#' @param filter If not `NULL`, only tests with file names matching this regular
-#'   expression will be executed. Matching is performed on the file name
-#'   including the extension.
-#'
-#' @return A data frame classed with the supplemental class `"shinytestrun"`.
-#'   The data frame has the following columns:
-#'
-#' | **Name** | **Type** | **Meaning** |
-#' | :-- | :-- | :-- |
-#' | `file` | `character(1)` | File name of the runner script in `tests/` that was sourced. |
-#' | `pass` | `logical(1)` | Whether or not the runner script signaled an error when sourced. |
-#' | `result` | any or `NA` | The return value of the runner, or `NA` if `pass == FALSE`. |
-#' | `error` | any or `NA` | The error signaled by the runner, or `NA` if `pass == TRUE`. |
-#'
-#' @details Historically, [shinytest](https://rstudio.github.io/shinytest/)
-#'   recommended placing tests at the top-level of the `tests/` directory. In
-#'   order to support that model, `testApp` first checks to see if the `.R`
-#'   files in the `tests/` directory are all shinytests; if so, just calls out
-#'   to [shinytest::testApp()].
-#' @export
-runTests <- function(appDir=".", filter=NULL){
-  require(shiny)
-
-  testsDir <- file.path(appDir, "tests")
-  if (!dirExists(testsDir)){
-    stop("No tests directory found: ", testsDir)
-  }
-  runners <- list.files(testsDir, pattern="\\.r$", ignore.case = TRUE)
-
-  if (length(runners) == 0){
-    message("No test runners found in ", testsDir)
-    return(result_row(character(0), logical(0), list(), list()))
-  }
-
-  if (!is.null(filter)){
-    runners <- runners[grepl(filter, runners)]
-  }
-  if (length(runners) == 0){
-    stop("No test runners matched the given filter: '", filter, "'")
-  }
-
-  # Inspect each runner to see if it appears to be a shinytest
-  isST <- vapply(runners, function(r){
-    text <- readLines(file.path(testsDir, r), warn = FALSE)
-    isShinyTest(text)
-  }, logical(1))
-
-  # See the @details section of the runTests() docs above for why this branch exists.
-  if (all(isST)){
-    # just call out to shinytest
-    # We don't need to message/warn here since shinytest already does it.
-    if (!requireNamespace("shinytest", quietly=TRUE) ){
-      stop("It appears that the .R files in ", testsDir,
-           " are all shinytests, but shinytest is not installed.")
-    }
-
-    if (!getOption("shiny.autoload.r", TRUE)) {
-      warning("You've disabled `shiny.autoload.r` via an option but this is not passed through to shinytest. Consider using a _disable_autoload.R file as described at https://rstd.io/shiny-autoload")
-    }
-
-    return(do.call(rbind, lapply(shinytest::testApp(appDir)[["results"]], function(r) {
-      error <- if (r[["pass"]]) NA else simpleError("Unknown shinytest error")
-      result_row(r[["name"]], r[["pass"]], list(NA), list(error))
-    })))
-  }
-
-  testenv <- new.env(parent=globalenv())
-  renv <- new.env(parent=testenv)
-  if (getOption("shiny.autoload.r", TRUE)) {
-    loadSupport(appDir, renv=renv, globalrenv=testenv)
-  } else if (file.exists.ci(file.path(appDir, "server.R"))){
-    # then check for global.R to load
-    if (file.exists(file.path.ci(appDir, "global.R"))){
-      sourceUTF8(file.path.ci(appDir, "global.R"))
-    }
-  }
-
-  oldwd <- getwd()
-  on.exit({
-    setwd(oldwd)
-  }, add=TRUE)
-
-  setwd(testsDir)
-
-  # Otherwise source all the runners -- each in their own environment.
-  return(do.call(rbind, lapply(runners, function(r) {
-    result <- NA
-    error <- NA
-    pass <- FALSE
-    tryCatch({
-      env <- new.env(parent = renv)
-      result <- sourceUTF8(r, envir = env)
-      pass <- TRUE
-    }, error = function(e) {
-      error <<- e
-    })
-    result_row(r, pass, list(result), list(error))
-  })))
-}

R/timer.R

@@ -1,5 +1,6 @@
-# Return the current time, in milliseconds from epoch.
-getTimeMs <- function() {
+# Return the current time, in milliseconds from epoch, with
+# unspecified time zone.
+now <- function() {
   as.numeric(Sys.time()) * 1000
 }
 
@@ -11,11 +12,9 @@ TimerCallbacks <- R6Class(
     .nextId = 0L,
     .funcs = 'Map',
     .times = data.frame(),
-    .now = 'Function',
 
-    initialize = function(nowFn = getTimeMs) {
+    initialize = function() {
       .funcs <<- Map$new()
-      .now <<- nowFn
     },
     clear = function() {
       .nextId <<- 0L
@@ -31,7 +30,7 @@ TimerCallbacks <- R6Class(
       id <- .nextId
       .nextId <<- .nextId + 1L
 
-      t <- .now()
+      t <- now()
 
       # TODO: Horribly inefficient, use a heap instead
       .times <<- rbind(.times, data.frame(time=t+millis,
@@ -57,17 +56,17 @@ TimerCallbacks <- R6Class(
     timeToNextEvent = function() {
       if (dim(.times)[1] == 0)
         return(Inf)
-      return(.times[1, 'time'] - .now())
+      return(.times[1, 'time'] - now())
     },
     takeElapsed = function() {
-      t <- .now()
-      elapsed <- .times$time <= .now()
+      t <- now()
+      elapsed <- .times$time < now()
       result <- .times[elapsed,]
       .times <<- .times[!elapsed,]
 
       # TODO: Examine scheduled column to check if any funny business
       #       has occurred with the system clock (e.g. if scheduled
-      #       is later than .now())
+      #       is later than now())
 
       return(result)
     },
@@ -87,30 +86,6 @@ TimerCallbacks <- R6Class(
   )
 )
 
-MockableTimerCallbacks <- R6Class(
-  'MockableTimerCallbacks',
-  inherit = TimerCallbacks,
-  portable = FALSE,
-  class = FALSE,
-  public = list(
-    # Empty constructor defaults to the getNow implementation
-    initialize = function() {
-      super$initialize(self$mockNow)
-    },
-    mockNow = function() {
-      return(private$time)
-    },
-    elapse = function(millis) {
-      private$time <- private$time + millis
-    },
-    getElapsed = function() {
-      private$time
-    }
-  ), private = list(
-    time = 0L
-  )
-)
-
 timerCallbacks <- TimerCallbacks$new()
 
 scheduleTask <- function(millis, callback) {
@@ -121,27 +96,3 @@ scheduleTask <- function(millis, callback) {
     invisible(timerCallbacks$unschedule(id))
   }
 }
-
-#' Get a scheduler function for scheduling tasks. Give priority to the
-#' session scheduler, but if it doesn't exist, use the global one.
-#' @noRd
-defineScheduler <- function(session){
-  if (!is.null(session) && !is.null(session$.scheduleTask)){
-    return(session$.scheduleTask)
-  }
-  scheduleTask
-}
-
-
-#' Get the current time using the current reactive domain. This will try to use
-#' the session's .now() method, but if that's not available, it will just return
-#' the real time (from getTimeMs()). The purpose of this function is to allow
-#' MockableTimerCallbacks to work.
-#' @noRd
-getDomainTimeMs <- function(session){
-  if (!is.null(session) && !is.null(session$.now)){
-    return(session$.now())
-  } else {
-    getTimeMs()
-  }
-}

R/utils.R

@@ -316,15 +316,6 @@ resolve <- function(dir, relpath) {
   return(abs.path)
 }
 
-# Given a string, make sure it has a trailing slash.
-ensure_trailing_slash <- function(path) {
-  if (!grepl("/$", path)) {
-    path <- paste0(path, "/")
-  }
-  path
-}
-
-
 isWindows <- function() .Platform$OS.type == 'windows'
 
 # This is a wrapper for download.file and has the same interface.
@@ -809,14 +800,7 @@ dataTablesJSON <- function(data, req) {
 
   fdata <- unname(as.matrix(fdata))
   if (is.character(fdata) && q$escape != 'false') {
-    if (q$escape == 'true') {
-      # fdata must be a matrix at this point, and we need to preserve
-      # dimensions. Note that it could be a 1xn matrix.
-      dims <- dim(fdata)
-      fdata <- htmlEscape(fdata)
-      dim(fdata) <- dims
-
-    } else {
+    if (q$escape == 'true') fdata <- htmlEscape(fdata) else {
       k <- as.integer(strsplit(q$escape, ',')[[1]])
       # use seq_len() in case escape = negative indices, e.g. c(-1, -5)
       for (j in seq_len(ncol(fdata))[k]) fdata[, j] <- htmlEscape(fdata[, j])
@@ -1821,20 +1805,3 @@ cat_line <- function(...) {
   cat(paste(..., "\n", collapse = ""))
 }
 
-select_menu <- function(choices, title = NULL, msg = "Enter one or more numbers (with spaces), or an empty line to exit: \n") 
-{
-  if (!is.null(title)) {
-    cat(title, "\n", sep = "")
-  }
-  nc <- length(choices)
-  op <- paste0(format(seq_len(nc)), ": ", choices)
-  fop <- format(op)
-  cat("", fop, "", sep = "\n")
-  repeat {
-    answer <- readline(msg)
-    answer <- strsplit(answer, "[ ,]+")[[1]]
-    if (all(answer %in% seq_along(choices))) {
-      return(choices[as.integer(answer)])
-    }
-  }
-}

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](https://github.com/rstudio/shiny/blob/master/.github/CONTRIBUTING.md) file for detailed guidelines of how to contribute.
+We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](CONTRIBUTING.md) file for detailed guidelines of how to contribute.
 
 ## License
 

appveyor.yml

@@ -11,12 +11,7 @@ install:
   ps: Bootstrap
 
 cache:
-  # Bust library cache every time the description file changes
-  #   as appveyor cache can not be busted manually
-  # This helps get around errors such as "can't update curl because it's already loaded"
-  #  when trying to update the existing cache
-  # PR: https://github.com/rstudio/shiny/pull/2722
-  - C:\RLibrary -> DESCRIPTION
+  - C:\RLibrary
 
 # Adapt as necessary starting from here
 

inst/app_template/R/my-module.R

@@ -1,27 +0,0 @@
-mymoduleUI <- function(id, label = "Counter") {
-  # Al uses of Shiny input/output IDs in the UI must be namespaced,
-  # as in ns("x").
-  ns <- NS(id)
-  tagList(
-    actionButton(ns("button"), label = label),
-    verbatimTextOutput(ns("out"))
-  )
-}
-
-mymoduleServer <- function(id) {
-  # moduleServer() wraps a function to create the server component of a
-  # module.
-  moduleServer(
-    id,
-    function(input, output, session) {
-      count <- reactiveVal(0)
-      observeEvent(input$button, {
-        count(count() + 1)
-      })
-      output$out <- renderText({
-        count()
-      })
-      count
-    }
-  )
-}

inst/app_template/R/sort.R

@@ -1,5 +0,0 @@
-# Given a numeric vector, convert to strings, sort, and convert back to
-# numeric.
-lexical_sort <- function(x) {
-  as.numeric(sort(as.character(x)))
-}

inst/app_template/app.R

@@ -1,52 +0,0 @@
-ui <- fluidPage(
-{{
-# These blocks of code are processed with htmlTemplate()
-if (isTRUE(module)) {
-'  # ======== Modules ========
-  # mymoduleUI is defined in R/my-module.R
-  mymoduleUI("mymodule1", "Click counter #1"),
-  mymoduleUI("mymodule2", "Click counter #2"),
-  # =========================
-'
-}
-}}
-  wellPanel(
-    sliderInput("size", "Data size", min = 5, max = 20, value = 10),
-{{
-if (isTRUE(rdir)) {
-  '    div("Lexically sorted sequence:"),'
-} else {
-  '    div("Sorted sequence:"),'
-}
-}}
-    verbatimTextOutput("sequence")
-  )
-)
-
-server <- function(input, output, session) {
-{{
-if (isTRUE(module)) {
-'  # ======== Modules ========
-  # mymoduleServer is defined in R/my-module.R
-  mymoduleServer("mymodule1")
-  mymoduleServer("mymodule2")
-  # =========================
-'
-}
-}}
-  data <- reactive({
-{{
-if (isTRUE(rdir)) {
-'    # lexical_sort from R/sort.R
-    lexical_sort(seq_len(input$size))'
-} else {
-'    sort(seq_len(input$size))'
-}
-}}
-  })
-  output$sequence <- renderText({
-    paste(data(), collapse = " ")
-  })
-}
-
-shinyApp(ui, server)

inst/app_template/tests/server.R

@@ -1,6 +0,0 @@
-
-files <- list.files("./server", full.names = FALSE)
-origwd <- getwd()
-setwd("./server")
-on.exit(setwd(origwd), add=TRUE)
-lapply(files, source, local=environment())

inst/app_template/tests/server/test-mymodule.R

@@ -1,19 +0,0 @@
-# Use testthat just for expectations
-library(testthat)
-
-# See ?testServer for more information
-testServer(mymoduleServer, {
-  # Set initial value of a button
-  session$setInputs(button = 0)
-
-  # Check the value of the reactiveVal `count()`
-  expect_equal(count(), 1)
-  # Check the value of the renderText()
-  expect_equal(output$out, "1")
-
-  # Simulate a click
-  session$setInputs(button = 1)
-
-  expect_equal(count(), 2)
-  expect_equal(output$out, "2")
-})

inst/app_template/tests/server/test-server.R

@@ -1,11 +0,0 @@
-# Use testthat just for expectations
-library(testthat)
-
-testServer('../..', {
-  # Set the `size` slider and check the output
-  session$setInputs(size = 6)
-  expect_equal(output$sequence, "1 2 3 4 5 6")
-
-  session$setInputs(size = 12)
-  expect_equal(output$sequence, "1 2 3 4 5 6 7 8 9 10 11 12")
-})

inst/app_template/tests/shinytest.R

@@ -1,3 +0,0 @@
-library(shinytest)
-shinytest::testApp("../")
-

inst/app_template/tests/shinytest/mytest.R

@@ -1,7 +0,0 @@
-app <- ShinyDriver$new("../../")
-app$snapshotInit("mytest")
-
-app$snapshot()
-app$setInputs(`mymodule1-button` = "click")
-app$setInputs(`mymodule1-button` = "click")
-app$snapshot()

inst/app_template/tests/testthat.R

@@ -1,6 +0,0 @@
-library(testthat)
-
-# Run in the "current" environment, because shiny::runTests() is going to
-# provision a new environment that's just for our test. And we'll want access to
-# the supporting files that were already loaded into that env.
-testthat::test_dir("./testthat", env = environment())

inst/app_template/tests/testthat/helper-load.R

@@ -1,11 +0,0 @@
-
-# The RStudio IDE offers a "Run Tests" button when it sees testthat tests but it runs
-# in its own environment/process. Which means that any helpers we've loaded into our
-# environment won't be visible. So we add this helper not because it's actually needed
-# in the typical `shiny::runTests` workflow, but to make that IDE button work.
-# Once the IDE adds proper support for this style, we'll be able to drop these files.
-#
-# Note that this may redundantly source the files in your R/ dir depending on your
-# workflow.
-library(shiny)
-shiny::loadSupport("../../", renv = globalenv())

inst/app_template/tests/testthat/test-sort.R

@@ -1,5 +0,0 @@
-# Test the lexical_sort function from R/utils.R
-test_that("Lexical sorting works", {
-  expect_equal(lexical_sort(c(1, 2, 3)), c(1, 2, 3))
-  expect_equal(lexical_sort(c(1, 2, 3, 13, 11, 21)), c(1, 11, 13, 2, 21, 3))
-})

inst/staticdocs/index.r

@@ -0,0 +1,235 @@
+sd_section("UI Layout",
+  "Functions for laying out the user interface for your application.",
+  c(
+    "absolutePanel",
+    "bootstrapPage",
+    "column",
+    "conditionalPanel",
+    "fillPage",
+    "fillRow",
+    "fixedPage",
+    "fluidPage",
+    "helpText",
+    "icon",
+    "navbarPage",
+    "navlistPanel",
+    "sidebarLayout",
+    "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",
+    "loadSupport"
+  )
+)
+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",
+    "onStop",
+    "diskCache",
+    "memoryCache",
+    "reexports",
+    "findPort"
+  )
+)
+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/datatables/js/dataTables.bootstrap.js

@@ -29,8 +29,8 @@ $.extend( true, DataTable.defaults, {
 /* Default class modification */
 $.extend( DataTable.ext.classes, {
 	sWrapper:      "dataTables_wrapper form-inline dt-bootstrap",
-	sFilterInput:  "form-control form-control-sm input-sm",
-	sLengthSelect: "form-control form-control-sm input-sm"
+	sFilterInput:  "form-control input-sm",
+	sLengthSelect: "form-control input-sm"
 } );
 
 

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

@@ -1,266 +0,0 @@
-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.css

@@ -401,9 +401,6 @@ pre.shiny-text-output {
 /* Overrides bootstrap-datepicker3.css styling for invalid date ranges.
    See https://github.com/rstudio/shiny/issues/2042 for details. */
 .datepicker table tbody tr td.disabled,
-.datepicker table tbody tr td.disabled:hover,
-.datepicker table tbody tr td span.disabled,
-.datepicker table tbody tr td span.disabled:hover {
+.datepicker table tbody tr td.disabled:hover {
   color: #aaa;
-  cursor: not-allowed;
 }

man/HTML.Rd

@@ -0,0 +1,24 @@
+\name{HTML}
+\alias{HTML}
+\title{Mark Characters as HTML}
+\usage{
+HTML(text, ...)
+}
+\arguments{
+\item{text}{The text value to mark with HTML}
+
+\item{...}{Any additional values to be converted to character and
+concatenated together}
+}
+\value{
+The same value, but marked as HTML.
+}
+\description{
+Marks the given text as HTML, which means the \link{tag} functions will know
+not to perform HTML escaping on it.
+}
+\examples{
+el <- div(HTML("I like <u>turtles</u>"))
+cat(as.character(el))
+
+}

man/MockShinySession.Rd

@@ -1,746 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/mock-session.R
-\name{MockShinySession}
-\alias{MockShinySession}
-\title{Mock Shiny Session}
-\description{
-An R6 class suitable for testing that simulates the \code{session} parameter
-provided to Shiny server functions or modules.
-}
-\examples{
-
-## ------------------------------------------------
-## Method `MockShinySession$setInputs`
-## ------------------------------------------------
-
-s <- MockShinySession$new()
-s$setInputs(x=1, y=2)
-}
-\section{Public fields}{
-\if{html}{\out{<div class="r6-fields">}}
-\describe{
-\item{\code{env}}{The environment associated with the session.}
-
-\item{\code{returned}}{The value returned by the module.}
-
-\item{\code{singletons}}{Hardcoded as empty. Needed for rendering HTML (i.e. renderUI)}
-
-\item{\code{clientData}}{Mock client data that always returns a size for plots}
-
-\item{\code{output}}{The shinyoutputs associated with the session}
-
-\item{\code{input}}{The reactive inputs associated with the session}
-
-\item{\code{userData}}{An environment initialized as empty.}
-
-\item{\code{progressStack}}{A stack of progress objects}
-}
-\if{html}{\out{</div>}}
-}
-\section{Active bindings}{
-\if{html}{\out{<div class="r6-active-bindings">}}
-\describe{
-\item{\code{request}}{An empty environment where the request should be. The request isn't meaningfully mocked currently.}
-}
-\if{html}{\out{</div>}}
-}
-\section{Methods}{
-\subsection{Public methods}{
-\itemize{
-\item \href{#method-reactlog}{\code{MockShinySession$reactlog()}}
-\item \href{#method-incrementBusyCount}{\code{MockShinySession$incrementBusyCount()}}
-\item \href{#method-new}{\code{MockShinySession$new()}}
-\item \href{#method-onFlush}{\code{MockShinySession$onFlush()}}
-\item \href{#method-onFlushed}{\code{MockShinySession$onFlushed()}}
-\item \href{#method-onEnded}{\code{MockShinySession$onEnded()}}
-\item \href{#method-isEnded}{\code{MockShinySession$isEnded()}}
-\item \href{#method-isClosed}{\code{MockShinySession$isClosed()}}
-\item \href{#method-close}{\code{MockShinySession$close()}}
-\item \href{#method-cycleStartAction}{\code{MockShinySession$cycleStartAction()}}
-\item \href{#method-fileUrl}{\code{MockShinySession$fileUrl()}}
-\item \href{#method-setInputs}{\code{MockShinySession$setInputs()}}
-\item \href{#method-.scheduleTask}{\code{MockShinySession$.scheduleTask()}}
-\item \href{#method-elapse}{\code{MockShinySession$elapse()}}
-\item \href{#method-.now}{\code{MockShinySession$.now()}}
-\item \href{#method-defineOutput}{\code{MockShinySession$defineOutput()}}
-\item \href{#method-getOutput}{\code{MockShinySession$getOutput()}}
-\item \href{#method-registerDataObj}{\code{MockShinySession$registerDataObj()}}
-\item \href{#method-allowReconnect}{\code{MockShinySession$allowReconnect()}}
-\item \href{#method-reload}{\code{MockShinySession$reload()}}
-\item \href{#method-resetBrush}{\code{MockShinySession$resetBrush()}}
-\item \href{#method-sendCustomMessage}{\code{MockShinySession$sendCustomMessage()}}
-\item \href{#method-sendBinaryMessage}{\code{MockShinySession$sendBinaryMessage()}}
-\item \href{#method-sendInputMessage}{\code{MockShinySession$sendInputMessage()}}
-\item \href{#method-setBookmarkExclude}{\code{MockShinySession$setBookmarkExclude()}}
-\item \href{#method-getBookmarkExclude}{\code{MockShinySession$getBookmarkExclude()}}
-\item \href{#method-onBookmark}{\code{MockShinySession$onBookmark()}}
-\item \href{#method-onBookmarked}{\code{MockShinySession$onBookmarked()}}
-\item \href{#method-doBookmark}{\code{MockShinySession$doBookmark()}}
-\item \href{#method-onRestore}{\code{MockShinySession$onRestore()}}
-\item \href{#method-onRestored}{\code{MockShinySession$onRestored()}}
-\item \href{#method-exportTestValues}{\code{MockShinySession$exportTestValues()}}
-\item \href{#method-getTestSnapshotUrl}{\code{MockShinySession$getTestSnapshotUrl()}}
-\item \href{#method-ns}{\code{MockShinySession$ns()}}
-\item \href{#method-flushReact}{\code{MockShinySession$flushReact()}}
-\item \href{#method-makeScope}{\code{MockShinySession$makeScope()}}
-\item \href{#method-setEnv}{\code{MockShinySession$setEnv()}}
-\item \href{#method-setReturned}{\code{MockShinySession$setReturned()}}
-\item \href{#method-getReturned}{\code{MockShinySession$getReturned()}}
-\item \href{#method-genId}{\code{MockShinySession$genId()}}
-\item \href{#method-clone}{\code{MockShinySession$clone()}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-reactlog"></a>}}
-\if{latex}{\out{\hypertarget{method-reactlog}{}}}
-\subsection{Method \code{reactlog()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$reactlog(logEntry)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{logEntry}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-incrementBusyCount"></a>}}
-\if{latex}{\out{\hypertarget{method-incrementBusyCount}{}}}
-\subsection{Method \code{incrementBusyCount()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$incrementBusyCount()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-new"></a>}}
-\if{latex}{\out{\hypertarget{method-new}{}}}
-\subsection{Method \code{new()}}{
-Create a new MockShinySession
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$new()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onFlush"></a>}}
-\if{latex}{\out{\hypertarget{method-onFlush}{}}}
-\subsection{Method \code{onFlush()}}{
-Define a callback to be invoked before a reactive flush
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onFlush(fun, once = TRUE)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{fun}}{The function to invoke}
-
-\item{\code{once}}{If \code{TRUE}, will only run once. Otherwise, will run every time reactives are flushed.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onFlushed"></a>}}
-\if{latex}{\out{\hypertarget{method-onFlushed}{}}}
-\subsection{Method \code{onFlushed()}}{
-Define a callback to be invoked after a reactive flush
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onFlushed(fun, once = TRUE)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{fun}}{The function to invoke}
-
-\item{\code{once}}{If \code{TRUE}, will only run once. Otherwise, will run every time reactives are flushed.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-onEnded}{}}}
-\subsection{Method \code{onEnded()}}{
-Define a callback to be invoked when the session ends
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onEnded(sessionEndedCallback)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{sessionEndedCallback}}{The callback to invoke when the session has ended.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-isEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-isEnded}{}}}
-\subsection{Method \code{isEnded()}}{
-Returns \code{FALSE} if the session has not yet been closed
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$isEnded()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-isClosed"></a>}}
-\if{latex}{\out{\hypertarget{method-isClosed}{}}}
-\subsection{Method \code{isClosed()}}{
-Returns \code{FALSE} if the session has not yet been closed
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$isClosed()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-close"></a>}}
-\if{latex}{\out{\hypertarget{method-close}{}}}
-\subsection{Method \code{close()}}{
-Closes the session
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$close()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-cycleStartAction"></a>}}
-\if{latex}{\out{\hypertarget{method-cycleStartAction}{}}}
-\subsection{Method \code{cycleStartAction()}}{
-Unsophisticated mock implementation that merely invokes
-the given callback immediately.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$cycleStartAction(callback)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{callback}}{The callback ato be invoked.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-fileUrl"></a>}}
-\if{latex}{\out{\hypertarget{method-fileUrl}{}}}
-\subsection{Method \code{fileUrl()}}{
-Base64-encode the given file. Needed for image rendering.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$fileUrl(name, file, contentType = "application/octet-stream")}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{name}}{Not used}
-
-\item{\code{file}}{The file to be encoded}
-
-\item{\code{contentType}}{The content type of the base64-encoded string}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setInputs"></a>}}
-\if{latex}{\out{\hypertarget{method-setInputs}{}}}
-\subsection{Method \code{setInputs()}}{
-Sets reactive values associated with the \code{session$inputs} object
-and flushes the reactives.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$setInputs(...)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{...}}{The inputs to set.}
-}
-\if{html}{\out{</div>}}
-}
-\subsection{Examples}{
-\if{html}{\out{<div class="r example copy">}}
-\preformatted{s <- MockShinySession$new()
-s$setInputs(x=1, y=2)
-}
-\if{html}{\out{</div>}}
-
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-.scheduleTask"></a>}}
-\if{latex}{\out{\hypertarget{method-.scheduleTask}{}}}
-\subsection{Method \code{.scheduleTask()}}{
-An internal method which shouldn't be used by others.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$.scheduleTask(millis, callback)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{millis}}{The number of milliseconds on which to schedule a callback}
-
-\item{\code{callback}}{The function to schedule}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-elapse"></a>}}
-\if{latex}{\out{\hypertarget{method-elapse}{}}}
-\subsection{Method \code{elapse()}}{
-Simulate the passing of time by the given number of milliseconds.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$elapse(millis)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{millis}}{The number of milliseconds to advance time.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-.now"></a>}}
-\if{latex}{\out{\hypertarget{method-.now}{}}}
-\subsection{Method \code{.now()}}{
-An internal method which shouldn't be used by others.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$.now()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-defineOutput"></a>}}
-\if{latex}{\out{\hypertarget{method-defineOutput}{}}}
-\subsection{Method \code{defineOutput()}}{
-An internal method which shouldn't be used by others.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$defineOutput(name, func, label)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{name}}{The name of the output}
-
-\item{\code{func}}{The render definition}
-
-\item{\code{label}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getOutput"></a>}}
-\if{latex}{\out{\hypertarget{method-getOutput}{}}}
-\subsection{Method \code{getOutput()}}{
-An internal method which shouldn't be used by others.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$getOutput(name)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{name}}{The name of the output}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-registerDataObj"></a>}}
-\if{latex}{\out{\hypertarget{method-registerDataObj}{}}}
-\subsection{Method \code{registerDataObj()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$registerDataObj(name, data, filterFunc)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{name}}{Not used}
-
-\item{\code{data}}{Not used}
-
-\item{\code{filterFunc}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-allowReconnect"></a>}}
-\if{latex}{\out{\hypertarget{method-allowReconnect}{}}}
-\subsection{Method \code{allowReconnect()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$allowReconnect(value)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{value}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-reload"></a>}}
-\if{latex}{\out{\hypertarget{method-reload}{}}}
-\subsection{Method \code{reload()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$reload()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-resetBrush"></a>}}
-\if{latex}{\out{\hypertarget{method-resetBrush}{}}}
-\subsection{Method \code{resetBrush()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$resetBrush(brushId)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{brushId}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-sendCustomMessage"></a>}}
-\if{latex}{\out{\hypertarget{method-sendCustomMessage}{}}}
-\subsection{Method \code{sendCustomMessage()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$sendCustomMessage(type, message)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{type}}{Not used}
-
-\item{\code{message}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-sendBinaryMessage"></a>}}
-\if{latex}{\out{\hypertarget{method-sendBinaryMessage}{}}}
-\subsection{Method \code{sendBinaryMessage()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$sendBinaryMessage(type, message)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{type}}{Not used}
-
-\item{\code{message}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-sendInputMessage"></a>}}
-\if{latex}{\out{\hypertarget{method-sendInputMessage}{}}}
-\subsection{Method \code{sendInputMessage()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$sendInputMessage(inputId, message)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{inputId}}{Not used}
-
-\item{\code{message}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setBookmarkExclude"></a>}}
-\if{latex}{\out{\hypertarget{method-setBookmarkExclude}{}}}
-\subsection{Method \code{setBookmarkExclude()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$setBookmarkExclude(names)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{names}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getBookmarkExclude"></a>}}
-\if{latex}{\out{\hypertarget{method-getBookmarkExclude}{}}}
-\subsection{Method \code{getBookmarkExclude()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$getBookmarkExclude()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onBookmark"></a>}}
-\if{latex}{\out{\hypertarget{method-onBookmark}{}}}
-\subsection{Method \code{onBookmark()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onBookmark(fun)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{fun}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onBookmarked"></a>}}
-\if{latex}{\out{\hypertarget{method-onBookmarked}{}}}
-\subsection{Method \code{onBookmarked()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onBookmarked(fun)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{fun}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-doBookmark"></a>}}
-\if{latex}{\out{\hypertarget{method-doBookmark}{}}}
-\subsection{Method \code{doBookmark()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$doBookmark()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onRestore"></a>}}
-\if{latex}{\out{\hypertarget{method-onRestore}{}}}
-\subsection{Method \code{onRestore()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onRestore(fun)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{fun}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onRestored"></a>}}
-\if{latex}{\out{\hypertarget{method-onRestored}{}}}
-\subsection{Method \code{onRestored()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$onRestored(fun)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{fun}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-exportTestValues"></a>}}
-\if{latex}{\out{\hypertarget{method-exportTestValues}{}}}
-\subsection{Method \code{exportTestValues()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$exportTestValues()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getTestSnapshotUrl"></a>}}
-\if{latex}{\out{\hypertarget{method-getTestSnapshotUrl}{}}}
-\subsection{Method \code{getTestSnapshotUrl()}}{
-No-op
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$getTestSnapshotUrl(
-  input = TRUE,
-  output = TRUE,
-  export = TRUE,
-  format = "json"
-)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{input}}{Not used}
-
-\item{\code{output}}{Not used}
-
-\item{\code{export}}{Not used}
-
-\item{\code{format}}{Not used}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-ns"></a>}}
-\if{latex}{\out{\hypertarget{method-ns}{}}}
-\subsection{Method \code{ns()}}{
-Returns the given id prefixed by this namespace's id.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$ns(id)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{id}}{The id to modify.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-flushReact"></a>}}
-\if{latex}{\out{\hypertarget{method-flushReact}{}}}
-\subsection{Method \code{flushReact()}}{
-Trigger a reactive flush right now.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$flushReact()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-makeScope"></a>}}
-\if{latex}{\out{\hypertarget{method-makeScope}{}}}
-\subsection{Method \code{makeScope()}}{
-Create and return a namespace-specific session proxy.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$makeScope(namespace)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{namespace}}{Character vector indicating a namespace.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setEnv"></a>}}
-\if{latex}{\out{\hypertarget{method-setEnv}{}}}
-\subsection{Method \code{setEnv()}}{
-Set the environment associated with a testServer() call.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$setEnv(env)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{env}}{The environment to retain.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setReturned"></a>}}
-\if{latex}{\out{\hypertarget{method-setReturned}{}}}
-\subsection{Method \code{setReturned()}}{
-Set the value returned by the module call and proactively flush.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$setReturned(value)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{value}}{The value returned from the module}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getReturned"></a>}}
-\if{latex}{\out{\hypertarget{method-getReturned}{}}}
-\subsection{Method \code{getReturned()}}{
-Get the value returned by the module call.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$getReturned()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-genId"></a>}}
-\if{latex}{\out{\hypertarget{method-genId}{}}}
-\subsection{Method \code{genId()}}{
-Return a distinct character identifier for use as a proxy
-namespace.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$genId()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-clone"></a>}}
-\if{latex}{\out{\hypertarget{method-clone}{}}}
-\subsection{Method \code{clone()}}{
-The objects of this class are cloneable with this method.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{MockShinySession$clone(deep = FALSE)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{deep}}{Whether to make a deep clone.}
-}
-\if{html}{\out{</div>}}
-}
-}
-}

man/NS.Rd

@@ -5,9 +5,7 @@
 \alias{NS}
 \alias{ns.sep}
 \title{Namespaced IDs for inputs/outputs}
-\format{
-An object of class \code{character} of length 1.
-}
+\format{An object of class \code{character} of length 1.}
 \usage{
 NS(namespace, id = NULL)
 

man/Progress.Rd

@@ -1,16 +1,47 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/progress.R
+\docType{data}
 \name{Progress}
 \alias{Progress}
 \title{Reporting progress (object-oriented API)}
-\description{
-Reporting progress (object-oriented API)
+\arguments{
+\item{session}{The Shiny session object, as provided by
+\code{shinyServer} to the server function.}
 
-Reporting progress (object-oriented API)
+\item{min}{The value that represents the starting point of the
+progress bar. Must be less than \code{max}.}
+
+\item{max}{The value that represents the end of the progress bar.
+Must be greater than \code{min}.}
+
+\item{message}{A single-element character vector; the message to be
+displayed to the user, or \code{NULL} to hide the current message
+(if any).}
+
+\item{detail}{A single-element character vector; the detail message
+to be displayed to the user, or \code{NULL} to hide the current
+detail message (if any). The detail message will be shown with a
+de-emphasized appearance relative to \code{message}.}
+
+\item{value}{A numeric value at which to set
+the progress bar, relative to \code{min} and \code{max}.}
+
+\item{style}{Progress display style. If \code{"notification"} (the default),
+the progress indicator will show using Shiny's notification API. If
+\code{"old"}, use the same HTML and CSS used in Shiny 0.13.2 and below
+(this is for backward-compatibility).}
+
+\item{amount}{Single-element numeric vector; the value at which to set
+the progress bar, relative to \code{min} and \code{max}.
+\code{NULL} hides the progress bar, if it is currently visible.}
+
+\item{amount}{For the \code{inc()} method, a numeric value to increment the
+progress bar.}
+}
+\description{
+Reports progress to the user during long-running operations.
 }
 \details{
-Reports progress to the user during long-running operations.
-
 This package exposes two distinct programming APIs for working with
 progress. \code{\link[=withProgress]{withProgress()}} and \code{\link[=setProgress]{setProgress()}}
 together provide a simple function-based interface, while the
@@ -28,6 +59,26 @@ CSS), you can use \code{style="old"} each time you call
 \code{Progress$new} is called, you can instead call
 \code{\link[=shinyOptions]{shinyOptions(progress.style="old")}} just once, inside the server
 function.
+
+\strong{Methods}
+\describe{
+\item{\code{initialize(session, min = 0, max = 1)}}{
+Creates a new progress panel (but does not display it).
+}
+\item{\code{set(value = NULL, message = NULL, detail = NULL)}}{
+Updates the progress panel. When called the first time, the
+progress panel is displayed.
+}
+\item{\code{inc(amount = 0.1, message = NULL, detail = NULL)}}{
+Like \code{set}, this updates the progress panel. The difference is
+that \code{inc} increases the progress bar by \code{amount}, instead
+of setting it to a specific value.
+}
+\item{\code{close()}}{
+Removes the progress panel. Future calls to \code{set} and
+\code{close} will be ignored.
+}
+}
 }
 \examples{
 ## Only run examples in interactive R sessions
@@ -59,165 +110,4 @@ shinyApp(ui, server)
 \seealso{
 \code{\link[=withProgress]{withProgress()}}
 }
-\section{Methods}{
-\subsection{Public methods}{
-\itemize{
-\item \href{#method-new}{\code{Progress$new()}}
-\item \href{#method-set}{\code{Progress$set()}}
-\item \href{#method-inc}{\code{Progress$inc()}}
-\item \href{#method-getMin}{\code{Progress$getMin()}}
-\item \href{#method-getMax}{\code{Progress$getMax()}}
-\item \href{#method-getValue}{\code{Progress$getValue()}}
-\item \href{#method-close}{\code{Progress$close()}}
-\item \href{#method-clone}{\code{Progress$clone()}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-new"></a>}}
-\if{latex}{\out{\hypertarget{method-new}{}}}
-\subsection{Method \code{new()}}{
-Creates a new progress panel (but does not display it).
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$new(
-  session = getDefaultReactiveDomain(),
-  min = 0,
-  max = 1,
-  style = getShinyOption("progress.style", default = "notification")
-)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{session}}{The Shiny session object, as provided by \code{shinyServer} to
-the server function.}
-
-\item{\code{min}}{The value that represents the starting point of the progress
-bar. Must be less than \code{max}.}
-
-\item{\code{max}}{The value that represents the end of the progress bar. Must be
-greater than \code{min}.}
-
-\item{\code{style}}{Progress display style. If \code{"notification"} (the default),
-the progress indicator will show using Shiny's notification API. If
-\code{"old"}, use the same HTML and CSS used in Shiny 0.13.2 and below (this
-is for backward-compatibility).}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-set"></a>}}
-\if{latex}{\out{\hypertarget{method-set}{}}}
-\subsection{Method \code{set()}}{
-Updates the progress panel. When called the first time, the
-progress panel is displayed.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$set(value = NULL, message = NULL, detail = NULL)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{value}}{Single-element numeric vector; the value at which to set the
-progress bar, relative to \code{min} and \code{max}. \code{NULL} hides the progress
-bar, if it is currently visible.}
-
-\item{\code{message}}{A single-element character vector; the message to be
-displayed to the user, or \code{NULL} to hide the current message (if any).}
-
-\item{\code{detail}}{A single-element character vector; the detail message to be
-displayed to the user, or \code{NULL} to hide the current detail message (if
-any). The detail message will be shown with a de-emphasized appearance
-relative to \code{message}.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-inc"></a>}}
-\if{latex}{\out{\hypertarget{method-inc}{}}}
-\subsection{Method \code{inc()}}{
-Like \code{set}, this updates the progress panel. The difference
-is that \code{inc} increases the progress bar by \code{amount}, instead of
-setting it to a specific value.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$inc(amount = 0.1, message = NULL, detail = NULL)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{amount}}{For the \code{inc()} method, a numeric value to increment the
-progress bar.}
-
-\item{\code{message}}{A single-element character vector; the message to be
-displayed to the user, or \code{NULL} to hide the current message (if any).}
-
-\item{\code{detail}}{A single-element character vector; the detail message to be
-displayed to the user, or \code{NULL} to hide the current detail message (if
-any). The detail message will be shown with a de-emphasized appearance
-relative to \code{message}.}
-}
-\if{html}{\out{</div>}}
-}
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getMin"></a>}}
-\if{latex}{\out{\hypertarget{method-getMin}{}}}
-\subsection{Method \code{getMin()}}{
-Returns the minimum value.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$getMin()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getMax"></a>}}
-\if{latex}{\out{\hypertarget{method-getMax}{}}}
-\subsection{Method \code{getMax()}}{
-Returns the maximum value.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$getMax()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getValue"></a>}}
-\if{latex}{\out{\hypertarget{method-getValue}{}}}
-\subsection{Method \code{getValue()}}{
-Returns the current value.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$getValue()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-close"></a>}}
-\if{latex}{\out{\hypertarget{method-close}{}}}
-\subsection{Method \code{close()}}{
-Removes the progress panel. Future calls to \code{set} and
-\code{close} will be ignored.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$close()}\if{html}{\out{</div>}}
-}
-
-}
-\if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-clone"></a>}}
-\if{latex}{\out{\hypertarget{method-clone}{}}}
-\subsection{Method \code{clone()}}{
-The objects of this class are cloneable with this method.
-\subsection{Usage}{
-\if{html}{\out{<div class="r">}}\preformatted{Progress$clone(deep = FALSE)}\if{html}{\out{</div>}}
-}
-
-\subsection{Arguments}{
-\if{html}{\out{<div class="arguments">}}
-\describe{
-\item{\code{deep}}{Whether to make a deep clone.}
-}
-\if{html}{\out{</div>}}
-}
-}
-}
+\keyword{datasets}

man/absolutePanel.Rd

@@ -5,30 +5,13 @@
 \alias{fixedPanel}
 \title{Panel with absolute positioning}
 \usage{
-absolutePanel(
-  ...,
-  top = NULL,
-  left = NULL,
-  right = NULL,
-  bottom = NULL,
-  width = NULL,
-  height = NULL,
-  draggable = FALSE,
-  fixed = FALSE,
-  cursor = c("auto", "move", "default", "inherit")
-)
+absolutePanel(..., top = NULL, left = NULL, right = NULL,
+  bottom = NULL, width = NULL, height = NULL, draggable = FALSE,
+  fixed = FALSE, cursor = c("auto", "move", "default", "inherit"))
 
-fixedPanel(
-  ...,
-  top = NULL,
-  left = NULL,
-  right = NULL,
-  bottom = NULL,
-  width = NULL,
-  height = NULL,
-  draggable = FALSE,
-  cursor = c("auto", "move", "default", "inherit")
-)
+fixedPanel(..., top = NULL, left = NULL, right = NULL,
+  bottom = NULL, width = NULL, height = NULL, draggable = FALSE,
+  cursor = c("auto", "move", "default", "inherit"))
 }
 \arguments{
 \item{...}{Attributes (named arguments) or children (unnamed arguments) that
@@ -70,7 +53,7 @@ An HTML element or list of elements.
 Creates a panel whose contents are absolutely positioned.
 }
 \details{
-The \code{absolutePanel} function creates a \verb{<div>} tag whose CSS
+The \code{absolutePanel} function creates a \code{<div>} tag whose CSS
 position is set to \code{absolute} (or fixed if \code{fixed = TRUE}). The way
 absolute positioning works in HTML is that absolute coordinates are specified
 relative to its nearest parent element whose position is not set to

man/actionButton.Rd

@@ -26,24 +26,13 @@ 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()) {
 
 ui <- fluidPage(
   sliderInput("obs", "Number of observations", 0, 1000, 500),
-  actionButton("goButton", "Go!", class = "btn-success"),
+  actionButton("goButton", "Go!"),
   plotOutput("distPlot")
 )
 
@@ -63,28 +52,17 @@ shinyApp(ui, server)
 
 }
 
-## Example of adding extra class values
-actionButton("largeButton", "Large Primary Button", class = "btn-primary btn-lg")
-actionLink("infoLink", "Information Link", class = "btn-info")
-
 }
 \seealso{
 \code{\link[=observeEvent]{observeEvent()}} and \code{\link[=eventReactive]{eventReactive()}}
 
-Other input elements: 
-\code{\link{checkboxGroupInput}()},
-\code{\link{checkboxInput}()},
-\code{\link{dateInput}()},
-\code{\link{dateRangeInput}()},
-\code{\link{fileInput}()},
-\code{\link{numericInput}()},
-\code{\link{passwordInput}()},
-\code{\link{radioButtons}()},
-\code{\link{selectInput}()},
-\code{\link{sliderInput}()},
-\code{\link{submitButton}()},
-\code{\link{textAreaInput}()},
-\code{\link{textInput}()},
-\code{\link{varSelectInput}()}
+Other input elements: \code{\link{checkboxGroupInput}},
+  \code{\link{checkboxInput}}, \code{\link{dateInput}},
+  \code{\link{dateRangeInput}}, \code{\link{fileInput}},
+  \code{\link{numericInput}}, \code{\link{passwordInput}},
+  \code{\link{radioButtons}}, \code{\link{selectInput}},
+  \code{\link{sliderInput}}, \code{\link{submitButton}},
+  \code{\link{textAreaInput}}, \code{\link{textInput}},
+  \code{\link{varSelectInput}}
 }
 \concept{input elements}

man/bookmarkButton.Rd

@@ -4,13 +4,10 @@
 \alias{bookmarkButton}
 \title{Create a button for bookmarking/sharing}
 \usage{
-bookmarkButton(
-  label = "Bookmark...",
-  icon = shiny::icon("link", lib = "glyphicon"),
+bookmarkButton(label = "Bookmark...", icon = shiny::icon("link", lib =
+  "glyphicon"),
   title = "Bookmark this application's state and get a URL for sharing.",
-  ...,
-  id = "._bookmark_"
-)
+  ..., id = "._bookmark_")
 }
 \arguments{
 \item{label}{The contents of the button or link--usually a text label, but

man/brushOpts.Rd

@@ -4,17 +4,9 @@
 \alias{brushOpts}
 \title{Create an object representing brushing options}
 \usage{
-brushOpts(
-  id = NULL,
-  fill = "#9cf",
-  stroke = "#036",
-  opacity = 0.25,
-  delay = 300,
-  delayType = c("debounce", "throttle"),
-  clip = TRUE,
-  direction = c("xy", "x", "y"),
-  resetOnNew = FALSE
-)
+brushOpts(id = NULL, fill = "#9cf", stroke = "#036",
+  opacity = 0.25, delay = 300, delayType = c("debounce", "throttle"),
+  clip = TRUE, direction = c("xy", "x", "y"), resetOnNew = FALSE)
 }
 \arguments{
 \item{id}{Input value name. For example, if the value is \code{"plot_brush"},

man/brushedPoints.Rd

@@ -4,15 +4,8 @@
 \alias{brushedPoints}
 \title{Find rows of data that are selected by a brush}
 \usage{
-brushedPoints(
-  df,
-  brush,
-  xvar = NULL,
-  yvar = NULL,
-  panelvar1 = NULL,
-  panelvar2 = NULL,
-  allRows = FALSE
-)
+brushedPoints(df, brush, xvar = NULL, yvar = NULL, panelvar1 = NULL,
+  panelvar2 = NULL, allRows = FALSE)
 }
 \arguments{
 \item{df}{A data frame from which to select rows.}

man/builder.Rd

@@ -0,0 +1,124 @@
+\name{builder}
+\alias{builder}
+\alias{tags}
+\alias{p}
+\alias{h1}
+\alias{h2}
+\alias{h3}
+\alias{h4}
+\alias{h5}
+\alias{h6}
+\alias{a}
+\alias{br}
+\alias{div}
+\alias{span}
+\alias{pre}
+\alias{code}
+\alias{img}
+\alias{strong}
+\alias{em}
+\alias{hr}
+\title{HTML Builder Functions}
+\usage{
+tags
+
+p(..., .noWS = NULL)
+
+h1(..., .noWS = NULL)
+
+h2(..., .noWS = NULL)
+
+h3(..., .noWS = NULL)
+
+h4(..., .noWS = NULL)
+
+h5(..., .noWS = NULL)
+
+h6(..., .noWS = NULL)
+
+a(..., .noWS = NULL)
+
+br(..., .noWS = NULL)
+
+div(..., .noWS = NULL)
+
+span(..., .noWS = NULL)
+
+pre(..., .noWS = NULL)
+
+code(..., .noWS = NULL)
+
+img(..., .noWS = NULL)
+
+strong(..., .noWS = NULL)
+
+em(..., .noWS = NULL)
+
+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), 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.
+}
+\details{
+The \code{tags} environment contains convenience functions for all valid
+HTML5 tags. To generate tags that are not part of the HTML5 specification,
+you can use the \code{\link{tag}()} function.
+
+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{as.character}()}.
+}
+\examples{
+doc <- tags$html(
+  tags$head(
+    tags$title('My first page')
+  ),
+  tags$body(
+    h1('My first heading'),
+    p('My first paragraph, with some ',
+      strong('bold'),
+      ' text.'),
+    div(id='myDiv', class='simpleDiv',
+        'Here is a div with some attributes.')
+  )
+)
+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/callModule.Rd

@@ -0,0 +1,31 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/modules.R
+\name{callModule}
+\alias{callModule}
+\title{Invoke a Shiny module}
+\usage{
+callModule(module, id, ..., session = getDefaultReactiveDomain())
+}
+\arguments{
+\item{module}{A Shiny module server function}
+
+\item{id}{An ID string that corresponds with the ID used to call the module's
+UI function}
+
+\item{...}{Additional parameters to pass to module server function}
+
+\item{session}{Session from which to make a child scope (the default should
+almost always be used)}
+}
+\value{
+The return value, if any, from executing the module server function
+}
+\description{
+Shiny's module feature lets you break complicated UI and server logic into
+smaller, self-contained pieces. Compared to large monolithic Shiny apps,
+modules are easier to reuse and easier to reason about. See the article at
+\url{http://shiny.rstudio.com/articles/modules.html} to learn more.
+}
+\seealso{
+\url{http://shiny.rstudio.com/articles/modules.html}
+}

man/checkboxGroupInput.Rd

@@ -4,16 +4,9 @@
 \alias{checkboxGroupInput}
 \title{Checkbox Group Input Control}
 \usage{
-checkboxGroupInput(
-  inputId,
-  label,
-  choices = NULL,
-  selected = NULL,
-  inline = FALSE,
-  width = NULL,
-  choiceNames = NULL,
-  choiceValues = NULL
-)
+checkboxGroupInput(inputId, label, choices = NULL, selected = NULL,
+  inline = FALSE, width = NULL, choiceNames = NULL,
+  choiceValues = NULL)
 }
 \arguments{
 \item{inputId}{The \code{input} slot that will be used to access the value.}
@@ -51,11 +44,6 @@ 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()) {
@@ -100,20 +88,13 @@ shinyApp(ui, server)
 \seealso{
 \code{\link[=checkboxInput]{checkboxInput()}}, \code{\link[=updateCheckboxGroupInput]{updateCheckboxGroupInput()}}
 
-Other input elements: 
-\code{\link{actionButton}()},
-\code{\link{checkboxInput}()},
-\code{\link{dateInput}()},
-\code{\link{dateRangeInput}()},
-\code{\link{fileInput}()},
-\code{\link{numericInput}()},
-\code{\link{passwordInput}()},
-\code{\link{radioButtons}()},
-\code{\link{selectInput}()},
-\code{\link{sliderInput}()},
-\code{\link{submitButton}()},
-\code{\link{textAreaInput}()},
-\code{\link{textInput}()},
-\code{\link{varSelectInput}()}
+Other input elements: \code{\link{actionButton}},
+  \code{\link{checkboxInput}}, \code{\link{dateInput}},
+  \code{\link{dateRangeInput}}, \code{\link{fileInput}},
+  \code{\link{numericInput}}, \code{\link{passwordInput}},
+  \code{\link{radioButtons}}, \code{\link{selectInput}},
+  \code{\link{sliderInput}}, \code{\link{submitButton}},
+  \code{\link{textAreaInput}}, \code{\link{textInput}},
+  \code{\link{varSelectInput}}
 }
 \concept{input elements}

man/checkboxInput.Rd

@@ -22,11 +22,6 @@ 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()) {
@@ -40,25 +35,17 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
-
 }
 \seealso{
 \code{\link[=checkboxGroupInput]{checkboxGroupInput()}}, \code{\link[=updateCheckboxInput]{updateCheckboxInput()}}
 
-Other input elements: 
-\code{\link{actionButton}()},
-\code{\link{checkboxGroupInput}()},
-\code{\link{dateInput}()},
-\code{\link{dateRangeInput}()},
-\code{\link{fileInput}()},
-\code{\link{numericInput}()},
-\code{\link{passwordInput}()},
-\code{\link{radioButtons}()},
-\code{\link{selectInput}()},
-\code{\link{sliderInput}()},
-\code{\link{submitButton}()},
-\code{\link{textAreaInput}()},
-\code{\link{textInput}()},
-\code{\link{varSelectInput}()}
+Other input elements: \code{\link{actionButton}},
+  \code{\link{checkboxGroupInput}},
+  \code{\link{dateInput}}, \code{\link{dateRangeInput}},
+  \code{\link{fileInput}}, \code{\link{numericInput}},
+  \code{\link{passwordInput}}, \code{\link{radioButtons}},
+  \code{\link{selectInput}}, \code{\link{sliderInput}},
+  \code{\link{submitButton}}, \code{\link{textAreaInput}},
+  \code{\link{textInput}}, \code{\link{varSelectInput}}
 }
 \concept{input elements}

man/createRenderFunction.Rd

@@ -4,12 +4,8 @@
 \alias{createRenderFunction}
 \title{Implement render functions}
 \usage{
-createRenderFunction(
-  func,
-  transform = function(value, session, name, ...) value,
-  outputFunc = NULL,
-  outputArgs = NULL
-)
+createRenderFunction(func, transform = function(value, session, name,
+  ...) value, outputFunc = NULL, outputArgs = NULL)
 }
 \arguments{
 \item{func}{A function without parameters, that returns user data. If the

man/dateInput.Rd

@@ -4,21 +4,10 @@
 \alias{dateInput}
 \title{Create date input}
 \usage{
-dateInput(
-  inputId,
-  label,
-  value = NULL,
-  min = NULL,
-  max = NULL,
-  format = "yyyy-mm-dd",
-  startview = "month",
-  weekstart = 0,
-  language = "en",
-  width = NULL,
-  autoclose = TRUE,
-  datesdisabled = NULL,
-  daysofweekdisabled = NULL
-)
+dateInput(inputId, label, value = NULL, min = NULL, max = NULL,
+  format = "yyyy-mm-dd", startview = "month", weekstart = 0,
+  language = "en", width = NULL, autoclose = TRUE,
+  datesdisabled = NULL, daysofweekdisabled = NULL)
 }
 \arguments{
 \item{inputId}{The \code{input} slot that will be used to access the value.}
@@ -86,11 +75,6 @@ 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()) {
@@ -126,25 +110,18 @@ ui <- fluidPage(
 
 shinyApp(ui, server = function(input, output) { })
 }
-
 }
 \seealso{
 \code{\link[=dateRangeInput]{dateRangeInput()}}, \code{\link[=updateDateInput]{updateDateInput()}}
 
-Other input elements: 
-\code{\link{actionButton}()},
-\code{\link{checkboxGroupInput}()},
-\code{\link{checkboxInput}()},
-\code{\link{dateRangeInput}()},
-\code{\link{fileInput}()},
-\code{\link{numericInput}()},
-\code{\link{passwordInput}()},
-\code{\link{radioButtons}()},
-\code{\link{selectInput}()},
-\code{\link{sliderInput}()},
-\code{\link{submitButton}()},
-\code{\link{textAreaInput}()},
-\code{\link{textInput}()},
-\code{\link{varSelectInput}()}
+Other input elements: \code{\link{actionButton}},
+  \code{\link{checkboxGroupInput}},
+  \code{\link{checkboxInput}},
+  \code{\link{dateRangeInput}}, \code{\link{fileInput}},
+  \code{\link{numericInput}}, \code{\link{passwordInput}},
+  \code{\link{radioButtons}}, \code{\link{selectInput}},
+  \code{\link{sliderInput}}, \code{\link{submitButton}},
+  \code{\link{textAreaInput}}, \code{\link{textInput}},
+  \code{\link{varSelectInput}}
 }
 \concept{input elements}

man/dateRangeInput.Rd

@@ -4,21 +4,10 @@
 \alias{dateRangeInput}
 \title{Create date range input}
 \usage{
-dateRangeInput(
-  inputId,
-  label,
-  start = NULL,
-  end = NULL,
-  min = NULL,
-  max = NULL,
-  format = "yyyy-mm-dd",
-  startview = "month",
-  weekstart = 0,
-  language = "en",
-  separator = " to ",
-  width = NULL,
-  autoclose = TRUE
-)
+dateRangeInput(inputId, label, start = NULL, end = NULL, min = NULL,
+  max = NULL, format = "yyyy-mm-dd", startview = "month",
+  weekstart = 0, language = "en", separator = " to ", width = NULL,
+  autoclose = TRUE)
 }
 \arguments{
 \item{inputId}{The \code{input} slot that will be used to access the value.}
@@ -86,11 +75,6 @@ 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()) {
@@ -130,25 +114,17 @@ ui <- fluidPage(
 
 shinyApp(ui, server = function(input, output) { })
 }
-
 }
 \seealso{
 \code{\link[=dateInput]{dateInput()}}, \code{\link[=updateDateRangeInput]{updateDateRangeInput()}}
 
-Other input elements: 
-\code{\link{actionButton}()},
-\code{\link{checkboxGroupInput}()},
-\code{\link{checkboxInput}()},
-\code{\link{dateInput}()},
-\code{\link{fileInput}()},
-\code{\link{numericInput}()},
-\code{\link{passwordInput}()},
-\code{\link{radioButtons}()},
-\code{\link{selectInput}()},
-\code{\link{sliderInput}()},
-\code{\link{submitButton}()},
-\code{\link{textAreaInput}()},
-\code{\link{textInput}()},
-\code{\link{varSelectInput}()}
+Other input elements: \code{\link{actionButton}},
+  \code{\link{checkboxGroupInput}},
+  \code{\link{checkboxInput}}, \code{\link{dateInput}},
+  \code{\link{fileInput}}, \code{\link{numericInput}},
+  \code{\link{passwordInput}}, \code{\link{radioButtons}},
+  \code{\link{selectInput}}, \code{\link{sliderInput}},
+  \code{\link{submitButton}}, \code{\link{textAreaInput}},
+  \code{\link{textInput}}, \code{\link{varSelectInput}}
 }
 \concept{input elements}

man/debounce.Rd

@@ -5,9 +5,11 @@
 \alias{throttle}
 \title{Slow down a reactive expression with debounce/throttle}
 \usage{
-debounce(r, millis, priority = 100, domain = getDefaultReactiveDomain())
+debounce(r, millis, priority = 100,
+  domain = getDefaultReactiveDomain())
 
-throttle(r, millis, priority = 100, domain = getDefaultReactiveDomain())
+throttle(r, millis, priority = 100,
+  domain = getDefaultReactiveDomain())
 }
 \arguments{
 \item{r}{A reactive expression (that invalidates too often).}
@@ -47,7 +49,7 @@ continually arrive from \code{r} within the time window, the debounced
 reactive will not invalidate at all. Only after the invalidations stop (or
 slow down sufficiently) will the downstream invalidation be sent.
 
-\verb{ooo-oo-oo---- => -----------o-}
+\code{ooo-oo-oo---- => -----------o-}
 
 (In this graphical depiction, each character represents a unit of time, and
 the time window is 3 characters.)
@@ -59,7 +61,7 @@ continually come from \code{r} within the time window, the throttled reactive
 will invalidate regularly, at a rate equal to or slower than than the time
 window.
 
-\verb{ooo-oo-oo---- => o--o--o--o---}
+\code{ooo-oo-oo---- => o--o--o--o---}
 }
 \section{Limitations}{
 

man/diskCache.Rd

@@ -4,17 +4,9 @@
 \alias{diskCache}
 \title{Create a disk cache object}
 \usage{
-diskCache(
-  dir = NULL,
-  max_size = 10 * 1024^2,
-  max_age = Inf,
-  max_n = Inf,
-  evict = c("lru", "fifo"),
-  destroy_on_finalize = FALSE,
-  missing = key_missing(),
-  exec_missing = FALSE,
-  logfile = NULL
-)
+diskCache(dir = NULL, max_size = 10 * 1024^2, max_age = Inf,
+  max_n = Inf, evict = c("lru", "fifo"), destroy_on_finalize = FALSE,
+  missing = key_missing(), exec_missing = FALSE, logfile = NULL)
 }
 \arguments{
 \item{dir}{Directory to store files for the cache. If \code{NULL} (the

man/downloadHandler.Rd

@@ -4,7 +4,8 @@
 \alias{downloadHandler}
 \title{File Downloads}
 \usage{
-downloadHandler(filename, content, contentType = NA, outputArgs = list())
+downloadHandler(filename, content, contentType = NA,
+  outputArgs = list())
 }
 \arguments{
 \item{filename}{A string of the filename, including extension, that the

man/exportTestValues.Rd

@@ -4,12 +4,8 @@
 \alias{exportTestValues}
 \title{Register expressions for export in test mode}
 \usage{
-exportTestValues(
-  ...,
-  quoted_ = FALSE,
-  env_ = parent.frame(),
-  session_ = getDefaultReactiveDomain()
-)
+exportTestValues(..., quoted_ = FALSE, env_ = parent.frame(),
+  session_ = getDefaultReactiveDomain())
 }
 \arguments{
 \item{...}{Named arguments that are quoted or unquoted expressions that will
@@ -66,7 +62,7 @@ shinyApp(
     })
 
     output$values <- renderText({
-      paste0("vals$x: ", vals$x, "\ny: ", y())
+      paste0("vals$x: ", vals$x, "\\ny: ", y())
     })
   }
 )

man/fileInput.Rd

@@ -4,15 +4,9 @@
 \alias{fileInput}
 \title{File Upload Control}
 \usage{
-fileInput(
-  inputId,
-  label,
-  multiple = FALSE,
-  accept = NULL,
-  width = NULL,
-  buttonLabel = "Browse...",
-  placeholder = "No file selected"
-)
+fileInput(inputId, label, multiple = FALSE, accept = NULL,
+  width = NULL, buttonLabel = "Browse...",
+  placeholder = "No file selected")
 }
 \arguments{
 \item{inputId}{The \code{input} slot that will be used to access the value.}
@@ -23,17 +17,8 @@ fileInput(
 multiple files at once. \strong{Does not work on older browsers, including
 Internet Explorer 9 and earlier.}}
 
-\item{accept}{A character vector of "unique file type specifiers" which
-gives the browser a hint as to the type of file the server expects.
-Many browsers use this prevent the user from selecting an invalid file.
-
-A unique file type specifier can be:
-\itemize{
-\item A case insensitive extension like \code{.csv} or \code{.rds}.
-\item A valid MIME type, like \code{text/plain} or \code{application/pdf}
-\item One of \verb{audio/*}, \verb{video/*}, or \verb{image/*} meaning any audio, video,
-or image type, respectively.
-}}
+\item{accept}{A character vector of MIME types; gives the browser a hint of
+what kind of files the server is expecting.}
 
 \item{width}{The width of the input, e.g. \code{'400px'}, or \code{'100\%'};
 see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
@@ -48,11 +33,8 @@ 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. See the \verb{Server value} section.
-}
-\section{Server value}{
-
-A \code{data.frame} that contains one row for each selected file, and following columns:
+to a dataframe. This dataframe contains one row for each selected file, and
+the 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
@@ -67,7 +49,6 @@ uploaded. This file may be deleted if the user performs another upload
 operation.}
 }
 }
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -75,7 +56,13 @@ if (interactive()) {
 ui <- fluidPage(
   sidebarLayout(
     sidebarPanel(
-      fileInput("file1", "Choose CSV File", accept = ".csv"),
+      fileInput("file1", "Choose CSV File",
+        accept = c(
+          "text/csv",
+          "text/comma-separated-values,text/plain",
+          ".csv")
+        ),
+      tags$hr(),
       checkboxInput("header", "Header", TRUE)
     ),
     mainPanel(
@@ -86,35 +73,31 @@ ui <- fluidPage(
 
 server <- function(input, output) {
   output$contents <- renderTable({
-    file <- input$file1
-    ext <- tools::file_ext(file$datapath)
+    # input$file1 will be NULL initially. After the user selects
+    # and uploads a file, it will be a data frame with 'name',
+    # 'size', 'type', and 'datapath' columns. The 'datapath'
+    # column will contain the local filenames where the data can
+    # be found.
+    inFile <- input$file1
 
-    req(file)
-    validate(need(ext == "csv", "Please upload a csv file"))
+    if (is.null(inFile))
+      return(NULL)
 
-    read.csv(file$datapath, header = input$header)
+    read.csv(inFile$datapath, header = input$header)
   })
 }
 
 shinyApp(ui, server)
 }
-
 }
 \seealso{
-Other input elements: 
-\code{\link{actionButton}()},
-\code{\link{checkboxGroupInput}()},
-\code{\link{checkboxInput}()},
-\code{\link{dateInput}()},
-\code{\link{dateRangeInput}()},
-\code{\link{numericInput}()},
-\code{\link{passwordInput}()},
-\code{\link{radioButtons}()},
-\code{\link{selectInput}()},
-\code{\link{sliderInput}()},
-\code{\link{submitButton}()},
-\code{\link{textAreaInput}()},
-\code{\link{textInput}()},
-\code{\link{varSelectInput}()}
+Other input elements: \code{\link{actionButton}},
+  \code{\link{checkboxGroupInput}},
+  \code{\link{checkboxInput}}, \code{\link{dateInput}},
+  \code{\link{dateRangeInput}}, \code{\link{numericInput}},
+  \code{\link{passwordInput}}, \code{\link{radioButtons}},
+  \code{\link{selectInput}}, \code{\link{sliderInput}},
+  \code{\link{submitButton}}, \code{\link{textAreaInput}},
+  \code{\link{textInput}}, \code{\link{varSelectInput}}
 }
 \concept{input elements}

man/fillPage.Rd

@@ -4,7 +4,8 @@
 \alias{fillPage}
 \title{Create a page that fills the window}
 \usage{
-fillPage(..., padding = 0, title = NULL, bootstrap = TRUE, theme = NULL)
+fillPage(..., padding = 0, title = NULL, bootstrap = TRUE,
+  theme = NULL)
 }
 \arguments{
 \item{...}{Elements to include within the page.}
@@ -41,11 +42,11 @@ to the size of the window.
 
 For example, \code{fluidPage(plotOutput("plot", height = "100\%"))} will not
 work as expected; the plot element's effective height will be \code{0},
-because the plot's containing elements (\verb{<div>} and \verb{<body>}) have
+because the plot's containing elements (\code{<div>} and \code{<body>}) have
 \emph{automatic} height; that is, they determine their own height based on
 the height of their contained elements. However,
 \code{fillPage(plotOutput("plot", height = "100\%"))} will work because
-\code{fillPage} fixes the \verb{<body>} height at 100\% of the window height.
+\code{fillPage} fixes the \code{<body>} height at 100\% of the window height.
 
 Note that \code{fillPage(plotOutput("plot"))} will not cause the plot to fill
 the page. Like most Shiny output widgets, \code{plotOutput}'s default height
@@ -81,14 +82,3 @@ 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/findPort.Rd

@@ -0,0 +1,36 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/server.R
+\name{findPort}
+\alias{findPort}
+\title{Find an open TCP port}
+\usage{
+findPort(min = 3000L, max = 8000L, host = getOption("shiny.host",
+  "127.0.0.1"), n = 20, cache = TRUE)
+}
+\arguments{
+\item{min}{Minimum port number.}
+
+\item{max}{Maximum port number.}
+
+\item{host}{see \code{\link[httpuv:randomPort]{httpuv::randomPort()}}.}
+
+\item{n}{Number of ports to try before giving up.}
+
+\item{cache}{if \code{TRUE}, use the last random port if it's available.}
+}
+\description{
+Finds a random available TCP port for listening on.
+}
+\details{
+This function automatically excludes some ports
+which are considered unsafe by web browsers.
+}
+\examples{
+
+findPort()
+findPort()
+findPort(cache = FALSE)
+}
+\seealso{
+\code{\link[httpuv:randomPort]{httpuv::randomPort()}}
+}

man/fixedPage.Rd

@@ -66,14 +66,4 @@ 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,13 +32,5 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-Other layout functions: 
-\code{\link{fillPage}()},
-\code{\link{fixedPage}()},
-\code{\link{fluidPage}()},
-\code{\link{navbarPage}()},
-\code{\link{sidebarLayout}()},
-\code{\link{splitLayout}()},
-\code{\link{verticalLayout}()}
+\code{\link[=verticalLayout]{verticalLayout()}}
 }
-\concept{layout functions}

man/fluidPage.Rd

@@ -99,15 +99,5 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-\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}()}
+\code{\link[=column]{column()}}, \code{\link[=sidebarLayout]{sidebarLayout()}}
 }
-\concept{layout functions}

man/getCurrentOutputInfo.Rd

@@ -9,11 +9,6 @@ getCurrentOutputInfo(session = getDefaultReactiveDomain())
 \arguments{
 \item{session}{The current Shiny session.}
 }
-\value{
-A list with information about the current output, including the
-\code{name} of the output. If no output is currently being executed, this will
-return \code{NULL}.
-}
 \description{
 Get information about the output that is currently being executed.
 }

man/getQueryString.Rd

@@ -15,7 +15,7 @@ getUrlHash(session = getDefaultReactiveDomain())
 \value{
 For \code{getQueryString}, a named list. For example, the query
 string \code{?param1=value1&param2=value2} becomes \code{list(param1 = value1, param2 = value2)}. For \code{getUrlHash}, a character vector with
-the hash (including the leading \verb{#} symbol).
+the hash (including the leading \code{#} symbol).
 }
 \description{
 Two user friendly wrappers for getting the query string and the hash
@@ -27,7 +27,7 @@ depending on the values in the query string / hash (e.g. instead of basing
 the conditional on an input or a calculated reactive, you can base it on the
 query string). However, note that, if you're changing the query string / hash
 programatically from within the server code, you must use
-\verb{updateQueryString(_yourNewQueryString_, mode = "push")}. The default
+\code{updateQueryString(_yourNewQueryString_, mode = "push")}. The default
 \code{mode} for \code{updateQueryString} is \code{"replace"}, which doesn't
 raise any events, so any observers or reactives that depend on it will
 \emph{not} get triggered. However, if you're changing the query string / hash
@@ -58,7 +58,7 @@ if (interactive()) {
         query <- getQueryString()
         queryText <- paste(names(query), query,
                        sep = "=", collapse=", ")
-        paste("Your query string is:\n", queryText)
+        paste("Your query string is:\\n", queryText)
       })
     }
   )
@@ -81,7 +81,7 @@ if (interactive()) {
       })
       output$hash <- renderText({
         hash <- getUrlHash()
-        paste("Your hash is:\n", hash)
+        paste("Your hash is:\\n", hash)
       })
     }
   )

man/hoverOpts.Rd

@@ -4,13 +4,8 @@
 \alias{hoverOpts}
 \title{Create an object representing hover options}
 \usage{
-hoverOpts(
-  id = NULL,
-  delay = 300,
-  delayType = c("debounce", "throttle"),
-  clip = TRUE,
-  nullOutside = TRUE
-)
+hoverOpts(id = NULL, delay = 300, delayType = c("debounce",
+  "throttle"), clip = TRUE, nullOutside = TRUE)
 }
 \arguments{
 \item{id}{Input value name. For example, if the value is \code{"plot_hover"},

man/htmlOutput.Rd

@@ -5,14 +5,11 @@
 \alias{uiOutput}
 \title{Create an HTML output element}
 \usage{
-htmlOutput(
-  outputId,
-  inline = FALSE,
-  container = if (inline) span else div,
-  ...
-)
+htmlOutput(outputId, inline = FALSE, container = if (inline) span else
+  div, ...)
 
-uiOutput(outputId, inline = FALSE, container = if (inline) span else div, ...)
+uiOutput(outputId, inline = FALSE, container = if (inline) span else
+  div, ...)
 }
 \arguments{
 \item{outputId}{output variable to read the value from}

man/htmlTemplate.Rd

@@ -0,0 +1,29 @@
+\name{htmlTemplate}
+\alias{htmlTemplate}
+\title{Process an HTML template}
+\usage{
+htmlTemplate(filename = NULL, ..., text_ = NULL, document_ = "auto")
+}
+\arguments{
+\item{filename}{Path to an HTML template file. Incompatible with
+\code{text_}.}
+
+\item{...}{Variable values to use when processing the template.}
+
+\item{text_}{A string to use as the template, instead of a file. Incompatible
+with \code{filename}.}
+
+\item{document_}{Is this template a complete HTML document (\code{TRUE}), or
+a fragment of HTML that is to be inserted into an HTML document
+(\code{FALSE})? With \code{"auto"} (the default), auto-detect by searching
+for the string \code{"<HTML>"} within the template.}
+}
+\description{
+Process an HTML template and return a tagList object. If the template is a
+complete HTML document, then the returned object will also have class
+\code{html_document}, and can be passed to the function
+\code{\link{renderDocument}} to get the final HTML text.
+}
+\seealso{
+\code{\link{renderDocument}}
+}

man/include.Rd

@@ -0,0 +1,44 @@
+\name{include}
+\alias{include}
+\alias{includeHTML}
+\alias{includeText}
+\alias{includeMarkdown}
+\alias{includeCSS}
+\alias{includeScript}
+\title{Include Content From a File}
+\usage{
+includeHTML(path)
+
+includeText(path)
+
+includeMarkdown(path)
+
+includeCSS(path, ...)
+
+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.}
+
+\item{...}{Any additional attributes to be applied to the generated tag.}
+}
+\description{
+Load HTML, text, or rendered Markdown from a file and turn into HTML.
+}
+\details{
+These functions provide a convenient way to include an extensive amount of
+HTML, textual, Markdown, CSS, or JavaScript content, rather than using a
+large literal R string.
+}
+\note{
+\code{includeText} escapes its contents, but does no other processing.
+  This means that hard breaks and multiple spaces will be rendered as they
+  usually are in HTML: as a single space character. If you are looking for
+  preformatted text, wrap the call with \code{\link{pre}}, or consider using
+  \code{includeMarkdown} instead.
+
+The \code{includeMarkdown} function requires the \code{markdown}
+  package.
+}