Skip to content

Commit

Permalink
preparing release
Browse files Browse the repository at this point in the history
  • Loading branch information
jbkunst committed Jan 3, 2022
1 parent 9e1a4ec commit c16bea8
Show file tree
Hide file tree
Showing 237 changed files with 813 additions and 647 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Package: highcharter
Type: Package
Version: 0.9.3.9000
Version: 0.9.4
Title: A Wrapper for the 'Highcharts' Library
Description: A wrapper for the 'Highcharts' library including
shortcut functions to plot R objects. 'Highcharts'
<http://www.highcharts.com/> is a charting library offering
<https://www.highcharts.com/> is a charting library offering
numerous chart types with a simple configuration syntax.
Authors@R: c(
person("Joshua", "Kunst", role = c("aut", "cre"), email = "[email protected]"),
Expand All @@ -23,7 +23,7 @@ Authors@R: c(
person("Bart", "Oortwijn", role = c("ctb"), comment = "rjson option, hc_add_yAxis, and GH issues collaborator"),
person("Paul", "Campbell", role = c("ctb"), comment = "additional proxy methods")
)
URL: http://jkunst.com/highcharter, https://github.com/jbkunst/highcharter
URL: https://jkunst.com/highcharter/, https://github.com/jbkunst/highcharter
BugReports: https://github.com/jbkunst/highcharter/issues
License: MIT + file LICENSE
RoxygenNote: 7.1.2
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# highcharter 0.9.2.9000
# highcharter 0.9.4

## Changes

Expand All @@ -17,6 +17,7 @@ when the size of viewport is small (like tables o phones).

## Bugs

* Fix url in documentations via `devtools::check_rhub()`.
* Removing `knitr.figure = FALSE` option in `sizingPolicy = htmlwidgets::sizingPolicy`
to fix #703

Expand Down
6 changes: 3 additions & 3 deletions R/data.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' Visual comparison of Mountains Panorama
#'
#' This data comes from the \url{http://www.highcharts.com/} examples:
#' This data comes from the \url{https://www.highcharts.com/} examples:
#' https://www.highcharts.com/demo/3d-area-multiple
#'
#' @section Variables:
Expand All @@ -21,7 +21,7 @@

#' City temperatures from a year in wide format
#'
#' This data comes from the \url{http://www.highcharts.com/} examples.
#' This data comes from the \url{https://www.highcharts.com/} examples.
#'
#' @section Variables:
#'
Expand All @@ -43,7 +43,7 @@

#' City temperatures from a year in long format
#'
#' This data comes from the \url{http://www.highcharts.com/} examples.
#' This data comes from the \url{https://www.highcharts.com/} examples.
#'
#' @section Variables:
#'
Expand Down
12 changes: 6 additions & 6 deletions R/hchart-shorcuts.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Shortcut to make spkarlines
#' @param x A numeric vector.
#' @param type Type sparkline: line, bar, etc.
#' @param ... Additional arguments for the data series \url{http://api.highcharts.com/highcharts#series}.
#' @param ... Additional arguments for the data series \url{https://api.highcharts.com/highcharts/series}.
#'
#' @examples
#'
Expand Down Expand Up @@ -34,7 +34,7 @@ hcspark <- function(x = NULL, type = NULL, ...) {
#' @param var A string vector same length of x.
#' @param var2 A string vector same length of x.
#' @param outliers A boolean value to show or not the outliers.
#' @param ... Additional arguments for the data series \url{http://api.highcharts.com/highcharts#series}.
#' @param ... Additional arguments for the data series \url{https://api.highcharts.com/highcharts/series}.
#' @examples
#' \dontrun{
#' hcboxplot(x = iris$Sepal.Length, var = iris$Species, color = "red")
Expand Down Expand Up @@ -138,7 +138,7 @@ hcboxplot <- function(x = NULL, var = NULL, var2 = NULL, outliers = TRUE, ...) {
#' @param rows A integer to set
#' @param icons A character vector same length (o length 1) as labels
#' @param size Font size
#' @param ... Additional arguments for the data series \url{http://api.highcharts.com/highcharts#series}.
#' @param ... Additional arguments for the data series \url{https://api.highcharts.com/highcharts/series}.
#' @importFrom dplyr ungroup group_by
#' @importFrom rlang .data
#' @export
Expand Down Expand Up @@ -227,7 +227,7 @@ Item chart provides better behaviour beside is a specific type of chart of Highc
#'
#' @param tm A \code{treemap} object from the treemap package.
#' @param ... Additional shared arguments for the data series
#' (\url{http://api.highcharts.com/highcharts#series}).
#' (\url{https://api.highcharts.com/highcharts/series}).
#'
#' @examples
#' \dontrun{
Expand Down Expand Up @@ -310,7 +310,7 @@ hctreemap <- function(tm, ...) {
#' @param size_var string name of column containing numeric data to aggregate by
#' @param color_var string name of column containing numeric data to color by. defaults to same column as \code{size_var}
#' @param ... additional shared arguments for the data series
#' (\url{http://api.highcharts.com/highcharts#series}).
#' (\url{https://api.highcharts.com/highcharts/series}).
#'
#' @return highchart plot object
#' @examples
Expand Down Expand Up @@ -434,7 +434,7 @@ hctreemap2 <- function(data, group_vars, size_var, color_var = NULL, ...) {
#' Shortcut to create parallel coordinates
#' @param df A data frame object.
#' @param ... Additional shared arguments for the data series
#' (\url{http://api.highcharts.com/highcharts#series}) for the
#' (\url{https://api.highcharts.com/highcharts/series}) for the
#' \code{hchar.data.frame} function.
#' @examples
#' require(viridisLite)
Expand Down
2 changes: 1 addition & 1 deletion R/hchart.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#'
#' @param object A R object.
#' @param ... Additional arguments for the data series
#' (\url{http://api.highcharts.com/highcharts#series}).
#' (\url{https://api.highcharts.com/highcharts/series}).
#'
#' @export
hchart <- function(object, ...) {
Expand Down
2 changes: 1 addition & 1 deletion R/highcharter-package.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' An `htmlwidget` interface to the
#' Highcharts javascript chart library
#'
#' Highcharts \url{http://www.highcharts.com/} is a mature javascript
#' Highcharts \url{https://www.highcharts.com/} is a mature javascript
#' charting library. Highcharts provide a various type of charts, from
#' scatters to heatmaps or treemaps.
#'
Expand Down
4 changes: 2 additions & 2 deletions R/highcharter.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#' other applications.
#'
#' @param hc_opts A `list` object containing options defined as
#' \url{http://api.highcharts.com/highcharts}.
#' \url{https://api.highcharts.com/highcharts/}.
#' @param theme A \code{hc_theme} class object-
#' @param type A character value to set if use Highchart, Highstock or
#' Highmap. Options are \code{"chart"}, \code{"stock"} and \code{"map"}.
Expand Down Expand Up @@ -127,7 +127,7 @@ renderHighchart <- function(expr, env = parent.frame(), quoted = FALSE) {
#' other applications.
#'
#' @param hc_opts A `list` object containing options defined as
#' \url{http://api.highcharts.com/highcharts}.
#' \url{https://api.highcharts.com/highcharts/}.
#' @param theme A \code{hc_theme} class object.
#' @param type A character value to set if use Highchart, Highstock or
#' Highmap. Options are \code{"chart"}, \code{"stock"} and \code{"map"}.
Expand Down
8 changes: 4 additions & 4 deletions R/highcharts-api-add.R
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ hc_add_series.ohlc <- function(hc, data, type = "candlestick", ...) {
#' @param fillOpacity The opacity of bands.
#' @param name The name of the series.
#' @param ... Arguments defined in
#' \url{http://api.highcharts.com/highcharts#chart}.
#' \url{https://api.highcharts.com/highcharts/chart}.
#' @export
hc_add_series.forecast <- function(hc, data, addOriginal = FALSE,
addLevels = TRUE, fillOpacity = 0.1, name = NULL, ...) {
Expand Down Expand Up @@ -252,7 +252,7 @@ hc_add_series.geo_list <- function(hc, data, type = NULL, ...) {
#' @param color A stringr color.
#' @param fillOpacity fillOpacity to the confidence interval.
#' @param ... Arguments defined in
#' \url{http://api.highcharts.com/highcharts#chart}.
#' \url{https://api.highcharts.com/highcharts/chart}.
#' @importFrom broom augment
#' @importFrom rlang .data
#' @export
Expand Down Expand Up @@ -299,7 +299,7 @@ hc_add_series.loess <- hc_add_series.lm
#' @param mapping The mapping, same idea as \code{ggplot2}.
#' @param fast convert to json during the composition of a highchart object
#' @param ... Arguments defined in
#' \url{http://api.highcharts.com/highcharts#chart}.
#' \url{https://api.highcharts.com/highcharts/chart}.
#' @importFrom rlang .data
#' @export
hc_add_series.data.frame <- function(hc, data, type = NULL, mapping = hcaes(), fast = FALSE, ...) {
Expand Down Expand Up @@ -626,7 +626,7 @@ hc_add_series_list <- function(hc, x) {
#' @param hc A `highchart` `htmlwidget` object.
#' @param series The name of type of series to apply the event.
#' @param event The name of event: click, mouseOut, mouseOver. See
#' \url{http://api.highcharts.com/highcharts/plotOptions.areasplinerange.point.events.select}
#' \url{https://api.highcharts.com/highcharts/plotOptions.areasplinerange.point.events.select}
#' for more details.
#'
#' @note Event details are accessible from hc_name_EventType, i.e. if a highchart is rendered against output$my_hc and
Expand Down
10 changes: 5 additions & 5 deletions R/highcharts-api-helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ validate_args <- function(name, lstargs) {
}

.hc_tooltip_table <- function(hc, ...) {
# http://stackoverflow.com/a/22327749/829971
# https://stackoverflow.com/a/22327749/829971
hc %>%
highcharter::hc_tooltip(
shared = TRUE,
Expand All @@ -50,7 +50,7 @@ validate_args <- function(name, lstargs) {
}

.hc_tooltip_sort <- function(hc, ...) {
# http://stackoverflow.com/a/16954666/829971
# https://stackoverflow.com/a/16954666/829971
hc %>%
highcharter::hc_tooltip(
shared = TRUE,
Expand Down Expand Up @@ -84,7 +84,7 @@ validate_args <- function(name, lstargs) {
#' inside of `hc_tooltip` function an `useHTML = TRUE` option.
#'
#' @param accesor A string indicating the name of the column where the data is.
#' @param hc_opts A list of options using the \url{http://api.highcharts.com/highcharts}
#' @param hc_opts A list of options using the \url{https://api.highcharts.com/highcharts/}
#' syntax.
#' @param width A numeric input in pixels indicating the with of the tooltip.
#' @param height A numeric input in pixels indicating the height of the tooltip.
Expand Down Expand Up @@ -337,7 +337,7 @@ hc_size <- function(hc, width = NULL, height = NULL) {
#' @param hc A \code{highchart} \code{htmlwidget} object.
#' @param enabled Enable the motion plugin.
#' @param startIndex start index, default to 0.
#' @param ... Arguments defined in \url{https://github.com/larsac07/Motion-Highcharts-Plugin/wiki}.
#' @param ... Arguments defined in \url{https://github.com/TorsteinHonsi/Motion-Highcharts-Plugin/wiki}.
#'
#' @export
hc_motion <- function(hc, enabled = TRUE, startIndex = 0, ...) {
Expand Down Expand Up @@ -388,7 +388,7 @@ hc_zAxis_multiples <- function(hc, ...) {
#' @param sep A numeric value for the separation (in percentage) for the panes.
#' @param offset A numeric value (in percentage).
#' @param turnopposite A logical value to turn the side of each axis or not.
#' @param ... Arguments defined in \url{http://api.highcharts.com/highcharts/yAxis}.
#' @param ... Arguments defined in \url{https://api.highcharts.com/highcharts/yAxis}.
#'
#' @examples
#'
Expand Down
4 changes: 2 additions & 2 deletions R/highcharts-api.R
Original file line number Diff line number Diff line change
Expand Up @@ -846,9 +846,9 @@ hc_title <- function(hc, ...) {
#' @param hc A `highchart` `htmlwidget` object.
#' @param ... Arguments defined in \url{https://api.highcharts.com/highcharts/tooltip}.
#' @param sort Logical value to implement sort according `this.point`
#' \url{http://stackoverflow.com/a/16954666/829971}.
#' \url{https://stackoverflow.com/a/16954666/829971}.
#' @param table Logical value to implement table in tooltip:
#' \url{http://stackoverflow.com/a/22327749/829971}.
#' \url{https://stackoverflow.com/a/22327749/829971}.
#'
#' @examples
#'
Expand Down
4 changes: 2 additions & 2 deletions R/highmaps.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#' @param value A string value with the name of the variable to chart.
#' @param joinBy What property to join the \code{map} and \code{df}
#' @param ... Additional shared arguments for the data series
#' (\url{http://api.highcharts.com/highcharts#series}).
#' (\url{https://api.highcharts.com/highcharts/series}).
#'
#' @examples
#'
Expand Down Expand Up @@ -86,7 +86,7 @@ hc_add_series_map <- function(hc, map, df, value, joinBy, ...) {
#' @param value A string value with the name of the variable to chart.
#' @param joinBy What property to join the \code{map} and \code{df}.
#' @param ... Additional shared arguments for the data series
#' (\url{http://api.highcharts.com/highcharts#series}).
#' (\url{https://api.highcharts.com/highcharts/series}).
#'
#' @examples
#'
Expand Down
2 changes: 1 addition & 1 deletion R/theme-chalk.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#' @param ... A named parameters to modify the theme.
#'
#' Chalk theme for highcharts was inspired by
#' \url{https://www.amcharts.com/inspiration/hand-drawn/}.
#' \url{https://www.amcharts.com/demos/}.
#'
#' @examples
#'
Expand Down
2 changes: 1 addition & 1 deletion R/theme-ffx.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' Firefox theme for highcharts
#'
#' Firefox theme was inspired by \url{https://www.mozilla.org/en-US/styleguide/}.
#' Firefox theme was inspired by \url{https://mozilla.design/}.
#'
#' @param ... A named parameters to modify the theme.
#'
Expand Down
2 changes: 1 addition & 1 deletion R/theme-flat.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' Flat and flatdark theme is inspired by
#' \url{https://github.com/chriskempson/base16} and
#' \url{https://github.com/cttobin/ggthemr#flat}
#' \url{https://github.com/Mikata-Project/ggthemr#flat}
#'
#' @param ... A named parameters to modify the theme.
#'
Expand Down
2 changes: 1 addition & 1 deletion R/theme-handdrawn.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Hand Drawn theme for highcharts
#'
#' Hand Drawn theme for highcharts. Inspired by
#' \url{https://www.amcharts.com/inspiration/hand-drawn/}.
#' \url{https://www.amcharts.com/demos/}.
#'
#' @param ... A named parameters to modify the theme.
#'
Expand Down
2 changes: 1 addition & 1 deletion R/theme-sandsignika.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ hc_theme_sandsignika <- function(...) {
chart = list(
backgroundColor = NULL,
divBackgroundImage =
"http://www.highcharts.com/samples/graphics/sand.png",
"https://www.highcharts.com/samples/graphics/sand.png",
style = list(
fontFamily = "Signika, serif"
)
Expand Down
2 changes: 1 addition & 1 deletion R/theme-smpl.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Simple theme for highcharts
#'
#' Theme smpl design is inspired by \url{https://github.com/hrbrmstr/hrbrmisc/blob/master/R/themes.r}
#' and color by \url{https://www.materialui.co/flatuicolors}.
#' and color by \url{https://materialui.co/flatuicolors}.
#'
#' @param ... A named parameters to modify the theme.
#'
Expand Down
4 changes: 2 additions & 2 deletions R/theme-sparkline.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Sparkline theme for highcharts
#'
#' Sparkline theme is based on \url{http://www.highcharts.com/demo/sparkline}
#' and this post \url{http://jkunst.com/blog/posts/2020-06-26-valuebox-and-sparklines/}.
#' Sparkline theme is based on \url{https://www.highcharts.com/demo/sparkline}
#' and this post \url{https://jkunst.com/blog/posts/2020-06-26-valuebox-and-sparklines/}.
#'
#' @param ... A named parameters to modify the theme.
#'
Expand Down
2 changes: 1 addition & 1 deletion R/theme.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#' There are some exiting themes so you can apply style to charts with few
#' lines of code.
#'
#' More examples and details in \url{http://www.highcharts.com/docs/chart-design-and-style/themes}.
#' More examples and details in \url{https://www.highcharts.com/docs/chart-design-and-style/themes}.
#'
#' @param ... A list of named parameters.
#'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/highcharter?color=brightgreen)](https://cran.r-project.org/package=highcharter)
[![CRAN downloads](https://cranlogs.r-pkg.org/badges/highcharter?color=brightgreen)](https://www.r-pkg.org/pkg/highcharter)
[![Project Status: Active – The project has reached a stable, usablestate and is being activelydeveloped.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![Lifecycle:stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable)
[![Codecov test coverage](https://codecov.io/gh/jbkunst/highcharter/branch/master/graph/badge.svg)](https://codecov.io/gh/jbkunst/highcharter?branch=master)
[![Lifecycle:stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
[![Codecov test coverage](https://codecov.io/gh/jbkunst/highcharter/branch/master/graph/badge.svg)](https://app.codecov.io/gh/jbkunst/highcharter?branch=master)
[![Last commit](https://img.shields.io/github/last-commit/jbkunst/highcharter.svg)](https://github.com/jbkunst/highcharter/issues)
[![GitHub closed issues](https://img.shields.io/github/issues-raw/jbkunst/highcharter.svg)](https://github.com/jbkunst/highcharter/issues)
[![GitHub issues](https://img.shields.io/github/issues-closed-raw/jbkunst/highcharter.svg)](https://github.com/jbkunst/highcharter/issues)
Expand Down
15 changes: 1 addition & 14 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,14 +1 @@
## Resubmission

- Adding `if(interactive())` to example for the `checking for detritus in the temp directory`
NOTE based on https://stackoverflow.com/questions/62456137/r-cran-check-detritus-in-temp-directory.

## Notes on past resubmission

- Removing invalid URLs from the documentation. Sorry for not fix all URL in
the previous submission.
- Removing invalid URLs from the documentation.
- Fix the examples with more than 10s elapsed times.
- Remove the VignetteBuilder field in DESCRIPTION file.
- Fix CRAN checks https://cran.r-project.org/web/checks/check_results_highcharter.html
- Updating highchartsJS libraries an adding new functionalities.
No comments.
4 changes: 2 additions & 2 deletions data-raw/pokemon.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ pkmn_detail_url <- bulbapedia_html %>%
html_attr("href")

library(furrr)
plan(multiprocess(workers = 10))
plan(multisession(workers = 10))

dfpkmn_detail <- furrr::future_map_dfr(
pkmn_detail_url,
function(url = "/wiki/Rattata_(Pok%C3%A9mon)"){
function(url = "/wiki/Slowpoke_(Pok%C3%A9mon)"){

message(url)
# url <- "/wiki/Necrozma_(Pokémon)"
Expand Down
Binary file modified data/pokemon.rda
Binary file not shown.
Loading

0 comments on commit c16bea8

Please sign in to comment.