treeInput: select with ID

dreamRs · Mar 1, 2023 · 26838f9 · 26838f9
1 parent bf0a001
commit 26838f9
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 19 deletions.
diff --git a/R/tree-input.R b/R/tree-input.R
@@ -61,7 +61,7 @@ treeInput <- function(inputId,
       tags$script(
         type = "application/json",
         `data-for` = inputId,
-        config
+        HTML(config)
       )
     ),
     html_dependency_tree()

diff --git a/examples/tree-default.R b/examples/tree-default.R
@@ -24,7 +24,7 @@ ui <- fluidPage(
         inputId = "ID1",
         label = "Select cities:",
         choices = create_tree(cities),
-        # selected = "San Francisco",
+        selected = "San Francisco",
         returnValue = "text",
         closeDepth = 0
       ),
@@ -36,7 +36,7 @@ ui <- fluidPage(
         inputId = "ID2",
         label = "Select cities:",
         choices = create_tree(cities),
-        # selected = "San Francisco",
+        selected = "San Francisco",
         returnValue = "text",
         closeDepth = 1
       ),
@@ -48,7 +48,7 @@ ui <- fluidPage(
         inputId = "ID3",
         label = "Select cities:",
         choices = create_tree(cities),
-        # selected = "San Francisco",
+        selected = c("San Francisco", "Monastir"),
         returnValue = "text",
         closeDepth = 2
       ),

diff --git a/examples/tree-update.R b/examples/tree-update.R
@@ -60,17 +60,21 @@ server <- function(input, output, session) {
     updateTreeInput(inputId = "ID1", label = input$label)
   )
 
-  observe(
+  observeEvent(
+    input$val_country,
     updateTreeInput(inputId = "ID1", selected = input$val_country)
   )
 
-  observe(
+  observeEvent(
+    input$val_city,
     updateTreeInput(inputId = "ID1", selected = input$val_city)
   )
 
-  observeEvent(
-    input$clear,
-    updateTreeInput(inputId = "ID1", selected = character(0))
+  observeEvent(input$clear, {
+      updateTreeInput(inputId = "ID1", selected = character(0))
+      updateCheckboxGroupInput(inputId = "val_country", selected = character(0))
+      updateCheckboxGroupInput(inputId = "val_city", selected = character(0))
+    }
   )
 }
 

diff --git a/inst/packer/tree.js b/inst/packer/tree.js
diff --git a/man/treeInput.Rd b/man/treeInput.Rd
diff --git a/man/updateTreeInput.Rd b/man/updateTreeInput.Rd
diff --git a/srcjs/inputs/tree.js b/srcjs/inputs/tree.js
@@ -78,7 +78,9 @@ $.extend(treeWidgetBinding, {
     var tree = treeWidgetBinding.store[el.id];
     var nodesId = tree.nodesById;
     var checked = Object.entries(nodesId).map((a) => {
-      if (value.includes(a[1].text[0])) {
+      if (value.toString() === a[1].id[0].toString()) {
+        return a[1].id[0];
+      } else if (value.includes(a[1].text[0])) {
         return a[1].id[0];
       } else {
         return null;