search update

dreamRs · May 7, 2020 · 3e3a75e · 3e3a75e
1 parent 1b89668
commit 3e3a75e
Show file tree

Hide file tree

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

diff --git a/R/server-treeview.R b/R/server-treeview.R
@@ -21,7 +21,7 @@ searchTreeview <- function(inputId,
                            collapse_before = TRUE,
                            session = shiny::getDefaultReactiveDomain()) {
   message <- list(search = list(
-    pattern = pattern,
+    pattern = list1(pattern),
     collapse = collapse_before,
     options = list(
       ignoreCase = ignore_case,

diff --git a/inst/assets/bootstrap-treeview/treeview-bindings.js b/inst/assets/bootstrap-treeview/treeview-bindings.js
@@ -45,19 +45,31 @@ $.extend(treeviewInputBinding, {
       if (data.search.collapse) {
         tree.collapseAll();
       }
-      tree.search(data.search.pattern, data.search.options);
+      if (data.search.pattern.length > 1) {
+        data.search.pattern.map(function(pattern) {
+          tree.search(pattern, data.search.options);
+        });
+      } else {
+        tree.search(data.search.pattern, data.search.options);
+      }
     }
     if (data.hasOwnProperty("expand")) {
       if (data.expand.hasOwnProperty("nodeId")) {
-        var expandedNode = tree.findNodes("^" + data.expand.nodeId + "$", "nodeId");
+        var expandedNode = tree.findNodes(
+          "^" + data.expand.nodeId + "$",
+          "nodeId"
+        );
         tree.expandNode(expandedNode, data.expand.options);
       } else {
         tree.expandAll(data.expand.options);
       }
     }
     if (data.hasOwnProperty("collapse")) {
       if (data.collapse.hasOwnProperty("nodeId")) {
-        var collapsedNode = tree.findNodes("^" + data.collapse.nodeId + "$", "nodeId");
+        var collapsedNode = tree.findNodes(
+          "^" + data.collapse.nodeId + "$",
+          "nodeId"
+        );
         tree.collapseNode(collapsedNode);
       } else {
         tree.collapseAll();
@@ -88,7 +100,7 @@ $.extend(treeviewInputBinding, {
         });
       }
       var nodes = tree.getNodes().map(function(o) {
-        return {text: o.text, nodeId: o.nodeId, parentId: o.parentId};
+        return { text: o.text, nodeId: o.nodeId, parentId: o.parentId };
       });
       Shiny.onInputChange(el.id + "_nodes:treeview.nodes", nodes);
     });