Skip to content

Commit 481a692

Browse files
committed
Merge branch 'main' into rc-v1.7.5.1
2 parents 837307f + b8923e9 commit 481a692

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1452
-1375
lines changed

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ plugins:
77
spec: "@yarnpkg/plugin-interactive-tools"
88

99
yarnPath: .yarn/releases/yarn-3.2.3.cjs
10+
checksumBehavior: update

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: shiny
22
Type: Package
33
Title: Web Application Framework for R
4-
Version: 1.7.5.1
4+
Version: 1.7.5.9000
55
Authors@R: c(
66
person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-1576-2126")),
77
person("Joe", "Cheng", role = "aut", email = "[email protected]"),

NEWS.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# shiny (development version)
2+
3+
## New features and improvements
4+
5+
* 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)
6+
7+
* Shiny's CSS styling for things like `showNotification()`, `withProgress()`, `inputPanel()`, etc., now looks better with `{bslib}`'s upcoming CSS-only dark mode. (#3882)
8+
9+
## Bug fixes
10+
11+
* `fileInput()` no longer has unwanted round corners applied to the `buttonLabel`. (#3879)
12+
13+
* Fixed #3898: `wrapFunctionLabel()` no longer throws an error if the `name` is longer than 10000 bytes. (#3903)
14+
115
# shiny 1.7.5.1
216

317
## Bug fixes

R/input-file.R

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,35 @@
22
#'
33
#' Create a file upload control that can be used to upload one or more files.
44
#'
5-
#' Whenever a file upload completes, the corresponding input variable is set
6-
#' to a dataframe. See the `Server value` section.
5+
#' Whenever a file upload completes, the corresponding input variable is set to
6+
#' a dataframe. See the `Server value` section.
7+
#'
8+
#' Each time files are uploaded, they are written to a new random subdirectory
9+
#' inside of R's process-level temporary directory. The Shiny user session keeps
10+
#' track of all uploads in the session, and when the session ends, Shiny deletes
11+
#' all of the subdirectories where files where uploaded to.
712
#'
813
#' @family input elements
914
#'
1015
#' @inheritParams textInput
1116
#' @param multiple Whether the user should be allowed to select and upload
1217
#' multiple files at once. **Does not work on older browsers, including
1318
#' Internet Explorer 9 and earlier.**
14-
#' @param accept A character vector of "unique file type specifiers" which
15-
#' gives the browser a hint as to the type of file the server expects.
16-
#' Many browsers use this prevent the user from selecting an invalid file.
19+
#' @param accept A character vector of "unique file type specifiers" which gives
20+
#' the browser a hint as to the type of file the server expects. Many browsers
21+
#' use this prevent the user from selecting an invalid file.
1722
#'
1823
#' A unique file type specifier can be:
1924
#' * A case insensitive extension like `.csv` or `.rds`.
2025
#' * A valid MIME type, like `text/plain` or `application/pdf`
2126
#' * One of `audio/*`, `video/*`, or `image/*` meaning any audio, video,
22-
#' or image type, respectively.
27+
#' or image type, respectively.
2328
#' @param buttonLabel The label used on the button. Can be text or an HTML tag
2429
#' object.
2530
#' @param placeholder The text to show before a file has been uploaded.
2631
#' @param capture What source to use for capturing image, audio or video data.
27-
#' This attribute facilitates user access to a device's media capture
28-
#' mechanism, such as a camera, or microphone, from within a file upload
32+
#' This attribute facilitates user access to a device's media capture
33+
#' mechanism, such as a camera, or microphone, from within a file upload
2934
#' control.
3035
#'
3136
#' A value of `user` indicates that the user-facing camera and/or microphone
@@ -67,7 +72,9 @@
6772
#' }
6873
#'
6974
#' @section Server value:
70-
#' A `data.frame` that contains one row for each selected file, and following columns:
75+
#'
76+
#' A `data.frame` that contains one row for each selected file, and following
77+
#' columns:
7178
#' \describe{
7279
#' \item{`name`}{The filename provided by the web browser. This is
7380
#' **not** the path to read to get at the actual data that was uploaded

R/input-select.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#' from a list of values.
55
#'
66
#' By default, `selectInput()` and `selectizeInput()` use the JavaScript library
7-
#' \pkg{selectize.js} (<https://selectize.dev/) instead of
7+
#' \pkg{selectize.js} (<https://selectize.dev/>) instead of
88
#' the basic select input element. To use the standard HTML select input
99
#' element, use `selectInput()` with `selectize=FALSE`.
1010
#'

R/shiny-package.R

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,11 @@ NULL
3434
# since we call require(shiny) as part of loading the app.
3535
#' @import methods
3636
NULL
37+
38+
39+
# For usethis::use_release_issue()
40+
release_bullets <- function() {
41+
c(
42+
"Update static imports: `staticimports::import()`"
43+
)
44+
}

R/staticimports.R

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,19 @@ get_package_version <- function(pkg) {
4242

4343
is_installed <- function(pkg, version = NULL) {
4444
installed <- isNamespaceLoaded(pkg) || nzchar(system_file_cached(package = pkg))
45+
4546
if (is.null(version)) {
4647
return(installed)
4748
}
49+
50+
if (!is.character(version) && !inherits(version, "numeric_version")) {
51+
# Avoid https://bugs.r-project.org/show_bug.cgi?id=18548
52+
alert <- if (identical(Sys.getenv("TESTTHAT"), "true")) stop else warning
53+
alert("`version` must be a character string or a `package_version` or `numeric_version` object.")
54+
55+
version <- numeric_version(sprintf("%0.9g", version))
56+
}
57+
4858
installed && isTRUE(get_package_version(pkg) >= version)
4959
}
5060

R/utils.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,6 +1429,12 @@ wrapFunctionLabel <- function(func, name, ..stacktraceon = FALSE, dots = TRUE) {
14291429
if (name == "name" || name == "func" || name == "relabelWrapper") {
14301430
stop("Invalid name for wrapFunctionLabel: ", name)
14311431
}
1432+
if (nchar(name, "bytes") > 10000) {
1433+
# Max variable length in R is 10000 bytes. Truncate to a shorter number of
1434+
# chars because some characters could be multi-byte.
1435+
name <- substr(name, 1, 5000)
1436+
}
1437+
14321438
assign(name, func, environment())
14331439
registerDebugHook(name, environment(), name)
14341440

R/version_selectize.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Generated by tools/updateSelectize.R; do not edit by hand
2-
version_selectize <- "0.12.4"
2+
version_selectize <- "0.15.2"

0 commit comments

Comments
 (0)