change ns of externally passed input elements in f7Login

RinteRface · May 24, 2024 · 13593c0 · 13593c0
1 parent 6030464
commit 13593c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/R/f7Login.R b/R/f7Login.R
@@ -42,6 +42,9 @@ cancellable = FALSE) {
       submitBttn
     )
   }
+
+  items <- list(...)
+  if (length(items) > 0) items <- change_id(items, ns)
 
   shiny::tags$div(
     id = sprintf("%s-login", id),
@@ -68,7 +71,7 @@ cancellable = FALSE) {
                 label = "Password",
                 placeholder = "Your password here"
               ),
-              ...
+              items
             ),
             btnUI,
             if (!is.null(footer)) {

diff --git a/R/utils.R b/R/utils.R
@@ -234,3 +234,19 @@ create_app_link <- function(
     `data-external` = "1"
   )
 }
+
+#' Change tags ids
+#' 
+#' Changes the id of the shiny tags
+#' and any nested element.
+#' 
+#' @keywords internal
+#' @noRd
+change_id <- function(items, ns) {
+  lapply(items, \(item) {
+    full_ns <- ns(character(0))
+    tmp <- strsplit(as.character(item), "\n")[[1]]
+    outer_ns <- strsplit(full_ns, "-")[[1]][1]
+    shiny::HTML(paste(gsub(sprintf("%s", outer_ns), full_ns, tmp), collapse = "\n"))
+  })
+}