fixed bug selected arg with ID

dreamRs · Sep 22, 2022 · 903e5b9 · 903e5b9
1 parent d4a0fc9
commit 903e5b9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: shinytreeview
 Title: Tree View for 'shiny' Applications
-Version: 0.1.0
+Version: 0.1.1
 Authors@R: 
     c(person(given = "Victor",
              family = "Perrier",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+# shinytreeview 0.1.1
+
+## Bug fixes
+
+* Fixed `selected = ` argument when using an ID to select initial value(s).
+
+
 # shinytreeview 0.1.0
 
 * New function `updateTreeview()` to update label and selected value from the server.

diff --git a/R/input-treeview.R b/R/input-treeview.R
@@ -159,6 +159,8 @@ make_tree <- function(data, levels, selected = NULL, levels_id = NULL, ...) {
     stopifnot(
       "levels and levels_id must be of same length" = length(levels) == length(levels_id)
     )
+    if (!all(levels_id %in% names(data)))
+      stop("All levels_id must be valid variables in data", call. = FALSE)
     mapply(
       SIMPLIFY = FALSE,
       USE.NAMES = FALSE,

diff --git a/inst/packer/treeview.js b/inst/packer/treeview.js
diff --git a/srcjs/inputs/treeview.js b/srcjs/inputs/treeview.js
@@ -65,6 +65,9 @@ $.extend(treeviewInputBinding, {
           exactMatch: true,
           revealResults: false
         });
+        if (selected.length < 1) {
+          selected = tree.findNodes("^" + data.selected[i] + "$", "id");
+        }
         tree.selectNode(selected);
         var parents = tree.getParents(selected);
         var maxLevel = Math.max.apply(
@@ -132,6 +135,9 @@ $.extend(treeviewInputBinding, {
             exactMatch: true,
             revealResults: false
           });
+          if (selected.length < 1) {
+            selected = tree.findNodes("^" + options.selected[i] + "$", "id");
+          }
           tree.selectNode(selected);
           var parents = tree.getParents(selected);
           var maxLevel = Math.max.apply(
@@ -210,6 +216,9 @@ $.extend(treecheckInputBinding, {
           exactMatch: true,
           revealResults: false
         });
+        if (selected.length < 1) {
+          selected = tree.findNodes("^" + data.selected[i] + "$", "id");
+        }
         tree.toggleNodeChecked(selected);
       }
       tree.search("", {
@@ -274,6 +283,9 @@ $.extend(treecheckInputBinding, {
             exactMatch: true,
             revealResults: false
           });
+          if (selected.length < 1) {
+            selected = tree.findNodes("^" + options.selected[i] + "$", "id");
+          }
           tree.toggleNodeChecked(selected);
         }
         tree.search("", {