Skip to content

Commit 5727743

Browse files
committed
build: fix check errors
1 parent 0f23d26 commit 5727743

File tree

8 files changed

+34
-100
lines changed

8 files changed

+34
-100
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ node_modules
1313
^\.bumpversion\.cfg$
1414
^\.editorconfig$
1515
^\.lintr$
16+
^docs$
1617
^Makefile$
1718
^CRAN-SUBMISSION$

CRAN-SUBMISSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Version: 4.3.0
2-
Date: 2022-07-28 01:13:21 UTC
3-
SHA: 183d4c30dd7a561518ae8093b89c4c156269fe6a
2+
Date: 2022-08-09 23:53:33 UTC
3+
SHA: 0f23d26d63db1792f4867a5989db48db1fc45e3a

DESCRIPTION

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Title: 'HTMLWidget' Wrapper of 'LineUp' for Visual Analysis of Multi-Attribute R
44
Description: 'LineUp' is an interactive technique designed to create, visualize and explore rankings of items based on a set of heterogeneous attributes.
55
This is a 'htmlwidget' wrapper around the JavaScript library 'LineUp.js'.
66
It is designed to be used in 'R Shiny' apps and 'R Markddown' files.
7-
Due to an outdated 'webkit' version of 'RStudio' it won't work in the intergrated viewer.
8-
Version: 4.3.0
9-
Date: 2021-08-30
7+
Due to an outdated 'webkit' version of 'RStudio' it won't work in the integrated viewer.
8+
Version: 4.6.0
9+
Date: 2022-08-10
1010
Authors@R: person("Samuel", "Gratzl", email = "[email protected]", role = c("aut", "cre"))
1111
Maintainer: Samuel Gratzl <[email protected]>
1212
URL: https://github.com/lineupjs/lineup_htmlwidget/
@@ -25,7 +25,6 @@ Suggests:
2525
lintr,
2626
remotes,
2727
styler
28-
LazyData: true
2928
RoxygenNote: 7.2.0
3029
VignetteBuilder: knitr
3130
Language: en-US

NAMESPACE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ export(renderLineup)
1010
export(renderTaggle)
1111
export(taggle)
1212
export(taggleOutput)
13-
importFrom(htmlwidgets,shinyRenderWidget)
14-
importFrom(htmlwidgets,shinyWidgetOutput)

R/lineup.R

Lines changed: 23 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
defaultSlopeGraphMode = "item",
1717
ignoreUnsupportedBrowser = FALSE
1818
)
19-
#' taggle - factory for Taggle HTMLWidget
19+
20+
#' lineup builder pattern function
2021
#'
2122
#' @param data data frame like object i.e. also crosstalk shared data frame
2223
#' @param options LineUp options
@@ -47,8 +48,7 @@
4748
#'
4849
#' @examples
4950
#' \dontrun{
50-
#' taggle(mtcars)
51-
#' taggle(iris)
51+
#' lineupBuilder(iris) |> buildLineUp()
5252
#' }
5353
#'
5454
#' @export
@@ -130,7 +130,7 @@ lineupBuilder <- function(data,
130130
}
131131
}
132132

133-
#' lineup - factory for LineUp HTMLWidget
133+
#' factory for LineUp HTMLWidget based on a LineUpBuilder
134134
#'
135135
#' @param x LineUpBuilder object
136136
#' @param width width of the element
@@ -140,6 +140,10 @@ lineupBuilder <- function(data,
140140
#'
141141
#' @return html lineup widget
142142
#'
143+
#' @examples
144+
#' \dontrun{
145+
#' lineupBuilder(iris) |> buildLineUp()
146+
#' }
143147
#' @export
144148
buildLineUp <- function(x, width = "100%",
145149
height = NULL,
@@ -148,16 +152,13 @@ buildLineUp <- function(x, width = "100%",
148152
.buildLineUpWidget(x, width, height, elementId, dependencies, lineupType = "lineup")
149153
}
150154

151-
#' taggle - factory for Taggle HTMLWidget
155+
#' factory for LineUp HTMLWidget based on a LineUpBuilder
156+
#' @inheritParams buildLineUp
152157
#'
153-
#' @param x LineUpBuilder object
154-
#' @param width width of the element
155-
#' @param height height of the element
156-
#' @param elementId unique element id
157-
#' @param dependencies include crosstalk dependencies
158-
#'
159-
#' @return html taggle widget
160-
158+
#' @examples
159+
#' \dontrun{
160+
#' lineupBuilder(iris) |> buildTaggle()
161+
#' }
161162
#' @export
162163
buildTaggle <- function(x, width = "100%",
163164
height = NULL,
@@ -169,40 +170,18 @@ buildTaggle <- function(x, width = "100%",
169170

170171
#' lineup - factory for LineUp HTMLWidget
171172
#'
172-
#' @param data data frame like object i.e. also crosstalk shared data frame
173+
#' @inheritParams lineupBuilder
174+
#' @inheritDotParams lineupBuilder
173175
#' @param width width of the element
174176
#' @param height height of the element
175177
#' @param elementId unique element id
176-
#' @param options LineUp options
177-
#' @param ranking ranking definition created using \code{\link{lineupRanking}}
178178
#' @param dependencies include crosstalk dependencies
179-
#' @param ... additional ranking definitions like 'ranking1=...' due to restrictions in converting parameters
180-
#'
181-
#' @section LineUp options:
182-
#' \describe{
183-
#' \item{filterGlobally}{whether filter within one ranking applies to all rankings (default: TRUE)}
184-
#' \item{singleSelection}{restrict to single item selection (default: FALSE}
185-
#' \item{noCriteriaLimits}{allow more than one sort and grouping criteria (default: FALSE)}
186-
#' \item{animated}{use animated transitions (default: TRUE)}
187-
#' \item{sidePanel}{show side panel (TRUE, FALSE, 'collapsed') (default: 'collapsed')}
188-
#' \item{hierarchyIndicator}{show sorting and grouping hierarchy indicator (TRUE, FALSE) (default: TRUE)}
189-
#' \item{labelRotation}{how many degrees should a label be rotated in case of narrow columns (default: 0)}
190-
#' \item{summaryHeader}{show summary histograms in the header (default: TRUE)}
191-
#' \item{overviewMode}{show overview mode in Taggle by default (default: FALSE)}
192-
#' \item{expandLineOnHover}{expand to full row height on mouse over (default: FALSE)}
193-
#' \item{defaultSlopeGraphMode}{default slope graph mode: item,band (default: 'item')}
194-
#' \item{ignoreUnsupportedBrowser}{ignore unsupported browser detection at own risk (default: FALSE)}
195-
#' \item{rowHeight}{height of a row in pixel (default: 18)}
196-
#' \item{rowPadding}{padding between two rows in pixel (default: 2)}
197-
#' \item{groupHeight}{height of an aggregated group in pixel (default: 40)}
198-
#' \item{groupPadding}{padding between two groups in pixel (default: 5)}
199-
#' }
200179
#'
180+
#' @inheritSection lineupBuilder LineUp options
201181
#' @return html lineup widget
202182
#'
203183
#' @examples
204184
#' \dontrun{
205-
#' lineup(mtcars)
206185
#' lineup(iris)
207186
#' }
208187
#'
@@ -222,40 +201,14 @@ lineup <- function(data,
222201

223202
#' taggle - factory for Taggle HTMLWidget
224203
#'
225-
#' @param data data frame like object i.e. also crosstalk shared data frame
226-
#' @param width width of the element
227-
#' @param height height of the element
228-
#' @param elementId unique element id
229-
#' @param options LineUp options
230-
#' @param ranking ranking definition created using \code{\link{lineupRanking}}
231-
#' @param dependencies include crosstalk dependencies
232-
#' @param ... additional ranking definitions like 'ranking1=...' due to restrictions in converting parameters
233-
#'
234-
#' @section LineUp options:
235-
#' \describe{
236-
#' \item{filterGlobally}{whether filter within one ranking applies to all rankings (default: TRUE)}
237-
#' \item{singleSelection}{restrict to single item selection (default: FALSE}
238-
#' \item{noCriteriaLimits}{allow more than one sort and grouping criteria (default: FALSE)}
239-
#' \item{animated}{use animated transitions (default: TRUE)}
240-
#' \item{sidePanel}{show side panel (TRUE, FALSE, 'collapsed') (default: 'collapsed')}
241-
#' \item{hierarchyIndicator}{show sorting and grouping hierarchy indicator (TRUE, FALSE) (default: TRUE)}
242-
#' \item{labelRotation}{how many degrees should a label be rotated in case of narrow columns (default: 0)}
243-
#' \item{summaryHeader}{show summary histograms in the header (default: TRUE)}
244-
#' \item{overviewMode}{show overview mode in Taggle by default (default: FALSE)}
245-
#' \item{expandLineOnHover}{expand to full row height on mouse over (default: FALSE)}
246-
#' \item{defaultSlopeGraphMode}{default slope graph mode: item,band (default: 'item')}
247-
#' \item{ignoreUnsupportedBrowser}{ignore unsupported browser detection at own risk (default: FALSE)}
248-
#' \item{rowHeight}{height of a row in pixel (default: 18)}
249-
#' \item{rowPadding}{padding between two rows in pixel (default: 2)}
250-
#' \item{groupHeight}{height of an aggregated group in pixel (default: 40)}
251-
#' \item{groupPadding}{padding between two groups in pixel (default: 5)}
252-
#' }
204+
#' @inheritParams lineup
205+
#' @inheritDotParams lineup
206+
#' @inheritSection lineup LineUp options
253207
#'
254208
#' @return html taggle widget
255209
#'
256210
#' @examples
257211
#' \dontrun{
258-
#' taggle(mtcars)
259212
#' taggle(iris)
260213
#' }
261214
#'
@@ -334,13 +287,6 @@ lineupRanking <- function(columns = c("_*", "*"),
334287
#' @param width,height Must be a valid CSS unit (like \code{'100\%'},
335288
#' \code{'800px'}, \code{'auto'}) or a number, which will be coerced to a
336289
#' string and have \code{'px'} appended.
337-
#' @param expr An expression that generates a lineup
338-
#' @param env The environment in which to evaluate \code{expr}.
339-
#' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
340-
#' is useful if you want to save an expression in a variable.
341-
#'
342-
#' @name lineup-shiny#'
343-
#' @importFrom htmlwidgets shinyWidgetOutput
344290
#'
345291
#' @export
346292
lineupOutput <- function(outputId,
@@ -351,7 +297,6 @@ lineupOutput <- function(outputId,
351297

352298
#' Shiny render bindings for lineup
353299
#'
354-
#' @rdname lineup-shiny
355300
#' @param expr An expression that generates a taggle
356301
#' @param env The environment in which to evaluate \code{expr}.
357302
#' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
@@ -371,17 +316,8 @@ renderLineup <- function(expr,
371316
#' Output and render functions for using taggle within Shiny
372317
#' applications and interactive Rmd documents.
373318
#'
374-
#' @param outputId output variable to read from
375-
#' @param width,height Must be a valid CSS unit (like \code{'100\%'},
376-
#' \code{'800px'}, \code{'auto'}) or a number, which will be coerced to a
377-
#' string and have \code{'px'} appended.
378-
#' @param expr An expression that generates a taggle
379-
#' @param env The environment in which to evaluate \code{expr}.
380-
#' @param quoted Is \code{expr} a quoted expression (with \code{quote()})? This
381-
#' is useful if you want to save an expression in a variable.
319+
#' @inheritParams lineupOutput
382320
#'
383-
#' @name taggle-shiny
384-
#' @importFrom htmlwidgets shinyWidgetOutput
385321
#'
386322
#' @export
387323
taggleOutput <- function(outputId,
@@ -392,8 +328,8 @@ taggleOutput <- function(outputId,
392328

393329
#' Shiny render bindings for taggle
394330
#'
395-
#' @importFrom htmlwidgets shinyRenderWidget
396-
#' @rdname taggle-shiny
331+
#' @inheritParams renderLineup
332+
#'
397333
#' @export
398334
renderTaggle <- function(expr,
399335
env = parent.frame(),

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ LineUp.js as HTMLWidget
44
[![License: MIT][mit-image]][mit-url] [![Github Actions][github-actions-image]][github-actions-url]
55

66
LineUp is an interactive technique designed to create, visualize and explore rankings of items based on a set of heterogeneous attributes.
7-
This is a [HTMLWidget](http://www.htmlwidgets.org/) wrapper around the JavaScript library [LineUp.js](https://github.com/lineupjs/lineupjs). Details about the LineUp visualization technique can be found at [http://lineup.caleydo.org](http://lineup.caleydo.org).
7+
This is a [HTMLWidget](http://www.htmlwidgets.org/) wrapper around the JavaScript library [LineUp.js](https://github.com/lineupjs/lineupjs). Details about the LineUp visualization technique can be found at [ https://jku-vds-lab.at/tools/lineup/](https://jku-vds-lab.at/tools/lineup/).
88

9-
It can be used within standalone [R Shiny](https://shiny.rstudio.com/) apps or [R Markdown](http://rmarkdown.rstudio.com/) files. **Integrated plotting does not work due to an outdated integrated Webkit version in RStudio**.
9+
It can be used within standalone [R Shiny](https://shiny.rstudio.com/) apps or [R Markdown](https://rmarkdown.rstudio.com/) files.
1010
[Crosstalk](https://rstudio.github.io/crosstalk/) is supported for synching selections and filtering among widgets.
1111

1212
Installation

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lineup_htmlwidget",
3-
"version": "4.2.0",
3+
"version": "4.6.0",
44
"description": "LineUp.js as HTMLWidget",
55
"bugs": {
66
"url": "https://github.com/lineupjs/lineup_htmlwidget/issues"

0 commit comments

Comments
 (0)