From 5a354fbcd7e8a3064a2e700b014a0b7ea35c5efd Mon Sep 17 00:00:00 2001 From: Thomas Shafer Date: Sun, 23 Jun 2019 16:46:53 -0700 Subject: [PATCH] Address changes to Handsontable Support licenseKey for new license model of Handsontable Address height and width issue with new Handsontable Handsontable version 7.0.0 changes the license model. https://github.com/handsontable/handsontable/releases/tag/7.0.0 --- R/rhandsontable.R | 6 ++++-- man/rhandsontable.Rd | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/R/rhandsontable.R b/R/rhandsontable.R index ba7076a..e037f83 100644 --- a/R/rhandsontable.R +++ b/R/rhandsontable.R @@ -8,6 +8,7 @@ #' will be used. Setting to \code{NULL} will omit. #' @param rowHeaders a vector of row names. If missing \code{rownames} #' will be used. Setting to \code{NULL} will omit. +#' @param licenseKey the license key to pass to Handsontable #' @param comments matrix or data.frame of comments; NA values are ignored #' @param useTypes logical specifying whether column classes should be mapped to #' equivalent Javascript types. Note that @@ -34,10 +35,10 @@ #' rhandsontable(DF, rowHeaders = NULL) #' @seealso \code{\link{hot_table}}, \code{\link{hot_cols}}, \code{\link{hot_rows}}, \code{\link{hot_cell}} #' @export -rhandsontable <- function(data, colHeaders, rowHeaders, comments = NULL, +rhandsontable <- function(data, colHeaders, rowHeaders, licenseKey = NULL, comments = NULL, useTypes = TRUE, readOnly = NULL, selectCallback = FALSE, - width = NULL, height = NULL, digits = 4, + width = "auto", height = "auto", digits = 4, debug = NULL, search = FALSE, ...) { rColHeaders = colnames(data) if (.row_names_info(data) > 0L) @@ -128,6 +129,7 @@ rhandsontable <- function(data, colHeaders, rowHeaders, comments = NULL, columns = cols, width = width, height = height, + licenseKey = licenseKey, debug = ifelse(is.null(debug) || is.na(debug) || !is.numeric(debug), 0, debug), search = search ) diff --git a/man/rhandsontable.Rd b/man/rhandsontable.Rd index 3137842..d1257f8 100644 --- a/man/rhandsontable.Rd +++ b/man/rhandsontable.Rd @@ -4,9 +4,9 @@ \alias{rhandsontable} \title{Handsontable widget} \usage{ -rhandsontable(data, colHeaders, rowHeaders, comments = NULL, +rhandsontable(data, colHeaders, rowHeaders, licenseKey = NULL, comments = NULL, useTypes = TRUE, readOnly = NULL, selectCallback = FALSE, - width = NULL, height = NULL, digits = 4, debug = NULL, + width = "auto", height = "auto", digits = 4, debug = NULL, search = FALSE, ...) } \arguments{ @@ -18,6 +18,8 @@ will be used. Setting to \code{NULL} will omit.} \item{rowHeaders}{a vector of row names. If missing \code{rownames} will be used. Setting to \code{NULL} will omit.} +\item{licenseKey}{the license key to pass to Handsontable} + \item{comments}{matrix or data.frame of comments; NA values are ignored} \item{useTypes}{logical specifying whether column classes should be mapped to