devtools::document() (GitHub Actions)

.eslintrc.yml

@@ -6,6 +6,7 @@ extends:
   - 'eslint:recommended'
   - 'plugin:@typescript-eslint/recommended'
   - 'plugin:jest/recommended'
+  - 'prettier/@typescript-eslint'
   - 'plugin:prettier/recommended'
   - 'plugin:jest-dom/recommended'
 globals:
@@ -44,6 +45,9 @@ rules:
   semi:
     - error
     - always
+  newline-after-var:
+    - error
+    - always
   dot-location:
     - error
     - property
@@ -60,7 +64,6 @@ rules:
     - error
     - default: array-simple
       readonly: array-simple
-
   "@typescript-eslint/consistent-indexed-object-style":
     - error
     - index-signature

.yarnrc.yml

@@ -6,5 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
-checksumBehavior: update
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

DESCRIPTION

@@ -1,19 +1,19 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.7.5.9000
+Version: 1.7.1.9002
 Authors@R: c(
-    person("Winston", "Chang", role = c("aut", "cre"), email = "winston@posit.co", comment = c(ORCID = "0000-0002-1576-2126")),
-    person("Joe", "Cheng", role = "aut", email = "joe@posit.co"),
-    person("JJ", "Allaire", role = "aut", email = "jj@posit.co"),
-    person("Carson", "Sievert", role = "aut", email = "carson@posit.co", comment = c(ORCID = "0000-0002-4958-2844")),
-    person("Barret", "Schloerke", role = "aut", email = "barret@posit.co", comment = c(ORCID = "0000-0001-9986-114X")),
-    person("Yihui", "Xie", role = "aut", email = "yihui@posit.co"),
-    person("Jeff", "Allen", role = "aut"),
-    person("Jonathan", "McPherson", role = "aut", email = "jonathan@posit.co"),
+    person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com", comment = c(ORCID = "0000-0002-1576-2126")),
+    person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
+    person("JJ", "Allaire", role = "aut", email = "jj@rstudio.com"),
+    person("Carson", "Sievert", role = "aut", email = "carson@rstudio.com", comment = c(ORCID = "0000-0002-4958-2844")),
+    person("Barret", "Schloerke", role = "aut", email = "barret@rstudio.com", comment = c(ORCID = "0000-0001-9986-114X")),
+    person("Yihui", "Xie", role = "aut", email = "yihui@rstudio.com"),
+    person("Jeff", "Allen", role = "aut", email = "jeff@rstudio.com"),
+    person("Jonathan", "McPherson", role = "aut", email = "jonathan@rstudio.com"),
     person("Alan", "Dipert", role = "aut"),
     person("Barbara", "Borges", role = "aut"),
-    person("Posit Software, PBC", role = c("cph", "fnd")),
+    person(family = "RStudio", role = "cph"),
     person(family = "jQuery Foundation", role = "cph",
     comment = "jQuery library and jQuery UI library"),
     person(family = "jQuery contributors", role = c("ctb", "cph"),
@@ -78,8 +78,8 @@ Imports:
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
-    fontawesome (>= 0.4.0),
-    htmltools (>= 0.5.4),
+    fontawesome (>= 0.2.1),
+    htmltools (>= 0.5.2),
     R6 (>= 2.0),
     sourcetools,
     later (>= 1.0.0),
@@ -87,7 +87,7 @@ Imports:
     tools,
     crayon,
     rlang (>= 0.4.10),
-    fastmap (>= 1.1.1),
+    fastmap (>= 1.1.0),
     withr,
     commonmark (>= 1.7),
     glue (>= 1.3.2),
@@ -105,14 +105,14 @@ Suggests:
     ggplot2,
     reactlog (>= 1.0.0),
     magrittr,
+    shinytest (>= 1.4.0.9003),
     yaml,
     future,
     dygraphs,
     ragg,
     showtext,
     sass
-URL: https://shiny.posit.co/,
-    https://github.com/rstudio/shiny
+URL: https://shiny.rstudio.com/
 BugReports: https://github.com/rstudio/shiny/issues
 Collate:
     'globals.R'
@@ -176,7 +176,6 @@ Collate:
     'render-cached-plot.R'
     'render-plot.R'
     'render-table.R'
-    'run-example.R'
     'run-url.R'
     'runapp.R'
     'serializers.R'
@@ -200,14 +199,11 @@ Collate:
     'version_bs_date_picker.R'
     'version_ion_range_slider.R'
     'version_jquery.R'
-    'version_jqueryui.R'
     'version_selectize.R'
     'version_strftime.R'
     'viewer.R'
-RoxygenNote: 7.2.3
+RoxygenNote: 7.1.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RdMacros: lifecycle
 Config/testthat/edition: 3
-Config/Needs/check:
-  shinytest2

NAMESPACE

@@ -43,13 +43,11 @@ S3method(bindEvent,reactiveExpr)
 S3method(bindEvent,shiny.render.function)
 S3method(format,reactiveExpr)
 S3method(format,reactiveVal)
-S3method(format,shiny_available_examples)
 S3method(names,reactivevalues)
 S3method(print,reactive)
 S3method(print,reactivevalues)
 S3method(print,shiny.appobj)
 S3method(print,shiny.render.function)
-S3method(print,shiny_available_examples)
 S3method(print,shiny_runtests)
 S3method(str,reactivevalues)
 export("conditionStackTrace<-")
@@ -67,7 +65,6 @@ export(addResourcePath)
 export(animationOptions)
 export(appendTab)
 export(as.shiny.appobj)
-export(availableExamples)
 export(basicPage)
 export(bindCache)
 export(bindEvent)

NEWS.md

@@ -1,135 +1,24 @@
-# shiny (development version)
-
-## New features and improvements
-
-* Updated `selectizeInput()`'s selectize.js dependency from v0.12.4 to v0.15.2. In addition to many bug fixes and improvements, this update also adds several new [plugin options](https://selectize.dev/docs/demos/plugins). (#3875)
-
-* Shiny's CSS styling for things like `showNotification()`, `withProgress()`, `inputPanel()`, etc., now looks better with `{bslib}`'s upcoming CSS-only dark mode. (#3882)
-
-## Bug fixes
-
-* `fileInput()` no longer has unwanted round corners applied to the `buttonLabel`. (#3879)
-
-* Fixed #3898: `wrapFunctionLabel()` no longer throws an error if the `name` is longer than 10000 bytes. (#3903)
-
-# shiny 1.7.5.1
-
-## Bug fixes
-
-* On r-devel (R > 4.3.1), `isTruthy(NULL)` now returns `FALSE` (as it does with older versions of R). (#3906)
-
-# shiny 1.7.5
-
-## Possibly breaking changes
-
-* For `reactiveValues()` objects, whenever the `$names()` or `$values()` methods are called, the keys are now returned in the order that they were inserted. (#3774)
-
-* The value provided to `options(shiny.json.digits)` is now interpreted as number of _digits after the decimal_ instead of _significant digits_. To treat the value as significant digits, wrap it in `I()` (e.g., `options(shiny.json.digits = I(4))`). This new default behavior not only helps with reducing digits in testing snapshots, but is also more consistent with `{jsonlite}`'s default behavior. (#3819)
-
-## New features and improvements
-
-* Closed #789: Dynamic UI is now rendered asynchronously, thanks in part to the newly exported `Shiny.renderDependenciesAsync()`, `Shiny.renderHtmlAsync()`, and `Shiny.renderContentAsync()`. Importantly, this means `<script>` tags are now loaded asynchronously (the old way used `XMLHttpRequest`, which is synchronous). In addition, `Shiny` now manages a queue of async tasks (exposed via `Shiny.shinyapp.taskQueue`) so that order of execution is preserved. (#3666)
-
-* Fixes #3840: `updateSliderInput()` now warns when attempting to set invalid `min`, `max`, or `value` values. Sending an invalid update message to an input no longer causes other update messages to fail. (#3843)
-
-* `sliderInput()` now has a larger target area for clicking or tapping on the slider handle or range. (#3859)
-
-* Closed #2956: Component authors can now prevent Shiny from creating an input binding on specific elements by adding the `data-shiny-no-bind-input` attribute to the element. The attribute may have any or no value; its presence will prevent binding. This feature is primarily useful for input component authors who want to use standard HTML input elements without causing Shiny to create an input binding for them. Additionally, Shiny now adds custom classes to its inputs. For example, `checkboxInput()` now has a `shiny-input-checkbox` class. These custom classes may be utilized in future updates to Shiny's input binding logic. (#3861)
-
-* `Map` objects are now initialized at load time instead of build time. This avoids potential problems that could arise from storing `fastmap` objects into the built Shiny package. (#3775)
-
-## Bug fixes
-
-* Fixed #3771: Sometimes the error `ion.rangeSlider.min.js: i.stopPropagation is not a function` would appear in the JavaScript console. (#3772)
-
-* Fixed #3833: When `width` is provided to `textAreaInput()`, we now correctly set the width of the `<textarea>` element. (#3838)
-
-
-# shiny 1.7.4.1
+shiny 1.7.1.9001
+================
 
 ## Full changelog
 
-* Closed #3849: In R-devel, a warning was raised when Shiny was loaded because `as.numeric_version()` was called with a number instead of a string. (#3850)
-
-
-# shiny 1.7.4
-
-## Full changelog
-
-### Breaking changes
-
-* Closed #3719: Output container sizes, which are available via [`session$clientData` and `getCurrentOutputInfo()`](https://shiny.rstudio.com/articles/client-data.html), no longer round to the nearest pixel (i.e., they are now more exact, possibly fractional values). (#3720)
-
-* Closed #3704, #3735, and #3740: `renderPlot()` no longer generates an error (or segfault) when it executes before the output is visible. Instead, it'll now use the graphics device's default size for it's initial size. Relatedly, `plotPNG()` now ignores `NULL` values for `width`/`height` (and uses the device's default `width`/`height` instead). (#3739)
-
-### New features and improvements
-
-* `plotOutput()`, `imageOutput()`, and `uiOutput()` gain a `fill` argument. If `TRUE` (the default for `plotOutput()`), the output container is allowed to grow/shrink to fit a fill container (created via `htmltools::bindFillRole()`) with an opinionated height. This means `plotOutput()` will grow/shrink by default [inside of `bslib::card_body_fill()`](https://rstudio.github.io/bslib/articles/cards.html#responsive-sizing), but `imageOutput()` and `uiOutput()` will have to opt-in to similar behavior with `fill = TRUE`. (#3715)
-
-* Closed #3687: Updated jQuery-UI to v1.13.2. (#3697)
-
-* Internal: Added clearer and strict TypeScript type definitions (#3644)
-
-
-# shiny 1.7.3
-
-### Bug fixes
-
-* Shiny 1.7.0 changed the `icon(lib="fontawesome")` implementation from a bundled copy of fontawesome, to the {fontawesome} package. This led to issue #3688, where icons that were previously working, were now breaking. That's because {fontawesome} 0.3.0 and earlier did not have support for icon names used in Font Awesome 5 and earlier, only the newest icon names used in Font Awesome 6. Now, {fontawesome} 0.4.0 has restored support for those older icon names, and Shiny 1.7.2.1 has updated its {fontawesome} requirement to >=0.4.0.
-
-
-# shiny 1.7.2
-
-## Full changelog
-
-### Breaking changes
-
-* Closed #3626: `renderPlot()` (and `plotPNG()`) now uses `ragg::agg_png()` by default when the [`{ragg}` package](https://github.com/r-lib/ragg) is installed. To restore the previous behavior, set `options(shiny.useragg = FALSE)`. (#3654)
-
-### New features and improvements
-
-* Closed #1545: `insertUI()` now executes `<script>` tags. (#3630)
-
-* `fileInput()` can set the `capture` attribute to facilitates user access to a device's media capture mechanism, such as a camera, or microphone, from within a file upload control ([W3C HTML Media Capture](https://www.w3.org/TR/html-media-capture/)). (Thanks to khaled-alshamaa, #3481)
-
-* Closed tidyverse/dplyr#5552: Compatibility of dplyr 1.0 (and rlang chained errors in general) with `req()`, `validate()`, and friends.
-
-* Closed tidyverse/dplyr#6154: Values from an `actionButton()` had S3 classes in the incorrect order.
-
-* Closed #3346: Default for `ref` input in `runGithub()` changed from `"master"` to `"HEAD"`. (#3564)
-
-* Closed #3619: In R 4.2, `splitLayout()` no longer raises warnings about incorrect length in an `if` statement. (Thanks to @dmenne, #3625)
-
-### Bug fixes
-
-* Closed #3250:`{rlang}`/`{tidyeval}` conditions (i.e., warnings and errors) are no longer filtered from stack traces. (#3602)
-
-* Closed #3581: Errors in throttled/debounced reactive expressions no longer cause the session to exit. (#3624)
-
-* Closed #3657: `throttle.ts` and the `Throttler` typescript objects it provides now function as intended. (Thanks gto @dvg-p4, #3659)
-
-* The auto-reload feature (`options(shiny.autoreload=TRUE)`) was not being activated by `devmode(TRUE)`, despite a console message asserting that it was. (#3620)
-
-* Closed #2297: If an error occurred in parsing a value in a bookmark query string, an error would be thrown and nothing would be restored. Now a message is displayed and that value is ignored. (Thanks to @daattali, #3385)
-
-* Restored the previous behavior of automatically guessing the `Content-Type` header for `downloadHandler` functions when no explicit `contentType` argument is supplied. (#3393)
-
-* Previously, updating an input value without a corresponding Input binding element did not trigger a JavaScript `shiny:inputchanged` event. Now, if no Input binding element is found, the `shiny:inputchanged` event is triggered on `window.document`. (#3584)
-
-* Closed #2955: Input and output bindings previously attempted to use `el['data-input-id']`, but that never worked. They now use `el.getAttribute('data-input-id')` instead. (#3538)
-
-### Minor improvements
-
-* When taking a test snapshot, the sort order of the json keys of the `input`, `output`, and `export` fields is currently sorted using the locale of the machine. This can lead to inconsistent test snapshot results. To opt-in to a consistent ordering of snapshot fields with `{shinytest}`, please set the global option `options(shiny.snapshotsortc = TRUE)`. `{shinytest2}` users do not need to set this value. (#3515)
-
-* Closed rstudio/shinytest2#222: When restoring a context (i.e., bookmarking) from a URL, Shiny now better handles a trailing `=` after `_inputs_` and `_values_`. (#3648)
+### Minor new features and improvements
 
 * Shiny's internal HTML dependencies are now mounted dynamically instead of statically. (#3537)
 
 * HTML dependencies that are sent to dynamic UI now have better type checking, and no longer require a `dep.src.href` field. (#3537)
 
+### Bug fixes
 
-# shiny 1.7.1
+* Closed tidyverse/dplyr#5552: Compatibility of dplyr 1.0 (and rlang chained errors in general) with `req()`, `validate()`, and friends.
+
+* Closed #2955: Input and output bindings previously attempted to use `el['data-input-id']`, but that never worked. They now use `el.getAttribute('data-input-id')` instead. (#3538)
+
+* Closed tidyverse/dplyr#6154: Values from an `actionButton()` had S3 classes in the incorrect order.
+
+shiny 1.7.1
+===========
 
 ## Bug Fixes
 
@@ -138,7 +27,8 @@
 * Re-arranged conditions for testthat 1.0.0 compatibility. (#3512)
 
 
-# shiny 1.7.0
+shiny 1.7.0
+===========
 
 ## Full changelog
 
@@ -195,13 +85,14 @@
 
 * Updated to jQuery 3.6.0. (#3311)
 
-# shiny 1.6.0
+shiny 1.6.0
+===========
 
 This release focuses on improvements in three main areas:
 
 1. Better theming (and Bootstrap 4) support:
   * The `theme` argument of `fluidPage()`, `navbarPage()`, and `bootstrapPage()` all now understand `bslib::bs_theme()` objects, which can be used to opt-into Bootstrap 4, use any Bootswatch theme, and/or implement custom themes without writing any CSS.
-  * The `session` object now includes `$setCurrentTheme()` and `$getCurrentTheme()` methods to dynamically update (or obtain) the page's `theme` after initial load, which is useful for things such as [adding a dark mode switch to an app](https://rstudio.github.io/bslib/articles/theming.html#dynamic) or some other "real-time" theming tool like `bslib::bs_themer()`.
+  * The `session` object now includes `$setCurrentTheme()` and `$getCurrentTheme()` methods to dynamically update (or obtain) the page's `theme` after initial load, which is useful for things such as [adding a dark mode switch to an app](https://rstudio.github.io/bslib/articles/bslib.html#dynamic) or some other "real-time" theming tool like `bslib::bs_themer()`.
   * For more details, see [`{bslib}`'s website](https://rstudio.github.io/bslib/)
 
 2. Caching of `reactive()` and `render*()` (e.g. `renderText()`, `renderTable()`, etc) expressions.
@@ -304,7 +195,8 @@ This release focuses on improvements in three main areas:
 * Removed es5-shim library, which was internally used within `selectInput()` for ECMAScript 5 compatibility. (#2993)
 
 
-# shiny 1.5.0
+shiny 1.5.0
+===========
 
 ## Full changelog
 
@@ -357,17 +249,20 @@ This release focuses on improvements in three main areas:
 * Updated from Font-Awesome 5.3.1 to 5.13.0, which includes icons related to COVID-19. For upgrade notes, see https://github.com/FortAwesome/Font-Awesome/blob/master/UPGRADING.md. (#2891)
 
 
-# shiny 1.4.0.2
+shiny 1.4.0.2
+===========
 
 Minor patch release: fixed some timing-dependent tests failed intermittently on CRAN build machines.
 
 
-# shiny 1.4.0.1
+shiny 1.4.0.1
+===========
 
 Minor patch release to account for changes to the grid package that will be upcoming in the R 4.0 release (#2776).
 
 
-# shiny 1.4.0
+shiny 1.4.0
+===========
 
 ## Full changelog
 
@@ -430,7 +325,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed #2329, #1817: These bugs were reported as fixed in Shiny 1.3.0 but were not actually fixed because some JavaScript changes were accidentally not included in the release. The fix resolves issues that occur when `withProgressBar()` or bookmarking are combined with the [networkD3](https://christophergandrud.github.io/networkD3/) package's Sankey plot.
 
 
-# shiny 1.3.2
+shiny 1.3.2
+===========
 
 ### Bug fixes
 
@@ -439,7 +335,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed #2280: Shiny applications that used a www/index.html file did not serve up the index file. (#2382)
 
 
-# shiny 1.3.1
+shiny 1.3.1
+===========
 
 ## Full changelog
 
@@ -448,7 +345,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed a performance issue introduced in v1.3.0 when using large nested lists within Shiny. (#2377)
 
 
-# shiny 1.3.0
+shiny 1.3.0
+===========
 
 ## Full changelog
 
@@ -479,7 +377,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed #2247: `renderCachedPlot` now supports using promises for either `expr` or `cacheKeyExpr`. (Shiny v1.2.0 supported async `expr`, but only if `cacheKeyExpr` was async as well; now you can use any combination of sync/async for `expr` and `cacheKeyExpr`.) #2261
 
 
-# shiny 1.2.0
+shiny 1.2.0
+===========
 
 This release features plot caching, an important new tool for improving performance and scalability. Using `renderCachedPlot` in place of `renderPlot` can greatly improve responsiveness for apps that show the same plot many times (for example, a dashboard or report where all users view the same data). Shiny gives you a fair amount of control in where the cache is stored and how cached plots are invalidated, so be sure to read [this article](https://shiny.rstudio.com/articles/plot-caching.html) to get the most out of this feature.
 
@@ -544,7 +443,8 @@ This release features plot caching, an important new tool for improving performa
 * Addressed #1864 by changing `optgroup` documentation to use `list` instead of `c`. (#2084)
 
 
-# shiny 1.1.0
+shiny 1.1.0
+===========
 
 This is a significant release for Shiny, with a major new feature that was nearly a year in the making: support for asynchronous operations! Until now, R's single-threaded nature meant that performing long-running calculations or tasks from Shiny would bring your app to a halt for other users of that process. This release of Shiny deeply integrates the [promises](https://rstudio.github.io/promises/) package to allow you to execute some tasks asynchronously, including as part of reactive expressions and outputs. See the [promises](https://rstudio.github.io/promises/) documentation to learn more.
 
@@ -580,7 +480,7 @@ This is a significant release for Shiny, with a major new feature that was nearl
 
 * Removed the (ridiculously outdated) "experimental feature" tag from the reference documentation for `renderUI`. (#2036)
 
-* Addressed #1907: the `ignoreInit` argument was first added only to `observeEvent`. Later, we also added it to `eventReactive`, but forgot to update the documentation. Now done, thanks @flo12392! (#2036)
+* Addressed #1907: the `ignoreInit` argument was first added only to `observeEvent`. Later, we also added it to `eventReactive`, but forgot to update the documentation. Now done, thanks [@flo12392](https://github.com/flo12392)! (#2036)
 
 ### Bug fixes
 
@@ -594,7 +494,7 @@ This is a significant release for Shiny, with a major new feature that was nearl
 
 * Fixed #1600: URL-encoded bookmarking did not work with sliders that had dates or date-times. (#1961)
 
-* Fixed #1962: [File dragging and dropping](https://posit.co/blog/shiny-1-0-4/) broke in the presence of jQuery version 3.0 as introduced by the [rhandsontable](https://jrowen.github.io/rhandsontable/) [htmlwidget](https://www.htmlwidgets.org/). (#2005)
+* Fixed #1962: [File dragging and dropping](https://blog.rstudio.com/2017/08/15/shiny-1-0-4/) broke in the presence of jQuery version 3.0 as introduced by the [rhandsontable](https://jrowen.github.io/rhandsontable/) [htmlwidget](https://www.htmlwidgets.org/). (#2005)
 
 * Improved the error handling inside the `addResourcePath()` function, to give end users more informative error messages when the `directoryPath` argument cannot be normalized. This is especially useful for `runtime: shiny_prerendered` Rmd documents, like `learnr` tutorials. (#1968)
 
@@ -617,7 +517,8 @@ This is a significant release for Shiny, with a major new feature that was nearl
 In some rare cases, interrupting an application (by pressing Ctrl-C or Esc) may result in the message `Error in execCallbacks(timeoutSecs) : c++ exception (unknown reason)`. Although this message sounds alarming, it is harmless, and will go away in a future version of the later package (more information [here](https://github.com/r-lib/later/issues/55)).
 
 
-# shiny 1.0.5
+shiny 1.0.5
+===========
 
 ## Full changelog
 
@@ -630,7 +531,8 @@ In some rare cases, interrupting an application (by pressing Ctrl-C or Esc) may
 * Fixed #1824: HTTP HEAD requests on static files caused the application to stop. (#1825)
 
 
-# shiny 1.0.4
+shiny 1.0.4
+===========
 
 There are three headlining features in this release of Shiny. It is now possible to add and remove tabs from a `tabPanel`; there is a new function, `onStop()`, which registers callbacks that execute when an application exits; and `fileInput`s now can have files dragged and dropped on them. In addition to these features, this release has a number of minor features and bug fixes. See the full changelog below for more details.
 
@@ -691,7 +593,8 @@ There are three headlining features in this release of Shiny. It is now possible
 * Fixed #1474: A `browser()` call in an observer could cause an error in the RStudio IDE on Windows. (#1802)
 
 
-# shiny 1.0.3
+shiny 1.0.3
+================
 
 This is a hotfix release of Shiny. With previous versions of Shiny, when running an application on the newly-released version of R, 3.4.0, it would print a message: `Warning in body(fun) : argument is not a function`. This has no effect on the application, but because the message could be alarming to users, we are releasing a new version of Shiny that fixes this issue.
 
@@ -704,7 +607,8 @@ This is a hotfix release of Shiny. With previous versions of Shiny, when running
 * Fixed #1676: On R 3.4.0, running a Shiny application gave a warning: `Warning in body(fun) : argument is not a function`. (#1677)
 
 
-# shiny 1.0.2
+shiny 1.0.2
+================
 
 This is a hotfix release of Shiny. The primary reason for this release is because the web host for MathJax JavaScript library is scheduled to be shut down in the next few weeks. After it is shut down, Shiny applications that use MathJax will no longer be able to load the MathJax library if they are run with Shiny 1.0.1 and below. (If you don't know whether your application uses MathJax, it probably does not.) For more information about why the MathJax CDN is shutting down, see https://www.mathjax.org/cdn-shutting-down/.
 
@@ -723,7 +627,8 @@ This is a hotfix release of Shiny. The primary reason for this release is becaus
 * Fixed #1653: wrong code example in documentation. (#1658)
 
 
-# shiny 1.0.1
+shiny 1.0.1
+================
 
 This is a maintenance release of Shiny, mostly aimed at fixing bugs and introducing minor features. The most notable additions in this version of Shiny are the introduction of the `reactiveVal()` function (it's like `reactiveValues()`, but it only stores a single value), and that the choices of `radioButtons()` and `checkboxGroupInput()` can now contain HTML content instead of just plain text.
 
@@ -793,7 +698,8 @@ in shiny apps. For more info, see the documentation (`?updateQueryString` and `?
 * Closed #1500: Updated ion.rangeSlider to 2.1.6. (#1540)
 
 
-# shiny 1.0.0
+shiny 1.0.0
+===========
 
 Shiny has reached a milestone: version 1.0.0! In the last year, we've added two major features that we considered essential for a 1.0.0 release: bookmarking, and support for testing Shiny applications. As usual, this version of Shiny also includes many minor features and bug fixes.
 
@@ -858,7 +764,8 @@ Now there's an official way to slow down reactive values and expressions that in
 * Updated to Font Awesome 4.7.0.
 
 
-# shiny 0.14.2
+shiny 0.14.2
+============
 
 This is a maintenance release of Shiny, with some bug fixes and minor new features.
 
@@ -886,7 +793,8 @@ This is a maintenance release of Shiny, with some bug fixes and minor new featur
 
 * Fixed a bug where, in versions of R before 3.2, Shiny applications could crash due to a bug in R's implementation of `list2env()`. (#1446)
 
-# shiny 0.14.1
+shiny 0.14.1
+============
 
 This is a maintenance release of Shiny, with some bug fixes and minor new features.
 
@@ -916,7 +824,8 @@ This is a maintenance release of Shiny, with some bug fixes and minor new featur
 * Updated to jQuery UI 1.12.1. Previously, Shiny included a build of 1.11.4 which was missing the datepicker component due to a conflict with the bootstrap-datepicker used by Shiny's `dateInput()` and `dateRangeInput()`. (#1374)
 
 
-# shiny 0.14
+shiny 0.14
+==========
 
 A new Shiny release is upon us! There are many new exciting features, bug fixes, and library updates. We'll just highlight the most important changes here, but you can browse through the full changelog below for details. This will likely be the last release before shiny 1.0, so get out your party hats!
 
@@ -1115,12 +1024,14 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * Updated to jQuery 1.12.4.
 
 
-# shiny 0.13.2
+shiny 0.13.2
+============
 
 * Updated documentation for `htmlTemplate`.
 
 
-# shiny 0.13.1
+shiny 0.13.1
+============
 
 * `flexCol` did not work on RStudio for Windows or Linux.
 
@@ -1129,7 +1040,8 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * BREAKING CHANGE: The long-deprecated ability to pass functions (rather than expressions) to reactive() and observe() has finally been removed.
 
 
-# shiny 0.13.0
+shiny 0.13.0
+============
 
 * Fixed #962: plot interactions did not work with the development version of ggplot2 (after ggplot2 1.0.1).
 
@@ -1180,7 +1092,8 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * Added support for the new htmltools 0.3 feature `htmlTemplate`. It's now possible to use regular HTML markup to design your UI, but still use R expressions to define inputs, outputs, and HTML widgets.
 
 
-# shiny 0.12.2
+shiny 0.12.2
+============
 
 * GitHub changed URLs for gists from .tar.gz to .zip, so `runGist` was updated to work with the new URLs.
 
@@ -1203,14 +1116,16 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * Shiny now correctly handles HTTP HEAD requests. (#876)
 
 
-# shiny 0.12.1
+shiny 0.12.1
+============
 
 * Fixed an issue where unbindAll() causes subsequent bindAll() to be ignored for previously bound outputs. (#856)
 
 * Undeprecate `dataTableOutput` and `renderDataTable`, which had been deprecated in favor of the new DT package. The DT package is a bit too new and has a slightly different API, we were too hasty in deprecating the existing Shiny functions.
 
 
-# shiny 0.12.0
+shiny 0.12.0
+============
 
 In addition to the changes listed below (in the *Full Changelog* section), there is an infrastructure change that could affect existing Shiny apps.
 
@@ -1266,7 +1181,8 @@ Shiny 0.12.0 deprecated Shiny's dataTableOutput and renderDataTable functions an
 * renderDataTable() and dataTableOutput() have been deprecated in shiny and will be removed in future versions of shiny. Please use the DT package instead: http://rstudio.github.io/DT/ (#807)
 
 
-# shiny 0.11.1
+shiny 0.11.1
+============
 
 * Major client-side performance improvements for pages that have many conditionalPanels, tabPanels, and plotOutputs. (#693, #717, #723)
 
@@ -1293,7 +1209,8 @@ Shiny 0.12.0 deprecated Shiny's dataTableOutput and renderDataTable functions an
 * downloadHandler content callback functions are now invoked with a temp file name that has the same extension as the final filename that will be used by the download. This is to deal with the fact that some file writing functions in R will auto-append the extension for their file type (pdf, zip).
 
 
-# shiny 0.11
+shiny 0.11
+==========
 
 Shiny 0.11 switches away from the Bootstrap 2 web framework to the next version, Bootstrap 3. This is in part because Bootstrap 2 is no longer being developed, and in part because it allows us to tap into the ecosystem of Bootstrap 3 themes.
 
@@ -1371,17 +1288,20 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Password input fields can now be used, with `passwordInput()`. (#672)
 
 
-# shiny 0.10.2.2
+shiny 0.10.2.2
+==============
 
 * Remove use of `rstudio::viewer` in a code example, for R CMD check.
 
 
-# shiny 0.10.2.1
+shiny 0.10.2.1
+==============
 
 * Changed some examples to use \donttest instead of \dontrun.
 
 
-# shiny 0.10.2
+shiny 0.10.2
+============
 
 * The minimal version of R required for the shiny package is 3.0.0 now.
 
@@ -1414,7 +1334,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Added `position` parameter to `navbarPage`.
 
 
-# shiny 0.10.1
+shiny 0.10.1
+============
 
 * Added Unicode support for Windows. Shiny apps running on Windows must use the UTF-8 encoding for ui.R and server.R (also the optional global.R) if they contain non-ASCII characters. See this article for details and examples: http://shiny.rstudio.com/gallery/unicode-characters.html (#516)
 
@@ -1427,7 +1348,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Added support for option groups in the select/selectize inputs. When the `choices` argument for `selectInput()`/`selectizeInput()` is a list of sub-lists and any sub-list is of length greater than 1, the HTML tag `<optgroup>` will be used. See an example at http://shiny.rstudio.com/gallery/option-groups-for-selectize-input.html (#542)
 
 
-# shiny 0.10.0
+shiny 0.10.0
+============
 
 * BREAKING CHANGE: By default, observers now terminate themselves if they were created during a session and that session ends. See ?domains for more details.
 
@@ -1464,12 +1386,14 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * `runGitHub()` can also take a value of the form "username/repo" in its first argument, e.g. both runGitHub("shiny_example", "rstudio") and runGitHub("rstudio/shiny_example") are valid ways to run the GitHub repo.
 
 
-# shiny 0.9.1
+shiny 0.9.1
+===========
 
 * Fixed warning 'Error in Context$new : could not find function "loadMethod"' that was happening to dependent packages on "R CMD check".
 
 
-# shiny 0.9.0
+shiny 0.9.0
+===========
 
 * BREAKING CHANGE: Added a `host` parameter to runApp() and runExample(), which defaults to the shiny.host option if it is non-NULL, or "127.0.0.1" otherwise. This means that by default, Shiny applications can only be accessed on the same machine from which they are served. To allow other clients to connect, as in previous versions of Shiny, use "0.0.0.0" (or the IP address of one of your network interfaces, if you care to be explicit about it).
 
@@ -1542,7 +1466,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Dots are now legal characters for inputId/outputId. (Thanks, Kevin Lindquist. #358)
 
 
-# shiny 0.8.0
+shiny 0.8.0
+===========
 
 * Debug hooks are registered on all user-provided functions and (reactive) expressions (e.g., in renderPlot()), which makes it possible to set breakpoints in these functions using the latest version of the RStudio IDE, and the RStudio visual debugging tools can be used to debug Shiny apps. Internally, the registration is done via installExprFunction(), which is a new function introduced in this version to replace exprToFunction() so that the registration can be automatically done.
 
@@ -1561,7 +1486,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * The minimal required version for the httpuv package was increased to 1.2 (on CRAN now).
 
 
-# shiny 0.7.0
+shiny 0.7.0
+===========
 
 * Stopped sending websocket subprotocol. This fixes a compatibility issue with Google Chrome 30.
 
@@ -1590,7 +1516,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add shiny.sharedSecret option, to require the HTTP header Shiny-Shared-Secret to be set to the given value.
 
 
-# shiny 0.6.0
+shiny 0.6.0
+===========
 
 * `tabsetPanel()` can be directed to start with a specific tab selected.
 
@@ -1621,7 +1548,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Shiny apps can be run without a server.r and ui.r file.
 
 
-# shiny 0.5.0
+shiny 0.5.0
+===========
 
 * Switch from websockets package for handling websocket connections to httpuv.
 
@@ -1638,14 +1566,16 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix bug #55, where `renderTable()` would throw error with an empty data frame.
 
 
-# shiny 0.4.1
+shiny 0.4.1
+===========
 
 * Fix bug where width and height weren't passed along properly from `reactivePlot` to `renderPlot`.
 
 * Fix bug where infinite recursion would happen when `reactivePlot` was passed a function for width or height.
 
 
-# shiny 0.4.0
+shiny 0.4.0
+===========
 
 * Added suspend/resume capability to observers.
 
@@ -1660,7 +1590,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fixed a bug where empty values in a numericInput were sent to the R process as 0. They are now sent as NA.
 
 
-# shiny 0.3.1
+shiny 0.3.1
+===========
 
 * Fix issue #91: bug where downloading files did not work.
 
@@ -1669,7 +1600,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Reactive functions now preserve the visible/invisible state of their returned values.
 
 
-# shiny 0.3.0
+shiny 0.3.0
+===========
 
 * Reactive functions are now evaluated lazily.
 
@@ -1694,44 +1626,52 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix issue #64, where pressing Enter in a textbox would cause a form to submit.
 
 
-# shiny 0.2.4
+shiny 0.2.4
+===========
 
 * `runGist` has been updated to use the new download URLs from https://gist.github.com.
 
 * Shiny now uses `CairoPNG()` for output, when the Cairo package is available. This provides better-looking output on Linux and Windows.
 
 
-# shiny 0.2.3
+shiny 0.2.3
+===========
 
 * Ignore request variables for routing purposes
 
 
-# shiny 0.2.2
+shiny 0.2.2
+===========
 
 * Fix CRAN warning (assigning to global environment)
 
 
-# shiny 0.2.1
+shiny 0.2.1
+===========
 
 * [BREAKING] Modify API of `downloadHandler`: The `content` function now takes a file path, not writable connection, as an argument. This makes it much easier to work with APIs that only write to file paths, not connections.
 
 
-# shiny 0.2.0
+shiny 0.2.0
+===========
 
 * Fix subtle name resolution bug--the usual symptom being S4 methods not being invoked correctly when called from inside of ui.R or server.R
 
 
-# shiny 0.1.14
+shiny 0.1.14
+===========
 
 * Fix slider animator, which broke in 0.1.10
 
 
-# shiny 0.1.13
+shiny 0.1.13
+===========
 
 * Fix temp file leak in reactivePlot
 
 
-# shiny 0.1.12
+shiny 0.1.12
+===========
 
 * Fix problems with runGist on Windows
 
@@ -1740,7 +1680,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add CSS hooks for app-wide busy indicators
 
 
-# shiny 0.1.11
+shiny 0.1.11
+===========
 
 * Fix input binding with IE8 on Shiny Server
 
@@ -1749,7 +1690,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Allow dynamic sizing of reactivePlot (i.e. using a function instead of a fixed value)
 
 
-# shiny 0.1.10
+shiny 0.1.10
+===========
 
 * Support more MIME types when serving out of www
 
@@ -1762,7 +1704,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix plot rendering with IE8 on Shiny Server
 
 
-# shiny 0.1.9
+shiny 0.1.9
+===========
 
 * Much less flicker when updating plots
 
@@ -1771,7 +1714,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add `includeText`, `includeHTML`, and `includeMarkdown` functions for putting text, HTML, and Markdown content from external files in the application's UI.
 
 
-# shiny 0.1.8
+shiny 0.1.8
+===========
 
 * Add `runGist` function for conveniently running a Shiny app that is published on gist.github.com.
 
@@ -1784,7 +1728,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add `bootstrapPage` function for creating new Bootstrap based layouts from scratch.
 
 
-# shiny 0.1.7
+shiny 0.1.7
+===========
 
 * Fix issue #26: Shiny.OutputBindings not correctly exported.
 
@@ -1793,7 +1738,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Transcode JSON into UTF-8 (prevents non-ASCII reactivePrint values from causing errors on Windows).
 
 
-# shiny 0.1.6
+shiny 0.1.6
+===========
 
 * Import package dependencies, instead of attaching them (with the exception of websockets, which doesn't currently work unless attached).
 
@@ -1802,7 +1748,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * bindAll was not correctly sending initial values to the server; fixed.
 
 
-# shiny 0.1.5
+shiny 0.1.5
+===========
 
 * BREAKING CHANGE: JS APIs Shiny.bindInput and Shiny.bindOutput removed and replaced with Shiny.bindAll; Shiny.unbindInput and Shiny.unbindOutput removed and replaced with Shiny.unbindAll.
 
@@ -1817,7 +1764,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * htmlOutput (CSS class `shiny-html-output`) can contain inputs and outputs.
 
 
-# shiny 0.1.4
+shiny 0.1.4
+===========
 
 * Allow Bootstrap tabsets to act as reactive inputs; their value indicates which tab is active
 
@@ -1830,7 +1778,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add Shiny.bindInputs(scope), .unbindInputs(scope), .bindOutputs(scope), and .unbindOutputs(scope) JS API calls to allow dynamic binding/unbinding of HTML elements
 
 
-# shiny 0.1.3
+shiny 0.1.3
+===========
 
 * Introduce Shiny.inputBindings.register JS API and InputBinding class, for creating custom input controls
 
@@ -1843,6 +1792,7 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix issue #10: Plots in tabsets not rendered
 
 
-# shiny 0.1.2
+shiny 0.1.2
+===========
 
 * Initial private beta release!

R/app_template.R

@@ -10,7 +10,8 @@
 #' 2: app.R              : Main application file
 #' 3: R/example.R        : Helper file with R code
 #' 4: R/example-module.R : Example module
-#' 5: tests/testthat/    : Tests using the testthat and shinytest2 package
+#' 5: tests/shinytest/   : Tests using the shinytest package
+#' 6: tests/testthat/    : Tests using the testthat package
 #' ```
 #'
 #' If option 1 is selected, the full example application including the
@@ -23,12 +24,13 @@
 #' |   |- example-module.R
 #' |   `- example.R
 #' `- tests
+#'     |- shinytest.R
+#'     |- shinytest
+#'     |   `- mytest.R
 #'     |- testthat.R
 #'     `- testthat
-#'         |- setup-shinytest2.R
 #'         |- test-examplemodule.R
 #'         |- test-server.R
-#'         |- test-shinytest2.R
 #'         `- test-sort.R
 #' ```
 #'
@@ -43,21 +45,20 @@
 #' * `tests/` contains various tests for the application. You may
 #'   choose to use or remove any of them. They can be executed by the
 #'   [runTests()] function.
+#' * `tests/shinytest.R` is a test runner for test files in the
+#'   `tests/shinytest/` directory.
+#' * `tests/shinytest/mytest.R` is a test that uses the
+#'   [shinytest](https://rstudio.github.io/shinytest/) package to do
+#'   snapshot-based testing.
 #' * `tests/testthat.R` is a test runner for test files in the
-#'   `tests/testthat/` directory using the
-#'   [shinytest2](https://rstudio.github.io/shinytest2/reference/test_app.html)
-#'   package.
-#' * `tests/testthat/setup-shinytest2.R` is setup file to source your `./R` folder into the testing environment.
+#'   `tests/testthat/` directory using the [testthat](https://testthat.r-lib.org/) package.
 #' * `tests/testthat/test-examplemodule.R` is a test for an application's module server function.
 #' * `tests/testthat/test-server.R` is a test for the application's server code
-#' * `tests/testthat/test-shinytest2.R` is a test that uses the
-#'   [shinytest2](https://rstudio.github.io/shinytest2/) package to do
-#'   snapshot-based testing.
 #' * `tests/testthat/test-sort.R` is a test for a supporting function in the `R/` directory.
 #'
 #' @param path Path to create new shiny application template.
 #' @param examples Either one of "default", "ask", "all", or any combination of
-#'   "app", "rdir", "module", and "tests". In an
+#'   "app", "rdir", "module", "shinytest", and "testthat". In an
 #'   interactive session, "default" falls back to "ask"; in a non-interactive
 #'   session, "default" falls back to "all". With "ask", this function will
 #'   prompt the user to select which template items will be added to the new app
@@ -78,19 +79,15 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
   # =======================================================
 
   choices <- c(
-    app    = "app.R              : Main application file",
-    rdir   = "R/example.R        : Helper file with R code",
-    module = "R/example-module.R : Example module",
-    tests  = "tests/testthat/    : Tests using {testthat} and {shinytest2}"
+    app       = "app.R              : Main application file",
+    rdir      = "R/example.R        : Helper file with R code",
+    module    = "R/example-module.R : Example module",
+    shinytest = "tests/shinytest/   : Tests using the shinytest package",
+    testthat  = "tests/testthat/    : Tests using the testthat package"
   )
 
-  # Support legacy value
-  examples[examples == "shinytest"] <- "tests"
-  examples[examples == "testthat"] <- "tests"
-  examples <- unique(examples)
-
   if (identical(examples, "default")) {
-    if (rlang::is_interactive()) {
+    if (interactive()) {
       examples <- "ask"
     } else {
       examples <- "all"
@@ -127,8 +124,18 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
     return(invisible())
   }
 
-  if ("tests" %in% examples) {
-    rlang::check_installed("shinytest2", "for {testthat} tests to work as expected", version = "0.2.0")
+  if ("shinytest" %in% examples) {
+    if (!is_installed("shinytest", "1.4.0"))
+    {
+      message(
+        "The tests/shinytest directory needs shinytest 1.4.0 or later to work properly."
+      )
+      if (is_installed("shinytest")) {
+        message("You currently have shinytest ",
+                get_package_version("shinytest"), " installed.")
+      }
+
+    }
   }
 
   # =======================================================
@@ -201,13 +208,16 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
   }
 
   # Copy the files for a tests/ subdirectory
-  copy_test_dir <- function() {
+  copy_test_dir <- function(name) {
     files <- dir(template_path("tests"), recursive = TRUE)
+    # Note: This is not the same as using dir(pattern = "^shinytest"), since
+    # that will not match files inside of shinytest/.
+    files <- files[grepl(paste0("^", name), files)]
 
     # Filter out files that are not module files in the R directory.
     if (! "rdir" %in% examples) {
       # find all files in the testthat folder that are not module or server files
-      is_r_folder_file <- !grepl("module|server|shinytest2|testthat", basename(files))
+      is_r_folder_file <- (!grepl("module|server", basename(files))) & (dirname(files) == "testthat")
       files <- files[!is_r_folder_file]
     }
 
@@ -272,10 +282,12 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
     copy_file(file.path("R", module_files))
   }
 
-  # tests/testthat dir
-  if ("tests" %in% examples) {
-    copy_test_dir()
+  # tests/ dir
+  if ("shinytest" %in% examples) {
+    copy_test_dir("shinytest")
+  }
+  if ("testthat" %in% examples) {
+    copy_test_dir("testthat")
   }
-
   invisible()
 }

R/bind-cache.R

@@ -159,8 +159,8 @@ utils::globalVariables(".GenericCallEnv", add = TRUE)
 #'   ```
 #'
 #'   To use different settings for a session-scoped cache, you can set
-#'   `session$cache` at the top of your server function. By default, it will
-#'   create a 200 MB memory cache for each session, but you can replace it with
+#'   `self$cache` at the top of your server function. By default, it will create
+#'   a 200 MB memory cache for each session, but you can replace it with
 #'   something different. To use the session-scoped cache, you must also call
 #'   `bindCache()` with `cache="session"`. This will create a 100 MB cache for
 #'   the session:

R/bookmark-state.R

@@ -321,38 +321,34 @@ RestoreContext <- R6Class("RestoreContext",
       if (substr(queryString, 1, 1) == '?')
         queryString <- substr(queryString, 2, nchar(queryString))
 
-      # The "=" after "_inputs_" is optional. Shiny doesn't generate URLs with
-      # "=", but httr always adds "=".
-      inputs_reg <- "(^|&)_inputs_=?(&|$)"
-      values_reg <- "(^|&)_values_=?(&|$)"
 
       # Error if multiple '_inputs_' or '_values_'. This is needed because
       # strsplit won't add an entry if the search pattern is at the end of a
       # string.
-      if (length(gregexpr(inputs_reg, queryString)[[1]]) > 1)
+      if (length(gregexpr("(^|&)_inputs_(&|$)", queryString)[[1]]) > 1)
         stop("Invalid state string: more than one '_inputs_' found")
-      if (length(gregexpr(values_reg, queryString)[[1]]) > 1)
+      if (length(gregexpr("(^|&)_values_(&|$)", queryString)[[1]]) > 1)
         stop("Invalid state string: more than one '_values_' found")
 
       # Look for _inputs_ and store following content in inputStr
-      splitStr <- strsplit(queryString, inputs_reg)[[1]]
+      splitStr <- strsplit(queryString, "(^|&)_inputs_(&|$)")[[1]]
       if (length(splitStr) == 2) {
         inputStr <- splitStr[2]
         # Remove any _values_ (and content after _values_) that may come after
         # _inputs_
-        inputStr <- strsplit(inputStr, values_reg)[[1]][1]
+        inputStr <- strsplit(inputStr, "(^|&)_values_(&|$)")[[1]][1]
 
       } else {
         inputStr <- ""
       }
 
       # Look for _values_ and store following content in valueStr
-      splitStr <- strsplit(queryString, values_reg)[[1]]
+      splitStr <- strsplit(queryString, "(^|&)_values_(&|$)")[[1]]
       if (length(splitStr) == 2) {
         valueStr <- splitStr[2]
         # Remove any _inputs_ (and content after _inputs_) that may come after
         # _values_
-        valueStr <- strsplit(valueStr, inputs_reg)[[1]][1]
+        valueStr <- strsplit(valueStr, "(^|&)_inputs_(&|$)")[[1]][1]
 
       } else {
         valueStr <- ""
@@ -363,20 +359,16 @@ RestoreContext <- R6Class("RestoreContext",
       values <- parseQueryString(valueStr, nested = TRUE)
 
       valuesFromJSON <- function(vals) {
-        varsUnparsed <- c()
-        valsParsed <- mapply(names(vals), vals, SIMPLIFY = FALSE,
+        mapply(names(vals), vals, SIMPLIFY = FALSE,
           FUN = function(name, value) {
             tryCatch(
               safeFromJSON(value),
               error = function(e) {
-                varsUnparsed <<- c(varsUnparsed, name)
-                warning("Failed to parse URL parameter \"", name, "\"")
+                stop("Failed to parse URL parameter \"", name, "\"")
               }
             )
           }
         )
-        valsParsed[varsUnparsed] <- NULL
-        valsParsed
       }
 
       inputs <- valuesFromJSON(inputs)
@@ -452,10 +444,8 @@ RestoreInputSet <- R6Class("RestoreInputSet",
   )
 )
 
+# This is a fastmap::faststack(); value is assigned in .onLoad().
 restoreCtxStack <- NULL
-on_load({
-    restoreCtxStack <- fastmap::faststack()
-})
 
 withRestoreContext <- function(ctx, expr) {
   restoreCtxStack$push(ctx)

R/bootstrap-deprecated.R

@@ -6,7 +6,7 @@
 #' @param sidebarPanel The [sidebarPanel] containing input controls
 #' @param mainPanel The [mainPanel] containing outputs
 #' @keywords internal
-#' @return A UI definition that can be passed to the [shinyUI] function
+#' @return A UI defintion that can be passed to the [shinyUI] function
 #' @export
 pageWithSidebar <- function(headerPanel,
                             sidebarPanel,

R/bootstrap-layout.R

@@ -1,87 +1,4 @@
-
-#' Create a page with fluid layout
-#'
-#' Functions for creating fluid page layouts. A fluid page layout consists of
-#' rows which in turn include columns. Rows exist for the purpose of making sure
-#' their elements appear on the same line (if the browser has adequate width).
-#' Columns exist for the purpose of defining how much horizontal space within a
-#' 12-unit wide grid it's elements should occupy. Fluid pages scale their
-#' components in realtime to fill all available browser width.
-#'
-#' @param ... Elements to include within the page
-#' @param title The browser window title (defaults to the host URL of the page).
-#'   Can also be set as a side effect of the [titlePanel()] function.
-#' @inheritParams bootstrapPage
-#'
-#' @return A UI definition that can be passed to the [shinyUI] function.
-#'
-#' @details To create a fluid page use the `fluidPage` function and include
-#'   instances of `fluidRow` and [column()] within it. As an
-#'   alternative to low-level row and column functions you can also use
-#'   higher-level layout functions like [sidebarLayout()].
-#'
-#' @note See the [
-#'   Shiny-Application-Layout-Guide](https://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fluid
-#'   pages.
-#'
-#' @family layout functions
-#' @seealso [column()]
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' # Example of UI with fluidPage
-#' ui <- fluidPage(
-#'
-#'   # Application title
-#'   titlePanel("Hello Shiny!"),
-#'
-#'   sidebarLayout(
-#'
-#'     # Sidebar with a slider input
-#'     sidebarPanel(
-#'       sliderInput("obs",
-#'                   "Number of observations:",
-#'                   min = 0,
-#'                   max = 1000,
-#'                   value = 500)
-#'     ),
-#'
-#'     # Show a plot of the generated distribution
-#'     mainPanel(
-#'       plotOutput("distPlot")
-#'     )
-#'   )
-#' )
-#'
-#' # Server logic
-#' server <- function(input, output) {
-#'   output$distPlot <- renderPlot({
-#'     hist(rnorm(input$obs))
-#'   })
-#' }
-#'
-#' # Complete app with UI and server components
-#' shinyApp(ui, server)
-#'
-#'
-#' # UI demonstrating column layouts
-#' ui <- fluidPage(
-#'   title = "Hello Shiny!",
-#'   fluidRow(
-#'     column(width = 4,
-#'       "4"
-#'     ),
-#'     column(width = 3, offset = 2,
-#'       "3 offset 2"
-#'     )
-#'   )
-#' )
-#'
-#' shinyApp(ui, server = function(input, output) { })
-#' }
-#' @rdname fluidPage
+#' @rdname bootstrapPage
 #' @export
 fluidPage <- function(..., title = NULL, theme = NULL, lang = NULL) {
   bootstrapPage(div(class = "container-fluid", ...),
@@ -91,62 +8,13 @@ fluidPage <- function(..., title = NULL, theme = NULL, lang = NULL) {
 }
 
 
-#' @rdname fluidPage
+#' @rdname column
 #' @export
 fluidRow <- function(...) {
   div(class = "row", ...)
 }
 
-#' Create a page with a fixed layout
-#'
-#' Functions for creating fixed page layouts. A fixed page layout consists of
-#' rows which in turn include columns. Rows exist for the purpose of making sure
-#' their elements appear on the same line (if the browser has adequate width).
-#' Columns exist for the purpose of defining how much horizontal space within a
-#' 12-unit wide grid it's elements should occupy. Fixed pages limit their width
-#' to 940 pixels on a typical display, and 724px or 1170px on smaller and larger
-#' displays respectively.
-#'
-#' @param ... Elements to include within the container
-#' @param title The browser window title (defaults to the host URL of the page)
-#' @inheritParams bootstrapPage
-#'
-#' @return A UI definition that can be passed to the [shinyUI] function.
-#'
-#' @details To create a fixed page use the `fixedPage` function and include
-#'   instances of `fixedRow` and [column()] within it. Note that
-#'   unlike [fluidPage()], fixed pages cannot make use of higher-level
-#'   layout functions like `sidebarLayout`, rather, all layout must be done
-#'   with `fixedRow` and `column`.
-#'
-#' @note See the [
-#'   Shiny Application Layout Guide](https://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fixed
-#'   pages.
-#'
-#' @family layout functions
-#'
-#' @seealso [column()]
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' ui <- fixedPage(
-#'   title = "Hello, Shiny!",
-#'   fixedRow(
-#'     column(width = 4,
-#'       "4"
-#'     ),
-#'     column(width = 3, offset = 2,
-#'       "3 offset 2"
-#'     )
-#'   )
-#' )
-#'
-#' shinyApp(ui, server = function(input, output) { })
-#' }
-#'
-#' @rdname fixedPage
+#' @rdname bootstrapPage
 #' @export
 fixedPage <- function(..., title = NULL, theme = NULL, lang = NULL) {
   bootstrapPage(div(class = "container", ...),
@@ -155,28 +23,39 @@ fixedPage <- function(..., title = NULL, theme = NULL, lang = NULL) {
                 lang = lang)
 }
 
-#' @rdname fixedPage
+#' @rdname column
 #' @export
 fixedRow <- function(...) {
   div(class = "row", ...)
 }
 
-
-#' Create a column within a UI definition
+#' Responsive row-column based layout
 #'
-#' Create a column for use within a  [fluidRow()] or
-#' [fixedRow()]
+#' Layout UI components using Bootstrap's grid layout system. Use
+#' `fluidRow()` to group elements that should appear on the same line (if the
+#' browser has adequate width) and `column()` to define how much horizontal
+#' space within a 12-unit wide grid each on of these elements should occupy. See
+#' the [layout guide](https://shiny.rstudio.com/articles/layout-guide.html) for
+#' more context and examples.
 #'
-#' @param width The grid width of the column (must be between 1 and 12)
-#' @param ... Elements to include within the column
+#' To work properly, these functions need [Bootstrap](https://getbootstrap.com)
+#' included on the page. Since most Shiny apps use [bootstrapPage()]
+#' under-the-hood, this is usually the case, but custom page containers (i.e.,
+#' [htmlTemplate()]) may need to explicitly include [bootstrapLib()]
+#' dependencies.
+#'
+#' @param width The grid width of the column (must be between 1 and 12). When
+#'   the device width is small (e.g., the viewer is on a mobile phone), the
+#'   width is always 12. For more control over these responsive breakpoints, use
+#'   Bootstrap's grid system more directly (e.g., `fluidRow(div(class =
+#'   "col-lg-2", ...))`).
+#' @param ... UI elements (i.e., [tags]). For `fluidRow()`, `...` should be a set of `column()`s.
 #' @param offset The number of columns to offset this column from the end of the
 #'   previous column.
 #'
-#' @return A column that can be included within a
-#'   [fluidRow()] or [fixedRow()].
+#' @return A UI element (i.e., [tags]).
 #'
-#'
-#' @seealso [fluidRow()], [fixedRow()].
+#' @seealso [fluidPage()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -202,16 +81,10 @@ fixedRow <- function(...) {
 #'
 #' shinyApp(ui, server)
 #'
-#'
-#'
 #' ui <- fluidPage(
 #'   fluidRow(
-#'     column(width = 4,
-#'       "4"
-#'     ),
-#'     column(width = 3, offset = 2,
-#'       "3 offset 2"
-#'     )
+#'     column(width = 4, "4"),
+#'     column(width = 3, offset = 2, "3 offset 2")
 #'   )
 #' )
 #' shinyApp(ui, server = function(input, output) { })
@@ -516,7 +389,7 @@ splitLayout <- function(..., cellWidths = NULL, cellArgs = list()) {
   children <- children[childIdx]
   count <- length(children)
 
-  if (length(cellWidths) == 0 || isTRUE(is.na(cellWidths))) {
+  if (length(cellWidths) == 0 || is.na(cellWidths)) {
     cellWidths <- sprintf("%.3f%%", 100 / count)
   }
   cellWidths <- rep(cellWidths, length.out = count)

R/bootstrap.R

@@ -1,36 +1,84 @@
 #' @include utils.R
 NULL
 
-#' Create a Bootstrap page
+#' Create a Bootstrap UI page container
 #'
-#' Create a Shiny UI page that loads the CSS and JavaScript for
-#' [Bootstrap](https://getbootstrap.com/), and has no content in the page
-#' body (other than what you provide).
+#' @description
+#' Create a user interface (UI) page container based on
+#' [Bootstrap](https://getbootstrap.com/)'s CSS and JavaScript. Most Shiny apps
+#' should use [fluidPage()] (or [navbarPage()]) to get a page container with a
+#' responsive page width, but in some cases you may want a fixed width container
+#' (`fixedPage()`) or just a bare `<body>` container (`bootstrapPage()`).
 #'
-#' This function is primarily intended for users who are proficient in HTML/CSS,
-#' and know how to lay out pages in Bootstrap. Most applications should use
-#' [fluidPage()] along with layout functions like
-#' [fluidRow()] and [sidebarLayout()].
+#' Most Shiny apps make use of other Shiny UI functions for [managing
+#' layout](https://shiny.rstudio.com/articles/layout-guide.html) (e.g.,
+#' [sidebarLayout()], [fluidRow()], etc), navigation (e.g., [tabPanel()]), and
+#' other styling (e.g., [wellPanel()], [inputPanel()]).  A good portion of these
+#' Shiny UI functions require Bootstrap to work properly (so most Shiny apps
+#' should use these functions to start their UI definitions), but more advanced
+#' usage (i.e., custom HTML/CSS/JS) can avoid Bootstrap entirely by using
+#' [htmlTemplate()] and/or HTML [tags].
 #'
-#' @param ... The contents of the document body.
-#' @param title The browser window title (defaults to the host URL of the page)
+#' @param ... UI elements (i.e., [tags]).
+#' @param title The browser window title (defaults to the host URL of the page).
+#'   Can also be set as a side effect of the [titlePanel()] function.
 #' @param theme One of the following:
 #'   * `NULL` (the default), which implies a "stock" build of Bootstrap 3.
 #'   * A [bslib::bs_theme()] object. This can be used to replace a stock
 #'   build of Bootstrap 3 with a customized version of Bootstrap 3 or higher.
 #'   * A character string pointing to an alternative Bootstrap stylesheet
 #'   (normally a css file within the www directory, e.g. `www/bootstrap.css`).
+#'   This option is here mainly for legacy reasons.
 #' @param lang ISO 639-1 language code for the HTML page, such as "en" or "ko".
-#'   This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="en">}.
+#'   This will be used as the lang in the `<html>` tag, as in `<html lang="en">`.
 #'   The default (NULL) results in an empty string.
 #'
-#' @return A UI definition that can be passed to the [shinyUI] function.
+#' @return A UI definition (i.e., a [tags] object) that can be passed to [shinyApp()].
 #'
-#' @note The `basicPage` function is deprecated, you should use the
-#'   [fluidPage()] function instead.
-#'
-#' @seealso [fluidPage()], [fixedPage()]
+#' @seealso [navbarPage()], [fillPage()], [column()], [tabPanel()]
 #' @export
+#' @examples
+#'
+#' # First create some UI content.
+#' # See the layout guide to learn more about creating different layouts
+#' # https://shiny.rstudio.com/articles/layout-guide.html
+#' ui <- sidebarLayout(
+#'   sidebarPanel(sliderInput("obs", "Number of observations:", 0, 1000, 500)),
+#'   mainPanel(plotOutput("distPlot"))
+#' )
+#' server <- function(input, output) {
+#'   output$distPlot <- renderPlot(hist(rnorm(input$obs)))
+#' }
+#'
+#' # Demonstrating difference between fluidPage(), fixedPage(), bootstrapPage()
+#' if (interactive()) {
+#'   # Container width scales _fluidly_ with window size
+#'   shinyApp(fluidPage(ui), server)
+#'   # Container width changes with window size at fixed breakpoints
+#'   shinyApp(fixedPage(ui), server)
+#'   # Container width is equal to the window's width
+#'   shinyApp(bootstrapPage(ui), server)
+#' }
+#'
+#' # The default look is provided by Bootstrap 3, but {bslib} can be
+#' # used to customize the Bootstrap version and its default styling
+#' theme <- bslib::bs_theme(
+#'   version = 5,
+#'   bg = "#101010",
+#'   fg = "#FDF7F7",
+#'   primary = "#ED79F9",
+#'   base_font = bslib::font_google("Prompt"),
+#'   code_font = bslib::font_google("JetBrains Mono")
+#' )
+#' if (interactive()) {
+#'   # Call thematic::thematic_shiny(font = "auto") to automatically
+#'   # translate the theme/CSS to the R plot
+#'   shinyApp(
+#'     fluidPage(ui, theme = theme, title = "Hello Bootstrap 5"),
+#'     server
+#'   )
+#' }
+#'
 bootstrapPage <- function(..., title = NULL, theme = NULL, lang = NULL) {
 
   args <- list(
@@ -234,14 +282,12 @@ bootstrapDependency <- function(theme) {
 
 bootstrapVersion <- "3.4.1"
 
-
 #' @rdname bootstrapPage
 #' @export
 basicPage <- function(...) {
   bootstrapPage(div(class="container-fluid", list(...)))
 }
 
-
 #' Create a page that fills the window
 #'
 #' `fillPage` creates a page whose height and width always fill the
@@ -374,7 +420,8 @@ collapseSizes <- function(padding) {
 #' @param inverse `TRUE` to use a dark background and light text for the
 #'   navigation bar
 #' @param collapsible `TRUE` to automatically collapse the navigation
-#'   elements into an expandable menu on mobile devices or narrow window widths.
+#'   elements into a menu when the width of the browser is less than 940 pixels
+#'   (useful for viewing on smaller touchscreen device)
 #' @param fluid `TRUE` to use a fluid layout. `FALSE` to use a fixed
 #'   layout.
 #' @param windowTitle the browser window title (as a character string). The
@@ -384,7 +431,7 @@ collapseSizes <- function(padding) {
 #' @inheritParams bootstrapPage
 #' @param icon Optional icon to appear on a `navbarMenu` tab.
 #'
-#' @return A UI definition that can be passed to the [shinyUI] function.
+#' @return A UI defintion that can be passed to the [shinyUI] function.
 #'
 #' @details The `navbarMenu` function can be used to create an embedded
 #'   menu within the navbar that in turns includes additional tabPanels (see
@@ -793,7 +840,7 @@ verbatimTextOutput <- function(outputId, placeholder = FALSE) {
 #' @export
 imageOutput <- function(outputId, width = "100%", height="400px",
                         click = NULL, dblclick = NULL, hover = NULL, brush = NULL,
-                        inline = FALSE, fill = FALSE) {
+                        inline = FALSE) {
 
   style <- if (!inline) {
     # Using `css()` here instead of paste/sprintf so that NULL values will
@@ -849,8 +896,7 @@ imageOutput <- function(outputId, width = "100%", height="400px",
   }
 
   container <- if (inline) span else div
-  res <- do.call(container, args)
-  bindFillRole(res, item = fill)
+  do.call(container, args)
 }
 
 #' Create an plot or image output element
@@ -918,11 +964,6 @@ imageOutput <- function(outputId, width = "100%", height="400px",
 #'   `imageOutput`/`plotOutput` calls may share the same `id`
 #'   value; brushing one image or plot will cause any other brushes with the
 #'   same `id` to disappear.
-#' @param fill Whether or not the returned tag should be treated as a fill item,
-#'   meaning that its `height` is allowed to grow/shrink to fit a fill container
-#'   with an opinionated height (see [htmltools::bindFillRole()]) with an
-#'   opinionated height. Examples of fill containers include `bslib::card()` and
-#'   `bslib::card_body_fill()`.
 #' @inheritParams textOutput
 #' @note The arguments `clickId` and `hoverId` only work for R base graphics
 #'   (see the \pkg{\link[graphics:graphics-package]{graphics}} package). They do
@@ -1093,11 +1134,11 @@ imageOutput <- function(outputId, width = "100%", height="400px",
 #' @export
 plotOutput <- function(outputId, width = "100%", height="400px",
                        click = NULL, dblclick = NULL, hover = NULL, brush = NULL,
-                       inline = FALSE, fill = !inline) {
+                       inline = FALSE) {
 
   # Result is the same as imageOutput, except for HTML class
   res <- imageOutput(outputId, width, height, click, dblclick,
-                     hover, brush, inline, fill)
+                     hover, brush, inline)
 
   res$attribs$class <- "shiny-plot-output"
   res
@@ -1140,21 +1181,15 @@ dataTableOutput <- function(outputId) {
 #' Create an HTML output element
 #'
 #' Render a reactive output variable as HTML within an application page. The
-#' text will be included within an HTML `div` tag, and is presumed to contain
-#' HTML content which should not be escaped.
+#' text will be included within an HTML `div` tag, and is presumed to
+#' contain HTML content which should not be escaped.
 #'
-#' `uiOutput` is intended to be used with `renderUI` on the server side. It is
-#' currently just an alias for `htmlOutput`.
+#' `uiOutput` is intended to be used with `renderUI` on the server
+#' side. It is currently just an alias for `htmlOutput`.
 #'
 #' @param outputId output variable to read the value from
 #' @param ... Other arguments to pass to the container tag function. This is
 #'   useful for providing additional classes for the tag.
-#' @param fill If `TRUE`, the result of `container` is treated as _both_ a fill
-#'   item and container (see [htmltools::bindFillRole()]), which means both the
-#'   `container` as well as its immediate children (i.e., the result of
-#'   `renderUI()`) are allowed to grow/shrink to fit a fill container with an
-#'   opinionated height. Set `fill = "item"` or `fill = "container"` to treat
-#'   `container` as just a fill item or a fill container.
 #' @inheritParams textOutput
 #' @return An HTML output element that can be included in a panel
 #' @examples
@@ -1166,16 +1201,12 @@ dataTableOutput <- function(outputId) {
 #' )
 #' @export
 htmlOutput <- function(outputId, inline = FALSE,
-  container = if (inline) span else div, fill = FALSE, ...)
+  container = if (inline) span else div, ...)
 {
   if (any_unnamed(list(...))) {
     warning("Unnamed elements in ... will be replaced with dynamic UI.")
   }
-  res <- container(id = outputId, class = "shiny-html-output", ...)
-  bindFillRole(
-    res, item = isTRUE(fill) || isTRUE("item" == fill),
-    container = isTRUE(fill) || isTRUE("container" == fill)
-  )
+  container(id = outputId, class="shiny-html-output", ...)
 }
 
 #' @rdname htmlOutput
@@ -1199,25 +1230,19 @@ uiOutput <- htmlOutput
 #' @examples
 #' \dontrun{
 #' ui <- fluidPage(
-#'   p("Choose a dataset to download."),
-#'   selectInput("dataset", "Dataset", choices = c("mtcars", "airquality")),
 #'   downloadButton("downloadData", "Download")
 #' )
 #'
 #' server <- function(input, output) {
-#'   # The requested dataset
-#'   data <- reactive({
-#'     get(input$dataset)
-#'   })
+#'   # Our dataset
+#'   data <- mtcars
 #'
 #'   output$downloadData <- downloadHandler(
 #'     filename = function() {
-#'       # Use the selected dataset as the suggested file name
-#'       paste0(input$dataset, ".csv")
+#'       paste("data-", Sys.Date(), ".csv", sep="")
 #'     },
 #'     content = function(file) {
-#'       # Write the dataset to the `file` that will be downloaded
-#'       write.csv(data(), file)
+#'       write.csv(data, file)
 #'     }
 #'   )
 #' }

R/conditions.R

@@ -421,17 +421,8 @@ pruneStackTrace <- function(parents) {
   # 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.
-  #
-  # jcheng 2022-03-18: Two more reasons a node can be kept:
-  #   1. parent is 0
-  #   2. parent is i
-  # Not sure why either of these situations happen, but they're common when
-  # interacting with rlang/dplyr errors. See issue rstudio/shiny#3250 for repro
-  # cases.
   include <- vapply(seq_along(parents), function(i) {
-    if ((!is_dupe[[i]] && parents[[i]] == current_node) ||
-        parents[[i]] == 0 ||
-        parents[[i]] == i) {
+    if (!is_dupe[[i]] && parents[[i]] == current_node) {
       current_node <<- i
       TRUE
     } else {

R/devmode.R

@@ -1,6 +1,6 @@
 #' Shiny Developer Mode
 #'
-#' @description `r lifecycle::badge("experimental")`
+#' @description \lifecycle{experimental}
 #'
 #'   Developer Mode enables a number of [options()] to make a developer's life
 #'   easier, like enabling non-minified JS and printing messages about
@@ -190,10 +190,8 @@ devmode_inform <- function(
 
 
 
-registered_devmode_options <- NULL
-on_load({
-  registered_devmode_options <- Map$new()
-})
+#' @include map.R
+registered_devmode_options <- Map$new()
 
 #' @describeIn devmode Registers a Shiny Developer Mode option with an updated
 #'   value and Developer message. This registration method allows package
@@ -342,22 +340,21 @@ get_devmode_option <- function(
 }
 
 
-on_load({
-  register_devmode_option(
-    "shiny.autoreload",
-    "Turning on shiny autoreload. To disable, call `options(shiny.autoreload = FALSE)`",
-    TRUE
-  )
 
-  register_devmode_option(
-    "shiny.minified",
-    "Using full shiny javascript file. To use the minified version, call `options(shiny.minified = TRUE)`",
-    FALSE
-  )
+register_devmode_option(
+  "shiny.autoreload",
+  "Turning on shiny autoreload. To disable, call `options(shiny.autoreload = FALSE)`",
+  TRUE
+)
 
-  register_devmode_option(
-    "shiny.fullstacktrace",
-    "Turning on full stack trace. To disable, call `options(shiny.fullstacktrace = FALSE)`",
-    TRUE
-  )
-})
+register_devmode_option(
+  "shiny.minified",
+  "Using full shiny javascript file. To use the minified version, call `options(shiny.minified = TRUE)`",
+  FALSE
+)
+
+register_devmode_option(
+  "shiny.fullstacktrace",
+  "Turning on full stack trace. To disable, call `options(shiny.fullstacktrace = FALSE)`",
+  TRUE
+)

R/globals.R

@@ -7,21 +7,19 @@
   # the private seed during load.
   withPrivateSeed(set.seed(NULL))
 
-  for (expr in on_load_exprs) {
-    eval(expr, envir = environment(.onLoad))
-  }
+  # Create this at the top level, but since the object is from a different
+  # package, we don't want to bake it into the built binary package.
+  restoreCtxStack <<- fastmap::faststack()
 
   # Make sure these methods are available to knitr if shiny is loaded but not
   # attached.
   s3_register("knitr::knit_print", "reactive")
   s3_register("knitr::knit_print", "shiny.appobj")
   s3_register("knitr::knit_print", "shiny.render.function")
-}
 
-
-on_load_exprs <- list()
-# Register an expression to be evaluated when the package is loaded (in the
-# .onLoad function).
-on_load <- function(expr) {
-  on_load_exprs[[length(on_load_exprs) + 1]] <<- substitute(expr)
+  # Shiny 1.4.0 bumps jQuery 1.x to 3.x, which caused a problem
+  # with static-rendering of htmlwidgets, and htmlwidgets 1.5
+  # includes a fix for this problem
+  # https://github.com/rstudio/shiny/issues/2630
+  register_upgrade_message("htmlwidgets", 1.5)
 }

R/graph.R

@@ -559,6 +559,4 @@ MessageLogger = R6Class(
   )
 )
 
-on_load({
-  rLog <- RLog$new("shiny.reactlog", "shiny.reactlog.console")
-})
+rLog <- RLog$new("shiny.reactlog", "shiny.reactlog.console")

R/image-interact.R

@@ -182,8 +182,8 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
 #  $ xmax     : num 3.78
 #  $ ymin     : num 17.1
 #  $ ymax     : num 20.4
-#  $ panelvar1: chr "6"
-#  $ panelvar2: chr "0
+#  $ panelvar1: int 6
+#  $ panelvar2: int 0
 #  $ coords_css:List of 4
 #   ..$ xmin: int 260
 #   ..$ xmax: int 298
@@ -367,8 +367,8 @@ nearPoints <- function(df, coordinfo, xvar = NULL, yvar = NULL,
 #  $ img_css_ratio:List of 2
 #   ..$ x: num 1.25
 #   ..$ y: num 1.25
-#  $ panelvar1 : chr "6"
-#  $ panelvar2 : chr "0"
+#  $ panelvar1 : int 6
+#  $ panelvar2 : int 0
 #  $ mapping   :List of 4
 #   ..$ x        : chr "wt"
 #   ..$ y        : chr "mpg"

R/imageutils.R

@@ -1,23 +1,22 @@
 startPNG <- function(filename, width, height, res, ...) {
-  pngfun <- if ((getOption('shiny.useragg') %||% TRUE) && is_installed("ragg")) {
-    ragg::agg_png
+  # shiny.useragg is an experimental option that isn't officially supported or
+  # documented. It's here in the off chance that someone really wants
+  # to use ragg (say, instead of showtext, for custom font rendering).
+  # In the next shiny release, this option will likely be superseded in
+  # favor of a fully customizable graphics device option
+  if ((getOption('shiny.useragg') %||% FALSE) && is_installed("ragg")) {
+    pngfun <- ragg::agg_png
   } else if (capabilities("aqua")) {
     # i.e., png(type = 'quartz')
-    grDevices::png
+    pngfun <- grDevices::png
   } else if ((getOption('shiny.usecairo') %||% TRUE) && is_installed("Cairo")) {
-    Cairo::CairoPNG
+    pngfun <- Cairo::CairoPNG
   } else {
     # i.e., png(type = 'cairo')
-    grDevices::png
+    pngfun <- grDevices::png
   }
 
-  args <- list2(filename = filename, width = width, height = height, res = res, ...)
-
-  # It's possible for width/height to be NULL/numeric(0) (e.g., when using
-  # suspendWhenHidden=F w/ tabsetPanel(), see rstudio/shiny#1409), so when
-  # this happens let the device determine what the default size should be.
-  if (length(args$width) == 0) args$width <- NULL
-  if (length(args$height) == 0) args$height <- NULL
+  args <- rlang::list2(filename=filename, width=width, height=height, res=res, ...)
 
   # Set a smarter default for the device's bg argument (based on thematic's global state).
   # Note that, technically, this is really only needed for CairoPNG, since the other
@@ -58,35 +57,33 @@ startPNG <- function(filename, width, height, res, ...) {
   grDevices::dev.cur()
 }
 
-#' Capture a plot as a PNG file.
+#' Run a plotting function and save the output as a PNG
 #'
-#' The PNG graphics device used is determined in the following order:
-#'   * If the ragg package is installed (and the `shiny.useragg` is not
-#'    set to `FALSE`), then use [ragg::agg_png()].
-#'   * If a quartz device is available (i.e., `capabilities("aqua")` is
-#'    `TRUE`), then use `png(type = "quartz")`.
-#'   * If the Cairo package is installed (and the `shiny.usecairo` option
-#'    is not set to `FALSE`), then use [Cairo::CairoPNG()].
-#'   * Otherwise, use [grDevices::png()]. In this case, Linux and Windows
-#'    may not antialias some point shapes, resulting in poor quality output.
+#' This function returns the name of the PNG file that it generates. In
+#' essence, it calls `png()`, then `func()`, then `dev.off()`.
+#' So `func` must be a function that will generate a plot when used this
+#' way.
 #'
-#' @details
-#'   A `NULL` value provided to `width` or `height` is ignored (i.e., the
-#'   default `width` or `height` of the graphics device is used).
+#' For output, it will try to use the following devices, in this order:
+#' quartz (via [grDevices::png()]), then [Cairo::CairoPNG()],
+#' and finally [grDevices::png()]. This is in order of quality of
+#' output. Notably, plain `png` output on Linux and Windows may not
+#' antialias some point shapes, resulting in poor quality output.
+#'
+#' In some cases, `Cairo()` provides output that looks worse than
+#' `png()`. To disable Cairo output for an app, use
+#' `options(shiny.usecairo=FALSE)`.
 #'
 #' @param func A function that generates a plot.
 #' @param filename The name of the output file. Defaults to a temp file with
 #'   extension `.png`.
 #' @param width Width in pixels.
 #' @param height Height in pixels.
-#' @param res Resolution in pixels per inch. This value is passed to the
-#'   graphics device. Note that this affects the resolution of PNG rendering in
+#' @param res Resolution in pixels per inch. This value is passed to
+#'   [grDevices::png()]. Note that this affects the resolution of PNG rendering in
 #'   R; it won't change the actual ppi of the browser.
-#' @param ... Arguments to be passed through to the graphics device. These can
-#'   be used to set the width, height, background color, etc.
-#'
-#' @return A path to the newly generated PNG file.
-#'
+#' @param ... Arguments to be passed through to [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, ...) {

R/input-checkbox.R

@@ -31,7 +31,7 @@ checkboxInput <- function(inputId, label, value = FALSE, width = NULL) {
 
   value <- restoreInput(id = inputId, default = value)
 
-  inputTag <- tags$input(id = inputId, type="checkbox", class = "shiny-input-checkbox")
+  inputTag <- tags$input(id = inputId, type="checkbox")
   if (!is.null(value) && value)
     inputTag$attribs$checked <- "checked"
 

R/input-file.R

@@ -2,13 +2,8 @@
 #'
 #' Create a file upload control that can be used to upload one or more files.
 #'
-#' Whenever a file upload completes, the corresponding input variable is set to
-#' a dataframe. See the `Server value` section.
-#'
-#' Each time files are uploaded, they are written to a new random subdirectory
-#' inside of R's process-level temporary directory. The Shiny user session keeps
-#' track of all uploads in the session, and when the session ends, Shiny deletes
-#' all of the subdirectories where files where uploaded to.
+#' Whenever a file upload completes, the corresponding input variable is set
+#' to a dataframe. See the `Server value` section.
 #'
 #' @family input elements
 #'
@@ -16,30 +11,19 @@
 #' @param multiple Whether the user should be allowed to select and upload
 #'   multiple files at once. **Does not work on older browsers, including
 #'   Internet Explorer 9 and earlier.**
-#' @param accept A character vector of "unique file type specifiers" which gives
-#'   the browser a hint as to the type of file the server expects. Many browsers
-#'   use this prevent the user from selecting an invalid file.
+#' @param accept A character vector of "unique file type specifiers" which
+#'   gives the browser a hint as to the type of file the server expects.
+#'   Many browsers use this prevent the user from selecting an invalid file.
 #'
 #'   A unique file type specifier can be:
 #'   * A case insensitive extension like `.csv` or `.rds`.
 #'   * A valid MIME type, like `text/plain` or `application/pdf`
 #'   * One of `audio/*`, `video/*`, or `image/*` meaning any audio, video,
-#'   or image type, respectively.
+#'     or image type, respectively.
 #' @param buttonLabel The label used on the button. Can be text or an HTML tag
 #'   object.
 #' @param placeholder The text to show before a file has been uploaded.
-#' @param capture What source to use for capturing image, audio or video data.
-#'   This attribute facilitates user access to a device's media capture
-#'   mechanism, such as a camera, or microphone, from within a file upload
-#'   control.
 #'
-#'   A value of `user` indicates that the user-facing camera and/or microphone
-#'   should be used. A value of `environment` specifies that the outward-facing
-#'   camera and/or microphone should be used.
-#'
-#'   By default on most phones, this will accept still photos or video. For
-#'   still photos only, also use `accept="image/*"`. For video only, use
-#'   `accept="video/*"`.
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
@@ -72,9 +56,7 @@
 #' }
 #'
 #' @section Server value:
-#'
-#'   A `data.frame` that contains one row for each selected file, and following
-#'   columns:
+#' A `data.frame` that contains one row for each selected file, and following columns:
 #' \describe{
 #'   \item{`name`}{The filename provided by the web browser. This is
 #'   **not** the path to read to get at the actual data that was uploaded
@@ -91,8 +73,7 @@
 #'
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
-  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected",
-  capture = NULL) {
+  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {
 
   restoredValue <- restoreInput(id = inputId, default = NULL)
 
@@ -108,7 +89,6 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
 
   inputTag <- tags$input(
     id = inputId,
-    class = "shiny-input-file",
     name = inputId,
     type = "file",
     # Don't use "display: none;" style, which causes keyboard accessibility issue; instead use the following workaround: https://css-tricks.com/places-its-tempting-to-use-display-none-but-dont/
@@ -121,9 +101,6 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
   if (length(accept) > 0)
     inputTag$attribs$accept <- paste(accept, collapse=',')
 
-  if (!is.null(capture)) {
-    inputTag$attribs$capture <- capture
-  }
 
   div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),

R/input-numeric.R

@@ -35,7 +35,7 @@ numericInput <- function(inputId, label, value, min = NA, max = NA, step = NA,
   value <- restoreInput(id = inputId, default = value)
 
   # build input tag
-  inputTag <- tags$input(id = inputId, type = "number", class="shiny-input-number form-control",
+  inputTag <- tags$input(id = inputId, type = "number", class="form-control",
                          value = formatNoSci(value))
   if (!is.na(min))
     inputTag$attribs$min = min

R/input-password.R

@@ -35,7 +35,7 @@ passwordInput <- function(inputId, label, value = "", width = NULL,
   div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),
     shinyInputLabel(inputId, label),
-    tags$input(id = inputId, type="password", class="shiny-input-password form-control", value=value,
+    tags$input(id = inputId, type="password", class="form-control", value=value,
                placeholder = placeholder)
   )
 }

R/input-select.R

@@ -4,7 +4,7 @@
 #' from a list of values.
 #'
 #' By default, `selectInput()` and `selectizeInput()` use the JavaScript library
-#' \pkg{selectize.js} (<https://selectize.dev/>) instead of
+#' \pkg{selectize.js} (<https://github.com/selectize/selectize.js>) instead of
 #' the basic select input element. To use the standard HTML select input
 #' element, use `selectInput()` with `selectize=FALSE`.
 #'
@@ -106,7 +106,6 @@ selectInput <- function(inputId, label, choices, selected = NULL,
   # create select tag and add options
   selectTag <- tags$select(
     id = inputId,
-    class = "shiny-input-select",
     class = if (!selectize) "form-control",
     size = size,
     selectOptions(choices, selected, inputId, selectize)
@@ -173,7 +172,7 @@ needOptgroup <- function(choices) {
 
 #' @rdname selectInput
 #' @param ... Arguments passed to `selectInput()`.
-#' @param options A list of options. See the documentation of \pkg{selectize.js}(<https://selectize.dev/docs/usage>)
+#' @param options A list of options. See the documentation of \pkg{selectize.js}
 #'   for possible options (character option values inside [base::I()] will
 #'   be treated as literal JavaScript code; see [renderDataTable()]
 #'   for details).
@@ -288,7 +287,7 @@ selectizeStaticDependency <- function(version) {
 #'
 #' By default, `varSelectInput()` and `selectizeInput()` use the
 #' JavaScript library \pkg{selectize.js}
-#' (<https://selectize.dev/>) to instead of the basic
+#' (<https://github.com/selectize/selectize.js>) to instead of the basic
 #' select input element. To use the standard HTML select input element, use
 #' `selectInput()` with `selectize=FALSE`.
 #'
@@ -384,7 +383,7 @@ varSelectInput <- function(
 
 #' @rdname varSelectInput
 #' @param ... Arguments passed to `varSelectInput()`.
-#' @param options A list of options. See the documentation of \pkg{selectize.js}(<https://selectize.dev/docs/usage>)
+#' @param options A list of options. See the documentation of \pkg{selectize.js}
 #'   for possible options (character option values inside [base::I()] will
 #'   be treated as literal JavaScript code; see [renderDataTable()]
 #'   for details).

R/input-text.R

@@ -42,7 +42,7 @@ textInput <- function(inputId, label, value = "", width = NULL,
   div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),
     shinyInputLabel(inputId, label),
-    tags$input(id = inputId, type="text", class="shiny-input-text form-control", value=value,
+    tags$input(id = inputId, type="text", class="form-control", value=value,
       placeholder = placeholder)
   )
 }

R/input-textarea.R

@@ -52,7 +52,7 @@ textAreaInput <- function(inputId, label, value = "", width = NULL, height = NUL
 
   style <- css(
     # The width is specified on the parent div.
-    width = if (!is.null(width)) "100%",
+    width = if (!is.null(width)) "width: 100%;",
     height = validateCssUnit(height),
     resize = resize
   )
@@ -62,7 +62,7 @@ textAreaInput <- function(inputId, label, value = "", width = NULL, height = NUL
     style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
     tags$textarea(
       id = inputId,
-      class = "shiny-input-textarea form-control",
+      class = "form-control",
       placeholder = placeholder,
       style = style,
       rows = rows,

R/insert-ui.R

@@ -1,6 +1,6 @@
 #' Insert and remove UI objects
 #'
-#' These functions allow you to dynamically add and remove arbitrary UI
+#' These functions allow you to dynamically add and remove arbirary UI
 #' into your app, whenever you want, as many times as you want.
 #' Unlike [renderUI()], the UI generated with `insertUI()` is persistent:
 #' once it's created, it stays there until removed by `removeUI()`. Each
@@ -11,7 +11,7 @@
 #' function.
 #'
 #' It's particularly useful to pair `removeUI` with `insertUI()`, but there is
-#' no restriction on what you can use it on. Any element that can be selected
+#' no restriction on what you can use on. Any element that can be selected
 #' through a jQuery selector can be removed through this function.
 #'
 #' @param selector A string that is accepted by jQuery's selector

R/jqueryui.R

@@ -103,10 +103,10 @@ fixedPanel <- function(...,
 
 jqueryuiDependency <- function() {
   htmlDependency(
-    "jqueryui",
-    version_jqueryui,
-    src = "www/shared/jqueryui",
-    package = "shiny",
-    script = "jquery-ui.min.js"
+    'jqueryui',
+    '1.12.1',
+    src = 'www/shared/jqueryui',
+    package = 'shiny',
+    script = 'jquery-ui.min.js'
   )
 }

R/map.R

@@ -48,9 +48,9 @@ Map <- R6Class(
   )
 )
 
-as.list.Map <- function(x, ...) {
-  x$values()
+as.list.Map <- function(map) {
+  map$values()
 }
-length.Map <- function(x) {
-  x$size()
+length.Map <- function(map) {
+  map$size()
 }

R/modal.R

@@ -43,10 +43,7 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' @param title An optional title for the dialog.
 #' @param footer UI for footer. Use `NULL` for no footer.
 #' @param size One of `"s"` for small, `"m"` (the default) for medium,
-#'   `"l"` for large, or `"xl"` for extra large. Note that `"xl"` only 
-#'    works with Bootstrap 4 and above (to opt-in to Bootstrap 4+, 
-#'    pass [bslib::bs_theme()] to the `theme` argument of a page container 
-#'    like [fluidPage()]).
+#'   or `"l"` for large.
 #' @param easyClose If `TRUE`, the modal dialog can be dismissed by
 #'   clicking outside the dialog box, or be pressing the Escape key. If
 #'   `FALSE` (the default), the modal dialog can't be dismissed in those

R/reactives.R

@@ -326,9 +326,6 @@ ReactiveValues <- R6Class(
     .dedupe = logical(0),
     # Key, asList(), or names() have been retrieved
     .hasRetrieved = list(),
-    # All names, in insertion order. The names are also stored in the .values
-    # object, but it does not preserve order.
-    .nameOrder = character(0),
 
 
     initialize = function(
@@ -406,11 +403,6 @@ ReactiveValues <- R6Class(
         return(invisible())
       }
 
-      # If it's new, append key to the name order
-      if (!key_exists) {
-        .nameOrder[length(.nameOrder) + 1] <<- key
-      }
-
       # set the value for better logging
       .values$set(key, value)
 
@@ -452,13 +444,14 @@ ReactiveValues <- R6Class(
     },
 
     names = function() {
+      nameValues <- .values$keys()
       if (!isTRUE(.hasRetrieved$names)) {
         domain <- getDefaultReactiveDomain()
-        rLog$defineNames(.reactId, .nameOrder, .label, domain)
+        rLog$defineNames(.reactId, nameValues, .label, domain)
         .hasRetrieved$names <<- TRUE
       }
       .namesDeps$register()
-      return(.nameOrder)
+      return(nameValues)
     },
 
     # Get a metadata value. Does not trigger reactivity.
@@ -506,7 +499,7 @@ ReactiveValues <- R6Class(
     },
 
     toList = function(all.names=FALSE) {
-      listValue <- .values$mget(.nameOrder)
+      listValue <- .values$values()
       if (!all.names) {
         listValue <- listValue[!grepl("^\\.", base::names(listValue))]
       }
@@ -2187,8 +2180,8 @@ maskReactiveContext <- function(expr) {
 #' @param autoDestroy If `TRUE` (the default), the observer will be
 #'   automatically destroyed when its domain (if any) ends.
 #' @param ignoreNULL Whether the action should be triggered (or value
-#'   calculated, in the case of `eventReactive`) when the input event expression
-#'   is `NULL`. See Details.
+#'   calculated, in the case of `eventReactive`) when the input is
+#'   `NULL`. See Details.
 #' @param ignoreInit If `TRUE`, then, when this `observeEvent` is
 #'   first created/initialized, ignore the `handlerExpr` (the second
 #'   argument), whether it is otherwise supposed to run or not. The default is
@@ -2479,11 +2472,11 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
 
       # Ensure r() is called only after setting firstRun to FALSE since r()
       # may throw an error
-      try(r(), silent = TRUE)
+      r()
       return()
     }
     # This ensures r() is still tracked after firstRun
-    try(r(), silent = TRUE)
+    r()
 
     # The value (or possibly millis) changed. Start or reset the timer.
     v$when <- getDomainTimeMs(domain) + millis()
@@ -2516,7 +2509,7 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
   # commenting it out and studying the unit test failure that results.
   primer <- observe({
     primer$destroy()
-    try(er(), silent = TRUE)
+    er()
   }, label = "debounce primer", domain = domain, priority = priority)
 
   er
@@ -2558,7 +2551,7 @@ throttle <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
   }
 
   # Responsible for tracking when f() changes.
-  observeEvent(try(r(), silent = TRUE), {
+  observeEvent(r(), {
     if (v$pending) {
       # In a blackout period and someone already scheduled; do nothing
     } else if (blackoutMillisLeft() > 0) {

R/render-plot.R

@@ -34,7 +34,7 @@
 #'   When rendering an inline plot, you must provide numeric values (in pixels)
 #'   to both \code{width} and \code{height}.
 #' @param res Resolution of resulting plot, in pixels per inch. This value is
-#'   passed to [plotPNG()]. Note that this affects the resolution of PNG
+#'   passed to [grDevices::png()]. Note that this affects the resolution of PNG
 #'   rendering in R; it won't change the actual ppi of the browser.
 #' @param alt Alternate text for the HTML `<img>` tag if it cannot be displayed
 #'   or viewed (i.e., the user uses a screen reader). In addition to a character
@@ -44,7 +44,7 @@
 #'   ggplot objects; for other plots, `NA` results in alt text of "Plot object".
 #'   `NULL` or `""` is not recommended because those should be limited to
 #'   decorative images.
-#' @param ... Arguments to be passed through to [plotPNG()].
+#' @param ... Arguments to be passed through to [grDevices::png()].
 #'   These can be used to set the width, height, background color, etc.
 #' @inheritParams renderUI
 #' @param execOnResize If `FALSE` (the default), then when a plot is
@@ -194,8 +194,8 @@ renderPlot <- function(expr, width = 'auto', height = 'auto', res = 72, ...,
 }
 
 resizeSavedPlot <- function(name, session, result, width, height, alt, pixelratio, res, ...) {
-  if (isTRUE(result$img$width == width && result$img$height == height &&
-      result$pixelratio == pixelratio && result$res == res)) {
+  if (result$img$width == width && result$img$height == height &&
+      result$pixelratio == pixelratio && result$res == res) {
     return(result)
   }
 

R/run-example.R

@@ -1,174 +0,0 @@
-#' Function to get the path of a Shiny example in a package
-#'
-#' @param package A character string specifying the name of the package
-#' @param name A character string specifying the name of the example
-#'
-#' @return A character string specifying the path of the example
-#' OR a data frame containing information about all available Shiny examples
-#'
-#' @noRd
-runExampleAppDir <- function(package = NULL, name = NULL) {
-    # arg checking
-    if (is.null(package)) {
-        if (is.null(name)) {
-            # neither package nor name is specified
-            return(availableExamples(package = NULL))
-        } else {
-            stop("Please provide a package name
-            when specifying an example name.")
-        }
-    } else {
-        stopifnot(length(package) == 1 && is.character(package))
-        # Search for a Shiny example with a given name in a package
-        if (!is.null(name)) {
-            examples <- availableExamples(package = package)
-            example_path <- examples[examples$name == name, "source_directory"]
-            if (length(example_path) > 0) {
-                return(example_path)
-            } else {
-                stop("No matching example found within the package")
-            }
-        }
-        # only package is specified
-        return(availableExamples(package = package))
-    }
-}
-
-#' Function to get a data frame of all available Shiny examples
-#'
-#' @param package A character string specifying the name of the package
-#'
-#' @return A data frame containing information
-#' about all available Shiny examples
-#'
-#' @export
-availableExamples <- function(package = NULL) {
-    info <-
-        if (is.null(package)) {
-            allAvailableExamples()
-        } else {
-            availableExamplesForPackage(package)
-        }
-    if (!is.null(info$error)) {
-        stop(info$error, call. = FALSE)
-    }
-    examples <- info$examples
-    return(examples)
-}
-
-#' Function to get a data frame of all available Shiny examples for a package
-#'
-#' @param package A character string specifying the name of the package
-#'
-#' @return A data frame containing information about all
-#'  available Shiny examples for the package
-#' @noRd
-availableExamplesForPackage <- function(package) {
-    an_error <- function(...) {
-        list(
-            examples = NULL,
-            error = paste0(...)
-        )
-    }
-
-    if (!nzchar(system.file(package = package))) {
-        return(an_error(
-            "No package found with name: \"", package, "\""
-        ))
-    }
-
-    examples_dir <- system.file("shiny-examples", package = package)
-    if (!nzchar(examples_dir)) {
-        return(an_error(
-            "No Shiny examples found for package: \"", package, "\""
-        ))
-    }
-
-    example_folders <- list.dirs(
-        examples_dir,
-        full.names = TRUE,
-        recursive = FALSE
-    )
-    names(example_folders) <- basename(example_folders)
-
-    example_info <- lapply(example_folders, function(example_dir) {
-        data.frame(
-            package = package,
-            name = basename(example_dir),
-            source_directory = example_dir,
-            stringsAsFactors = FALSE,
-            row.names = FALSE
-        )
-    })
-
-    examples <- do.call(rbind, example_info)
-    class(examples) <- c("shiny_available_examples", class(examples))
-
-    list(
-        examples = examples,
-        error = NULL
-    )
-}
-
-#' Function to get a data frame of all available Shiny examples
-#'  for all installed packages
-#'
-#' @return A data frame containing information about
-#'  all available Shiny examples for all installed packages
-#' @noRd
-allAvailableExamples <- function() {
-    ret <- list()
-    all_pkgs <- installed.packages()[, "Package"]
-
-    for (pkg in all_pkgs) {
-        info <- availableExamplesForPackage(pkg)
-        if (!is.null(info$examples)) {
-            ret[[length(ret) + 1]] <- info$examples
-        }
-    }
-
-    # combines the data frames into a single data frame
-    examples <- do.call(rbind, ret)
-
-    list(
-        examples = examples, # will maintain class
-        error = NULL
-    )
-}
-
-#' @export
-format.shiny_available_examples <- function(x, ...) {
-    examples <- x
-    split_examples <- split(examples, examples$package)
-
-    pkg_examples <- vapply(
-        split_examples,
-        function(examples_sub) {
-            paste0(
-                "* ", examples_sub$package[1], "\n",
-                paste0("  - ", examples_sub$name, collapse = "\n")
-            )
-        },
-        character(1)
-    )
-
-    paste0(
-        "Available Shiny examples:\n",
-        paste0(pkg_examples, collapse = "\n")
-    )
-}
-
-#' @export
-print.shiny_available_examples <- function(x, ...) {
-    cat(format(x, ...), "\n", sep = "")
-}
-
-# runExampleAppDir()
-# runExampleAppDir(package = "shiny")
-# runExampleAppDir(package = "tidyverse")
-
-# runExampleAppDir(package = c("shiny", "tidyverse"))
-# runExampleAppDir(package = "shuny")
-# runExampleAppDir(name = "01_hello")
-# runExampleAppDir(package = "shiny", name = "01_hello")
-# runExampleAppDir(package = "shiny", name = "05_hello")

R/run-url.R

@@ -121,8 +121,7 @@ runGist <- function(gist, destdir = NULL, ...) {
 #' @param username GitHub username. If `repo` is of the form
 #'   `"username/repo"`, `username` will be taken from `repo`.
 #' @param ref Desired git reference. Could be a commit, tag, or branch name.
-#'   Defaults to `"HEAD"`, which means the default branch on GitHub, typically
-#'   `"main"` or `"master"`.
+#'   Defaults to `"master"`.
 #' @export
 #' @examples
 #' ## Only run this example in interactive R sessions
@@ -134,7 +133,7 @@ runGist <- function(gist, destdir = NULL, ...) {
 #'   runGitHub("shiny_example", "rstudio", subdir = "inst/shinyapp/")
 #' }
 runGitHub <- function(repo, username = getOption("github.user"),
-                      ref = "HEAD", subdir = NULL, destdir = NULL, ...) {
+                      ref = "master", subdir = NULL, destdir = NULL, ...) {
 
   if (grepl('/', repo)) {
     res <- strsplit(repo, '/')[[1]]

R/runapp.R

@@ -28,7 +28,7 @@
 #'   ports will be tried.
 #' @param launch.browser If true, the system's default web browser will be
 #'   launched automatically after the app is started. Defaults to true in
-#'   interactive sessions only. The value of this parameter can also be a
+#'   interactive sessions only. This value of this parameter can also be a
 #'   function to call with the application's URL.
 #' @param host The IPv4 address that the application should listen on. Defaults
 #'   to the `shiny.host` option, if set, or `"127.0.0.1"` if not. See

R/server-input-handlers.R

@@ -1,9 +1,5 @@
-# Create a Map object for input handlers and register the defaults.
-# This is assigned in .onLoad time.
-inputHandlers <- NULL
-on_load({
-  inputHandlers <- Map$new()
-})
+# Create a map for input handlers and register the defaults.
+inputHandlers <- Map$new()
 
 #' Register an Input Handler
 #'
@@ -129,117 +125,115 @@ applyInputHandlers <- function(inputs, shinysession = getDefaultReactiveDomain()
   inputs
 }
 
-on_load({
-  # 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, ...) {
-    if (length(data) == 0)
-      return(matrix(nrow=0, ncol=0))
 
-    m <- matrix(unlist(lapply(data, function(x) {
-      sapply(x, function(y) {
-        ifelse(is.null(y), NA, y)
-      })
-    })), nrow = length(data[[1]]), ncol = length(data))
-    return(m)
-  })
+# 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, ...) {
+  if (length(data) == 0)
+    return(matrix(nrow=0, ncol=0))
 
-
-  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
-  })
-
-  registerInputHandler("shiny.datetime", function(val, ...){
-    # First replace NULLs with NA, then convert to POSIXct vector
-    times <- lapply(val, function(x) {
-      if (is.null(x)) NA
-      else x
+  m <- matrix(unlist(lapply(data, function(x) {
+    sapply(x, function(y) {
+      ifelse(is.null(y), NA, y)
     })
-    as.POSIXct(unlist(times), origin = "1970-01-01", tz = "UTC")
-  })
-
-  registerInputHandler("shiny.action", function(val, shinysession, name) {
-    # mark up the action button value with a special class so we can recognize it later
-    class(val) <- c("shinyActionButtonValue", class(val))
-    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)
-    }
-  })
-
+  })), nrow = length(data[[1]]), ncol = length(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
+})
+
+registerInputHandler("shiny.datetime", function(val, ...){
+  # First replace NULLs with NA, then convert to POSIXct vector
+  times <- lapply(val, function(x) {
+    if (is.null(x)) NA
+    else x
+  })
+  as.POSIXct(unlist(times), origin = "1970-01-01", tz = "UTC")
+})
+
+registerInputHandler("shiny.action", function(val, shinysession, name) {
+  # mark up the action button value with a special class so we can recognize it later
+  class(val) <- c("shinyActionButtonValue", class(val))
+  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,12 +1,7 @@
 #' @include server-input-handlers.R
 
-appsByToken <- NULL
-appsNeedingFlush <- NULL
-on_load({
-  appsByToken <- Map$new()
-  appsNeedingFlush <- Map$new()
-})
-
+appsByToken <- Map$new()
+appsNeedingFlush <- Map$new()
 
 # Provide a character representation of the WS that can be used
 # as a key in a Map.
@@ -34,7 +29,7 @@ registerClient <- function(client) {
 
 #' Define Server Functionality
 #'
-#' @description `r lifecycle::badge("superseded")`
+#' @description \lifecycle{superseded}
 #'
 #' @description Defines the server-side logic of the Shiny application. This generally
 #' involves creating functions that map user inputs to various kinds of output.
@@ -54,7 +49,7 @@ registerClient <- function(client) {
 #' optional `session` parameter, which is used when greater control is
 #' needed.
 #'
-#' See the [tutorial](https://shiny.rstudio.com/tutorial/) for more
+#' See the [tutorial](https://rstudio.github.io/shiny/tutorial/) for more
 #' on how to write a server function.
 #'
 #' @param func The server function for this application. See the details section
@@ -127,10 +122,7 @@ decodeMessage <- function(data) {
   return(mainMessage)
 }
 
-autoReloadCallbacks <- NULL
-on_load({
-  autoReloadCallbacks <- Callbacks$new()
-})
+autoReloadCallbacks <- Callbacks$new()
 
 createAppHandlers <- function(httpHandlers, serverFuncSource) {
   appvars <- new.env()
@@ -339,7 +331,7 @@ argsForServerFunc <- function(serverFunc, session) {
 getEffectiveBody <- function(func) {
   if (is.null(func))
     NULL
-  else if (isS4(func) && inherits(func, "functionWithTrace"))
+  else if (isS4(func) && class(func) == "functionWithTrace")
     body(func@original)
   else
     body(func)

R/shiny-options.R

@@ -90,15 +90,10 @@ getShinyOption <- function(name, default = NULL) {
 #' \item{shiny.jquery.version (defaults to `3`)}{The major version of jQuery to use.
 #'   Currently only values of `3` or `1` are supported. If `1`, then jQuery 1.12.4 is used. If `3`,
 #'   then jQuery `r version_jquery` is used.}
-#' \item{shiny.json.digits (defaults to `I(16)`)}{Max number of digits to use when converting
-#'   numbers to JSON format to send to the client web browser. Use [I()] to specify significant digits.
-#'   Use `NA` for max precision.}
+#' \item{shiny.json.digits (defaults to `16`)}{The number of digits to use when converting
+#'   numbers to JSON format to send to the client web browser.}
 #' \item{shiny.launch.browser (defaults to `interactive()`)}{A boolean which controls the default behavior
 #'   when an app is run. See [runApp()] for more information.}
-#' \item{shiny.mathjax.url (defaults to `"https://mathjax.rstudio.com/latest/MathJax.js"`)}{
-#'   The URL that should be used to load MathJax, via [withMathJax()].}
-#' \item{shiny.mathjax.config (defaults to `"config=TeX-AMS-MML_HTMLorMML"`)}{The querystring
-#'   used to load MathJax, via [withMathJax()].}
 #' \item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
 #'   web request size, which serves as a size limit for file uploads.}
 #' \item{shiny.minified (defaults to `TRUE`)}{By default
@@ -130,9 +125,6 @@ getShinyOption <- function(name, default = NULL) {
 #'   console.}
 #' \item{shiny.testmode (defaults to `FALSE`)}{If `TRUE`, then various features for testing Shiny
 #'   applications are enabled.}
-#' \item{shiny.snapshotsortc (defaults to `FALSE`)}{If `TRUE`, test snapshot keys
-#'   for \pkg{shinytest} will be sorted consistently using the C locale.  Snapshots
-#'   retrieved by \pkg{shinytest2} will always sort using the C locale.}
 #' \item{shiny.trace (defaults to `FALSE`)}{Print messages sent between the R server and the web
 #'   browser client to the R console. This is useful for debugging. Possible
 #'   values are `"send"` (only print messages sent to the client),
@@ -141,10 +133,9 @@ getShinyOption <- function(name, default = NULL) {
 #'   messages).}
 #' \item{shiny.autoload.r (defaults to `TRUE`)}{If `TRUE`, then the R/
 #'   of a shiny app will automatically be sourced.}
-#' \item{shiny.useragg (defaults to `TRUE`)}{Set to `FALSE` to prevent PNG rendering via the
-#'   ragg package. See [plotPNG()] for more information.}
-#' \item{shiny.usecairo (defaults to `TRUE`)}{Set to `FALSE` to prevent PNG rendering via the
-#'   Cairo package. See [plotPNG()] for more information.}
+#' \item{shiny.usecairo (defaults to `TRUE`)}{This is used to disable graphical rendering by the
+#'   Cairo package, if it is installed. See [plotPNG()] for more
+#'   information.}
 #' \item{shiny.devmode (defaults to `NULL`)}{Option to enable Shiny Developer Mode. When set,
 #'   different default `getOption(key)` values will be returned. See [devmode()] for more details.}
 ### Not documenting as 'shiny.devmode.verbose' is for niche use only

R/shiny-package.R

@@ -34,11 +34,3 @@ NULL
 # since we call require(shiny) as part of loading the app.
 #' @import methods
 NULL
-
-
-# For usethis::use_release_issue()
-release_bullets <- function() {
-  c(
-    "Update static imports: `staticimports::import()`"
-  )
-}

R/shiny.R

@@ -33,12 +33,8 @@ createUniqueId <- function(bytes, prefix = "", suffix = "") {
 }
 
 toJSON <- function(x, ...,  dataframe = "columns", null = "null", na = "null",
-  auto_unbox = TRUE,
-  # Shiny has had a legacy value of 16 significant digits
-  # We can use `I(16)` mixed with the default behavior in jsonlite's `use_signif=`
-  # https://github.com/jeroen/jsonlite/commit/728efa9
-  digits = getOption("shiny.json.digits", I(16)), use_signif = is(digits, "AsIs"),
-  force = TRUE, POSIXt = "ISO8601", UTC = TRUE,
+  auto_unbox = TRUE, digits = getOption("shiny.json.digits", 16),
+  use_signif = TRUE, force = TRUE, POSIXt = "ISO8601", UTC = TRUE,
   rownames = FALSE, keep_vec_names = TRUE, strict_atomic = TRUE) {
 
   if (strict_atomic) {
@@ -189,11 +185,9 @@ workerId <- local({
 #'   session is actually connected.
 #' }
 #' \item{request}{
-#'   An environment that implements the [Rook
-#'   specification](https://github.com/jeffreyhorner/Rook#the-environment) for
-#'   HTTP requests. This is the request that was used to initiate the websocket
-#'   connection (as opposed to the request that downloaded the web page for the
-#'   app).
+#'   An environment that implements the Rook specification for HTTP requests.
+#'   This is the request that was used to initiate the websocket connection
+#'   (as opposed to the request that downloaded the web page for the app).
 #' }
 #' \item{userData}{
 #'   An environment for app authors and module/package authors to store whatever
@@ -484,35 +478,6 @@ ShinySession <- R6Class(
           # "json" unless requested otherwise. The only other valid value is
           # "rds".
           format <- params$format %||% "json"
-          # Machines can test their snapshot under different locales.
-          # R CMD check runs under the `C` locale.
-          # However, before this parameter, existing snapshots were most likely not
-          #   under the `C` locale is would cause failures. This parameter allows
-          #   users to opt-in to the `C` locale.
-          # From ?sort:
-          #   However, there are some caveats with the radix sort:
-          #     If ‘x’ is a ‘character’ vector, all elements must share the
-          #   same encoding. Only UTF-8 (including ASCII) and Latin-1
-          #   encodings are supported. Collation always follows the "C"
-          #   locale.
-          # {shinytest2} will always set `sortC=1`
-          # {shinytest} does not have `sortC` functionality.
-          #    Users should set `options(shiny.snapshotsortc = TRUE)` within their app.
-          # The sortingMethod should always be `radix` going forward.
-          sortMethod <-
-            if (!is.null(params$sortC)) {
-              if (params$sortC != "1") {
-                stop("The `sortC` parameter can only be `1` or not supplied")
-              }
-              "radix"
-            } else {
-              # Allow users to set an option for {shinytest2}.
-              if (isTRUE(getShinyOption("snapshotsortc", default = FALSE))) {
-                "radix"
-              } else {
-                "auto"
-              }
-            }
 
           values <- list()
 
@@ -555,7 +520,7 @@ ShinySession <- R6Class(
               }
             )
 
-            values$input <- sortByName(values$input, method = sortMethod)
+            values$input <- sortByName(values$input)
           }
 
           if (!is.null(params$output)) {
@@ -583,7 +548,7 @@ ShinySession <- R6Class(
               }
             )
 
-            values$output <- sortByName(values$output, method = sortMethod)
+            values$output <- sortByName(values$output)
           }
 
           if (!is.null(params$export)) {
@@ -604,7 +569,7 @@ ShinySession <- R6Class(
               )
             }
 
-            values$export <- sortByName(values$export, method = sortMethod)
+            values$export <- sortByName(values$export)
           }
 
           # Make sure input, output, and export are all named lists (at this
@@ -1754,7 +1719,7 @@ ShinySession <- R6Class(
     },
 
     getTestSnapshotUrl = function(input = TRUE, output = TRUE, export = TRUE,
-                                  format = "json", sortC = FALSE) {
+                                  format = "json") {
       reqString <- function(group, value) {
         if (isTRUE(value))
           paste0(group, "=1")
@@ -1768,7 +1733,6 @@ ShinySession <- R6Class(
         reqString("input", input),
         reqString("output", output),
         reqString("export", export),
-        reqString("sortC", sortC),
         paste0("format=", format),
         sep = "&"
       )

R/shinyapp.R

@@ -286,7 +286,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 #
 # The return value is a function that halts monitoring when called.
 initAutoReloadMonitor <- function(dir) {
-  if (!get_devmode_option("shiny.autoreload", FALSE)) {
+  if (!getOption("shiny.autoreload", FALSE)) {
     return(function(){})
   }
 
@@ -339,7 +339,7 @@ initAutoReloadMonitor <- function(dir) {
 #' @param appDir The application directory. If `appDir` is `NULL` or
 #'   not supplied, the nearest enclosing directory that is a Shiny app, starting
 #'   with the current directory, is used.
-#' @param renv The environment in which the files in the `R/` directory should
+#' @param renv The environmeny in which the files in the `R/` directory should
 #'   be evaluated.
 #' @param globalrenv The environment in which `global.R` should be evaluated. If
 #'   `NULL`, `global.R` will not be evaluated at all.

R/shinyui.R

@@ -14,11 +14,7 @@ NULL
 #' # now we can just write "static" content without withMathJax()
 #' div("more math here $$\\sqrt{2}$$")
 withMathJax <- function(...) {
-  path <- paste0(
-    getOption("shiny.mathjax.url", "https://mathjax.rstudio.com/latest/MathJax.js"),
-    "?",
-    getOption("shiny.mathjax.config", "config=TeX-AMS-MML_HTMLorMML")
-  )
+  path <- 'https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
   tagList(
     tags$head(
       singleton(tags$script(src = path, type = 'text/javascript'))
@@ -148,7 +144,7 @@ shinyDependencyCSS <- function(theme) {
 
 #' Create a Shiny UI handler
 #'
-#' @description `r lifecycle::badge("superseded")`
+#' @description \lifecycle{superseded}
 #'
 #' @description Historically this function was used in ui.R files to register a user
 #' interface with Shiny. It is no longer required as of Shiny 0.10; simply

R/shinywrappers.R

@@ -778,9 +778,9 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #'   function.)
 #' @param contentType A string of the download's
 #'   [content type](https://en.wikipedia.org/wiki/Internet_media_type), for
-#'   example `"text/csv"` or `"image/png"`. If `NULL`, the content type 
-#'   will be guessed based on the filename extension, or 
-#'   `application/octet-stream` if the extension is unknown.
+#'   example `"text/csv"` or `"image/png"`. If `NULL` or
+#'   `NA`, the content type will be guessed based on the filename
+#'   extension, or `application/octet-stream` if the extension is unknown.
 #' @param outputArgs A list of arguments to be passed through to the implicit
 #'   call to [downloadButton()] when `downloadHandler` is used
 #'   in an interactive R Markdown document.
@@ -810,7 +810,7 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #' shinyApp(ui, server)
 #' }
 #' @export
-downloadHandler <- function(filename, content, contentType=NULL, outputArgs=list()) {
+downloadHandler <- function(filename, content, contentType=NA, outputArgs=list()) {
   renderFunc <- function(shinysession, name, ...) {
     shinysession$registerDownload(name, filename, contentType, content)
   }

R/staticimports.R

@@ -42,20 +42,36 @@ get_package_version <- function(pkg) {
 
 is_installed <- function(pkg, version = NULL) {
   installed <- isNamespaceLoaded(pkg) || nzchar(system_file_cached(package = pkg))
-
   if (is.null(version)) {
     return(installed)
   }
+  installed && isTRUE(get_package_version(pkg) >= version)
+}
 
-  if (!is.character(version) && !inherits(version, "numeric_version")) {
-    # Avoid https://bugs.r-project.org/show_bug.cgi?id=18548
-    alert <- if (identical(Sys.getenv("TESTTHAT"), "true")) stop else warning
-    alert("`version` must be a character string or a `package_version` or `numeric_version` object.")
+register_upgrade_message <- function(pkg, version, error = FALSE) {
 
-    version <- numeric_version(sprintf("%0.9g", version))
+  msg <- sprintf(
+    "This version of '%s' is designed to work with '%s' >= %s.
+    Please upgrade via install.packages('%s').",
+    environmentName(environment(register_upgrade_message)),
+    pkg, version, pkg
+  )
+
+  cond <- if (error) stop else packageStartupMessage
+
+  if (pkg %in% loadedNamespaces() && !is_installed(pkg, version)) {
+    cond(msg)
   }
 
-  installed && isTRUE(get_package_version(pkg) >= version)
+  # Always register hook in case pkg is loaded at some
+  # point the future (or, potentially, but less commonly,
+  # unloaded & reloaded)
+  setHook(
+    packageEvent(pkg, "onLoad"),
+    function(...) {
+      if (!is_installed(pkg, version)) cond(msg)
+    }
+  )
 }
 
 # Simplified version rlang:::s3_register() that just uses
@@ -174,9 +190,11 @@ system_file <- function(..., package = "base") {
   normalizePath(files, winslash = "/")
 }
 
-# A wrapper for `system.file()`, which caches the package path because
-# `system.file()` can be slow. If a package is not installed, the result won't
-# be cached.
+# A wrapper for `system.file()`, which caches the results, because
+# `system.file()` can be slow. Note that because of caching, if
+# `system_file_cached()` is called on a package that isn't installed, then the
+# package is installed, and then `system_file_cached()` is called again, it will
+# still return "".
 system_file_cached <- local({
   pkg_dir_cache <- character()
 
@@ -188,9 +206,7 @@ system_file_cached <- local({
     not_cached <- is.na(match(package, names(pkg_dir_cache)))
     if (not_cached) {
       pkg_dir <- system.file(package = package)
-      if (nzchar(pkg_dir)) {
-        pkg_dir_cache[[package]] <<- pkg_dir
-      }
+      pkg_dir_cache[[package]] <<- pkg_dir
     } else {
       pkg_dir <- pkg_dir_cache[[package]]
     }

R/update-input.R

@@ -423,23 +423,6 @@ updateSliderInput <- function(session = getDefaultReactiveDomain(), inputId, lab
 {
   validate_session_object(session)
 
-  if (!is.null(value)) {
-    if (!is.null(min) && !is.null(max)) {
-      # Validate value/min/max together if all three are provided
-      tryCatch(
-        validate_slider_value(min, max, value, "updateSliderInput"),
-        error = function(err) warning(conditionMessage(err), call. = FALSE)
-      )
-    } else if (length(value) <  1 || length(value) > 2 || any(is.na(value))) {
-      # Otherwise ensure basic assumptions about value are met
-      warning(
-        "In updateSliderInput(): value must be a single value or a length-2 ",
-        "vector and cannot contain NA values.",
-        call. = FALSE
-      )
-    }
-  }
-
   # If no min/max/value is provided, we won't know the
   # type, and this will return an empty string
   dataType <- getSliderType(min, max, value)

R/utils.R

@@ -4,7 +4,7 @@ NULL
 
 # @staticimports pkg:staticimports
 #   is_installed get_package_version system_file
-#   s3_register
+#   s3_register register_upgrade_message
 #   any_named any_unnamed
 
 #' Make a random number generator repeatable
@@ -162,7 +162,7 @@ mergeVectors <- function(a, b) {
 # 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, method = "auto") {
+sortByName <- function(x) {
   if (any_unnamed(x))
     stop("All items must be named")
 
@@ -170,19 +170,7 @@ sortByName <- function(x, method = "auto") {
   if (length(x) == 0)
     return(x)
 
-  # Must provide consistent sort order
-  #  https://github.com/rstudio/shinytest/issues/409
-  # Using a flag in the snapshot url to determine the method
-  # `method="radix"` uses `C` locale, which is consistent across platforms
-  # Even if two platforms share `en_us.UTF-8`, they may not sort consistently
-  #  https://blog.zhimingwang.org/macos-lc_collate-hunt
-  #  (macOS) $ LC_ALL=en_US.UTF-8 sort <<<$'python-dev\npython3-dev'
-  #  python-dev
-  #  python3-dev
-  #  (Linux) $ LC_ALL=en_US.UTF-8 sort <<<$'python-dev\npython3-dev'
-  #  python3-dev
-  #  python-dev
-  x[order(names(x), method = method)]
+  x[order(names(x))]
 }
 
 # Sort a vector. If a character vector, sort using C locale, which is consistent
@@ -1240,12 +1228,14 @@ dotloop <- function(fun_, ...) {
 #' @param x An expression whose truthiness value we want to determine
 #' @export
 isTruthy <- function(x) {
-  if (is.null(x))
-    return(FALSE)
   if (inherits(x, 'try-error'))
     return(FALSE)
+
   if (!is.atomic(x))
     return(TRUE)
+
+  if (is.null(x))
+    return(FALSE)
   if (length(x) == 0)
     return(FALSE)
   if (all(is.na(x)))
@@ -1429,12 +1419,6 @@ wrapFunctionLabel <- function(func, name, ..stacktraceon = FALSE, dots = TRUE) {
   if (name == "name" || name == "func" || name == "relabelWrapper") {
     stop("Invalid name for wrapFunctionLabel: ", name)
   }
-  if (nchar(name, "bytes") > 10000) {
-    # Max variable length in R is 10000 bytes. Truncate to a shorter number of
-    # chars because some characters could be multi-byte.
-    name <- substr(name, 1, 5000)
-  }
-
   assign(name, func, environment())
   registerDebugHook(name, environment(), name)
 

R/version_jqueryui.R

@@ -1,2 +0,0 @@
-# Generated by tools/updatejQueryUI.R; do not edit by hand
-version_jqueryui <- "1.13.2"

R/version_selectize.R

@@ -1,2 +1,2 @@
 # Generated by tools/updateSelectize.R; do not edit by hand
-version_selectize <- "0.15.2"
+version_selectize <- "0.12.4"

README.md

@@ -16,7 +16,7 @@ Easily build rich and productive interactive web apps in R — no HTML/CSS/J
 * A prebuilt set of highly sophisticated, customizable, and easy-to-use widgets (e.g., plots, tables, sliders, dropdowns, date pickers, and more).
 * An attractive default look based on [Bootstrap](https://getbootstrap.com/) which can also be easily customized with the [bslib](https://github.com/rstudio/bslib) package or avoided entirely with more direct R bindings to HTML/CSS/JavaScript.
 * Seamless integration with [R Markdown](https://shiny.rstudio.com/articles/interactive-docs.html), making it easy to embed numerous applications natively within a larger dynamic document.
-* Tools for improving and monitoring performance, including native support for [async programming](https://posit.co/blog/shiny-1-1-0/), [caching](https://talks.cpsievert.me/20201117), [load testing](https://rstudio.github.io/shinyloadtest/), and more.
+* Tools for improving and monitoring performance, including native support for [async programming](https://blog.rstudio.com/2018/06/26/shiny-1-1-0/), [caching](https://talks.cpsievert.me/20201117), [load testing](https://rstudio.github.io/shinyloadtest/), and [more](https://support.rstudio.com/hc/en-us/articles/231874748-Scaling-and-Performance-Tuning-in-RStudio-Connect).
 * [Modules](https://shiny.rstudio.com/articles/modules.html): a framework for reducing code duplication and complexity.
 * An ability to [bookmark application state](https://shiny.rstudio.com/articles/bookmarking-state.html) and/or [generate code to reproduce output(s)](https://github.com/rstudio/shinymeta).
 * A rich ecosystem of extension packages for more [custom widgets](http://www.htmlwidgets.org/), [input validation](https://github.com/rstudio/shinyvalidate), [unit testing](https://github.com/rstudio/shinytest), and more.
@@ -45,10 +45,6 @@ For more examples and inspiration, check out the [Shiny User Gallery](https://sh
 
 For help with learning fundamental Shiny programming concepts, check out the [Mastering Shiny](https://mastering-shiny.org/) book and the [Shiny Tutorial](https://shiny.rstudio.com/tutorial/). The former is currently more up-to-date with modern Shiny features, whereas the latter takes a deeper, more visual, dive into fundamental concepts.
 
-## Join the conversation
-
-If you want to chat about Shiny, meet other developers, or help us decide what to work on next, [join us on Discord](https://discord.com/invite/yMGCamUMnS).
-
 ## Getting Help
 
 To ask a question about Shiny, please use the [RStudio Community website](https://community.rstudio.com/new-topic?category=shiny&tags=shiny).

inst/app_template/tests/shinytest.R

@@ -0,0 +1,2 @@
+library(shinytest)
+expect_pass(testApp("../", suffix = osName()))

inst/app_template/tests/shinytest/mytest.R

@@ -0,0 +1,12 @@
+app <- ShinyDriver$new("../../")
+app$snapshotInit("mytest")
+
+app$snapshot()
+{{
+if (isTRUE(module)) {
+'
+app$setInputs(`examplemodule1-button` = "click")
+app$setInputs(`examplemodule1-button` = "click")
+app$snapshot()'
+}
+}}

inst/app_template/tests/testthat.R

@@ -1 +1,9 @@
-shinytest2::test_app()
+library(testthat)
+
+test_dir(
+  "./testthat",
+  # Run in the app's environment containing all support methods.
+  env = shiny::loadSupport(),
+  # Display the regular progress output and throw an error if any test error is found
+  reporter = c("progress", "fail")
+)

inst/app_template/tests/testthat/setup-shinytest2.R

@@ -1,2 +0,0 @@
-# Load application support files into testing environment
-shinytest2::load_app_env()

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

@@ -14,4 +14,5 @@ if (isTRUE(rdir)) {
   expect_equal(output$sequence, "1 2 3 4 5 6 7 8 9 10 11 12")
 '
 }
-}}})
+}}
+})

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

@@ -1,18 +0,0 @@
-library(shinytest2)
-
-test_that("Initial snapshot values are consistent", {
-  app <- AppDriver$new(name = "init")
-  app$expect_values()
-}){{
-if (isTRUE(module)) {
-HTML('
-
-
-test_that("Module values are consistent", {
-  app <- AppDriver$new(name = "mod")
-  app$click("examplemodule1-button")
-  app$click("examplemodule1-button")
-  app$expect_values()
-})')
-}
-}}

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

@@ -1,6 +1,5 @@
 @charset "UTF-8";
 /* 'shiny' skin for Ion.RangeSlider, largely based on the 'big' skin, but with smaller dimensions, grayscale grid text, and without gradients
-© Posit, PBC, 2023
 © RStudio, Inc, 2014
 © Denis Ineshin, 2014  https://github.com/IonDen
 © guybowden, 2014  https://github.com/guybowden
@@ -175,18 +174,6 @@
   background-color: #ededed;
   border: 1px solid #cccccc;
   border-radius: 8px;
-  overflow: visible;
-}
-
-.irs--shiny .irs-line::before {
-  content: "";
-  display: block;
-  position: relative;
-  cursor: s-resize;
-  width: 100%;
-  height: 22px;
-  top: -9px;
-  z-index: 1;
 }
 
 .irs--shiny .irs-bar {
@@ -195,24 +182,12 @@
   border-top: 1px solid #428bca;
   border-bottom: 1px solid #428bca;
   background: #428bca;
-  cursor: s-resize;
-  z-index: 2;
 }
 
 .irs--shiny .irs-bar--single {
   border-radius: 8px 0 0 8px;
 }
 
-.irs--shiny .irs-bar::before {
-  content: "";
-  display: block;
-  position: relative;
-  width: 100%;
-  height: 22px;
-  top: -9px;
-  z-index: 2;
-}
-
 .irs--shiny .irs-shadow {
   top: 38px;
   height: 2px;
@@ -232,7 +207,6 @@
   background-color: #dedede;
   box-shadow: 1px 1px 3px rgba(255, 255, 255, 0.3);
   border-radius: 22px;
-  z-index: 2;
 }
 
 .irs--shiny .irs-handle.state_hover, .irs--shiny .irs-handle:hover {

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

@@ -753,7 +753,7 @@
                 x = $handle.offset().left;
                 x += ($handle.width() / 2) - 1;
 
-                this.pointerClick("single", {preventDefault: function () {}, stopPropagation: function () {}, pageX: x});
+                this.pointerClick("single", {preventDefault: function () {}, pageX: x});
             }
         },
 

inst/www/shared/ionrangeslider/scss/shiny.scss

@@ -1,5 +1,4 @@
 /* 'shiny' skin for Ion.RangeSlider, largely based on the 'big' skin, but with smaller dimensions, grayscale grid text, and without gradients
-© Posit, PBC, 2023
 © RStudio, Inc, 2014
 © Denis Ineshin, 2014  https://github.com/IonDen
 © guybowden, 2014  https://github.com/guybowden
@@ -80,19 +79,6 @@ $font-family: $font-family-base !default;
     background-color: $line_bg_color;
     border: $line_border;
     @include border-radius-shim($line_height);
-
-    // Increase the touch target area of the slider line
-    overflow: visible;
-    &::before {
-      content: "";
-      display: block;
-      position: relative;
-      cursor: s-resize; // downward arrow
-      width: 100%;
-      height: $handle_height;
-      top: -(($handle_height - $line_height / 2) / 2);
-      z-index: 1; // raise touch area above grid
-    }
   }
 
   .#{$name}-bar {
@@ -101,23 +87,10 @@ $font-family: $font-family-base !default;
     border-top: 1px solid $bar_color;
     border-bottom: 1px solid $bar_color;
     background: $bar_color;
-    cursor: s-resize; // downard arrow, overwritten when a range
-    z-index: 2;
 
     &--single {
       @include border-radius-shim($line_height 0 0 $line_height);
     }
-
-    // Increase the touch target area of the slider bar
-    &::before {
-      content: "";
-      display: block;
-      position: relative;
-      width: 100%;
-      height: $handle_height;
-      top: -(($handle_height - $line_height / 2) / 2);
-      z-index: 2; // raise touch area above line touch target
-    }
   }
 
   // sliderInput() doesn't currently support from_min/from_max, so this isn't relevant
@@ -141,7 +114,6 @@ $font-family: $font-family-base !default;
     background-color: $handle_color;
     box-shadow: $handle_box_shadow;
     border-radius: $handle_width;
-    z-index: 2;
 
     &.state_hover,
     &:hover {

inst/www/shared/jqueryui/AUTHORS.txt

@@ -312,7 +312,7 @@ Mani Mishra <manimishra902@gmail.com>
 Hannah Methvin <hannahmethvin@gmail.com>
 Leonardo Balter <leonardo.balter@gmail.com>
 Benjamin Albert <benjamin_a5@yahoo.com>
-Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
+Michał Gołębiowski <m.goleb@gmail.com>
 Alyosha Pushak <alyosha.pushak@gmail.com>
 Fahad Ahmad <fahadahmad41@hotmail.com>
 Matt Brundage <github@mattbrundage.com>
@@ -331,42 +331,3 @@ Peter Dave Hello <hsu@peterdavehello.org>
 Johannes Schäfer <johnschaefer@gmx.de>
 Ville Skyttä <ville.skytta@iki.fi>
 Ryan Oriecuia <ryan.oriecuia@visioncritical.com>
-Sergei Ratnikov <sergeir82@gmail.com>
-milk54 <milk851@gmail.com>
-Evelyn Masso <evoutofambit@gmail.com>
-Robin <mail@robin-fowler.com>
-Simon Asika <asika32764@gmail.com>
-Kevin Cupp <kevin.cupp@gmail.com>
-Jeremy Mickelson <Jeremy.Mickelson@gmail.com>
-Kyle Rosenberg <kyle.rosenberg@gmail.com>
-Petri Partio <petri.partio@gmail.com>
-pallxk <github@pallxk.com>
-Luke Brookhart <luke@onjax.com>
-claudi <hirt-claudia@gmx.de>
-Eirik Sletteberg <eiriksletteberg@gmail.com>
-Albert Johansson <albert@intervaro.se>
-A. Wells <borgboyone@users.noreply.github.com>
-Robert Brignull <robertbrignull@gmail.com>
-Horus68 <pauloizidoro@gmail.com>
-Maksymenkov Eugene <foatei@gmail.com>
-OskarNS <soerensen.oskar@gmail.com>
-Gez Quinn <holla@gezquinn.design>
-jigar gala <jigar.gala140291@gmail.com>
-Florian Wegscheider <flo.wegscheider@gmail.com>
-Fatér Zsolt <fater.zsolt@gmail.com>
-Szabolcs Szabolcsi-Toth <nec@shell8.net>
-Jérémy Munsch <github@jeremydev.ovh>
-Hrvoje Novosel <hrvoje.novosel@gmail.com>
-Paul Capron <PaulCapron@users.noreply.github.com>
-Micah Miller <mikhey@runbox.com>
-sakshi87 <53863764+sakshi87@users.noreply.github.com>
-Mikolaj Wolicki <wolicki.mikolaj@gmail.com>
-Patrick McKay <patrick.mckay@vumc.org>
-c-lambert <58025159+c-lambert@users.noreply.github.com>
-Josep Sanz <josepsanzcamp@gmail.com>
-Ben Mullins <benm@umich.edu>
-Christian Oliff <christianoliff@pm.me>
-dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-Adam Lidén Hällgren <adamlh92@gmail.com>
-James Hinderks <hinderks@gmail.com>
-Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>

inst/www/shared/jqueryui/README

@@ -0,0 +1,5 @@
+This a full jQuery UI build, downloaded from:
+https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip
+
+The copy of jQuery that is bundled with the download, under external/, is not
+included because Shiny already has its own copy of jQuery.

inst/www/shared/jqueryui/index.html

@@ -58,6 +58,7 @@
 
 <h1>YOUR COMPONENTS:</h1>
 
+
 <!-- Accordion -->
 <h2 class="demoHeaders">Accordion</h2>
 <div id="accordion">
@@ -69,17 +70,23 @@
 	<div>Nam dui erat, auctor a, dignissim quis.</div>
 </div>
 
+
+
 <!-- Autocomplete -->
 <h2 class="demoHeaders">Autocomplete</h2>
 <div>
 	<input id="autocomplete" title="type &quot;a&quot;">
 </div>
 
+
+
 <!-- Button -->
 <h2 class="demoHeaders">Button</h2>
 <button id="button">A button element</button>
 <button id="button-icon">An icon-only button</button>
 
+
+
 <!-- Checkboxradio -->
 <h2 class="demoHeaders">Checkboxradio</h2>
 <form style="margin-top: 1em;">
@@ -90,6 +97,8 @@
 	</div>
 </form>
 
+
+
 <!-- Controlgroup -->
 <h2 class="demoHeaders">Controlgroup</h2>
 <fieldset>
@@ -116,6 +125,8 @@
 	</div>
 </fieldset>
 
+
+
 <!-- Tabs -->
 <h2 class="demoHeaders">Tabs</h2>
 <div id="tabs">
@@ -129,6 +140,8 @@
 	<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
 </div>
 
+
+
 <h2 class="demoHeaders">Dialog</h2>
 <p>
 	<button id="dialog-link" class="ui-button ui-corner-all ui-widget">
@@ -154,6 +167,7 @@
 </div>
 
 
+
 <h2 class="demoHeaders">Framework Icons (content color preview)</h2>
 <ul id="icons" class="ui-widget ui-helper-clearfix">
 	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-n"><span class="ui-icon ui-icon-caret-1-n"></span></li>
@@ -331,18 +345,25 @@
 	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
 </ul>
 
+
 <!-- Slider -->
 <h2 class="demoHeaders">Slider</h2>
 <div id="slider"></div>
 
+
+
 <!-- Datepicker -->
 <h2 class="demoHeaders">Datepicker</h2>
 <div id="datepicker"></div>
 
+
+
 <!-- Progressbar -->
 <h2 class="demoHeaders">Progressbar</h2>
 <div id="progressbar"></div>
 
+
+
 <!-- Progressbar -->
 <h2 class="demoHeaders">Selectmenu</h2>
 <select id="selectmenu">
@@ -353,10 +374,14 @@
 	<option>Faster</option>
 </select>
 
+
+
 <!-- Spinner -->
 <h2 class="demoHeaders">Spinner</h2>
 <input id="spinner">
 
+
+
 <!-- Menu -->
 <h2 class="demoHeaders">Menu</h2>
 <ul style="width:100px;" id="menu">
@@ -375,6 +400,8 @@
 	<li><div>Item 5</div></li>
 </ul>
 
+
+
 <!-- Tooltip -->
 <h2 class="demoHeaders">Tooltip</h2>
 <p id="tooltip">
@@ -382,6 +409,7 @@
 the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
 </p>
 
+
 <!-- Highlight / Error -->
 <h2 class="demoHeaders">Highlight / Error</h2>
 <div class="ui-widget">
@@ -401,8 +429,11 @@ the element with your mouse, the title attribute is displayed in a little box ne
 <script src="external/jquery/jquery.js"></script>
 <script src="jquery-ui.js"></script>
 <script>
+
 $( "#accordion" ).accordion();
 
+
+
 var availableTags = [
 	"ActionScript",
 	"AppleScript",
@@ -431,18 +462,28 @@ $( "#autocomplete" ).autocomplete({
 	source: availableTags
 });
 
+
+
 $( "#button" ).button();
 $( "#button-icon" ).button({
 	icon: "ui-icon-gear",
 	showLabel: false
 });
 
+
+
 $( "#radioset" ).buttonset();
 
+
+
 $( "#controlgroup" ).controlgroup();
 
+
+
 $( "#tabs" ).tabs();
 
+
+
 $( "#dialog" ).dialog({
 	autoOpen: false,
 	width: 400,
@@ -468,27 +509,42 @@ $( "#dialog-link" ).click(function( event ) {
 	event.preventDefault();
 });
 
+
+
 $( "#datepicker" ).datepicker({
 	inline: true
 });
 
+
+
 $( "#slider" ).slider({
 	range: true,
 	values: [ 17, 67 ]
 });
 
+
+
 $( "#progressbar" ).progressbar({
 	value: 20
 });
 
+
+
 $( "#spinner" ).spinner();
 
+
+
 $( "#menu" ).menu();
 
+
+
 $( "#tooltip" ).tooltip();
 
+
+
 $( "#selectmenu" ).selectmenu();
 
+
 // Hover states on the static widgets
 $( "#dialog-link, #icons li" ).hover(
 	function() {

inst/www/shared/jqueryui/jquery-ui.css

@@ -1,4 +1,4 @@
-/*! jQuery UI - v1.13.2 - 2022-07-14
+/*! jQuery UI - v1.12.1 - 2016-09-14
 * http://jqueryui.com
 * Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
 * To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
@@ -45,7 +45,7 @@
 	left: 0;
 	position: absolute;
 	opacity: 0;
-	-ms-filter: "alpha(opacity=0)"; /* support: IE8 */
+	filter:Alpha(Opacity=0); /* support: IE8 */
 }
 
 .ui-front {
@@ -664,7 +664,7 @@ button.ui-button::-moz-focus-inner {
 .ui-progressbar .ui-progressbar-overlay {
 	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
 	height: 100%;
-	-ms-filter: "alpha(opacity=25)"; /* support: IE8 */
+	filter: alpha(opacity=25); /* support: IE8 */
 	opacity: 0.25;
 }
 .ui-progressbar-indeterminate .ui-progressbar-value {
@@ -728,7 +728,7 @@ button.ui-button::-moz-focus-inner {
 	z-index: 2;
 	width: 1.2em;
 	height: 1.2em;
-	cursor: pointer;
+	cursor: default;
 	-ms-touch-action: none;
 	touch-action: none;
 }
@@ -1041,18 +1041,18 @@ a.ui-button:active,
 .ui-widget-content .ui-priority-secondary,
 .ui-widget-header .ui-priority-secondary {
 	opacity: .7;
-	-ms-filter: "alpha(opacity=70)"; /* support: IE8 */
+	filter:Alpha(Opacity=70); /* support: IE8 */
 	font-weight: normal;
 }
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled,
 .ui-widget-header .ui-state-disabled {
 	opacity: .35;
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 */
+	filter:Alpha(Opacity=35); /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 - See #6059 */
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -1093,10 +1093,7 @@ a.ui-button:active,
 }
 
 /* positioning */
-/* Three classes needed to override `.ui-button:hover .ui-icon` */
-.ui-icon-blank.ui-icon-blank.ui-icon-blank {
-	background-image: none;
-}
+.ui-icon-blank { background-position: 16px 16px; }
 .ui-icon-caret-1-n { background-position: 0 0; }
 .ui-icon-caret-1-ne { background-position: -16px 0; }
 .ui-icon-caret-1-e { background-position: -32px 0; }
@@ -1307,7 +1304,7 @@ a.ui-button:active,
 .ui-widget-overlay {
 	background: #aaaaaa;
 	opacity: .003;
-	-ms-filter: Alpha(Opacity=.3); /* support: IE8 */
+	filter: Alpha(Opacity=.3); /* support: IE8 */
 }
 .ui-widget-shadow {
 	-webkit-box-shadow: 0px 0px 5px #666666;

inst/www/shared/jqueryui/jquery-ui.structure.css

@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.13.2
+ * jQuery UI CSS Framework 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -49,7 +49,7 @@
 	left: 0;
 	position: absolute;
 	opacity: 0;
-	-ms-filter: "alpha(opacity=0)"; /* support: IE8 */
+	filter:Alpha(Opacity=0); /* support: IE8 */
 }
 
 .ui-front {
@@ -668,7 +668,7 @@ button.ui-button::-moz-focus-inner {
 .ui-progressbar .ui-progressbar-overlay {
 	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
 	height: 100%;
-	-ms-filter: "alpha(opacity=25)"; /* support: IE8 */
+	filter: alpha(opacity=25); /* support: IE8 */
 	opacity: 0.25;
 }
 .ui-progressbar-indeterminate .ui-progressbar-value {
@@ -732,7 +732,7 @@ button.ui-button::-moz-focus-inner {
 	z-index: 2;
 	width: 1.2em;
 	height: 1.2em;
-	cursor: pointer;
+	cursor: default;
 	-ms-touch-action: none;
 	touch-action: none;
 }

inst/www/shared/jqueryui/jquery-ui.theme.css

@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.13.2
+ * jQuery UI CSS Framework 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -172,18 +172,18 @@ a.ui-button:active,
 .ui-widget-content .ui-priority-secondary,
 .ui-widget-header .ui-priority-secondary {
 	opacity: .7;
-	-ms-filter: "alpha(opacity=70)"; /* support: IE8 */
+	filter:Alpha(Opacity=70); /* support: IE8 */
 	font-weight: normal;
 }
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled,
 .ui-widget-header .ui-state-disabled {
 	opacity: .35;
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 */
+	filter:Alpha(Opacity=35); /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 - See #6059 */
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -224,10 +224,7 @@ a.ui-button:active,
 }
 
 /* positioning */
-/* Three classes needed to override `.ui-button:hover .ui-icon` */
-.ui-icon-blank.ui-icon-blank.ui-icon-blank {
-	background-image: none;
-}
+.ui-icon-blank { background-position: 16px 16px; }
 .ui-icon-caret-1-n { background-position: 0 0; }
 .ui-icon-caret-1-ne { background-position: -16px 0; }
 .ui-icon-caret-1-e { background-position: -32px 0; }
@@ -438,7 +435,7 @@ a.ui-button:active,
 .ui-widget-overlay {
 	background: #aaaaaa;
 	opacity: .003;
-	-ms-filter: Alpha(Opacity=.3); /* support: IE8 */
+	filter: Alpha(Opacity=.3); /* support: IE8 */
 }
 .ui-widget-shadow {
 	-webkit-box-shadow: 0px 0px 5px #666666;

inst/www/shared/selectize/accessibility/js/selectize-plugin-a11y.js

@@ -42,7 +42,7 @@ Selectize.define("selectize-plugin-a11y", function (options) {
               // random IDs are assigned when .selectize() is called, but we're
               // doing it here to limit the scope of changes.
               var kids = self.$dropdown_content[0].children;
-              for (var i = 0; i < kids.length; i++) {
+              for (i = 0; i < kids.length; i++) {
                 var attrs = kids[i].attributes;
                 if (!attrs.role) {
                   kids[i].setAttribute("role", "option");

inst/www/shared/selectize/accessibility/js/selectize-plugin-a11y.min.js

@@ -1 +1 @@
-Selectize.define("selectize-plugin-a11y",function(c){var t=this,l=13;typeof t.accessibility=="undefined"&&(t.accessibility={}),t.accessibility.helpers={randomId:function(e){for(var r="",s=e||10,i="abcdefghijklmnopqrstuvwxyz0123456789",n=i.length,a=0;a<s;a++)r+=i[Math.floor(n*Math.random())];return r}},t.accessibility.liveRegion={$region:"",speak:function(e){var r=$("<div></div>");r.text(e),this.$region.html(r)},domListener:function(){var e=new MutationObserver(function(r){r.forEach(function(s){var i=$(s.target);if(i.hasClass("items"))if(i.hasClass("dropdown-active")){t.$control_input.attr("aria-expanded","true");for(var n=t.$dropdown_content[0].children,a=0;a<n.length;a++){var o=n[a].attributes;o.role||n[a].setAttribute("role","option"),o.id||n[a].setAttribute("id",t.accessibility.helpers.randomId())}}else t.$control_input.attr("aria-expanded","false"),t.$control_input.removeAttr("aria-activedescendant");else i.hasClass("active")&&i.attr("data-value")&&(t.$control_input.attr("aria-activedescendant",i.attr("id")),t.accessibility.liveRegion.speak(i.text(),500))})});e.observe(t.$dropdown[0],{attributes:!0,attributeFilter:["class"],subtree:!0,attributeOldValue:!0}),e.observe(t.$control[0],{attributes:!0,attributeFilter:["class"]}),e.observe(t.$control_input[0],{attributes:!0,attributeFilter:["value"]})},setAttributes:function(){this.$region.attr({"aria-live":"assertive",role:"log","aria-relevant":"additions","aria-atomic":"true"})},setStyles:function(){this.$region.css({position:"absolute",width:"1px",height:"1px","margin-top":"-1px",clip:"rect(1px, 1px, 1px, 1px)",overflow:"hidden"})},init:function(){this.$region=$("<div>"),this.setAttributes(),this.setStyles(),$("body").append(this.$region),this.domListener()}},this.setup=function(){var e=t.setup;return function(){e.apply(this,arguments);var r=t.accessibility.helpers.randomId(),s=t.accessibility.helpers.randomId();t.$control.on("keydown",function(i){i.keyCode===l&&(t.settings.openOnFocus?(t.settings.openOnFocus=!1,t.focus(),setTimeout(function(){t.settings.openOnFocus=!0},0)):t.focus())}),t.$control_input.attr({role:"combobox","aria-expanded":"false",haspopup:"listbox","aria-owns":s,"aria-label":t.$wrapper.closest("[data-accessibility-selectize-label]").attr("data-accessibility-selectize-label")}),t.$dropdown_content.attr({role:"listbox",id:s}),t.accessibility.liveRegion.init()}}(),this.destroy=function(){var e=t.destroy;return function(){return t.accessibility.liveRegion.$region.remove(),e.apply(this,arguments)}}()});
+Selectize.define("selectize-plugin-a11y",function(c){var t=this,l=13;typeof t.accessibility=="undefined"&&(t.accessibility={}),t.accessibility.helpers={randomId:function(e){for(var a="",s=e||10,r="abcdefghijklmnopqrstuvwxyz0123456789",n=r.length,o=0;o<s;o++)a+=r[Math.floor(n*Math.random())];return a}},t.accessibility.liveRegion={$region:"",speak:function(e){var a=$("<div></div>");a.text(e),this.$region.html(a)},domListener:function(){var e=new MutationObserver(function(a){a.forEach(function(s){var r=$(s.target);if(r.hasClass("items"))if(r.hasClass("dropdown-active")){t.$control_input.attr("aria-expanded","true");var n=t.$dropdown_content[0].children;for(i=0;i<n.length;i++){var o=n[i].attributes;o.role||n[i].setAttribute("role","option"),o.id||n[i].setAttribute("id",t.accessibility.helpers.randomId())}}else t.$control_input.attr("aria-expanded","false"),t.$control_input.removeAttr("aria-activedescendant");else r.hasClass("active")&&r.attr("data-value")&&(t.$control_input.attr("aria-activedescendant",r.attr("id")),t.accessibility.liveRegion.speak(r.text(),500))})});e.observe(t.$dropdown[0],{attributes:!0,attributeFilter:["class"],subtree:!0,attributeOldValue:!0}),e.observe(t.$control[0],{attributes:!0,attributeFilter:["class"]}),e.observe(t.$control_input[0],{attributes:!0,attributeFilter:["value"]})},setAttributes:function(){this.$region.attr({"aria-live":"assertive",role:"log","aria-relevant":"additions","aria-atomic":"true"})},setStyles:function(){this.$region.css({position:"absolute",width:"1px",height:"1px","margin-top":"-1px",clip:"rect(1px, 1px, 1px, 1px)",overflow:"hidden"})},init:function(){this.$region=$("<div>"),this.setAttributes(),this.setStyles(),$("body").append(this.$region),this.domListener()}},this.setup=function(){var e=t.setup;return function(){e.apply(this,arguments);var a=t.accessibility.helpers.randomId(),s=t.accessibility.helpers.randomId();t.$control.on("keydown",function(r){r.keyCode===l&&(t.settings.openOnFocus?(t.settings.openOnFocus=!1,t.focus(),setTimeout(function(){t.settings.openOnFocus=!0},0)):t.focus())}),t.$control_input.attr({role:"combobox","aria-expanded":"false",haspopup:"listbox","aria-owns":s,"aria-label":t.$wrapper.closest("[data-accessibility-selectize-label]").attr("data-accessibility-selectize-label")}),t.$dropdown_content.attr({role:"listbox",id:s}),t.accessibility.liveRegion.init()}}(),this.destroy=function(){var e=t.destroy;return function(){return t.accessibility.liveRegion.$region.remove(),e.apply(this,arguments)}}()});

inst/www/shared/selectize/scss/plugins/auto_position.scss

@@ -1,16 +0,0 @@
-.#{selectize}-dropdown.plugin-auto_position.#{$selectize}-position-top {
-  border-top: 1px solid $select-color-border;
-  border-bottom: 0 none;
-  border-radius: 3px 3px 0 0;
-  box-shadow: 0 -6px 12px rgba(var(--bs-body-color-rgb, 0,0,0), .18);
-}
-
-.#{selectize}-control.plugin-auto_position .#{selectize}-input.#{$selectize}-position-top.dropdown-active {
-  border-radius: 0 0 3px 3px;
-  border-top: 0 none;
-
-  &::before {
-    top: 0;
-    bottom: unset;
-  }
-}

inst/www/shared/selectize/scss/plugins/clear_button.scss

@@ -1,29 +0,0 @@
-.#{$selectize}-control.plugin-clear_button {
-    .clear {
-        text-decoration: none;
-        display: flex;
-        position: absolute;
-        height: 100%;
-        width: 25px;
-        top: 0;
-        right: calc(#{$select-padding-x} - #{$select-padding-item-x});
-        color: var(--bs-body-color, black);
-        opacity: 0.4;
-        font-weight: bold;
-        border: none;
-        cursor: pointer;
-        z-index: 1;
-        font-size: 21px;
-        justify-content: center;
-        align-items: center;
-    }
-
-    .clear:hover {
-        opacity: 1;
-    }
-
-    &.single .clear {
-        right: calc(#{$select-padding-x} - #{$select-padding-item-x} + 1.5rem);
-    }
-
-}

inst/www/shared/selectize/scss/plugins/drag_drop.scss

@@ -1,19 +1,16 @@
-.#{$selectize}-control.plugin-drag_drop {
-  &.multi > .#{$selectize}-input.dragging {
-    overflow: visible;
-  }
-  &.multi > .#{$selectize}-input > div.ui-sortable-placeholder {
-    visibility: visible !important;
-    background: #f2f2f2 !important;
-    background: rgba(0, 0, 0, 0.06) !important;
-    border: 0 none !important;
-    box-shadow: inset 0 0 12px 4px #fff;
+.selectize-control.plugin-drag_drop {
+  &.multi > .selectize-input > div.ui-sortable-placeholder {
+	visibility: visible !important;
+	background: #f2f2f2 !important;
+	background: rgba(0,0,0,0.06) !important;
+	border: 0 none !important;
+	@include selectize-box-shadow(inset 0 0 12px 4px #fff);
   }
   .ui-sortable-placeholder::after {
-    content: "!";
-    visibility: hidden;
+	content: '!';
+	visibility: hidden;
   }
   .ui-sortable-helper {
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+	@include selectize-box-shadow(0 2px 5px rgba(0,0,0,0.2));
   }
-}
+}

inst/www/shared/selectize/scss/plugins/dropdown_header.scss

@@ -1,24 +1,20 @@
-.#{$selectize}-dropdown.plugin-dropdown_header {
-  .#{$selectize}-dropdown-header {
-    position: relative;
-    padding: ($select-padding-dropdown-item-y * 2)
-      $select-padding-dropdown-item-x;
-    border-bottom: 1px solid $select-color-border;
-    background: RGBA($select-color-dropdown, 0.15);
-    border-radius: $select-border-radius $select-border-radius 0 0;
-  }
-  .#{$selectize}-dropdown-header-close {
-    position: absolute;
-    right: $select-padding-dropdown-item-x;
-    top: 50%;
-    color: $select-color-text;
-    opacity: 0.4;
-    margin-top: -12px;
-    line-height: 20px;
-    font-size: 20px !important;
-    text-decoration: none;
-  }
-  .#{$selectize}-dropdown-header-close:hover {
-    color: RGB($select-color-rgb);
-  }
+.selectize-dropdown-header {
+  position: relative;
+  padding: $selectize-padding-dropdown-item-y $selectize-padding-dropdown-item-x;
+  border-bottom: 1px solid $selectize-color-border;
+  background: mix($selectize-color-dropdown, $selectize-color-border, 85%);
+  @include selectize-border-radius($selectize-border-radius $selectize-border-radius 0 0);
 }
+.selectize-dropdown-header-close {
+  position: absolute;
+  right: $selectize-padding-dropdown-item-x;
+  top: 50%;
+  color: $selectize-color-text;
+  opacity: 0.4;
+  margin-top: -12px;
+  line-height: 20px;
+  font-size: 20px !important;
+}
+.selectize-dropdown-header-close:hover {
+  color: darken($selectize-color-text, 25%);
+}

inst/www/shared/selectize/scss/plugins/optgroup_columns.scss

@@ -1,22 +1,17 @@
-.#{$selectize}-dropdown.plugin-optgroup_columns {
-  .#{$selectize}-dropdown-content {
-    display: flex;
-  }
-
+.selectize-dropdown.plugin-optgroup_columns {
   .optgroup {
-    border-right: 1px solid #f2f2f2;
-    border-top: 0 none;
-    flex-grow: 1;
-    flex-basis: 0;
-    min-width: 0;
+	border-right: 1px solid #f2f2f2;
+	border-top: 0 none;
+	float: left;
+	@include selectize-box-sizing(border-box);
   }
   .optgroup:last-child {
-    border-right: 0 none;
+	border-right: 0 none;
   }
   .optgroup:before {
-    display: none;
+	display: none;
   }
   .optgroup-header {
-    border-top: 0 none;
+	border-top: 0 none;
   }
-}
+}

inst/www/shared/selectize/scss/plugins/remove_button.scss

@@ -1,38 +1,43 @@
-.#{$selectize}-control.plugin-remove_button {
-  .item {
-    display: inline-flex;
-    align-items: center;
-    padding-right: 0 !important;
+.selectize-control.plugin-remove_button {
+  [data-value] {
+	position: relative;
+	padding-right: 24px !important;
   }
-
-  .item .remove {
-    color: inherit;
-    text-decoration: none;
-    vertical-align: middle;
-    display: inline-block;
-    padding: $select-padding-item-y $select-padding-item-x;
-    border-left: 1px solid $select-color-item-border;
-    border-radius: 0 2px 2px 0;
-    box-sizing: border-box;
-    margin-left: $select-padding-item-x;
+  [data-value] .remove {
+	z-index: 1; /* fixes ie bug (see #392) */
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	width: 17px;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
+	color: inherit;
+	text-decoration: none;
+	vertical-align: middle;
+	display: inline-block;
+	padding: $selectize-padding-item-y 0 0 0;
+	border-left: 1px solid $selectize-color-item-border;
+	@include selectize-border-radius(0 2px 2px 0);
+	@include selectize-box-sizing(border-box);
   }
-
-  .item .remove:hover {
-    background: rgba(0, 0, 0, 0.05);
+  [data-value] .remove:hover {
+	background: rgba(0,0,0,0.05);
   }
-
-  .item.active .remove {
-    border-left-color: $select-color-item-active-border;
+  [data-value].active .remove {
+	border-left-color: $selectize-color-item-active-border;
   }
-
-  .disabled .item .remove:hover {
-    background: none;
+  .disabled [data-value] .remove:hover {
+	background: none;
   }
-
-  .disabled .item .remove {
-    border-left-color: lighten(
-      desaturate($select-color-item-border, 100%),
-      $select-lighten-disabled-item-border
-    );
+  .disabled [data-value] .remove {
+	border-left-color: lighten(desaturate($selectize-color-item-border, 100%), $selectize-lighten-disabled-item-border);
+  }
+  .remove-single {
+	position: absolute;
+	right: 0;
+	top: 0;
+	font-size: 23px;
   }
 }

inst/www/shared/selectize/scss/selectize.bootstrap3.scss

@@ -1,136 +1,158 @@
+/**
+ * selectize.bootstrap3.css (v0.12.3) - Bootstrap 3 Theme
+ * Copyright (c) 2013–2015 Brian Reavis & contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
+ * file except in compliance with the License. You may obtain a copy of the License at:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ * ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ *
+ * @author Brian Reavis <brian@thirdroute.com>
+ */
 
-$select-font-family: inherit;
-$select-font-size: inherit;
-$select-line-height: $line-height-computed;
+$selectize-font-family: inherit !default;
+$selectize-font-size: inherit !default;
+$selectize-line-height: $line-height-computed !default;
 
-$select-color-text: $text-color;
-$select-color-highlight: rgba(255, 237, 40, 0.4);
-$select-color-input: $input-bg;
-$select-color-input-full: $input-bg;
-$select-color-input-error: $state-danger-text;
-$select-color-input-error-focus: darken($select-color-input-error, 10%);
-$select-color-disabled: $input-bg;
-$select-color-item: RGBA($select-color-text, 0.1);
-$select-color-item-border: rgba(0, 0, 0, 0);
-$select-color-item-active: $component-active-bg;
-$select-color-item-active-text: color-contrast($select-color-item-active);
-$select-color-item-active-border: rgba(0, 0, 0, 0);
-$select-color-optgroup: $dropdown-bg;
-$select-color-optgroup-text: $dropdown-header-color;
-$select-color-optgroup-border: $dropdown-divider-bg;
-$select-color-dropdown: $dropdown-bg;
-$select-color-dropdown-border-top: mix($input-border, $input-bg, 80%);
-$select-color-dropdown-item-active: $dropdown-link-hover-bg;
-$select-color-dropdown-item-active-text: $dropdown-link-hover-color;
-$select-color-dropdown-item-create-active-text: $dropdown-link-hover-color;
-$select-opacity-disabled: 0.5;
-$select-shadow-input: none;
-$select-shadow-input-focus: inset 0 1px 2px rgba(0, 0, 0, 0.15);
-$select-shadow-input-error: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-$select-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-  0 0 6px lighten($select-color-input-error, 20%);
-$select-border: 1px solid $input-border;
-$select-border-radius: $input-border-radius;
+$selectize-color-text: $input-color !default;
+$selectize-color-highlight: rgba(255,237,40,0.4) !default;
+$selectize-color-input: $input-bg !default;
+$selectize-color-input-full: $input-bg !default;
+$selectize-color-input-error: $state-danger-text !default;
+$selectize-color-input-error-focus: darken($selectize-color-input-error, 10%) !default;
+$selectize-color-disabled: $input-bg !default;
+$selectize-color-item: mix($selectize-color-input, $selectize-color-text, 90%) !default;
+$selectize-color-item-border: rgba(black, 0) !default;
+$selectize-color-item-active: $component-active-bg !default;
+$selectize-color-item-active-text: color-contrast($selectize-color-item-active) !default;
+$selectize-color-item-active-border: rgba(black, 0) !default;
+$selectize-color-optgroup: $dropdown-bg !default;
+$selectize-color-optgroup-text: $dropdown-header-color !default;
+$selectize-color-optgroup-border: $dropdown-divider-bg !default;
+$selectize-color-dropdown: $dropdown-bg !default;
+$selectize-color-dropdown-text: $dropdown-link-color !default;
+$selectize-color-dropdown-border-top: mix($input-border, $input-bg, 0.8) !default;
+$selectize-color-dropdown-item-active: $dropdown-link-hover-bg !default;
+$selectize-color-dropdown-item-active-text: $dropdown-link-hover-color !default;
+$selectize-color-dropdown-item-create-active-text: $dropdown-link-hover-color !default;
+$selectize-opacity-disabled: 0.5 !default;
+$selectize-shadow-input: none !default;
+$selectize-shadow-input-focus: inset 0 1px 2px rgba(black, 0.15) !default;
+$selectize-shadow-input-error: inset 0 1px 1px rgba(black, .075) !default;
+$selectize-shadow-input-error-focus: inset 0 1px 1px rgba(black, .075), 0 0 6px lighten($selectize-color-input-error, 20%) !default;
+$selectize-border: 1px solid $input-border !default;
+$selectize-border-radius: $input-border-radius !default;
 
-$select-width-item-border: 0px;
-$select-padding-x: $padding-base-horizontal;
-$select-padding-y: $padding-base-vertical;
-$select-padding-dropdown-item-x: $padding-base-horizontal;
-$select-padding-dropdown-item-y: 3px;
-$select-padding-item-x: 5px;
-$select-padding-item-y: 1px;
-$select-margin-item-x: 3px;
-$select-margin-item-y: 3px;
+$selectize-width-item-border: 0 !default;
+$selectize-padding-x: $padding-base-horizontal !default;
+$selectize-padding-y: $padding-base-vertical !default;
+$selectize-padding-dropdown-item-x: $padding-base-horizontal !default;
+$selectize-padding-dropdown-item-y: 3px !default;
+$selectize-padding-item-x: 3px !default;
+$selectize-padding-item-y: 1px !default;
+$selectize-margin-item-x: 3px !default;
+$selectize-margin-item-y: 3px !default;
+$selectize-caret-margin: 0 !default;
 
-$select-arrow-size: 5px;
-$select-arrow-color: $select-color-text;
-$select-arrow-offset: $select-padding-x + 5px;
+$selectize-arrow-size: 5px !default;
+$selectize-arrow-color: $selectize-color-text !default;
+$selectize-arrow-offset: $selectize-padding-x + 5px !default;
 
 @import "selectize";
 
-.#{$selectize}-dropdown,
-.#{$selectize}-dropdown.form-control {
-  height: auto;
-  padding: 0;
-  margin: 2px 0 0 0;
-  z-index: $zindex-dropdown;
-  background: $select-color-dropdown;
-  border: 1px solid $dropdown-fallback-border;
-  border: 1px solid $dropdown-border;
-  border-radius: $border-radius-base;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+//Import Plugins
+@import "plugins/drag_drop";
+@import "plugins/dropdown_header";
+@import "plugins/optgroup_columns";
+@import "plugins/remove_button";
+
+.selectize-dropdown, .selectize-dropdown.form-control {
+    height: auto;
+    padding: 0;
+    margin: 2px 0 0 0;
+    z-index: $zindex-dropdown;
+    background: $selectize-color-dropdown;
+    color: $selectize-color-dropdown-text;
+    border: 1px solid $dropdown-fallback-border;
+    border: 1px solid $dropdown-border;
+    @include selectize-border-radius ($border-radius-base);
+    @include selectize-box-shadow (0 6px 12px rgba(black, .175));
 }
 
-.#{$selectize}-dropdown {
-  .optgroup-header {
-    font-size: $font-size-small;
-    line-height: $line-height-base;
-  }
-  .optgroup:first-child:before {
-    display: none;
-  }
-  .optgroup:before {
-    content: " ";
-    display: block;
-    @include nav-divider();
-    margin-left: $select-padding-dropdown-item-x * -1;
-    margin-right: $select-padding-dropdown-item-x * -1;
-  }
-}
-
-.#{$selectize}-dropdown-content {
-  padding: 5px 0;
-}
-
-.#{$selectize}-dropdown-emptyoptionlabel {
-	text-align: center;
-}
-
-.#{$selectize}-input {
-  min-height: $input-height-base;
-
-  &.dropdown-active {
-    border-radius: $select-border-radius;
-  }
-  &.dropdown-active::before {
-    display: none;
-  }
-  &.focus {
-    $color: $input-border-focus;
-    $color-rgba: rgba(red($color), green($color), blue($color), 0.6);
-    border-color: $color;
-    outline: 0;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px $color-rgba;
-  }
-}
-
-.has-error .#{$selectize}-input {
-  border-color: $select-color-input-error;
-  box-shadow: $select-shadow-input-error;
-
-  &:focus {
-    border-color: $select-color-input-error-focus;
-    box-shadow: $select-shadow-input-error-focus;
-  }
-}
-
-.#{$selectize}-control {
-  &.multi {
-    .#{$selectize}-input.has-items {
-      padding-left: $select-padding-x - $select-padding-item-x;
-      padding-right: $select-padding-x - $select-padding-item-x;
+.selectize-dropdown {
+    .optgroup-header {
+        font-size: $font-size-small;
+        line-height: $line-height-base;
     }
-    .#{$selectize}-input > div {
-      border-radius: $select-border-radius - 1px;
+    .optgroup:first-child:before {
+        display: none;
+    }
+    .optgroup:before {
+        content: ' ';
+        display: block;
+        @include nav-divider;
+        margin-left: $selectize-padding-dropdown-item-x * -1;
+        margin-right: $selectize-padding-dropdown-item-x * -1;
     }
-  }
 }
 
-.form-control.#{$selectize}-control {
-  padding: 0;
-  height: auto;
-  border: none;
-  background: none;
-  box-shadow: none;
-  border-radius: 0;
+.selectize-dropdown-content {
+    padding: 5px 0;
+}
+
+.selectize-dropdown-header {
+    padding: $selectize-padding-dropdown-item-y * 2 $selectize-padding-dropdown-item-x;
+}
+
+.selectize-input {
+    min-height: $input-height-base;
+
+    &.dropdown-active {
+        @include selectize-border-radius ($selectize-border-radius);
+    }
+    &.dropdown-active::before {
+        display: none;
+    }
+    &.focus {
+        $color: $input-border-focus;
+        $color-rgba: rgba(red($color), green($color), blue($color), .6);
+        border-color: $color;
+        outline: 0;
+        @include selectize-box-shadow ("inset 0 1px 1px rgba(black, .075), 0 0 8px #{$color-rgba}");
+    }
+}
+
+.has-error .selectize-input {
+    border-color: $selectize-color-input-error;
+    @include selectize-box-shadow ($selectize-shadow-input-error);
+
+    &:focus {
+        border-color: $selectize-color-input-error-focus;
+        @include selectize-box-shadow ($selectize-shadow-input-error-focus);
+    }
+}
+
+.selectize-control {
+    &.multi {
+        .selectize-input.has-items {
+            padding-left: $selectize-padding-x - $selectize-padding-item-x;
+            padding-right: $selectize-padding-x - $selectize-padding-item-x;
+        }
+        .selectize-input > div {
+            @include selectize-border-radius ($selectize-border-radius - 1px);
+        }
+    }
+}
+
+.form-control.selectize-control {
+    padding: 0;
+    height: auto;
+    border: none;
+    background: none;
+    @include selectize-box-shadow (none);
+    @include selectize-border-radius (0);
 }

inst/www/shared/selectize/scss/selectize.bootstrap4.scss

@@ -1,112 +1,118 @@
+/**
+ * Selectize bootstrap 4
+ */
+
+//Import Boostrap 4 functions and variables
 
 $enable-shadows: true !default;
-$select-font-family: inherit !default;
-$select-font-size: inherit !default;
-$select-line-height: $input-btn-line-height !default; //formerly line-height-computed
+$selectize-font-family: inherit !default;
+$selectize-font-size: inherit !default;
+$selectize-line-height: $input-btn-line-height !default; //formerly line-height-computed
 
-$select-color-text: gray("800") !default; //$gray-800
-$select-color-highlight: rgba(255, 237, 40, 0.4) !default;
-$select-color-input: $input-bg !default;
-$select-color-input-full: $input-bg !default;
-$select-color-input-error: theme-color("danger") !default;
-$select-color-input-error-focus: darken(
-  $select-color-input-error,
-  10%
-) !default;
-$select-color-disabled: $input-bg !default;
-$select-color-item: RGBA($select-color-text, 0.1) !default;
-$select-color-item-border: $border-color !default;
-$select-color-item-active: $component-active-bg !default;
-$select-color-item-active-text: color-contrast($select-color-item-active) !default;
-$select-color-item-active-border: rgba(0, 0, 0, 0) !default;
-$select-color-optgroup: $dropdown-bg !default;
-$select-color-optgroup-text: $dropdown-header-color !default;
-$select-color-optgroup-border: $dropdown-divider-bg !default;
-$select-color-dropdown: $dropdown-bg !default;
-$select-color-dropdown-border-top: mix(
-  $input-border-color,
-  $input-bg,
-  80%
-) !default;
-$select-color-dropdown-item-active: $dropdown-link-hover-bg !default;
-$select-color-dropdown-item-active-text: $dropdown-link-hover-color !default;
-$select-color-dropdown-item-create-active-text: $dropdown-link-hover-color !default;
-$select-opacity-disabled: 0.5 !default;
-$select-shadow-input: none !default;
-$select-shadow-input-focus: inset 0 1px 2px rgba(0, 0, 0, 0.15) !default;
-$select-shadow-input-error: inset 0 1px 1px rgba(0, 0, 0, 0.075) !default;
-$select-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-  0 0 6px lighten($select-color-input-error, 20%) !default;
-$select-border: 1px solid $input-border-color !default;
-$select-border-radius: $input-border-radius !default;
+$selectize-color-text: $input-color !default;
+$selectize-color-highlight: rgba(255,237,40,0.4) !default;
+$selectize-color-input: $input-bg !default;
+$selectize-color-input-full: $input-bg !default;
+$selectize-color-input-error: $danger !default;
+$selectize-color-input-error-focus: darken($selectize-color-input-error, 10%) !default;
+$selectize-color-disabled: $input-bg !default;
+$selectize-color-item: mix($selectize-color-input, $selectize-color-text, 90%) !default;
+$selectize-color-item-border: $input-border-color !default;
+$selectize-color-item-active: $component-active-bg !default;
+$selectize-color-item-active-text: color-contrast($selectize-color-item-active) !default;
+$selectize-color-item-active-border: rgba(0,0,0,0) !default;
+$selectize-color-optgroup: $dropdown-bg !default;
+$selectize-color-optgroup-text: $dropdown-header-color !default;
+$selectize-color-optgroup-border: $dropdown-divider-bg !default;
+$selectize-color-dropdown: $dropdown-bg !default;
+$selectize-color-dropdown-text: $dropdown-link-color !default;
+$selectize-color-dropdown-border-top: mix($input-border-color, $input-bg, 0.8) !default;
+$selectize-color-dropdown-item-active: $dropdown-link-hover-bg !default;
+$selectize-color-dropdown-item-active-text: $dropdown-link-hover-color !default;
+$selectize-color-dropdown-item-create-active-text: $dropdown-link-hover-color !default;
+$selectize-opacity-disabled: 0.5 !default;
+$selectize-shadow-input: none !default;
+$selectize-shadow-input-focus: inset 0 1px 2px rgba(0,0,0,0.15) !default;
+$selectize-shadow-input-error: inset 0 1px 1px rgba(0, 0, 0, .075) !default;
+$selectize-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten($selectize-color-input-error, 20%) !default;
+$selectize-border: 1px solid $input-border-color !default;
+$selectize-border-radius: $input-border-radius !default;
 
-$select-width-item-border: 0px !default;
-$select-padding-x: $input-btn-padding-x !default;
-$select-padding-y: $input-btn-padding-y !default;
-$select-padding-dropdown-item-x: $input-btn-padding-x !default;
-$select-padding-dropdown-item-y: 3px !default;
-$select-padding-item-x: 5px !default;
-$select-padding-item-y: 1px !default;
-$select-margin-item-x: 3px !default;
-$select-margin-item-y: 3px !default;
+$selectize-width-item-border: 0px !default;
+$selectize-padding-x: $input-btn-padding-x !default;
+$selectize-padding-y: $input-btn-padding-y !default;
+$selectize-padding-dropdown-item-x: $input-btn-padding-x !default;
+$selectize-padding-dropdown-item-y: 3px !default;
+$selectize-padding-item-x: 3px !default;
+$selectize-padding-item-y: 1px !default;
+$selectize-margin-item-x: 3px !default;
+$selectize-margin-item-y: 3px !default;
+$selectize-caret-margin: 0 !default;
+
+$selectize-arrow-size: 5px !default;
+$selectize-arrow-color: $selectize-color-text !default;
+$selectize-arrow-offset: calc(#{$selectize-padding-x} + 5px) !default;
 
-$select-arrow-size: 5px !default;
-$select-arrow-color: $select-color-text !default;
-$select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;
 
 @import "selectize";
 
-.#{$selectize}-dropdown,
-.#{$selectize}-dropdown.form-control {
+//Import Plugins
+@import "plugins/drag_drop";
+@import "plugins/dropdown_header";
+@import "plugins/optgroup_columns";
+@import "plugins/remove_button";
+
+.selectize-dropdown, .selectize-dropdown.form-control {
   height: auto;
   padding: 0;
   margin: 2px 0 0 0;
   z-index: $zindex-dropdown;
-  background: $select-color-dropdown;
+  background: $selectize-color-dropdown;
+  color: $selectize-color-dropdown-text;
   border: 1px solid $dropdown-border-color; //$dropdown-fallback-border
-  border-radius: $border-radius;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  @include selectize-border-radius($border-radius);
+  @include selectize-box-shadow(0 6px 12px rgba(0,0,0,.175));
 }
 
-.#{$selectize}-dropdown {
+.selectize-dropdown {
   .optgroup-header {
-    font-size: $font-size-sm;
-    line-height: $line-height-base;
+	font-size: $font-size-sm;
+	line-height: $line-height-base;
   }
   .optgroup:first-child:before {
-    display: none;
+	display: none;
   }
   .optgroup:before {
-    content: " ";
-    display: block;
-    height: 0;
-    margin: $dropdown-divider-margin-y 0;
-    overflow: hidden;
-    border-top: 1px solid $dropdown-divider-bg;
-    margin-left: $select-padding-dropdown-item-x * -1;
-    margin-right: $select-padding-dropdown-item-x * -1;
+	content: ' ';
+	display: block;
+	height: 0;
+	margin: $dropdown-divider-margin-y 0;
+	overflow: hidden;
+	border-top: 1px solid $dropdown-divider-bg;
+	margin-left: $selectize-padding-dropdown-item-x * -1;
+	margin-right: $selectize-padding-dropdown-item-x * -1;
   }
 
   .create {
-    padding-left: $select-padding-dropdown-item-x;
+	padding-left: $selectize-padding-dropdown-item-x;
   }
 }
 
-.#{$selectize}-dropdown-content {
+.selectize-dropdown-content {
   padding: 5px 0;
 }
 
-.#{$selectize}-dropdown-emptyoptionlabel {
-	text-align: center;
+.selectize-dropdown-header {
+  padding: $selectize-padding-dropdown-item-y * 2 $selectize-padding-dropdown-item-x;
 }
 
-.#{$selectize}-input {
+.selectize-input {
   min-height: $input-height;
   @include box-shadow($input-box-shadow);
   @include transition($input-transition);
 
   &.dropdown-active {
-    border-radius: $select-border-radius;
+    @include selectize-border-radius($selectize-border-radius);
   }
   &.dropdown-active::before {
     display: none;
@@ -122,21 +128,22 @@ $select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;
   }
 }
 
-.is-invalid .#{$selectize}-input {
-  border-color: $select-color-input-error;
-  box-shadow: $select-shadow-input-error;
+.is-invalid .selectize-input {
+  border-color: $selectize-color-input-error;
+  @include selectize-box-shadow($selectize-shadow-input-error);
 
   &:focus {
-    border-color: $select-color-input-error-focus;
-    box-shadow: $select-shadow-input-error-focus;
+	border-color: $selectize-color-input-error-focus;
+	// @include selectize-box-shadow(none)
+	@include selectize-box-shadow($selectize-shadow-input-error-focus);
   }
 }
 
-.#{$selectize}-control {
-  &.form-control-sm {
-    .#{$selectize}-input.has-items {
+.selectize-control {
+  &.form-control-sm{
+    .selectize-input.has-items{
       min-height: $input-height-sm !important;
-      height: $input-height-sm;
+      height: $input-height-sm !important;
       padding: $input-padding-y-sm $input-padding-x-sm !important;
       font-size: $input-font-size-sm;
       line-height: $input-line-height-sm;
@@ -144,53 +151,26 @@ $select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;
   }
 
   &.multi {
-    .#{$selectize}-input.has-items {
-      height: auto;
-      padding-left: calc(#{$select-padding-x} - #{$select-padding-item-x});
-      padding-right: calc(#{$select-padding-x} - #{$select-padding-item-x});
-    }
-    .#{$selectize}-input > div {
-      border-radius: calc(#{$select-border-radius} - 1px);
-    }
+	.selectize-input.has-items {
+	  padding-left: calc(#{$selectize-padding-x} - #{$selectize-padding-item-x});
+	  padding-right: calc(#{$selectize-padding-x} - #{$selectize-padding-item-x});
+	}
+	.selectize-input > div {
+	  @include selectize-border-radius(calc(#{$selectize-border-radius} - 1px));
+	}
   }
 }
 
-.form-control.#{$selectize}-control {
+.form-control.selectize-control {
   padding: 0;
   height: auto;
   border: none;
   background: none;
-  box-shadow: none;
-  border-radius: 0;
+  @include selectize-box-shadow(none);
+  @include selectize-border-radius(0);
 }
 
-.input-group .#{$selectize}-control:not(:last-child) {
-  .#{$selectize}-input{
-    overflow: unset;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-.input-group .#{$selectize}-control:not(:first-child) {
-  .#{$selectize}-input{
-    overflow: unset;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
-
-// .input-group .#{$selectize}-input {
-//   overflow: unset;
-//   border-radius: 0 $select-border-radius $select-border-radius 0;
-// }
-
-.#{selectize}-dropdown.plugin-auto_position.#{$selectize}-position-top {
-  border-top: $select-border!important;
-  border-bottom: $select-border!important;
-  border-radius: $select-border-radius!important;
-}
-.#{selectize}-control.plugin-auto_position .#{selectize}-input.#{$selectize}-position-top.dropdown-active {
-  border-radius: $select-border-radius!important;
-  border-top: $select-border!important;
+.input-group .selectize-input {
+	overflow: unset;
+	@include selectize-border-radius(0 $selectize-border-radius $selectize-border-radius 0);
 }

inst/www/shared/selectize/scss/selectize.bootstrap5.scss

@@ -1,200 +1,3 @@
-
-$enable-shadows: true !default;
-$select-font-family: if($input-btn-font-family, $input-btn-font-family, inherit) !default;
-$select-font-size: $input-btn-font-size !default;
-$select-line-height: $input-btn-line-height !default; //formerly line-height-computed
-
-$select-color-rgb: var(--bs-emphasis-color-rgb, 0, 0, 0) !default;
-$select-color-text: RGBA($select-color-rgb, 0.83) !default;
-$select-color-highlight: rgba(255, 237, 40, 0.4) !default;
-$select-color-input: $input-bg !default;
-$select-color-input-full: $input-bg !default;
-$select-color-input-error: $danger !default;
-$select-color-input-error-focus: darken(
-  $select-color-input-error,
-  10%
-) !default;
-$select-color-disabled: $input-bg !default;
-$select-color-item: RGBA($select-color-rgb, 0.05) !default;
-$select-color-item-border: $border-color !default;
-$select-color-item-active: $component-active-bg !default;
-$select-color-item-active-text: color-contrast($select-color-item-active) !default;
-$select-color-item-active-border: rgba(0, 0, 0, 0) !default;
-$select-color-optgroup: $dropdown-bg !default;
-$select-color-optgroup-text: $dropdown-header-color !default;
-$select-color-optgroup-border: $dropdown-divider-bg !default;
-$select-color-dropdown: $dropdown-bg !default;
-$select-color-dropdown-border-top: rgba($input-border-color, 0.8) !default;
-$select-color-dropdown-item-active: $dropdown-link-hover-bg !default;
-$select-color-dropdown-item-active-text: $dropdown-link-hover-color !default;
-$select-color-dropdown-item-create-active-text: $dropdown-link-hover-color !default;
-$select-opacity-disabled: 0.5 !default;
-$select-shadow-input: none !default;
-$select-shadow-input-focus: inset 0 1px 2px rgba(0, 0, 0, 0.15) !default;
-$select-shadow-input-error: inset 0 1px 1px rgba(0, 0, 0, 0.075) !default;
-$select-shadow-input-error-focus: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-  0 0 6px lighten($select-color-input-error, 20%) !default;
-$select-border: 1px solid $input-border-color !default;
-$select-border-radius: $input-border-radius !default;
-
-$select-width-item-border: 0px !default;
-$select-padding-x: $input-btn-padding-x !default;
-$select-padding-y: $input-btn-padding-y !default;
-$select-padding-dropdown-item-x: $input-btn-padding-x !default;
-$select-padding-dropdown-item-y: 3px !default;
-$select-padding-item-x: 5px !default;
-$select-padding-item-y: 1px !default;
-$select-margin-item-x: 3px !default;
-$select-margin-item-y: 3px !default;
-
-$select-arrow-size: 5px !default;
-$select-arrow-color: $select-color-text !default;
-$select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;
-
-@import "selectize";
-
-.#{$selectize}-dropdown,
-.#{$selectize}-dropdown.form-control {
-  height: auto;
-  padding: 0;
-  margin: 2px 0 0 0;
-  z-index: $zindex-dropdown;
-  background: $select-color-dropdown;
-  border: 1px solid $dropdown-border-color; //$dropdown-fallback-border
-  border-radius: $border-radius;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-}
-
-.#{$selectize}-dropdown {
-  .optgroup-header {
-    font-size: $font-size-sm;
-    line-height: $line-height-base;
-  }
-  .optgroup:first-child:before {
-    display: none;
-  }
-  .optgroup:before {
-    content: " ";
-    display: block;
-    height: 0;
-    margin: $dropdown-divider-margin-y 0;
-    overflow: hidden;
-    border-top: 1px solid $dropdown-divider-bg;
-    margin-left: $select-padding-dropdown-item-x * -1;
-    margin-right: $select-padding-dropdown-item-x * -1;
-  }
-
-  .create {
-    padding-left: $select-padding-dropdown-item-x;
-  }
-}
-
-.#{$selectize}-dropdown-content {
-  padding: 5px 0;
-}
-
-.#{$selectize}-dropdown-emptyoptionlabel {
-	text-align: center;
-}
-
-.#{$selectize}-input {
-  min-height: $input-height;
-  @include box-shadow($input-box-shadow);
-  @include transition($input-transition);
-
-  &.dropdown-active {
-    border-radius: $select-border-radius;
-  }
-  &.dropdown-active::before {
-    display: none;
-  }
-  &.focus {
-    border-color: $input-focus-border-color;
-    outline: 0;
-    @if $enable-shadows {
-      box-shadow: $input-box-shadow, $input-focus-box-shadow;
-    } @else {
-      box-shadow: $input-focus-box-shadow;
-    }
-  }
-}
-
-.is-invalid .#{$selectize}-input {
-  border-color: $select-color-input-error;
-  box-shadow: $select-shadow-input-error;
-
-  &:focus {
-    border-color: $select-color-input-error-focus;
-    box-shadow: $select-shadow-input-error-focus;
-  }
-}
-
-.#{$selectize}-control {
-  &.form-control-sm {
-    .#{$selectize}-input {
-      min-height: $input-height-sm !important;
-      height: $input-height-sm;
-      padding: $input-padding-y-sm $input-padding-x-sm !important;
-      font-size: $input-font-size-sm;
-      line-height: $line-height-sm;
-    }
-  }
-
-  &.multi {
-    .#{$selectize}-input {
-      height: auto;
-      padding-left: calc(#{$select-padding-x} - #{$select-padding-item-x});
-      padding-right: calc(#{$select-padding-x} - #{$select-padding-item-x});
-    }
-    .#{$selectize}-input > div {
-      border-radius: calc(#{$select-border-radius} - 1px);
-    }
-  }
-}
-
-.form-select.#{$selectize}-control,
-.form-control.#{$selectize}-control {
-  padding: 0;
-  height: auto;
-  border: none;
-  background: none;
-  box-shadow: none;
-  border-radius: 0;
-}
-
-.input-group>.input-group-append>.btn, .input-group>.form-control:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.input-group>.input-group-prepend>.btn {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-
-.input-group .#{$selectize}-control:not(:last-child) {
-  .#{$selectize}-input{
-    overflow: unset;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-.input-group .#{$selectize}-control:not(:first-child) {
-  .#{$selectize}-input{
-    overflow: unset;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
-
-.#{selectize}-dropdown.plugin-auto_position.#{$selectize}-position-top {
-  border-top: $select-border!important;
-  border-bottom: $select-border!important;
-  border-radius: $select-border-radius!important;
-}
-.#{selectize}-control.plugin-auto_position .#{selectize}-input.#{$selectize}-position-top.dropdown-active {
-  border-radius: $select-border-radius!important;
-  border-top: $select-border!important;
-}
+$input-line-height-sm: $form-select-line-height !default;
+@import 'selectize.bootstrap4';
+.selectize-control{padding:0;}

inst/www/shared/selectize/scss/selectize.default.scss

@@ -1,71 +1,84 @@
-$select-color-item: #1da7ee;
-$select-color-item-text: #fff;
-$select-color-item-active-text: #fff;
-$select-color-item-border: #0073bb;
-$select-color-item-active: #92c836;
-$select-color-item-active-border: #00578d;
-$select-width-item-border: 1px;
+/**
+ * selectize.default.css (v$$version) - Default Theme
+ * Copyright (c) 2013–2015 Brian Reavis & contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
+ * file except in compliance with the License. You may obtain a copy of the License at:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ * ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ *
+ * $author Brian Reavis <brian$thirdroute.com>
+ */
 
-@import "selectize.scss";
+@import "selectize";
 
-.#{$selectize}-control {
+$selectize-color-item: #1da7ee;
+$selectize-color-item-text: #fff;
+$selectize-color-item-active-text: #fff;
+$selectize-color-item-border: #0073bb;
+$selectize-color-item-active: #92c836;
+$selectize-color-item-active-border: #00578d;
+$selectize-width-item-border: 1px;
+$selectize-caret-margin: 0 1px;
+
+.selectize-control {
   &.multi {
-    .#{$selectize}-input {
-      &.has-items {
-        $padding-x: $select-padding-x - 3px;
-        padding-left: $padding-x;
-        padding-right: $padding-x;
-      }
-      &.disabled [data-value] {
-        color: #999;
-        text-shadow: none;
-        background: none;
-        box-shadow: none;
+	.selectize-input {
+	  &.has-items {
+		$padding-x: $selectize-padding-x - 3px;
+		padding-left: $padding-x;
+		padding-right: $padding-x;
+	  }
+	  &.disabled [data-value] {
+		color: #999;
+		text-shadow: none;
+		background: none;
+		@include selectize-box-shadow(none);
 
-        &,
-        .remove {
-          border-color: #e6e6e6;
-        }
-        .remove {
-          background: none;
-        }
-      }
-      [data-value] {
-        text-shadow: 0 1px 0 rgba(0, 51, 83, 0.3);
-        border-radius: 3px;
-        @include selectize-vertical-gradient(#1da7ee, #178ee9);
-        box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2),
-          inset 0 1px rgba(255, 255, 255, 0.03);
-        &.active {
-          @include selectize-vertical-gradient(#008fd8, #0075cf);
-        }
-      }
-    }
+		&, .remove {
+		  border-color: #e6e6e6;
+		}
+		.remove {
+		  background: none;
+		}
+	  }
+	  [data-value] {
+		text-shadow: 0 1px 0 rgba(0,51,83,0.3);
+		@include selectize-border-radius(3px);
+		@include selectize-vertical-gradient(#1da7ee, #178ee9);
+		@include selectize-box-shadow(#{"0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03)"});
+		&.active {
+		  @include selectize-vertical-gradient(#008fd8, #0075cf);
+		}
+	  }
+	}
   }
   &.single {
-    .#{$selectize}-input {
-      box-shadow: 0 1px 0 rgba(0, 0, 0, 0.05),
-        inset 0 1px 0 rgba(255, 255, 255, 0.8);
-      @include selectize-vertical-gradient(#fefefe, #f2f2f2);
-    }
+	.selectize-input {
+	  @include selectize-box-shadow(#{"0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8)"});
+	  @include selectize-vertical-gradient(#fefefe, #f2f2f2);
+	}
   }
 }
 
-.#{$selectize}-control.single .#{$selectize}-input,
-.#{$selectize}-dropdown.single {
+.selectize-control.single .selectize-input, .selectize-dropdown.single {
   border-color: #b8b8b8;
 }
 
-.#{$selectize}-dropdown {
+.selectize-dropdown {
   .optgroup-header {
-    padding-top: $select-padding-dropdown-item-y + 2px;
-    font-weight: bold;
-    font-size: 0.85em;
+	padding-top: $selectize-padding-dropdown-item-y + 2px;
+	font-weight: bold;
+	font-size: 0.85em;
   }
   .optgroup {
-    border-top: 1px solid $select-color-dropdown-border-top;
-    &:first-child {
-      border-top: 0 none;
-    }
+	border-top: 1px solid $selectize-color-dropdown-border-top;
+	&:first-child {
+	  border-top: 0 none;
+	}
   }
-}
+}

inst/www/shared/selectize/scss/selectize.scss

@@ -1,364 +1,300 @@
-@use "sass:math";
-
 // base styles
-$selectize: "selectize" !default;
-$select-font-family: inherit !default;
-$select-font-smoothing: inherit !default;
-$select-font-size: 13px !default;
-$select-line-height: 18px !default;
 
-$select-color-rgb: 0,0,0 !default;
-$select-color-text: RGBA($select-color-rgb, 0.83) !default;
-$select-color-border: #d0d0d0 !default;
-$select-color-highlight: rgba(125, 168, 208, 0.2) !default;
-$select-color-input: #fff !default;
-$select-color-input-full: $select-color-input !default;
-$select-color-disabled: #fafafa !default;
-$select-color-item: #f2f2f2 !default;
-$select-color-item-text: $select-color-text !default;
-$select-color-item-border: #d0d0d0 !default;
-$select-color-item-active: #e8e8e8 !default;
-$select-color-item-active-text: $select-color-text !default;
-$select-color-item-active-border: #cacaca !default;
-$select-color-dropdown: #fff !default;
-$select-color-dropdown-border: $select-color-border !default;
-$select-color-dropdown-border-top: #f0f0f0 !default;
-$select-color-dropdown-item-active: #f5fafd !default;
-$select-color-dropdown-item-active-text: #495c68 !default;
-$select-color-dropdown-item-create-text: RGBA($select-color-rgb, 0.5) !default;
-$select-color-dropdown-item-create-active-text: $select-color-dropdown-item-active-text !default;
-$select-color-optgroup: $select-color-dropdown !default;
-$select-color-optgroup-text: $select-color-text !default;
-$select-lighten-disabled-item: 30% !default;
-$select-lighten-disabled-item-text: 30% !default;
-$select-lighten-disabled-item-border: 30% !default;
-$select-opacity-disabled: 0.5 !default;
+$selectize-font-family: inherit !default;
+$selectize-font-smoothing: inherit !default;
+$selectize-font-size: 13px !default;
+$selectize-line-height: 18px !default;
 
-$select-shadow-input: inset 0 1px 1px rgba(0, 0, 0, 0.1) !default;
-$select-shadow-input-focus: inset 0 1px 2px rgba(0, 0, 0, 0.15) !default;
-$select-border: 1px solid $select-color-border !default;
-$select-dropdown-border: 1px solid $select-color-dropdown-border !default;
-$select-border-radius: 3px !default;
+$selectize-color-text: #303030 !default;
+$selectize-color-border: #d0d0d0 !default;
+$selectize-color-highlight: rgba(125,168,208,0.2) !default;
+$selectize-color-input: #fff !default;
+$selectize-color-input-full: $selectize-color-input !default;
+$selectize-color-disabled: #fafafa !default;
+$selectize-color-item: #f2f2f2 !default;
+$selectize-color-item-text: $selectize-color-text !default;
+$selectize-color-item-border: #d0d0d0 !default;
+$selectize-color-item-active: #e8e8e8 !default;
+$selectize-color-item-active-text: $selectize-color-text !default;
+$selectize-color-item-active-border: #cacaca !default;
+$selectize-color-dropdown: #fff !default;
+$selectize-color-dropdown-border: $selectize-color-border !default;
+$selectize-color-dropdown-border-top: #f0f0f0 !default;
+$selectize-color-dropdown-item-active: #f5fafd !default;
+$selectize-color-dropdown-item-active-text: #495c68 !default;
+$selectize-color-dropdown-item-create-text: rgba(red($selectize-color-text), green($selectize-color-text), blue($selectize-color-text), 0.5) !default;
+$selectize-color-dropdown-item-create-active-text: $selectize-color-dropdown-item-active-text !default;
+$selectize-color-optgroup: $selectize-color-dropdown !default;
+$selectize-color-optgroup-text: $selectize-color-text !default;
+$selectize-lighten-disabled-item: 30% !default;
+$selectize-lighten-disabled-item-text: 30% !default;
+$selectize-lighten-disabled-item-border: 30% !default;
+$selectize-opacity-disabled: 0.5 !default;
 
-$select-width-item-border: 0px !default;
-$select-max-height-dropdown: 200px !default;
+$selectize-shadow-input: inset 0 1px 1px rgba(0,0,0,0.1) !default;
+$selectize-shadow-input-focus: inset 0 1px 2px rgba(0,0,0,0.15) !default;
+$selectize-border: 1px solid $selectize-color-border !default;
+$selectize-dropdown-border: 1px solid $selectize-color-dropdown-border !default;
+$selectize-border-radius: 3px !default;
 
-$select-padding-x: 8px !default;
-$select-padding-y: 8px !default;
-$select-padding-item-x: 6px !default;
-$select-padding-item-y: 2px !default;
-$select-padding-dropdown-item-x: $select-padding-x !default;
-$select-padding-dropdown-item-y: 5px !default;
-$select-margin-item-x: 3px !default;
-$select-margin-item-y: 3px !default;
+$selectize-width-item-border: 0 !default;
+$selectize-max-height-dropdown: 200px !default;
 
-$select-arrow-size: 5px !default;
-$select-arrow-color: #808080 !default;
-$select-arrow-offset: 15px !default;
+$selectize-padding-x: 8px !default;
+$selectize-padding-y: 8px !default;
+$selectize-padding-item-x: 6px !default;
+$selectize-padding-item-y: 2px !default;
+$selectize-padding-dropdown-item-x: $selectize-padding-x !default;
+$selectize-padding-dropdown-item-y: 5px !default;
+$selectize-margin-item-x: 3px !default;
+$selectize-margin-item-y: 3px !default;
 
-$select-caret-margin: 0 0px !default;
-$select-caret-margin-rtl: 0 4px 0 -2px !default;
+$selectize-arrow-size: 5px !default;
+$selectize-arrow-color: #808080 !default;
+$selectize-arrow-offset: 15px !default;
 
-$select-spinner-size: 30px;
-$select-spinner-border-size: 5px;
-$select-spinner-border-color: $select-color-border;
+$selectize-caret-margin: 0 2px 0 0 !default;
+$selectize-caret-margin-rtl: 0 4px 0 -2px !default;
 
-@mixin selectize-vertical-gradient($color-top, $color-bottom) {
+@mixin selectize-border-radius($radii){
+  @if mixin-exists("border-radius") {
+    @include border-radius($radii)
+  } @else {
+    border-radius: $radii;
+  }
+}
+@mixin selectize-unselectable(){
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+@mixin selectize-box-shadow($shadow){
+  -webkit-box-shadow: $shadow;
+  box-shadow: $shadow;
+}
+@mixin selectize-box-sizing($type: border-box){
+  -webkit-box-sizing: $type;
+  -moz-box-sizing: $type;
+  box-sizing: $type;
+}
+@mixin selectize-vertical-gradient($color-top, $color-bottom){
   background-color: mix($color-top, $color-bottom, 60%);
-  background-image: linear-gradient(to bottom, $color-top, $color-bottom);
+  background-image: -moz-linear-gradient(top, $color-top, $color-bottom); // FF 3.6+
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($color-top), to($color-bottom)); // Safari 4+, Chrome 2+
+  background-image: -webkit-linear-gradient(top, $color-top, $color-bottom); // Safari 5.1+, Chrome 10+
+  background-image: -o-linear-gradient(top, $color-top, $color-bottom); // Opera 11.10
+  background-image: linear-gradient(to bottom, $color-top, $color-bottom); // Standard, IE10
   background-repeat: repeat-x;
+  //filter: e(%("progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb($color-top),argb($color-bottom))); // IE9 and down
 }
 
-@import "plugins/drag_drop.scss";
-@import "plugins/dropdown_header.scss";
-@import "plugins/optgroup_columns.scss";
-@import "plugins/remove_button.scss";
-@import "plugins/clear_button.scss";
-@import "plugins/auto_position.scss";
-
-.#{$selectize}-control {
+.selectize-control {
   position: relative;
 }
 
-.#{$selectize}-dropdown,
-.#{$selectize}-input,
-.#{$selectize}-input input {
-  color: $select-color-text;
-  font-family: $select-font-family;
-  font-size: $select-font-size;
-  line-height: $select-line-height;
-  font-smoothing: $select-font-smoothing;
+.selectize-dropdown, .selectize-input, .selectize-input input {
+  color: $selectize-color-text;
+  font-family: $selectize-font-family;
+  font-size: $selectize-font-size;
+  line-height: $selectize-line-height;
+  -webkit-font-smoothing: $selectize-font-smoothing;
 }
 
-.#{$selectize}-input,
-.#{$selectize}-control.single .#{$selectize}-input.input-active {
-  background: $select-color-input;
+.selectize-input, .selectize-control.single .selectize-input.input-active {
+  background: $selectize-color-input;
   cursor: text;
   display: inline-block;
 }
 
-.#{$selectize}-input {
-  border: $select-border;
-  padding: $select-padding-y $select-padding-x;
+.selectize-input {
+  border: $selectize-border;
+  padding: $selectize-padding-y $selectize-padding-x;
   display: inline-block;
   width: 100%;
-  // overflow: hidden;
+  overflow: hidden;
   position: relative;
   z-index: 1;
-  box-sizing: border-box;
-  box-shadow: $select-shadow-input;
-  border-radius: $select-border-radius;
+  @include selectize-box-sizing(border-box);
+  @include selectize-box-shadow($selectize-shadow-input);
+  @include selectize-border-radius($selectize-border-radius);
 
-  .#{$selectize}-control.multi &.has-items {
-    $padding-x: $select-padding-x;
-    $padding-top: calc(
-      #{$select-padding-y} - #{$select-padding-item-y} - #{$select-width-item-border}
-    );
-    $padding-bottom: calc(
-      #{$select-padding-y} - #{$select-padding-item-y} - #{$select-margin-item-y} -
-        #{$select-width-item-border}
-    );
-    padding: $padding-top $padding-x $padding-bottom;
+  .selectize-control.multi &.has-items {
+	$padding-x: $selectize-padding-x;
+	$padding-top: calc(#{$selectize-padding-y} - #{$selectize-padding-item-y} - #{$selectize-width-item-border});
+	$padding-bottom: calc(#{$selectize-padding-y} - #{$selectize-padding-item-y} - #{$selectize-margin-item-y} - #{$selectize-width-item-border});
+	padding: $padding-top $padding-x $padding-bottom;
   }
 
   &.full {
-    background-color: $select-color-input-full;
+	background-color: $selectize-color-input-full;
   }
-  &.disabled,
-  &.disabled * {
-    cursor: default !important;
+  &.disabled, &.disabled * {
+	cursor: default !important;
   }
   &.focus {
-    box-shadow: $select-shadow-input-focus;
+	@include selectize-box-shadow($selectize-shadow-input-focus);
   }
   &.dropdown-active {
-    border-radius: $select-border-radius $select-border-radius 0 0;
+	@include selectize-border-radius($selectize-border-radius $selectize-border-radius 0 0);
   }
 
   > * {
-    vertical-align: baseline;
-    display: inline-block;
-    zoom: 1;
+	vertical-align: baseline;
+	display: -moz-inline-stack;
+	display: inline-block;
+	zoom: 1;
+	*display: inline;
   }
-  .#{$selectize}-control.multi & > div {
-    cursor: pointer;
-    margin: 0 $select-margin-item-x $select-margin-item-y 0;
-    padding: $select-padding-item-y $select-padding-item-x;
-    background: $select-color-item;
-    color: $select-color-item-text;
-    border: $select-width-item-border solid $select-color-item-border;
+  .selectize-control.multi & > div {
+	cursor: pointer;
+	margin: 0 $selectize-margin-item-x $selectize-margin-item-y 0;
+	padding: $selectize-padding-item-y $selectize-padding-item-x;
+	background: $selectize-color-item;
+	color: $selectize-color-item-text;
+	border: $selectize-width-item-border solid $selectize-color-item-border;
 
-    &.active {
-      background: $select-color-item-active;
-      color: $select-color-item-active-text;
-      border: $select-width-item-border solid $select-color-item-active-border;
-    }
+	&.active {
+	  background: $selectize-color-item-active;
+	  color: $selectize-color-item-active-text;
+	  border: $selectize-width-item-border solid $selectize-color-item-active-border;
+	}
   }
-  .#{$selectize}-control.multi &.disabled > div {
-    &,
-    &.active {
-      color: lighten(gray, $select-lighten-disabled-item-text);
-      background: lighten(gray, $select-lighten-disabled-item);
-      border: $select-width-item-border solid
-        lighten(gray, $select-lighten-disabled-item-border);
-    }
+  .selectize-control.multi &.disabled > div {
+	&, &.active {
+	  color: lighten(desaturate($selectize-color-item-text, 100%), $selectize-lighten-disabled-item-text);
+	  background: lighten(desaturate($selectize-color-item, 100%), $selectize-lighten-disabled-item);
+	  border: $selectize-width-item-border solid lighten(desaturate($selectize-color-item-border, 100%), $selectize-lighten-disabled-item-border);
+	}
   }
   > input {
-    &::-ms-clear {
-      display: none;
-    }
-    display: inline-block !important;
-    padding: 0 !important;
-    min-height: 0 !important;
-    max-height: none !important;
-    max-width: 100% !important;
-    margin: 0 !important;
-    text-indent: 0 !important;
-    border: 0 none !important;
-    background: none !important;
-    line-height: inherit !important;
-    user-select: auto !important;
-    box-shadow: none !important;
-    &:focus {
-      outline: none !important;
-    }
-
-    &[placeholder] {
-      box-sizing: initial;
-    }
-  }
-  &.has-items > input {
-    margin: $select-caret-margin !important;
+	&::-ms-clear {
+	  display: none;
+	}
+	display: inline-block !important;
+	padding: 0 !important;
+	min-height: 0 !important;
+	max-height: none !important;
+	max-width: 100% !important;
+	margin: $selectize-caret-margin !important;
+	text-indent: 0 !important;
+	border: 0 none !important;
+	background: none !important;
+	line-height: inherit !important;
+	-webkit-user-select: auto !important;
+	@include selectize-box-shadow(none);
+	&:focus { outline: none !important; }
   }
 }
 
-.#{$selectize}-input::after {
-  content: " ";
+.selectize-input::after {
+  content: ' ';
   display: block;
   clear: left;
 }
 
-.#{$selectize}-input.dropdown-active::before {
-  content: " ";
+.selectize-input.dropdown-active::before {
+  content: ' ';
   display: block;
   position: absolute;
-  background: $select-color-dropdown-border-top;
+  background: $selectize-color-dropdown-border-top;
   height: 1px;
   bottom: 0;
   left: 0;
   right: 0;
 }
 
-.#{$selectize}-dropdown {
+.selectize-dropdown {
   position: absolute;
-  top: 100%;
-  left: 0;
-  width: 100%;
   z-index: 10;
-
-  border: $select-dropdown-border;
-  background: $select-color-dropdown;
+  border: $selectize-dropdown-border;
+  background: $selectize-color-dropdown;
   margin: -1px 0 0 0;
   border-top: 0 none;
-  box-sizing: border-box;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  border-radius: 0 0 $select-border-radius $select-border-radius;
+  @include selectize-box-sizing(border-box);
+  @include selectize-box-shadow(0 1px 3px rgba(0,0,0,0.1));
+  @include selectize-border-radius(0 0 $selectize-border-radius $selectize-border-radius);
 
   [data-selectable] {
-    cursor: pointer;
-    overflow: hidden;
-    .highlight {
-      background: $select-color-highlight;
-      border-radius: 1px;
-    }
+	cursor: pointer;
+	overflow: hidden;
+	.highlight {
+	  background: $selectize-color-highlight;
+	  @include selectize-border-radius(1px);
+	}
   }
-  .option,
-  .optgroup-header,
-  .no-results,
-  .create {
-    padding: $select-padding-dropdown-item-y $select-padding-dropdown-item-x;
+  .option, .optgroup-header {
+	padding: $selectize-padding-dropdown-item-y $selectize-padding-dropdown-item-x;
   }
-  .option,
-  [data-disabled],
-  [data-disabled] [data-selectable].option {
-    cursor: inherit;
-    opacity: 0.5;
+  .option, [data-disabled], [data-disabled] [data-selectable].option {
+	cursor: inherit;
+	opacity: 0.5;
   }
   [data-selectable].option {
-    opacity: 1;
-    cursor: pointer;
+	opacity: 1;
   }
   .optgroup:first-child .optgroup-header {
-    border-top: 0 none;
+	border-top: 0 none;
   }
   .optgroup-header {
-    color: $select-color-optgroup-text;
-    background: $select-color-optgroup;
-    cursor: default;
+	color: $selectize-color-optgroup-text;
+	background: $selectize-color-optgroup;
+	cursor: default;
   }
   .active {
-    background-color: $select-color-item-active;
-    color: $select-color-item-active-text;
-    &.create {
-      color: $select-color-dropdown-item-create-active-text;
-    }
-  }
-
-  .selected {
-    background-color: $select-color-item-active;
-    color: $select-color-item-active-text;
+	background-color: $selectize-color-dropdown-item-active;
+	color: $selectize-color-dropdown-item-active-text;
+	&.create {
+	  color: $selectize-color-dropdown-item-create-active-text;
+	}
   }
   .create {
-    color: $select-color-dropdown-item-create-text;
-  }
-
-  .active:not(.selected) {
-    background: $select-color-dropdown-item-active;
-    color: $select-color-dropdown-item-active-text;
+	color: $selectize-color-dropdown-item-create-text;
   }
 }
 
-.#{$selectize}-dropdown-content {
+.selectize-dropdown-content {
   overflow-y: auto;
   overflow-x: hidden;
-  max-height: $select-max-height-dropdown;
-  overflow-scrolling: touch;
+  max-height: $selectize-max-height-dropdown;
+  -webkit-overflow-scrolling: touch;
 }
 
-.#{$selectize}-dropdown-emptyoptionlabel {
-	text-align: center;
-}
-
-.#{$selectize}-dropdown .spinner {
-  display: inline-block;
-  width: $select-spinner-size;
-  height: $select-spinner-size;
-  margin: $select-padding-dropdown-item-y $select-padding-dropdown-item-x;
+.selectize-control.single .selectize-input {
+  &, input { cursor: pointer; }
+  &.input-active, &.input-active input { cursor: text; }
 
   &:after {
-    content: " ";
-    display: block;
-    width: $select-spinner-size * 0.8;
-    height: $select-spinner-size * 0.8;
-    margin: $select-spinner-size * 0.1;
-    border-radius: 50%;
-    border: $select-spinner-border-size solid $select-spinner-border-color;
-    border-color: $select-spinner-border-color transparent
-      $select-spinner-border-color transparent;
-    animation: lds-dual-ring 1.2s linear infinite;
+	content: ' ';
+	display: block;
+	position: absolute;
+	top: 50%;
+	right: $selectize-arrow-offset;
+	margin-top: round((-1 * $selectize-arrow-size / 2));
+	width: 0;
+	height: 0;
+	border-style: solid;
+	border-width: $selectize-arrow-size $selectize-arrow-size 0 $selectize-arrow-size;
+	border-color: $selectize-arrow-color transparent transparent transparent;
   }
-  @keyframes lds-dual-ring {
-    0% {
-      transform: rotate(0deg);
-    }
-    100% {
-      transform: rotate(360deg);
-    }
+  &.dropdown-active:after {
+	margin-top: $selectize-arrow-size * -0.8;
+	border-width: 0 $selectize-arrow-size $selectize-arrow-size $selectize-arrow-size;
+	border-color: transparent transparent $selectize-arrow-color transparent;
   }
 }
 
-.#{$selectize}-control.single .#{$selectize}-input {
-  &,
-  input {
-    cursor: pointer;
+.selectize-control.rtl {
+  &.single .selectize-input:after {
+	left: $selectize-arrow-offset;
+	right: auto;
   }
-  &.input-active,
-  &.input-active input:not(:read-only) {
-    cursor: text;
-  }
-
-  &:not(.no-arrow):after {
-    content: " ";
-    display: block;
-    position: absolute;
-    top: 50%;
-    right: $select-arrow-offset;
-    margin-top: round(divide(-1 * $select-arrow-size, 2));
-    width: 0;
-    height: 0;
-    border-style: solid;
-    border-width: $select-arrow-size $select-arrow-size 0 $select-arrow-size;
-    border-color: $select-arrow-color transparent transparent transparent;
-  }
-  &:not(.no-arrow).dropdown-active:after {
-    margin-top: $select-arrow-size * -0.8;
-    border-width: 0 $select-arrow-size $select-arrow-size $select-arrow-size;
-    border-color: transparent transparent $select-arrow-color transparent;
+  .selectize-input > input {
+	margin: $selectize-caret-margin-rtl !important;
   }
 }
 
-.#{$selectize}-control.rtl {
-  text-align: right;
-  &.single .#{$selectize}-input:after {
-    left: $select-arrow-offset;
-    right: auto;
-  }
-  .#{$selectize}-input > input {
-    margin: $select-caret-margin-rtl !important;
-  }
-}
-
-.#{$selectize}-control .#{$selectize}-input.disabled {
-  opacity: $select-opacity-disabled;
-  background-color: $select-color-disabled;
+.selectize-control .selectize-input.disabled {
+  opacity: $selectize-opacity-disabled;
+  background-color: $selectize-color-disabled;
 }

inst/www/shared/shiny-showcase.css

@@ -1,2 +1,2 @@
-/*! shiny 1.7.5.9000 | (c) 2012-2023 RStudio, PBC. | License: GPL-3 | file LICENSE */
-#showcase-well{border-radius:0}.shiny-code{background-color:#fff;margin-bottom:0}.shiny-code code{font-family:Menlo,Consolas,Courier New,monospace}.shiny-code-container{margin-top:20px;clear:both}.shiny-code-container h3{display:inline;margin-right:15px}.showcase-header{font-size:16px;font-weight:400}.showcase-code-link{text-align:right;padding:15px}#showcase-app-container{vertical-align:top}#showcase-code-tabs{margin-right:15px}#showcase-code-tabs pre{border:none;line-height:1em}#showcase-code-tabs .nav,#showcase-code-tabs ul{margin-bottom:0}#showcase-code-tabs .tab-content{border-style:solid;border-color:#e5e5e5;border-width:0px 1px 1px 1px;overflow:auto;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#showcase-app-code{width:100%}#showcase-code-position-toggle{float:right}#showcase-sxs-code{padding-top:20px;vertical-align:top}.showcase-code-license{display:block;text-align:right}#showcase-code-content pre{background-color:#fff}
+/*! shiny 1.7.1.9002 | (c) 2012-2022 RStudio, PBC. | License: GPL-3 | file LICENSE */
+#showcase-well{border-radius:0}.shiny-code{background-color:#fff;margin-bottom:0}.shiny-code code{font-family:Menlo,Consolas,"Courier New",monospace}.shiny-code-container{margin-top:20px;clear:both}.shiny-code-container h3{display:inline;margin-right:15px}.showcase-header{font-size:16px;font-weight:normal}.showcase-code-link{text-align:right;padding:15px}#showcase-app-container{vertical-align:top}#showcase-code-tabs{margin-right:15px}#showcase-code-tabs pre{border:none;line-height:1em}#showcase-code-tabs .nav{margin-bottom:0}#showcase-code-tabs ul{margin-bottom:0}#showcase-code-tabs .tab-content{border-style:solid;border-color:#e5e5e5;border-width:0px 1px 1px 1px;overflow:auto;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#showcase-app-code{width:100%}#showcase-code-position-toggle{float:right}#showcase-sxs-code{padding-top:20px;vertical-align:top}.showcase-code-license{display:block;text-align:right}#showcase-code-content pre{background-color:#fff}