Fix bug "Failed to execute 'insertAdjacentHTML' on 'Element'"

Due to undefined value for where, which didn't used to be required.

.Rbuildignore

@@ -16,7 +16,3 @@
 ^CONTRIBUTING.md$
 ^cran-comments.md$
 ^.*\.o$
-^appveyor\.yml$
-^revdep$
-^TODO-promises.md$
-^manualtests$

.travis.yml

@@ -1,8 +1,4 @@
 language: r
-r:
-  - oldrel
-  - release
-  - devel
 sudo: false
 cache: packages
 

CONTRIBUTING.md

@@ -1,38 +1,10 @@
+
 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. 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.
+2. Ensure that you have signed the [individual](http://www.rstudio.com/wp-content/uploads/2014/06/RStudioIndividualContributorAgreement.pdf) or [corporate](http://www.rstudio.com/wp-content/uploads/2014/06/RStudioCorporateContributorAgreement.pdf) contributor agreement as appropriate. You can send the signed copy to jj@rstudio.com.
 
 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:
-
-* Add an entry to NEWS.md concisely describing what you changed.
-
-* If appropriate, add unit tests in the tests/ directory.
-
-* If you made any changes to the JavaScript files in the srcjs/ directory, make sure you build the output JavaScript files. See tools/README.md file for information on using the build system.
-
-* Run Build->Check Package in the RStudio IDE, or `devtools::check()`, to make sure your change did not add any messages, warnings, or errors.
-
-Doing these things will make it easier for the Shiny development team to evaluate your pull request. Even so, we may still decide to modify your code or even not merge it at all. Factors that may prevent us from merging the pull request include:
-
-* breaking backward compatibility
-* adding a feature that we do not consider relevant for Shiny
-* is hard to understand
-* is hard to maintain in the future
-* is computationally expensive
-* is not intuitive for people to use
-
-We will try to be responsive and provide feedback in case we decide not to merge your pull request.
-
-
-## Filing issues
-
-If you find a bug in Shiny, you can also [file an issue](https://github.com/rstudio/shiny/issues/new). Please provide as much relevant information as you can, and include a minimal reproducible example if possible.
+We'll try to be as responsive as possible in reviewing and accepting pull requests. We appreciate your contributions!

DESCRIPTION

@@ -1,7 +1,8 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.2.0
+Version: 0.13.2.9004
+Date: 2016-02-17
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -14,7 +15,7 @@ Authors@R: c(
     person(family = "jQuery contributors", role = c("ctb", "cph"),
     comment = "jQuery library; authors listed in inst/www/shared/jquery-AUTHORS.txt"),
     person(family = "jQuery UI contributors", role = c("ctb", "cph"),
-    comment = "jQuery UI library; authors listed in inst/www/shared/jqueryui/AUTHORS.txt"),
+    comment = "jQuery UI library; authors listed in inst/www/shared/jqueryui/1.10.4/AUTHORS.txt"),
     person("Mark", "Otto", role = "ctb",
     comment = "Bootstrap library"),
     person("Jacob", "Thornton", role = "ctb",
@@ -56,28 +57,22 @@ Authors@R: c(
     )
 Description: Makes it incredibly easy to build interactive web
     applications with R. Automatic "reactive" binding between inputs and
-    outputs and extensive prebuilt widgets make it possible to build
+    outputs and extensive pre-built widgets make it possible to build
     beautiful, responsive, and powerful applications with minimal effort.
 License: GPL-3 | file LICENSE
 Depends:
-    R (>= 3.0.2),
+    R (>= 3.0.0),
     methods
 Imports:
     utils,
-    grDevices,
-    httpuv (>= 1.4.4),
+    httpuv (>= 1.3.3),
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
     digest,
     htmltools (>= 0.3.5),
     R6 (>= 2.0),
-    sourcetools,
-    later (>= 0.7.2),
-    promises (>= 1.0.1),
-    tools,
-    crayon,
-    rlang
+    sourcetools
 Suggests:
     datasets,
     Cairo (>= 1.5-5),
@@ -85,31 +80,23 @@ Suggests:
     knitr (>= 1.6),
     markdown,
     rmarkdown,
-    ggplot2,
-    magrittr
+    ggplot2
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
+VignetteBuilder: knitr
 Collate:
     'app.R'
-    'bookmark-state-local.R'
-    'stack.R'
-    'bookmark-state.R'
     'bootstrap-layout.R'
-    'globals.R'
     'conditions.R'
     'map.R'
+    'globals.R'
     'utils.R'
     'bootstrap.R'
-    'cache-context.R'
-    'cache-disk.R'
-    'cache-memory.R'
-    'cache-utils.R'
+    'cache.R'
     'diagnose.R'
     'fileupload.R'
+    'stack.R'
     'graph.R'
-    'reactives.R'
-    'reactive-domains.R'
-    'history.R'
     'hooks.R'
     'html-deps.R'
     'htmltools.R'
@@ -129,9 +116,7 @@ Collate:
     'input-slider.R'
     'input-submit.R'
     'input-text.R'
-    'input-textarea.R'
     'input-utils.R'
-    'insert-tab.R'
     'insert-ui.R'
     'jqueryui.R'
     'middleware-shiny.R'
@@ -142,21 +127,18 @@ Collate:
     'priorityqueue.R'
     'progress.R'
     'react.R'
-    'render-cached-plot.R'
+    'reactive-domains.R'
+    'reactives.R'
     'render-plot.R'
     'render-table.R'
     'run-url.R'
-    'serializers.R'
     'server-input-handlers.R'
     'server.R'
-    'shiny-options.R'
     'shiny.R'
     'shinyui.R'
     'shinywrappers.R'
     'showcase.R'
-    'snapshot.R'
     'tar.R'
-    'test-export.R'
     'timer.R'
     'update-input.R'
-RoxygenNote: 6.1.0
+RoxygenNote: 5.0.1

LICENSE

@@ -12,7 +12,7 @@ these components are included below):
 - Respond.js, https://github.com/scottjehl/Respond
 - bootstrap-datepicker, https://github.com/eternicode/bootstrap-datepicker
 - Font Awesome, https://github.com/FortAwesome/Font-Awesome
-- selectize.js, https://github.com/selectize/selectize.js
+- selectize.js, https://github.com/brianreavis/selectize.js
 - es5-shim, https://github.com/es-shims/es5-shim
 - ion.rangeSlider, https://github.com/IonDen/ion.rangeSlider
 - strftime for Javascript, https://github.com/samsonjs/strftime
@@ -673,7 +673,7 @@ bootstrap-datepicker
    limitations under the License.
 
 
-Font Awesome (CSS files are MIT licensed; fonts have SIL Open Font License 1.1, svgs have CC BY 4.0 License)
+Font-Awesome (CSS file is MIT licensed; font has SIL Open Font License 1.1)
 ----------------------------------------------------------------------
 
 The MIT License (MIT)
@@ -795,326 +795,6 @@ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
 OTHER DEALINGS IN THE FONT SOFTWARE.
 
-=======================================================================
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution 4.0 International Public License ("Public License"). To the
-extent this Public License may be interpreted as a contract, You are
-granted the Licensed Rights in consideration of Your acceptance of
-these terms and conditions, and the Licensor grants You such rights in
-consideration of benefits the Licensor receives from making the
-Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  d. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  e. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  f. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  g. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  h. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  i. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  j. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  k. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-       4. If You Share Adapted Material You produce, the Adapter's
-          License You apply must not prevent recipients of the Adapted
-          Material from complying with this Public License.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material; and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
 
 selectize.js
 ----------------------------------------------------------------------

NAMESPACE

@@ -11,7 +11,6 @@ S3method("[",shinyoutput)
 S3method("[<-",reactivevalues)
 S3method("[<-",shinyoutput)
 S3method("[[",reactivevalues)
-S3method("[[",session_proxy)
 S3method("[[",shinyoutput)
 S3method("[[<-",reactivevalues)
 S3method("[[<-",shinyoutput)
@@ -22,10 +21,7 @@ S3method(as.shiny.appobj,list)
 S3method(as.shiny.appobj,shiny.appobj)
 S3method(as.tags,shiny.appobj)
 S3method(as.tags,shiny.render.function)
-S3method(format,reactiveExpr)
-S3method(format,reactiveVal)
 S3method(names,reactivevalues)
-S3method(print,key_missing)
 S3method(print,reactive)
 S3method(print,shiny.appobj)
 S3method(str,reactivevalues)
@@ -41,10 +37,8 @@ export(actionButton)
 export(actionLink)
 export(addResourcePath)
 export(animationOptions)
-export(appendTab)
 export(as.shiny.appobj)
 export(basicPage)
-export(bookmarkButton)
 export(bootstrapLib)
 export(bootstrapPage)
 export(br)
@@ -52,6 +46,7 @@ export(browserViewer)
 export(brushOpts)
 export(brushedPoints)
 export(callModule)
+export(cancelOutput)
 export(captureStackTraces)
 export(checkboxGroupInput)
 export(checkboxInput)
@@ -60,23 +55,18 @@ export(code)
 export(column)
 export(conditionStackTrace)
 export(conditionalPanel)
-export(createRenderFunction)
 export(createWebDependency)
 export(dataTableOutput)
 export(dateInput)
 export(dateRangeInput)
 export(dblclickOpts)
-export(debounce)
 export(dialogViewer)
-export(diskCache)
 export(div)
 export(downloadButton)
 export(downloadHandler)
 export(downloadLink)
 export(em)
-export(enableBookmarking)
 export(eventReactive)
-export(exportTestValues)
 export(exprToFunction)
 export(extractStackTrace)
 export(fileInput)
@@ -90,13 +80,7 @@ export(flowLayout)
 export(fluidPage)
 export(fluidRow)
 export(formatStackTrace)
-export(freezeReactiveVal)
-export(freezeReactiveValue)
-export(getCurrentOutputInfo)
 export(getDefaultReactiveDomain)
-export(getQueryString)
-export(getShinyOption)
-export(getUrlHash)
 export(h1)
 export(h2)
 export(h3)
@@ -105,7 +89,6 @@ export(h5)
 export(h6)
 export(headerPanel)
 export(helpText)
-export(hideTab)
 export(hoverOpts)
 export(hr)
 export(htmlOutput)
@@ -120,19 +103,14 @@ export(includeMarkdown)
 export(includeScript)
 export(includeText)
 export(inputPanel)
-export(insertTab)
 export(insertUI)
 export(installExprFunction)
 export(invalidateLater)
-export(is.key_missing)
 export(is.reactive)
 export(is.reactivevalues)
 export(is.shiny.appobj)
 export(is.singleton)
-export(isRunning)
-export(isTruthy)
 export(isolate)
-export(key_missing)
 export(knit_print.html)
 export(knit_print.reactive)
 export(knit_print.shiny.appobj)
@@ -143,7 +121,6 @@ export(mainPanel)
 export(makeReactiveBinding)
 export(markRenderFunction)
 export(maskReactiveContext)
-export(memoryCache)
 export(modalButton)
 export(modalDialog)
 export(navbarMenu)
@@ -155,15 +132,7 @@ export(ns.sep)
 export(numericInput)
 export(observe)
 export(observeEvent)
-export(onBookmark)
-export(onBookmarked)
-export(onFlush)
-export(onFlushed)
 export(onReactiveDomainEnded)
-export(onRestore)
-export(onRestored)
-export(onSessionEnded)
-export(onStop)
 export(outputOptions)
 export(p)
 export(pageWithSidebar)
@@ -173,7 +142,6 @@ export(passwordInput)
 export(plotOutput)
 export(plotPNG)
 export(pre)
-export(prependTab)
 export(printError)
 export(printStackTrace)
 export(radioButtons)
@@ -186,16 +154,13 @@ export(reactiveTable)
 export(reactiveText)
 export(reactiveTimer)
 export(reactiveUI)
-export(reactiveVal)
 export(reactiveValues)
 export(reactiveValuesToList)
 export(registerInputHandler)
 export(removeInputHandler)
 export(removeModal)
 export(removeNotification)
-export(removeTab)
 export(removeUI)
-export(renderCachedPlot)
 export(renderDataTable)
 export(renderImage)
 export(renderPlot)
@@ -205,7 +170,6 @@ export(renderText)
 export(renderUI)
 export(repeatable)
 export(req)
-export(restoreInput)
 export(runApp)
 export(runExample)
 export(runGadget)
@@ -216,28 +180,19 @@ export(safeError)
 export(selectInput)
 export(selectizeInput)
 export(serverInfo)
-export(setBookmarkExclude)
 export(setProgress)
-export(setSerializer)
 export(shinyApp)
 export(shinyAppDir)
 export(shinyAppFile)
-export(shinyOptions)
 export(shinyServer)
 export(shinyUI)
-export(showBookmarkUrlModal)
 export(showModal)
 export(showNotification)
 export(showReactLog)
-export(showTab)
 export(sidebarLayout)
 export(sidebarPanel)
 export(singleton)
-export(sizeGrowthRatio)
 export(sliderInput)
-export(snapshotExclude)
-export(snapshotPreprocessInput)
-export(snapshotPreprocessOutput)
 export(span)
 export(splitLayout)
 export(stopApp)
@@ -254,10 +209,8 @@ export(tagAppendChildren)
 export(tagList)
 export(tagSetChildren)
 export(tags)
-export(textAreaInput)
 export(textInput)
 export(textOutput)
-export(throttle)
 export(titlePanel)
 export(uiOutput)
 export(updateActionButton)
@@ -268,21 +221,14 @@ export(updateDateRangeInput)
 export(updateNavbarPage)
 export(updateNavlistPanel)
 export(updateNumericInput)
-export(updateQueryString)
 export(updateRadioButtons)
 export(updateSelectInput)
 export(updateSelectizeInput)
 export(updateSliderInput)
 export(updateTabsetPanel)
-export(updateTextAreaInput)
 export(updateTextInput)
-export(updateVarSelectInput)
-export(updateVarSelectizeInput)
-export(urlModal)
 export(validate)
 export(validateCssUnit)
-export(varSelectInput)
-export(varSelectizeInput)
 export(verbatimTextOutput)
 export(verticalLayout)
 export(wellPanel)
@@ -298,5 +244,3 @@ import(httpuv)
 import(methods)
 import(mime)
 import(xtable)
-importFrom(grDevices,dev.cur)
-importFrom(grDevices,dev.set)

R/app.R

@@ -20,29 +20,19 @@
 #' @param onStart A function that will be called before the app is actually run.
 #'   This is only needed for \code{shinyAppObj}, since in the \code{shinyAppDir}
 #'   case, a \code{global.R} file can be used for this purpose.
-#' @param options Named options that should be passed to the \code{runApp} call
-#'   (these can be any of the following: "port", "launch.browser", "host", "quiet",
-#'   "display.mode" and "test.mode"). You can also specify \code{width} and
-#'   \code{height} parameters which provide a hint to the embedding environment
-#'   about the ideal height/width for the app.
+#' @param options Named options that should be passed to the `runApp` call. You
+#'   can also specify \code{width} and \code{height} parameters which provide a
+#'   hint to the embedding environment about the ideal height/width for the app.
 #' @param uiPattern A regular expression that will be applied to each \code{GET}
 #'   request to determine whether the \code{ui} should be used to handle the
 #'   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 \code{"url"}, \code{"server"}, or
-#'   \code{"disable"}. This is equivalent to calling the
-#'   \code{\link{enableBookmarking}()} function just before calling
-#'   \code{shinyApp()}. With the default value (\code{NULL}), the app will
-#'   respect the setting from any previous calls to \code{enableBookmarking()}.
-#'   See \code{\link{enableBookmarking}} for more information.
 #' @return An object that represents the app. Printing the object or passing it
 #'   to \code{\link{runApp}} will run the app.
 #'
 #' @examples
 #' ## Only run this example in interactive R sessions
 #' if (interactive()) {
-#'   options(device.ask.default = FALSE)
-#'
 #'   shinyApp(
 #'     ui = fluidPage(
 #'       numericInput("n", "n", 1),
@@ -69,9 +59,10 @@
 #'
 #'   runApp(app)
 #' }
+#'
 #' @export
 shinyApp <- function(ui=NULL, server=NULL, onStart=NULL, options=list(),
-                     uiPattern="/", enableBookmarking=NULL) {
+                     uiPattern="/") {
   if (is.null(server)) {
     stop("`server` missing from shinyApp")
   }
@@ -85,24 +76,12 @@ shinyApp <- function(ui=NULL, server=NULL, onStart=NULL, options=list(),
     server
   }
 
-  if (!is.null(enableBookmarking)) {
-    bookmarkStore <- match.arg(enableBookmarking, c("url", "server", "disable"))
-    enableBookmarking(bookmarkStore)
-  }
-
-  # Store the appDir and bookmarking-related options, so that we can read them
-  # from within the app.
-  shinyOptions(appDir = getwd())
-  appOptions <- consumeAppOptions()
-
   structure(
     list(
       httpHandler = httpHandler,
       serverFuncSource = serverFuncSource,
       onStart = onStart,
-      options = options,
-      appOptions = appOptions
-    ),
+      options = options),
     class = "shiny.appobj"
   )
 }
@@ -134,9 +113,7 @@ shinyAppDir <- function(appDir, options=list()) {
 #' @export
 shinyAppFile <- function(appFile, options=list()) {
   appFile <- normalizePath(appFile, mustWork = TRUE)
-  appDir <- dirname(appFile)
-
-  shinyAppDir_appR(basename(appFile), appDir, options = options)
+  shinyAppDir_appR(basename(appFile), dirname(appFile), options = options)
 }
 
 # This reads in an app dir in the case that there's a server.R (and ui.R/www)
@@ -201,8 +178,6 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
     }
   }
 
-  shinyOptions(appDir = appDir)
-
   oldwd <- NULL
   monitorHandle <- NULL
   onStart <- function() {
@@ -212,7 +187,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
     if (file.exists(file.path.ci(appDir, "global.R")))
       sourceUTF8(file.path.ci(appDir, "global.R"))
   }
-  onStop <- function() {
+  onEnd <- function() {
     setwd(oldwd)
     monitorHandle()
     monitorHandle <<- NULL
@@ -223,9 +198,8 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
       httpHandler = joinHandlers(c(uiHandler, wwwDir, fallbackWWWDir)),
       serverFuncSource = serverFuncSource,
       onStart = onStart,
-      onStop = onStop,
-      options = options
-    ),
+      onEnd = onEnd,
+      options = options),
     class = "shiny.appobj"
   )
 }
@@ -235,13 +209,13 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 # ignored when checking extensions. If any changes are detected, all connected
 # Shiny sessions are reloaded.
 #
-# Use options(shiny.autoreload = TRUE) to enable this behavior. Since monitoring
+# Use option(shiny.autoreload = TRUE) to enable this behavior. Since monitoring
 # for changes is expensive (we are polling for mtimes here, nothing fancy) 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"))
+# option(shiny.autoreload.pattern = glob2rx("ui.R"))
 #
 # The return value is a function that halts monitoring when called.
 initAutoReloadMonitor <- function(dir) {
@@ -278,8 +252,7 @@ initAutoReloadMonitor <- function(dir) {
 
 # This reads in an app dir for a single-file application (e.g. app.R), and
 # returns a shiny.appobj.
-shinyAppDir_appR <- function(fileName, appDir, options=list())
-{
+shinyAppDir_appR <- function(fileName, appDir, options=list()) {
   fullpath <- file.path.ci(appDir, fileName)
 
   # This sources app.R and caches the content. When appObj() is called but
@@ -292,8 +265,6 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
       if (!is.shiny.appobj(result))
         stop("app.R did not return a shiny.appobj object.")
 
-      unconsumeAppOptions(result$appOptions)
-
       return(result)
     }
   )
@@ -317,9 +288,8 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
     oldwd <<- getwd()
     setwd(appDir)
     monitorHandle <<- initAutoReloadMonitor(appDir)
-    if (!is.null(appObj()$onStart)) appObj()$onStart()
   }
-  onStop <- function() {
+  onEnd <- function() {
     setwd(oldwd)
     monitorHandle()
     monitorHandle <<- NULL
@@ -330,7 +300,7 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
       httpHandler = joinHandlers(c(dynHttpHandler, wwwDir, fallbackWWWDir)),
       serverFuncSource = dynServerFuncSource,
       onStart = onStart,
-      onStop = onStop,
+      onEnd = onEnd,
       options = options
     ),
     class = "shiny.appobj"
@@ -378,13 +348,11 @@ is.shiny.appobj <- function(x) {
 print.shiny.appobj <- function(x, ...) {
   opts <- x$options %OR% list()
   opts <- opts[names(opts) %in%
-      c("port", "launch.browser", "host", "quiet",
-        "display.mode", "test.mode")]
+      c("port", "launch.browser", "host", "quiet", "display.mode")]
 
-  # Quote x and put runApp in quotes so that there's a nicer stack trace (#1851)
-  args <- c(list(quote(x)), opts)
+  args <- c(list(x), opts)
 
-  do.call("runApp", args)
+  do.call(runApp, args)
 }
 
 #' @rdname shinyApp

R/bookmark-state-local.R

@@ -1,28 +0,0 @@
-# Function wrappers for saving and restoring state to/from disk when running
-# Shiny locally.
-#
-# These functions provide a directory to the callback function.
-#
-# @param id A session ID to save.
-# @param callback A callback function that saves state to or restores state from
-#   a directory. It must take one argument, \code{stateDir}, which is a
-#   directory to which it writes/reads.
-
-saveInterfaceLocal <- function(id, callback) {
-  # Try to save in app directory
-  appDir <- getShinyOption("appDir", default = getwd())
-
-  stateDir <- file.path(appDir, "shiny_bookmarks", id)
-  if (!dirExists(stateDir))
-    dir.create(stateDir, recursive = TRUE)
-
-  callback(stateDir)
-}
-
-loadInterfaceLocal <- function(id, callback) {
-  # Try to load from app directory
-  appDir <- getShinyOption("appDir", default = getwd())
-
-  stateDir <- file.path(appDir, "shiny_bookmarks", id)
-  callback(stateDir)
-}

R/bootstrap-layout.R

@@ -277,7 +277,6 @@ titlePanel <- function(title, windowTitle=title) {
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
-#' options(device.ask.default = FALSE)
 #'
 #' # Define UI
 #' ui <- fluidPage(
@@ -419,6 +418,7 @@ flowLayout <- function(..., cellArgs = list()) {
 #' suitable for wrapping inputs.
 #'
 #' @param ... Input controls or other HTML elements.
+#'
 #' @export
 inputPanel <- function(...) {
   div(class = "shiny-input-panel",
@@ -443,7 +443,6 @@ inputPanel <- function(...) {
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
-#' options(device.ask.default = FALSE)
 #'
 #' # Server code used for all examples
 #' server <- function(input, output) {
@@ -588,7 +587,7 @@ flexfill <- function(..., direction, flex, width = width, height = height) {
   }
 
   if (length(flex) > length(children)) {
-    flex <- flex[seq_along(children)]
+    flex <- flex[1:length(children)]
   }
 
   # The dimension along the main axis

R/bootstrap.R

@@ -25,6 +25,7 @@ NULL
 #'   \code{\link{fluidPage}} function instead.
 #'
 #' @seealso \code{\link{fluidPage}}, \code{\link{fixedPage}}
+#'
 #' @export
 bootstrapPage <- function(..., title = NULL, responsive = NULL, theme = NULL) {
 
@@ -60,7 +61,7 @@ bootstrapPage <- function(..., title = NULL, responsive = NULL, theme = NULL) {
 #' @inheritParams bootstrapPage
 #' @export
 bootstrapLib <- function(theme = NULL) {
-  htmlDependency("bootstrap", "3.3.7",
+  htmlDependency("bootstrap", "3.3.6",
     c(
       href = "shared/bootstrap",
       file = system.file("www/shared/bootstrap", package = "shiny")
@@ -152,6 +153,7 @@ basicPage <- function(...) {
 #'     div(style = "background-color: blue; width: 100%; height: 100%;")
 #'   )
 #' )
+#'
 #' @export
 fillPage <- function(..., padding = 0, title = NULL, bootstrap = TRUE,
   theme = NULL) {
@@ -213,6 +215,7 @@ collapseSizes <- function(padding) {
 #'     plotOutput("distPlot")
 #'   )
 #' )
+#'
 #' @export
 pageWithSidebar <- function(headerPanel,
                             sidebarPanel,
@@ -285,8 +288,7 @@ pageWithSidebar <- function(headerPanel,
 #'   example below).
 #'
 #' @seealso \code{\link{tabPanel}}, \code{\link{tabsetPanel}},
-#'   \code{\link{updateNavbarPage}}, \code{\link{insertTab}},
-#'   \code{\link{showTab}}
+#'   \code{\link{updateNavbarPage}}
 #'
 #' @examples
 #' navbarPage("App Title",
@@ -336,25 +338,14 @@ navbarPage <- function(title,
   if (inverse)
     navbarClass <- paste(navbarClass, "navbar-inverse")
 
-  if (!is.null(id))
-    selected <- restoreInput(id = id, default = selected)
-
   # build the tabset
   tabs <- list(...)
   tabset <- buildTabset(tabs, "nav navbar-nav", NULL, id, selected)
 
-  # function to return plain or fluid class name
-  className <- function(name) {
-    if (fluid)
-      paste(name, "-fluid", sep="")
-    else
-      name
-  }
-
   # built the container div dynamically to support optional collapsibility
   if (collapsible) {
     navId <- paste("navbar-collapse-", p_randomInt(1000, 10000), sep="")
-    containerDiv <- div(class=className("container"),
+    containerDiv <- div(class="container",
       div(class="navbar-header",
         tags$button(type="button", class="navbar-toggle collapsed",
           `data-toggle`="collapse", `data-target`=paste0("#", navId),
@@ -368,7 +359,7 @@ navbarPage <- function(title,
       div(class="navbar-collapse collapse", id=navId, tabset$navList)
     )
   } else {
-    containerDiv <- div(class=className("container"),
+    containerDiv <- div(class="container",
       div(class="navbar-header",
         span(class="navbar-brand", pageTitle)
       ),
@@ -376,6 +367,14 @@ navbarPage <- function(title,
     )
   }
 
+  # function to return plain or fluid class name
+  className <- function(name) {
+    if (fluid)
+      paste(name, "-fluid", sep="")
+    else
+      name
+  }
+
   # build the main tab content div
   contentDiv <- div(class=className("container"))
   if (!is.null(header))
@@ -394,15 +393,10 @@ navbarPage <- function(title,
   )
 }
 
-#' @param menuName A name that identifies this \code{navbarMenu}. This
-#'   is needed if you want to insert/remove or show/hide an entire
-#'   \code{navbarMenu}.
-#'
 #' @rdname navbarPage
 #' @export
-navbarMenu <- function(title, ..., menuName = title, icon = NULL) {
+navbarMenu <- function(title, ..., icon = NULL) {
   structure(list(title = title,
-                 menuName = menuName,
                  tabs = list(...),
                  iconClass = iconClass(icon)),
             class = "shiny.navbarmenu")
@@ -436,6 +430,7 @@ headerPanel <- function(title, windowTitle=title) {
 #'
 #' @param ... UI elements to include inside the panel.
 #' @return The newly created panel.
+#'
 #' @export
 wellPanel <- function(...) {
   div(class="well", ...)
@@ -508,8 +503,6 @@ mainPanel <- function(..., width = 8) {
 #'
 #' @param condition A JavaScript expression that will be evaluated repeatedly to
 #'   determine whether the panel should be displayed.
-#' @param ns The \code{\link[=NS]{namespace}} object of the current module, if
-#'   any.
 #' @param ... Elements to include in the panel.
 #'
 #' @note You are not recommended to use special JavaScript characters such as a
@@ -518,55 +511,33 @@ mainPanel <- function(..., width = 8) {
 #'   \code{input["foo.bar"]} instead of \code{input.foo.bar} to read the input
 #'   value.
 #' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'   ui <- fluidPage(
-#'     sidebarPanel(
-#'       selectInput("plotType", "Plot Type",
-#'         c(Scatter = "scatter", Histogram = "hist")
-#'       ),
-#'       # Only show this panel if the plot type is a histogram
+#' sidebarPanel(
+#'    selectInput(
+#'       "plotType", "Plot Type",
+#'       c(Scatter = "scatter",
+#'         Histogram = "hist")),
+#'
+#'    # Only show this panel if the plot type is a histogram
+#'    conditionalPanel(
+#'       condition = "input.plotType == 'hist'",
+#'       selectInput(
+#'          "breaks", "Breaks",
+#'          c("Sturges",
+#'            "Scott",
+#'            "Freedman-Diaconis",
+#'            "[Custom]" = "custom")),
+#'
+#'       # Only show this panel if Custom is selected
 #'       conditionalPanel(
-#'         condition = "input.plotType == 'hist'",
-#'         selectInput(
-#'           "breaks", "Breaks",
-#'           c("Sturges", "Scott", "Freedman-Diaconis", "[Custom]" = "custom")
-#'         ),
-#'         # Only show this panel if Custom is selected
-#'         conditionalPanel(
-#'           condition = "input.breaks == 'custom'",
-#'           sliderInput("breakCount", "Break Count", min = 1, max = 50, value = 10)
-#'         )
+#'          condition = "input.breaks == 'custom'",
+#'          sliderInput("breakCount", "Break Count", min=1, max=1000, value=10)
 #'       )
-#'     ),
-#'     mainPanel(
-#'       plotOutput("plot")
-#'     )
-#'   )
+#'    )
+#' )
 #'
-#'   server <- function(input, output) {
-#'     x <- rnorm(100)
-#'     y <- rnorm(100)
-#'
-#'     output$plot <- renderPlot({
-#'       if (input$plotType == "scatter") {
-#'         plot(x, y)
-#'       } else {
-#'         breaks <- input$breaks
-#'         if (breaks == "custom") {
-#'           breaks <- input$breakCount
-#'         }
-#'
-#'         hist(x, breaks = breaks)
-#'       }
-#'     })
-#'   }
-#'
-#'   shinyApp(ui, server)
-#' }
 #' @export
-conditionalPanel <- function(condition, ..., ns = NS(NULL)) {
-  div(`data-display-if`=condition, `data-ns-prefix`=ns(""), ...)
+conditionalPanel <- function(condition, ...) {
+  div('data-display-if'=condition, ...)
 }
 
 #' Create a help text element
@@ -640,8 +611,7 @@ tabPanel <- function(title, ..., value = title, icon = NULL) {
 #'   Bootstrap 3.
 #' @return A tabset that can be passed to \code{\link{mainPanel}}
 #'
-#' @seealso \code{\link{tabPanel}}, \code{\link{updateTabsetPanel}},
-#'   \code{\link{insertTab}}, \code{\link{showTab}}
+#' @seealso \code{\link{tabPanel}}, \code{\link{updateTabsetPanel}}
 #'
 #' @examples
 #' # Show a tabset that includes a plot, summary, and
@@ -665,13 +635,9 @@ tabsetPanel <- function(...,
                     version = "0.10.2.2")
   }
 
-  if (!is.null(id))
-    selected <- restoreInput(id = id, default = selected)
-
   # build the tabset
   tabs <- list(...)
   type <- match.arg(type)
-
   tabset <- buildTabset(tabs, paste0("nav nav-", type), NULL, id, selected)
 
   # create the content
@@ -708,9 +674,7 @@ tabsetPanel <- function(...,
 #'   supported. This is because version 0.11 switched to Bootstrap 3, which
 #'   doesn't support separators.
 #'
-#' @seealso \code{\link{tabPanel}}, \code{\link{updateNavlistPanel}},
-#'    \code{\link{insertTab}}, \code{\link{showTab}}
-#'
+#' @seealso \code{\link{tabPanel}}, \code{\link{updateNavlistPanel}}
 #' @examples
 #' fluidPage(
 #'
@@ -736,9 +700,6 @@ navlistPanel <- function(...,
       tags$li(class="navbar-brand", text)
   }
 
-  if (!is.null(id))
-    selected <- restoreInput(id = id, default = selected)
-
   # build the tabset
   tabs <- list(...)
   tabset <- buildTabset(tabs,
@@ -760,158 +721,189 @@ navlistPanel <- function(...,
     fixedRow(columns)
 }
 
-# Helpers to build tabsetPanels (& Co.) and their elements
-markTabAsSelected <- function(x) {
-  attr(x, "selected") <- TRUE
-  x
-}
 
-isTabSelected <- function(x) {
-  isTRUE(attr(x, "selected", exact = TRUE))
-}
+buildTabset <- function(tabs, ulClass, textFilter = NULL,
+                        id = NULL, selected = NULL) {
 
-containsSelectedTab <- function(tabs) {
-  any(vapply(tabs, isTabSelected, logical(1)))
-}
+  # This function proceeds in two phases. First, it scans over all the items
+  # to find and mark which tab should start selected. Then it actually builds
+  # the tab nav and tab content lists.
 
-findAndMarkSelectedTab <- function(tabs, selected, foundSelected) {
-  tabs <- lapply(tabs, function(div) {
-    if (foundSelected || is.character(div)) {
-      # Strings are not selectable items
+  # Mark an item as selected
+  markSelected <- function(x) {
+    attr(x, "selected") <- TRUE
+    x
+  }
 
-    } else if (inherits(div, "shiny.navbarmenu")) {
-      # Recur for navbarMenus
-      res <- findAndMarkSelectedTab(div$tabs, selected, foundSelected)
-      div$tabs <- res$tabs
-      foundSelected <<- res$foundSelected
+  # Returns TRUE if an item is selected
+  isSelected <- function(x) {
+    isTRUE(attr(x, "selected", exact = TRUE))
+  }
+
+  # Returns TRUE if a list of tab items contains a selected tab, FALSE
+  # otherwise.
+  containsSelected <- function(tabs) {
+    any(vapply(tabs, isSelected, logical(1)))
+  }
+
+  # Take a pass over all tabs, and mark the selected tab.
+  foundSelectedItem <- FALSE
+  findAndMarkSelected <- function(tabs, selected) {
+    lapply(tabs, function(divTag) {
+      if (foundSelectedItem) {
+        # If we already found the selected tab, no need to keep looking
+
+      } else if (is.character(divTag)) {
+        # Strings don't represent selectable items
+
+      } else if (inherits(divTag, "shiny.navbarmenu")) {
+        # Navbar menu
+        divTag$tabs <- findAndMarkSelected(divTag$tabs, selected)
 
-    } else {
-      # Base case: regular tab item. If the `selected` argument is
-      # provided, check for a match in the existing tabs; else,
-      # mark first available item as selected
-      if (is.null(selected)) {
-        foundSelected <<- TRUE
-        div <- markTabAsSelected(div)
       } else {
-        tabValue <- div$attribs$`data-value` %OR% div$attribs$title
-        if (identical(selected, tabValue)) {
-          foundSelected <<- TRUE
-          div <- markTabAsSelected(div)
+        # Regular tab item
+        if (is.null(selected)) {
+          # If selected tab isn't specified, mark first available item
+          # as selected.
+          foundSelectedItem <<- TRUE
+          divTag <- markSelected(divTag)
+
+        } else {
+          # If selected tab is specified, check for a match
+          tabValue <- divTag$attribs$`data-value` %OR% divTag$attribs$title
+          if (identical(selected, tabValue)) {
+            foundSelectedItem <<- TRUE
+            divTag <- markSelected(divTag)
+          }
         }
       }
-    }
-    return(div)
-  })
-  return(list(tabs = tabs, foundSelected = foundSelected))
-}
 
-# Returns the icon object (or NULL if none), provided either a
-# tabPanel, OR the icon class
-getIcon <- function(tab = NULL, iconClass = NULL) {
-  if (!is.null(tab)) iconClass <- tab$attribs$`data-icon-class`
-  if (!is.null(iconClass)) {
-    if (grepl("fa-", iconClass, fixed = TRUE)) {
+      return(divTag)
+    })
+  }
+
+
+  # Append an optional icon to an aTag
+  appendIcon <- function(aTag, iconClass) {
+    if (!is.null(iconClass)) {
       # for font-awesome we specify fixed-width
-      iconClass <- paste(iconClass, "fa-fw")
+      if (grepl("fa-", iconClass, fixed = TRUE))
+        iconClass <- paste(iconClass, "fa-fw")
+      aTag <- tagAppendChild(aTag, icon(name = NULL, class = iconClass))
     }
-    icon(name = NULL, class = iconClass)
-  } else NULL
-}
-
-# Text filter for navbarMenu's (plain text) separators
-navbarMenuTextFilter <- function(text) {
-  if (grepl("^\\-+$", text)) tags$li(class = "divider")
-  else tags$li(class = "dropdown-header", text)
-}
-
-# This function is called internally by navbarPage, tabsetPanel
-# and navlistPanel
-buildTabset <- function(tabs, ulClass, textFilter = NULL, id = NULL,
-                        selected = NULL, foundSelected = FALSE) {
-
-  res <- findAndMarkSelectedTab(tabs, selected, foundSelected)
-  tabs <- res$tabs
-  foundSelected <- res$foundSelected
-
-  # add input class if we have an id
-  if (!is.null(id)) ulClass <- paste(ulClass, "shiny-tab-input")
-
-  if (anyNamed(tabs)) {
-    nms <- names(tabs)
-    nms <- nms[nzchar(nms)]
-    stop("Tabs should all be unnamed arguments, but some are named: ",
-      paste(nms, collapse = ", "))
+    aTag
   }
 
-  tabsetId <- p_randomInt(1000, 10000)
-  tabs <- lapply(seq_len(length(tabs)), buildTabItem,
-            tabsetId = tabsetId, foundSelected = foundSelected,
-            tabs = tabs, textFilter = textFilter)
+  # Build the tabset
+  build <- function(tabs, ulClass, textFilter = NULL, id = NULL) {
+    # add tab input sentinel class if we have an id
+    if (!is.null(id))
+      ulClass <- paste(ulClass, "shiny-tab-input")
 
-  tabNavList <- tags$ul(class = ulClass, id = id,
-                  `data-tabsetid` = tabsetId, lapply(tabs, "[[", 1))
-
-  tabContent <- tags$div(class = "tab-content",
-                  `data-tabsetid` = tabsetId, lapply(tabs, "[[", 2))
-
-  list(navList = tabNavList, content = tabContent)
-}
-
-# Builds tabPanel/navbarMenu items (this function used to be
-# declared inside the buildTabset() function and it's been
-# refactored for clarity and reusability). Called internally
-# by buildTabset.
-buildTabItem <- function(index, tabsetId, foundSelected, tabs = NULL,
-                         divTag = NULL, textFilter = NULL) {
-
-  divTag <- if (!is.null(divTag)) divTag else tabs[[index]]
-
-  if (is.character(divTag) && !is.null(textFilter)) {
-    # text item: pass it to the textFilter if it exists
-    liTag <- textFilter(divTag)
-    divTag <- NULL
-
-  } else if (inherits(divTag, "shiny.navbarmenu")) {
-    # navbarMenu item: build the child tabset
-    tabset <- buildTabset(divTag$tabs, "dropdown-menu",
-      navbarMenuTextFilter, foundSelected = foundSelected)
-
-    # if this navbarMenu contains a selected item, mark it active
-    containsSelected <- containsSelectedTab(divTag$tabs)
-    liTag <- tags$li(
-      class = paste0("dropdown", if (containsSelected) " active"),
-      tags$a(href = "#",
-        class = "dropdown-toggle", `data-toggle` = "dropdown",
-        `data-value` = divTag$menuName,
-        getIcon(iconClass = divTag$iconClass),
-        divTag$title, tags$b(class = "caret")
-      ),
-      tabset$navList   # inner tabPanels items
-    )
-    # list of tab content divs from the child tabset
-    divTag <- tabset$content$children
-
-  } else {
-    # tabPanel item: create the tab's liTag and divTag
-    tabId <- paste("tab", tabsetId, index, sep = "-")
-    liTag <- tags$li(
-               tags$a(
-                 href = paste("#", tabId, sep = ""),
-                 `data-toggle` = "tab",
-                 `data-value` = divTag$attribs$`data-value`,
-                 getIcon(iconClass = divTag$attribs$`data-icon-class`),
-                 divTag$attribs$title
-               )
-    )
-    # if this tabPanel is selected item, mark it active
-    if (isTabSelected(divTag)) {
-      liTag$attribs$class <- "active"
-      divTag$attribs$class <- "tab-pane active"
+    if (anyNamed(tabs)) {
+      nms <- names(tabs)
+      nms <- nms[nzchar(nms)]
+      stop("Tabs should all be unnamed arguments, but some are named: ",
+           paste(nms, collapse = ", "))
     }
-    divTag$attribs$id <- tabId
-    divTag$attribs$title <- NULL
+
+    tabNavList <- tags$ul(class = ulClass, id = id)
+    tabContent <- tags$div(class = "tab-content")
+    tabsetId <- p_randomInt(1000, 10000)
+    tabId <- 1
+
+    buildItem <- function(divTag) {
+      # check for text; pass it to the textFilter or skip it if there is none
+      if (is.character(divTag)) {
+        if (!is.null(textFilter)) {
+          tabNavList <<- tagAppendChild(tabNavList, textFilter(divTag))
+        }
+
+      } else if (inherits(divTag, "shiny.navbarmenu")) {
+
+        # create the a tag
+        aTag <- tags$a(href="#",
+                       class="dropdown-toggle",
+                       `data-toggle`="dropdown")
+
+        # add optional icon
+        aTag <- appendIcon(aTag, divTag$iconClass)
+
+        # add the title and caret
+        aTag <- tagAppendChild(aTag, divTag$title)
+        aTag <- tagAppendChild(aTag, tags$b(class="caret"))
+
+        # build the dropdown list element
+        liTag <- tags$li(class = "dropdown", aTag)
+
+        # text filter for separators
+        textFilter <- function(text) {
+          if (grepl("^\\-+$", text))
+            tags$li(class="divider")
+          else
+            tags$li(class="dropdown-header", text)
+        }
+
+        # build the child tabset
+        tabset <- build(divTag$tabs, "dropdown-menu", textFilter)
+        liTag <- tagAppendChild(liTag, tabset$navList)
+
+        # If this navbar menu contains a selected item, mark it as active
+        if (containsSelected(divTag$tabs)) {
+          liTag$attribs$class <- paste(liTag$attribs$class, "active")
+        }
+
+        tabNavList <<- tagAppendChild(tabNavList, liTag)
+        # don't add a standard tab content div, rather add the list of tab
+        # content divs that are contained within the tabset
+        tabContent <<- tagAppendChildren(tabContent,
+                                        list = tabset$content$children)
+
+      } else {
+        # Standard navbar item
+        # compute id and assign it to the div
+        thisId <- paste("tab", tabsetId, tabId, sep="-")
+        divTag$attribs$id <- thisId
+        tabId <<- tabId + 1
+
+        tabValue <- divTag$attribs$`data-value`
+
+        # create the a tag
+        aTag <- tags$a(href=paste("#", thisId, sep=""),
+                       `data-toggle` = "tab",
+                       `data-value` = tabValue)
+
+        # append optional icon
+        aTag <- appendIcon(aTag, divTag$attribs$`data-icon-class`)
+
+        # add the title
+        aTag <- tagAppendChild(aTag, divTag$attribs$title)
+
+        # create the li tag
+        liTag <- tags$li(aTag)
+
+        # If selected, set appropriate classes on li tag and div tag.
+        if (isSelected(divTag)) {
+          liTag$attribs$class <- "active"
+          divTag$attribs$class <- "tab-pane active"
+        }
+
+        divTag$attribs$title <- NULL
+
+        # append the elements to our lists
+        tabNavList <<- tagAppendChild(tabNavList, liTag)
+        tabContent <<- tagAppendChild(tabContent, divTag)
+      }
+    }
+
+    lapply(tabs, buildItem)
+    list(navList = tabNavList, content = tabContent)
   }
-  return(list(liTag = liTag, divTag = divTag))
+
+
+  # Finally, actually invoke the functions to do the processing.
+  tabs <- findAndMarkSelected(tabs, selected)
+  build(tabs, ulClass, textFilter, id)
 }
 
 
@@ -938,34 +930,21 @@ textOutput <- function(outputId, container = if (inline) span else div, inline =
 #' Render a reactive output variable as verbatim text within an
 #' application page. The text will be included within an HTML \code{pre} tag.
 #' @param outputId output variable to read the value from
-#' @param placeholder if the output is empty or \code{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 \link{renderPrint} function to preserve fixed-width formatting
-#'   of printed objects.
+#' with the \link{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:"),
-#'       verbatimTextOutput("default"),
-#'       verbatimTextOutput("placeholder", placeholder = TRUE)
-#'     ),
-#'     server = function(input, output) {
-#'       output$default <- renderText({ input$txt })
-#'       output$placeholder <- renderText({ input$txt })
-#'     }
-#'   )
-#' }
+#' mainPanel(
+#'   h4("Summary"),
+#'   verbatimTextOutput("summary"),
+#'
+#'   h4("Observations"),
+#'   tableOutput("view")
+#' )
 #' @export
-verbatimTextOutput <- function(outputId, placeholder = FALSE) {
-  pre(id = outputId,
-      class = paste(c("shiny-text-output", if (!placeholder) "noplaceholder"),
-                    collapse = " ")
-      )
+verbatimTextOutput <- function(outputId) {
+  textOutput(outputId, container = pre)
 }
 
 
@@ -1139,7 +1118,7 @@ imageOutput <- function(outputId, width = "100%", height="400px",
 #'   same \code{id} to disappear.
 #' @inheritParams textOutput
 #' @note The arguments \code{clickId} and \code{hoverId} only work for R base
-#'   graphics (see the \pkg{\link[graphics:graphics-package]{graphics}} package). They do not work for
+#'   graphics (see the \pkg{\link{graphics}} package). They do not work for
 #'   \pkg{\link[grid:grid-package]{grid}}-based graphics, such as \pkg{ggplot2},
 #'   \pkg{lattice}, and so on.
 #'
@@ -1437,7 +1416,6 @@ uiOutput <- htmlOutput
 #'   is assigned to.
 #' @param label The label that should appear on the button.
 #' @param class Additional CSS classes to apply to the tag, if any.
-#' @param ... Other arguments to pass to the container tag function.
 #'
 #' @examples
 #' \dontrun{
@@ -1456,29 +1434,27 @@ uiOutput <- htmlOutput
 #' }
 #'
 #' @aliases downloadLink
-#' @seealso \code{\link{downloadHandler}}
+#' @seealso downloadHandler
 #' @export
 downloadButton <- function(outputId,
                            label="Download",
-                           class=NULL, ...) {
+                           class=NULL) {
   aTag <- tags$a(id=outputId,
                  class=paste('btn btn-default shiny-download-link', class),
                  href='',
                  target='_blank',
-                 download=NA,
                  icon("download"),
-                 label, ...)
+                 label)
 }
 
 #' @rdname downloadButton
 #' @export
-downloadLink <- function(outputId, label="Download", class=NULL, ...) {
+downloadLink <- function(outputId, label="Download", class=NULL) {
   tags$a(id=outputId,
          class=paste(c('shiny-download-link', class), collapse=" "),
          href='',
          target='_blank',
-         download=NA,
-         label, ...)
+         label)
 }
 
 
@@ -1489,9 +1465,8 @@ downloadLink <- function(outputId, label="Download", class=NULL, ...) {
 #' \code{\link{navbarPage}}.
 #'
 #' @param name Name of icon. Icons are drawn from the
-#'   \href{https://fontawesome.com/}{Font Awesome Free} (currently icons from
-#'   the v5.3.1 set are supported with the v4 naming convention) and
-#'   \href{http://getbootstrap.com/components/#glyphicons}{Glyphicons}
+#'   \href{http://fontawesome.io/icons/}{Font Awesome} and
+#'   \href{http://getbootstrap.com/components/#glyphicons}{Glyphicons"}
 #'   libraries. Note that the "fa-" and "glyphicon-" prefixes should not be used
 #'   in icon names (i.e. the "fa-calendar" icon should be referred to as
 #'   "calendar")
@@ -1520,6 +1495,7 @@ downloadLink <- function(outputId, label="Download", class=NULL, ...) {
 #'   tabPanel("Summary", icon = icon("list-alt")),
 #'   tabPanel("Table", icon = icon("table"))
 #' )
+#'
 #' @export
 icon <- function(name, class = NULL, lib = "font-awesome") {
   prefixes <- list(
@@ -1547,15 +1523,12 @@ icon <- function(name, class = NULL, lib = "font-awesome") {
   # font-awesome needs an additional dependency (glyphicon is in bootstrap)
   if (lib == "font-awesome") {
     htmlDependencies(iconTag) <- htmlDependency(
-      "font-awesome", "5.3.1", "www/shared/fontawesome", package = "shiny",
-      stylesheet = c(
-        "css/all.min.css",
-        "css/v4-shims.min.css"
-      )
+      "font-awesome", "4.5.0", c(href="shared/font-awesome"),
+      stylesheet = "css/font-awesome.min.css"
     )
   }
 
-  htmltools::browsable(iconTag)
+  iconTag
 }
 
 # Helper funtion to extract the class from an icon

R/cache-disk.R

@@ -1,561 +0,0 @@
-#' Create a disk cache object
-#'
-#' A disk cache object is a key-value store that saves the values as files in a
-#' directory on disk. Objects can be stored and retrieved using the \code{get()}
-#' and \code{set()} methods. Objects are automatically pruned from the cache
-#' according to the parameters \code{max_size}, \code{max_age}, \code{max_n},
-#' and \code{evict}.
-#'
-#'
-#' @section Missing Keys:
-#'
-#'   The \code{missing} and \code{exec_missing} parameters controls what happens
-#'   when \code{get()} is called with a key that is not in the cache (a cache
-#'   miss). The default behavior is to return a \code{\link{key_missing}}
-#'   object. This is a \emph{sentinel value} that indicates that the key was not
-#'   present in the cache. You can test if the returned value represents a
-#'   missing key by using the \code{\link{is.key_missing}} function. You can
-#'   also have \code{get()} return a different sentinel value, like \code{NULL}.
-#'   If you want to throw an error on a cache miss, you can do so by providing a
-#'   function for \code{missing} that takes one argument, the key, and also use
-#'   \code{exec_missing=TRUE}.
-#'
-#'   When the cache is created, you can supply a value for \code{missing}, which
-#'   sets the default value to be returned for missing values. It can also be
-#'   overridden when \code{get()} is called, by supplying a \code{missing}
-#'   argument. For example, if you use \code{cache$get("mykey", missing =
-#'   NULL)}, it will return \code{NULL} if the key is not in the cache.
-#'
-#'   If your cache is configured so that \code{get()} returns a sentinel value
-#'   to represent a cache miss, then \code{set} will also not allow you to store
-#'   the sentinel value in the cache. It will throw an error if you attempt to
-#'   do so.
-#'
-#'   Instead of returning the same sentinel value each time there is cache miss,
-#'   the cache can execute a function each time \code{get()} encounters missing
-#'   key. If the function returns a value, then \code{get()} will in turn return
-#'   that value. However, a more common use is for the function to throw an
-#'   error. If an error is thrown, then \code{get()} will not return a value.
-#'
-#'   To do this, pass a one-argument function to \code{missing}, and use
-#'   \code{exec_missing=TRUE}. For example, if you want to throw an error that
-#'   prints the missing key, you could do this:
-#'
-#'   \preformatted{
-#'   diskCache(
-#'     missing = function(key) {
-#'       stop("Attempted to get missing key: ", key)
-#'     },
-#'     exec_missing = TRUE
-#'   )
-#'   }
-#'
-#'   If you use this, the code that calls \code{get()} should be wrapped with
-#'   \code{\link{tryCatch}()} to gracefully handle missing keys.
-#'
-#' @section Cache pruning:
-#'
-#'   Cache pruning occurs when \code{set()} is called, or it can be invoked
-#'   manually by calling \code{prune()}.
-#'
-#'   The disk cache will throttle the pruning so that it does not happen on
-#'   every call to \code{set()}, because the filesystem operations for checking
-#'   the status of files can be slow. Instead, it will prune once in every 20
-#'   calls to \code{set()}, or if at least 5 seconds have elapsed since the last
-#'   prune occurred, whichever is first. These parameters are currently not
-#'   customizable, but may be in the future.
-#'
-#'   When a pruning occurs, if there are any objects that are older than
-#'   \code{max_age}, they will be removed.
-#'
-#'   The \code{max_size} and \code{max_n} parameters are applied to the cache as
-#'   a whole, in contrast to \code{max_age}, which is applied to each object
-#'   individually.
-#'
-#'   If the number of objects in the cache exceeds \code{max_n}, then objects
-#'   will be removed from the cache according to the eviction policy, which is
-#'   set with the \code{evict} parameter. Objects will be removed so that the
-#'   number of items is \code{max_n}.
-#'
-#'   If the size of the objects in the cache exceeds \code{max_size}, then
-#'   objects will be removed from the cache. Objects will be removed from the
-#'   cache so that the total size remains under \code{max_size}. Note that the
-#'   size is calculated using the size of the files, not the size of disk space
-#'   used by the files -- these two values can differ because of files are
-#'   stored in blocks on disk. For example, if the block size is 4096 bytes,
-#'   then a file that is one byte in size will take 4096 bytes on disk.
-#'
-#'   Another time that objects can be removed from the cache is when
-#'   \code{get()} is called. If the target object is older than \code{max_age},
-#'   it will be removed and the cache will report it as a missing value.
-#'
-#' @section Eviction policies:
-#'
-#' If \code{max_n} or \code{max_size} are used, then objects will be removed
-#' from the cache according to an eviction policy. The available eviction
-#' policies are:
-#'
-#'   \describe{
-#'     \item{\code{"lru"}}{
-#'       Least Recently Used. The least recently used objects will be removed.
-#'       This uses the filesystem's mtime property. When "lru" is used, each
-#'       \code{get()} is called, it will update the file's mtime.
-#'     }
-#'     \item{\code{"fifo"}}{
-#'       First-in-first-out. The oldest objects will be removed.
-#'     }
-#'   }
-#'
-#' Both of these policies use files' mtime. Note that some filesystems (notably
-#' FAT) have poor mtime resolution. (atime is not used because support for
-#' atime is worse than mtime.)
-#'
-#'
-#' @section Sharing among multiple processes:
-#'
-#' The directory for a DiskCache can be shared among multiple R processes. To
-#' do this, each R process should have a DiskCache object that uses the same
-#' directory. Each DiskCache will do pruning independently of the others, so if
-#' they have different pruning parameters, then one DiskCache may remove cached
-#' objects before another DiskCache would do so.
-#'
-#' Even though it is possible for multiple processes to share a DiskCache
-#' directory, this should not be done on networked file systems, because of
-#' slow performance of networked file systems can cause problems. If you need
-#' a high-performance shared cache, you can use one built on a database like
-#' Redis, SQLite, mySQL, or similar.
-#'
-#' When multiple processes share a cache directory, there are some potential
-#' race conditions. For example, if your code calls \code{exists(key)} to check
-#' if an object is in the cache, and then call \code{get(key)}, the object may
-#' be removed from the cache in between those two calls, and \code{get(key)}
-#' will throw an error. Instead of calling the two functions, it is better to
-#' simply call \code{get(key)}, and use \code{tryCatch()} to handle the error
-#' that is thrown if the object is not in the cache. This effectively tests for
-#' existence and gets the object in one operation.
-#'
-#' It is also possible for one processes to prune objects at the same time that
-#' another processes is trying to prune objects. If this happens, you may see
-#' a warning from \code{file.remove()} failing to remove a file that has
-#' already been deleted.
-#'
-#'
-#' @section Methods:
-#'
-#'  A disk cache object has the following methods:
-#'
-#'   \describe{
-#'     \item{\code{get(key, missing, exec_missing)}}{
-#'       Returns the value associated with \code{key}. If the key is not in the
-#'       cache, then it returns the value specified by \code{missing} or,
-#'       \code{missing} is a function and \code{exec_missing=TRUE}, then
-#'       executes \code{missing}. The function can throw an error or return the
-#'       value. If either of these parameters are specified here, then they
-#'       will override the defaults that were set when the DiskCache object was
-#'       created. See section Missing Keys for more information.
-#'     }
-#'     \item{\code{set(key, value)}}{
-#'       Stores the \code{key}-\code{value} pair in the cache.
-#'     }
-#'     \item{\code{exists(key)}}{
-#'       Returns \code{TRUE} if the cache contains the key, otherwise
-#'       \code{FALSE}.
-#'     }
-#'     \item{\code{size()}}{
-#'       Returns the number of items currently in the cache.
-#'     }
-#'     \item{\code{keys()}}{
-#'       Returns a character vector of all keys currently in the cache.
-#'     }
-#'     \item{\code{reset()}}{
-#'       Clears all objects from the cache.
-#'     }
-#'     \item{\code{destroy()}}{
-#'       Clears all objects in the cache, and removes the cache directory from
-#'       disk.
-#'     }
-#'     \item{\code{prune()}}{
-#'       Prunes the cache, using the parameters specified by \code{max_size},
-#'       \code{max_age}, \code{max_n}, and \code{evict}.
-#'     }
-#'   }
-#'
-#' @param dir Directory to store files for the cache. If \code{NULL} (the
-#'   default) it will create and use a temporary directory.
-#' @param max_age Maximum age of files in cache before they are evicted, in
-#'   seconds. Use \code{Inf} for no age limit.
-#' @param max_size Maximum size of the cache, in bytes. If the cache exceeds
-#'   this size, cached objects will be removed according to the value of the
-#'   \code{evict}. Use \code{Inf} for no size limit.
-#' @param max_n Maximum number of objects in the cache. If the number of objects
-#'   exceeds this value, then cached objects will be removed according to the
-#'   value of \code{evict}. Use \code{Inf} for no limit of number of items.
-#' @param evict The eviction policy to use to decide which objects are removed
-#'   when a cache pruning occurs. Currently, \code{"lru"} and \code{"fifo"} are
-#'   supported.
-#' @param destroy_on_finalize If \code{TRUE}, then when the DiskCache object is
-#'   garbage collected, the cache directory and all objects inside of it will be
-#'   deleted from disk. If \code{FALSE} (the default), it will do nothing when
-#'   finalized.
-#' @param missing A value to return or a function to execute when
-#'   \code{get(key)} is called but the key is not present in the cache. The
-#'   default is a \code{\link{key_missing}} object. If it is a function to
-#'   execute, the function must take one argument (the key), and you must also
-#'   use \code{exec_missing = TRUE}. If it is a function, it is useful in most
-#'   cases for it to throw an error, although another option is to return a
-#'   value. If a value is returned, that value will in turn be returned by
-#'   \code{get()}. See section Missing keys for more information.
-#' @param exec_missing If \code{FALSE} (the default), then treat \code{missing}
-#'   as a value to return when \code{get()} results in a cache miss. If
-#'   \code{TRUE}, treat \code{missing} as a function to execute when
-#'   \code{get()} results in a cache miss.
-#' @param logfile An optional filename or connection object to where logging
-#'   information will be written. To log to the console, use \code{stdout()}.
-#'
-#' @export
-diskCache <- function(
-  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$new(dir, max_size, max_age, max_n, evict, destroy_on_finalize,
-                missing, exec_missing, logfile)
-}
-
-
-DiskCache <- R6Class("DiskCache",
-  public = list(
-    initialize = function(
-      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)
-    {
-      if (exec_missing && (!is.function(missing) || length(formals(missing)) == 0)) {
-        stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-      }
-      if (is.null(dir)) {
-        dir <- tempfile("DiskCache-")
-      }
-      if (!is.numeric(max_size)) stop("max_size must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_age))  stop("max_age must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_n))    stop("max_n must be a number. Use `Inf` for no limit.")
-
-      if (!dirExists(dir)) {
-        private$log(paste0("initialize: Creating ", dir))
-        dir.create(dir, recursive = TRUE)
-      }
-
-      private$dir                 <- normalizePath(dir)
-      private$max_size            <- max_size
-      private$max_age             <- max_age
-      private$max_n               <- max_n
-      private$evict               <- match.arg(evict)
-      private$destroy_on_finalize <- destroy_on_finalize
-      private$missing             <- missing
-      private$exec_missing        <- exec_missing
-      private$logfile             <- logfile
-
-      private$prune_last_time     <- as.numeric(Sys.time())
-    },
-
-    get = function(key, missing = private$missing, exec_missing = private$exec_missing) {
-      private$log(paste0('get: key "', key, '"'))
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-
-      private$maybe_prune_single(key)
-
-      filename <- private$key_to_filename(key)
-
-      # Instead of calling exists() before fetching the value, just try to
-      # fetch the value. This reduces the risk of a race condition when
-      # multiple processes share a cache.
-      read_error <- FALSE
-      tryCatch(
-        {
-          value <- suppressWarnings(readRDS(filename))
-          if (private$evict == "lru"){
-            Sys.setFileTime(filename, Sys.time())
-          }
-        },
-        error = function(e) {
-          read_error <<- TRUE
-        }
-      )
-      if (read_error) {
-        private$log(paste0('get: key "', key, '" is missing'))
-
-        if (exec_missing) {
-          if (!is.function(missing) || length(formals(missing)) == 0) {
-            stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-          }
-          return(missing(key))
-        } else {
-          return(missing)
-        }
-      }
-
-      private$log(paste0('get: key "', key, '" found'))
-      value
-    },
-
-    set = function(key, value) {
-      private$log(paste0('set: key "', key, '"'))
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-
-      file <- private$key_to_filename(key)
-      temp_file <- paste0(file, "-temp-", createUniqueId(8))
-
-      save_error <- FALSE
-      ref_object <- FALSE
-      tryCatch(
-        {
-          saveRDS(value, file = temp_file,
-            refhook = function(x) {
-              ref_object <<- TRUE
-              NULL
-            }
-          )
-          file.rename(temp_file, file)
-        },
-        error = function(e) {
-          save_error <<- TRUE
-          # Unlike file.remove(), unlink() does not raise warning if file does
-          # not exist.
-          unlink(temp_file)
-        }
-      )
-      if (save_error) {
-        private$log(paste0('set: key "', key, '" error'))
-        stop('Error setting value for key "', key, '".')
-      }
-      if (ref_object) {
-        private$log(paste0('set: value is a reference object'))
-        warning("A reference object was cached in a serialized format. The restored object may not work as expected.")
-      }
-
-      private$prune_throttled()
-      invisible(self)
-    },
-
-    exists = function(key) {
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-      file.exists(private$key_to_filename(key))
-    },
-
-    # Return all keys in the cache
-    keys = function() {
-      self$is_destroyed(throw = TRUE)
-      files <- dir(private$dir, "\\.rds$")
-      sub("\\.rds$", "", files)
-    },
-
-    remove = function(key) {
-      private$log(paste0('remove: key "', key, '"'))
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-      file.remove(private$key_to_filename(key))
-      invisible(self)
-    },
-
-    reset = function() {
-      private$log(paste0('reset'))
-      self$is_destroyed(throw = TRUE)
-      file.remove(dir(private$dir, "\\.rds$", full.names = TRUE))
-      invisible(self)
-    },
-
-    prune = function() {
-      # TODO: It would be good to add parameters `n` and `size`, so that the
-      # cache can be pruned to `max_n - n` and `max_size - size` before adding
-      # an object. Right now we prune after adding the object, so the cache
-      # can temporarily grow past the limits. The reason we don't do this now
-      # is because it is expensive to find the size of the serialized object
-      # before adding it.
-
-      private$log(paste0('prune'))
-      self$is_destroyed(throw = TRUE)
-
-      current_time <- Sys.time()
-
-      filenames <- dir(private$dir, "\\.rds$", full.names = TRUE)
-      info <- file.info(filenames)
-      info <- info[info$isdir == FALSE, ]
-      info$name <- rownames(info)
-      rownames(info) <- NULL
-      # Files could be removed between the dir() and file.info() calls. The
-      # entire row for such files will have NA values. Remove those rows.
-      info <- info[!is.na(info$size), ]
-
-      # 1. Remove any files where the age exceeds max age.
-      if (is.finite(private$max_age)) {
-        timediff <- as.numeric(current_time - info$mtime, units = "secs")
-        rm_idx <- timediff > private$max_age
-        if (any(rm_idx)) {
-          private$log(paste0("prune max_age: Removing ", paste(info$name[rm_idx], collapse = ", ")))
-          file.remove(info$name[rm_idx])
-          info <- info[!rm_idx, ]
-        }
-      }
-
-      # Sort objects by priority. The sorting is done in a function which can be
-      # called multiple times but only does the work the first time.
-      info_is_sorted <- FALSE
-      ensure_info_is_sorted <- function() {
-        if (info_is_sorted) return()
-
-        info <<- info[order(info$mtime, decreasing = TRUE), ]
-        info_is_sorted <<- TRUE
-      }
-
-      # 2. Remove files if there are too many.
-      if (is.finite(private$max_n) && nrow(info) > private$max_n) {
-        ensure_info_is_sorted()
-        rm_idx <- seq_len(nrow(info)) > private$max_n
-        private$log(paste0("prune max_n: Removing ", paste(info$name[rm_idx], collapse = ", ")))
-        rm_success <- file.remove(info$name[rm_idx])
-        info <- info[!rm_success, ]
-      }
-
-      # 3. Remove files if cache is too large.
-      if (is.finite(private$max_size) && sum(info$size) > private$max_size) {
-        ensure_info_is_sorted()
-        cum_size <- cumsum(info$size)
-        rm_idx <- cum_size > private$max_size
-        private$log(paste0("prune max_size: Removing ", paste(info$name[rm_idx], collapse = ", ")))
-        rm_success <- file.remove(info$name[rm_idx])
-        info <- info[!rm_success, ]
-      }
-
-      private$prune_last_time <- as.numeric(current_time)
-
-      invisible(self)
-    },
-
-    size = function() {
-      self$is_destroyed(throw = TRUE)
-      length(dir(private$dir, "\\.rds$"))
-    },
-
-    destroy = function() {
-      if (self$is_destroyed()) {
-        return(invisible(self))
-      }
-
-      private$log(paste0("destroy: Removing ", private$dir))
-      # First create a sentinel file so that other processes sharing this
-      # cache know that the cache is to be destroyed. This is needed because
-      # the recursive unlink is not atomic: another process can add a file to
-      # the directory after unlink starts removing files but before it removes
-      # the directory, and when that happens, the directory removal will fail.
-      file.create(file.path(private$dir, "__destroyed__"))
-      # Remove all the .rds files. This will not remove the setinel file.
-      file.remove(dir(private$dir, "\\.rds$", full.names = TRUE))
-      # Next remove dir recursively, including sentinel file.
-      unlink(private$dir, recursive = TRUE)
-      private$destroyed <- TRUE
-      invisible(self)
-    },
-
-    is_destroyed = function(throw = FALSE) {
-      if (!dirExists(private$dir) ||
-          file.exists(file.path(private$dir, "__destroyed__")))
-      {
-        # It's possible for another process to destroy a shared cache directory
-        private$destroyed <- TRUE
-      }
-
-      if (throw) {
-        if (private$destroyed) {
-          stop("Attempted to use cache which has been destroyed:\n  ", private$dir)
-        }
-
-      } else {
-        private$destroyed
-      }
-    },
-
-    finalize = function() {
-      if (private$destroy_on_finalize) {
-        self$destroy()
-      }
-    }
-  ),
-
-  private = list(
-    dir = NULL,
-    max_age = NULL,
-    max_size = NULL,
-    max_n = NULL,
-    evict = NULL,
-    destroy_on_finalize = NULL,
-    destroyed = FALSE,
-    missing = NULL,
-    exec_missing = FALSE,
-    logfile = NULL,
-
-    prune_throttle_counter = 0,
-    prune_last_time = NULL,
-
-    key_to_filename = function(key) {
-      validate_key(key)
-      # Additional validation. This 80-char limit is arbitrary, and is
-      # intended to avoid hitting a filename length limit on Windows.
-      if (nchar(key) > 80) {
-        stop("Invalid key: key must have fewer than 80 characters.")
-      }
-      file.path(private$dir, paste0(key, ".rds"))
-    },
-
-    # A wrapper for prune() that throttles it, because prune() can be
-    # expensive due to filesystem operations. This function will prune only
-    # once every 20 times it is called, or if it has been more than 5 seconds
-    # since the last time the cache was actually pruned, whichever is first.
-    # In the future, the behavior may be customizable.
-    prune_throttled = function() {
-      # Count the number of times prune() has been called.
-      private$prune_throttle_counter <- private$prune_throttle_counter + 1
-
-      if (private$prune_throttle_counter > 20 ||
-          private$prune_last_time - as.numeric(Sys.time()) > 5)
-      {
-        self$prune()
-        private$prune_throttle_counter <- 0
-      }
-    },
-
-    # Prunes a single object if it exceeds max_age. If the object does not
-    # exceed max_age, or if the object doesn't exist, do nothing.
-    maybe_prune_single = function(key) {
-      obj <- private$cache[[key]]
-      if (is.null(obj)) return()
-
-      timediff <- as.numeric(Sys.time()) - obj$mtime
-      if (timediff > private$max_age) {
-        private$log(paste0("pruning single object exceeding max_age: Removing ", key))
-        rm(list = key, envir = private$cache)
-      }
-    },
-
-    log = function(text) {
-      if (is.null(private$logfile)) return()
-
-      text <- paste0(format(Sys.time(), "[%Y-%m-%d %H:%M:%OS3] DiskCache "), text)
-      writeLines(text, private$logfile)
-    }
-  )
-)

R/cache-memory.R

@@ -1,366 +0,0 @@
-#' Create a memory cache object
-#'
-#' A memory cache object is a key-value store that saves the values in an
-#' environment. Objects can be stored and retrieved using the \code{get()} and
-#' \code{set()} methods. Objects are automatically pruned from the cache
-#' according to the parameters \code{max_size}, \code{max_age}, \code{max_n},
-#' and \code{evict}.
-#'
-#' In a \code{MemoryCache}, R objects are stored directly in the cache; they are
-#' not \emph{not} serialized before being stored in the cache. This contrasts
-#' with other cache types, like \code{\link{diskCache}}, where objects are
-#' serialized, and the serialized object is cached. This can result in some
-#' differences of behavior. For example, as long as an object is stored in a
-#' MemoryCache, it will not be garbage collected.
-#'
-#'
-#' @section Missing keys:
-#'   The \code{missing} and \code{exec_missing} parameters controls what happens
-#'   when \code{get()} is called with a key that is not in the cache (a cache
-#'   miss). The default behavior is to return a \code{\link{key_missing}}
-#'   object. This is a \emph{sentinel value} that indicates that the key was not
-#'   present in the cache. You can test if the returned value represents a
-#'   missing key by using the \code{\link{is.key_missing}} function. You can
-#'   also have \code{get()} return a different sentinel value, like \code{NULL}.
-#'   If you want to throw an error on a cache miss, you can do so by providing a
-#'   function for \code{missing} that takes one argument, the key, and also use
-#'   \code{exec_missing=TRUE}.
-#'
-#'   When the cache is created, you can supply a value for \code{missing}, which
-#'   sets the default value to be returned for missing values. It can also be
-#'   overridden when \code{get()} is called, by supplying a \code{missing}
-#'   argument. For example, if you use \code{cache$get("mykey", missing =
-#'   NULL)}, it will return \code{NULL} if the key is not in the cache.
-#'
-#'   If your cache is configured so that \code{get()} returns a sentinel value
-#'   to represent a cache miss, then \code{set} will also not allow you to store
-#'   the sentinel value in the cache. It will throw an error if you attempt to
-#'   do so.
-#'
-#'   Instead of returning the same sentinel value each time there is cache miss,
-#'   the cache can execute a function each time \code{get()} encounters missing
-#'   key. If the function returns a value, then \code{get()} will in turn return
-#'   that value. However, a more common use is for the function to throw an
-#'   error. If an error is thrown, then \code{get()} will not return a value.
-#'
-#'   To do this, pass a one-argument function to \code{missing}, and use
-#'   \code{exec_missing=TRUE}. For example, if you want to throw an error that
-#'   prints the missing key, you could do this:
-#'
-#'   \preformatted{
-#'   diskCache(
-#'     missing = function(key) {
-#'       stop("Attempted to get missing key: ", key)
-#'     },
-#'     exec_missing = TRUE
-#'   )
-#'   }
-#'
-#'   If you use this, the code that calls \code{get()} should be wrapped with
-#'   \code{\link{tryCatch}()} to gracefully handle missing keys.
-#'
-#' @section Cache pruning:
-#'
-#'   Cache pruning occurs when \code{set()} is called, or it can be invoked
-#'   manually by calling \code{prune()}.
-#'
-#'   When a pruning occurs, if there are any objects that are older than
-#'   \code{max_age}, they will be removed.
-#'
-#'   The \code{max_size} and \code{max_n} parameters are applied to the cache as
-#'   a whole, in contrast to \code{max_age}, which is applied to each object
-#'   individually.
-#'
-#'   If the number of objects in the cache exceeds \code{max_n}, then objects
-#'   will be removed from the cache according to the eviction policy, which is
-#'   set with the \code{evict} parameter. Objects will be removed so that the
-#'   number of items is \code{max_n}.
-#'
-#'   If the size of the objects in the cache exceeds \code{max_size}, then
-#'   objects will be removed from the cache. Objects will be removed from the
-#'   cache so that the total size remains under \code{max_size}. Note that the
-#'   size is calculated using the size of the files, not the size of disk space
-#'   used by the files -- these two values can differ because of files are
-#'   stored in blocks on disk. For example, if the block size is 4096 bytes,
-#'   then a file that is one byte in size will take 4096 bytes on disk.
-#'
-#'   Another time that objects can be removed from the cache is when
-#'   \code{get()} is called. If the target object is older than \code{max_age},
-#'   it will be removed and the cache will report it as a missing value.
-#'
-#' @section Eviction policies:
-#'
-#' If \code{max_n} or \code{max_size} are used, then objects will be removed
-#' from the cache according to an eviction policy. The available eviction
-#' policies are:
-#'
-#'   \describe{
-#'     \item{\code{"lru"}}{
-#'       Least Recently Used. The least recently used objects will be removed.
-#'       This uses the filesystem's atime property. Some filesystems do not
-#'       support atime, or have a very low atime resolution. The DiskCache will
-#'       check for atime support, and if the filesystem does not support atime,
-#'       a warning will be issued and the "fifo" policy will be used instead.
-#'     }
-#'     \item{\code{"fifo"}}{
-#'       First-in-first-out. The oldest objects will be removed.
-#'     }
-#'   }
-#'
-#' @section Methods:
-#'
-#'  A disk cache object has the following methods:
-#'
-#'   \describe{
-#'     \item{\code{get(key, missing, exec_missing)}}{
-#'       Returns the value associated with \code{key}. If the key is not in the
-#'       cache, then it returns the value specified by \code{missing} or,
-#'       \code{missing} is a function and \code{exec_missing=TRUE}, then
-#'       executes \code{missing}. The function can throw an error or return the
-#'       value. If either of these parameters are specified here, then they
-#'       will override the defaults that were set when the DiskCache object was
-#'       created. See section Missing Keys for more information.
-#'     }
-#'     \item{\code{set(key, value)}}{
-#'       Stores the \code{key}-\code{value} pair in the cache.
-#'     }
-#'     \item{\code{exists(key)}}{
-#'       Returns \code{TRUE} if the cache contains the key, otherwise
-#'       \code{FALSE}.
-#'     }
-#'     \item{\code{size()}}{
-#'       Returns the number of items currently in the cache.
-#'     }
-#'     \item{\code{keys()}}{
-#'       Returns a character vector of all keys currently in the cache.
-#'     }
-#'     \item{\code{reset()}}{
-#'       Clears all objects from the cache.
-#'     }
-#'     \item{\code{destroy()}}{
-#'       Clears all objects in the cache, and removes the cache directory from
-#'       disk.
-#'     }
-#'     \item{\code{prune()}}{
-#'       Prunes the cache, using the parameters specified by \code{max_size},
-#'       \code{max_age}, \code{max_n}, and \code{evict}.
-#'     }
-#'   }
-#'
-#' @inheritParams diskCache
-#'
-#' @export
-memoryCache <- function(
-  max_size = 10 * 1024 ^ 2,
-  max_age = Inf,
-  max_n = Inf,
-  evict = c("lru", "fifo"),
-  missing = key_missing(),
-  exec_missing = FALSE,
-  logfile = NULL)
-{
-  MemoryCache$new(max_size, max_age, max_n, evict, missing, exec_missing, logfile)
-}
-
-MemoryCache <- R6Class("MemoryCache",
-  public = list(
-    initialize = function(
-      max_size = 10 * 1024 ^ 2,
-      max_age = Inf,
-      max_n = Inf,
-      evict = c("lru", "fifo"),
-      missing = key_missing(),
-      exec_missing = FALSE,
-      logfile = NULL)
-    {
-      if (exec_missing && (!is.function(missing) || length(formals(missing)) == 0)) {
-        stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-      }
-      if (!is.numeric(max_size)) stop("max_size must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_age))  stop("max_age must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_n))    stop("max_n must be a number. Use `Inf` for no limit.")
-      private$cache        <- new.env(parent = emptyenv())
-      private$max_size     <- max_size
-      private$max_age      <- max_age
-      private$max_n        <- max_n
-      private$evict        <- match.arg(evict)
-      private$missing      <- missing
-      private$exec_missing <- exec_missing
-      private$logfile      <- logfile
-    },
-
-    get = function(key, missing = private$missing, exec_missing = private$exec_missing) {
-      private$log(paste0('get: key "', key, '"'))
-      validate_key(key)
-
-      private$maybe_prune_single(key)
-
-      if (!self$exists(key)) {
-        private$log(paste0('get: key "', key, '" is missing'))
-        if (exec_missing) {
-          if (!is.function(missing) || length(formals(missing)) == 0) {
-            stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-          }
-          return(missing(key))
-        } else {
-          return(missing)
-        }
-      }
-
-      private$log(paste0('get: key "', key, '" found'))
-      value <- private$cache[[key]]$value
-      value
-    },
-
-    set = function(key, value) {
-      private$log(paste0('set: key "', key, '"'))
-      validate_key(key)
-
-      time <- as.numeric(Sys.time())
-
-      # Only record size if we're actually using max_size for pruning.
-      if (is.finite(private$max_size)) {
-        # Reported size is rough! See ?object.size.
-        size <- as.numeric(object.size(value))
-      } else {
-        size <- NULL
-      }
-
-      private$cache[[key]] <- list(
-        key = key,
-        value = value,
-        size = size,
-        mtime = time,
-        atime = time
-      )
-      self$prune()
-      invisible(self)
-    },
-
-    exists = function(key) {
-      validate_key(key)
-      # Faster than `exists(key, envir = private$cache, inherits = FALSE)
-      !is.null(private$cache[[key]])
-    },
-
-    keys = function() {
-      ls(private$cache, sorted = FALSE)  # Faster with sorted=FALSE
-    },
-
-    remove = function(key) {
-      private$log(paste0('remove: key "', key, '"'))
-      validate_key(key)
-      rm(list = key, envir = private$cache)
-      invisible(self)
-    },
-
-    reset = function() {
-      private$log(paste0('reset'))
-      rm(list = self$keys(), envir = private$cache)
-      invisible(self)
-    },
-
-    prune = function() {
-      private$log(paste0('prune'))
-      info <- private$object_info()
-
-      # 1. Remove any objects where the age exceeds max age.
-      if (is.finite(private$max_age)) {
-        time <- as.numeric(Sys.time())
-        timediff <- time - info$mtime
-        rm_idx <- timediff > private$max_age
-        if (any(rm_idx)) {
-          private$log(paste0("prune max_age: Removing ", paste(info$key[rm_idx], collapse = ", ")))
-          rm(list = info$key[rm_idx], envir = private$cache)
-          info <- info[!rm_idx, ]
-        }
-      }
-
-      # Sort objects by priority, according to eviction policy. The sorting is
-      # done in a function which can be called multiple times but only does
-      # the work the first time.
-      info_is_sorted <- FALSE
-      ensure_info_is_sorted <- function() {
-        if (info_is_sorted) return()
-
-        if (private$evict == "lru") {
-          info <<- info[order(info$atime, decreasing = TRUE), ]
-        } else if (private$evict == "fifo") {
-          info <<- info[order(info$mtime, decreasing = TRUE), ]
-        } else {
-          stop('Unknown eviction policy "', private$evict, '"')
-        }
-        info_is_sorted <<- TRUE
-      }
-
-      # 2. Remove objects if there are too many.
-      if (is.finite(private$max_n) && nrow(info) > private$max_n) {
-        ensure_info_is_sorted()
-        rm_idx <- seq_len(nrow(info)) > private$max_n
-        private$log(paste0("prune max_n: Removing ", paste(info$key[rm_idx], collapse = ", ")))
-        rm(list = info$key[rm_idx], envir = private$cache)
-        info <- info[!rm_idx, ]
-      }
-
-      # 3. Remove objects if cache is too large.
-      if (is.finite(private$max_size) && sum(info$size) > private$max_size) {
-        ensure_info_is_sorted()
-        cum_size <- cumsum(info$size)
-        rm_idx <- cum_size > private$max_size
-        private$log(paste0("prune max_size: Removing ", paste(info$key[rm_idx], collapse = ", ")))
-        rm(list = info$key[rm_idx], envir = private$cache)
-        info <- info[!rm_idx, ]
-      }
-
-      invisible(self)
-    },
-
-    size = function() {
-      length(self$keys())
-    }
-  ),
-
-  private = list(
-    cache = NULL,
-    max_age = NULL,
-    max_size = NULL,
-    max_n = NULL,
-    evict = NULL,
-    missing = NULL,
-    exec_missing = NULL,
-    logfile = NULL,
-
-    # Prunes a single object if it exceeds max_age. If the object does not
-    # exceed max_age, or if the object doesn't exist, do nothing.
-    maybe_prune_single = function(key) {
-      if (!is.finite(private$max_age)) return()
-
-      obj <- private$cache[[key]]
-      if (is.null(obj)) return()
-
-      timediff <- as.numeric(Sys.time()) - obj$mtime
-      if (timediff > private$max_age) {
-        private$log(paste0("pruning single object exceeding max_age: Removing ", key))
-        rm(list = key, envir = private$cache)
-      }
-    },
-
-    object_info = function() {
-      keys <- ls(private$cache, sorted = FALSE)
-      data.frame(
-        key   = keys,
-        size  = vapply(keys, function(key) private$cache[[key]]$size,  0),
-        mtime = vapply(keys, function(key) private$cache[[key]]$mtime, 0),
-        atime = vapply(keys, function(key) private$cache[[key]]$atime, 0),
-        stringsAsFactors = FALSE
-      )
-    },
-
-    log = function(text) {
-      if (is.null(private$logfile)) return()
-
-      text <- paste0(format(Sys.time(), "[%Y-%m-%d %H:%M:%OS3] MemoryCache "), text)
-      writeLines(text, private$logfile)
-    }
-  )
-)

R/cache-utils.R

@@ -1,33 +0,0 @@
-#' A Key Missing object
-#'
-#' A \code{key_missing} object represents a cache miss.
-#'
-#' @param x An object to test.
-#'
-#' @seealso \code{\link{diskCache}}, \code{\link{memoryCache}}.
-#'
-#' @export
-key_missing <- function() {
-  structure(list(), class = "key_missing")
-}
-
-#' @rdname key_missing
-#' @export
-is.key_missing <- function(x) {
-  inherits(x, "key_missing")
-}
-
-#' @export
-print.key_missing <- function(x, ...) {
-  cat("<Key Missing>\n")
-}
-
-
-validate_key <- function(key) {
-  if (!is.character(key) || length(key) != 1 || nchar(key) == 0) {
-    stop("Invalid key: key must be single non-empty string.")
-  }
-  if (grepl("[^a-z0-9]", key)) {
-    stop("Invalid key: ", key, ". Only lowercase letters and numbers are allowed.")
-  }
-}

R/conditions.R

@@ -76,7 +76,7 @@ getCallNames <- function(calls) {
 }
 
 getLocs <- function(calls) {
-  vapply(calls, function(call) {
+  sapply(calls, function(call) {
     srcref <- attr(call, "srcref", exact = TRUE)
     if (!is.null(srcref)) {
       srcfile <- attr(srcref, "srcfile", exact = TRUE)
@@ -86,24 +86,7 @@ getLocs <- function(calls) {
       }
     }
     return("")
-  }, character(1))
-}
-
-getCallCategories <- function(calls) {
-  vapply(calls, function(call) {
-    srcref <- attr(call, "srcref", exact = TRUE)
-    if (!is.null(srcref)) {
-      srcfile <- attr(srcref, "srcfile", exact = TRUE)
-      if (!is.null(srcfile)) {
-        if (!is.null(srcfile$original)) {
-          return("pkg")
-        } else {
-          return("user")
-        }
-      }
-    }
-    return("")
-  }, character(1))
+  })
 }
 
 #' @details \code{captureStackTraces} runs the given \code{expr} and if any
@@ -122,91 +105,15 @@ getCallCategories <- function(calls) {
 #' @rdname stacktrace
 #' @export
 captureStackTraces <- function(expr) {
-  promises::with_promise_domain(createStackTracePromiseDomain(),
-    expr
-  )
-}
-
-#' @include globals.R
-.globals$deepStack <- NULL
-
-createStackTracePromiseDomain <- function() {
-  # These are actually stateless, we wouldn't have to create a new one each time
-  # if we didn't want to. They're pretty cheap though.
-  
-  d <- promises::new_promise_domain(
-    wrapOnFulfilled = function(onFulfilled) {
-      force(onFulfilled)
-      # Subscription time
-      if (deepStacksEnabled()) {
-        currentStack <- sys.calls()
-        currentParents <- sys.parents()
-        attr(currentStack, "parents") <- currentParents
-        currentDeepStack <- .globals$deepStack
+  withCallingHandlers(expr,
+    error = function(e) {
+      if (is.null(attr(e, "stack.trace", exact = TRUE))) {
+        calls <- sys.calls()
+        attr(e, "stack.trace") <- calls
+        stop(e)
       }
-      function(...) {
-        # Fulfill time
-        if (deepStacksEnabled()) {
-          origDeepStack <- .globals$deepStack
-          .globals$deepStack <- c(currentDeepStack, list(currentStack))
-          on.exit(.globals$deepStack <- origDeepStack, add = TRUE)
-        }
-
-        withCallingHandlers(
-          onFulfilled(...),
-          error = doCaptureStack
-        )
-      }
-    },
-    wrapOnRejected = function(onRejected) {
-      force(onRejected)
-      # Subscription time
-      if (deepStacksEnabled()) {
-        currentStack <- sys.calls()
-        currentParents <- sys.parents()
-        attr(currentStack, "parents") <- currentParents
-        currentDeepStack <- .globals$deepStack
-      }
-      function(...) {
-        # Fulfill time
-        if (deepStacksEnabled()) {
-          origDeepStack <- .globals$deepStack
-          .globals$deepStack <- c(currentDeepStack, list(currentStack))
-          on.exit(.globals$deepStack <- origDeepStack, add = TRUE)
-        }
-
-        withCallingHandlers(
-          onRejected(...),
-          error = doCaptureStack
-        )
-      }
-    },
-    wrapSync = function(expr) {
-      withCallingHandlers(expr,
-        error = doCaptureStack
-      )
-    },
-    onError = doCaptureStack
-  )
-}
-
-deepStacksEnabled <- function() {
-  getOption("shiny.deepstacktrace", TRUE)
-}
-
-doCaptureStack <- function(e) {
-  if (is.null(attr(e, "stack.trace", exact = TRUE))) {
-    calls <- sys.calls()
-    parents <- sys.parents()
-    attr(calls, "parents") <- parents
-    attr(e, "stack.trace") <- calls
-  }
-  if (deepStacksEnabled()) {
-    if (is.null(attr(e, "deep.stack.trace", exact = TRUE)) && !is.null(.globals$deepStack)) {
-      attr(e, "deep.stack.trace") <- .globals$deepStack
     }
-  }
-  stop(e)
+  )
 }
 
 #' @details \code{withLogErrors} captures stack traces and logs errors that
@@ -221,22 +128,7 @@ withLogErrors <- function(expr,
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
 
   withCallingHandlers(
-    {
-      result <- captureStackTraces(expr)
-
-      # Handle expr being an async operation
-      if (promises::is.promise(result)) {
-        result <- promises::catch(result, function(cond) {
-          # Don't print shiny.silent.error (i.e. validation errors)
-          if (inherits(cond, "shiny.silent.error")) return()
-          if (isTRUE(getOption("show.error.messages"))) {
-            printError(cond, full = full, offset = offset)
-          }
-        })
-      }
-
-      result
-    },
+    captureStackTraces(expr),
     error = function(cond) {
       # Don't print shiny.silent.error (i.e. validation errors)
       if (inherits(cond, "shiny.silent.error")) return()
@@ -266,11 +158,11 @@ withLogErrors <- function(expr,
 printError <- function(cond,
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
-  
-  warning(call. = FALSE, immediate. = TRUE, sprintf("Error in %s: %s", 
+
+  warning(call. = FALSE, immediate. = TRUE, sprintf("Error in %s: %s",
     getCallNames(list(conditionCall(cond))), conditionMessage(cond)))
-  
   printStackTrace(cond, full = full, offset = offset)
+  invisible()
 }
 
 #' @rdname stacktrace
@@ -279,85 +171,24 @@ printStackTrace <- function(cond,
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
 
-  should_drop <- !full
-  should_strip <- !full
-  should_prune <- !full
-  
-  stackTraceCalls <- c(
-    attr(cond, "deep.stack.trace", exact = TRUE),
-    list(attr(cond, "stack.trace", exact = TRUE))
-  )
-  
-  stackTraceParents <- lapply(stackTraceCalls, attr, which = "parents", exact = TRUE)
-  stackTraceCallNames <- lapply(stackTraceCalls, getCallNames)
-  stackTraceCalls <- lapply(stackTraceCalls, offsetSrcrefs, offset = offset)
-  
-  # Use dropTrivialFrames logic to remove trailing bits (.handleSimpleError, h)
-  if (should_drop) {
-    # toKeep is a list of logical vectors, of which elements (stack frames) to keep
-    toKeep <- lapply(stackTraceCallNames, dropTrivialFrames)
-    # We apply the list of logical vector indices to each data structure
-    stackTraceCalls <- mapply(stackTraceCalls, FUN = `[`, toKeep, SIMPLIFY = FALSE)
-    stackTraceCallNames <- mapply(stackTraceCallNames, FUN = `[`, toKeep, SIMPLIFY = FALSE)
-    stackTraceParents <- mapply(stackTraceParents, FUN = `[`, toKeep, SIMPLIFY = FALSE)
-  }
-  
-  delayedAssign("all_true", {
-    # List of logical vectors that are all TRUE, the same shape as
-    # stackTraceCallNames. Delay the evaluation so we don't create it unless
-    # we need it, but if we need it twice then we don't pay to create it twice.
-    lapply(stackTraceCallNames, function(st) {
-      rep_len(TRUE, length(st))
-    })
-  })
-  
-  # stripStackTraces and lapply(stackTraceParents, pruneStackTrace) return lists
-  # of logical vectors. Use mapply(FUN = `&`) to boolean-and each pair of the
-  # logical vectors.
-  toShow <- mapply(
-    if (should_strip) stripStackTraces(stackTraceCallNames) else all_true,
-    if (should_prune) lapply(stackTraceParents, pruneStackTrace) else all_true,
-    FUN = `&`,
-    SIMPLIFY = FALSE
-  )
-  
-  dfs <- mapply(seq_along(stackTraceCalls), rev(stackTraceCalls), rev(stackTraceCallNames), rev(toShow), FUN = function(i, calls, nms, index) {
-    st <- data.frame(
-      num = rev(which(index)),
-      call = rev(nms[index]),
-      loc = rev(getLocs(calls[index])),
-      category = rev(getCallCategories(calls[index])),
-      stringsAsFactors = FALSE
-    )
-    
-    if (i != 1) {
-      message("From earlier call:")
-    }
-
-    if (nrow(st) == 0) {
-      message("  [No stack trace available]")
+  stackTrace <- attr(cond, "stack.trace", exact = TRUE)
+  tryCatch(
+    if (!is.null(stackTrace)) {
+      message(paste0(
+        "Stack trace (innermost first):\n",
+        paste0(collapse = "\n",
+          formatStackTrace(stackTrace, full = full, offset = offset,
+            indent = "    ")
+        )
+      ))
     } else {
-      width <- floor(log10(max(st$num))) + 1
-      formatted <- paste0(
-        "  ",
-        formatC(st$num, width = width),
-        ": ",
-        mapply(paste0(st$call, st$loc), st$category, FUN = function(name, category) {
-          if (category == "pkg")
-            crayon::silver(name)
-          else if (category == "user")
-            crayon::blue$bold(name)
-          else
-            crayon::white(name)
-        }),
-        "\n"
-      )
-      cat(file = stderr(), formatted, sep = "")
-    }
+      message("No stack trace available")
+    },
 
-    st
-  }, SIMPLIFY = FALSE)
-  
+    error = function(cond) {
+      warning("Failed to write stack trace: ", cond)
+    }
+  )
   invisible()
 }
 
@@ -365,17 +196,12 @@ printStackTrace <- function(cond,
 #'   from \code{conditionStackTrace(cond)}) and returns a data frame with one
 #'   row for each stack frame and the columns \code{num} (stack frame number),
 #'   \code{call} (a function name or similar), and \code{loc} (source file path
-#'   and line number, if available). It was deprecated after shiny 1.0.5 because
-#'   it doesn't support deep stack traces.
+#'   and line number, if available).
 #' @rdname stacktrace
 #' @export
 extractStackTrace <- function(calls,
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
-  
-  shinyDeprecated(NULL,
-    "extractStackTrace is deprecated. Please contact the Shiny team if you were using this functionality.",
-    version = "1.0.5")
 
   srcrefs <- getSrcRefs(calls)
   if (offset) {
@@ -415,11 +241,7 @@ extractStackTrace <- function(calls,
     score <- rep.int(0, length(callnames))
     score[callnames == "..stacktraceoff.."] <- -1
     score[callnames == "..stacktraceon.."] <- 1
-    toShow <- (1 + cumsum(score)) > 0 & !(callnames %in% c("..stacktraceon..", "..stacktraceoff..", "..stacktracefloor.."))
-
-    # doTryCatch, tryCatchOne, and tryCatchList are not informative--they're
-    # just internals for tryCatch
-    toShow <- toShow & !(callnames %in% c("doTryCatch", "tryCatchOne", "tryCatchList"))
+    toShow <- (1 + cumsum(score)) > 0 & !(callnames %in% c("..stacktraceon..", "..stacktraceoff.."))
   }
   calls <- calls[toShow]
 
@@ -431,115 +253,12 @@ extractStackTrace <- function(calls,
     num = index,
     call = getCallNames(calls),
     loc = getLocs(calls),
-    category = getCallCategories(calls),
     stringsAsFactors = FALSE
   )
 }
 
-stripStackTraces <- function(stackTraces, values = FALSE) {
-  score <- 1L  # >=1: show, <=0: hide
-  lapply(seq_along(stackTraces), function(i) {
-    res <- stripOneStackTrace(stackTraces[[i]], i != 1, score)
-    score <<- res$score
-    toShow <- as.logical(res$trace)
-    if (values) {
-      as.character(stackTraces[[i]][toShow])
-    } else {
-      as.logical(toShow)
-    }
-  })
-}
-
-stripOneStackTrace <- function(stackTrace, truncateFloor, startingScore) {
-  prefix <- logical(0)
-  if (truncateFloor) {
-    indexOfFloor <- utils::tail(which(stackTrace == "..stacktracefloor.."), 1)
-    if (length(indexOfFloor)) {
-      stackTrace <- stackTrace[(indexOfFloor+1L):length(stackTrace)]
-      prefix <- rep_len(FALSE, indexOfFloor)
-    }
-  }
-  
-  if (length(stackTrace) == 0) {
-    return(list(score = startingScore, character(0)))
-  }
-  
-  score <- rep.int(0L, length(stackTrace))
-  score[stackTrace == "..stacktraceon.."] <- 1L
-  score[stackTrace == "..stacktraceoff.."] <- -1L
-  score <- startingScore + cumsum(score)
-  
-  toShow <- score > 0 & !(stackTrace %in% c("..stacktraceon..", "..stacktraceoff..", "..stacktracefloor.."))
-  
-  
-  list(score = utils::tail(score, 1), trace = c(prefix, toShow))
-}
-
-# Given sys.parents() (which corresponds to sys.calls()), return a logical index
-# that prunes each subtree so that only the final branch remains. The result,
-# when applied to sys.calls(), is a linear list of calls without any "wrapper"
-# functions like tryCatch, try, with, hybrid_chain, etc. While these are often
-# part of the active call stack, they rarely are helpful when trying to identify
-# a broken bit of code.
-pruneStackTrace <- function(parents) {
-  # Detect nodes that are not the last child. This is necessary, but not
-  # sufficient; we also need to drop nodes that are the last child, but one of
-  # their ancestors is not.
-  is_dupe <- duplicated(parents, fromLast = TRUE)
-  
-  # The index of the most recently seen node that was actually kept instead of
-  # dropped.
-  current_node <- 0
-  
-  # Loop over the parent indices. Anything that is not parented by current_node
-  # (a.k.a. last-known-good node), or is a dupe, can be discarded. Anything that
-  # is kept becomes the new current_node.
-  include <- vapply(seq_along(parents), function(i) {
-    if (!is_dupe[[i]] && parents[[i]] == current_node) {
-      current_node <<- i
-      TRUE
-    } else {
-      FALSE
-    }
-  }, FUN.VALUE = logical(1))
-  
-  include
-}
-
-dropTrivialFrames <- function(callnames) {
-  # Remove stop(), .handleSimpleError(), and h() calls from the end of
-  # the calls--they don't add any helpful information. But only remove
-  # the last *contiguous* block of them, and then, only if they are the
-  # last thing in the calls list.
-  hideable <- callnames %in% c(".handleSimpleError", "h", "base$wrapOnFulfilled")
-  # What's the last that *didn't* match stop/.handleSimpleError/h?
-  lastGoodCall <- max(which(!hideable))
-  toRemove <- length(callnames) - lastGoodCall
-  
-  c(
-    rep_len(TRUE, length(callnames) - toRemove),
-    rep_len(FALSE, toRemove)
-  )
-}
-
-offsetSrcrefs <- function(calls, offset = TRUE) {
-  if (offset) {
-    srcrefs <- getSrcRefs(calls)
-
-    # Offset calls vs. srcrefs by 1 to make them more intuitive.
-    # E.g. for "foo [bar.R:10]", line 10 of bar.R will be part of
-    # the definition of foo().
-    srcrefs <- c(utils::tail(srcrefs, -1), list(NULL))
-    
-    calls <- setSrcRefs(calls, srcrefs)
-  }
-  
-  calls
-}
-
 #' @details \code{formatStackTrace} is similar to \code{extractStackTrace}, but
-#'   it returns a preformatted character vector instead of a data frame. It was
-#'   deprecated after shiny 1.0.5 because it doesn't support deep stack traces.
+#'   it returns a preformatted character vector instead of a data frame.
 #' @param indent A string to prefix every line of the stack trace.
 #' @rdname stacktrace
 #' @export
@@ -547,10 +266,6 @@ formatStackTrace <- function(calls, indent = "    ",
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
 
-  shinyDeprecated(NULL,
-    "extractStackTrace is deprecated. Please contact the Shiny team if you were using this functionality.",
-    version = "1.0.5")
-  
   st <- extractStackTrace(calls, full = full, offset = offset)
   if (nrow(st) == 0) {
     return(character(0))
@@ -561,14 +276,8 @@ formatStackTrace <- function(calls, indent = "    ",
     indent,
     formatC(st$num, width = width),
     ": ",
-    mapply(paste0(st$call, st$loc), st$category, FUN = function(name, category) {
-      if (category == "pkg")
-        crayon::silver(name)
-      else if (category == "user")
-        crayon::blue$bold(name)
-      else
-        crayon::white(name)
-    })
+    st$call,
+    st$loc
   )
 }
 
@@ -623,5 +332,3 @@ conditionStackTrace <- function(cond) {
 #' @rdname stacktrace
 #' @export
 ..stacktraceoff.. <- function(expr) expr
-
-..stacktracefloor.. <- function(expr) expr

R/fileupload.R

@@ -20,18 +20,6 @@
 # form upload, i.e. traditional HTTP POST-based file upload) doesn't work with
 # the websockets package's HTTP server at the moment.
 
-# @description Returns a file's extension, with a leading dot, if one can be
-#   found. A valid extension contains only alphanumeric characters. If there is
-#   no extension, or if it contains non-alphanumeric characters, an empty
-#   string is returned.
-# @param x character vector giving file paths.
-# @return The extension of \code{x}, with a leading dot, if one was found.
-#   Otherwise, an empty character vector.
-maybeGetExtension <- function(x) {
-  ext <- tools::file_ext(x)
-  ifelse(ext == "", ext, paste0(".", ext))
-}
-
 FileUploadOperation <- R6Class(
   'FileUploadOperation',
   portable = FALSE,
@@ -64,9 +52,8 @@ FileUploadOperation <- R6Class(
       .currentFileInfo <<- file
       .pendingFileInfos <<- tail(.pendingFileInfos, -1)
 
-      fileBasename <- basename(.currentFileInfo$name)
-      filename <- file.path(.dir, paste0(as.character(length(.files$name)), maybeGetExtension(fileBasename)))
-      row <- data.frame(name=fileBasename, size=file$size, type=file$type,
+      filename <- file.path(.dir, as.character(length(.files$name)))
+      row <- data.frame(name=file$name, size=file$size, type=file$type,
                         datapath=filename, stringsAsFactors=FALSE)
 
       if (length(.files$name) == 0)
@@ -107,7 +94,7 @@ FileUploadContext <- R6Class(
     },
     createUploadOperation = function(fileInfos) {
       while (TRUE) {
-        id <- createUniqueId(12)
+        id <- paste(as.raw(p_runif(12, min=0, max=0xFF)), collapse='')
         private$ids <- c(private$ids, id)
         dir <- file.path(private$basedir, id)
         if (!dir.create(dir))

R/globals.R

@@ -5,7 +5,7 @@
   # 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
   # the private seed during load.
-  withPrivateSeed(set.seed(NULL))
+  withPrivateSeed(reinitializeSeed())
 }
 
 .onAttach <- function(libname, pkgname) {

R/graph.R

@@ -43,6 +43,7 @@ writeReactLog <- function(file=stdout(), sessionToken = NULL) {
 #'
 #' @param time A boolean that specifies whether or not to display the
 #' time that each reactive.
+#'
 #' @export
 showReactLog <- function(time = TRUE) {
   utils::browseURL(renderReactLog(time = as.logical(time)))
@@ -97,8 +98,8 @@ renderReactLog <- function(sessionToken = NULL, time = TRUE) {
   .graphAppend(list(action='enter', id=id))
 }
 
-.graphExitContext <- function(id, domain) {
-  .graphAppend(list(action='exit', id=id), domain = domain)
+.graphExitContext <- function(id) {
+  .graphAppend(list(action='exit', id=id))
 }
 
 .graphValueChange <- function(label, value) {

R/history.R

@@ -1,95 +0,0 @@
-
-#' @include reactive-domains.R
-NULL
-
-#' @include reactives.R
-NULL
-
-#' Get the query string / hash component from the URL
-#'
-#' Two user friendly wrappers for getting the query string and the hash
-#' component from the app's URL.
-#'
-#' These can be particularly useful if you want to display different content
-#' 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
-#' \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
-#' directly by typing directly in the browser and hitting enter, you don't have
-#' to worry about this.
-#'
-#' @param session	A Shiny session object.
-#'
-#' @return 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 \code{#} symbol).
-#'
-#' @seealso \code{\link{updateQueryString}}
-#'
-#' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'
-#'   ## App 1: getQueryString
-#'   ## Printing the value of the query string
-#'   ## (Use the back and forward buttons to see how the browser
-#'   ## keeps a record of each state)
-#'   shinyApp(
-#'     ui = fluidPage(
-#'       textInput("txt", "Enter new query string"),
-#'       helpText("Format: ?param1=val1&param2=val2"),
-#'       actionButton("go", "Update"),
-#'       hr(),
-#'       verbatimTextOutput("query")
-#'     ),
-#'     server = function(input, output, session) {
-#'       observeEvent(input$go, {
-#'         updateQueryString(input$txt, mode = "push")
-#'       })
-#'       output$query <- renderText({
-#'         query <- getQueryString()
-#'         queryText <- paste(names(query), query,
-#'                        sep = "=", collapse=", ")
-#'         paste("Your query string is:\n", queryText)
-#'       })
-#'     }
-#'   )
-#'
-#'   ## App 2: getUrlHash
-#'   ## Printing the value of the URL hash
-#'   ## (Use the back and forward buttons to see how the browser
-#'   ## keeps a record of each state)
-#'   shinyApp(
-#'     ui = fluidPage(
-#'       textInput("txt", "Enter new hash"),
-#'       helpText("Format: #hash"),
-#'       actionButton("go", "Update"),
-#'       hr(),
-#'       verbatimTextOutput("hash")
-#'     ),
-#'     server = function(input, output, session) {
-#'       observeEvent(input$go, {
-#'         updateQueryString(input$txt, mode = "push")
-#'       })
-#'       output$hash <- renderText({
-#'         hash <- getUrlHash()
-#'         paste("Your hash is:\n", hash)
-#'       })
-#'     }
-#'   )
-#' }
-#' @export
-getQueryString <- function(session = getDefaultReactiveDomain()) {
-  parseQueryString(session$clientData$url_search)
-}
-
-#' @rdname getQueryString
-#' @export
-getUrlHash <- function(session = getDefaultReactiveDomain()) {
-  session$clientData$url_hash
-}

R/html-deps.R

@@ -6,18 +6,13 @@
 #' URL.
 #'
 #' @param dependency A single HTML dependency object, created using
-#'   \code{\link[htmltools]{htmlDependency}}. If the \code{src} value is named,
-#'   then \code{href} and/or \code{file} names must be present.
-#' @param scrubFile If TRUE (the default), remove \code{src$file} for the
-#'   dependency. This prevents the local file path from being sent to the client
-#'   when dynamic web dependencies are used. If FALSE, don't remove
-#'   \code{src$file}. Setting it to FALSE should be needed only in very unusual
-#'   cases.
+#'   \code{\link{htmlDependency}}. If the \code{src} value is named, then
+#'   \code{href} and/or \code{file} names must be present.
 #'
 #' @return A single HTML dependency object that has an \code{href}-named element
 #'   in its \code{src}.
 #' @export
-createWebDependency <- function(dependency, scrubFile = TRUE) {
+createWebDependency <- function(dependency) {
   if (is.null(dependency))
     return(NULL)
 
@@ -30,10 +25,6 @@ createWebDependency <- function(dependency, scrubFile = TRUE) {
     dependency$src$href <- prefix
   }
 
-  # Don't leak local file path to client
-  if (scrubFile)
-    dependency$src$file <- NULL
-
   return(dependency)
 }
 

R/image-interact.R

@@ -86,8 +86,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
   if (use_x) {
     if (is.null(xvar))
       stop("brushedPoints: not able to automatically infer `xvar` from brush")
-    if (!(xvar %in% names(df)))
-      stop("brushedPoints: `xvar` ('", xvar ,"')  not in names of input")
     # Extract data values from the data frame
     x <- asNumber(df[[xvar]])
     keep_rows <- keep_rows & (x >= brush$xmin & x <= brush$xmax)
@@ -95,8 +93,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
   if (use_y) {
     if (is.null(yvar))
       stop("brushedPoints: not able to automatically infer `yvar` from brush")
-    if (!(yvar %in% names(df)))
-      stop("brushedPoints: `yvar` ('", yvar ,"') not in names of input")
     y <- asNumber(df[[yvar]])
     keep_rows <- keep_rows & (y >= brush$ymin & y <= brush$ymax)
   }
@@ -122,19 +118,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
 #  $ xmax   : num 4.22
 #  $ ymin   : num 13.9
 #  $ ymax   : num 19.8
-#  $ coords_css:List of 4
-#   ..$ xmin: int 260
-#   ..$ xmax: int 298
-#   ..$ ymin: num 112
-#   ..$ ymax: num 205
-#  $ coords_img:List of 4
-#   ..$ xmin: int 325
-#   ..$ xmax: num 372
-#   ..$ ymin: num 140
-#   ..$ ymax: num 257
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
 #  $ mapping: Named list()
 #  $ domain :List of 4
 #   ..$ left  : num 1.36
@@ -160,19 +143,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
 #  $ ymax     : num 20.4
 #  $ panelvar1: int 6
 #  $ panelvar2: int 0
-#  $ coords_css:List of 4
-#   ..$ xmin: int 260
-#   ..$ xmax: int 298
-#   ..$ ymin: num 112
-#   ..$ ymax: num 205
-#  $ coords_img:List of 4
-#   ..$ xmin: int 325
-#   ..$ xmax: num 372
-#   ..$ ymin: num 140
-#   ..$ ymax: num 257
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
 #  $ mapping  :List of 4
 #   ..$ x        : chr "wt"
 #   ..$ y        : chr "mpg"
@@ -275,29 +245,18 @@ nearPoints <- function(df, coordinfo, xvar = NULL, yvar = NULL,
   if (is.null(yvar))
     stop("nearPoints: not able to automatically infer `yvar` from coordinfo")
 
-  if (!(xvar %in% names(df)))
-    stop("nearPoints: `xvar` ('", xvar ,"')  not in names of input")
-  if (!(yvar %in% names(df)))
-    stop("nearPoints: `yvar` ('", yvar ,"')  not in names of input")
-
   # Extract data values from the data frame
   x <- asNumber(df[[xvar]])
   y <- asNumber(df[[yvar]])
 
-  # Get the coordinates of the point (in img pixel coordinates)
-  point_img <- coordinfo$coords_img
+  # Get the pixel coordinates of the point
+  coordPx <- scaleCoords(coordinfo$x, coordinfo$y, coordinfo)
 
-  # Get coordinates of data points (in img pixel coordinates)
-  data_img <- scaleCoords(x, y, coordinfo)
+  # Get pixel coordinates of data points
+  dataPx <- scaleCoords(x, y, coordinfo)
 
-  # Get x/y distances (in css coordinates)
-  dist_css <- list(
-    x = (data_img$x - point_img$x) / coordinfo$img_css_ratio$x,
-    y = (data_img$y - point_img$y) / coordinfo$img_css_ratio$y
-  )
-
-  # Distances of data points to the target point, in css pixels.
-  dists <- sqrt(dist_css$x^2 + dist_css$y^2)
+  # Distances of data points to coordPx
+  dists <- sqrt((dataPx$x - coordPx$x) ^ 2 + (dataPx$y - coordPx$y) ^ 2)
 
   if (addDist)
     df$dist_ <- dists
@@ -339,68 +298,50 @@ nearPoints <- function(df, coordinfo, xvar = NULL, yvar = NULL,
 # The coordinfo data structure will look something like the examples below.
 # For base graphics, `mapping` is empty, and there are no panelvars:
 # List of 7
-#  $ x         : num 4.37
-#  $ y         : num 12
-#  $ coords_css:List of 2
-#   ..$ x: int 286
-#   ..$ y: int 192
-#  $ coords_img:List of 2
-#   ..$ x: num 358
-#   ..$ y: int 240
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
-#  $ mapping   : Named list()
-#  $ domain    :List of 4
+#  $ x      : num 4.37
+#  $ y      : num 12
+#  $ mapping: Named list()
+#  $ domain :List of 4
 #   ..$ left  : num 1.36
 #   ..$ right : num 5.58
 #   ..$ bottom: num 9.46
 #   ..$ top   : num 34.8
-#  $ range     :List of 4
+#  $ range  :List of 4
 #   ..$ left  : num 58
 #   ..$ right : num 429
 #   ..$ bottom: num 226
 #   ..$ top   : num 58
-#  $ log       :List of 2
+#  $ log    :List of 2
 #   ..$ x: NULL
 #   ..$ y: NULL
-#  $ .nonce    : num 0.343
+#  $ .nonce : num 0.343
 #
 # For ggplot2, the mapping vars usually will be included, and if faceting is
 # used, they will be listed as panelvars:
 # List of 9
-#  $ x         : num 3.78
-#  $ y         : num 17.1
-#  $ coords_css:List of 2
-#   ..$ x: int 286
-#   ..$ y: int 192
-#  $ coords_img:List of 2
-#   ..$ x: num 358
-#   ..$ y: int 240
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
-#  $ panelvar1 : int 6
-#  $ panelvar2 : int 0
-#  $ mapping   :List of 4
+#  $ x        : num 3.78
+#  $ y        : num 17.1
+#  $ panelvar1: int 6
+#  $ panelvar2: int 0
+#  $ mapping  :List of 4
 #   ..$ x        : chr "wt"
 #   ..$ y        : chr "mpg"
 #   ..$ panelvar1: chr "cyl"
 #   ..$ panelvar2: chr "am"
-#  $ domain    :List of 4
+#  $ domain   :List of 4
 #   ..$ left  : num 1.32
 #   ..$ right : num 5.62
 #   ..$ bottom: num 9.22
 #   ..$ top   : num 35.1
-#  $ range     :List of 4
+#  $ range    :List of 4
 #   ..$ left  : num 172
 #   ..$ right : num 300
 #   ..$ bottom: num 144
 #   ..$ top   : num 28.5
-#  $ log       :List of 2
+#  $ log      :List of 2
 #   ..$ x: NULL
 #   ..$ y: NULL
-#  $ .nonce    : num 0.603
+#  $ .nonce   : num 0.603
 
 
 

R/imageutils.R

@@ -1,33 +1,3 @@
-startPNG <- function(filename, width, height, res, ...) {
-  # If quartz is available, use png() (which will default to quartz).
-  # Otherwise, if the Cairo package is installed, use CairoPNG().
-  # Finally, if neither quartz nor Cairo, use png().
-  if (capabilities("aqua")) {
-    pngfun <- grDevices::png
-  } else if ((getOption('shiny.usecairo') %OR% TRUE) &&
-      nchar(system.file(package = "Cairo"))) {
-    pngfun <- Cairo::CairoPNG
-  } else {
-    pngfun <- grDevices::png
-  }
-
-  pngfun(filename=filename, width=width, height=height, res=res, ...)
-  # Call plot.new() so that even if no plotting operations are performed at
-  # least we have a blank background. N.B. we need to set the margin to 0
-  # temporarily before plot.new() because when the plot size is small (e.g.
-  # 200x50), we will get an error "figure margin too large", which is triggered
-  # by plot.new() with the default (large) margin. However, this does not
-  # guarantee user's code in func() will not trigger the error -- they may have
-  # to set par(mar = smaller_value) before they draw base graphics.
-  op <- graphics::par(mar = rep(0, 4))
-  tryCatch(
-    graphics::plot.new(),
-    finally = graphics::par(op)
-  )
-
-  grDevices::dev.cur()
-}
-
 #' Run a plotting function and save the output as a PNG
 #'
 #' This function returns the name of the PNG file that it generates. In
@@ -51,51 +21,43 @@ startPNG <- function(filename, width, height, res, ...) {
 #' @param width Width in pixels.
 #' @param height Height in pixels.
 #' @param res Resolution in pixels per inch. This value is passed to
-#'   \code{\link[grDevices]{png}}. Note that this affects the resolution of PNG rendering in
+#'   \code{\link{png}}. Note that this affects the resolution of PNG rendering in
 #'   R; it won't change the actual ppi of the browser.
 #' @param ... Arguments to be passed through to \code{\link[grDevices]{png}}.
 #'   These can be used to set the width, height, background color, etc.
+#'
 #' @export
 plotPNG <- function(func, filename=tempfile(fileext='.png'),
                     width=400, height=400, res=72, ...) {
-  dv <- startPNG(filename, width, height, res, ...)
+  # If quartz is available, use png() (which will default to quartz).
+  # Otherwise, if the Cairo package is installed, use CairoPNG().
+  # Finally, if neither quartz nor Cairo, use png().
+  if (capabilities("aqua")) {
+    pngfun <- grDevices::png
+  } else if ((getOption('shiny.usecairo') %OR% TRUE) &&
+             nchar(system.file(package = "Cairo"))) {
+    pngfun <- Cairo::CairoPNG
+  } else {
+    pngfun <- grDevices::png
+  }
+
+  pngfun(filename=filename, width=width, height=height, res=res, ...)
+  # Call plot.new() so that even if no plotting operations are performed at
+  # least we have a blank background. N.B. we need to set the margin to 0
+  # temporarily before plot.new() because when the plot size is small (e.g.
+  # 200x50), we will get an error "figure margin too large", which is triggered
+  # by plot.new() with the default (large) margin. However, this does not
+  # guarantee user's code in func() will not trigger the error -- they may have
+  # to set par(mar = smaller_value) before they draw base graphics.
+  op <- graphics::par(mar = rep(0, 4))
+  tryCatch(
+    graphics::plot.new(),
+    finally = graphics::par(op)
+  )
+
+  dv <- grDevices::dev.cur()
   on.exit(grDevices::dev.off(dv), add = TRUE)
   func()
 
   filename
 }
-
-#' @importFrom grDevices dev.set dev.cur
-createGraphicsDevicePromiseDomain <- function(which = dev.cur()) {
-  force(which)
-
-  promises::new_promise_domain(
-    wrapOnFulfilled = function(onFulfilled) {
-      force(onFulfilled)
-      function(...) {
-        old <- dev.cur()
-        dev.set(which)
-        on.exit(dev.set(old))
-
-        onFulfilled(...)
-      }
-    },
-    wrapOnRejected = function(onRejected) {
-      force(onRejected)
-      function(...) {
-        old <- dev.cur()
-        dev.set(which)
-        on.exit(dev.set(old))
-
-        onRejected(...)
-      }
-    },
-    wrapSync = function(expr) {
-      old <- dev.cur()
-      dev.set(which)
-      on.exit(dev.set(old))
-
-      force(expr)
-    }
-  )
-}

R/input-action.R

@@ -37,16 +37,13 @@
 #' }
 #'
 #' @seealso \code{\link{observeEvent}} and \code{\link{eventReactive}}
+#'
 #' @export
 actionButton <- function(inputId, label, icon = NULL, width = NULL, ...) {
-
-  value <- restoreInput(id = inputId, default = NULL)
-
   tags$button(id=inputId,
     style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
     type="button",
     class="btn btn-default action-button",
-    `data-val` = value,
     list(validateIcon(icon), label),
     ...
   )
@@ -55,12 +52,9 @@ actionButton <- function(inputId, label, icon = NULL, width = NULL, ...) {
 #' @rdname actionButton
 #' @export
 actionLink <- function(inputId, label, icon = NULL, ...) {
-  value <- restoreInput(id = inputId, default = NULL)
-
   tags$a(id=inputId,
     href="#",
     class="action-button",
-    `data-val` = value,
     list(validateIcon(icon), label),
     ...
   )

R/input-checkbox.R

@@ -24,9 +24,6 @@
 #' }
 #' @export
 checkboxInput <- function(inputId, label, value = FALSE, width = NULL) {
-
-  value <- restoreInput(id = inputId, default = value)
-
   inputTag <- tags$input(id = inputId, type="checkbox")
   if (!is.null(value) && value)
     inputTag$attribs$checked <- "checked"

R/input-checkboxgroup.R

@@ -6,22 +6,9 @@
 #'
 #' @inheritParams textInput
 #' @param choices List of values to show checkboxes for. If elements of the list
-#'   are named then that name rather than the value is displayed to the user. If
-#'   this argument is provided, then \code{choiceNames} and \code{choiceValues}
-#'   must not be provided, and vice-versa. The values should be strings; other
-#'   types (such as logicals and numbers) will be coerced to strings.
+#'   are named then that name rather than the value is displayed to the user.
 #' @param selected The values that should be initially selected, if any.
 #' @param inline If \code{TRUE}, render the choices inline (i.e. horizontally)
-#' @param choiceNames,choiceValues List of names and values, respectively,
-#'   that are displayed to the user in the app and correspond to the each
-#'   choice (for this reason, \code{choiceNames} and \code{choiceValues}
-#'   must have the same length). If either of these arguments is
-#'   provided, then the other \emph{must} be provided and \code{choices}
-#'   \emph{must not} be provided. The advantage of using both of these over
-#'   a named list for \code{choices} is that \code{choiceNames} allows any
-#'   type of UI object to be passed through (tag objects, icons, HTML code,
-#'   ...), instead of just simple text. See Examples.
-#'
 #' @return A list of HTML elements that can be added to a UI definition.
 #'
 #' @family input elements
@@ -39,52 +26,24 @@
 #'   tableOutput("data")
 #' )
 #'
-#' server <- function(input, output, session) {
+#' server <- function(input, output) {
 #'   output$data <- renderTable({
 #'     mtcars[, c("mpg", input$variable), drop = FALSE]
 #'   }, rownames = TRUE)
 #' }
 #'
 #' shinyApp(ui, server)
-#'
-#' ui <- fluidPage(
-#'   checkboxGroupInput("icons", "Choose icons:",
-#'     choiceNames =
-#'       list(icon("calendar"), icon("bed"),
-#'            icon("cog"), icon("bug")),
-#'     choiceValues =
-#'       list("calendar", "bed", "cog", "bug")
-#'   ),
-#'   textOutput("txt")
-#' )
-#'
-#' server <- function(input, output, session) {
-#'   output$txt <- renderText({
-#'     icons <- paste(input$icons, collapse = ", ")
-#'     paste("You chose", icons)
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
 #' }
 #' @export
-checkboxGroupInput <- function(inputId, label, choices = NULL, selected = NULL,
-  inline = FALSE, width = NULL, choiceNames = NULL, choiceValues = NULL) {
+checkboxGroupInput <- function(inputId, label, choices, selected = NULL,
+  inline = FALSE, width = NULL) {
 
-  # keep backward compatibility with Shiny < 1.0.1 (see #1649)
-  if (is.null(choices) && is.null(choiceNames) && is.null(choiceValues)) {
-    choices <- character(0)
-  }
+  # resolve names
+  choices <- choicesWithNames(choices)
+  if (!is.null(selected))
+    selected <- validateSelected(selected, choices, inputId)
 
-  args <- normalizeChoicesArgs(choices, choiceNames, choiceValues)
-
-  selected <- restoreInput(id = inputId, default = selected)
-
-  # default value if it's not specified
-  if (!is.null(selected)) selected <- as.character(selected)
-
-  options <- generateOptions(inputId, selected, inline,
-    'checkbox', args$choiceNames, args$choiceValues)
+  options <- generateOptions(inputId, choices, selected, inline)
 
   divClass <- "form-group shiny-input-checkboxgroup shiny-input-container"
   if (inline)

R/input-date.R

@@ -10,7 +10,7 @@
 #'   \item \code{yy} Year without century (12)
 #'   \item \code{yyyy} Year with century (2012)
 #'   \item \code{mm} Month number, with leading zero (01-12)
-#'   \item \code{m} Month number, without leading zero (1-12)
+#'   \item \code{m} Month number, without leading zero (01-12)
 #'   \item \code{M} Abbreviated month name
 #'   \item \code{MM} Full month name
 #'   \item \code{dd} Day of month with leading zero
@@ -21,33 +21,23 @@
 #'
 #' @inheritParams textInput
 #' @param value The starting date. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. If NULL (the default), will use the current date
-#'   in the client's time zone.
+#'   \code{yyyy-mm-dd} format. If NULL (the default), will use the current
+#'   date in the client's time zone.
 #' @param min The minimum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param max The maximum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param format The format of the date to display in the browser. Defaults to
 #'   \code{"yyyy-mm-dd"}.
-#' @param startview The date range shown when the input object is first clicked.
-#'   Can be "month" (the default), "year", or "decade".
+#' @param startview The date range shown when the input object is first
+#'   clicked. Can be "month" (the default), "year", or "decade".
 #' @param weekstart Which day is the start of the week. Should be an integer
 #'   from 0 (Sunday) to 6 (Saturday).
 #' @param language The language used for month and day names. Default is "en".
-#'   Other valid values include "ar-tn", "ar", "az", "bg", "bn", "br", "bs",
-#'   "ca", "cs", "cy", "da", "de", "el", "en-AU", "en-CA", "en-GB", "en-IE",
-#'   "en-NZ", "en-ZA", "eo", "es", "et", "eu", "fa", "fi", "fo", "fr-CH", "fr",
-#'   "gl", "he", "hi", "hr", "hu", "hy", "id", "is", "it-CH", "it", "ja", "ka",
-#'   "kh", "kk", "km", "ko", "kr", "lt", "lv", "me", "mk", "mn", "ms", "nl-BE",
-#'   "nl", "no", "oc", "pl", "pt-BR", "pt", "ro", "rs-latin", "rs", "ru", "si",
-#'   "sk", "sl", "sq", "sr-latin", "sr", "sv", "sw", "ta", "tg", "th", "tk",
-#'   "tr", "uk", "uz-cyrl", "uz-latn", "vi", "zh-CN", and "zh-TW".
-#' @param autoclose Whether or not to close the datepicker immediately when a
-#'   date is selected.
-#' @param datesdisabled Which dates should be disabled. Either a Date object, or
-#'   a string in \code{yyyy-mm-dd} format.
-#' @param daysofweekdisabled Days of the week that should be disabled. Should be
-#'   a integer vector with values from 0 (Sunday) to 6 (Saturday).
+#'   Other valid values include "bg", "ca", "cs", "da", "de", "el", "es", "fi",
+#'   "fr", "he", "hr", "hu", "id", "is", "it", "ja", "kr", "lt", "lv", "ms",
+#'   "nb", "nl", "pl", "pt", "pt-BR", "ro", "rs", "rs-latin", "ru", "sk", "sl",
+#'   "sv", "sw", "th", "tr", "uk", "zh-CN", and "zh-TW".
 #'
 #' @family input elements
 #' @seealso \code{\link{dateRangeInput}}, \code{\link{updateDateInput}}
@@ -70,76 +60,50 @@
 #'
 #'   # Use different language and different first day of week
 #'   dateInput("date5", "Date:",
-#'           language = "ru",
+#'           language = "de",
 #'           weekstart = 1),
 #'
 #'   # Start with decade view instead of default month view
 #'   dateInput("date6", "Date:",
-#'             startview = "decade"),
-#'
-#'   # Disable Mondays and Tuesdays.
-#'   dateInput("date7", "Date:", daysofweekdisabled = c(1,2)),
-#'
-#'   # Disable specific dates.
-#'   dateInput("date8", "Date:", value = "2012-02-29",
-#'             datesdisabled = c("2012-03-01", "2012-03-02"))
+#'             startview = "decade")
 #' )
 #'
 #' shinyApp(ui, server = function(input, output) { })
 #' }
 #' @export
 dateInput <- function(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) {
+  format = "yyyy-mm-dd", startview = "month", weekstart = 0, language = "en",
+  width = NULL) {
 
   # If value is a date object, convert it to a string with yyyy-mm-dd format
   # Same for min and max
   if (inherits(value, "Date"))  value <- format(value, "%Y-%m-%d")
   if (inherits(min,   "Date"))  min   <- format(min,   "%Y-%m-%d")
   if (inherits(max,   "Date"))  max   <- format(max,   "%Y-%m-%d")
-  if (inherits(datesdisabled, "Date")) {
-      datesdisabled <- format(datesdisabled,   "%Y-%m-%d")
-  }
 
-  value <- restoreInput(id = inputId, default = value)
+  attachDependencies(
+    tags$div(id = inputId,
+      class = "shiny-date-input form-group shiny-input-container",
+      style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
 
-  tags$div(id = inputId,
-    class = "shiny-date-input form-group shiny-input-container",
-    style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
-
-    controlLabel(inputId, label),
-    tags$input(type = "text",
-               class = "form-control",
-               `data-date-language` = language,
-               `data-date-week-start` = weekstart,
-               `data-date-format` = format,
-               `data-date-start-view` = startview,
-               `data-min-date` = min,
-               `data-max-date` = max,
-               `data-initial-date` = value,
-               `data-date-autoclose` = if (autoclose) "true" else "false",
-               `data-date-dates-disabled` =
-                   # Ensure NULL is not sent as `{}` but as 'null'
-                   jsonlite::toJSON(datesdisabled, null = 'null'),
-               `data-date-days-of-week-disabled` =
-                   jsonlite::toJSON(daysofweekdisabled, null = 'null')
+      controlLabel(inputId, label),
+      tags$input(type = "text",
+                 # datepicker class necessary for dropdown to display correctly
+                 class = "form-control datepicker",
+                 `data-date-language` = language,
+                 `data-date-weekstart` = weekstart,
+                 `data-date-format` = format,
+                 `data-date-start-view` = startview,
+                 `data-min-date` = min,
+                 `data-max-date` = max,
+                 `data-initial-date` = value
+      )
     ),
     datePickerDependency
   )
 }
 
 datePickerDependency <- htmlDependency(
-  "bootstrap-datepicker",
-  "1.8.0",
-  c(href = "shared/datepicker"),
+  "bootstrap-datepicker", "1.0.2", c(href = "shared/datepicker"),
   script = "js/bootstrap-datepicker.min.js",
-  stylesheet = "css/bootstrap-datepicker3.min.css",
-  # Need to enable noConflict mode. See #1346.
-  head = "<script>
-(function() {
-  var datepicker = $.fn.datepicker.noConflict();
-  $.fn.bsDatepicker = datepicker;
-})();
-</script>"
-)
+  stylesheet = "css/datepicker.css")

R/input-daterange.R

@@ -10,7 +10,7 @@
 #'   \item \code{yy} Year without century (12)
 #'   \item \code{yyyy} Year with century (2012)
 #'   \item \code{mm} Month number, with leading zero (01-12)
-#'   \item \code{m} Month number, without leading zero (1-12)
+#'   \item \code{m} Month number, without leading zero (01-12)
 #'   \item \code{M} Abbreviated month name
 #'   \item \code{MM} Full month name
 #'   \item \code{dd} Day of month with leading zero
@@ -73,8 +73,7 @@
 #' @export
 dateRangeInput <- function(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) {
+    weekstart = 0, language = "en", separator = " to ", width = NULL) {
 
   # If start and end are date objects, convert to a string with yyyy-mm-dd format
   # Same for min and max
@@ -83,10 +82,6 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
   if (inherits(min,   "Date"))  min   <- format(min,   "%Y-%m-%d")
   if (inherits(max,   "Date"))  max   <- format(max,   "%Y-%m-%d")
 
-  restored <- restoreInput(id = inputId, default = list(start, end))
-  start <- restored[[1]]
-  end <- restored[[2]]
-
   attachDependencies(
     div(id = inputId,
       class = "shiny-date-range-input form-group shiny-input-container",
@@ -99,26 +94,24 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
           class = "input-sm form-control",
           type = "text",
           `data-date-language` = language,
-          `data-date-week-start` = weekstart,
+          `data-date-weekstart` = weekstart,
           `data-date-format` = format,
           `data-date-start-view` = startview,
           `data-min-date` = min,
           `data-max-date` = max,
-          `data-initial-date` = start,
-          `data-date-autoclose` = if (autoclose) "true" else "false"
+          `data-initial-date` = start
         ),
         span(class = "input-group-addon", separator),
         tags$input(
           class = "input-sm form-control",
           type = "text",
           `data-date-language` = language,
-          `data-date-week-start` = weekstart,
+          `data-date-weekstart` = weekstart,
           `data-date-format` = format,
           `data-date-start-view` = startview,
           `data-min-date` = min,
           `data-max-date` = max,
-          `data-initial-date` = end,
-          `data-date-autoclose` = if (autoclose) "true" else "false"
+          `data-initial-date` = end
         )
       )
     ),

R/input-file.R

@@ -27,9 +27,6 @@
 #'   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
@@ -73,50 +70,18 @@
 #' }
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
-  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {
-
-  restoredValue <- restoreInput(id = inputId, default = NULL)
-
-  # Catch potential edge case - ensure that it's either NULL or a data frame.
-  if (!is.null(restoredValue) && !is.data.frame(restoredValue)) {
-    warning("Restored value for ", inputId, " has incorrect format.")
-    restoredValue <- NULL
-  }
-
-  if (!is.null(restoredValue)) {
-    restoredValue <- toJSON(restoredValue, strict_atomic = FALSE)
-  }
-
-  inputTag <- tags$input(
-    id = inputId,
-    name = inputId,
-    type = "file",
-    style = "display: none;",
-    `data-restore` = restoredValue
-  )
+  width = NULL) {
 
+  inputTag <- tags$input(id = inputId, name = inputId, type = "file")
   if (multiple)
     inputTag$attribs$multiple <- "multiple"
   if (length(accept) > 0)
     inputTag$attribs$accept <- paste(accept, collapse=',')
 
-
   div(class = "form-group shiny-input-container",
     style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
     label %AND% tags$label(label),
-
-    div(class = "input-group",
-      tags$label(class = "input-group-btn",
-        span(class = "btn btn-default btn-file",
-          buttonLabel,
-          inputTag
-        )
-      ),
-      tags$input(type = "text", class = "form-control",
-        placeholder = placeholder, readonly = "readonly"
-      )
-    ),
-
+    inputTag,
     tags$div(
       id=paste(inputId, "_progress", sep=""),
       class="progress progress-striped active shiny-file-input-progress",

R/input-numeric.R

@@ -1,3 +1,4 @@
+
 #' Create a numeric input control
 #'
 #' Create an input control for entry of numeric values
@@ -28,8 +29,6 @@
 numericInput <- function(inputId, label, value, min = NA, max = NA, step = NA,
   width = NULL) {
 
-  value <- restoreInput(id = inputId, default = value)
-
   # build input tag
   inputTag <- tags$input(id = inputId, type = "number", class="form-control",
                          value = formatNoSci(value))

R/input-radiobuttons.R

@@ -3,30 +3,19 @@
 #' Create a set of radio buttons used to select an item from a list.
 #'
 #' If you need to represent a "None selected" state, it's possible to default
-#' the radio buttons to have no options selected by using \code{selected =
-#' character(0)}. However, this is not recommended, as it gives the user no way
-#' to return to that state once they've made a selection. Instead, consider
-#' having the first of your choices be \code{c("None selected" = "")}.
+#' the radio buttons to have no options selected by using
+#' \code{selected = character(0)}. However, this is not recommended, as it gives
+#' the user no way to return to that state once they've made a selection.
+#' Instead, consider having the first of your choices be \code{c("None selected"
+#' = "")}.
 #'
 #' @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). If
-#'   this argument is provided, then \code{choiceNames} and \code{choiceValues}
-#'   must not be provided, and vice-versa. The values should be strings; other
-#'   types (such as logicals and numbers) will be coerced to strings.
-#' @param selected The initially selected value (if not specified then defaults
-#'   to the first value)
+#' named then that name rather than the value is displayed to the user)
+#' @param selected The initially selected value (if not specified then
+#' defaults to the first value)
 #' @param inline If \code{TRUE}, render the choices inline (i.e. horizontally)
 #' @return A set of radio buttons that can be added to a UI definition.
-#' @param choiceNames,choiceValues List of names and values, respectively, that
-#'   are displayed to the user in the app and correspond to the each choice (for
-#'   this reason, \code{choiceNames} and \code{choiceValues} must have the same
-#'   length). If either of these arguments is provided, then the other
-#'   \emph{must} be provided and \code{choices} \emph{must not} be provided. The
-#'   advantage of using both of these over a named list for \code{choices} is
-#'   that \code{choiceNames} allows any type of UI object to be passed through
-#'   (tag objects, icons, HTML code, ...), instead of just simple text. See
-#'   Examples.
 #'
 #' @family input elements
 #' @seealso \code{\link{updateRadioButtons}}
@@ -58,46 +47,25 @@
 #' }
 #'
 #' shinyApp(ui, server)
-#'
-#' ui <- fluidPage(
-#'   radioButtons("rb", "Choose one:",
-#'                choiceNames = list(
-#'                  icon("calendar"),
-#'                  HTML("<p style='color:red;'>Red Text</p>"),
-#'                  "Normal text"
-#'                ),
-#'                choiceValues = list(
-#'                  "icon", "html", "text"
-#'                )),
-#'   textOutput("txt")
-#' )
-#'
-#' server <- function(input, output) {
-#'   output$txt <- renderText({
-#'     paste("You chose", input$rb)
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
 #' }
 #' @export
-radioButtons <- function(inputId, label, choices = NULL, selected = NULL,
-  inline = FALSE, width = NULL, choiceNames = NULL, choiceValues = NULL) {
+radioButtons <- function(inputId, label, choices, selected = NULL,
+  inline = FALSE, width = NULL) {
 
-  args <- normalizeChoicesArgs(choices, choiceNames, choiceValues)
-
-  selected <- restoreInput(id = inputId, default = selected)
+  # resolve names
+  choices <- choicesWithNames(choices)
 
   # default value if it's not specified
-  selected <- if (is.null(selected)) args$choiceValues[[1]] else as.character(selected)
-
+  selected <- if (is.null(selected)) choices[[1]] else {
+    validateSelected(selected, choices, inputId)
+  }
   if (length(selected) > 1) stop("The 'selected' argument must be of length 1")
 
-  options <- generateOptions(inputId, selected, inline,
-    'radio', args$choiceNames, args$choiceValues)
+  options <- generateOptions(inputId, choices, selected, inline, type = 'radio')
 
   divClass <- "form-group shiny-input-radiogroup shiny-input-container"
-  if (inline) divClass <- paste(divClass, "shiny-input-container-inline")
+  if (inline)
+    divClass <- paste(divClass, "shiny-input-container-inline")
 
   tags$div(id = inputId,
     style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),

R/input-select.R

@@ -5,7 +5,7 @@
 #'
 #' By default, \code{selectInput()} and \code{selectizeInput()} use the
 #' JavaScript library \pkg{selectize.js}
-#' (\url{https://github.com/selectize/selectize.js}) to instead of the basic
+#' (\url{https://github.com/brianreavis/selectize.js}) to instead of the basic
 #' select input element. To use the standard HTML select input element, use
 #' \code{selectInput()} with \code{selectize=FALSE}.
 #'
@@ -15,12 +15,7 @@
 #'
 #' @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.
-#'   This can also be a named list whose elements are (either named or
-#'   unnamed) lists or vectors. If this is the case, the outermost names
-#'   will be used as the "optgroup" label for the elements in the respective
-#'   sublist. This allows you to group and label similar choices. See the
-#'   example section for a small demo of this feature.
+#'   named then that name rather than the value is displayed to the user.
 #' @param selected The initially selected value (or multiple values if
 #'   \code{multiple = TRUE}). If not specified then defaults to the first value
 #'   for single-select lists and no values for multiple select lists.
@@ -33,59 +28,39 @@
 #' @return A select list control that can be added to a UI definition.
 #'
 #' @family input elements
-#' @seealso \code{\link{updateSelectInput}} \code{\link{varSelectInput}}
+#' @seealso \code{\link{updateSelectInput}}
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
 #'
-#' # basic example
-#' shinyApp(
-#'   ui = fluidPage(
-#'     selectInput("variable", "Variable:",
-#'                 c("Cylinders" = "cyl",
-#'                   "Transmission" = "am",
-#'                   "Gears" = "gear")),
-#'     tableOutput("data")
-#'   ),
-#'   server = function(input, output) {
-#'     output$data <- renderTable({
-#'       mtcars[, c("mpg", input$variable), drop = FALSE]
-#'     }, rownames = TRUE)
-#'   }
+#' ui <- fluidPage(
+#'   selectInput("variable", "Variable:",
+#'               c("Cylinders" = "cyl",
+#'                 "Transmission" = "am",
+#'                 "Gears" = "gear")),
+#'   tableOutput("data")
 #' )
 #'
-#' # demoing optgroup support in the `choices` arg
-#' shinyApp(
-#'   ui = fluidPage(
-#'     selectInput("state", "Choose a state:",
-#'       list(`East Coast` = list("NY", "NJ", "CT"),
-#'            `West Coast` = list("WA", "OR", "CA"),
-#'            `Midwest` = list("MN", "WI", "IA"))
-#'     ),
-#'     textOutput("result")
-#'   ),
-#'   server = function(input, output) {
-#'     output$result <- renderText({
-#'       paste("You chose", input$state)
-#'     })
-#'   }
-#' )
+#' server <- function(input, output) {
+#'   output$data <- renderTable({
+#'     mtcars[, c("mpg", input$variable), drop = FALSE]
+#'   }, rownames = TRUE)
+#' }
+#'
+#' shinyApp(ui, server)
 #' }
 #' @export
 selectInput <- function(inputId, label, choices, selected = NULL,
-  multiple = FALSE, selectize = TRUE, width = NULL,
-  size = NULL) {
-
-  selected <- restoreInput(id = inputId, default = selected)
-
+                        multiple = FALSE, selectize = TRUE, width = NULL,
+                        size = NULL) {
   # resolve names
   choices <- choicesWithNames(choices)
 
   # default value if it's not specified
   if (is.null(selected)) {
     if (!multiple) selected <- firstChoice(choices)
-  } else selected <- as.character(selected)
+  } else selected <- validateSelected(selected, choices, inputId)
 
   if (!is.null(size) && selectize) {
     stop("'size' argument is incompatible with 'selectize=TRUE'.")
@@ -155,7 +130,7 @@ needOptgroup <- function(choices) {
 #' @rdname selectInput
 #' @param ... Arguments passed to \code{selectInput()}.
 #' @param options A list of options. See the documentation of \pkg{selectize.js}
-#'   for possible options (character option values inside \code{\link[base]{I}()} will
+#'   for possible options (character option values inside \code{\link{I}()} will
 #'   be treated as literal JavaScript code; see \code{\link{renderDataTable}()}
 #'   for details).
 #' @param width The width of the input, e.g. \code{'400px'}, or \code{'100\%'};
@@ -194,7 +169,7 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 
   if ('drag_drop' %in% options$plugins) {
     selectizeDep <- list(selectizeDep, htmlDependency(
-      'jqueryui', '1.12.1', c(href = 'shared/jqueryui'),
+      'jqueryui', '1.11.4', c(href = 'shared/jqueryui'),
       script = 'jquery-ui.min.js'
     ))
   }
@@ -212,135 +187,3 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 
   attachDependencies(select, selectizeDep)
 }
-
-
-
-
-
-
-
-
-#' Select variables from a data frame
-#'
-#' 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 \code{input} value will be returned as:
-#' \itemize{
-#'   \item a symbol if \code{multiple = FALSE}.  The \code{input} value should be
-#'         used with rlang's \code{\link[rlang]{!!}}. For example,
-#'         \code{ggplot2::aes(!!input$variable)}.
-#'   \item a list of symbols if \code{multiple = TRUE}. The \code{input} value
-#'         should be used with rlang's \code{\link[rlang]{!!!}} to expand
-#'         the symbol list as individual arguments. For example,
-#'         \code{dplyr::select(mtcars, !!!input$variabls)} which is
-#'         equivalent to \code{dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])}.
-#' }
-#'
-#' By default, \code{varSelectInput()} and \code{selectizeInput()} use the
-#' JavaScript library \pkg{selectize.js}
-#' (\url{https://github.com/selectize/selectize.js}) to instead of the basic
-#' select input element. To use the standard HTML select input element, use
-#' \code{selectInput()} with \code{selectize=FALSE}.
-#'
-#' @inheritParams selectInput
-#' @param data A data frame. Used to retrieve the column names as choices for a \code{\link{selectInput}}
-#' @return A variable select list control that can be added to a UI definition.
-#'
-#' @family input elements
-#' @seealso \code{\link{updateSelectInput}}
-#' @examples
-#'
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' library(ggplot2)
-#'
-#' # single selection
-#' shinyApp(
-#'   ui = fluidPage(
-#'     varSelectInput("variable", "Variable:", mtcars),
-#'     plotOutput("data")
-#'   ),
-#'   server = function(input, output) {
-#'     output$data <- renderPlot({
-#'       ggplot(mtcars, aes(!!input$variable)) + geom_histogram()
-#'     })
-#'   }
-#' )
-#'
-#'
-#' # multiple selections
-#' \dontrun{
-#' shinyApp(
-#'  ui = fluidPage(
-#'    varSelectInput("variables", "Variable:", mtcars, multiple = TRUE),
-#'    tableOutput("data")
-#'  ),
-#'  server = function(input, output) {
-#'    output$data <- renderTable({
-#'       if (length(input$variables) == 0) return(mtcars)
-#'       mtcars %>% dplyr::select(!!!input$variables)
-#'    }, rownames = TRUE)
-#'  }
-#' )}
-#'
-#' }
-#' @export
-varSelectInput <- function(
-  inputId, label, data, selected = NULL,
-  multiple = FALSE, selectize = TRUE, width = NULL,
-  size = NULL
-) {
-  # no place holders
-  choices <- colnames(data)
-
-  selectInputVal <- selectInput(
-    inputId = inputId,
-    label = label,
-    choices = choices,
-    selected = selected,
-    multiple = multiple,
-    selectize = selectize,
-    width = width,
-    size = size
-  )
-
-  # set the select tag class to be "symbol"
-  selectClass <- selectInputVal$children[[2]]$children[[1]]$attribs$class
-  if (is.null(selectClass)) {
-    newClass <- "symbol"
-  } else {
-    newClass <- paste(selectClass, "symbol", sep = " ")
-  }
-  selectInputVal$children[[2]]$children[[1]]$attribs$class <- newClass
-
-  selectInputVal
-}
-
-
-
-#' @rdname varSelectInput
-#' @param ... Arguments passed to \code{varSelectInput()}.
-#' @param options A list of options. See the documentation of \pkg{selectize.js}
-#'   for possible options (character option values inside \code{\link[base]{I}()} will
-#'   be treated as literal JavaScript code; see \code{\link{renderDataTable}()}
-#'   for details).
-#' @param width The width of the input, e.g. \code{'400px'}, or \code{'100\%'};
-#'   see \code{\link{validateCssUnit}}.
-#' @note The variable selectize input created from \code{varSelectizeInput()} allows
-#'   deletion of the selected option even in a single select input, which will
-#'   return an empty string as its value. This is the default behavior of
-#'   \pkg{selectize.js}. However, the selectize input created from
-#'   \code{selectInput(..., selectize = TRUE)} will ignore the empty string
-#'   value when it is a single choice input and the empty string is not in the
-#'   \code{choices} argument. This is to keep compatibility with
-#'   \code{selectInput(..., selectize = FALSE)}.
-#' @export
-varSelectizeInput <- function(inputId, ..., options = NULL, width = NULL) {
-  selectizeIt(
-    inputId,
-    varSelectInput(inputId, ..., selectize = FALSE, width = width),
-    options
-  )
-}

R/input-slider.R

@@ -36,7 +36,7 @@
 #'   format string, to be passed to the Javascript strftime library. See
 #'   \url{https://github.com/samsonjs/strftime} for more details. The allowed
 #'   format specifications are very similar, but not identical, to those for R's
-#'   \code{\link[base]{strftime}} function. For Dates, the default is \code{"\%F"}
+#'   \code{\link{strftime}} function. For Dates, the default is \code{"\%F"}
 #'   (like \code{"2015-07-01"}), and for POSIXt, the default is \code{"\%F \%T"}
 #'   (like \code{"2015-07-01 15:32:10"}).
 #' @param timezone Only used if the values are POSIXt objects. A string
@@ -51,7 +51,6 @@
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
-#' options(device.ask.default = FALSE)
 #'
 #' ui <- fluidPage(
 #'   sliderInput("obs", "Number of observations:",
@@ -86,25 +85,38 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
                     version = "0.10.2.2")
   }
 
-  dataType <- getSliderType(min, max, value)
+  # If step is NULL, use heuristic to set the step size.
+  findStepSize <- function(min, max, step) {
+    if (!is.null(step)) return(step)
 
-  if (is.null(timeFormat)) {
-    timeFormat <- switch(dataType, date = "%F", datetime = "%F %T", number = NULL)
+    range <- max - min
+    # If short range or decimals, use continuous decimal with ~100 points
+    if (range < 2 || hasDecimals(min) || hasDecimals(max)) {
+      step <- pretty(c(min, max), n = 100)
+      step[2] - step[1]
+    } else {
+      1
+    }
   }
 
-  # Restore bookmarked values here, after doing the type checking, because the
-  # restored value will be a character vector instead of Date or POSIXct, and we can do
-  # the conversion to correct type next.
-  value <- restoreInput(id = inputId, default = value)
+  if (inherits(min, "Date")) {
+    if (!inherits(max, "Date") || !inherits(value, "Date"))
+      stop("`min`, `max`, and `value must all be Date or non-Date objects")
+    dataType <- "date"
 
-  if (is.character(value)) {
-    # If we got here, the value was restored from a URL-encoded bookmark.
-    if (dataType == "date") {
-      value <- as.Date(value, format = "%Y-%m-%d")
-    } else if (dataType == "datetime") {
-      # Date-times will have a format like "2018-02-28T03:46:26Z"
-      value <- as.POSIXct(value, format = "%Y-%m-%dT%H:%M:%SZ", tz = "UTC")
-    }
+    if (is.null(timeFormat))
+      timeFormat <- "%F"
+
+  } else if (inherits(min, "POSIXt")) {
+    if (!inherits(max, "POSIXt") || !inherits(value, "POSIXt"))
+      stop("`min`, `max`, and `value must all be POSIXt or non-POSIXt objects")
+    dataType <- "datetime"
+
+    if (is.null(timeFormat))
+      timeFormat <- "%F %T"
+
+  } else {
+    dataType <- "number"
   }
 
   step <- findStepSize(min, max, step)
@@ -150,13 +162,11 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
     `data-grid-num` = n_ticks,
     `data-grid-snap` = FALSE,
     `data-prettify-separator` = sep,
-    `data-prettify-enabled` = (sep != ""),
     `data-prefix` = pre,
     `data-postfix` = post,
     `data-keyboard` = TRUE,
-    # This value is only relevant for range sliders; for non-range sliders it
-    # causes problems since ion.RangeSlider 2.1.2 (issue #1605).
-    `data-drag-interval` = if (length(value) > 1) dragRange,
+    `data-keyboard-step` = step / (max - min) * 100,
+    `data-drag-interval` = dragRange,
     # The following are ignored by the ion.rangeSlider, but are used by Shiny.
     `data-data-type` = dataType,
     `data-time-format` = timeFormat,
@@ -202,7 +212,7 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
   }
 
   dep <- list(
-    htmlDependency("ionrangeslider", "2.1.6", c(href="shared/ionrangeslider"),
+    htmlDependency("ionrangeslider", "2.1.2", c(href="shared/ionrangeslider"),
       script = "js/ion.rangeSlider.min.js",
       # ion.rangeSlider also needs normalize.css, which is already included in
       # Bootstrap.
@@ -222,34 +232,6 @@ hasDecimals <- function(value) {
   return (!identical(value, truncatedValue))
 }
 
-
-# If step is NULL, use heuristic to set the step size.
-findStepSize <- function(min, max, step) {
-  if (!is.null(step)) return(step)
-
-  range <- max - min
-  # If short range or decimals, use continuous decimal with ~100 points
-  if (range < 2 || hasDecimals(min) || hasDecimals(max)) {
-    # Workaround for rounding errors (#1006): the intervals between the items
-    # returned by pretty() can have rounding errors. To avoid this, we'll use
-    # pretty() to find the min, max, and number of steps, and then use those
-    # values to calculate the step size.
-    pretty_steps <- pretty(c(min, max), n = 100)
-    n_steps <- length(pretty_steps) - 1
-
-    # Fix for #2061: Windows has low-significance digits (like 17 digits out)
-    # even at the boundaries of pretty()'s output. Use signif(digits = 10),
-    # which should be way way less significant than any data we'd want to keep.
-    # It might make sense to use signif(steps[2] - steps[1], 10) instead, but
-    # for now trying to make the minimal change.
-    signif(digits = 10, (max(pretty_steps) - min(pretty_steps)) / n_steps)
-
-  } else {
-    1
-  }
-}
-
-
 #' @rdname sliderInput
 #'
 #' @param interval The interval, in milliseconds, between each animation step.
@@ -260,6 +242,7 @@ findStepSize <- function(min, max, step) {
 #'   or list of tags (using \code{\link{tag}} and friends), or raw HTML (using
 #'   \code{\link{HTML}}).
 #' @param pauseButton Similar to \code{playButton}, but for the pause button.
+#'
 #' @export
 animationOptions <- function(interval=1000,
                              loop=FALSE,

R/input-submit.R

@@ -1,27 +1,8 @@
 #' Create a submit button
 #'
-#' Create a submit button for an app. Apps that include a submit
+#' Create a submit button for an input form. Forms that include a submit
 #' button do not automatically update their outputs when inputs change,
 #' rather they wait until the user explicitly clicks the submit button.
-#' The use of \code{submitButton} is generally discouraged in favor of
-#' the more versatile \code{\link{actionButton}} (see details below).
-#'
-#' Submit buttons are unusual Shiny inputs, and we recommend using
-#' \code{\link{actionButton}} instead of \code{submitButton} when you
-#' want to delay a reaction.
-#' See \href{http://shiny.rstudio.com/articles/action-buttons.html}{this
-#' article} for more information (including a demo of how to "translate"
-#' code using a \code{submitButton} to code using an \code{actionButton}).
-#'
-#' In essence, the presence of a submit button stops all inputs from
-#' sending their values automatically to the server. This means, for
-#' instance, that if there are \emph{two} submit buttons in the same app,
-#' clicking either one will cause all inputs in the app to send their
-#' values to the server. This is probably not what you'd want, which is
-#' why submit button are unwieldy for all but the simplest apps. There
-#' are other problems with submit buttons: for example, dynamically
-#' created submit buttons (for example, with \code{\link{renderUI}}
-#' or \code{\link{insertUI}}) will not work.
 #'
 #' @param text Button caption
 #' @param icon Optional \code{\link{icon}} to appear on the button
@@ -32,26 +13,8 @@
 #' @family input elements
 #'
 #' @examples
-#' if (interactive()) {
-#'
-#' shinyApp(
-#'   ui = basicPage(
-#'     numericInput("num", label = "Make changes", value = 1),
-#'     submitButton("Update View", icon("refresh")),
-#'     helpText("When you click the button above, you should see",
-#'              "the output below update to reflect the value you",
-#'              "entered at the top:"),
-#'     verbatimTextOutput("value")
-#'   ),
-#'   server = function(input, output) {
-#'
-#'     # submit buttons do not have a value of their own,
-#'     # they control when the app accesses values of other widgets.
-#'     # input$num is the value of the number widget.
-#'     output$value <- renderPrint({ input$num })
-#'   }
-#' )
-#' }
+#' submitButton("Update View")
+#' submitButton("Update View", icon("refresh"))
 #' @export
 submitButton <- function(text = "Apply Changes", icon = NULL, width = NULL) {
   div(

R/input-text.R

@@ -32,8 +32,6 @@
 textInput <- function(inputId, label, value = "", width = NULL,
   placeholder = NULL) {
 
-  value <- restoreInput(id = inputId, default = value)
-
   div(class = "form-group shiny-input-container",
     style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
     label %AND% tags$label(label, `for` = inputId),

R/input-textarea.R

@@ -1,69 +0,0 @@
-#' Create a textarea input control
-#'
-#' Create a textarea input control for entry of unstructured text values.
-#'
-#' @inheritParams textInput
-#' @param height The height of the input, e.g. \code{'400px'}, or
-#'   \code{'100\%'}; see \code{\link{validateCssUnit}}.
-#' @param cols Value of the visible character columns of the input, e.g.
-#'   \code{80}. If used with \code{width}, \code{width} will take precedence in
-#'   the browser's rendering.
-#' @param rows The value of the visible character rows of the input, e.g.
-#'   \code{6}. If used with \code{height}, \code{height} will take precedence in
-#'   the browser's rendering.
-#' @param resize Which directions the textarea box can be resized. Can be one of
-#'   \code{"both"}, \code{"none"}, \code{"vertical"}, and \code{"horizontal"}.
-#'   The default, \code{NULL}, will use the client browser's default setting for
-#'   resizing textareas.
-#' @return A textarea input control that can be added to a UI definition.
-#'
-#' @family input elements
-#' @seealso \code{\link{updateTextAreaInput}}
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fluidPage(
-#'   textAreaInput("caption", "Caption", "Data Summary", width = "1000px"),
-#'   verbatimTextOutput("value")
-#' )
-#' server <- function(input, output) {
-#'   output$value <- renderText({ input$caption })
-#' }
-#' shinyApp(ui, server)
-#'
-#' }
-#' @export
-textAreaInput <- function(inputId, label, value = "", width = NULL, height = NULL,
-  cols = NULL, rows = NULL, placeholder = NULL, resize = NULL) {
-
-  value <- restoreInput(id = inputId, default = value)
-
-  if (!is.null(resize)) {
-    resize <- match.arg(resize, c("both", "none", "vertical", "horizontal"))
-  }
-
-  style <- paste(
-    if (!is.null(width))  paste0("width: ",  validateCssUnit(width),  ";"),
-    if (!is.null(height)) paste0("height: ", validateCssUnit(height), ";"),
-    if (!is.null(resize)) paste0("resize: ", resize, ";")
-  )
-
-  # Workaround for tag attribute=character(0) bug:
-  #   https://github.com/rstudio/htmltools/issues/65
-  if (length(style) == 0) style <- NULL
-
-  div(class = "form-group shiny-input-container",
-    label %AND% tags$label(label, `for` = inputId),
-    tags$textarea(
-      id = inputId,
-      class = "form-control",
-      placeholder = placeholder,
-      style = style,
-      rows = rows,
-      cols = cols,
-      value
-    )
-  )
-}

R/input-utils.R

@@ -2,62 +2,42 @@ controlLabel <- function(controlName, label) {
   label %AND% tags$label(class = "control-label", `for` = controlName, label)
 }
 
-# This function takes in either a list or vector for `choices` (and
-# `choiceNames` and `choiceValues` are passed in as NULL) OR it takes
-# in a list or vector for both `choiceNames` and `choiceValues` (and
-# `choices` is passed as NULL) and returns a list of two elements:
-#    - `choiceNames` is a vector or list that holds the options names
-#      (each element can be arbitrary UI, or simple text)
-#    - `choiceValues` is a vector or list that holds the options values
-#       (each element must be simple text)
-normalizeChoicesArgs <- function(choices, choiceNames, choiceValues,
-  mustExist = TRUE) {
-  # if-else to check that either choices OR (choiceNames + choiceValues)
-  # were correctly provided
-  if (is.null(choices)) {
-    if (is.null(choiceNames) || is.null(choiceValues)) {
-      if (mustExist) {
-        stop("Please specify a non-empty vector for `choices` (or, ",
-             "alternatively, for both `choiceNames` AND `choiceValues`).")
-      } else {
-        if (is.null(choiceNames) && is.null(choiceValues)) {
-          # this is useful when we call this function from `updateInputOptions()`
-          # in which case, all three `choices`, `choiceNames` and `choiceValues`
-          # may legitimately be NULL
-          return(list(choiceNames = NULL, choiceValues = NULL))
-        } else {
-          stop("One of `choiceNames` or `choiceValues` was set to ",
-               "NULL, but either both or none should be NULL.")
-        }
-      }
-    }
-    if (length(choiceNames) != length(choiceValues)) {
-      stop("`choiceNames` and `choiceValues` must have the same length.")
-    }
-    if (anyNamed(choiceNames) || anyNamed(choiceValues)) {
-      stop("`choiceNames` and `choiceValues` must not be named.")
-    }
-  } else {
-    if (!is.null(choiceNames) || !is.null(choiceValues)) {
-      warning("Using `choices` argument; ignoring `choiceNames` and `choiceValues`.")
-    }
-    choices <- choicesWithNames(choices) # resolve names if not specified
-    choiceNames <- names(choices)
-    choiceValues <- unname(choices)
-  }
 
-  return(list(choiceNames = as.list(choiceNames),
-              choiceValues = as.list(as.character(choiceValues))))
+# Before shiny 0.9, `selected` refers to names/labels of `choices`; now it
+# refers to values. Below is a function for backward compatibility.
+validateSelected <- function(selected, choices, inputId) {
+  # drop names, otherwise toJSON() keeps them too
+  selected <- unname(selected)
+  # if you are using optgroups, you're using shiny > 0.10.0, and you should
+  # already know that `selected` must be a value instead of a label
+  if (needOptgroup(choices)) return(selected)
+
+  if (is.list(choices)) choices <- unlist(choices)
+
+  nms <- names(choices)
+  # labels and values are identical, no need to validate
+  if (identical(nms, unname(choices))) return(selected)
+  # when selected labels instead of values
+  i <- (selected %in% nms) & !(selected %in% choices)
+  if (any(i)) {
+    warnFun <- if (all(i)) {
+      # replace names with values
+      selected <- unname(choices[selected])
+      warning
+    } else stop  # stop when it is ambiguous (some labels == values)
+    warnFun("'selected' must be the values instead of names of 'choices' ",
+            "for the input '", inputId, "'")
+  }
+  selected
 }
 
+
 # generate options for radio buttons and checkbox groups (type = 'checkbox' or
 # 'radio')
-generateOptions <- function(inputId, selected, inline, type = 'checkbox',
-                            choiceNames, choiceValues,
-                            session = getDefaultReactiveDomain()) {
+generateOptions <- function(inputId, choices, selected, inline, type = 'checkbox') {
   # generate a list of <input type=? [checked] />
   options <- mapply(
-    choiceValues, choiceNames,
+    choices, names(choices),
     FUN = function(value, name) {
       inputTag <- tags$input(
         type = type, name = inputId, value = value
@@ -65,18 +45,14 @@ generateOptions <- function(inputId, selected, inline, type = 'checkbox',
       if (value %in% selected)
         inputTag$attribs$checked <- "checked"
 
-      # in case, the options include UI code other than text
-      # (arbitrary HTML using the tags() function or equivalent)
-      pd <- processDeps(name, session)
-
       # If inline, there's no wrapper div, and the label needs a class like
       # checkbox-inline.
       if (inline) {
-        tags$label(class = paste0(type, "-inline"), inputTag,
-                   tags$span(pd$html, pd$deps))
+        tags$label(class = paste0(type, "-inline"), inputTag, tags$span(name))
       } else {
-        tags$div(class = type, tags$label(inputTag,
-                 tags$span(pd$html, pd$deps)))
+        tags$div(class = type,
+          tags$label(inputTag, tags$span(name))
+        )
       }
     },
     SIMPLIFY = FALSE, USE.NAMES = FALSE
@@ -87,7 +63,7 @@ generateOptions <- function(inputId, selected, inline, type = 'checkbox',
 
 
 # Takes a vector or list, and adds names (same as the value) to any entries
-# without names. Coerces all leaf nodes to `character`.
+# without names.
 choicesWithNames <- function(choices) {
   # Take a vector or list, and convert to list. Also, if any children are
   # vectors with length > 1, convert those to list. If the list is unnamed,
@@ -103,7 +79,7 @@ choicesWithNames <- function(choices) {
       if (is.list(val))
         listify(val)
       else if (length(val) == 1 && is.null(names(val)))
-        as.character(val)
+        val
       else
         makeNamed(as.list(val))
     })

R/insert-tab.R

@@ -1,325 +0,0 @@
-#' Dynamically insert/remove a tabPanel
-#'
-#' Dynamically insert or remove a \code{\link{tabPanel}} (or a
-#' \code{\link{navbarMenu}}) from an existing \code{\link{tabsetPanel}},
-#' \code{\link{navlistPanel}} or \code{\link{navbarPage}}.
-#'
-#' When you want to insert a new tab before or after an existing tab, you
-#' should use \code{insertTab}. When you want to prepend a tab (i.e. add a
-#' tab to the beginning of the \code{tabsetPanel}), use \code{prependTab}.
-#' When you want to append a tab (i.e. add a tab to the end of the
-#' \code{tabsetPanel}), use \code{appendTab}.
-#'
-#' For \code{navbarPage}, you can insert/remove conventional
-#' \code{tabPanel}s (whether at the top level or nested inside a
-#' \code{navbarMenu}), as well as an entire \code{\link{navbarMenu}}.
-#' For the latter case, \code{target} should be the \code{menuName} that
-#' you gave your \code{navbarMenu} when you first created it (by default,
-#' this is equal to the value of the \code{title} argument).
-#'
-#' @param inputId The \code{id} of the \code{tabsetPanel} (or
-#'   \code{navlistPanel} or \code{navbarPage}) into which \code{tab} will
-#'   be inserted/removed.
-#'
-#' @param tab The item to be added (must be created with \code{tabPanel},
-#'   or with \code{navbarMenu}).
-#'
-#' @param target If inserting: the \code{value} of an existing
-#'   \code{tabPanel}, next to which \code{tab} will be added.
-#'   If removing: the \code{value} of the \code{tabPanel} that
-#'   you want to remove. See Details if you want to insert next to/remove
-#'   an entire \code{navbarMenu} instead.
-#'
-#' @param position Should \code{tab} be added before or after the
-#'   \code{target} tab?
-#'
-#' @param select Should \code{tab} be selected upon being inserted?
-#'
-#' @param session The shiny session within which to call this function.
-#'
-#' @seealso \code{\link{showTab}}
-#'
-#' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'
-#' # example app for inserting/removing a tab
-#' ui <- fluidPage(
-#'   sidebarLayout(
-#'     sidebarPanel(
-#'       actionButton("add", "Add 'Dynamic' tab"),
-#'       actionButton("remove", "Remove 'Foo' tab")
-#'     ),
-#'     mainPanel(
-#'       tabsetPanel(id = "tabs",
-#'         tabPanel("Hello", "This is the hello tab"),
-#'         tabPanel("Foo", "This is the foo tab"),
-#'         tabPanel("Bar", "This is the bar tab")
-#'       )
-#'     )
-#'   )
-#' )
-#' server <- function(input, output, session) {
-#'   observeEvent(input$add, {
-#'     insertTab(inputId = "tabs",
-#'       tabPanel("Dynamic", "This a dynamically-added tab"),
-#'       target = "Bar"
-#'     )
-#'   })
-#'   observeEvent(input$remove, {
-#'     removeTab(inputId = "tabs", target = "Foo")
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#'
-#'
-#' # example app for prepending/appending a navbarMenu
-#' ui <- navbarPage("Navbar page", id = "tabs",
-#'   tabPanel("Home",
-#'     actionButton("prepend", "Prepend a navbarMenu"),
-#'     actionButton("append", "Append a navbarMenu")
-#'   )
-#' )
-#' server <- function(input, output, session) {
-#'   observeEvent(input$prepend, {
-#'     id <- paste0("Dropdown", input$prepend, "p")
-#'     prependTab(inputId = "tabs",
-#'       navbarMenu(id,
-#'         tabPanel("Drop1", paste("Drop1 page from", id)),
-#'         tabPanel("Drop2", paste("Drop2 page from", id)),
-#'         "------",
-#'         "Header",
-#'         tabPanel("Drop3", paste("Drop3 page from", id))
-#'       )
-#'     )
-#'   })
-#'   observeEvent(input$append, {
-#'     id <- paste0("Dropdown", input$append, "a")
-#'     appendTab(inputId = "tabs",
-#'       navbarMenu(id,
-#'         tabPanel("Drop1", paste("Drop1 page from", id)),
-#'         tabPanel("Drop2", paste("Drop2 page from", id)),
-#'         "------",
-#'         "Header",
-#'         tabPanel("Drop3", paste("Drop3 page from", id))
-#'       )
-#'     )
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#'
-#' }
-#' @export
-insertTab <- function(inputId, tab, target,
-                      position = c("before", "after"), select = FALSE,
-                      session = getDefaultReactiveDomain()) {
-  force(target)
-  force(select)
-  position <- match.arg(position)
-  inputId <- session$ns(inputId)
-
-  # Barbara -- August 2017
-  # Note: until now, the number of tabs in a tabsetPanel (or navbarPage
-  # or navlistPanel) was always fixed. So, an easy way to give an id to
-  # a tab was simply incrementing a counter. (Just like it was easy to
-  # give a random 4-digit number to identify the tabsetPanel). Since we
-  # can only know this in the client side, we'll just pass `id` and
-  # `tsid` (TabSetID) as dummy values that will be fixed in the JS code.
-  item <- buildTabItem("id", "tsid", TRUE, divTag = tab,
-    textFilter = if (is.character(tab)) navbarMenuTextFilter else NULL)
-
-  callback <- function() {
-    session$sendInsertTab(
-      inputId = inputId,
-      liTag = processDeps(item$liTag, session),
-      divTag = processDeps(item$divTag, session),
-      menuName = NULL,
-      target = target,
-      position = position,
-      select = select)
-  }
-  session$onFlush(callback, once = TRUE)
-}
-
-#' @param menuName This argument should only be used when you want to
-#'   prepend (or append) \code{tab} to the beginning (or end) of an
-#'   existing \code{\link{navbarMenu}} (which must itself be part of
-#'   an existing \code{\link{navbarPage}}). In this case, this argument
-#'   should be the \code{menuName} that you gave your \code{navbarMenu}
-#'   when you first created it (by default, this is equal to the value
-#'   of the \code{title} argument). Note that you still need to set the
-#'   \code{inputId} argument to whatever the \code{id} of the parent
-#'   \code{navbarPage} is. If \code{menuName} is left as \code{NULL},
-#'   \code{tab} will be prepended (or appended) to whatever
-#'   \code{inputId} is.
-#'
-#' @rdname insertTab
-#' @export
-prependTab <- function(inputId, tab, select = FALSE, menuName = NULL,
-                       session = getDefaultReactiveDomain()) {
-  force(select)
-  force(menuName)
-  inputId <- session$ns(inputId)
-
-  item <- buildTabItem("id", "tsid", TRUE, divTag = tab,
-    textFilter = if (is.character(tab)) navbarMenuTextFilter else NULL)
-
-  callback <- function() {
-    session$sendInsertTab(
-      inputId = inputId,
-      liTag = processDeps(item$liTag, session),
-      divTag = processDeps(item$divTag, session),
-      menuName = menuName,
-      target = NULL,
-      position = "after",
-      select = select)
-  }
-  session$onFlush(callback, once = TRUE)
-}
-
-#' @rdname insertTab
-#' @export
-appendTab <- function(inputId, tab, select = FALSE, menuName = NULL,
-                      session = getDefaultReactiveDomain()) {
-  force(select)
-  force(menuName)
-  inputId <- session$ns(inputId)
-
-  item <- buildTabItem("id", "tsid", TRUE, divTag = tab,
-    textFilter = if (is.character(tab)) navbarMenuTextFilter else NULL)
-
-  callback <- function() {
-    session$sendInsertTab(
-      inputId = inputId,
-      liTag = processDeps(item$liTag, session),
-      divTag = processDeps(item$divTag, session),
-      menuName = menuName,
-      target = NULL,
-      position = "before",
-      select = select)
-  }
-  session$onFlush(callback, once = TRUE)
-}
-
-#' @rdname insertTab
-#' @export
-removeTab <- function(inputId, target,
-                      session = getDefaultReactiveDomain()) {
-  force(target)
-  inputId <- session$ns(inputId)
-
-  callback <- function() {
-    session$sendRemoveTab(
-      inputId = inputId,
-      target = target)
-  }
-  session$onFlush(callback, once = TRUE)
-}
-
-
-#' Dynamically hide/show a tabPanel
-#'
-#' Dynamically hide or show a \code{\link{tabPanel}} (or a
-#' \code{\link{navbarMenu}})from an existing \code{\link{tabsetPanel}},
-#' \code{\link{navlistPanel}} or \code{\link{navbarPage}}.
-#'
-#' For \code{navbarPage}, you can hide/show conventional
-#' \code{tabPanel}s (whether at the top level or nested inside a
-#' \code{navbarMenu}), as well as an entire \code{\link{navbarMenu}}.
-#' For the latter case, \code{target} should be the \code{menuName} that
-#' you gave your \code{navbarMenu} when you first created it (by default,
-#' this is equal to the value of the \code{title} argument).
-#'
-#' @param inputId The \code{id} of the \code{tabsetPanel} (or
-#'   \code{navlistPanel} or \code{navbarPage}) in which to find
-#'   \code{target}.
-#'
-#' @param target The \code{value} of the \code{tabPanel} to be
-#'   hidden/shown. See Details if you want to hide/show an entire
-#'   \code{navbarMenu} instead.
-#'
-#' @param select Should \code{target} be selected upon being shown?
-#'
-#' @param session The shiny session within which to call this function.
-#'
-#' @seealso \code{\link{insertTab}}
-#'
-#' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- navbarPage("Navbar page", id = "tabs",
-#'   tabPanel("Home",
-#'     actionButton("hideTab", "Hide 'Foo' tab"),
-#'     actionButton("showTab", "Show 'Foo' tab"),
-#'     actionButton("hideMenu", "Hide 'More' navbarMenu"),
-#'     actionButton("showMenu", "Show 'More' navbarMenu")
-#'   ),
-#'   tabPanel("Foo", "This is the foo tab"),
-#'   tabPanel("Bar", "This is the bar tab"),
-#'   navbarMenu("More",
-#'     tabPanel("Table", "Table page"),
-#'     tabPanel("About", "About page"),
-#'     "------",
-#'     "Even more!",
-#'     tabPanel("Email", "Email page")
-#'   )
-#' )
-#'
-#' server <- function(input, output, session) {
-#'   observeEvent(input$hideTab, {
-#'     hideTab(inputId = "tabs", target = "Foo")
-#'   })
-#'
-#'   observeEvent(input$showTab, {
-#'     showTab(inputId = "tabs", target = "Foo")
-#'   })
-#'
-#'   observeEvent(input$hideMenu, {
-#'     hideTab(inputId = "tabs", target = "More")
-#'   })
-#'
-#'   observeEvent(input$showMenu, {
-#'     showTab(inputId = "tabs", target = "More")
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#' }
-#'
-#' @export
-showTab <- function(inputId, target, select = FALSE,
-                    session = getDefaultReactiveDomain()) {
-  force(target)
-
-  if (select) updateTabsetPanel(session, inputId, selected = target)
-  inputId <- session$ns(inputId)
-
-  callback <- function() {
-    session$sendChangeTabVisibility(
-      inputId = inputId,
-      target = target,
-      type = "show"
-    )
-  }
-  session$onFlush(callback, once = TRUE)
-}
-
-#' @rdname showTab
-#' @export
-hideTab <- function(inputId, target,
-                    session = getDefaultReactiveDomain()) {
-  force(target)
-  inputId <- session$ns(inputId)
-
-  callback <- function() {
-    session$sendChangeTabVisibility(
-      inputId = inputId,
-      target = target,
-      type = "hide"
-    )
-  }
-  session$onFlush(callback, once = TRUE)
-}

R/insert-ui.R

@@ -73,6 +73,7 @@
 #' # Complete app with UI and server components
 #' shinyApp(ui, server)
 #' }
+#'
 #' @export
 insertUI <- function(selector,
   where = c("beforeBegin", "afterBegin", "beforeEnd", "afterEnd"),
@@ -154,6 +155,7 @@ insertUI <- function(selector,
 #' # Complete app with UI and server components
 #' shinyApp(ui, server)
 #' }
+#'
 #' @export
 removeUI <- function(selector,
   multiple = FALSE,

R/jqueryui.R

@@ -53,6 +53,7 @@
 #'   over text). The default is \code{"auto"}, which is equivalent to
 #'   \code{ifelse(draggable, "move", "inherit")}.
 #' @return An HTML element or list of elements.
+#'
 #' @export
 absolutePanel <- function(...,
                           top = NULL, left = NULL, right = NULL, bottom = NULL,
@@ -79,6 +80,8 @@ absolutePanel <- function(...,
   if (isTRUE(draggable)) {
     divTag <- tagAppendAttributes(divTag, class='draggable')
     return(tagList(
+      # IMPORTANT NOTE: If you update jqueryui, make sure you DON'T include the datepicker,
+      # as it collides with our bootstrap datepicker!
       singleton(tags$head(tags$script(src='shared/jqueryui/jquery-ui.min.js'))),
       divTag,
       tags$script('$(".draggable").draggable();')

R/middleware.R

@@ -191,7 +191,7 @@ staticHandler <- function(root) {
     if (!identical(req$REQUEST_METHOD, 'GET'))
       return(NULL)
 
-    path <- URLdecode(req$PATH_INFO)
+    path <- req$PATH_INFO
 
     if (is.null(path))
       return(httpResponse(400, content="<h1>Bad Request</h1>"))
@@ -351,72 +351,38 @@ HandlerManager <- R6Class("HandlerManager",
         }
 
         response <- handler(req)
+        if (is.null(response))
+          response <- httpResponse(404, content="<h1>Not Found</h1>")
 
-        res <- hybrid_chain(response, function(response) {
-          if (is.null(response))
-            response <- httpResponse(404, content="<h1>Not Found</h1>")
-
-          if (inherits(response, "httpResponse")) {
-            headers <- as.list(response$headers)
-            headers$'Content-Type' <- response$content_type
-
-            response <- filter(req, response)
-            if (head_request) {
-
-              headers$`Content-Length` <- getResponseContentLength(response, deleteOwnedContent = TRUE)
-
-              return(list(
-                status = response$status,
-                body = "",
-                headers = headers
-              ))
-            } else {
-              return(list(
-                status = response$status,
-                body = response$content,
-                headers = headers
-              ))
-            }
+        if (inherits(response, "httpResponse")) {
+          headers <- as.list(response$headers)
+          headers$'Content-Type' <- response$content_type
 
+          response <- filter(req, response)
+          if (head_request) {
+            headers$`Content-Length` <- nchar(response$content, type = "bytes")
+            return(list(
+              status = response$status,
+              body = "",
+              headers = headers
+            ))
           } else {
-            # Assume it's a Rook-compatible response
-            return(response)
+            return(list(
+              status = response$status,
+              body = response$content,
+              headers = headers
+            ))
           }
-        })
+
+        } else {
+          # Assume it's a Rook-compatible response
+          return(response)
+        }
       }
     }
   )
 )
 
-# Safely get the Content-Length of a Rook response, or NULL if the length cannot
-# be determined for whatever reason (probably malformed response$content).
-# If deleteOwnedContent is TRUE, then the function should delete response
-# content that is of the form list(file=..., owned=TRUE).
-getResponseContentLength <- function(response, deleteOwnedContent) {
-  force(deleteOwnedContent)
-
-  result <- if (is.character(response$content) && length(response$content) == 1) {
-    nchar(response$content, type = "bytes")
-  } else if (is.raw(response$content)) {
-    length(response$content)
-  } else if (is.list(response$content) && !is.null(response$content$file)) {
-    if (deleteOwnedContent && isTRUE(response$content$owned)) {
-      on.exit(unlink(response$content$file, recursive = FALSE, force = FALSE), add = TRUE)
-    }
-    file.info(response$content$file)$size
-  } else {
-    warning("HEAD request for unexpected content class ", class(response$content)[[1]])
-    NULL
-  }
-
-  if (is.na(result)) {
-    # Mostly for missing file case
-    return(NULL)
-  } else {
-    return(result)
-  }
-}
-
 #
 # ## Next steps
 #

R/modal.R

@@ -36,15 +36,11 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' @param ... UI elements for the body of the modal dialog box.
 #' @param title An optional title for the dialog.
 #' @param footer UI for footer. Use \code{NULL} for no footer.
-#' @param size One of \code{"s"} for small, \code{"m"} (the default) for medium,
-#'   or \code{"l"} for large.
 #' @param easyClose If \code{TRUE}, the modal dialog can be dismissed by
 #'   clicking outside the dialog box, or be pressing the Escape key. If
 #'   \code{FALSE} (the default), the modal dialog can't be dismissed in those
 #'   ways; instead it must be dismissed by clicking on the dismiss button, or
 #'   from a call to \code{\link{removeModal}} on the server.
-#' @param fade If \code{FALSE}, the modal dialog will have no fade-in animation
-#'   (it will simply appear rather than fade in to view).
 #'
 #' @examples
 #' if (interactive()) {
@@ -84,7 +80,7 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' )
 #'
 #'
-#' # Display a modal that requires valid input before continuing.
+# Display a modal that requires valid input before continuing.
 #' shinyApp(
 #'   ui = basicPage(
 #'     actionButton("show", "Show modal dialog"),
@@ -124,8 +120,7 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #'     # message.
 #'     observeEvent(input$ok, {
 #'       # Check that data object exists and is data frame.
-#'       if (!is.null(input$dataset) && nzchar(input$dataset) &&
-#'           exists(input$dataset) && is.data.frame(get(input$dataset))) {
+#'       if (exists(input$dataset) && is.data.frame(get(input$dataset))) {
 #'         vals$data <- get(input$dataset)
 #'         removeModal()
 #'       } else {
@@ -145,18 +140,13 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' }
 #' @export
 modalDialog <- function(..., title = NULL, footer = modalButton("Dismiss"),
-  size = c("m", "s", "l"), easyClose = FALSE, fade = TRUE) {
+                        easyClose = FALSE) {
 
-  size <- match.arg(size)
-
-  cls <- if (fade) "modal fade" else "modal"
-  div(id = "shiny-modal", class = cls, tabindex = "-1",
+  div(id = "shiny-modal", class = "modal fade", tabindex = "-1",
     `data-backdrop` = if (!easyClose) "static",
     `data-keyboard` = if (!easyClose) "false",
 
-    div(
-      class = "modal-dialog",
-      class = switch(size, s = "modal-sm", m = NULL, l = "modal-lg"),
+    div(class = "modal-dialog",
       div(class = "modal-content",
         if (!is.null(title)) div(class = "modal-header",
           tags$h4(class = "modal-title", title)

R/modules.R

@@ -1,4 +1,4 @@
-# Creates an object whose $ and [[ pass through to the parent
+# Creates an object whose $ and $<- pass through to the parent
 # session, unless the name is matched in ..., in which case
 # that value is returned instead. (See Decorator pattern.)
 createSessionProxy <- function(parentSession, ...) {
@@ -14,29 +14,18 @@ createSessionProxy <- function(parentSession, ...) {
 
 #' @export
 `$.session_proxy` <- function(x, name) {
-  if (name %in% names(.subset2(x, "overrides")))
-    .subset2(x, "overrides")[[name]]
+  if (name %in% names(x[["overrides"]]))
+    x[["overrides"]][[name]]
   else
-    .subset2(x, "parent")[[name]]
+    x[["parent"]][[name]]
 }
 
-#' @export
-`[[.session_proxy` <- `$.session_proxy`
-
-
 #' @export
 `$<-.session_proxy` <- function(x, name, value) {
-  # this line allows users to write into session$userData
-  # (e.g. it allows something like `session$userData$x <- TRUE`,
-  # but not `session$userData <- TRUE`) from within a module
-  # without any hacks (see PR #1732)
-  if (identical(x[[name]], value)) return(x)
-  stop("Attempted to assign value on session proxy.")
+  x[["parent"]][[name]] <- value
+  x
 }
 
-`[[<-.session_proxy` <- `$<-.session_proxy`
-
-
 #' Invoke a Shiny module
 #'
 #' Shiny's module feature lets you break complicated UI and server logic into
@@ -53,6 +42,7 @@ createSessionProxy <- function(parentSession, ...) {
 #'
 #' @return The return value, if any, from executing the module server function
 #' @seealso \url{http://shiny.rstudio.com/articles/modules.html}
+#'
 #' @export
 callModule <- function(module, id, ..., session = getDefaultReactiveDomain()) {
   childScope <- session$makeScope(id)

R/notifications.R

@@ -75,7 +75,7 @@ showNotification <- function(ui, action = NULL, duration = 5,
 {
 
   if (is.null(id))
-    id <- createUniqueId(8)
+    id <- randomID()
 
   res <- processDeps(ui, session)
   actionRes <- processDeps(action, session)

R/progress.R

@@ -12,14 +12,6 @@
 #' method is called. Calling \code{close} will cause the progress panel
 #' to be removed.
 #'
-#' As of version 0.14, the progress indicators use Shiny's new notification API.
-#' If you want to use the old styling (for example, you may have used customized
-#' CSS), you can use \code{style="old"} each time you call
-#' \code{Progress$new()}. If you don't want to set the style each time
-#' \code{Progress$new} is called, you can instead call
-#' \code{\link{shinyOptions}(progress.style="old")} just once, inside the server
-#' function.
-#'
 #' \strong{Methods}
 #'   \describe{
 #'     \item{\code{initialize(session, min = 0, max = 1)}}{
@@ -55,10 +47,7 @@
 #'   de-emphasized appearance relative to \code{message}.
 #' @param value A numeric value at which to set
 #'   the progress bar, relative to \code{min} and \code{max}.
-#' @param 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).
+#'   \code{NULL} hides the progress bar, if it is currently visible.
 #' @param 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.
@@ -97,24 +86,21 @@
 #' @export
 Progress <- R6Class(
   'Progress',
+  portable = TRUE,
   public = list(
 
-    initialize = function(session = getDefaultReactiveDomain(),
-      min = 0, max = 1,
-      style = getShinyOption("progress.style", default = "notification"))
-    {
+    initialize = function(session = getDefaultReactiveDomain(), min = 0, max = 1) {
       if (is.null(session$progressStack))
         stop("'session' is not a ShinySession object.")
 
       private$session <- session
-      private$id <- createUniqueId(8)
+      private$id <- randomID()
       private$min <- min
       private$max <- max
       private$value <- NULL
-      private$style <- match.arg(style, choices = c("notification", "old"))
       private$closed <- FALSE
 
-      session$sendProgress('open', list(id = private$id, style = private$style))
+      session$sendProgress('open', list(id = private$id))
     },
 
     set = function(value = NULL, message = NULL, detail = NULL) {
@@ -123,31 +109,27 @@ Progress <- R6Class(
         return()
       }
 
-      if (is.null(value) || is.na(value))
+      if (is.null(value) || is.na(value)) {
         value <- NULL
-
-      if (!is.null(value)) {
-        private$value <- value
+      } else {
         # Normalize value to number between 0 and 1
         value <- min(1, max(0, (value - private$min) / (private$max - private$min)))
       }
 
+      private$value <- value
+
       data <- dropNulls(list(
         id = private$id,
         message = message,
         detail = detail,
-        value = value,
-        style = private$style
+        value = value
       ))
 
-      private$session$sendProgress('update', data)
+       private$session$sendProgress('update', data)
     },
 
     inc = function(amount = 0.1, message = NULL, detail = NULL) {
-      if (is.null(private$value))
-        private$value <- private$min
-
-      value <- min(private$value + amount, private$max)
+      value <- min(self$getValue() + amount, private$max)
       self$set(value, message, detail)
     },
 
@@ -155,7 +137,10 @@ Progress <- R6Class(
 
     getMax = function() private$max,
 
-    getValue = function() private$value,
+    # Return value (not the normalized 0-1 value, but in the original range)
+    getValue = function() {
+      private$value * (private$max - private$min) + private$min
+    },
 
     close = function() {
       if (private$closed) {
@@ -163,20 +148,17 @@ Progress <- R6Class(
         return()
       }
 
-      private$session$sendProgress('close',
-        list(id = private$id, style = private$style)
-      )
+      private$session$sendProgress('close', list(id = private$id))
       private$closed <- TRUE
     }
   ),
 
   private = list(
-    session = 'ShinySession',
+    session = 'environment',
     id = character(0),
     min = numeric(0),
     max = numeric(0),
-    style = character(0),
-    value = numeric(0),
+    value = NULL,
     closed = logical(0)
   )
 )
@@ -204,14 +186,6 @@ Progress <- R6Class(
 #' is not common) or otherwise cannot be encapsulated by a single scope. In that
 #' case, you can use the \code{Progress} reference class.
 #'
-#' As of version 0.14, the progress indicators use Shiny's new notification API.
-#' If you want to use the old styling (for example, you may have used customized
-#' CSS), you can use \code{style="old"} each time you call
-#' \code{withProgress()}. If you don't want to set the style each time
-#' \code{withProgress} is called, you can instead call
-#' \code{\link{shinyOptions}(progress.style="old")} just once, inside the server
-#' function.
-#'
 #' @param session The Shiny session object, as provided by \code{shinyServer} to
 #'   the server function. The default is to automatically find the session by
 #'   using the current reactive domain.
@@ -232,17 +206,13 @@ Progress <- R6Class(
 #'   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}.
-#' @param 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).
 #' @param value Single-element numeric vector; the value at which to set the
-#'   progress bar, relative to \code{min} and \code{max}.
+#'   progress bar, relative to \code{min} and \code{max}. \code{NULL} hides the
+#'   progress bar, if it is currently visible.
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
-#' options(device.ask.default = FALSE)
 #'
 #' ui <- fluidPage(
 #'   plotOutput("plot")
@@ -267,12 +237,10 @@ Progress <- R6Class(
 #' @rdname withProgress
 #' @export
 withProgress <- function(expr, min = 0, max = 1,
-  value = min + (max - min) * 0.1,
-  message = NULL, detail = NULL,
-  style = getShinyOption("progress.style", default = "notification"),
-  session = getDefaultReactiveDomain(),
-  env = parent.frame(), quoted = FALSE)
-{
+                         value = min + (max - min) * 0.1,
+                         message = NULL, detail = NULL,
+                         session = getDefaultReactiveDomain(),
+                         env = parent.frame(), quoted = FALSE) {
 
   if (!quoted)
     expr <- substitute(expr)
@@ -280,9 +248,7 @@ withProgress <- function(expr, min = 0, max = 1,
   if (is.null(session$progressStack))
     stop("'session' is not a ShinySession object.")
 
-  style <- match.arg(style, c("notification", "old"))
-
-  p <- Progress$new(session, min = min, max = max, style = style)
+  p <- Progress$new(session, min = min, max = max)
 
   session$progressStack$push(p)
   on.exit({

R/react.R

@@ -1,21 +1,3 @@
-processId <- local({
-  # pid is not sufficient to uniquely identify a process, because
-  # distributed futures span machines which could introduce pid
-  # collisions.
-  cached <- NULL
-  function() {
-    if (is.null(cached)) {
-      cached <<- digest::digest(list(
-        Sys.info(),
-        Sys.time()
-      ))
-    }
-    # Sys.getpid() cannot be cached because forked children will
-    # then have the same processId as their parents.
-    paste(cached, Sys.getpid())
-  }
-})
-
 Context <- R6Class(
   'Context',
   portable = FALSE,
@@ -27,37 +9,25 @@ Context <- R6Class(
     .invalidateCallbacks = list(),
     .flushCallbacks = list(),
     .domain = NULL,
-    .pid = NULL,
 
     initialize = function(domain, label='', type='other', prevId='') {
       id <<- .getReactiveEnvironment()$nextId()
       .label <<- label
       .domain <<- domain
-      .pid <<- processId()
       .graphCreateContext(id, label, type, prevId, domain)
     },
     run = function(func) {
       "Run the provided function under this context."
-
-      promises::with_promise_domain(reactivePromiseDomain(), {
-        withReactiveDomain(.domain, {
-          env <- .getReactiveEnvironment()
-          .graphEnterContext(id)
-          on.exit({
-            .graphExitContext(id, domain = .domain)
-          }, add = TRUE)
-          env$runWith(self, func)
-        })
+      withReactiveDomain(.domain, {
+        env <- .getReactiveEnvironment()
+        .graphEnterContext(id)
+        on.exit(.graphExitContext(id), add = TRUE)
+        env$runWith(self, func)
       })
     },
     invalidate = function() {
       "Invalidate this context. It will immediately call the callbacks
         that have been registered with onInvalidate()."
-
-      if (!identical(.pid, processId())) {
-        stop("Reactive context was created in one process and invalidated from another")
-      }
-
       if (.invalidated)
         return()
       .invalidated <<- TRUE
@@ -73,11 +43,6 @@ Context <- R6Class(
       "Register a function to be called when this context is invalidated.
         If this context is already invalidated, the function is called
         immediately."
-
-      if (!identical(.pid, processId())) {
-        stop("Reactive context was created in one process and accessed from another")
-      }
-
       if (.invalidated)
         func()
       else
@@ -87,6 +52,9 @@ Context <- R6Class(
     addPendingFlush = function(priority) {
       "Tell the reactive environment that this context should be flushed the
         next time flushReact() called."
+      if (!is.null(.domain)) {
+        .domain$incrementBusyCount()
+      }
       .getReactiveEnvironment()$addPendingFlush(self, priority)
     },
     onFlush = function(func) {
@@ -96,6 +64,12 @@ Context <- R6Class(
     executeFlushCallbacks = function() {
       "For internal use only."
 
+      on.exit({
+        if (!is.null(.domain)) {
+          .domain$decrementBusyCount()
+        }
+      }, add = TRUE)
+
       lapply(.flushCallbacks, function(flushCallback) {
         flushCallback()
       })
@@ -141,24 +115,16 @@ ReactiveEnvironment <- R6Class(
     addPendingFlush = function(ctx, priority) {
       .pendingFlush$enqueue(ctx, priority)
     },
-    hasPendingFlush = function() {
-      return(!.pendingFlush$isEmpty())
-    },
-    # Returns TRUE if anything was actually called
     flush = function() {
-      # If nothing to flush, exit early
-      if (!hasPendingFlush()) return(invisible(FALSE))
       # If already in a flush, don't start another one
-      if (.inFlush) return(invisible(FALSE))
+      if (.inFlush) return()
       .inFlush <<- TRUE
       on.exit(.inFlush <<- FALSE)
 
-      while (hasPendingFlush()) {
+      while (!.pendingFlush$isEmpty()) {
         ctx <- .pendingFlush$dequeue()
         ctx$executeFlushCallbacks()
       }
-
-      invisible(TRUE)
     }
   )
 )
@@ -172,10 +138,9 @@ ReactiveEnvironment <- R6Class(
   }
 })
 
-# Causes any pending invalidations to run. Returns TRUE if any invalidations
-# were pending (i.e. if work was actually done).
+# Causes any pending invalidations to run.
 flushReact <- function() {
-  return(.getReactiveEnvironment()$flush())
+  .getReactiveEnvironment()$flush()
 }
 
 # Retrieves the current reactive context, or errors if there is no reactive
@@ -195,31 +160,3 @@ local({
     return(dummyContext)
   }
 })
-
-wrapForContext <- function(func, ctx) {
-  force(func)
-  force(ctx)
-
-  function(...) {
-    ctx$run(function() {
-      captureStackTraces(
-        func(...)
-      )
-    })
-  }
-}
-
-reactivePromiseDomain <- function() {
-  promises::new_promise_domain(
-    wrapOnFulfilled = function(onFulfilled) {
-      force(onFulfilled)
-      ctx <- getCurrentContext()
-      wrapForContext(onFulfilled, ctx)
-    },
-    wrapOnRejected = function(onRejected) {
-      force(onRejected)
-      ctx <- getCurrentContext()
-      wrapForContext(onRejected, ctx)
-    }
-  )
-}

R/reactive-domains.R

@@ -42,11 +42,11 @@ NULL
 #
 ## ------------------------------------------------------------------------
 createMockDomain <- function() {
-  callbacks <- Callbacks$new()
+  callbacks <- list()
   ended <- FALSE
   domain <- new.env(parent = emptyenv())
   domain$onEnded <- function(callback) {
-    return(callbacks$register(callback))
+    callbacks <<- c(callbacks, callback)
   }
   domain$isEnded <- function() {
     ended
@@ -55,7 +55,7 @@ createMockDomain <- function() {
   domain$end <- function() {
     if (!ended) {
       ended <<- TRUE
-      callbacks$invoke()
+      lapply(callbacks, do.call, list())
     }
     invisible()
   }
@@ -95,7 +95,11 @@ getDefaultReactiveDomain <- function() {
 #' @rdname domains
 #' @export
 withReactiveDomain <- function(domain, expr) {
-  promises::with_promise_domain(createVarPromiseDomain(.globals, "domain", domain), expr)
+  oldValue <- .globals$domain
+  .globals$domain <- domain
+  on.exit(.globals$domain <- oldValue)
+
+  expr
 }
 
 #

R/render-cached-plot.R

@@ -1,588 +0,0 @@
-#' Plot output with cached images
-#'
-#' Renders a reactive plot, with plot images cached to disk.
-#'
-#' \code{expr} is an expression that generates a plot, similar to that in
-#' \code{renderPlot}. Unlike with \code{renderPlot}, this expression does not
-#' take reactive dependencies. It is re-executed only when the cache key
-#' changes.
-#'
-#' \code{cacheKeyExpr} is an expression which, when evaluated, returns an object
-#' which will be serialized and hashed using the \code{\link[digest]{digest}}
-#' function to generate a string that will be used as a cache key. This key is
-#' used to identify the contents of the plot: if the cache key is the same as a
-#' previous time, it assumes that the plot is the same and can be retrieved from
-#' the cache.
-#'
-#' This \code{cacheKeyExpr} is reactive, and so it will be re-evaluated when any
-#' upstream reactives are invalidated. This will also trigger re-execution of
-#' the plotting expression, \code{expr}.
-#'
-#' The key should consist of "normal" R objects, like vectors and lists. Lists
-#' should in turn contain other normal R objects. If the key contains
-#' environments, external pointers, or reference objects -- or even if it has
-#' such objects attached as attributes -- then it is possible that it will
-#' change unpredictably even when you do not expect it to. Additionally, because
-#' the entire key is serialized and hashed, if it contains a very large object
-#' -- a large data set, for example -- there may be a noticeable performance
-#' penalty.
-#'
-#' If you face these issues with the cache key, you can work around them by
-#' extracting out the important parts of the objects, and/or by converting them
-#' to normal R objects before returning them. Your expression could even
-#' serialize and hash that information in an efficient way and return a string,
-#' which will in turn be hashed (very quickly) by the
-#' \code{\link[digest]{digest}} function.
-#'
-#' Internally, the result from \code{cacheKeyExpr} is combined with the name of
-#' the output (if you assign it to \code{output$plot1}, it will be combined
-#' with \code{"plot1"}) to form the actual key that is used. As a result, even
-#' if there are multiple plots that have the same \code{cacheKeyExpr}, they
-#' will not have cache key collisions.
-#'
-#' @section Cache scoping:
-#'
-#'   There are a number of different ways you may want to scope the cache. For
-#'   example, you may want each user session to have their own plot cache, or
-#'   you may want each run of the application to have a cache (shared among
-#'   possibly multiple simultaneous user sessions), or you may want to have a
-#'   cache that persists even after the application is shut down and started
-#'   again.
-#'
-#'   To control the scope of the cache, use the \code{cache} parameter. There
-#'   are two ways of having Shiny automatically create and clean up the disk
-#'   cache.
-#'
-#' \describe{
-#'   \item{1}{To scope the cache to one run of a Shiny application (shared
-#'     among possibly multiple user sessions), use \code{cache="app"}. This
-#'     is the default. The cache will be shared across multiple sessions, so
-#'     there is potentially a large performance benefit if there are many users
-#'     of the application. When the application stops running, the cache will
-#'     be deleted. If plots cannot be safely shared across users, this should
-#'     not be used.}
-#'   \item{2}{To scope the cache to one session, use \code{cache="session"}.
-#'     When a new user session starts -- in other words, when a web browser
-#'     visits the Shiny application -- a new cache will be created on disk
-#'     for that session. When the session ends, the cache will be deleted.
-#'     The cache will not be shared across multiple sessions.}
-#'  }
-#'
-#'   If either \code{"app"} or \code{"session"} is used, the cache will be 10 MB
-#'   in size, and will be stored stored in memory, using a
-#'   \code{\link{memoryCache}} object. Note that the cache space will be shared
-#'   among all cached plots within a single application or session.
-#'
-#'   In some cases, you may want more control over the caching behavior. For
-#'   example, you may want to use a larger or smaller cache, share a cache
-#'   among multiple R processes, or you may want the cache to persist across
-#'   multiple runs of an application, or even across multiple R processes.
-#'
-#'   To use different settings for an application-scoped cache, you can call
-#'   \code{\link{shinyOptions}()} at the top of your app.R, server.R, or
-#'   global.R. For example, this will create a cache with 20 MB of space
-#'   instead of the default 10 MB:
-#'   \preformatted{
-#'   shinyOptions(cache = memoryCache(size = 20e6))
-#'   }
-#'
-#'   To use different settings for a session-scoped cache, you can call
-#'   \code{\link{shinyOptions}()} at the top of your server function. To use
-#'   the session-scoped cache, you must also call \code{renderCachedPlot} with
-#'   \code{cache="session"}. This will create a 20 MB cache for the session:
-#'   \preformatted{
-#'   function(input, output, session) {
-#'     shinyOptions(cache = memoryCache(size = 20e6))
-#'
-#'     output$plot <- renderCachedPlot(
-#'       ...,
-#'       cache = "session"
-#'     )
-#'   }
-#'   }
-#'
-#'   If you want to create a cache that is shared across multiple concurrent
-#'   R processes, you can use a \code{\link{diskCache}}. You can create an
-#'   application-level shared cache by putting this at the top of your app.R,
-#'   server.R, or global.R:
-#'   \preformatted{
-#'   shinyOptions(cache = diskCache(file.path(dirname(tempdir()), "myapp-cache"))
-#'   }
-#'
-#'   This will create a subdirectory in your system temp directory named
-#'   \code{myapp-cache} (replace \code{myapp-cache} with a unique name of
-#'   your choosing). On most platforms, this directory will be removed when
-#'   your system reboots. This cache will persist across multiple starts and
-#'   stops of the R process, as long as you do not reboot.
-#'
-#'   To have the cache persist even across multiple reboots, you can create the
-#'   cache in a location outside of the temp directory. For example, it could
-#'   be a subdirectory of the application:
-#'   \preformatted{
-#'   shinyOptions(cache = diskCache("./myapp-cache"))
-#'   }
-#'
-#'   In this case, resetting the cache will have to be done manually, by deleting
-#'   the directory.
-#'
-#'   You can also scope a cache to just one plot, or selected plots. To do that,
-#'   create a \code{\link{memoryCache}} or \code{\link{diskCache}}, and pass it
-#'   as the \code{cache} argument of \code{renderCachedPlot}.
-#'
-#' @section Interactive plots:
-#'
-#'   \code{renderCachedPlot} can be used to create interactive plots. See
-#'   \code{\link{plotOutput}} for more information and examples.
-#'
-#'
-#' @inheritParams renderPlot
-#' @param cacheKeyExpr An expression that returns a cache key. This key should
-#'   be a unique identifier for a plot: the assumption is that if the cache key
-#'   is the same, then the plot will be the same.
-#' @param sizePolicy A function that takes two arguments, \code{width} and
-#'   \code{height}, and returns a list with \code{width} and \code{height}. The
-#'   purpose is to round the actual pixel dimensions from the browser to some
-#'   other dimensions, so that this will not generate and cache images of every
-#'   possible pixel dimension. See \code{\link{sizeGrowthRatio}} for more
-#'   information on the default sizing policy.
-#' @param res The resolution of the PNG, in pixels per inch.
-#' @param cache The scope of the cache, or a cache object. This can be
-#'   \code{"app"} (the default), \code{"session"}, or a cache object like
-#'   a \code{\link{diskCache}}. See the Cache Scoping section for more
-#'   information.
-#'
-#' @seealso See \code{\link{renderPlot}} for the regular, non-cached version of
-#'   this function. For more about configuring caches, see
-#'   \code{\link{memoryCache}} and \code{\link{diskCache}}.
-#'
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' # A basic example that uses the default app-scoped memory cache.
-#' # The cache will be shared among all simultaneous users of the application.
-#' shinyApp(
-#'   fluidPage(
-#'     sidebarLayout(
-#'       sidebarPanel(
-#'         sliderInput("n", "Number of points", 4, 32, value = 8, step = 4)
-#'       ),
-#'       mainPanel(plotOutput("plot"))
-#'     )
-#'   ),
-#'   function(input, output, session) {
-#'     output$plot <- renderCachedPlot({
-#'         Sys.sleep(2)  # Add an artificial delay
-#'         seqn <- seq_len(input$n)
-#'         plot(mtcars$wt[seqn], mtcars$mpg[seqn],
-#'              xlim = range(mtcars$wt), ylim = range(mtcars$mpg))
-#'       },
-#'       cacheKeyExpr = { list(input$n) }
-#'     )
-#'   }
-#' )
-#'
-#'
-#'
-#' # An example uses a data object shared across sessions. mydata() is part of
-#' # the cache key, so when its value changes, plots that were previously
-#' # stored in the cache will no longer be used (unless mydata() changes back
-#' # to its previous value).
-#' mydata <- reactiveVal(data.frame(x = rnorm(400), y = rnorm(400)))
-#'
-#' ui <- fluidPage(
-#'   sidebarLayout(
-#'     sidebarPanel(
-#'       sliderInput("n", "Number of points", 50, 400, 100, step = 50),
-#'       actionButton("newdata", "New data")
-#'     ),
-#'     mainPanel(
-#'       plotOutput("plot")
-#'     )
-#'   )
-#' )
-#'
-#' server <- function(input, output, session) {
-#'   observeEvent(input$newdata, {
-#'     mydata(data.frame(x = rnorm(400), y = rnorm(400)))
-#'   })
-#'
-#'   output$plot <- renderCachedPlot(
-#'     {
-#'       Sys.sleep(2)
-#'       d <- mydata()
-#'       seqn <- seq_len(input$n)
-#'       plot(d$x[seqn], d$y[seqn], xlim = range(d$x), ylim = range(d$y))
-#'     },
-#'     cacheKeyExpr = { list(input$n, mydata()) },
-#'   )
-#' }
-#'
-#' shinyApp(ui, server)
-#'
-#'
-#' # A basic application with two plots, where each plot in each session has
-#' # a separate cache.
-#' shinyApp(
-#'   fluidPage(
-#'     sidebarLayout(
-#'       sidebarPanel(
-#'         sliderInput("n", "Number of points", 4, 32, value = 8, step = 4)
-#'       ),
-#'       mainPanel(
-#'         plotOutput("plot1"),
-#'         plotOutput("plot2")
-#'       )
-#'     )
-#'   ),
-#'   function(input, output, session) {
-#'     output$plot1 <- renderCachedPlot({
-#'         Sys.sleep(2)  # Add an artificial delay
-#'         seqn <- seq_len(input$n)
-#'         plot(mtcars$wt[seqn], mtcars$mpg[seqn],
-#'              xlim = range(mtcars$wt), ylim = range(mtcars$mpg))
-#'       },
-#'       cacheKeyExpr = { list(input$n) },
-#'       cache = memoryCache()
-#'     )
-#'     output$plot2 <- renderCachedPlot({
-#'         Sys.sleep(2)  # Add an artificial delay
-#'         seqn <- seq_len(input$n)
-#'         plot(mtcars$wt[seqn], mtcars$mpg[seqn],
-#'              xlim = range(mtcars$wt), ylim = range(mtcars$mpg))
-#'       },
-#'       cacheKeyExpr = { list(input$n) },
-#'       cache = memoryCache()
-#'     )
-#'   }
-#' )
-#'
-#' }
-#'
-#' \dontrun{
-#' # At the top of app.R, this set the application-scoped cache to be a memory
-#' # cache that is 20 MB in size, and where cached objects expire after one
-#' # hour.
-#' shinyOptions(cache = memoryCache(max_size = 20e6, max_age = 3600))
-#'
-#' # At the top of app.R, this set the application-scoped cache to be a disk
-#' # cache that can be shared among multiple concurrent R processes, and is
-#' # deleted when the system reboots.
-#' shinyOptions(cache = diskCache(file.path(dirname(tempdir()), "myapp-cache"))
-#'
-#' # At the top of app.R, this set the application-scoped cache to be a disk
-#' # cache that can be shared among multiple concurrent R processes, and
-#' # persists on disk across reboots.
-#' shinyOptions(cache = diskCache("./myapp-cache"))
-#'
-#' # At the top of the server function, this set the session-scoped cache to be
-#' # a memory cache that is 5 MB in size.
-#' server <- function(input, output, session) {
-#'   shinyOptions(cache = memoryCache(max_size = 5e6))
-#'
-#'   output$plot <- renderCachedPlot(
-#'     ...,
-#'     cache = "session"
-#'   )
-#' }
-#'
-#' }
-#' @export
-renderCachedPlot <- function(expr,
-  cacheKeyExpr,
-  sizePolicy = sizeGrowthRatio(width = 400, height = 400, growthRate = 1.2),
-  res = 72,
-  cache = "app",
-  ...,
-  outputArgs = list()
-) {
-
-  # This ..stacktraceon is matched by a ..stacktraceoff.. when plotFunc
-  # is called
-  installExprFunction(expr, "func", parent.frame(), quoted = FALSE, ..stacktraceon = TRUE)
-  # This is so that the expr doesn't re-execute by itself; it needs to be
-  # triggered by the cache key (or width/height) changing.
-  isolatedFunc <- function() isolate(func())
-
-  args <- list(...)
-
-  cacheKeyExpr <- substitute(cacheKeyExpr)
-  # The real cache key we'll use also includes width, height, res, pixelratio.
-  # This is just the part supplied by the user.
-  userCacheKey <- reactive(cacheKeyExpr, env = parent.frame(), quoted = TRUE, label = "userCacheKey")
-
-  ensureCacheSetup <- function() {
-    # For our purposes, cache objects must support these methods.
-    isCacheObject <- function(x) {
-      # Use tryCatch in case the object does not support `$`.
-      tryCatch(
-        is.function(x$get) && is.function(x$set),
-        error = function(e) FALSE
-      )
-    }
-
-    if (isCacheObject(cache)) {
-      # If `cache` is already a cache object, do nothing
-      return()
-
-    } else if (identical(cache, "app")) {
-      cache <<- getShinyOption("cache")
-
-    } else if (identical(cache, "session")) {
-      cache <<- session$cache
-
-    } else {
-      stop('`cache` must either be "app", "session", or a cache object with methods, `$get`, and `$set`.')
-    }
-  }
-
-  # The width and height of the plot to draw, given from sizePolicy. These
-  # values get filled by an observer below.
-  fitDims <- reactiveValues(width = NULL, height = NULL)
-
-  resizeObserver <- NULL
-  ensureResizeObserver <- function() {
-    if (!is.null(resizeObserver))
-      return()
-
-    # Given the actual width/height of the image in the browser, this gets the
-    # width/height from sizePolicy() and pushes those values into `fitDims`.
-    # It's done this way so that the `fitDims` only change (and cause
-    # invalidations) when the rendered image size changes, and not every time
-    # the browser's <img> tag changes size.
-    doResizeCheck <- function() {
-      width  <- session$clientData[[paste0('output_', outputName, '_width')]]
-      height <- session$clientData[[paste0('output_', outputName, '_height')]]
-
-      if (is.null(width)) width <- 0
-      if (is.null(height)) height <- 0
-
-      rect <- sizePolicy(c(width, height))
-      fitDims$width  <- rect[1]
-      fitDims$height <- rect[2]
-    }
-
-    # Run it once immediately, then set up the observer
-    isolate(doResizeCheck())
-
-    resizeObserver <<- observe(doResizeCheck())
-  }
-
-  # Vars to store session and output, so that they can be accessed from
-  # the plotObj() reactive.
-  session <- NULL
-  outputName <- NULL
-
-
-  drawReactive <- reactive(label = "plotObj", {
-    hybrid_chain(
-      # Depend on the user cache key, even though we don't use the value. When
-      # it changes, it can cause the drawReactive to re-execute. (Though
-      # drawReactive will not necessarily re-execute -- it must be called from
-      # renderFunc, which happens only if there's a cache miss.)
-      userCacheKey(),
-      function(userCacheKeyValue) {
-        # Get width/height, but don't depend on them.
-        isolate({
-          width  <- fitDims$width
-          height <- fitDims$height
-        })
-
-        pixelratio <- session$clientData$pixelratio %OR% 1
-
-        do.call("drawPlot", c(
-          list(
-            name = outputName,
-            session = session,
-            func = isolatedFunc,
-            width = width,
-            height = height,
-            pixelratio = pixelratio,
-            res = res
-          ),
-          args
-        ))
-      },
-      catch = function(reason) {
-        # Non-isolating read. A common reason for errors in plotting is because
-        # the dimensions are too small. By taking a dependency on width/height,
-        # we can try again if the plot output element changes size.
-        fitDims$width
-        fitDims$height
-
-        # Propagate the error
-        stop(reason)
-      }
-    )
-  })
-
-
-  # This function is the one that's returned from renderPlot(), and gets
-  # wrapped in an observer when the output value is assigned.
-  renderFunc <- function(shinysession, name, ...) {
-    outputName <<- name
-    session <<- shinysession
-    ensureCacheSetup()
-    ensureResizeObserver()
-
-    hybrid_chain(
-      # This use of the userCacheKey() sets up the reactive dependency that
-      # causes plot re-draw events. These may involve pulling from the cache,
-      # replaying a display list, or re-executing user code.
-      userCacheKey(),
-      function(userCacheKeyResult) {
-        width  <- fitDims$width
-        height <- fitDims$height
-        pixelratio <- session$clientData$pixelratio %OR% 1
-
-        key <- digest::digest(list(outputName, userCacheKeyResult, width, height, res, pixelratio), "xxhash64")
-
-        plotObj <- cache$get(key)
-
-        # First look in cache.
-        # Case 1. cache hit.
-        if (!is.key_missing(plotObj)) {
-          return(list(
-            cacheHit = TRUE,
-            key = key,
-            plotObj = plotObj,
-            width = width,
-            height = height,
-            pixelratio = pixelratio
-          ))
-        }
-
-        # If not in cache, hybrid_chain call to drawReactive
-        #
-        # Two more possible cases:
-        #   2. drawReactive will re-execute and return a plot that's the
-        #      correct size.
-        #   3. It will not re-execute, but it will return the previous value,
-        #      which is the wrong size. It will include a valid display list
-        #      which can be used by resizeSavedPlot.
-        hybrid_chain(
-          drawReactive(),
-          function(drawReactiveResult) {
-            # Pass along the key for caching in the next stage
-            list(
-              cacheHit = FALSE,
-              key = key,
-              plotObj = drawReactiveResult,
-              width = width,
-              height = height,
-              pixelratio = pixelratio
-            )
-          }
-        )
-      },
-      function(result) {
-        width      <- result$width
-        height     <- result$height
-        pixelratio <- result$pixelratio
-
-        # Three possibilities when we get here:
-        # 1. There was a cache hit. No need to set a value in the cache.
-        # 2. There was a cache miss, and the plotObj is already the correct
-        #    size (because drawReactive re-executed). In this case, we need
-        #    to cache it.
-        # 3. There was a cache miss, and the plotObj was not the corect size.
-        #    In this case, we need to replay the display list, and then cache
-        #    the result.
-        if (!result$cacheHit) {
-          # If the image is already the correct size, this just returns the
-          # object unchanged.
-          result$plotObj <- do.call("resizeSavedPlot", c(
-            list(
-              name,
-              shinysession,
-              result$plotObj,
-              width,
-              height,
-              pixelratio,
-              res
-            ),
-            args
-          ))
-
-          # Save a cached copy of the plotObj. The recorded displaylist for
-          # the plot can't be serialized and restored properly within the same
-          # R session, so we NULL it out before saving. (The image data and
-          # other metadata be saved and restored just fine.) Displaylists can
-          # also be very large (~1.5MB for a basic ggplot), and they would not
-          # be commonly used. Note that displaylist serialization was fixed in
-          # revision 74506 (2e6c669), and should be in R 3.6. A MemoryCache
-          # doesn't need to serialize objects, so it could actually save a
-          # display list, but for the reasons listed previously, it's
-          # generally not worth it.
-          # The plotResult is not the same as the recordedPlot (it is used to
-          # retrieve coordmap information for ggplot2 objects) but it is only
-          # used in conjunction with the recordedPlot, and we'll remove it
-          # because it can be quite large.
-          result$plotObj$plotResult <- NULL
-          result$plotObj$recordedPlot <- NULL
-          cache$set(result$key, result$plotObj)
-        }
-
-        img <- result$plotObj$img
-        # Replace exact pixel dimensions; instead, the max-height and
-        # max-width will be set to 100% from CSS.
-        img$class <- "shiny-scalable"
-        img$width  <- NULL
-        img$height <- NULL
-
-        img
-      }
-    )
-  }
-
-  # If renderPlot isn't going to adapt to the height of the div, then the
-  # div needs to adapt to the height of renderPlot. By default, plotOutput
-  # sets the height to 400px, so to make it adapt we need to override it
-  # with NULL.
-  outputFunc <- plotOutput
-  formals(outputFunc)['height'] <- list(NULL)
-
-  markRenderFunction(outputFunc, renderFunc, outputArgs = outputArgs)
-}
-
-
-#' Create a sizing function that grows at a given ratio
-#'
-#' Returns a function which takes a two-element vector representing an input
-#' width and height, and returns a two-element vector of width and height. The
-#' possible widths are the base width times the growthRate to any integer power.
-#' For example, with a base width of 500 and growth rate of 1.25, the possible
-#' widths include 320, 400, 500, 625, 782, and so on, both smaller and larger.
-#' Sizes are rounded up to the next pixel. Heights are computed the same way as
-#' widths.
-#'
-#' @param width,height Base width and height.
-#' @param growthRate Growth rate multiplier.
-#'
-#' @seealso This is to be used with \code{\link{renderCachedPlot}}.
-#'
-#' @examples
-#' f <- sizeGrowthRatio(500, 500, 1.25)
-#' f(c(400, 400))
-#' f(c(500, 500))
-#' f(c(530, 550))
-#' f(c(625, 700))
-#'
-#' @export
-sizeGrowthRatio <- function(width = 400, height = 400, growthRate = 1.2) {
-  round_dim_up <- function(x, base, rate) {
-    power <- ceiling(log(x / base, rate))
-    ceiling(base * rate^power)
-  }
-
-  function(dims) {
-    if (length(dims) != 2) {
-      stop("dims must be a vector with two numbers, for width and height.")
-    }
-    c(
-      round_dim_up(dims[1], width,  growthRate),
-      round_dim_up(dims[2], height, growthRate)
-    )
-  }
-}

R/render-table.R

@@ -46,6 +46,7 @@
 #' @param outputArgs A list of arguments to be passed through to the
 #'   implicit call to \code{\link{tableOutput}} when \code{renderTable} is
 #'   used in an interactive R Markdown document.
+#'
 #' @export
 renderTable <- function(expr, striped = FALSE, hover = FALSE,
                         bordered = FALSE, spacing = c("s", "xs", "m", "l"),
@@ -79,150 +80,129 @@ renderTable <- function(expr, striped = FALSE, hover = FALSE,
   digitsWrapper <- createWrapper(digits)
   naWrapper <- createWrapper(na)
 
-  dots <- list(...)  ## used later (but defined here because of scoping)
+  renderFunc <- function(shinysession, name, ...) {
+    striped <- stripedWrapper()
+    hover <- hoverWrapper()
+    bordered <- borderedWrapper()
+    format <- c(striped = striped, hover = hover, bordered = bordered)
+    spacing <- spacingWrapper()
+    width <- widthWrapper()
+    align <- alignWrapper()
+    rownames <- rownamesWrapper()
+    colnames <- colnamesWrapper()
+    digits <- digitsWrapper()
+    na <- naWrapper()
 
-  createRenderFunction(
-    func,
-    function(data, session, name, ...) {
-      striped <- stripedWrapper()
-      hover <- hoverWrapper()
-      bordered <- borderedWrapper()
-      format <- c(striped = striped, hover = hover, bordered = bordered)
-      spacing <- spacingWrapper()
-      width <- widthWrapper()
-      align <- alignWrapper()
-      rownames <- rownamesWrapper()
-      colnames <- colnamesWrapper()
-      digits <- digitsWrapper()
-      na <- naWrapper()
+    spacing_choices <- c("s", "xs", "m", "l")
+    if (!(spacing %in% spacing_choices)) {
+      stop(paste("`spacing` must be one of",
+                 paste0("'", spacing_choices, "'", collapse=", ")))
+    }
 
-      spacing_choices <- c("s", "xs", "m", "l")
-      if (!(spacing %in% spacing_choices)) {
-        stop(paste("`spacing` must be one of",
-          paste0("'", spacing_choices, "'", collapse=", ")))
-      }
+    # For css styling
+    classNames <- paste0("table shiny-table",
+                         paste0(" table-", names(format)[format], collapse = "" ),
+                         paste0(" spacing-", spacing))
 
-      # For css styling
-      classNames <- paste0("table shiny-table",
-        paste0(" table-", names(format)[format], collapse = "" ),
-        paste0(" spacing-", spacing))
+    data <- func()
+    data <- as.data.frame(data)
 
-      data <- as.data.frame(data)
+    # Return NULL if no data is provided
+    if (is.null(data) ||
+        (is.data.frame(data) && nrow(data) == 0 && ncol(data) == 0))
+      return(NULL)
 
-      # Return NULL if no data is provided
-      if (is.null(data) ||
-          (is.data.frame(data) && nrow(data) == 0 && ncol(data) == 0))
-        return(NULL)
+    # Separate the ... args to pass to xtable() vs print.xtable()
+    dots <- list(...)
+    xtable_argnames <- setdiff(names(formals(xtable)), c("x", "..."))
+    xtable_args <- dots[intersect(names(dots), xtable_argnames)]
+    non_xtable_args <- dots[setdiff(names(dots), xtable_argnames)]
 
-      # Separate the ... args to pass to xtable() vs print.xtable()
-      xtable_argnames <- setdiff(names(formals(xtable)), c("x", "..."))
-      xtable_args <- dots[intersect(names(dots), xtable_argnames)]
-      non_xtable_args <- dots[setdiff(names(dots), xtable_argnames)]
+    # By default, numbers are right-aligned and everything else is left-aligned.
+    defaultAlignment <- function(col) {
+      if (is.numeric(col)) "r" else "l"
+    }
 
-      # By default, numbers are right-aligned and everything else is left-aligned.
-      defaultAlignment <- function(col) {
-        if (is.numeric(col)) "r" else "l"
-      }
-
-      # Figure out column alignment
-      ## Case 1: default alignment
-      if (is.null(align) || align == "?") {
-        names <- defaultAlignment(attr(data, "row.names"))
-        cols <- paste(vapply(data, defaultAlignment, character(1)), collapse = "")
-        cols <- paste0(names, cols)
-      } else {
-        ## Case 2: user-specified alignment
-        num_cols <- if (rownames) nchar(align) else nchar(align)+1
-        valid <- !grepl("[^lcr\\?]", align)
-        if (num_cols == ncol(data)+1 && valid) {
-          cols <- if (rownames) align else paste0("r", align)
-          defaults <- grep("\\?", strsplit(cols,"")[[1]])
-          if (length(defaults) != 0) {
-            vals <- vapply(data[,defaults-1], defaultAlignment, character(1))
-            for (i in seq_len(length(defaults))) {
-              substr(cols, defaults[i], defaults[i]) <- vals[i]
-            }
+    # Figure out column alignment
+    ## Case 1: default alignment
+    if (is.null(align) || align == "?") {
+      names <- defaultAlignment(attr(data, "row.names"))
+      cols <- paste(vapply(data, defaultAlignment, character(1)), collapse = "")
+      cols <- paste0(names, cols)
+    } else {
+      ## Case 2: user-specified alignment
+      num_cols <- if (rownames) nchar(align) else nchar(align)+1
+      valid <- !grepl("[^lcr\\?]", align)
+      if (num_cols == ncol(data)+1 && valid) {
+        cols <- if (rownames) align else paste0("r", align)
+        defaults <- grep("\\?", strsplit(cols,"")[[1]])
+        if (length(defaults) != 0) {
+          vals <- vapply(data[,defaults-1], defaultAlignment, character(1))
+          for (i in seq_len(length(defaults))) {
+            substr(cols, defaults[i], defaults[i]) <- vals[i]
           }
-        } else if (nchar(align) == 1 && valid) {
-          cols <- paste0(rep(align, ncol(data)+1), collapse="")
-        } else {
-          stop("`align` must contain only the characters `l`, `c`, `r` and/or `?` and",
-            "have length either equal to 1 or to the total number of columns")
         }
+      } else if (nchar(align) == 1 && valid) {
+        cols <- paste0(rep(align, ncol(data)+1), collapse="")
+      } else {
+        stop("`align` must contain only the characters `l`, `c`, `r` and/or `?` and",
+             "have length either equal to 1 or to the total number of columns")
       }
+    }
 
-      # Call xtable with its (updated) args
-      xtable_args <- c(xtable_args, align = cols, digits = digits)
-      xtable_res <- do.call(xtable, c(list(data), xtable_args))
+    # Call xtable with its (updated) args
+    xtable_args <- c(xtable_args, align = cols, digits = digits)
+    xtable_res <- do.call(xtable, c(list(data), xtable_args))
 
-      # Set up print args
-      print_args <- list(
-        x = xtable_res,
-        type = 'html',
-        include.rownames = {
-          if ("include.rownames" %in% names(dots)) dots$include.rownames
-          else rownames
-        },
-        include.colnames = {
-          if ("include.colnames" %in% names(dots)) dots$include.colnames
-          else colnames
-        },
-        NA.string = {
-          if ("NA.string" %in% names(dots)) dots$NA.string
-          else na
-        },
-        html.table.attributes =
-          paste0({
-            if ("html.table.attributes" %in% names(dots)) dots$html.table.attributes
-            else ""
-          }, " ",
-            "class = '", htmlEscape(classNames, TRUE), "' ",
-            "style = 'width:", validateCssUnit(width), ";'"),
-        comment = {
-          if ("comment" %in% names(dots)) dots$comment
-          else FALSE
-        }
-      )
+    # Set up print args
+    print_args <- list(
+      xtable_res,
+      type = 'html',
+      include.rownames = rownames,
+      include.colnames = colnames,
+      NA.string = na,
+      html.table.attributes = paste0("class = '", htmlEscape(classNames, TRUE), "' ",
+                                     "style = 'width:", validateCssUnit(width), ";'"))
 
-      print_args <- c(print_args, non_xtable_args)
-      print_args <- print_args[unique(names(print_args))]
+    print_args <- c(print_args, non_xtable_args)
 
-      # Capture the raw html table returned by print.xtable(), and store it in
-      # a variable for further processing
-      tab <- paste(utils::capture.output(do.call(print, print_args)),collapse = "\n")
+    # Capture the raw html table returned by print.xtable(), and store it in
+    # a variable for further processing
+    tab <- paste(utils::capture.output(do.call(print, print_args)),collapse = "\n")
 
-      # Add extra class to cells with NA value, to be able to style them separately
-      tab <- gsub(paste(">", na, "<"), paste(" class='NA'>", na, "<"), tab)
+    # Add extra class to cells with NA value, to be able to style them separately
+    tab <- gsub(paste(">", na, "<"), paste(" class='NA'>", na, "<"), tab)
 
-      # All further processing concerns the table headers, so we don't need to run
-      # any of this if colnames=FALSE
-      if (colnames) {
-        # Make sure that the final html table has a proper header (not included
-        # in the print.xtable() default)
-        tab <- sub("<tr>", "<thead> <tr>", tab)
-        tab <- sub("</tr>", "</tr> </thead> <tbody>", tab)
-        tab <- sub("</table>$", "</tbody> </table>", tab)
+    # All further processing concerns the table headers, so we don't need to run
+    # any of this if colnames=FALSE
+    if (colnames) {
+      # Make sure that the final html table has a proper header (not included
+      # in the print.xtable() default)
+      tab <- sub("<tr>", "<thead> <tr>", tab)
+      tab <- sub("</tr>", "</tr> </thead> <tbody>", tab)
+      tab <- sub("</table>$", "</tbody> </table>", tab)
 
-        # Update the `cols` string (which stores the alignment of each column) so
-        # that it only includes the alignment for the table variables (and not
-        # for the row.names)
-        cols <- if (rownames) cols else substr(cols, 2, nchar(cols))
+      # Update the `cols` string (which stores the alignment of each column) so
+      # that it only includes the alignment for the table variables (and not
+      # for the row.names)
+      cols <- if (rownames) cols else substr(cols, 2, nchar(cols))
 
-        # Create a vector whose i-th entry corresponds to the i-th table variable
-        # alignment (substituting "l" by "left", "c" by "center" and "r" by "right")
-        cols <- strsplit(cols, "")[[1]]
-        cols[cols == "l"] <- "left"
-        cols[cols == "r"] <- "right"
-        cols[cols == "c"] <- "center"
+      # Create a vector whose i-th entry corresponds to the i-th table variable
+      # alignment (substituting "l" by "left", "c" by "center" and "r" by "right")
+      cols <- strsplit(cols, "")[[1]]
+      cols[cols == "l"] <- "left"
+      cols[cols == "r"] <- "right"
+      cols[cols == "c"] <- "center"
 
-        # Align each header accordingly (this guarantees that each header and its
-        # corresponding column have the same alignment)
-        for (i in seq_len(length(cols))) {
-          tab <- sub("<th>", paste0("<th style='text-align: ", cols[i], ";'>"), tab)
-        }
+      # Align each header accordingly (this guarantees that each header and its
+      # corresponding column have the same alignment)
+      for (i in seq_len(length(cols))) {
+        tab <- sub("<th>", paste0("<th style='text-align: ", cols[i], ";'>"), tab)
       }
-      return(tab)
-    },
-    tableOutput, outputArgs
-  )
+    }
+    return(tab)
+  }
+
+  # Main render function
+  markRenderFunction(tableOutput, renderFunc, outputArgs = outputArgs)
 }

R/serializers.R

@@ -1,91 +0,0 @@
-#' Add a function for serializing an input before bookmarking application state
-#'
-#' @param inputId Name of the input value.
-#' @param fun A function that takes the input value and returns a modified
-#'   value. The returned value will be used for the test snapshot.
-#' @param session A Shiny session object.
-#'
-#' @keywords internal
-#' @export
-setSerializer <- function(inputId, fun, session = getDefaultReactiveDomain()) {
-  if (is.null(session)) {
-    stop("setSerializer() needs a session object.")
-  }
-
-  input_impl <- .subset2(session$input, "impl")
-  input_impl$setMeta(inputId, "shiny.serializer", fun)
-}
-
-
-# For most types of values, simply return the value unchanged.
-serializerDefault <- function(value, stateDir) {
-  value
-}
-
-
-serializerFileInput <- function(value, stateDir = NULL) {
-  # File inputs can be serialized only if there's a stateDir
-  if (is.null(stateDir)) {
-    return(serializerUnserializable())
-  }
-
-  # value is a data frame. When persisting files, we need to copy the file to
-  # the persistent dir and then strip the original path before saving.
-  newpaths <- file.path(stateDir, basename(value$datapath))
-  file.copy(value$datapath, newpaths, overwrite = TRUE)
-  value$datapath <- basename(newpaths)
-
-  value
-}
-
-
-# Return a sentinel value that represents "unserializable". This is applied to
-# for example, passwords and actionButtons.
-serializerUnserializable <- function(value, stateDir) {
-  structure(
-    list(),
-    serializable = FALSE
-  )
-}
-
-# Is this an "unserializable" sentinel value?
-isUnserializable <- function(x) {
-  identical(
-    attr(x, "serializable", exact = TRUE),
-    FALSE
-  )
-}
-
-
-# Given a reactiveValues object and optional directory for saving state, apply
-# serializer function to each of the values, and return a list of the returned
-# values. This function passes stateDir to the serializer functions, so if
-# stateDir is non-NULL, it can have a side effect of writing values to disk (in
-# stateDir).
-serializeReactiveValues <- function(values, exclude, stateDir = NULL) {
-  impl <- .subset2(values, "impl")
-
-  # Get named list where keys and values are the names of inputs; we'll retrieve
-  # actual values later.
-  vals <- isolate(impl$names())
-  vals <- setdiff(vals, exclude)
-  names(vals) <- vals
-
-  # Get values and apply serializer functions
-  vals <- lapply(vals, function(name) {
-    val <- impl$get(name)
-
-    # Get the serializer function for this input value. If none specified, use
-    # the default.
-    serializer_fun <- impl$getMeta(name, "shiny.serializer")
-    if (is.null(serializer_fun))
-      serializer_fun <- serializerDefault
-
-    # Apply serializer function.
-    serializer_fun(val, stateDir)
-  })
-
-  # Filter out any values that were marked as unserializable.
-  vals <- Filter(Negate(isUnserializable), vals)
-  vals
-}

R/server-input-handlers.R

@@ -71,63 +71,6 @@ removeInputHandler <- function(type){
   inputHandlers$remove(type)
 }
 
-
-# Apply input handler to a single input value
-applyInputHandler <- function(name, val, shinysession) {
-  splitName <- strsplit(name, ':')[[1]]
-  if (length(splitName) > 1) {
-    if (!inputHandlers$containsKey(splitName[[2]])) {
-      # No input handler registered for this type
-      stop("No handler registered for type ", name)
-    }
-
-    inputName <- splitName[[1]]
-
-    # Get the function for processing this type of input
-    inputHandler <- inputHandlers$get(splitName[[2]])
-
-    return(inputHandler(val, shinysession, inputName))
-
-  } else if (is.list(val) && is.null(names(val))) {
-    return(unlist(val, recursive = TRUE))
-  } else {
-    return(val)
-  }
-}
-
-#' Apply input handlers to raw input values
-#'
-#' The purpose of this function is to make it possible for external packages to
-#' test Shiny inputs. It takes a named list of raw input values, applies input
-#' handlers to those values, and then returns a named list of the processed
-#' values.
-#'
-#' The raw input values should be in a named list. Some values may have names
-#' like \code{"x:shiny.date"}. This function would apply the \code{"shiny.date"}
-#' input handler to the value, and then rename the result to \code{"x"}, in the
-#' output.
-#'
-#' @param inputs A named list of input values.
-#' @param shinysession A Shiny session object.
-#'
-#' @seealso registerInputHandler
-#' @keywords internal
-applyInputHandlers <- function(inputs, shinysession = getDefaultReactiveDomain()) {
-  inputs <- mapply(applyInputHandler, names(inputs), inputs,
-                   MoreArgs = list(shinysession = shinysession),
-                   SIMPLIFY = FALSE)
-
-  # Convert names like "button1:shiny.action" to "button1"
-  names(inputs) <- vapply(
-    names(inputs),
-    function(name) { strsplit(name, ":")[[1]][1] },
-    FUN.VALUE = character(1)
-  )
-
-  inputs
-}
-
-
 # Takes a list-of-lists and returns a matrix. The lists
 # must all be the same length. NULL is replaced by NA.
 registerInputHandler("shiny.matrix", function(data, ...) {
@@ -142,34 +85,14 @@ registerInputHandler("shiny.matrix", function(data, ...) {
   return(m)
 })
 
-
 registerInputHandler("shiny.number", function(val, ...){
   ifelse(is.null(val), NA, val)
 })
 
-registerInputHandler("shiny.password", function(val, shinysession, name) {
-  # Mark passwords as not serializable
-  setSerializer(name, serializerUnserializable)
-  val
-})
-
 registerInputHandler("shiny.date", function(val, ...){
   # First replace NULLs with NA, then convert to Date vector
   datelist <- ifelse(lapply(val, is.null), NA, val)
-
-  res <- NULL
-  tryCatch({
-      res <- as.Date(unlist(datelist))
-    },
-    error = function(e) {
-      # It's possible for client to send a string like "99999-01-01", which
-      # as.Date can't handle.
-      warning(e$message)
-      res <<- as.Date(rep(NA, length(datelist)))
-    }
-  )
-
-  res
+  as.Date(unlist(datelist))
 })
 
 registerInputHandler("shiny.datetime", function(val, ...){
@@ -181,61 +104,8 @@ registerInputHandler("shiny.datetime", function(val, ...){
   as.POSIXct(unlist(times), origin = "1970-01-01", tz = "UTC")
 })
 
-registerInputHandler("shiny.action", function(val, shinysession, name) {
+registerInputHandler("shiny.action", function(val, ...) {
   # mark up the action button value with a special class so we can recognize it later
   class(val) <- c(class(val), "shinyActionButtonValue")
   val
 })
-
-registerInputHandler("shiny.file", function(val, shinysession, name) {
-  # This function is only used when restoring a Shiny fileInput. When a file is
-  # uploaded the usual way, it takes a different code path and won't hit this
-  # function.
-  if (is.null(val))
-    return(NULL)
-
-  # The data will be a named list of lists; convert to a data frame.
-  val <- as.data.frame(lapply(val, unlist), stringsAsFactors = FALSE)
-
-  # `val$datapath` should be a filename without a path, for security reasons.
-  if (basename(val$datapath) != val$datapath) {
-    stop("Invalid '/' found in file input path.")
-  }
-
-  # Prepend the persistent dir
-  oldfile <- file.path(getCurrentRestoreContext()$dir, val$datapath)
-
-  # Copy the original file to a new temp dir, so that a restored session can't
-  # modify the original.
-  newdir <- file.path(tempdir(), createUniqueId(12))
-  dir.create(newdir)
-  val$datapath <- file.path(newdir, val$datapath)
-  file.copy(oldfile, val$datapath)
-
-  # Need to mark this input value with the correct serializer. When a file is
-  # uploaded the usual way (instead of being restored), this occurs in
-  # session$`@uploadEnd`.
-  setSerializer(name, serializerFileInput)
-
-  snapshotPreprocessInput(name, snapshotPreprocessorFileInput)
-
-  val
-})
-
-
-# to be used with !!!answer
-registerInputHandler("shiny.symbolList", function(val, ...) {
-  if (is.null(val)) {
-    list()
-  } else {
-    lapply(val, as.symbol)
-  }
-})
-# to be used with !!answer
-registerInputHandler("shiny.symbol", function(val, ...) {
-  if (is.null(val) || identical(val, "")) {
-    NULL
-  } else {
-    as.symbol(val)
-  }
-})

R/server.R

@@ -1,7 +1,6 @@
 #' @include server-input-handlers.R
 
 appsByToken <- Map$new()
-appsNeedingFlush <- Map$new()
 
 # Provide a character representation of the WS that can be used
 # as a key in a Map.
@@ -35,7 +34,7 @@ registerClient <- function(client) {
 #' JavaScript/CSS files available to their components.
 #'
 #' @param prefix The URL prefix (without slashes). Valid characters are a-z,
-#'   A-Z, 0-9, hyphen, period, and underscore.
+#'   A-Z, 0-9, hyphen, period, and underscore; and must begin with a-z or A-Z.
 #'   For example, a value of 'foo' means that any request paths that begin with
 #'   '/foo' will be mapped to the given directory.
 #' @param directoryPath The directory that contains the static resources to be
@@ -50,26 +49,25 @@ registerClient <- function(client) {
 #'
 #' @examples
 #' addResourcePath('datasets', system.file('data', package='datasets'))
+#'
 #' @export
 addResourcePath <- function(prefix, directoryPath) {
   prefix <- prefix[1]
-  if (!grepl('^[a-z0-9\\-_][a-z0-9\\-_.]*$', prefix, ignore.case = TRUE, perl = TRUE)) {
+  if (!grepl('^[a-z][a-z0-9\\-_.]*$', prefix, ignore.case=TRUE, perl=TRUE)) {
     stop("addResourcePath called with invalid prefix; please see documentation")
   }
+
   if (prefix %in% c('shared')) {
     stop("addResourcePath called with the reserved prefix '", prefix, "'; ",
          "please use a different prefix")
   }
-  normalizedPath <- tryCatch(normalizePath(directoryPath, mustWork = TRUE),
-    error = function(e) {
-      stop("Couldn't normalize path in `addResourcePath`, with arguments: ",
-        "`prefix` = '", prefix, "'; `directoryPath` = '" , directoryPath, "'")
-    }
-  )
-  .globals$resources[[prefix]] <- list(
-    directoryPath = normalizedPath,
-    func = staticHandler(normalizedPath)
-  )
+
+  directoryPath <- normalizePath(directoryPath, mustWork=TRUE)
+
+  existing <- .globals$resources[[prefix]]
+
+  .globals$resources[[prefix]] <- list(directoryPath=directoryPath,
+                                       func=staticHandler(directoryPath))
 }
 
 resourcePathHandler <- function(req) {
@@ -143,6 +141,7 @@ resourcePathHandler <- function(req) {
 #'   })
 #' }
 #' }
+#'
 #' @export
 shinyServer <- function(func) {
   .globals$server <- list(func)
@@ -158,7 +157,7 @@ decodeMessage <- function(data) {
     # Treat message as UTF-8
     charData <- rawToChar(data)
     Encoding(charData) <- 'UTF-8'
-    return(safeFromJSON(charData, simplifyVector=FALSE))
+    return(jsonlite::fromJSON(charData, simplifyVector=FALSE))
   }
 
   i <- 5
@@ -221,38 +220,52 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
           if (is.character(msg))
             msg <- charToRaw(msg)
 
-          traceOption <- getOption('shiny.trace', FALSE)
-          if (isTRUE(traceOption) || traceOption == "recv") {
+          if (isTRUE(getOption('shiny.trace'))) {
             if (binary)
               message("RECV ", '$$binary data$$')
             else
               message("RECV ", rawToChar(msg))
           }
 
-          if (isEmptyMessage(msg))
+          if (identical(charToRaw("\003\xe9"), msg))
             return()
 
           msg <- decodeMessage(msg)
 
-          # Set up a restore context from .clientdata_url_search before
-          # handling all the input values, because the restore context may be
-          # used by an input handler (like the one for "shiny.file"). This
-          # should only happen once, when the app starts.
-          if (is.null(shinysession$restoreContext)) {
-            bookmarkStore <- getShinyOption("bookmarkStore", default = "disable")
-            if (bookmarkStore == "disable") {
-              # If bookmarking is disabled, use empty context
-              shinysession$restoreContext <- RestoreContext$new()
-            } else {
-              # If there's bookmarked state, save it on the session object
-              shinysession$restoreContext <- RestoreContext$new(msg$data$.clientdata_url_search)
-              shinysession$createBookmarkObservers()
+          # Do our own list simplifying here. sapply/simplify2array give names to
+          # character vectors, which is rarely what we want.
+          if (!is.null(msg$data)) {
+            for (name in names(msg$data)) {
+              val <- msg$data[[name]]
+
+              splitName <- strsplit(name, ':')[[1]]
+              if (length(splitName) > 1) {
+                msg$data[[name]] <- NULL
+
+                if (!inputHandlers$containsKey(splitName[[2]])){
+                  # No input handler registered for this type
+                  stop("No handler registered for type ", name)
+                }
+
+                msg$data[[ splitName[[1]] ]] <-
+                  inputHandlers$get(splitName[[2]])(
+                    val,
+                    shinysession,
+                    splitName[[1]] )
+              }
+              else if (is.list(val) && is.null(names(val))) {
+                val_flat <- unlist(val, recursive = TRUE)
+
+                if (is.null(val_flat)) {
+                  # This is to assign NULL instead of deleting the item
+                  msg$data[name] <- list(NULL)
+                } else {
+                  msg$data[[name]] <- val_flat
+                }
+              }
             }
           }
 
-
-          msg$data <- applyInputHandlers(msg$data)
-
           switch(
             msg$method,
             init = {
@@ -279,19 +292,7 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
                   shinysession$setShowcase(mode)
               }
 
-              # In shinysession$createBookmarkObservers() above, observers may be
-              # created, which puts the shiny session in busyCount > 0 state. That
-              # prevents the manageInputs here from taking immediate effect, by
-              # default. The manageInputs here needs to take effect though, because
-              # otherwise the bookmark observers won't find the clientData they are
-              # looking for. So use `now = TRUE` to force the changes to be
-              # immediate.
-              #
-              # FIXME: break createBookmarkObservers into two separate steps, one
-              # before and one after manageInputs, and put the observer creation
-              # in the latter. Then add an assertion that busyCount == 0L when
-              # this manageInputs is called.
-              shinysession$manageInputs(msg$data, now = TRUE)
+              shinysession$manageInputs(msg$data)
 
               # The client tells us what singletons were rendered into
               # the initial page
@@ -320,13 +321,33 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
             },
             shinysession$dispatch(msg)
           )
-          # The HTTP_GUID, if it exists, is for Shiny Server reporting purposes
-          shinysession$startTiming(ws$request$HTTP_GUID)
-          shinysession$requestFlush()
+          shinysession$manageHiddenOutputs()
 
-          # Make httpuv return control to Shiny quickly, instead of waiting
-          # for the usual timeout
-          httpuv::interrupt()
+          if (exists(".shiny__stdout", globalenv()) &&
+              exists("HTTP_GUID", ws$request)) {
+            # safe to assume we're in shiny-server
+            shiny_stdout <- get(".shiny__stdout", globalenv())
+
+            # eNter a flushReact
+            writeLines(paste("_n_flushReact ", get("HTTP_GUID", ws$request),
+              " @ ", sprintf("%.3f", as.numeric(Sys.time())),
+              sep=""), con=shiny_stdout)
+            flush(shiny_stdout)
+
+            flushReact()
+
+            # eXit a flushReact
+            writeLines(paste("_x_flushReact ", get("HTTP_GUID", ws$request),
+              " @ ", sprintf("%.3f", as.numeric(Sys.time())),
+              sep=""), con=shiny_stdout)
+            flush(shiny_stdout)
+          } else {
+            flushReact()
+          }
+          lapply(appsByToken$values(), function(shinysession) {
+            shinysession$flushOutput()
+            NULL
+          })
         })
       }
       ws$onMessage(function(binary, msg) {
@@ -337,7 +358,6 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
       ws$onClose(function() {
         shinysession$wsClosed()
         appsByToken$remove(shinysession$token)
-        appsNeedingFlush$remove(shinysession$token)
       })
 
       return(TRUE)
@@ -367,9 +387,9 @@ argsForServerFunc <- function(serverFunc, session) {
 }
 
 getEffectiveBody <- function(func) {
-  if (is.null(func))
-    NULL
-  else if (isS4(func) && class(func) == "functionWithTrace")
+  # Note: NULL values are OK. isS4(NULL) returns FALSE, body(NULL)
+  # returns NULL.
+  if (isS4(func) && class(func) == "functionWithTrace")
     body(func@original)
   else
     body(func)
@@ -419,10 +439,7 @@ startApp <- function(appObj, port, host, quiet) {
 
   if (is.numeric(port) || is.integer(port)) {
     if (!quiet) {
-      hostString <- host
-      if (httpuv::ipFamily(host) == 6L)
-        hostString <- paste0("[", hostString, "]")
-      message('\n', 'Listening on http://', hostString, ':', port)
+      message('\n', 'Listening on http://', host, ':', port)
     }
     return(startServer(host, port, handlerManager$createHttpuvApp()))
   } else if (is.character(port)) {
@@ -430,12 +447,6 @@ startApp <- function(appObj, port, host, quiet) {
       message('\n', 'Listening on domain socket ', port)
     }
     mask <- attr(port, 'mask')
-    if (is.null(mask)) {
-      stop("`port` is not a valid domain socket (missing `mask` attribute). ",
-           "Note that if you're using the default `host` + `port` ",
-           "configuration (and not domain sockets), then `port` must ",
-           "be numeric, not a string.")
-    }
     return(startPipeServer(port, mask, handlerManager$createHttpuvApp()))
   }
 }
@@ -443,38 +454,28 @@ startApp <- function(appObj, port, host, quiet) {
 # Run an application that was created by \code{\link{startApp}}. This
 # function should normally be called in a \code{while(TRUE)} loop.
 serviceApp <- function() {
-  timerCallbacks$executeElapsed()
+  if (timerCallbacks$executeElapsed()) {
+    for (shinysession in appsByToken$values()) {
+      shinysession$manageHiddenOutputs()
+    }
 
-  flushReact()
-  flushPendingSessions()
+    flushReact()
+
+    for (shinysession in appsByToken$values()) {
+      shinysession$flushOutput()
+    }
+  }
 
   # If this R session is interactive, then call service() with a short timeout
   # to keep the session responsive to user input
   maxTimeout <- ifelse(interactive(), 100, 1000)
 
-  timeout <- max(1, min(maxTimeout, timerCallbacks$timeToNextEvent(), later::next_op_secs()))
+  timeout <- max(1, min(maxTimeout, timerCallbacks$timeToNextEvent()))
   service(timeout)
-
-  flushReact()
-  flushPendingSessions()
 }
 
 .shinyServerMinVersion <- '0.3.4'
 
-# Global flag that's TRUE whenever we're inside of the scope of a call to runApp
-.globals$running <- FALSE
-
-#' Check whether a Shiny application is running
-#'
-#' This function tests whether a Shiny application is currently running.
-#'
-#' @return \code{TRUE} if a Shiny application is currently running. Otherwise,
-#'   \code{FALSE}.
-#' @export
-isRunning <- function() {
-  .globals$running
-}
-
 #' Run Shiny Application
 #'
 #' Runs a Shiny application. This function normally does not return; interrupt R
@@ -516,9 +517,6 @@ isRunning <- function() {
 #'   application. If set to \code{"normal"}, displays the application normally.
 #'   Defaults to \code{"auto"}, which displays the application in the mode given
 #'   in its \code{DESCRIPTION} file, if any.
-#' @param test.mode Should the application be launched in test mode? This is
-#'   only used for recording or running automated tests. Defaults to the
-#'   \code{shiny.testmode} option, or FALSE if the option is not set.
 #'
 #' @examples
 #' \dontrun{
@@ -531,8 +529,6 @@ isRunning <- function() {
 #'
 #' ## Only run this example in interactive R sessions
 #' if (interactive()) {
-#'   options(device.ask.default = FALSE)
-#'
 #'   # Apps can be run without a server.r and ui.r file
 #'   runApp(list(
 #'     ui = bootstrapPage(
@@ -564,89 +560,23 @@ runApp <- function(appDir=getwd(),
                                             interactive()),
                    host=getOption('shiny.host', '127.0.0.1'),
                    workerId="", quiet=FALSE,
-                   display.mode=c("auto", "normal", "showcase"),
-                   test.mode=getOption('shiny.testmode', FALSE)) {
+                   display.mode=c("auto", "normal", "showcase")) {
   on.exit({
     handlerManager$clear()
   }, add = TRUE)
 
-  if (.globals$running) {
-    stop("Can't call `runApp()` from within `runApp()`. If your ",
-         "application code contains `runApp()`, please remove it.")
-  }
-  .globals$running <- TRUE
-  on.exit({
-    .globals$running <- FALSE
-  }, add = TRUE)
 
-  # Enable per-app Shiny options, for shinyOptions() and getShinyOption().
-  oldOptionSet <- .globals$options
-  on.exit({
-    .globals$options <- oldOptionSet
-  },add = TRUE)
-
-  # A unique identifier associated with this run of this application. It is
-  # shared across sessions.
-  shinyOptions(appToken = createUniqueId(8))
+  if (is.null(host) || is.na(host))
+    host <- '0.0.0.0'
 
   # Make warnings print immediately
   # Set pool.scheduler to support pool package
-  ops <- options(
-    # Raise warn level to 1, but don't lower it
-    warn = max(1, getOption("warn", default = 1)),
-    pool.scheduler = scheduleTask
-  )
+  ops <- options(warn = 1, pool.scheduler = scheduleTask)
   on.exit(options(ops), add = TRUE)
 
-  # Set up default cache for app.
-  if (is.null(getShinyOption("cache"))) {
-    shinyOptions(cache = MemoryCache$new())
-  }
-
-  appParts <- as.shiny.appobj(appDir)
-
-  # The lines below set some of the app's running options, which
-  # can be:
-  #   - left unspeficied (in which case the arguments' default
-  #     values from `runApp` kick in);
-  #   - passed through `shinyApp`
-  #   - passed through `runApp` (this function)
-  #   - passed through both `shinyApp` and `runApp` (the latter
-  #     takes precedence)
-  #
-  # Matrix of possibilities:
-  # | IN shinyApp | IN runApp | result       | check                                                                                                                                  |
-  # |-------------|-----------|--------------|----------------------------------------------------------------------------------------------------------------------------------------|
-  # | no          | no        | use defaults | exhaust all possibilities: if it's missing (runApp does not specify); THEN if it's not in shinyApp appParts$options; THEN use defaults |
-  # | yes         | no        | use shinyApp | if it's missing (runApp does not specify); THEN if it's in shinyApp appParts$options; THEN use shinyApp                                |
-  # | no          | yes       | use runApp   | if it's not missing (runApp specifies), use those                                                                                      |
-  # | yes         | yes       | use runApp   | if it's not missing (runApp specifies), use those                                                                                      |
-  #
-  # I tried to make this as compact and intuitive as possible,
-  # given that there are four distinct possibilities to check
-  appOps <- appParts$options
-  findVal <- function(arg, default) {
-    if (arg %in% names(appOps)) appOps[[arg]] else default
-  }
-
-  if (missing(port))
-    port <- findVal("port", port)
-  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))
-    display.mode <- findVal("display.mode", display.mode)
-  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()) {
+  if (nzchar(Sys.getenv('SHINY_PORT'))) {
     # If SHINY_PORT is set, we're running under Shiny Server. Check the version
     # to make sure it is compatible. Older versions of Shiny Server don't set
     # SHINY_SERVER_VERSION, those will return "" which is considered less than
@@ -663,11 +593,6 @@ runApp <- function(appDir=getwd(),
   # the display.mode parameter. The latter takes precedence.
   setShowcaseDefault(0)
 
-  .globals$testMode <- test.mode
-  if (test.mode) {
-    message("Running application in test mode.")
-  }
-
   # If appDir specifies a path, and display mode is specified in the
   # DESCRIPTION file at that path, apply it here.
   if (is.character(appDir)) {
@@ -735,15 +660,7 @@ runApp <- function(appDir=getwd(),
       }
       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
-          }
-        }
+        port <- p_randomInt(3000, 8000)
       }
 
       # Test port to see if we can use it
@@ -756,22 +673,11 @@ runApp <- function(appDir=getwd(),
     }
   }
 
-  # Invoke user-defined onStop callbacks, before the application's internal
-  # onStop callbacks.
-  on.exit({
-    .globals$onStopCallbacks$invoke()
-    .globals$onStopCallbacks <- Callbacks$new()
-  }, add = TRUE)
-
-  # Extract appOptions (which is a list) and store them as shinyOptions, for
-  # this app. (This is the only place we have to store settings that are
-  # accessible both the UI and server portion of the app.)
-  unconsumeAppOptions(appParts$appOptions)
-
-  # Set up the onStop before we call onStart, so that it gets called even if an
+  appParts <- as.shiny.appobj(appDir)
+  # Set up the onEnd before we call onStart, so that it gets called even if an
   # error happens in onStart.
-  if (!is.null(appParts$onStop))
-    on.exit(appParts$onStop(), add = TRUE)
+  if (!is.null(appParts$onEnd))
+    on.exit(appParts$onEnd(), add = TRUE)
   if (!is.null(appParts$onStart))
     appParts$onStart()
 
@@ -782,17 +688,8 @@ runApp <- function(appDir=getwd(),
   }, add = TRUE)
 
   if (!is.character(port)) {
-    browseHost <- host
-    if (identical(host, "0.0.0.0")) {
-      # http://0.0.0.0/ doesn't work on QtWebKit (i.e. RStudio viewer)
-      browseHost <- "127.0.0.1"
-    } else if (identical(host, "::")) {
-      browseHost <- "::1"
-    }
-
-    if (httpuv::ipFamily(browseHost) == 6L) {
-      browseHost <- paste0("[", browseHost, "]")
-    }
+    # http://0.0.0.0/ doesn't work on QtWebKit (i.e. RStudio viewer)
+    browseHost <- if (identical(host, "0.0.0.0")) "127.0.0.1" else host
 
     appUrl <- paste("http://", browseHost, ":", port, sep="")
     if (is.function(launch.browser))
@@ -815,12 +712,12 @@ runApp <- function(appDir=getwd(),
   # Top-level ..stacktraceoff..; matches with ..stacktraceon in observe(),
   # reactive(), Callbacks$invoke(), and others
   ..stacktraceoff..(
-    captureStackTraces({
+    captureStackTraces(
       while (!.globals$stopped) {
-        ..stacktracefloor..(serviceApp())
+        serviceApp()
         Sys.sleep(0.001)
       }
-    })
+    )
   )
 
   if (isTRUE(.globals$reterror)) {
@@ -839,6 +736,7 @@ runApp <- function(appDir=getwd(),
 #'
 #' @param returnValue The value that should be returned from
 #'   \code{\link{runApp}}.
+#'
 #' @export
 stopApp <- function(returnValue = invisible()) {
   # reterror will indicate whether retval is an error (i.e. it should be passed
@@ -957,6 +855,7 @@ runExample <- function(example=NA,
 #' # ...or as a single app object
 #' runGadget(shinyApp(ui, server))
 #' }
+#'
 #' @export
 runGadget <- function(app, server = NULL, port = getOption("shiny.port"),
   viewer = paneViewer(), stopOnCancel = TRUE) {
@@ -1052,15 +951,3 @@ browserViewer <- function(browser = getOption("browser")) {
     utils::browseURL(url, browser = browser)
   }
 }
-
-# Returns TRUE if we're running in Shiny Server or other hosting environment,
-# otherwise returns FALSE.
-inShinyServer <- function() {
-  nzchar(Sys.getenv('SHINY_PORT'))
-}
-
-# This check was moved out of the main function body because of an issue with
-# the RStudio debugger. (#1474)
-isEmptyMessage <- function(msg) {
-  identical(charToRaw("\003\xe9"), msg)
-}

R/shiny-options.R

@@ -1,83 +0,0 @@
-.globals$options <- list()
-
-#' @param name Name of an option to get.
-#' @param default Value to be returned if the option is not currently set.
-#' @rdname shinyOptions
-#' @export
-getShinyOption <- function(name, default = NULL) {
-  # Make sure to use named (not numeric) indexing
-  name <- as.character(name)
-
-  if (name %in% names(.globals$options))
-    .globals$options[[name]]
-  else
-    default
-}
-
-#' Get or set Shiny options
-#'
-#' \code{getShinyOption} retrieves the value of a Shiny option.
-#' \code{shinyOptions} sets the value of Shiny options; it can also be used to
-#' return a list of all currently-set Shiny options.
-#'
-#' There is a global option set, which is available by default. When a Shiny
-#' application is run with \code{\link{runApp}}, that option set is duplicated
-#' and the new option set is available for getting or setting values. If options
-#' are set from global.R, app.R, ui.R, or server.R, or if they are set from
-#' inside the server function, then the options will be scoped to the
-#' application. When the application exits, the new option set is discarded and
-#' the global option set is restored.
-#'
-#' @param ... Options to set, with the form \code{name = value}.
-#'
-#' @examples
-#' \dontrun{
-#' shinyOptions(myOption = 10)
-#' getShinyOption("myOption")
-#' }
-#' @export
-shinyOptions <- function(...) {
-  newOpts <- list(...)
-
-  if (length(newOpts) > 0) {
-    .globals$options <- dropNulls(mergeVectors(.globals$options, newOpts))
-    invisible(.globals$options)
-  } else {
-    .globals$options
-  }
-}
-
-
-# Eval an expression with a new option set
-withLocalOptions <- function(expr) {
-  oldOptionSet <- .globals$options
-  on.exit(.globals$options <- oldOptionSet)
-
-  expr
-}
-
-
-# Get specific shiny options and put them in a list, reset those shiny options,
-# and then return the options list. This should be during the creation of a
-# shiny app object, which happens before another option frame is added to the
-# options stack (the new option frame is added when the app is run). This
-# function "consumes" the options when the shinyApp object is created, so the
-# options won't affect another app that is created later.
-consumeAppOptions <- function() {
-  options <- list(
-    appDir = getwd(),
-    bookmarkStore = getShinyOption("bookmarkStore")
-  )
-
-  shinyOptions(appDir = NULL, bookmarkStore = NULL)
-
-  options
-}
-
-# Do the inverse of consumeAppOptions. This should be called once the app is
-# started.
-unconsumeAppOptions <- function(options) {
-  if (!is.null(options)) {
-    do.call(shinyOptions, options)
-  }
-}

R/shinyui.R

@@ -14,7 +14,7 @@ NULL
 #' # now we can just write "static" content without withMathJax()
 #' div("more math here $$\\sqrt{2}$$")
 withMathJax <- function(...) {
-  path <- 'https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+  path <- 'https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
   tagList(
     tags$head(
       singleton(tags$script(src = path, type = 'text/javascript'))
@@ -24,7 +24,7 @@ withMathJax <- function(...) {
   )
 }
 
-renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
+renderPage <- function(ui, connection, showcase=0) {
   # If the ui is a NOT complete document (created by htmlTemplate()), then do some
   # preprocessing and make sure it's a complete document.
   if (!inherits(ui, "html_document")) {
@@ -44,19 +44,12 @@ renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
 
   shiny_deps <- list(
     htmlDependency("json2", "2014.02.04", c(href="shared"), script = "json2-min.js"),
-    htmlDependency("jquery", "1.12.4", c(href="shared"), script = "jquery.min.js"),
+    htmlDependency("jquery", "1.11.3", c(href="shared"), script = "jquery.min.js"),
+    htmlDependency("babel-polyfill", "6.7.2", c(href="shared"), script = "babel-polyfill.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")
   )
-
-  if (testMode) {
-    # Add code injection listener if in test mode
-    shiny_deps[[length(shiny_deps) + 1]] <-
-      htmlDependency("shiny-testmode", utils::packageVersion("shiny"),
-        c(href="shared"), script = "shiny-testmode.js")
-  }
-
   html <- renderDocument(ui, shiny_deps, processDep = createWebDependency)
   writeUTF8(html, con = connection)
 }
@@ -71,6 +64,7 @@ renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
 #'
 #' @param ui A user interace definition
 #' @return The user interface definition, without modifications or side effects.
+#'
 #' @export
 shinyUI <- function(ui) {
   .globals$ui <- list(ui)
@@ -97,40 +91,21 @@ uiHttpHandler <- function(ui, uiPattern = "^/$") {
       if (!is.null(mode))
         showcaseMode <- mode
     }
-
-    testMode <- .globals$testMode %OR% FALSE
-
-    # Create a restore context using query string
-    bookmarkStore <- getShinyOption("bookmarkStore", default = "disable")
-    if (bookmarkStore == "disable") {
-      # If bookmarking is disabled, use empty context
-      restoreContext <- RestoreContext$new()
-    } else {
-      restoreContext <- RestoreContext$new(req$QUERY_STRING)
-    }
-
-    withRestoreContext(restoreContext, {
-      uiValue <- NULL
-
-      if (is.function(ui)) {
-        if (length(formals(ui)) > 0) {
-          # No corresponding ..stacktraceoff.., this is pure user code
-          uiValue <- ..stacktraceon..(ui(req))
-        } else {
-          # No corresponding ..stacktraceoff.., this is pure user code
-          uiValue <- ..stacktraceon..(ui())
-        }
+    uiValue <- if (is.function(ui)) {
+      if (length(formals(ui)) > 0) {
+        # No corresponding ..stacktraceoff.., this is pure user code
+        ..stacktraceon..(ui(req))
       } else {
-        if (getCurrentRestoreContext()$active) {
-          warning("Trying to restore saved app state, but UI code must be a function for this to work! See ?enableBookmarking")
-        }
-        uiValue <- ui
+        # No corresponding ..stacktraceoff.., this is pure user code
+        ..stacktraceon..(ui())
       }
-    })
+    } else {
+      ui
+    }
     if (is.null(uiValue))
       return(NULL)
 
-    renderPage(uiValue, textConn, showcaseMode, testMode)
+    renderPage(uiValue, textConn, showcaseMode)
     html <- paste(readLines(textConn, encoding = 'UTF-8'), collapse='\n')
     return(httpResponse(200, content=enc2utf8(html)))
   }

R/shinywrappers.R

@@ -1,4 +1,4 @@
-utils::globalVariables('func')
+globalVariables('func')
 
 #' Mark a function as a render function
 #'
@@ -19,6 +19,7 @@ utils::globalVariables('func')
 #'   dynamically generated UIs, such as those created by Shiny code snippets
 #'   embedded in R Markdown documents).
 #' @return The \code{renderFunc} function, with annotations.
+#'
 #' @export
 markRenderFunction <- function(uiFunc, renderFunc, outputArgs = list()) {
   # a mutable object that keeps track of whether `useRenderFunction` has been
@@ -52,49 +53,6 @@ markRenderFunction <- function(uiFunc, renderFunc, outputArgs = list()) {
             hasExecuted = hasExecuted)
 }
 
-#' Implement render functions
-#'
-#' @param func A function without parameters, that returns user data. If the
-#'   returned value is a promise, then the render function will proceed in async
-#'   mode.
-#' @param transform A function that takes four arguments: \code{value},
-#'   \code{session}, \code{name}, and \code{...} (for future-proofing). This
-#'   function will be invoked each time a value is returned from \code{func},
-#'   and is responsible for changing the value into a JSON-ready value to be
-#'   JSON-encoded and sent to the browser.
-#' @param outputFunc The UI function that is used (or most commonly used) with
-#'   this render function. This can be used in R Markdown documents to create
-#'   complete output widgets out of just the render function.
-#' @param outputArgs A list of arguments to pass to the \code{outputFunc}.
-#'   Render functions should include \code{outputArgs = list()} in their own
-#'   parameter list, and pass through the value as this argument, to allow app
-#'   authors to customize outputs. (Currently, this is only supported for
-#'   dynamically generated UIs, such as those created by Shiny code snippets
-#'   embedded in R Markdown documents).
-#' @return An annotated render function, ready to be assigned to an
-#'   \code{output} slot.
-#'
-#' @export
-createRenderFunction <- function(
-  func, transform = function(value, session, name, ...) value,
-  outputFunc = NULL, outputArgs = NULL
-) {
-
-  renderFunc <- function(shinysession, name, ...) {
-    hybrid_chain(
-      func(),
-      function(value, .visible) {
-        transform(setVisible(value, .visible), shinysession, name, ...)
-      }
-    )
-  }
-
-  if (!is.null(outputFunc))
-    markRenderFunction(outputFunc, renderFunc, outputArgs = outputArgs)
-  else
-    renderFunc
-}
-
 useRenderFunction <- function(renderFunc, inline = FALSE) {
   outputFunction <- attr(renderFunc, "outputFunc")
   outputArgs <- attr(renderFunc, "outputArgs")
@@ -111,17 +69,13 @@ useRenderFunction <- function(renderFunc, inline = FALSE) {
   }
 
   id <- createUniqueId(8, "out")
-
-  o <- getDefaultReactiveDomain()$output
-  if (!is.null(o)) {
-    o[[id]] <- renderFunc
-    # If there's a namespace, we must respect it
-    id <- getDefaultReactiveDomain()$ns(id)
-  }
-
   # Make the id the first positional argument
   outputArgs <- c(list(id), outputArgs)
 
+  o <- getDefaultReactiveDomain()$output
+  if (!is.null(o))
+    o[[id]] <- renderFunc
+
   if (is.logical(formals(outputFunction)[["inline"]]) && !("inline" %in% names(outputArgs))) {
     outputArgs[["inline"]] <- inline
   }
@@ -135,34 +89,6 @@ as.tags.shiny.render.function <- function(x, ..., inline = FALSE) {
   useRenderFunction(x, inline = inline)
 }
 
-
-#' Mark a render function with attributes that will be used by the output
-#'
-#' @inheritParams markRenderFunction
-#' @param snapshotExclude If TRUE, exclude the output from test snapshots.
-#' @param snapshotPreprocess A function for preprocessing the value before
-#'   taking a test snapshot.
-#'
-#' @keywords internal
-markOutputAttrs <- function(renderFunc, snapshotExclude = NULL,
-  snapshotPreprocess = NULL)
-{
-  # Add the outputAttrs attribute if necessary
-  if (is.null(attr(renderFunc, "outputAttrs", TRUE))) {
-    attr(renderFunc, "outputAttrs") <- list()
-  }
-
-  if (!is.null(snapshotExclude)) {
-    attr(renderFunc, "outputAttrs")$snapshotExclude <- snapshotExclude
-  }
-
-  if (!is.null(snapshotPreprocess)) {
-    attr(renderFunc, "outputAttrs")$snapshotPreprocess <- snapshotPreprocess
-  }
-
-  renderFunc
-}
-
 #' Image file output
 #'
 #' Renders a reactive image that is suitable for assigning to an \code{output}
@@ -202,7 +128,6 @@ markOutputAttrs <- function(renderFunc, snapshotExclude = NULL,
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
-#' options(device.ask.default = FALSE)
 #'
 #' ui <- fluidPage(
 #'   sliderInput("n", "Number of observations", 2, 1000, 500),
@@ -269,25 +194,26 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
                         deleteFile=TRUE, outputArgs=list()) {
   installExprFunction(expr, "func", env, quoted)
 
-  createRenderFunction(func,
-    transform = function(imageinfo, session, name, ...) {
-      # Should the file be deleted after being sent? If .deleteFile not set or if
-      # TRUE, then delete; otherwise don't delete.
-      if (deleteFile) {
-        on.exit(unlink(imageinfo$src))
-      }
+  renderFunc <- function(shinysession, name, ...) {
+    imageinfo <- func()
+    # Should the file be deleted after being sent? If .deleteFile not set or if
+    # TRUE, then delete; otherwise don't delete.
+    if (deleteFile) {
+      on.exit(unlink(imageinfo$src))
+    }
 
-      # If contentType not specified, autodetect based on extension
-      contentType <- imageinfo$contentType %OR% getContentType(imageinfo$src)
+    # If contentType not specified, autodetect based on extension
+    contentType <- imageinfo$contentType %OR% getContentType(imageinfo$src)
 
-      # Extra values are everything in imageinfo except 'src' and 'contentType'
-      extra_attr <- imageinfo[!names(imageinfo) %in% c('src', 'contentType')]
+    # Extra values are everything in imageinfo except 'src' and 'contentType'
+    extra_attr <- imageinfo[!names(imageinfo) %in% c('src', 'contentType')]
 
-      # Return a list with src, and other img attributes
-      c(src = session$fileUrl(name, file=imageinfo$src, contentType=contentType),
-        extra_attr)
-    },
-    imageOutput, outputArgs)
+    # Return a list with src, and other img attributes
+    c(src = shinysession$fileUrl(name, file=imageinfo$src, contentType=contentType),
+      extra_attr)
+  }
+
+  markRenderFunction(imageOutput, renderFunc, outputArgs = outputArgs)
 }
 
 
@@ -295,7 +221,7 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
 #'
 #' Makes a reactive version of the given function that captures any printed
 #' output, and also captures its printable result (unless
-#' \code{\link[base]{invisible}}), into a string. The resulting function is suitable
+#' \code{\link{invisible}}), into a string. The resulting function is suitable
 #' for assigning to an  \code{output} slot.
 #'
 #' The corresponding HTML output tag can be anything (though \code{pre} is
@@ -307,14 +233,14 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
 #'
 #' Note that unlike most other Shiny output functions, if the given function
 #' returns \code{NULL} then \code{NULL} will actually be visible in the output.
-#' To display nothing, make your function return \code{\link[base]{invisible}()}.
+#' To display nothing, make your function return \code{\link{invisible}()}.
 #'
 #' @param expr An expression that may print output and/or return a printable R
 #'   object.
 #' @param env The environment in which to evaluate \code{expr}.
 #' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
 #'   is useful if you want to save an expression in a variable.
-#' @param width The value for \code{\link[base]{options}('width')}.
+#' @param width The value for \code{\link{options}('width')}.
 #' @param outputArgs A list of arguments to be passed through to the implicit
 #'   call to \code{\link{verbatimTextOutput}} when \code{renderPrint} is used
 #'   in an interactive R Markdown document.
@@ -322,79 +248,21 @@ renderImage <- function(expr, env=parent.frame(), quoted=FALSE,
 #'   function, instead of the printed output.
 #'
 #' @example res/text-example.R
+#'
 #' @export
 renderPrint <- function(expr, env = parent.frame(), quoted = FALSE,
                         width = getOption('width'), outputArgs=list()) {
   installExprFunction(expr, "func", env, quoted)
 
-  # Set a promise domain that sets the console width
-  #   and captures output
-  # op <- options(width = width)
-  # on.exit(options(op), add = TRUE)
-
   renderFunc <- function(shinysession, name, ...) {
-    domain <- createRenderPrintPromiseDomain(width)
-    hybrid_chain(
-      {
-        promises::with_promise_domain(domain, func())
-      },
-      function(value, .visible) {
-        if (.visible) {
-          cat(file = domain$conn, paste(utils::capture.output(value, append = TRUE), collapse = "\n"))
-        }
-        res <- paste(readLines(domain$conn, warn = FALSE), collapse = "\n")
-        res
-      },
-      finally = function() {
-        close(domain$conn)
-      }
-    )
+    op <- options(width = width)
+    on.exit(options(op), add = TRUE)
+    paste(utils::capture.output(func()), collapse = "\n")
   }
 
   markRenderFunction(verbatimTextOutput, renderFunc, outputArgs = outputArgs)
 }
 
-createRenderPrintPromiseDomain <- function(width) {
-  f <- file()
-
-  promises::new_promise_domain(
-    wrapOnFulfilled = function(onFulfilled) {
-      force(onFulfilled)
-      function(...) {
-        op <- options(width = width)
-        on.exit(options(op), add = TRUE)
-
-        sink(f, append = TRUE)
-        on.exit(sink(NULL), add = TRUE)
-
-        onFulfilled(...)
-      }
-    },
-    wrapOnRejected = function(onRejected) {
-      force(onRejected)
-      function(...) {
-        op <- options(width = width)
-        on.exit(options(op), add = TRUE)
-
-        sink(f, append = TRUE)
-        on.exit(sink(NULL), add = TRUE)
-
-        onRejected(...)
-      }
-    },
-    wrapSync = function(expr) {
-      op <- options(width = width)
-      on.exit(options(op), add = TRUE)
-
-      sink(f, append = TRUE)
-      on.exit(sink(NULL), add = TRUE)
-
-      force(expr)
-    },
-    conn = f
-  )
-}
-
 #' Text Output
 #'
 #' Makes a reactive version of the given function that also uses
@@ -421,23 +289,24 @@ createRenderPrintPromiseDomain <- function(width) {
 #'   function, rather than the returned text value.
 #'
 #' @example res/text-example.R
+#'
 #' @export
 renderText <- function(expr, env=parent.frame(), quoted=FALSE,
                        outputArgs=list()) {
   installExprFunction(expr, "func", env, quoted)
 
-  createRenderFunction(
-    func,
-    function(value, session, name, ...) {
-      paste(utils::capture.output(cat(value)), collapse="\n")
-    },
-    textOutput, outputArgs
-  )
+  renderFunc <- function(shinysession, name, ...) {
+    value <- func()
+    return(paste(utils::capture.output(cat(value)), collapse="\n"))
+  }
+
+  markRenderFunction(textOutput, renderFunc, outputArgs = outputArgs)
 }
 
 #' UI Output
 #'
-#' Renders reactive HTML using the Shiny UI library.
+#' \bold{Experimental feature.} Makes a reactive version of a function that
+#' generates HTML using the Shiny UI library.
 #'
 #' The corresponding HTML output tag should be \code{div} and have the CSS class
 #' name \code{shiny-html-output} (or use \code{\link{uiOutput}}).
@@ -451,7 +320,8 @@ renderText <- function(expr, env=parent.frame(), quoted=FALSE,
 #'   call to \code{\link{uiOutput}} when \code{renderUI} is used in an
 #'   interactive R Markdown document.
 #'
-#' @seealso \code{\link{uiOutput}}
+#' @seealso conditionalPanel
+#'
 #' @export
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -476,16 +346,15 @@ renderUI <- function(expr, env=parent.frame(), quoted=FALSE,
                      outputArgs=list()) {
   installExprFunction(expr, "func", env, quoted)
 
-  createRenderFunction(
-    func,
-    function(result, shinysession, name, ...) {
-      if (is.null(result) || length(result) == 0)
-        return(NULL)
+  renderFunc <- function(shinysession, name, ...) {
+    result <- func()
+    if (is.null(result) || length(result) == 0)
+      return(NULL)
 
-      processDeps(result, shinysession)
-    },
-    uiOutput, outputArgs
-  )
+    processDeps(result, shinysession)
+  }
+
+  markRenderFunction(uiOutput, renderFunc, outputArgs = outputArgs)
 }
 
 #' File Downloads
@@ -544,9 +413,7 @@ downloadHandler <- function(filename, content, contentType=NA, outputArgs=list()
   renderFunc <- function(shinysession, name, ...) {
     shinysession$registerDownload(name, filename, contentType, content)
   }
-  snapshotExclude(
-    markRenderFunction(downloadButton, renderFunc, outputArgs = outputArgs)
-  )
+  markRenderFunction(downloadButton, renderFunc, outputArgs = outputArgs)
 }
 
 #' Table output with the JavaScript library DataTables
@@ -557,7 +424,7 @@ downloadHandler <- function(filename, content, contentType=NA, outputArgs=list()
 #' the server infrastructure.
 #'
 #' For the \code{options} argument, the character elements that have the class
-#' \code{"AsIs"} (usually returned from \code{\link[base]{I}()}) will be evaluated in
+#' \code{"AsIs"} (usually returned from \code{\link{I}()}) will be evaluated in
 #' JavaScript. This is useful when the type of the option value is not supported
 #' in JSON, e.g., a JavaScript function, which can be obtained by evaluating a
 #' character string. Note this only applies to the root-level elements of the
@@ -623,46 +490,31 @@ renderDataTable <- function(expr, options = NULL, searchDelay = 500,
     if (is.function(options)) options <- options()
     options <- checkDT9(options)
     res <- checkAsIs(options)
-    hybrid_chain(
-      func(),
-      function(data) {
-        if (length(dim(data)) != 2) return() # expects a rectangular data object
-        if (is.data.frame(data)) data <- as.data.frame(data)
-        action <- shinysession$registerDataObj(name, data, dataTablesJSON)
-        colnames <- colnames(data)
-        # if escape is column names, turn names to numeric indices
-        if (is.character(escape)) {
-          escape <- stats::setNames(seq_len(ncol(data)), colnames)[escape]
-          if (any(is.na(escape)))
-            stop("Some column names in the 'escape' argument not found in data")
-        }
-        colnames[escape] <- htmlEscape(colnames[escape])
-        if (!is.logical(escape)) {
-          if (!is.numeric(escape))
-            stop("'escape' must be TRUE, FALSE, or a numeric vector, or column names")
-          escape <- paste(escape, collapse = ',')
-        }
-        list(
-          colnames = colnames, action = action, options = res$options,
-          evalOptions = if (length(res$eval)) I(res$eval), searchDelay = searchDelay,
-          callback = paste(callback, collapse = '\n'), escape = escape
-        )
-      }
+    data <- func()
+    if (length(dim(data)) != 2) return() # expects a rectangular data object
+    if (is.data.frame(data)) data <- as.data.frame(data)
+    action <- shinysession$registerDataObj(name, data, dataTablesJSON)
+    colnames <- colnames(data)
+    # if escape is column names, turn names to numeric indices
+    if (is.character(escape)) {
+      escape <- stats::setNames(seq_len(ncol(data)), colnames)[escape]
+      if (any(is.na(escape)))
+        stop("Some column names in the 'escape' argument not found in data")
+    }
+    colnames[escape] <- htmlEscape(colnames[escape])
+    if (!is.logical(escape)) {
+      if (!is.numeric(escape))
+        stop("'escape' must be TRUE, FALSE, or a numeric vector, or column names")
+      escape <- paste(escape, collapse = ',')
+    }
+    list(
+      colnames = colnames, action = action, options = res$options,
+      evalOptions = if (length(res$eval)) I(res$eval), searchDelay = searchDelay,
+      callback = paste(callback, collapse = '\n'), escape = escape
     )
   }
 
-  renderFunc <- markRenderFunction(dataTableOutput, renderFunc, outputArgs = outputArgs)
-
-  renderFunc <- snapshotPreprocessOutput(renderFunc, function(value) {
-    # Remove the action field so that it's not saved in test snapshots. It
-    # contains a value that changes every time an app is run, and shouldn't be
-    # stored for test snapshots. It will be something like:
-    # "session/e0d14d3fe97f672f9655a127f2a1e079/dataobj/table?w=&nonce=7f5d6d54e22450a3"
-    value$action <- NULL
-    value
-  })
-
-  renderFunc
+  markRenderFunction(dataTableOutput, renderFunc, outputArgs = outputArgs)
 }
 
 # a data frame containing the DataTables 1.9 and 1.10 names

R/showcase.R

@@ -18,8 +18,7 @@ licenseLink <- function(licenseName) {
     "Artistic-2.0" = "http://www.r-project.org/Licenses/Artistic-2.0",
     "BSD_2_clause" = "http://www.r-project.org/Licenses/BSD_2_clause",
     "BSD_3_clause" = "http://www.r-project.org/Licenses/BSD_3_clause",
-    "MIT" = "http://www.r-project.org/Licenses/MIT",
-    "CC-BY-SA-4.0" = "https://www.r-project.org/Licenses/CC-BY-SA-4.0")
+    "MIT" = "http://www.r-project.org/Licenses/MIT")
   if (exists(licenseName, where = licenses)) {
     tags$a(href=licenses[[licenseName]], licenseName)
   } else {
@@ -32,7 +31,7 @@ licenseLink <- function(licenseName) {
 showcaseHead <- function() {
 
   deps  <- list(
-    htmlDependency("jqueryui", "1.12.1", c(href="shared/jqueryui"),
+    htmlDependency("jqueryui", "1.11.4", c(href="shared/jqueryui"),
       script = "jquery-ui.min.js"),
     htmlDependency("showdown", "0.3.1", c(href="shared/showdown/compressed"),
       script = "showdown.js"),

R/snapshot.R

@@ -1,44 +0,0 @@
-#' Mark an output to be excluded from test snapshots
-#'
-#' @param x A reactive which will be assigned to an output.
-#'
-#' @export
-snapshotExclude <- function(x) {
-  markOutputAttrs(x, snapshotExclude = TRUE)
-}
-
-#' Add a function for preprocessing an output before taking a test snapshot
-#'
-#' @param x A reactive which will be assigned to an output.
-#' @param fun A function that takes the output value as an input and returns a
-#'   modified value. The returned value will be used for the test snapshot.
-#'
-#' @export
-snapshotPreprocessOutput <- function(x, fun) {
-  markOutputAttrs(x, snapshotPreprocess = fun)
-}
-
-
-#' Add a function for preprocessing an input before taking a test snapshot
-#'
-#' @param inputId Name of the input value.
-#' @param fun A function that takes the input value and returns a modified
-#'   value. The returned value will be used for the test snapshot.
-#' @param session A Shiny session object.
-#'
-#' @export
-snapshotPreprocessInput <- function(inputId, fun, session = getDefaultReactiveDomain()) {
-  if (is.null(session)) {
-    stop("snapshotPreprocessInput() needs a session object.")
-  }
-
-  input_impl <- .subset2(session$input, "impl")
-  input_impl$setMeta(inputId, "shiny.snapshot.preprocess", fun)
-}
-
-
-# Strip out file path from fileInput value
-snapshotPreprocessorFileInput <- function(value) {
-  value$datapath <- basename(value$datapath)
-  value
-}

R/test-export.R

@@ -1,61 +0,0 @@
-#' Register expressions for export in test mode
-#'
-#' This function registers expressions that will be evaluated when a test export
-#' event occurs. These events are triggered by accessing a snapshot URL.
-#'
-#' This function only has an effect if the app is launched in test mode. This is
-#' done by calling \code{runApp()} with \code{test.mode=TRUE}, or by setting the
-#' global option \code{shiny.testmode} to \code{TRUE}.
-#'
-#' @param quoted_ Are the expression quoted? Default is \code{FALSE}.
-#' @param env_ The environment in which the expression should be evaluated.
-#' @param session_ A Shiny session object.
-#' @param ... Named arguments that are quoted or unquoted expressions that will
-#'   be captured and evaluated when snapshot URL is visited.
-#' @examples
-#' ## Only run this example in interactive R sessions
-#' if (interactive()) {
-#'
-#' options(shiny.testmode = TRUE)
-#'
-#' # This application shows the test snapshot URL; clicking on it will
-#' # fetch the input, output, and exported values in JSON format.
-#' shinyApp(
-#'   ui = basicPage(
-#'     h4("Snapshot URL: "),
-#'     uiOutput("url"),
-#'     h4("Current values:"),
-#'     verbatimTextOutput("values"),
-#'     actionButton("inc", "Increment x")
-#'   ),
-#'
-#'   server = function(input, output, session) {
-#'     vals <- reactiveValues(x = 1)
-#'     y <- reactive({ vals$x + 1 })
-#'
-#'     observeEvent(input$inc, {
-#'       vals$x <<- vals$x + 1
-#'     })
-#'
-#'     exportTestValues(
-#'       x = vals$x,
-#'       y = y()
-#'     )
-#'
-#'     output$url <- renderUI({
-#'       url <- session$getTestSnapshotUrl(format="json")
-#'       a(href = url, url)
-#'     })
-#'
-#'     output$values <- renderText({
-#'       paste0("vals$x: ", vals$x, "\ny: ", y())
-#'     })
-#'   }
-#' )
-#' }
-#' @export
-exportTestValues <- function(..., quoted_ = FALSE, env_ = parent.frame(),
-  session_ = getDefaultReactiveDomain())
-{
-  session_$exportTestValues(..., quoted_ = quoted_, env_ = env_)
-}

R/timer.R

@@ -22,11 +22,6 @@ TimerCallbacks <- R6Class(
       .times <<- data.frame()
     },
     schedule = function(millis, func) {
-      # If args could fail to evaluate, let's make them do that before
-      # we change any state
-      force(millis)
-      force(func)
-
       id <- .nextId
       .nextId <<- .nextId + 1L
 
@@ -42,17 +37,6 @@ TimerCallbacks <- R6Class(
 
       return(id)
     },
-    unschedule = function(id) {
-      toRemoveIndices <- .times$id %in% id
-      toRemoveIds <- .times[toRemoveIndices, "id", drop = TRUE]
-      if (length(toRemoveIds) > 0) {
-        .times <<- .times[!toRemoveIndices,]
-        for (toRemoveId in as.character(toRemoveIds)) {
-          .funcs$remove(toRemoveId)
-        }
-      }
-      return(id %in% toRemoveIds)
-    },
     timeToNextEvent = function() {
       if (dim(.times)[1] == 0)
         return(Inf)
@@ -72,7 +56,7 @@ TimerCallbacks <- R6Class(
     },
     executeElapsed = function() {
       elapsed <- takeElapsed()
-      if (nrow(elapsed) == 0)
+      if (length(elapsed) == 0)
         return(FALSE)
 
       for (id in elapsed$id) {
@@ -90,9 +74,13 @@ timerCallbacks <- TimerCallbacks$new()
 
 scheduleTask <- function(millis, callback) {
   cancelled <- FALSE
-  id <- timerCallbacks$schedule(millis, callback)
+  timerCallbacks$schedule(millis, function() {
+    if (!cancelled)
+      callback()
+  })
 
   function() {
-    invisible(timerCallbacks$unschedule(id))
+    cancelled <<- TRUE
+    callback <<- NULL # to allow for callback to be gc'ed
   }
 }

R/update-input.R

@@ -2,7 +2,6 @@
 #'
 #' @template update-input
 #' @param value The value to set for the input object.
-#' @param placeholder The placeholder to set for the input object.
 #'
 #' @seealso \code{\link{textInput}}
 #'
@@ -35,49 +34,11 @@
 #' shinyApp(ui, server)
 #' }
 #' @export
-updateTextInput <- function(session, inputId, label = NULL, value = NULL, placeholder = NULL) {
-  message <- dropNulls(list(label=label, value=value, placeholder=placeholder))
+updateTextInput <- function(session, inputId, label = NULL, value = NULL) {
+  message <- dropNulls(list(label=label, value=value))
   session$sendInputMessage(inputId, message)
 }
 
-#' Change the value of a textarea input on the client
-#'
-#' @template update-input
-#' @inheritParams updateTextInput
-#'
-#' @seealso \code{\link{textAreaInput}}
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fluidPage(
-#'   sliderInput("controller", "Controller", 0, 20, 10),
-#'   textAreaInput("inText", "Input textarea"),
-#'   textAreaInput("inText2", "Input textarea 2")
-#' )
-#'
-#' server <- function(input, output, session) {
-#'   observe({
-#'     # We'll use the input$controller variable multiple times, so save it as x
-#'     # for convenience.
-#'     x <- input$controller
-#'
-#'     # This will change the value of input$inText, based on x
-#'     updateTextAreaInput(session, "inText", value = paste("New text", x))
-#'
-#'     # Can also set the label, this time for input$inText2
-#'     updateTextAreaInput(session, "inText2",
-#'       label = paste("New label", x),
-#'       value = paste("New text", x))
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#' }
-#' @export
-updateTextAreaInput <- updateTextInput
-
 
 #' Change the value of a checkbox input on the client
 #'
@@ -107,10 +68,7 @@ updateTextAreaInput <- updateTextInput
 #' shinyApp(ui, server)
 #' }
 #' @export
-updateCheckboxInput <- function(session, inputId, label = NULL, value = NULL) {
-  message <- dropNulls(list(label=label, value=value))
-  session$sendInputMessage(inputId, message)
-}
+updateCheckboxInput <- updateTextInput
 
 
 #' Change the label or icon of an action button on the client
@@ -170,7 +128,7 @@ updateActionButton <- function(session, inputId, label = NULL, icon = NULL) {
 #'
 #' @template update-input
 #' @param value The desired date value. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. Supply \code{NA} to clear the date.
+#'   \code{yyyy-mm-dd} format.
 #' @param min The minimum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param max The maximum allowed date. Either a Date object, or a string in
@@ -183,18 +141,21 @@ updateActionButton <- function(session, inputId, label = NULL, icon = NULL) {
 #' if (interactive()) {
 #'
 #' ui <- fluidPage(
-#'   sliderInput("n", "Day of month", 1, 30, 10),
+#'   sliderInput("controller", "Controller", 1, 30, 10),
 #'   dateInput("inDate", "Input date")
 #' )
 #'
 #' server <- function(input, output, session) {
 #'   observe({
-#'     date <- as.Date(paste0("2013-04-", input$n))
+#'     # We'll use the input$controller variable multiple times, so save it as x
+#'     # for convenience.
+#'     x <- input$controller
+#'
 #'     updateDateInput(session, "inDate",
-#'       label = paste("Date label", input$n),
-#'       value = date,
-#'       min   = date - 3,
-#'       max   = date + 3
+#'       label = paste("Date label", x),
+#'       value = paste("2013-04-", x, sep=""),
+#'       min   = paste("2013-04-", x-1, sep=""),
+#'       max   = paste("2013-04-", x+1, sep="")
 #'     )
 #'   })
 #' }
@@ -205,18 +166,11 @@ updateActionButton <- function(session, inputId, label = NULL, icon = NULL) {
 updateDateInput <- function(session, inputId, label = NULL, value = NULL,
                             min = NULL, max = NULL) {
 
-  # Make sure values are NULL or Date objects. This is so we can ensure that
-  # they will be formatted correctly. For example, the string "2016-08-9" is not
-  # correctly formatted, but the conversion to Date and back to string will fix
-  # it.
-  formatDate <- function(x) {
-    if (is.null(x))
-      return(NULL)
-    format(as.Date(x), "%Y-%m-%d")
-  }
-  value <- formatDate(value)
-  min   <- formatDate(min)
-  max   <- formatDate(max)
+  # If value is a date object, convert it to a string with yyyy-mm-dd format
+  # Same for min and max
+  if (inherits(value, "Date"))  value <- format(value, "%Y-%m-%d")
+  if (inherits(min, "Date"))    min   <- format(min,   "%Y-%m-%d")
+  if (inherits(max, "Date"))    max   <- format(max,   "%Y-%m-%d")
 
   message <- dropNulls(list(label=label, value=value, min=min, max=max))
   session$sendInputMessage(inputId, message)
@@ -227,9 +181,9 @@ updateDateInput <- function(session, inputId, label = NULL, value = NULL,
 #'
 #' @template update-input
 #' @param start The start date. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. Supplying \code{NA} clears the start date.
+#'   \code{yyyy-mm-dd} format.
 #' @param end The end date. Either a Date object, or a string in
-#'   \code{yyyy-mm-dd} format. Supplying \code{NA} clears the end date.
+#'   \code{yyyy-mm-dd} format.
 #' @param min The minimum allowed date. Either a Date object, or a string in
 #'   \code{yyyy-mm-dd} format.
 #' @param max The maximum allowed date. Either a Date object, or a string in
@@ -242,20 +196,20 @@ updateDateInput <- function(session, inputId, label = NULL, value = NULL,
 #' if (interactive()) {
 #'
 #' ui <- fluidPage(
-#'   sliderInput("n", "Day of month", 1, 30, 10),
+#'   sliderInput("controller", "Controller", 1, 30, 10),
 #'   dateRangeInput("inDateRange", "Input date range")
 #' )
 #'
 #' server <- function(input, output, session) {
 #'   observe({
-#'     date <- as.Date(paste0("2013-04-", input$n))
+#'     # We'll use the input$controller variable multiple times, so save it as x
+#'     # for convenience.
+#'     x <- input$controller
 #'
 #'     updateDateRangeInput(session, "inDateRange",
-#'       label = paste("Date range label", input$n),
-#'       start = date - 1,
-#'       end = date + 1,
-#'       min = date - 5,
-#'       max = date + 5
+#'       label = paste("Date range label", x),
+#'       start = paste("2013-01-", x, sep=""),
+#'       end = paste("2013-12-", x, sep="")
 #'     )
 #'   })
 #' }
@@ -275,7 +229,7 @@ updateDateRangeInput <- function(session, inputId, label = NULL,
 
   message <- dropNulls(list(
     label = label,
-    value = dropNulls(list(start = start, end = end)),
+    value = c(start, end),
     min = min,
     max = max
   ))
@@ -383,17 +337,13 @@ updateNumericInput <- function(session, inputId, label = NULL, value = NULL,
   session$sendInputMessage(inputId, message)
 }
 
-#' Update Slider Input Widget
-#'
-#' Change the value of a slider input on the client.
+#' Change the value of a slider input on the client
 #'
 #' @template update-input
 #' @param value The value to set for the input object.
 #' @param min Minimum value.
 #' @param max Maximum value.
 #' @param step Step size.
-#' @param timeFormat Date and POSIXt formatting.
-#' @param timezone The timezone offset for POSIXt objects.
 #'
 #' @seealso \code{\link{sliderInput}}
 #'
@@ -426,15 +376,22 @@ updateNumericInput <- function(session, inputId, label = NULL, value = NULL,
 #' }
 #' @export
 updateSliderInput <- function(session, inputId, label = NULL, value = NULL,
-  min = NULL, max = NULL, step = NULL, timeFormat = NULL, timezone = NULL)
+  min = NULL, max = NULL, step = NULL)
 {
-  dataType <- getSliderType(min, max, value)
+  # Make sure that value, min, max all have the same type, because we need
+  # special handling for dates and datetimes.
+  vals <- dropNulls(list(value, min, max))
 
-  if (is.null(timeFormat)) {
-    timeFormat <- switch(dataType, date = "%F", datetime = "%F %T", number = NULL)
+  type <- unique(lapply(vals, function(x) {
+    if      (inherits(x, "Date"))   "date"
+    else if (inherits(x, "POSIXt")) "datetime"
+    else                            "number"
+  }))
+  if (length(type) > 1) {
+    stop("Type mismatch for value, min, and max")
   }
 
-  if (dataType == "date" || dataType == "datetime") {
+  if ((length(type) == 1) && (type == "date" || type == "datetime")) {
     to_ms <- function(x) 1000 * as.numeric(as.POSIXct(x))
     if (!is.null(min))   min   <- to_ms(min)
     if (!is.null(max))   max   <- to_ms(max)
@@ -446,28 +403,23 @@ updateSliderInput <- function(session, inputId, label = NULL, value = NULL,
     value = formatNoSci(value),
     min = formatNoSci(min),
     max = formatNoSci(max),
-    step = formatNoSci(step),
-    `data-type` = dataType,
-    `time-format` = timeFormat,
-    timezone = timezone
+    step = formatNoSci(step)
   ))
   session$sendInputMessage(inputId, message)
 }
 
 
 updateInputOptions <- function(session, inputId, label = NULL, choices = NULL,
-                               selected = NULL, inline = FALSE, type = NULL,
-                               choiceNames = NULL, choiceValues = NULL) {
-  if (is.null(type)) stop("Please specify the type ('checkbox' or 'radio')")
+                               selected = NULL, inline = FALSE,
+                               type = 'checkbox') {
+  if (!is.null(choices))
+    choices <- choicesWithNames(choices)
+  if (!is.null(selected))
+    selected <- validateSelected(selected, choices, inputId)
 
-  args <- normalizeChoicesArgs(choices, choiceNames, choiceValues, mustExist = FALSE)
-
-  if (!is.null(selected)) selected <- as.character(selected)
-
-  options <- if (!is.null(args$choiceValues)) {
+  options <- if (!is.null(choices)) {
     format(tagList(
-      generateOptions(session$ns(inputId), selected, inline, type,
-        args$choiceNames, args$choiceValues)
+      generateOptions(inputId, choices, selected, inline, type = type)
     ))
   }
 
@@ -516,10 +468,9 @@ updateInputOptions <- function(session, inputId, label = NULL, choices = NULL,
 #' }
 #' @export
 updateCheckboxGroupInput <- function(session, inputId, label = NULL,
-  choices = NULL, selected = NULL, inline = FALSE,
-  choiceNames = NULL, choiceValues = NULL) {
-  updateInputOptions(session, inputId, label, choices, selected,
-                     inline, "checkbox", choiceNames, choiceValues)
+                                     choices = NULL, selected = NULL,
+                                     inline = FALSE) {
+  updateInputOptions(session, inputId, label, choices, selected, inline)
 }
 
 
@@ -559,15 +510,10 @@ updateCheckboxGroupInput <- function(session, inputId, label = NULL,
 #' }
 #' @export
 updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
-                               selected = NULL, inline = FALSE,
-                               choiceNames = NULL, choiceValues = NULL) {
+                               selected = NULL, inline = FALSE) {
   # you must select at least one radio button
-  if (is.null(selected)) {
-    if (!is.null(choices)) selected <- choices[[1]]
-    else if (!is.null(choiceValues)) selected <- choiceValues[[1]]
-  }
-  updateInputOptions(session, inputId, label, choices, selected,
-    inline, 'radio', choiceNames, choiceValues)
+  if (is.null(selected) && !is.null(choices)) selected <- choices[[1]]
+  updateInputOptions(session, inputId, label, choices, selected, inline, type = 'radio')
 }
 
 
@@ -576,7 +522,7 @@ updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
 #' @template update-input
 #' @inheritParams selectInput
 #'
-#' @seealso \code{\link{selectInput}} \code{\link{varSelectInput}}
+#' @seealso \code{\link{selectInput}}
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -613,7 +559,8 @@ updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
 updateSelectInput <- function(session, inputId, label = NULL, choices = NULL,
                               selected = NULL) {
   choices <- if (!is.null(choices)) choicesWithNames(choices)
-  if (!is.null(selected)) selected <- as.character(selected)
+  if (!is.null(selected))
+    selected <- validateSelected(selected, choices, inputId)
   options <- if (!is.null(choices)) selectOptions(choices, selected)
   message <- dropNulls(list(label = label, options = options, value = selected))
   session$sendInputMessage(inputId, message)
@@ -633,7 +580,7 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
     res <- checkAsIs(options)
     cfg <- tags$script(
       type = 'application/json',
-      `data-for` = session$ns(inputId),
+      `data-for` = inputId,
       `data-eval` = if (length(res$eval)) HTML(toJSON(res$eval)),
       HTML(toJSON(res$options))
     )
@@ -642,95 +589,8 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
   if (!server) {
     return(updateSelectInput(session, inputId, label, choices, selected))
   }
-
-  noOptGroup <- TRUE
-  if (is.list(choices)) {
-    # check if list is nested
-    for (i in seq_along(choices)) {
-      if (is.list(choices[[i]]) || length(choices[[i]]) > 1) {
-        noOptGroup <- FALSE
-        break()
-      }
-    }
-  }
-  # convert choices to a data frame so it returns [{label: , value: , optgroup: },...]
-  choices <- if (is.data.frame(choices)) {
-    # jcheng 2018/09/25: I don't think we ever said data frames were OK to pass
-    # to updateSelectInput, but one of the example apps does this and at least
-    # one user noticed when we broke it.
-    # https://github.com/rstudio/shiny/issues/2172
-    # https://github.com/rstudio/shiny/issues/2192
-    as.data.frame(choices, stringsAsFactors = FALSE)
-  } else if (is.atomic(choices) || noOptGroup) {
-    # fast path for vectors and flat lists
-    if (is.list(choices)) {
-      choices <- unlist(choices)
-    }
-    if (is.null(names(choices))) {
-      lab <- as.character(choices)
-    } else {
-      lab <- names(choices)
-      # replace empty names like: choices = c(a = 1, 2)
-      # in this case: names(choices) = c("a", "")
-      # with replacement below choices will be: lab = c("a", "2")
-      empty_names_indices <- lab == ""
-      lab[empty_names_indices] <- as.character(choices[empty_names_indices])
-    }
-    data.frame(label = lab, value = choices, stringsAsFactors = FALSE)
-  } else {
-    # slow path for nested lists/optgroups
-    list_names <- names(choices)
-    if (is.null(list_names)) {
-      list_names <- rep("", length(choices))
-    }
-
-    choice_list <- mapply(choices, list_names, FUN = function (choice, name) {
-      group <- ""
-      lab <- name
-      if (lab == "") lab <- as.character(choice)
-
-      if (is.list(choice) || length(choice) > 1) {
-        group <- rep(name, length(choice))
-        choice <- unlist(choice)
-
-        if (is.null(names(choice))) {
-          lab <- as.character(choice)
-        } else {
-          lab <- names(choice)
-          # replace empty names like: choices = c(a = 1, 2)
-          # in this case: names(choices) = c("a", "")
-          # with replacement below choices will be: lab = c("a", "2")
-          empty_names_indices <- lab == ""
-          lab[empty_names_indices] <- as.character(choice[empty_names_indices])
-        }
-      }
-
-      list(
-        label = lab,
-        value = as.character(choice),
-        # The name "optgroup" is because this is the default field where
-        # selectize will look for group IDs
-        optgroup = group
-      )
-    }, SIMPLIFY = FALSE)
-
-
-    extract_vector <- function(x, name) {
-      vecs <- lapply(x, `[[`, name)
-      do.call(c, vecs)
-    }
-
-    data.frame(
-      label = extract_vector(choice_list, "label"),
-      value = extract_vector(choice_list, "value"),
-      optgroup = extract_vector(choice_list, "optgroup"),
-      stringsAsFactors = FALSE, row.names = NULL
-    )
-  }
-
   value <- unname(selected)
   attr(choices, 'selected_value') <- value
-
   message <- dropNulls(list(
     label = label,
     value = value,
@@ -738,76 +598,38 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
   ))
   session$sendInputMessage(inputId, message)
 }
-#' @rdname updateSelectInput
-#' @inheritParams varSelectInput
-#' @export
-updateVarSelectInput <- function(session, inputId, label = NULL, data = NULL, selected = NULL) {
-  if (is.null(data)) {
-    choices <- NULL
-  } else {
-    choices <- colnames(data)
-  }
-  updateSelectInput(
-    session = session,
-    inputId = inputId,
-    label = label,
-    choices = choices,
-    selected = selected
-  )
-}
-#' @rdname updateSelectInput
-#' @export
-updateVarSelectizeInput <- function(session, inputId, label = NULL, data = NULL, selected = NULL, options = list(), server = FALSE) {
-  if (is.null(data)) {
-    choices <- NULL
-  } else {
-    choices <- colnames(data)
-  }
-  updateSelectizeInput(
-    session = session,
-    inputId = inputId,
-    label = label,
-    choices = choices,
-    selected = selected,
-    options = options,
-    server = server
-  )
-}
-
-
 
 selectizeJSON <- function(data, req) {
   query <- parseQueryString(req$QUERY_STRING)
-
   # extract the query variables, conjunction (and/or), search string, maximum options
-  var <- c(safeFromJSON(query$field))
-
+  var <- c(jsonlite::fromJSON(query$field))
+  cjn <- if (query$conju == 'and') all else any
   # all keywords in lower-case, for case-insensitive matching
   key <- unique(strsplit(tolower(query$query), '\\s+')[[1]])
-
   if (identical(key, '')) key <- character(0)
   mop <- as.numeric(query$maxop)
   vfd <- query$value  # the value field name
   sel <- attr(data, 'selected_value', exact = TRUE)
 
+  # convert a single vector to a data frame so it returns {label: , value: }
+  # later in JSON; other objects return arbitrary JSON {x: , y: , foo: , ...}
+  data <- if (is.atomic(data)) {
+    data.frame(label = names(choicesWithNames(data)), value = data,
+               stringsAsFactors = FALSE)
+  } else as.data.frame(data, stringsAsFactors = FALSE)
+
   # start searching for keywords in all specified columns
   idx <- logical(nrow(data))
-  if (length(key)) {
-    for (v in var) {
-      matches <- do.call(
-        cbind,
-        lapply(key, function(k) {
-          grepl(k, tolower(as.character(data[[v]])), fixed = TRUE)
-        })
-      )
-      # merge column matches using OR, and match multiple keywords in one column
-      # using the conjunction setting (AND or OR)
-      matches <- rowSums(matches)
-      if (query$conju == 'and')
-        idx <- idx | (matches == length(key))
-      else
-        idx <- idx | matches
-    }
+  if (length(key)) for (v in var) {
+    matches <- do.call(
+      cbind,
+      lapply(key, function(k) {
+        grepl(k, tolower(as.character(data[[v]])), fixed = TRUE)
+      })
+    )
+    # merge column matches using OR, and match multiple keywords in one column
+    # using the conjunction setting (AND or OR)
+    idx <- idx | apply(matches, 1, cjn)
   }
   # only return the first n rows (n = maximum options in configuration)
   idx <- utils::head(if (length(key)) which(idx) else seq_along(idx), mop)

R/utils.R

@@ -23,6 +23,7 @@ NULL
 #' rnormA(3)  # [1]  1.8285879 -0.7468041 -0.4639111
 #' rnormA(5)  # [1]  1.8285879 -0.7468041 -0.4639111 -1.6510126 -1.4686924
 #' rnormB(5)  # [1] -0.7946034  0.2568374 -0.6567597  1.2451387 -0.8375699
+#'
 #' @export
 repeatable <- function(rngfunc, seed = stats::runif(1, 0, .Machine$integer.max)) {
   force(seed)
@@ -43,43 +44,53 @@ repeatable <- function(rngfunc, seed = stats::runif(1, 0, .Machine$integer.max))
   }
 }
 
+# Temporarily set x in env to value, evaluate expr, and
+# then restore x to its original state
+withTemporary <- function(env, x, value, expr, unset = FALSE) {
+
+  if (exists(x, envir = env, inherits = FALSE)) {
+    oldValue <- get(x, envir = env, inherits = FALSE)
+    on.exit(
+      assign(x, oldValue, envir = env, inherits = FALSE),
+      add = TRUE)
+  } else {
+    on.exit(
+      rm(list = x, envir = env, inherits = FALSE),
+      add = TRUE
+    )
+  }
+
+  if (!missing(value) && !isTRUE(unset))
+    assign(x, value, envir = env, inherits = FALSE)
+  else {
+    if (exists(x, envir = env, inherits = FALSE))
+      rm(list = x, envir = env, inherits = FALSE)
+  }
+  force(expr)
+}
+
 .globals$ownSeed <- NULL
 # Evaluate an expression using Shiny's own private stream of
 # randomness (not affected by set.seed).
 withPrivateSeed <- function(expr) {
-  # Save the old seed if present.
-  if (exists(".Random.seed", envir = .GlobalEnv, inherits = FALSE)) {
-    hasOrigSeed <- TRUE
-    origSeed <- .GlobalEnv$.Random.seed
-  } else {
-    hasOrigSeed <- FALSE
-  }
-
-  # Swap in the private seed.
-  if (is.null(.globals$ownSeed)) {
-    if (hasOrigSeed) {
-      # Move old seed out of the way if present.
-      rm(.Random.seed, envir = .GlobalEnv, inherits = FALSE)
+  withTemporary(.GlobalEnv, ".Random.seed",
+    .globals$ownSeed, unset=is.null(.globals$ownSeed), {
+      tryCatch({
+        expr
+      }, finally = {
+        .globals$ownSeed <- getExists('.Random.seed', 'numeric', globalenv())
+      })
     }
-  } else {
-    .GlobalEnv$.Random.seed <- .globals$ownSeed
-  }
+  )
+}
 
-  # On exit, save the modified private seed, and put the old seed back.
-  on.exit({
-    .globals$ownSeed <- .GlobalEnv$.Random.seed
-
-    if (hasOrigSeed) {
-      .GlobalEnv$.Random.seed <- origSeed
-    } else {
-      rm(.Random.seed, envir = .GlobalEnv, inherits = FALSE)
-    }
-    # Need to call this to make sure that the value of .Random.seed gets put
-    # into R's internal RNG state. (Issue #1763)
-    httpuv::getRNGState()
-  })
-
-  expr
+# a homemade version of set.seed(NULL) for backward compatibility with R 2.15.x
+reinitializeSeed <- if (getRversion() >= '3.0.0') {
+  function() set.seed(NULL)
+} else function() {
+  if (exists('.Random.seed', globalenv()))
+    rm(list = '.Random.seed', pos = globalenv())
+  stats::runif(1)  # generate any random numbers so R can reinitialize the seed
 }
 
 # Version of runif that runs with private seed
@@ -109,6 +120,16 @@ p_randomInt <- function(...) {
   withPrivateSeed(randomInt(...))
 }
 
+# Return a random hexadecimal string with `length` digits.
+randomID <- function(length = 16) {
+  paste(sample(
+    c("0", "1", "2", "3", "4", "5", "6", "7", "8","9",
+      "a", "b", "c", "d", "e", "f"),
+    length,
+    replace = TRUE
+  ), collapse = '')
+}
+
 isWholeNum <- function(x, tol = .Machine$double.eps^0.5) {
   abs(x - round(x)) < tol
 }
@@ -172,55 +193,6 @@ anyUnnamed <- function(x) {
   any(!nzchar(nms))
 }
 
-
-# Given a vector/list, returns a named vector (the labels will be blank).
-asNamedVector <- function(x) {
-  if (!is.null(names(x)))
-    return(x)
-
-  names(x) <- rep.int("", length(x))
-  x
-}
-
-# Given two named vectors, join them together, and keep only the last element
-# with a given name in the resulting vector. If b has any elements with the same
-# name as elements in a, the element in a is dropped. Also, if there are any
-# duplicated names in a or b, only the last one with that name is kept.
-mergeVectors <- function(a, b) {
-  if (anyUnnamed(a) || anyUnnamed(b)) {
-    stop("Vectors must be either NULL or have names for all elements")
-  }
-
-  x <- c(a, b)
-  drop_idx <- duplicated(names(x), fromLast = TRUE)
-  x[!drop_idx]
-}
-
-# Sort a vector by the names of items. If there are multiple items with the
-# same name, preserve the original order of those items. For empty
-# vectors/lists/NULL, return the original value.
-sortByName <- function(x) {
-  if (anyUnnamed(x))
-    stop("All items must be named")
-
-  # Special case for empty vectors/lists, and NULL
-  if (length(x) == 0)
-    return(x)
-
-  x[order(names(x))]
-}
-
-# Wrapper around list2env with a NULL check. In R <3.2.0, if an empty unnamed
-# list is passed to list2env(), it errors. But an empty named list is OK. For
-# R >=3.2.0, this wrapper is not necessary.
-list2env2 <- function(x, ...) {
-  # Ensure that zero-length lists have a name attribute
-  if (length(x) == 0)
-    attr(x, "names") <- character(0)
-
-  list2env(x, ...)
-}
-
 # Combine dir and (file)name into a file path. If a file already exists with a
 # name differing only by case, then use it instead.
 file.path.ci <- function(...) {
@@ -263,31 +235,6 @@ find.file.ci <- function(...) {
   return(matches[1])
 }
 
-# The function base::dir.exists was added in R 3.2.0, but for backward
-# compatibility we need to add this function
-dirExists <- function(paths) {
-  file.exists(paths) & file.info(paths)$isdir
-}
-
-# Removes empty directory (vectorized). This is needed because file.remove()
-# on Unix will remove empty directories, but on Windows, it will not. On
-# Windows, you would need to use unlink(recursive=TRUE), which is not very
-# safe. This function does it safely on Unix and Windows.
-dirRemove <- function(path) {
-  for (p in path) {
-    if (!dirExists(p)) {
-      stop("Cannot remove non-existent directory ", p, ".")
-    }
-    if (length(dir(p, all.files = TRUE, no.. = TRUE)) != 0) {
-      stop("Cannot remove non-empty directory ", p, ".")
-    }
-    result <- unlink(p, recursive = TRUE)
-    if (result == 1) {
-      stop("Error removing directory ", p, ".")
-    }
-  }
-}
-
 # Attempt to join a path and relative path, and turn the result into a
 # (normalized) absolute path. The result will only be returned if it is an
 # existing file/directory and is a descendant of dir.
@@ -453,6 +400,7 @@ makeFunction <- function(args = pairlist(), body, env = parent.frame()) {
 #'
 #' isolate(tripleA())
 #' # "text, text, text"
+#'
 #' @export
 exprToFunction <- function(expr, env=parent.frame(), quoted=FALSE) {
   if (!quoted) {
@@ -486,6 +434,7 @@ exprToFunction <- function(expr, env=parent.frame(), quoted=FALSE) {
 #'   the name of the calling function.
 #' @param wrappedWithLabel,..stacktraceon Advanced use only. For stack manipulation purposes; see
 #'   \code{\link{stacktrace}}.
+#'
 #' @export
 installExprFunction <- function(expr, name, eval.env = parent.frame(2),
                                 quoted = FALSE,
@@ -557,8 +506,6 @@ parseQueryString <- function(str, nested = FALSE) {
     str <- substr(str, 2, nchar(str))
 
   pairs <- strsplit(str, '&', fixed = TRUE)[[1]]
-  # Drop any empty items (if there's leading/trailing/consecutive '&' chars)
-  pairs <- pairs[pairs != ""]
   pairs <- strsplit(pairs, '=', fixed = TRUE)
 
   keys   <- vapply(pairs, function(x) x[1], FUN.VALUE = character(1))
@@ -606,7 +553,13 @@ shinyCallingHandlers <- function(expr) {
         return()
 
       handle <- getOption('shiny.error')
-      if (is.function(handle)) handle()
+      if (is.function(handle)) {
+        if ("condition" %in% names(formals(handle))) {
+          handle(condition = e)
+        } else {
+          handle()
+        }
+      }
     }
   )
 }
@@ -681,9 +634,6 @@ Callbacks <- R6Class(
       .callbacks <<- Map$new()
     },
     register = function(callback) {
-      if (!is.function(callback)) {
-        stop("callback must be a function")
-      }
       id <- as.character(.nextId)
       .nextId <<- .nextId - 1L
       .callbacks$set(id, callback)
@@ -1026,62 +976,6 @@ safeError <- function(error) {
   error
 }
 
-#***********************************************************************#
-#**** Keep this function internal for now, may chnage in the future ****#
-#***********************************************************************#
-# #' Propagate an error through Shiny, but catch it before it throws
-# #'
-# #' Throws a type of exception that is caught by observers. When such an
-# #' exception is triggered, all reactive links are broken. So, essentially,
-# #' \code{reactiveStop()} behaves just like \code{stop()}, except that
-# #' instead of ending the session, it is silently swalowed by Shiny.
-# #'
-# #' This function should be used when you want to disrupt the reactive
-# #' links in a reactive chain, but do not want to end the session. For
-# #' example, this enables you to disallow certain inputs, but get back
-# #' to business as usual when valid inputs are re-entered.
-# #' \code{reactiveStop} is also called internally by Shiny to create
-# #' special errors, such as the ones generated by \code{\link{validate}()},
-# #' \code{\link{req}()} and \code{\link{cancelOutput}()}.
-# #'
-# #' @param message An optional error message.
-# #' @param class An optional class to add to the error.
-# #' @export
-# #' @examples
-# #' ## Note: the breaking of the reactive chain that happens in the app
-# #' ## below (when input$txt = 'bad' and input$allowBad = 'FALSE') is
-# #' ## easily visualized with `showReactLog()`
-# #'
-# #' ## Only run examples in interactive R sessions
-# #' if (interactive()) {
-# #'
-# #' ui <- fluidPage(
-# #'   textInput('txt', 'Enter some text...'),
-# #'   selectInput('allowBad', 'Allow the string \'bad\'?',
-# #'               c('TRUE', 'FALSE'), selected = 'FALSE')
-# #' )
-# #'
-# #' server <- function(input, output) {
-# #'   val <- reactive({
-# #'     if (!(as.logical(input$allowBad))) {
-# #'       if (identical(input$txt, "bad")) {
-# #'         reactiveStop()
-# #'       }
-# #'     }
-## '   })
-# #'
-# #'   observe({
-# #'     val()
-# #'   })
-# #' }
-# #'
-# #' shinyApp(ui, server)
-# #' }
-# #' @export
-reactiveStop <- function(message = "", class = NULL) {
-  stopWithCondition(c("shiny.silent.error", class), message)
-}
-
 #' Validate input values and other conditions
 #'
 #' For an output rendering function (e.g. \code{\link{renderPlot}()}), you may
@@ -1138,17 +1032,15 @@ reactiveStop <- function(message = "", class = NULL) {
 #'   \code{shiny-output-error-} prepended to this value.
 #' @export
 #' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#' options(device.ask.default = FALSE)
-#'
-#' ui <- fluidPage(
+#' # in ui.R
+#' fluidPage(
 #'   checkboxGroupInput('in1', 'Check some letters', choices = head(LETTERS)),
 #'   selectizeInput('in2', 'Select a state', choices = state.name),
 #'   plotOutput('plot')
 #' )
 #'
-#' server <- function(input, output) {
+#' # in server.R
+#' function(input, output) {
 #'   output$plot <- renderPlot({
 #'     validate(
 #'       need(input$in1, 'Check at least one letter!'),
@@ -1157,10 +1049,6 @@ reactiveStop <- function(message = "", class = NULL) {
 #'     plot(1:10, main = paste(c(input$in1, input$in2), collapse = ', '))
 #'   })
 #' }
-#'
-#' shinyApp(ui, server)
-#'
-#' }
 validate <- function(..., errorClass = character(0)) {
   results <- sapply(list(...), function(x) {
     # Detect NULL or NA
@@ -1181,7 +1069,8 @@ validate <- function(..., errorClass = character(0)) {
   # There may be empty strings remaining; these are message-less failures that
   # started as FALSE
   results <- results[nzchar(results)]
-  reactiveStop(paste(results, collapse="\n"), c(errorClass, "validation"))
+  stopWithCondition(c("validation", "shiny.silent.error", errorClass),
+                    paste(results, collapse="\n"))
 }
 
 #' @param expr An expression to test. The condition will pass if the expression
@@ -1243,7 +1132,7 @@ need <- function(expr, message = paste(label, "must be provided"), label) {
 #' \strong{Truthy and falsy values}
 #'
 #' The terms "truthy" and "falsy" generally indicate whether a value, when
-#' coerced to a \code{\link[base]{logical}}, is \code{TRUE} or \code{FALSE}. We use
+#' coerced to a \code{\link{logical}}, is \code{TRUE} or \code{FALSE}. We use
 #' the term a little loosely here; our usage tries to match the intuitive
 #' notions of "Is this value missing or available?", or "Has the user provided
 #' an answer?", or in the case of action buttons, "Has the button been
@@ -1275,67 +1164,20 @@ need <- function(expr, message = paste(label, "must be provided"), label) {
 #'
 #' \code{req(input$a != 0)}
 #'
-#' \strong{Using \code{req(FALSE)}}
-#'
-#' You can use \code{req(FALSE)} (i.e. no condition) if you've already performed
-#' all the checks you needed to by that point and just want to stop the reactive
-#' chain now. There is no advantange to this, except perhaps ease of readibility
-#' if you have a complicated condition to check for (or perhaps if you'd like to
-#' divide your condition into nested \code{if} statements).
-#'
-#' \strong{Using \code{cancelOutput = TRUE}}
-#'
-#' When \code{req(..., cancelOutput = TRUE)} is used, the "silent" exception is
-#' also raised, but it is treated slightly differently if one or more outputs are
-#' currently being evaluated. In those cases, the reactive chain does not proceed
-#' or update, but the output(s) are left is whatever state they happen to be in
-#' (whatever was their last valid state).
-#'
-#' Note that this is always going to be the case if
-#' this is used inside an output context (e.g. \code{output$txt <- ...}). It may
-#' or may not be the case if it is used inside a non-output context (e.g.
-#' \code{\link{reactive}}, \code{\link{observe}} or \code{\link{observeEvent}})
-#' -- depending on whether or not there is an \code{output$...} that is triggered
-#' as a result of those calls. See the examples below for concrete scenarios.
-#'
 #' @param ... Values to check for truthiness.
 #' @param cancelOutput If \code{TRUE} and an output is being evaluated, stop
 #'   processing as usual but instead of clearing the output, leave it in
 #'   whatever state it happens to be in.
-#' @param x An expression whose truthiness value we want to determine
 #' @return The first value that was passed in.
+#'
 #' @export
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'   ui <- fluidPage(
-#'     textInput('data', 'Enter a dataset from the "datasets" package', 'cars'),
-#'     p('(E.g. "cars", "mtcars", "pressure", "faithful")'), hr(),
-#'     tableOutput('tbl')
-#'   )
-#'
-#'   server <- function(input, output) {
-#'     output$tbl <- renderTable({
-#'
-#'       ## to require that the user types something, use: `req(input$data)`
-#'       ## but better: require that input$data is valid and leave the last
-#'       ## valid table up
-#'       req(exists(input$data, "package:datasets", inherits = FALSE),
-#'           cancelOutput = TRUE)
-#'
-#'       head(get(input$data, "package:datasets", inherits = FALSE))
-#'     })
-#'   }
-#'
-#'   shinyApp(ui, server)
-#' }
 req <- function(..., cancelOutput = FALSE) {
   dotloop(function(item) {
     if (!isTruthy(item)) {
       if (isTRUE(cancelOutput)) {
         cancelOutput()
       } else {
-        reactiveStop(class = "validation")
+        stopWithCondition(c("validation", "shiny.silent.error"), "")
       }
     }
   }, ...)
@@ -1346,44 +1188,20 @@ req <- function(..., cancelOutput = FALSE) {
     invisible()
 }
 
-#***********************************************************************#
-#**** Keep this function internal for now, may chnage in the future ****#
-#***********************************************************************#
-# #' Cancel processing of the current output
-# #'
-# #' Signals an error that Shiny treats specially if an output is currently being
-# #' evaluated. Execution will stop, but rather than clearing the output (as
-# #' \code{\link{req}} does) or showing an error message (as \code{\link{stop}}
-# #' does), the output simply remains unchanged.
-# #'
-# #' If \code{cancelOutput} is called in any non-output context (like in an
-# #' \code{\link{observe}} or \code{\link{observeEvent}}), the effect is the same
-# #' as \code{\link{req}(FALSE)}.
-# #' @export
-# #' @examples
-# #' ## Only run examples in interactive R sessions
-# #' if (interactive()) {
-# #'
-# #' # uncomment the desired line to experiment with cancelOutput() vs. req()
-# #'
-# #' ui <- fluidPage(
-# #'   textInput('txt', 'Enter text'),
-# #'   textOutput('check')
-# #' )
-# #'
-# #' server <- function(input, output) {
-# #'   output$check <- renderText({
-# #'     # req(input$txt)
-# #'     if (input$txt == 'hi') return('hi')
-# #'     else if (input$txt == 'bye') return('bye')
-# #'     # else cancelOutput()
-# #'   })
-# #' }
-# #'
-# #' shinyApp(ui, server)
-# #' }
+#' Cancel processing of the current output
+#'
+#' Signals an error that Shiny treats specially if an output is currently being
+#' evaluated. Execution will stop, but rather than clearing the output (as
+#' \code{\link{req}} does) or showing an error message (as \code{\link{stop}}
+#' does), the output simply remains unchanged.
+#'
+#' If \code{cancelOutput} is called in any non-output context (like in an
+#' \code{\link{observe}} or \code{\link{observeEvent}}), the effect is the same
+#' as \code{\link{req}(FALSE)}.
+#'
+#' @export
 cancelOutput <- function() {
-  reactiveStop(class = "shiny.output.cancel")
+  stopWithCondition(c("shiny.output.cancel", "shiny.silent.error"), "")
 }
 
 # Execute a function against each element of ..., but only evaluate each element
@@ -1398,8 +1216,6 @@ dotloop <- function(fun_, ...) {
   invisible()
 }
 
-#' @export
-#' @rdname req
 isTruthy <- function(x) {
   if (inherits(x, 'try-error'))
     return(FALSE)
@@ -1551,10 +1367,7 @@ writeUTF8 <- function(text, ...) {
   writeLines(text, ..., useBytes = TRUE)
 }
 
-URLdecode <- function(value) {
-  decodeURIComponent(value)
-}
-
+URLdecode <- decodeURIComponent
 URLencode <- function(value, reserved = FALSE) {
   value <- enc2utf8(value)
   if (reserved) encodeURIComponent(value) else encodeURI(value)
@@ -1600,143 +1413,3 @@ Mutable <- R6Class("Mutable",
     get = function() { private$value }
   )
 )
-
-# More convenient way of chaining together promises than then/catch/finally,
-# without the performance impact of %...>%.
-promise_chain <- function(promise, ..., catch = NULL, finally = NULL,
-  domain = NULL, replace = FALSE) {
-
-  do <- function() {
-    p <- Reduce(function(memo, func) {
-      promises::then(memo, func)
-    }, list(...), promise)
-
-    if (!is.null(catch)) {
-      p <- promises::catch(p, catch)
-    }
-
-    if (!is.null(finally)) {
-      p <- promises::finally(p, finally)
-    }
-
-    p
-  }
-
-  if (!is.null(domain)) {
-    promises::with_promise_domain(domain, do(), replace = replace)
-  } else {
-    do()
-  }
-}
-
-# Like promise_chain, but if `expr` returns a non-promise, then `...`, `catch`,
-# and `finally` are all executed synchronously
-hybrid_chain <- function(expr, ..., catch = NULL, finally = NULL,
-  domain = NULL, replace = FALSE) {
-
-  do <- function() {
-    runFinally <- TRUE
-    tryCatch(
-      {
-        captureStackTraces({
-          result <- withVisible(force(expr))
-          if (promises::is.promising(result$value)) {
-            # Purposefully NOT including domain (nor replace), as we're already in
-            # the domain at this point
-            p <- promise_chain(setVisible(result), ..., catch = catch, finally = finally)
-            runFinally <- FALSE
-            p
-          } else {
-            result <- Reduce(function(v, func) {
-              if (".visible" %in% names(formals(func))) {
-                withVisible(func(v$value, .visible = v$visible))
-              } else {
-                withVisible(func(v$value))
-              }
-            }, list(...), result)
-
-            setVisible(result)
-          }
-        })
-      },
-      error = function(e) {
-        if (!is.null(catch))
-          catch(e)
-        else
-          stop(e)
-      },
-      finally = if (runFinally && !is.null(finally)) finally()
-    )
-  }
-
-  if (!is.null(domain)) {
-    promises::with_promise_domain(domain, do(), replace = replace)
-  } else {
-    do()
-  }
-}
-
-# Returns `value` with either `invisible()` applied or not, depending on the
-# value of `visible`.
-#
-# If the `visible` is missing, then `value` should be a list as returned from
-# `withVisible()`, and that visibility will be applied.
-setVisible <- function(value, visible) {
-  if (missing(visible)) {
-    visible <- value$visible
-    value <- value$value
-  }
-
-  if (!visible) {
-    invisible(value)
-  } else {
-    (value)
-  }
-}
-
-createVarPromiseDomain <- function(env, name, value) {
-  force(env)
-  force(name)
-  force(value)
-
-  promises::new_promise_domain(
-    wrapOnFulfilled = function(onFulfilled) {
-      function(...) {
-        orig <- env[[name]]
-        env[[name]] <- value
-        on.exit(env[[name]] <- orig)
-
-        onFulfilled(...)
-      }
-    },
-    wrapOnRejected = function(onRejected) {
-      function(...) {
-        orig <- env[[name]]
-        env[[name]] <- value
-        on.exit(env[[name]] <- orig)
-
-        onRejected(...)
-      }
-    },
-    wrapSync = function(expr) {
-      orig <- env[[name]]
-      env[[name]] <- value
-      on.exit(env[[name]] <- orig)
-
-      force(expr)
-    }
-  )
-}
-
-getSliderType <- function(min, max, value) {
-  vals <- dropNulls(list(value, min, max))
-  type <- unique(lapply(vals, function(x) {
-    if      (inherits(x, "Date"))   "date"
-    else if (inherits(x, "POSIXt")) "datetime"
-    else                            "number"
-  }))
-  if (length(type) > 1) {
-    stop("Type mismatch for `min`, `max`, and `value`. Each must be Date, POSIXt, or number.")
-  }
-  type[[1]]
-}

README.md

@@ -1,24 +1,20 @@
 # Shiny
 
-*Travis:* [![Travis Build Status](https://travis-ci.org/rstudio/shiny.svg?branch=master)](https://travis-ci.org/rstudio/shiny)
-
-*AppVeyor:* [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/rstudio/shiny?branch=master&svg=true)](https://ci.appveyor.com/project/rstudio/shiny)
+[![Build Status](https://travis-ci.org/rstudio/shiny.svg?branch=master)](https://travis-ci.org/rstudio/shiny)
 
 Shiny is a new package from RStudio that makes it incredibly easy to build interactive web applications with R.
 
 For an introduction and examples, visit the [Shiny Dev Center](http://shiny.rstudio.com/).
 
-If you have general questions about using Shiny, please use the [RStudio Community website](https://community.rstudio.com). For bug reports, please use the [issue tracker](https://github.com/rstudio/shiny/issues).
-
 ## Features
 
 * Build useful web applications with only a few lines of code—no JavaScript required.
 * Shiny applications are automatically "live" in the same way that spreadsheets are live. Outputs change instantly as users modify inputs, without requiring a reload of the browser.
 * Shiny user interfaces can be built entirely using R, or can be written directly in HTML, CSS, and JavaScript for more flexibility.
 * Works in any R environment (Console R, Rgui for Windows or Mac, ESS, StatET, RStudio, etc.).
-* Attractive default UI theme based on [Bootstrap](http://getbootstrap.com/).
+* Attractive default UI theme based on [Bootstrap](http://getbootstrap.com/2.3.2/).
 * A highly customizable slider widget with built-in support for animation.
-* Prebuilt output widgets for displaying plots, tables, and printed output of R objects.
+* Pre-built output widgets for displaying plots, tables, and printed output of R objects.
 * Fast bidirectional communication between the web browser and R using the [httpuv](https://github.com/rstudio/httpuv) package.
 * Uses a [reactive](http://en.wikipedia.org/wiki/Reactive_programming) programming model that eliminates messy event handling code, so you can focus on the code that really matters.
 * Develop and redistribute your own Shiny widgets that other developers can easily drop into their own applications (coming soon!).
@@ -43,6 +39,8 @@ devtools::install_github("rstudio/shiny")
 
 To learn more we highly recommend you check out the [Shiny Tutorial](http://shiny.rstudio.com/tutorial/). The tutorial explains the framework in-depth, walks you through building a simple application, and includes extensive annotated examples.
 
+We hope you enjoy using Shiny. If you have general questions about using Shiny, please use the Shiny [mailing list](https://groups.google.com/forum/#!forum/shiny-discuss). For bug reports, please use the [issue tracker](https://github.com/rstudio/shiny/issues).
+
 ## Bootstrap 3 migration
 
 Shiny versions 0.10.2.2 and below used the Bootstrap 2 web framework. After 0.10.2.2, Shiny switched to Bootstrap 3. For most users, the upgrade should be seamless. However, if you have have customized your HTML-generating code to use features specific to Bootstrap 2, you may need to update your code to work with Bootstrap 3.
@@ -59,10 +57,6 @@ devtools::install_version("shiny", version = "0.10.2.2")
 
 The Javascript code in Shiny is minified using tools that run on Node.js. See the tools/ directory for more information.
 
-## Guidelines for contributing
-
-We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](CONTRIBUTING.md) file for detailed guidelines of how to contribute.
-
 ## License
 
 The shiny package is licensed under the GPLv3. See these files in the inst directory for additional details:

TODO-promises.md

@@ -1,54 +0,0 @@
-# Promises TODO
-
-## Documentation
-
-- [x] Motivation -- why should I care about async? Why shouldn't I (what are the limitations)?
-- [x] High level technical overview
-- [ ] Cookbook-style examples
-- [ ] Top-down porting of a sync app to async
-
-## Core API
-- [x] Should as.promise() convert regular values to promises? Or throw?
-  - [x] If as.promise() doesn't convert regular values to promises, add promise_resolved(value) and promise_rejected(err) functions?
-
-## later
-- [ ] Add support for multiple event loops
-- [x] Add timeout to run_now
-
-## Error handling/debugging
-- [ ] ..stacktraceon../..stacktraceoff.. and stack traces in general
-- [x] long stack traces
-  - [x] require opt-in
-- [ ] options(shiny.error) should work in promise handlers
-- [x] Detect when reactives are used across process boundaries, and error
-
-## Render functions
-- [x] Non-async render functions should have their code all execute on the current tick. Otherwise order of execution will be surprising if they have side effects and explicit priorities.
-- [x] Promise domains should maybe have an onExecute, for the "sync" part that kicks off async operations to also have wrapping behavior (like capturing output). Right now, I have to start off renderPrint with promise(~resolve(TRUE)) and then execute the user code in a then(), just to get the promise behavior. Same will be true when we tackle error handling (stack trace capture).
-- [x] invisible() doesn't seem to be working correctly with renderPrint. .visible doesn't survive promise chaining, e.g. promise(~resolve(promise(~resolve(invisible("Hi"))))) %>% then(function(x, .visible) { cat(.visible) }) will print TRUE, not FALSE.
-- [x] renderDataTable should support async
-- [x] Support downloadHandler
-  - [ ] Support async filename?
-  - [x] Should prevent session from continuing until download completes (ref count)
-
-## Flush lifecycle
-- [x] While async operations are running in a session, hold off on any further processing of inputs and scheduled task items until all operations are complete.
-- [x] Hold all outputs/errors until async operations are complete.
-- [ ] Allow both sync and async outputs to be displayed before all outputs are done. (opt-in)
-
-## Testing
-- [x] App that tests that all built-in render functions support async
-- [x] Apps that test flush lifecycle, including onFlushed(once = FALSE)
-- [x] Apps that test invisible() behavior for renderPrint, both sync and async
-- [x] Apps that ensure all render functions execute synchronous code before tick is over
-- [x] App that tests async downloadHandler
-- [x] App that verifies inputs/timers don't fire for a session while it has async operations pending
-- [x] App that verifies req(FALSE), req(FALSE, cancelOutput = TRUE), validate/need, etc. all work in async
-
-## External packages
-- [x] DT
-- [x] htmlwidgets: Don't require async-aware version of Shiny if not using async
-- [x] Plotly
-
-## Bugs
-- [x] req(FALSE, cancelOutput = TRUE) shows grey (even without async)

appveyor.yml

@@ -1,49 +0,0 @@
-# DO NOT CHANGE the "init" and "install" sections below
-
-# Download script file from GitHub
-init:
-  ps: |
-        $ErrorActionPreference = "Stop"
-        Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
-        Import-Module '..\appveyor-tool.ps1'
-
-install:
-  ps: Bootstrap
-
-cache:
-  - C:\RLibrary
-
-# Adapt as necessary starting from here
-
-build_script:
-  - travis-tool.sh install_deps
-
-test_script:
-  - travis-tool.sh run_tests
-
-on_failure:
-  - 7z a failure.zip *.Rcheck\*
-  - appveyor PushArtifact failure.zip
-
-artifacts:
-  - path: '*.Rcheck\**\*.log'
-    name: Logs
-
-  - path: '*.Rcheck\**\*.out'
-    name: Logs
-
-  - path: '*.Rcheck\**\*.fail'
-    name: Logs
-
-  - path: '*.Rcheck\**\*.Rout'
-    name: Logs
-
-  - path: '\*_*.tar.gz'
-    name: Bits
-
-  - path: '\*_*.zip'
-    name: Bits
-
-environment:
-  global:
-    USE_RTOOLS: true

inst/examples/01_hello/Readme.md

@@ -1,3 +1,4 @@
-This small Shiny application demonstrates Shiny's automatic UI updates. 
-
-Move the *Number of bins* slider and notice how the `renderPlot` expression is automatically re-evaluated when its dependant, `input$bins`, changes, causing a histogram with a new number of bins to be rendered.
+This small Shiny application demonstrates Shiny's automatic UI updates. Move
+the *Number of bins* slider and notice how the `renderPlot` expression is
+automatically re-evaluated when its dependant, `input$bins`, changes,
+causing a histogram with a new number of bins to be rendered.

inst/examples/01_hello/app.R

@@ -1,59 +0,0 @@
-library(shiny)
-
-# Define UI for app that draws a histogram ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("Hello Shiny!"),
-
-  # Sidebar layout with input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar panel for inputs ----
-    sidebarPanel(
-
-      # Input: Slider for the number of bins ----
-      sliderInput(inputId = "bins",
-                  label = "Number of bins:",
-                  min = 1,
-                  max = 50,
-                  value = 30)
-
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Histogram ----
-      plotOutput(outputId = "distPlot")
-
-    )
-  )
-)
-
-# Define server logic required to draw a histogram ----
-server <- function(input, output) {
-
-  # Histogram of the Old Faithful Geyser Data ----
-  # with requested number of bins
-  # This expression that generates a histogram is wrapped in a call
-  # to renderPlot to indicate that:
-  #
-  # 1. It is "reactive" and therefore should be automatically
-  #    re-executed when inputs (input$bins) change
-  # 2. Its output type is a plot
-  output$distPlot <- renderPlot({
-
-    x    <- faithful$waiting
-    bins <- seq(min(x), max(x), length.out = input$bins + 1)
-
-    hist(x, breaks = bins, col = "#75AADB", border = "white",
-         xlab = "Waiting time to next eruption (in mins)",
-         main = "Histogram of waiting times")
-
-    })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui = ui, server = server)

inst/examples/01_hello/rsconnect/localhost/admin/01_hello.dcf

@@ -0,0 +1,6 @@
+name: 01_hello
+account: admin
+server: localhost
+bundleId: 1
+url: http://localhost:3939/admin/01_hello/
+when: 1436550957.65385

inst/examples/01_hello/server.R

@@ -0,0 +1,21 @@
+library(shiny)
+
+# Define server logic required to draw a histogram
+function(input, output) {
+
+  # Expression that generates a histogram. The expression is
+  # wrapped in a call to renderPlot to indicate that:
+  #
+  #  1) It is "reactive" and therefore should be automatically
+  #     re-executed when inputs change
+  #  2) Its output type is a plot
+
+  output$distPlot <- renderPlot({
+    x    <- faithful[, 2]  # Old Faithful Geyser data
+    bins <- seq(min(x), max(x), length.out = input$bins + 1)
+
+    # draw the histogram with the specified number of bins
+    hist(x, breaks = bins, col = 'darkgray', border = 'white')
+  })
+
+}

inst/examples/01_hello/ui.R

@@ -0,0 +1,24 @@
+library(shiny)
+
+# Define UI for application that draws a histogram
+fluidPage(
+
+  # Application title
+  titlePanel("Hello Shiny!"),
+
+  # Sidebar with a slider input for the number of bins
+  sidebarLayout(
+    sidebarPanel(
+      sliderInput("bins",
+                  "Number of bins:",
+                  min = 1,
+                  max = 50,
+                  value = 30)
+    ),
+
+    # Show a plot of the generated distribution
+    mainPanel(
+      plotOutput("distPlot")
+    )
+  )
+)

inst/examples/02_text/Readme.md

@@ -1 +1 @@
-This example demonstrates output of raw text from R using the `renderPrint` function in `server` and the `verbatimTextOutput` function in `ui`. In this case, a textual summary of the data is shown using R's built-in `summary` function. 
+This example demonstrates output of raw text from R using the `renderPrint` function in `server.R` and the `verbatimTextOutput` function in `ui.R`. In this case, a textual summary of the data is shown using R's built-in `summary` function. 

inst/examples/02_text/app.R

@@ -1,64 +0,0 @@
-library(shiny)
-
-# Define UI for dataset viewer app ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("Shiny Text"),
-
-  # Sidebar layout with a input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar panel for inputs ----
-    sidebarPanel(
-
-      # Input: Selector for choosing dataset ----
-      selectInput(inputId = "dataset",
-                  label = "Choose a dataset:",
-                  choices = c("rock", "pressure", "cars")),
-
-      # Input: Numeric entry for number of obs to view ----
-      numericInput(inputId = "obs",
-                   label = "Number of observations to view:",
-                   value = 10)
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Verbatim text for data summary ----
-      verbatimTextOutput("summary"),
-
-      # Output: HTML table with requested number of observations ----
-      tableOutput("view")
-
-    )
-  )
-)
-
-# Define server logic to summarize and view selected dataset ----
-server <- function(input, output) {
-
-  # Return the requested dataset ----
-  datasetInput <- reactive({
-    switch(input$dataset,
-           "rock" = rock,
-           "pressure" = pressure,
-           "cars" = cars)
-  })
-
-  # Generate a summary of the dataset ----
-  output$summary <- renderPrint({
-    dataset <- datasetInput()
-    summary(dataset)
-  })
-
-  # Show the first "n" observations ----
-  output$view <- renderTable({
-    head(datasetInput(), n = input$obs)
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui = ui, server = server)

inst/examples/02_text/server.R

@@ -0,0 +1,26 @@
+library(shiny)
+library(datasets)
+
+# Define server logic required to summarize and view the selected
+# dataset
+function(input, output) {
+  
+  # Return the requested dataset
+  datasetInput <- reactive({
+    switch(input$dataset,
+           "rock" = rock,
+           "pressure" = pressure,
+           "cars" = cars)
+  })
+  
+  # Generate a summary of the dataset
+  output$summary <- renderPrint({
+    dataset <- datasetInput()
+    summary(dataset)
+  })
+  
+  # Show the first "n" observations
+  output$view <- renderTable({
+    head(datasetInput(), n = input$obs)
+  })
+}

inst/examples/02_text/ui.R

@@ -0,0 +1,27 @@
+library(shiny)
+
+# Define UI for dataset viewer application
+fluidPage(
+  
+  # Application title
+  titlePanel("Shiny Text"),
+  
+  # Sidebar with controls to select a dataset and specify the
+  # number of observations to view
+  sidebarLayout(
+    sidebarPanel(
+      selectInput("dataset", "Choose a dataset:", 
+                  choices = c("rock", "pressure", "cars")),
+      
+      numericInput("obs", "Number of observations to view:", 10)
+    ),
+    
+    # Show a summary of the dataset and an HTML table with the 
+	 # requested number of observations
+    mainPanel(
+      verbatimTextOutput("summary"),
+      
+      tableOutput("view")
+    )
+  )
+)

inst/examples/03_reactivity/Readme.md

@@ -1,5 +1,5 @@
-This example demonstrates a core feature of Shiny: **reactivity**. In the `server` function, a reactive called `datasetInput` is declared. 
+This example demonstrates a core feature of Shiny: **reactivity**. In `server.R`, a reactive called `datasetInput` is declared. 
 
-Notice that the reactive expression depends on the input expression `input$dataset`, and that it's used by two output expressions: `output$summary` and `output$view`. Try changing the dataset (using *Choose a dataset*) while looking at the reactive and then at the outputs; you will see first the reactive and then its dependencies flash. 
+Notice that the reactive expression depends on the input expression `input$dataset`, and that it's used by both the output expression `output$summary` and `output$view`. Try changing the dataset (using *Choose a dataset*) while looking at the reactive and then at the outputs; you will see first the reactive and then its dependencies flash. 
 
 Notice also that the reactive expression doesn't just update whenever anything changes--only the inputs it depends on will trigger an update. Change the "Caption" field and notice how only the `output$caption` expression is re-evaluated; the reactive and its dependents are left alone.

inst/examples/03_reactivity/app.R

@@ -1,102 +0,0 @@
-library(shiny)
-
-# Define UI for dataset viewer app ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("Reactivity"),
-
-  # Sidebar layout with input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar panel for inputs ----
-    sidebarPanel(
-
-      # Input: Text for providing a caption ----
-      # Note: Changes made to the caption in the textInput control
-      # are updated in the output area immediately as you type
-      textInput(inputId = "caption",
-                label = "Caption:",
-                value = "Data Summary"),
-
-      # Input: Selector for choosing dataset ----
-      selectInput(inputId = "dataset",
-                  label = "Choose a dataset:",
-                  choices = c("rock", "pressure", "cars")),
-
-      # Input: Numeric entry for number of obs to view ----
-      numericInput(inputId = "obs",
-                   label = "Number of observations to view:",
-                   value = 10)
-
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Formatted text for caption ----
-      h3(textOutput("caption", container = span)),
-
-      # Output: Verbatim text for data summary ----
-      verbatimTextOutput("summary"),
-
-      # Output: HTML table with requested number of observations ----
-      tableOutput("view")
-
-    )
-  )
-)
-
-# Define server logic to summarize and view selected dataset ----
-server <- function(input, output) {
-
-  # Return the requested dataset ----
-  # By declaring datasetInput as a reactive expression we ensure
-  # that:
-  #
-  # 1. It is only called when the inputs it depends on changes
-  # 2. The computation and result are shared by all the callers,
-  #    i.e. it only executes a single time
-  datasetInput <- reactive({
-    switch(input$dataset,
-           "rock" = rock,
-           "pressure" = pressure,
-           "cars" = cars)
-  })
-
-  # Create caption ----
-  # The output$caption is computed based on a reactive expression
-  # that returns input$caption. When the user changes the
-  # "caption" field:
-  #
-  # 1. This function is automatically called to recompute the output
-  # 2. New caption is pushed back to the browser for re-display
-  #
-  # Note that because the data-oriented reactive expressions
-  # below don't depend on input$caption, those expressions are
-  # NOT called when input$caption changes
-  output$caption <- renderText({
-    input$caption
-  })
-
-  # Generate a summary of the dataset ----
-  # The output$summary depends on the datasetInput reactive
-  # expression, so will be re-executed whenever datasetInput is
-  # invalidated, i.e. whenever the input$dataset changes
-  output$summary <- renderPrint({
-    dataset <- datasetInput()
-    summary(dataset)
-  })
-
-  # Show the first "n" observations ----
-  # The output$view depends on both the databaseInput reactive
-  # expression and input$obs, so it will be re-executed whenever
-  # input$dataset or input$obs is changed
-  output$view <- renderTable({
-    head(datasetInput(), n = input$obs)
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui, server)

inst/examples/03_reactivity/server.R

@@ -0,0 +1,53 @@
+library(shiny)
+library(datasets)
+
+# Define server logic required to summarize and view the selected
+# dataset
+function(input, output) {
+
+  # By declaring datasetInput as a reactive expression we ensure 
+  # that:
+  #
+  #  1) It is only called when the inputs it depends on changes
+  #  2) The computation and result are shared by all the callers 
+  #	  (it only executes a single time)
+  #
+  datasetInput <- reactive({
+    switch(input$dataset,
+           "rock" = rock,
+           "pressure" = pressure,
+           "cars" = cars)
+  })
+  
+  # The output$caption is computed based on a reactive expression
+  # that returns input$caption. When the user changes the
+  # "caption" field:
+  #
+  #  1) This function is automatically called to recompute the 
+  #     output 
+  #  2) The new caption is pushed back to the browser for 
+  #     re-display
+  # 
+  # Note that because the data-oriented reactive expressions
+  # below don't depend on input$caption, those expressions are
+  # NOT called when input$caption changes.
+  output$caption <- renderText({
+    input$caption
+  })
+  
+  # The output$summary depends on the datasetInput reactive
+  # expression, so will be re-executed whenever datasetInput is
+  # invalidated
+  # (i.e. whenever the input$dataset changes)
+  output$summary <- renderPrint({
+    dataset <- datasetInput()
+    summary(dataset)
+  })
+  
+  # The output$view depends on both the databaseInput reactive
+  # expression and input$obs, so will be re-executed whenever
+  # input$dataset or input$obs is changed. 
+  output$view <- renderTable({
+    head(datasetInput(), n = input$obs)
+  })
+}

inst/examples/03_reactivity/ui.R

@@ -0,0 +1,34 @@
+library(shiny)
+
+# Define UI for dataset viewer application
+fluidPage(
+  
+  # Application title
+  titlePanel("Reactivity"),
+  
+  # Sidebar with controls to provide a caption, select a dataset,
+  # and specify the number of observations to view. Note that
+  # changes made to the caption in the textInput control are
+  # updated in the output area immediately as you type
+  sidebarLayout(
+    sidebarPanel(
+      textInput("caption", "Caption:", "Data Summary"),
+      
+      selectInput("dataset", "Choose a dataset:", 
+                  choices = c("rock", "pressure", "cars")),
+      
+      numericInput("obs", "Number of observations to view:", 10)
+    ),
+    
+    
+    # Show the caption, a summary of the dataset and an HTML 
+	 # table with the requested number of observations
+    mainPanel(
+      h3(textOutput("caption", container = span)),
+      
+      verbatimTextOutput("summary"), 
+      
+      tableOutput("view")
+    )
+  )
+)

inst/examples/04_mpg/Readme.md

@@ -1,4 +1,4 @@
 This example demonstrates the following concepts:
 
-- **Global variables**: The `mpgData` variable is declared outside of the `ui` and `server` function definitions. This makes it available anywhere inside `app.R`. The code in `app.R` outside of `ui` and `server` function definitions is only run once when the app starts up, so it can't contain user input.
-- **Reactive expressions**: `formulaText` is a reactive expression. Note how it re-evaluates when the Variable field is changed, but not when the Show Outliers box is unchecked. 
+* **Global variables**: The `mpgData` variable is declared outside the `shinyServer` function. This makes it available anywhere inside `shinyServer`. The code in `server.R` outside `shinyServer` is only run once when the app starts up, so it can't contain user input.
+* **Reactive expressions**: `formulaText` is a reactive expression. Note how it re-evaluates when the Variable field is changed, but not when the Show Outliers box is ticked. 

inst/examples/04_mpg/app.R

@@ -1,75 +0,0 @@
-library(shiny)
-library(datasets)
-
-# Data pre-processing ----
-# Tweak the "am" variable to have nicer factor labels -- since this
-# doesn't rely on any user inputs, we can do this once at startup
-# and then use the value throughout the lifetime of the app
-mpgData <- mtcars
-mpgData$am <- factor(mpgData$am, labels = c("Automatic", "Manual"))
-
-
-# Define UI for miles per gallon app ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("Miles Per Gallon"),
-
-  # Sidebar layout with input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar panel for inputs ----
-    sidebarPanel(
-
-      # Input: Selector for variable to plot against mpg ----
-      selectInput("variable", "Variable:",
-                  c("Cylinders" = "cyl",
-                    "Transmission" = "am",
-                    "Gears" = "gear")),
-
-      # Input: Checkbox for whether outliers should be included ----
-      checkboxInput("outliers", "Show outliers", TRUE)
-
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Formatted text for caption ----
-      h3(textOutput("caption")),
-
-      # Output: Plot of the requested variable against mpg ----
-      plotOutput("mpgPlot")
-
-    )
-  )
-)
-
-# Define server logic to plot various variables against mpg ----
-server <- function(input, output) {
-
-  # Compute the formula text ----
-  # This is in a reactive expression since it is shared by the
-  # output$caption and output$mpgPlot functions
-  formulaText <- reactive({
-    paste("mpg ~", input$variable)
-  })
-
-  # Return the formula text for printing as a caption ----
-  output$caption <- renderText({
-    formulaText()
-  })
-
-  # Generate a plot of the requested variable against mpg ----
-  # and only exclude outliers if requested
-  output$mpgPlot <- renderPlot({
-    boxplot(as.formula(formulaText()),
-            data = mpgData,
-            outline = input$outliers,
-            col = "#75AADB", pch = 19)
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui, server)

inst/examples/04_mpg/server.R

@@ -0,0 +1,34 @@
+library(shiny)
+library(datasets)
+
+# We tweak the "am" field to have nicer factor labels. Since
+# this doesn't rely on any user inputs we can do this once at
+# startup and then use the value throughout the lifetime of the
+# application
+mpgData <- mtcars
+mpgData$am <- factor(mpgData$am, labels = c("Automatic", "Manual"))
+
+
+# Define server logic required to plot various variables against
+# mpg
+function(input, output) {
+
+  # Compute the formula text in a reactive expression since it is
+  # shared by the output$caption and output$mpgPlot functions
+  formulaText <- reactive({
+    paste("mpg ~", input$variable)
+  })
+
+  # Return the formula text for printing as a caption
+  output$caption <- renderText({
+    formulaText()
+  })
+
+  # Generate a plot of the requested variable against mpg and
+  # only include outliers if requested
+  output$mpgPlot <- renderPlot({
+    boxplot(as.formula(formulaText()),
+            data = mpgData,
+            outline = input$outliers)
+  })
+}

inst/examples/04_mpg/ui.R

@@ -0,0 +1,29 @@
+library(shiny)
+
+# Define UI for miles per gallon application
+fluidPage(
+  
+  # Application title
+  titlePanel("Miles Per Gallon"),
+  
+  # Sidebar with controls to select the variable to plot against
+  # mpg and to specify whether outliers should be included
+  sidebarLayout(
+    sidebarPanel(
+      selectInput("variable", "Variable:",
+                  c("Cylinders" = "cyl",
+                    "Transmission" = "am",
+                    "Gears" = "gear")),
+  
+      checkboxInput("outliers", "Show outliers", FALSE)
+    ),
+    
+	 # Show the caption and plot of the requested variable against
+	 # mpg
+    mainPanel(
+      h3(textOutput("caption")),
+      
+      plotOutput("mpgPlot")
+    )
+  )
+)

inst/examples/05_sliders/app.R

@@ -1,86 +0,0 @@
-library(shiny)
-
-# Define UI for slider demo app ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("Sliders"),
-
-  # Sidebar layout with input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar to demonstrate various slider options ----
-    sidebarPanel(
-
-      # Input: Simple integer interval ----
-      sliderInput("integer", "Integer:",
-                  min = 0, max = 1000,
-                  value = 500),
-
-      # Input: Decimal interval with step value ----
-      sliderInput("decimal", "Decimal:",
-                  min = 0, max = 1,
-                  value = 0.5, step = 0.1),
-
-      # Input: Specification of range within an interval ----
-      sliderInput("range", "Range:",
-                  min = 1, max = 1000,
-                  value = c(200,500)),
-
-      # Input: Custom currency format for with basic animation ----
-      sliderInput("format", "Custom Format:",
-                  min = 0, max = 10000,
-                  value = 0, step = 2500,
-                  pre = "$", sep = ",",
-                  animate = TRUE),
-
-      # Input: Animation with custom interval (in ms) ----
-      # to control speed, plus looping
-      sliderInput("animation", "Looping Animation:",
-                  min = 1, max = 2000,
-                  value = 1, step = 10,
-                  animate =
-                    animationOptions(interval = 300, loop = TRUE))
-
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Table summarizing the values entered ----
-      tableOutput("values")
-
-    )
-  )
-)
-
-# Define server logic for slider examples ----
-server <- function(input, output) {
-
-  # Reactive expression to create data frame of all input values ----
-  sliderValues <- reactive({
-
-    data.frame(
-      Name = c("Integer",
-               "Decimal",
-               "Range",
-               "Custom Format",
-               "Animation"),
-      Value = as.character(c(input$integer,
-                             input$decimal,
-                             paste(input$range, collapse = " "),
-                             input$format,
-                             input$animation)),
-      stringsAsFactors = FALSE)
-
-  })
-
-  # Show the values in an HTML table ----
-  output$values <- renderTable({
-    sliderValues()
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui, server)

inst/examples/05_sliders/server.R

@@ -0,0 +1,29 @@
+library(shiny)
+
+# Define server logic for slider examples
+function(input, output) {
+  
+  # Reactive expression to compose a data frame containing all of
+  # the values
+  sliderValues <- reactive({
+    
+    # Compose data frame
+    data.frame(
+      Name = c("Integer", 
+               "Decimal",
+               "Range",
+               "Custom Format",
+               "Animation"),
+      Value = as.character(c(input$integer, 
+                             input$decimal,
+                             paste(input$range, collapse=' '),
+                             input$format,
+                             input$animation)), 
+      stringsAsFactors=FALSE)
+  }) 
+  
+  # Show the values using an HTML table
+  output$values <- renderTable({
+    sliderValues()
+  })
+}

inst/examples/05_sliders/ui.R

@@ -0,0 +1,43 @@
+library(shiny)
+
+# Define UI for slider demo application
+fluidPage(
+
+  #  Application title
+  titlePanel("Sliders"),
+
+  # Sidebar with sliders that demonstrate various available
+  # options
+  sidebarLayout(
+    sidebarPanel(
+      # Simple integer interval
+      sliderInput("integer", "Integer:",
+                  min=0, max=1000, value=500),
+
+      # Decimal interval with step value
+      sliderInput("decimal", "Decimal:",
+                  min = 0, max = 1, value = 0.5, step= 0.1),
+
+      # Specification of range within an interval
+      sliderInput("range", "Range:",
+                  min = 1, max = 1000, value = c(200,500)),
+
+      # Provide a custom currency format for value display,
+		# with basic animation
+      sliderInput("format", "Custom Format:",
+                  min = 0, max = 10000, value = 0, step = 2500,
+                  pre = "$", sep = ",", animate=TRUE),
+
+      # Animation with custom interval (in ms) to control speed,
+		# plus looping
+      sliderInput("animation", "Looping Animation:", 1, 2000, 1,
+					  	step = 10, animate=
+							animationOptions(interval=300, loop=TRUE))
+    ),
+
+    # Show a table summarizing the values entered
+    mainPanel(
+      tableOutput("values")
+    )
+  )
+)

inst/examples/06_tabsets/Readme.md

@@ -2,7 +2,7 @@ This example demonstrates the `tabsetPanel` and `tabPanel` widgets.
 
 Notice that outputs that are not visible are not re-evaluated until they become visible. Try this: 
 
-1. Scroll to the bottom of the `server` function. You might need to use the *show with app* option so you can easily view the code and interact with the app at the same time.
+1. Scroll to the bottom of `server.R`
 2. Change the number of observations, and observe that only `output$plot` is evaluated.
 3. Click the Summary tab, and observe that `output$summary` is evaluated.
 4. Change the number of observations again, and observe that now only `output$summary` is evaluated.

inst/examples/06_tabsets/app.R

@@ -1,92 +0,0 @@
-library(shiny)
-
-# Define UI for random distribution app ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("Tabsets"),
-
-  # Sidebar layout with input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar panel for inputs ----
-    sidebarPanel(
-
-      # Input: Select the random distribution type ----
-      radioButtons("dist", "Distribution type:",
-                   c("Normal" = "norm",
-                     "Uniform" = "unif",
-                     "Log-normal" = "lnorm",
-                     "Exponential" = "exp")),
-
-      # br() element to introduce extra vertical spacing ----
-      br(),
-
-      # Input: Slider for the number of observations to generate ----
-      sliderInput("n",
-                  "Number of observations:",
-                  value = 500,
-                  min = 1,
-                  max = 1000)
-
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Tabset w/ plot, summary, and table ----
-      tabsetPanel(type = "tabs",
-                  tabPanel("Plot", plotOutput("plot")),
-                  tabPanel("Summary", verbatimTextOutput("summary")),
-                  tabPanel("Table", tableOutput("table"))
-      )
-
-    )
-  )
-)
-
-# Define server logic for random distribution app ----
-server <- function(input, output) {
-
-  # Reactive expression to generate the requested distribution ----
-  # This is called whenever the inputs change. The output functions
-  # defined below then use the value computed from this expression
-  d <- reactive({
-    dist <- switch(input$dist,
-                   norm = rnorm,
-                   unif = runif,
-                   lnorm = rlnorm,
-                   exp = rexp,
-                   rnorm)
-
-    dist(input$n)
-  })
-
-  # Generate a plot of the data ----
-  # Also uses the inputs to build the plot label. Note that the
-  # dependencies on the inputs and the data reactive expression are
-  # both tracked, and all expressions are called in the sequence
-  # implied by the dependency graph.
-  output$plot <- renderPlot({
-    dist <- input$dist
-    n <- input$n
-
-    hist(d(),
-         main = paste("r", dist, "(", n, ")", sep = ""),
-         col = "#75AADB", border = "white")
-  })
-
-  # Generate a summary of the data ----
-  output$summary <- renderPrint({
-    summary(d())
-  })
-
-  # Generate an HTML table view of the data ----
-  output$table <- renderTable({
-    d()
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui, server)

inst/examples/06_tabsets/server.R

@@ -0,0 +1,44 @@
+library(shiny)
+
+# Define server logic for random distribution application
+function(input, output) {
+  
+  # Reactive expression to generate the requested distribution.
+  # This is called whenever the inputs change. The output
+  # functions defined below then all use the value computed from
+  # this expression
+  data <- reactive({
+    dist <- switch(input$dist,
+                   norm = rnorm,
+                   unif = runif,
+                   lnorm = rlnorm,
+                   exp = rexp,
+                   rnorm)
+    
+    dist(input$n)
+  })
+  
+  # Generate a plot of the data. Also uses the inputs to build
+  # the plot label. Note that the dependencies on both the inputs
+  # and the data reactive expression are both tracked, and
+  # all expressions are called in the sequence implied by the
+  # dependency graph
+  output$plot <- renderPlot({
+    dist <- input$dist
+    n <- input$n
+    
+    hist(data(), 
+         main=paste('r', dist, '(', n, ')', sep=''))
+  })
+  
+  # Generate a summary of the data
+  output$summary <- renderPrint({
+    summary(data())
+  })
+  
+  # Generate an HTML table view of the data
+  output$table <- renderTable({
+    data.frame(x=data())
+  })
+  
+}

inst/examples/06_tabsets/ui.R

@@ -0,0 +1,38 @@
+library(shiny)
+
+# Define UI for random distribution application 
+fluidPage(
+    
+  # Application title
+  titlePanel("Tabsets"),
+  
+  # Sidebar with controls to select the random distribution type
+  # and number of observations to generate. Note the use of the
+  # br() element to introduce extra vertical spacing
+  sidebarLayout(
+    sidebarPanel(
+      radioButtons("dist", "Distribution type:",
+                   c("Normal" = "norm",
+                     "Uniform" = "unif",
+                     "Log-normal" = "lnorm",
+                     "Exponential" = "exp")),
+      br(),
+      
+      sliderInput("n", 
+                  "Number of observations:", 
+                   value = 500,
+                   min = 1, 
+                   max = 1000)
+    ),
+    
+    # Show a tabset that includes a plot, summary, and table view
+    # of the generated distribution
+    mainPanel(
+      tabsetPanel(type = "tabs", 
+        tabPanel("Plot", plotOutput("plot")), 
+        tabPanel("Summary", verbatimTextOutput("summary")), 
+        tabPanel("Table", tableOutput("table"))
+      )
+    )
+  )
+)

inst/examples/07_widgets/Readme.md

@@ -1 +1 @@
-This example demonstrates some additional widgets included in Shiny, such as `helpText` and `actionButton`. The latter is used to delay rendering output until the user explicitly requests it (a construct which also introduces two important server functions, `eventReactive` and `isolate`).
+This example demonstrates some additional widgets included in Shiny, such as `helpText` and `submitButton`. The latter is used to delay rendering output until the user explicitly requests it.

inst/examples/07_widgets/app.R

@@ -1,82 +0,0 @@
-library(shiny)
-
-# Define UI for dataset viewer app ----
-ui <- fluidPage(
-
-  # App title ----
-  titlePanel("More Widgets"),
-
-  # Sidebar layout with input and output definitions ----
-  sidebarLayout(
-
-    # Sidebar panel for inputs ----
-    sidebarPanel(
-
-      # Input: Select a dataset ----
-      selectInput("dataset", "Choose a dataset:",
-                  choices = c("rock", "pressure", "cars")),
-
-      # Input: Specify the number of observations to view ----
-      numericInput("obs", "Number of observations to view:", 10),
-
-      # Include clarifying text ----
-      helpText("Note: while the data view will show only the specified",
-               "number of observations, the summary will still be based",
-               "on the full dataset."),
-
-      # Input: actionButton() to defer the rendering of output ----
-      # until the user explicitly clicks the button (rather than
-      # doing it immediately when inputs change). This is useful if
-      # the computations required to render output are inordinately
-      # time-consuming.
-      actionButton("update", "Update View")
-
-    ),
-
-    # Main panel for displaying outputs ----
-    mainPanel(
-
-      # Output: Header + summary of distribution ----
-      h4("Summary"),
-      verbatimTextOutput("summary"),
-
-      # Output: Header + table of distribution ----
-      h4("Observations"),
-      tableOutput("view")
-    )
-
-  )
-)
-
-# Define server logic to summarize and view selected dataset ----
-server <- function(input, output) {
-
-  # Return the requested dataset ----
-  # Note that we use eventReactive() here, which depends on
-  # input$update (the action button), so that the output is only
-  # updated when the user clicks the button
-  datasetInput <- eventReactive(input$update, {
-    switch(input$dataset,
-           "rock" = rock,
-           "pressure" = pressure,
-           "cars" = cars)
-  }, ignoreNULL = FALSE)
-
-  # Generate a summary of the dataset ----
-  output$summary <- renderPrint({
-    dataset <- datasetInput()
-    summary(dataset)
-  })
-
-  # Show the first "n" observations ----
-  # The use of isolate() is necessary because we don't want the table
-  # to update whenever input$obs changes (only when the user clicks
-  # the action button)
-  output$view <- renderTable({
-    head(datasetInput(), n = isolate(input$obs))
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui, server)

inst/examples/07_widgets/server.R

@@ -0,0 +1,26 @@
+library(shiny)
+library(datasets)
+
+# Define server logic required to summarize and view the 
+# selected dataset
+function(input, output) {
+  
+  # Return the requested dataset
+  datasetInput <- reactive({
+    switch(input$dataset,
+           "rock" = rock,
+           "pressure" = pressure,
+           "cars" = cars)
+  })
+  
+  # Generate a summary of the dataset
+  output$summary <- renderPrint({
+    dataset <- datasetInput()
+    summary(dataset)
+  })
+  
+  # Show the first "n" observations
+  output$view <- renderTable({
+    head(datasetInput(), n = input$obs)
+  })
+}

inst/examples/07_widgets/ui.R

@@ -0,0 +1,43 @@
+library(shiny)
+
+# Define UI for dataset viewer application
+fluidPage(
+  
+  # Application title.
+  titlePanel("More Widgets"),
+  
+  # Sidebar with controls to select a dataset and specify the
+  # number of observations to view. The helpText function is
+  # also used to include clarifying text. Most notably, the
+  # inclusion of a submitButton defers the rendering of output
+  # until the user explicitly clicks the button (rather than
+  # doing it immediately when inputs change). This is useful if
+  # the computations required to render output are inordinately
+  # time-consuming.
+  sidebarLayout(
+    sidebarPanel(
+      selectInput("dataset", "Choose a dataset:", 
+                  choices = c("rock", "pressure", "cars")),
+      
+      numericInput("obs", "Number of observations to view:", 10),
+      
+      helpText("Note: while the data view will show only the specified",
+               "number of observations, the summary will still be based",
+               "on the full dataset."),
+      
+      submitButton("Update View")
+    ),
+    
+    # Show a summary of the dataset and an HTML table with the
+    # requested number of observations. Note the use of the h4
+    # function to provide an additional header above each output
+    # section.
+    mainPanel(
+      h4("Summary"),
+      verbatimTextOutput("summary"),
+      
+      h4("Observations"),
+      tableOutput("view")
+    )
+  )
+)

inst/examples/08_html/Readme.md

@@ -1 +1,4 @@
-Normally we use the built-in functions, such as `textInput()`, to generate the HTML UI in the R script `ui.R`. Actually **shiny** also works with a custom HTML page `www/index.html`. See [the tutorial](http://shiny.rstudio.com/tutorial/) for more details.
+Normally we use the built-in functions, such as `textInput()`, to generate
+the HTML UI in the R script `ui.R`. Actually **shiny** also works with a
+custom HTML page `www/index.html`. See [the
+tutorial](http://rstudio.github.io/shiny/tutorial/#html-ui) for more details.

inst/examples/08_html/app.R

@@ -1,47 +0,0 @@
-library(shiny)
-
-# Define server logic for random distribution app ----
-server <- function(input, output) {
-
-  # Reactive expression to generate the requested distribution ----
-  # This is called whenever the inputs change. The output functions
-  # defined below then use the value computed from this expression
-  d <- reactive({
-    dist <- switch(input$dist,
-                   norm = rnorm,
-                   unif = runif,
-                   lnorm = rlnorm,
-                   exp = rexp,
-                   rnorm)
-
-    dist(input$n)
-  })
-
-  # Generate a plot of the data ----
-  # Also uses the inputs to build the plot label. Note that the
-  # dependencies on the inputs and the data reactive expression are
-  # both tracked, and all expressions are called in the sequence
-  # implied by the dependency graph.
-  output$plot <- renderPlot({
-    dist <- input$dist
-    n <- input$n
-
-    hist(d(),
-         main = paste("r", dist, "(", n, ")", sep = ""),
-         col = "#75AADB", border = "white")
-  })
-
-  # Generate a summary of the data ----
-  output$summary <- renderPrint({
-    summary(d())
-  })
-
-  # Generate an HTML table view of the head of the data ----
-  output$table <- renderTable({
-    head(data.frame(x = d()))
-  })
-
-}
-
-# Create Shiny app ----
-shinyApp(ui = htmlTemplate("www/index.html"), server)

inst/examples/08_html/server.R

@@ -0,0 +1,42 @@
+library(shiny)
+
+# Define server logic for random distribution application
+function(input, output) {
+  
+  # Reactive expression to generate the requested distribution. This is 
+  # called whenever the inputs change. The output expressions defined 
+  # below then all used the value computed from this expression
+  data <- reactive({
+    dist <- switch(input$dist,
+                   norm = rnorm,
+                   unif = runif,
+                   lnorm = rlnorm,
+                   exp = rexp,
+                   rnorm)
+    
+    dist(input$n)
+  })
+  
+  # Generate a plot of the data. Also uses the inputs to build the 
+  # plot label. Note that the dependencies on both the inputs and
+  # the data reactive expression are both tracked, and all expressions 
+  # are called in the sequence implied by the dependency graph
+  output$plot <- renderPlot({
+    dist <- input$dist
+    n <- input$n
+    
+    hist(data(), 
+         main=paste('r', dist, '(', n, ')', sep=''))
+  })
+  
+  # Generate a summary of the data
+  output$summary <- renderPrint({
+    summary(data())
+  })
+  
+  # Generate an HTML table view of the data
+  output$table <- renderTable({
+    data.frame(x=data())
+  })
+  
+}