Resolve conflicts

Merge branch 'main' into doc/add-tutorials

# Conflicts:
#	R/inputs.R

Author: Eduardodudu

NAMESPACE

@@ -8,3 +8,4 @@ export(reactable_extras_dependency)
 export(reactable_extras_server)
 export(reactable_extras_ui)
 export(text_extra)
+export(tooltip_extra)

R/dependencies.R

@@ -10,7 +10,18 @@ reactable_extras_dependency <- function() {
     version = "0.0.1",
     src = list(file = "assets"),
     package = "reactable.extras",
-    script = c("js/reactable-extras.js", "js/reactable-server.js"),
-    stylesheet = "css/reactable-server.css"
+    script = c(
+      "js/reactable-extras.js",
+      "js/reactable-server.js",
+      "js/popper.js",
+      "js/tippy.js"
+    ),
+    stylesheet = c(
+      "css/reactable-server.css",
+      "css/tippy-light.css",
+      "css/tippy-light-border.css",
+      "css/tippy-material.css",
+      "css/tippy-translucent.css"
+    )
   )
 }

R/inputs.R

@@ -24,7 +24,11 @@ define_key <- function(key) {
   if (!is.null(key)) {
     key <- paste0("cellInfo.row.", key)
   } else {
-    key <- "(Number(cellInfo.id) + 1)"
+    key <- paste(
+      "cellInfo.row['.internal_uuid'] ?",
+      "cellInfo.row['.internal_uuid'] :",
+      "(Number(cellInfo.id) + 1)"
+    )
   }
 
   return(key)
@@ -110,7 +114,8 @@ date_extra <- function(id, key = NULL, ...) {
         }",
         id = id,
         key = key,
-        args = args_js(...))
+        args = args_js(...)
+      )
     )
   )
 }
@@ -152,8 +157,9 @@ dropdown_extra <- function(id, choices, key = NULL, ...) {
         key = key,
         choices = choices_js,
         args = args_js(...)
+      )
     )
-  ))
+  )
 }
 
 #' Text input for reactable column cell
@@ -179,7 +185,8 @@ text_extra <- function(id, key = NULL, ...) {
         }",
         id = id,
         key = key,
-        args = args_js(...))
+        args = args_js(...)
+      )
     )
   )
 }

R/reactable-server.R

@@ -234,14 +234,23 @@ reactable_extras_ui <- function(id, width = "auto", height = "auto") {
   )
 }
 
+hide_internal_uuid <- function(args) {
+  if (is.null(args$columns)) {
+    args$columns <- list()
+  }
+  args$columns[[".internal_uuid"]] <- reactable::colDef(show = FALSE)
+  return(args)
+}
+
 #' @rdname reactable-extras-server
 #' @export
 reactable_extras_server <- function(id, data, total_pages = 4, sortable = TRUE, ...) {
 
-  data <- as.data.frame(data, stringsAsFactors = TRUE)
+  data <- as.data.frame(data, stringsAsFactors = TRUE) |>
+    dplyr::mutate(.internal_uuid = dplyr::row_number())
 
   # Create and clean-up reactable arguments
-  reactable_args <- list(...)
+  reactable_args <- hide_internal_uuid(list(...))
 
   checkmate::assert(
     checkmate::check_character(id, len = 1),

R/tooltip.R

@@ -0,0 +1,25 @@
+#' Tool-tip for table headers
+#'
+#' @param content The content to be displayed in the tool-tip
+#' @param theme The theme of the tool-tip, either "light", "light-border", "material" or
+#'   "translucent"
+#'
+#' @examples
+#' reactable::colDef(header = tooltip_extra("This is my tool-tip", theme = "material"))
+#'
+#' @export
+tooltip_extra <- function(content, theme = "light") {
+  reactable::JS(
+    htmltools::doRenderTags(
+      htmltools::htmlTemplate(
+        text_ = "function(columnInfo) {
+                 return React.createElement(TooltipExtras,
+                 {column: columnInfo.name, tooltip: '{{content}}',
+                 theme: '{{theme}}'})
+        }",
+        content = content,
+        theme = theme
+      )
+    )
+  )
+}