Skip to content

Update modal.R #4331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BajczA475 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update modal.R #4331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3317fe3
Update modal.R
BajczA475 Dec 4, 2025
d22526a
Update modal.R to not hardcode h4
BajczA475 Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion R/modal.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ modalDialog <- function(..., title = NULL, footer = modalButton("Dismiss"),

size <- match.arg(size)

has_title <- !is.null(title)

backdrop <- if (!easyClose) "static"
keyboard <- if (!easyClose) "false"
div(
Expand All @@ -169,13 +171,16 @@ modalDialog <- function(..., title = NULL, footer = modalButton("Dismiss"),
`data-bs-backdrop` = backdrop,
`data-keyboard` = keyboard,
`data-bs-keyboard` = keyboard,
if (has_title) `aria-labelledby` = "shiny-modal-title",
Copy link
Member

@gadenbuie gadenbuie Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't quite work as written, we need to assign to the argument when has_title is TRUE:

Suggested change
if (has_title) `aria-labelledby` = "shiny-modal-title",
`aria-labelledby` = if (has_title) "shiny-modal-title",

This relies on a nice htmltools behavior that it will drop NULL attributes (and if (FALSE) "foo" returns NULL in R).


div(
class = "modal-dialog",
class = switch(size, s = "modal-sm", m = NULL, l = "modal-lg", xl = "modal-xl"),
div(class = "modal-content",
if (!is.null(title)) div(class = "modal-header",
tags$h4(class = "modal-title", title)
div(class = "modal-title",
id = "shiny-modal-title",
title)
Comment on lines +181 to +183
Copy link
Member

@gadenbuie gadenbuie Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small style nit: Let's put this on one line

Suggested change
div(class = "modal-title",
id = "shiny-modal-title",
title)
div(class = "modal-title", id = "shiny-modal-title", title)

),
div(class = "modal-body", ...),
if (!is.null(footer)) div(class = "modal-footer", footer)
Expand Down