patch to allow root label specification with csv_to_hier #114 and let rootLabel argument work again with sund2b()

timelyportfolio · timelyportfolio · commit 2d97d123d02a · 2022-06-12T21:04:04.000-05:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: sunburstR
 Type: Package
 Title: Sunburst 'Htmlwidget'
-Version: 2.1.6
-Date: 2021-09-19
+Version: 2.1.7
+Date: 2022-06-12
 Authors@R: c(
       person(
         "Mike", "Bostock"
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# sunburstR 2.1.7
+
+* allow specification of root label in internal `csv_to_hier` converter function
+* fix bug where `rootLabel` argument for `sund2b` was not working ; (see [issue 114](https://github.com/timelyportfolio/sunburstR/issues/114))
+
 # sunburstR 2.1.6
 
 * add labels for slices based on https://bl.ocks.org/vasturiano/12da9071095fbd4df434e60d52d2d58d
diff --git a/R/converters.R b/R/converters.R
@@ -1,5 +1,5 @@
 #' @keywords internal
-csv_to_hier <- function(csv, delim = "-") {
+csv_to_hier <- function(csv, delim = "-", rootLabel = "root") {
   hier_col <- strsplit(as.character(csv[[1]]), delim)
   # determine max length of all the paths to build column names
   #   issue 107
@@ -21,5 +21,5 @@ csv_to_hier <- function(csv, delim = "-") {
     df <- df[,-1]
   }
   df$size = csv[[2]]
-  d3r::d3_nest(df, value_cols = "size")
+  d3r::d3_nest(df, value_cols = "size", root = rootLabel)
 }
diff --git a/inst/htmlwidgets/sund2b.js b/inst/htmlwidgets/sund2b.js
@@ -74,7 +74,7 @@ HTMLWidgets.widget({
         }
 
         if(x.options.hasOwnProperty("rootLabel") && x.options.rootLabel !== null) {
-          x.data.root.label = x.options.rootLabel;
+          x.data.root.name = x.options.rootLabel;
         }
 
         d3.select(el).datum(x.data)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#' @keywords internal`
`2`		`-csv_to_hier <- function(csv, delim = "-") {`
	`2`	`+csv_to_hier <- function(csv, delim = "-", rootLabel = "root") {`
`3`	`3`	`hier_col <- strsplit(as.character(csv[[1]]), delim)`
`4`	`4`	`# determine max length of all the paths to build column names`
`5`	`5`	`# issue 107`
`@@ -21,5 +21,5 @@ csv_to_hier <- function(csv, delim = "-") {`
`21`	`21`	`df <- df[,-1]`
`22`	`22`	`}`
`23`	`23`	`df$size = csv[[2]]`
`24`		`- d3r::d3_nest(df, value_cols = "size")`
	`24`	`+ d3r::d3_nest(df, value_cols = "size", root = rootLabel)`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ HTMLWidgets.widget({`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if(x.options.hasOwnProperty("rootLabel") && x.options.rootLabel !== null) {`
`77`		`- x.data.root.label = x.options.rootLabel;`
	`77`	`+ x.data.root.name = x.options.rootLabel;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`d3.select(el).datum(x.data)`