version 1.3.1

stla · Mar 6, 2021 · bd3f3d6 · bd3f3d6
1 parent 847b208
commit bd3f3d6
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 102 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rAmCharts4
 Title: Interface to the JavaScript Library 'amCharts 4' 
-Version: 1.3.0
+Version: 1.3.1
 Authors@R: c(
     person(given = "Stéphane",
            family = "Laurent",
@@ -30,7 +30,7 @@ Encoding: UTF-8
 LazyData: true
 Imports: 
     htmltools,
-    htmlwidgets,
+    htmlwidgets (>= 1.5.3),
     reactR,
     shiny,
     jsonlite,

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# rAmCharts4 1.3.1 (2021-03-06)
+
+* Updated 'amcharts4'.
+* Compliance with the new 'htmlwidgets' convention.
+
+
 # rAmCharts4 1.3.0 (2021-01-11)
 
 * New options for legends: `maxWidth`, `maxHeight`, and `scrollable`.

diff --git a/R/internal.R b/R/internal.R
@@ -1,6 +1,6 @@
 #' Called by HTMLWidgets to produce the widget's root element.
 #' @noRd
-amChart4_html <- function(id, style, class, ...) {
+widget_html.amChart4 <- function(id, style, class, ...) {
   htmltools::tagList(
     # Necessary for RStudio viewer version < 1.2
     reactR::html_dependency_corejs(),

diff --git a/inst/htmlwidgets/amChart4.js b/inst/htmlwidgets/amChart4.js
diff --git a/inst/htmlwidgets/amChart4.js.map b/inst/htmlwidgets/amChart4.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "@amcharts/amcharts4": "^4.10.12",
+    "@amcharts/amcharts4": "^4.10.16",
     "regression": "^2.0.1"
   },
   "devDependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@amcharts/amcharts4@^4.10.12":
-  version "4.10.12"
-  resolved "https://registry.yarnpkg.com/@amcharts/amcharts4/-/amcharts4-4.10.12.tgz#ecec7c456a3840694c71854e2fc39b1c33d6ef18"
-  integrity sha512-TC3YQEiL+SA8YA9LtIIQlgCu+43TVeVXg2jAyZKr6Th3t5t04fFkT+NvNqN9/k312ud8RIipEtSG/6ozUFssuw==
+"@amcharts/amcharts4@^4.10.16":
+  version "4.10.16"
+  resolved "https://registry.yarnpkg.com/@amcharts/amcharts4/-/amcharts4-4.10.16.tgz#6da21413d9c7190ab19e81339182a8044cc85546"
+  integrity sha512-RCXQ/7g6DXTQ2owEgDWojVD1FSe+6oiKeNWNxC9+miDNgX2OU/y2g8rDo65OXf5/7ZhD5uvu7msh/Ma4vw9EtA==
   dependencies:
     "@babel/runtime" "^7.6.3"
     core-js "^3.0.0"