support custom icons shinyTree#9

also, deal with hyphenated icons

Author: bellma-lilly

.gitignore

@@ -1,4 +1,5 @@
 .Rproj.user
 .Rhistory
 .RData
-shinyapps/
+shinyapps/
+.DS_Store

NAMESPACE

@@ -9,3 +9,5 @@ importFrom(jsonlite,toJSON)
 importFrom(methods,loadMethod)
 importFrom(utils,head)
 importFrom(utils,tail)
+importFrom(stringr,str_match)
+importFrom(stringr,str_subset)

R/update-tree.R

@@ -31,6 +31,29 @@ fixIconName <- function(icon){
   }
 }
 
+library(stringr)
+
+#fix icon retains backward compatibility for icon entries that are not fully specified
+fixIconName <- function(icon){
+  if(is.null(icon)){
+    NULL
+  }else if(grepl("[/\\]",icon)){ #ie. "/images/ball.jpg"
+    icon
+  }else{
+    iconGroup <- str_subset(icon,"(\\S+) \\1-") #ie "fa fa-file"
+    if(length(iconGroup) > 0){
+      icon
+    }else{
+      iconGroup <- str_match(icon,"(fa|glyphicon)-") #ie "fa-file"
+      if(length(iconGroup) > 1 && !is.na(iconGroup[2])){
+        paste(iconGroup[2],icon)
+      }else{ #ie. just "file"
+        paste0("fa fa-",icon)
+      }
+    }
+  }
+}
+
 get_flatList <- function(nestedList, flatList = NULL, parent = "#") {
   for (name in names(nestedList)) {
     additionalAttributeNames <- c("icon","type")

inst/examples/13-icons/server.R

@@ -0,0 +1,36 @@
+library(shiny)
+library(shinyTree)
+
+#' Examples of using jstree types to define node attributes
+#' @author Michael Bell \email{bellma@@lilly.com}
+shinyServer(function(input, output, session) {
+  log <- c(paste0(Sys.time(), ": Interact with the tree to see the logs here..."))
+  
+  treeData <- reactive({
+    list(
+      root1 = structure("", stselected=TRUE,sttype="root"),
+      root2 = structure(list(
+        SubListA = structure(list(
+            leaf1 = structure("",sttype="file",sticon="fa fa-signal"), 
+            leaf2 = structure("",sttype="file"),
+            leaf3 = structure("",sttype="file")),
+            sttype="root",stopened=TRUE
+            ),
+        SubListB = structure(list(
+          leafA = structure("",sttype="default",sticon="glyphicon glyphicon-leaf"),
+          leafB = structure("",sttype="default",sticon="shinyTree/icon.png")
+          ),stopened=TRUE,sttype="root")
+      ),
+      sttype="root",stopened=TRUE
+    )
+  )
+  })
+  
+  observeEvent(input$updateTree,{
+    updateTree(session, treeId = "tree", data = treeData())
+  })
+  
+  output$tree <- renderTree({
+    treeData()
+  })
+})

inst/examples/13-icons/ui.R

@@ -0,0 +1,26 @@
+library(shiny)
+library(shinyTree)
+
+#' Demonstrates icons by using types and by paticular items in the tree
+#' @author Michael Bell \email{bellma@@lilly.com}
+shinyUI(
+  pageWithSidebar(
+    # Application title
+    headerPanel("shinyTree with icons!"),
+    
+    sidebarPanel(
+      helpText(HTML("A shinyTree example for displaying various icons using types and specifying particular items in the tree
+                  <hr>Created using shinyTree<hr>"))
+    ),
+    mainPanel(
+      # Show a simple table.
+      shinyTree("tree", dragAndDrop = TRUE,types= #Types is in the same format that jstree expects
+      "{
+          '#': { 'max_children' : 2, 'max_depth' : 4, 'valid_children' : ['root'] },
+          'root' : { 'valid_children' : ['file'] },
+          'default' : { 'valid_children' : ['default','file'] },
+          'file' : { 'icon' : 'fa fa-file', 'valid_children' : [] }
+        }"
+      )
+    )
+  ))