use phosphoricons

Author: pvictor

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: shinytreeview
 Title: Tree View for 'shiny' Applications
-Version: 0.0.8
+Version: 0.0.9
 Authors@R: 
     c(person(given = "Victor",
              family = "Perrier",
@@ -25,10 +25,11 @@ License: GPL-3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 Imports: 
     htmltools,
     shiny,
-    jsonlite
+    jsonlite,
+    phosphoricons
 Depends: 
     R (>= 2.10)

NEWS.md

@@ -1,3 +1,13 @@
+# shinytreeview 0.0.9
+
+* Use [phosphoricons](https://github.com/dreamRs/phosphoricons) for icons.
+
+
+# shinytreeview 0.0.8
+
+* Fixed a bug in `selected =` argument.
+
+
 # shinytreeview 0.0.7
 
 * Internal: use [{packer}](https://github.com/JohnCoene/packer) to manage JavaScript assets.

R/input-treecheck.R

@@ -32,11 +32,11 @@ treecheckInput <- function(inputId,
     highlightSelected = FALSE,
     propagateCheckEvent = hierarchical,
     hierarchicalCheck = hierarchical,
-    uncheckedIcon = "fa fa-square-o",
-    partiallyCheckedIcon = "fa fa-minus-square-o",
-    checkedIcon = "fa fa-check-square-o",
-    expandIcon = "fa fa-chevron-right",
-    collapseIcon = "fa fa-chevron-down",
+    uncheckedIcon = "ph-square-light ph-shinytreeview",
+    partiallyCheckedIcon = "ph-square-logo-light ph-shinytreeview",
+    checkedIcon = "ph-check-square-light ph-shinytreeview",
+    expandIcon = "ph-caret-right-light ph-shinytreeview",
+    collapseIcon = "ph-caret-down-light ph-shinytreeview",
     ...
   )
   options <- dropNulls(list(
@@ -59,6 +59,6 @@ treecheckInput <- function(inputId,
       )
     ),
     html_dependency_treeview(),
-    htmlDependencies(icon("plus", verify_fa = FALSE))
+    phosphoricons::html_dependency_phosphor()
   )
 }

R/input-treeview.R

@@ -42,17 +42,18 @@ treeviewInput <- function(inputId,
     warning("Multiple selected values used but multiple = FALSE, only first one will be selected.")
     selected <- selected[1]
   }
+  config <- list(
+    data = choices,
+    multiSelect = multiple,
+    preventUnselect = prevent_unselect,
+    levels = levels,
+    showBorder = borders,
+    expandIcon = "ph-plus-light ph-shinytreeview",
+    collapseIcon = "ph-minus-light ph-shinytreeview",
+    ...
+  )
   options <- dropNulls(list(
-    config = c(
-      list(
-        data = choices,
-        multiSelect = multiple,
-        preventUnselect = prevent_unselect,
-        levels = levels,
-        showBorder = borders
-      ),
-      list(...)
-    ),
+    config = config,
     selected = list1(selected)
   ))
 
@@ -70,7 +71,8 @@ treeviewInput <- function(inputId,
         HTML(jsonlite::toJSON(options, auto_unbox = TRUE, json_verbatim = TRUE))
       )
     ),
-    html_dependency_treeview()
+    html_dependency_treeview(),
+    phosphoricons::html_dependency_phosphor()
   )
 }
 

inst/packer/treeview.js

@@ -0,0 +1,6 @@
+.ph-shinytreeview {
+  font-size: 1.3333em;
+  line-height: 0.75em;
+  vertical-align: -0.2em;
+  margin-right: 0.4em !important;
+}

srcjs/css/styles.css

@@ -2,6 +2,7 @@ import $ from "jquery";
 import "shiny";
 import "patternfly-bootstrap-treeview/dist/bootstrap-treeview.min.js";
 import "patternfly-bootstrap-treeview/dist/bootstrap-treeview.min.css";
+import "../css/styles.css";
 
 var treeviewInputBinding = new Shiny.InputBinding();
 $.extend(treeviewInputBinding, {