Merge branch 'htmlwidget' of https://github.com/gvegayon/rgexf into htmlwidget

Author: gvegayon

.gitignore

@@ -1,19 +1,27 @@
-*.(R|r)proj.user
-*.(R|r)history
-*.(R|r)Data
-*.(R|r)proj
-*.(R|r)buildignore
-.(R|r)proj.user
+*.Rproj.user
+*.rproj.user
+*.Rhistory
+*.rhistory
+.Rhistory
+.rhistory
+*.RData
+*.rdata
+*.Rproj
+*.rproj
+*.Rbuildignore
+*.rbuildignore
+.Rproj.user
+.rproj.user
 *~
 *.gexf
 *.html
 *.dll
 *.rds
 *.o
 
-*.(R|r)html
+*.Rhtml
+*.rhtml
 *.pdf
-.Rproj.user
 inst/doc
 docs/
 

DESCRIPTION

@@ -21,7 +21,8 @@ Imports:
     igraph,
     grDevices,
     utils,
-    servr
+    servr,
+    htmlwidgets
 License: MIT + file LICENSE
 LazyLoad: yes
 RoxygenNote: 7.3.1

NAMESPACE

@@ -16,7 +16,7 @@ export(gexf.to.igraph)
 export(gexf_js_config)
 export(gexfjs)
 export(gexfjsOutput)
-export(gexfjsSigma)
+export(renderGexfjs)
 export(igraph.to.gexf)
 export(new.gexf.graph)
 export(read.gexf)

R/plot.R

@@ -257,12 +257,12 @@ gexfjs <- function(
 
 #' @export
 gexfjsOutput <- function(outputId, width = "100%", height = "400px") {
-  shinyWidgetOutput(outputId, "gexfjs", width, height, package = "rgexf")
+  htmlwidgets::shinyWidgetOutput(outputId, "gexfjs", width, height, package = "rgexf")
 }
 #' @export
-gexfjsSigma <- function(expr, env = parent.frame(), quoted = FALSE) {
+renderGexfjs <- function(expr, env = parent.frame(), quoted = FALSE) {
   if (!quoted) { expr <- substitute(expr) } # force quoted
-  shinyRenderWidget(expr, sigmaOutput, env, quoted = TRUE)
+  htmlwidgets::shinyRenderWidget(expr, gexfjsOutput, env, quoted = TRUE)
 }
 
 #' @import htmlwidgets
@@ -292,10 +292,10 @@ test1 <- function(width=NULL, height=NULL) {
 
 #' @export
 test1Output <- function(outputId, width = "100%", height = "400px") {
-  shinyWidgetOutput(outputId, "test1", width, height, package = "rgexf")
+  htmlwidgets::shinyWidgetOutput(outputId, "test1", width, height, package = "rgexf")
 }
 #' @export
 renderTest1 <- function(expr, env = parent.frame(), quoted = FALSE) {
   if (!quoted) { expr <- substitute(expr) } # force quoted
-  shinyRenderWidget(expr, test1Output, env, quoted = TRUE)
+  htmlwidgets::shinyRenderWidget(expr, test1Output, env, quoted = TRUE)
 }