Skip to content

Commit

Permalink
Update monorepo and rebuild package (#271)
Browse files Browse the repository at this point in the history
* Updating gulpfile and package.json

* More package.json and linting updates

* Adding in simplified callback updates/tests

* Import fixes

* Updating package.json

* Gulpfile script changes

* Gulpfile updates

* Rebuilding package with monorepo updates

* Re-running test

* Updating unittest

* Updating test dependencies
  • Loading branch information
HammadTheOne authored Oct 3, 2021
1 parent 948f0f7 commit ed1acb3
Show file tree
Hide file tree
Showing 219 changed files with 7,905 additions and 889 deletions.
7 changes: 1 addition & 6 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export(dccStore)
export(dccTab)
export(dccTabs)
export(dccTextarea)
export(dccTooltip)
export(dccUpload)


Expand Down Expand Up @@ -116,7 +117,6 @@ export(htmlCite)
export(htmlCode)
export(htmlCol)
export(htmlColgroup)
export(htmlCommand)
export(htmlContent)
export(htmlData)
export(htmlDatalist)
Expand All @@ -128,7 +128,6 @@ export(htmlDialog)
export(htmlDiv)
export(htmlDl)
export(htmlDt)
export(htmlElement)
export(htmlEm)
export(htmlEmbed)
export(htmlFieldset)
Expand All @@ -152,23 +151,19 @@ export(htmlI)
export(htmlIframe)
export(htmlImg)
export(htmlIns)
export(htmlIsindex)
export(htmlKbd)
export(htmlKeygen)
export(htmlLabel)
export(htmlLegend)
export(htmlLi)
export(htmlLink)
export(htmlListing)
export(htmlMain)
export(htmlMapEl)
export(htmlMark)
export(htmlMarquee)
export(htmlMeta)
export(htmlMeter)
export(htmlMulticol)
export(htmlNav)
export(htmlNextid)
export(htmlNobr)
export(htmlNoscript)
export(htmlObjectEl)
Expand Down
9 changes: 7 additions & 2 deletions R/callbacks-advanced.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ add_callback <- function(app, outputs, params, callback) {
num_inputs <- length(callback_params) - num_states
for (i in seq_len(num_states)) {
idx <- num_inputs + i
callback_params <- append(callback_params, callback_params[[idx]], state_idx[i] - 1)
callback_params <- append(callback_params, list(callback_params[[idx]]), state_idx[i] - 1)
callback_params <- callback_params[-(idx + 1)]
}
}
Expand Down Expand Up @@ -97,11 +97,16 @@ flatten <- function(x) {
# g = input("g", "value")
# )
# str(params_to_keys(as.list(LETTERS[1:7]), test))
# str(params_to_keys(c(as.list(LETTERS[1:6]), list(NULL)), test))
params_to_keys <- function(params, keys) {
params_to_key_helper <- function(keys) {
for (item_idx in seq_along(keys)) {
if (inherits(keys[[item_idx]], "dash_dependency")) {
keys[[item_idx]] <- params[[1]]
if (is.null(params[[1]])) {
keys[item_idx] <- list(NULL)
} else {
keys[[item_idx]] <- params[[1]]
}
params <<- params[-1]
} else {
keys[[item_idx]] <- params_to_key_helper(keys[[item_idx]])
Expand Down
6 changes: 3 additions & 3 deletions R/dccChecklist.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

dccChecklist <- function(id=NULL, className=NULL, inputClassName=NULL, inputStyle=NULL, labelClassName=NULL, labelStyle=NULL, loading_state=NULL, options=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, style=NULL, value=NULL) {
dccChecklist <- function(id=NULL, className=NULL, inline=NULL, inputClassName=NULL, inputStyle=NULL, labelClassName=NULL, labelStyle=NULL, loading_state=NULL, options=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, style=NULL, value=NULL) {

props <- list(id=id, className=className, inputClassName=inputClassName, inputStyle=inputStyle, labelClassName=labelClassName, labelStyle=labelStyle, loading_state=loading_state, options=options, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, style=style, value=value)
props <- list(id=id, className=className, inline=inline, inputClassName=inputClassName, inputStyle=inputStyle, labelClassName=labelClassName, labelStyle=labelStyle, loading_state=loading_state, options=options, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, style=style, value=value)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Checklist',
namespace = 'dash_core_components',
propNames = c('id', 'className', 'inputClassName', 'inputStyle', 'labelClassName', 'labelStyle', 'loading_state', 'options', 'persisted_props', 'persistence', 'persistence_type', 'style', 'value'),
propNames = c('id', 'className', 'inline', 'inputClassName', 'inputStyle', 'labelClassName', 'labelStyle', 'loading_state', 'options', 'persisted_props', 'persistence', 'persistence_type', 'style', 'value'),
package = 'dashCoreComponents'
)

Expand Down
6 changes: 3 additions & 3 deletions R/dccRadioItems.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

dccRadioItems <- function(id=NULL, className=NULL, inputClassName=NULL, inputStyle=NULL, labelClassName=NULL, labelStyle=NULL, loading_state=NULL, options=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, style=NULL, value=NULL) {
dccRadioItems <- function(id=NULL, className=NULL, inline=NULL, inputClassName=NULL, inputStyle=NULL, labelClassName=NULL, labelStyle=NULL, loading_state=NULL, options=NULL, persisted_props=NULL, persistence=NULL, persistence_type=NULL, style=NULL, value=NULL) {

props <- list(id=id, className=className, inputClassName=inputClassName, inputStyle=inputStyle, labelClassName=labelClassName, labelStyle=labelStyle, loading_state=loading_state, options=options, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, style=style, value=value)
props <- list(id=id, className=className, inline=inline, inputClassName=inputClassName, inputStyle=inputStyle, labelClassName=labelClassName, labelStyle=labelStyle, loading_state=loading_state, options=options, persisted_props=persisted_props, persistence=persistence, persistence_type=persistence_type, style=style, value=value)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'RadioItems',
namespace = 'dash_core_components',
propNames = c('id', 'className', 'inputClassName', 'inputStyle', 'labelClassName', 'labelStyle', 'loading_state', 'options', 'persisted_props', 'persistence', 'persistence_type', 'style', 'value'),
propNames = c('id', 'className', 'inline', 'inputClassName', 'inputStyle', 'labelClassName', 'labelStyle', 'loading_state', 'options', 'persisted_props', 'persistence', 'persistence_type', 'style', 'value'),
package = 'dashCoreComponents'
)

Expand Down
18 changes: 18 additions & 0 deletions R/dccTooltip.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# AUTO GENERATED FILE - DO NOT EDIT

dccTooltip <- function(children=NULL, id=NULL, background_color=NULL, bbox=NULL, border_color=NULL, className=NULL, direction=NULL, loading_state=NULL, loading_text=NULL, show=NULL, style=NULL, targetable=NULL, zindex=NULL) {

props <- list(children=children, id=id, background_color=background_color, bbox=bbox, border_color=border_color, className=className, direction=direction, loading_state=loading_state, loading_text=loading_text, show=show, style=style, targetable=targetable, zindex=zindex)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Tooltip',
namespace = 'dash_core_components',
propNames = c('children', 'id', 'background_color', 'bbox', 'border_color', 'className', 'direction', 'loading_state', 'loading_text', 'show', 'style', 'targetable', 'zindex'),
package = 'dashCoreComponents'
)

structure(component, class = c('dash_component', 'list'))
}
6 changes: 3 additions & 3 deletions R/htmlDialog.R
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# AUTO GENERATED FILE - DO NOT EDIT

htmlDialog <- function(children=NULL, id=NULL, accessKey=NULL, className=NULL, contentEditable=NULL, contextMenu=NULL, dir=NULL, draggable=NULL, hidden=NULL, key=NULL, lang=NULL, loading_state=NULL, n_clicks=NULL, n_clicks_timestamp=NULL, role=NULL, spellCheck=NULL, style=NULL, tabIndex=NULL, title=NULL, ...) {
htmlDialog <- function(children=NULL, id=NULL, accessKey=NULL, className=NULL, contentEditable=NULL, contextMenu=NULL, dir=NULL, draggable=NULL, hidden=NULL, key=NULL, lang=NULL, loading_state=NULL, n_clicks=NULL, n_clicks_timestamp=NULL, open=NULL, role=NULL, spellCheck=NULL, style=NULL, tabIndex=NULL, title=NULL, ...) {

wildcard_names = names(dash_assert_valid_wildcards(attrib = list('aria', 'data'), ...))

props <- list(children=children, id=id, accessKey=accessKey, className=className, contentEditable=contentEditable, contextMenu=contextMenu, dir=dir, draggable=draggable, hidden=hidden, key=key, lang=lang, loading_state=loading_state, n_clicks=n_clicks, n_clicks_timestamp=n_clicks_timestamp, role=role, spellCheck=spellCheck, style=style, tabIndex=tabIndex, title=title, ...)
props <- list(children=children, id=id, accessKey=accessKey, className=className, contentEditable=contentEditable, contextMenu=contextMenu, dir=dir, draggable=draggable, hidden=hidden, key=key, lang=lang, loading_state=loading_state, n_clicks=n_clicks, n_clicks_timestamp=n_clicks_timestamp, open=open, role=role, spellCheck=spellCheck, style=style, tabIndex=tabIndex, title=title, ...)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Dialog',
namespace = 'dash_html_components',
propNames = c('children', 'id', 'accessKey', 'className', 'contentEditable', 'contextMenu', 'dir', 'draggable', 'hidden', 'key', 'lang', 'loading_state', 'n_clicks', 'n_clicks_timestamp', 'role', 'spellCheck', 'style', 'tabIndex', 'title', wildcard_names),
propNames = c('children', 'id', 'accessKey', 'className', 'contentEditable', 'contextMenu', 'dir', 'draggable', 'hidden', 'key', 'lang', 'loading_state', 'n_clicks', 'n_clicks_timestamp', 'open', 'role', 'spellCheck', 'style', 'tabIndex', 'title', wildcard_names),
package = 'dashHtmlComponents'
)

Expand Down
6 changes: 3 additions & 3 deletions R/htmlLink.R
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# AUTO GENERATED FILE - DO NOT EDIT

htmlLink <- function(children=NULL, id=NULL, accessKey=NULL, className=NULL, contentEditable=NULL, contextMenu=NULL, crossOrigin=NULL, dir=NULL, draggable=NULL, hidden=NULL, href=NULL, hrefLang=NULL, integrity=NULL, key=NULL, lang=NULL, loading_state=NULL, media=NULL, n_clicks=NULL, n_clicks_timestamp=NULL, referrerPolicy=NULL, rel=NULL, role=NULL, sizes=NULL, spellCheck=NULL, style=NULL, tabIndex=NULL, title=NULL, ...) {
htmlLink <- function(children=NULL, id=NULL, accessKey=NULL, className=NULL, contentEditable=NULL, contextMenu=NULL, crossOrigin=NULL, dir=NULL, draggable=NULL, hidden=NULL, href=NULL, hrefLang=NULL, integrity=NULL, key=NULL, lang=NULL, loading_state=NULL, media=NULL, n_clicks=NULL, n_clicks_timestamp=NULL, referrerPolicy=NULL, rel=NULL, role=NULL, sizes=NULL, spellCheck=NULL, style=NULL, tabIndex=NULL, title=NULL, type=NULL, ...) {

wildcard_names = names(dash_assert_valid_wildcards(attrib = list('aria', 'data'), ...))

props <- list(children=children, id=id, accessKey=accessKey, className=className, contentEditable=contentEditable, contextMenu=contextMenu, crossOrigin=crossOrigin, dir=dir, draggable=draggable, hidden=hidden, href=href, hrefLang=hrefLang, integrity=integrity, key=key, lang=lang, loading_state=loading_state, media=media, n_clicks=n_clicks, n_clicks_timestamp=n_clicks_timestamp, referrerPolicy=referrerPolicy, rel=rel, role=role, sizes=sizes, spellCheck=spellCheck, style=style, tabIndex=tabIndex, title=title, ...)
props <- list(children=children, id=id, accessKey=accessKey, className=className, contentEditable=contentEditable, contextMenu=contextMenu, crossOrigin=crossOrigin, dir=dir, draggable=draggable, hidden=hidden, href=href, hrefLang=hrefLang, integrity=integrity, key=key, lang=lang, loading_state=loading_state, media=media, n_clicks=n_clicks, n_clicks_timestamp=n_clicks_timestamp, referrerPolicy=referrerPolicy, rel=rel, role=role, sizes=sizes, spellCheck=spellCheck, style=style, tabIndex=tabIndex, title=title, type=type, ...)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'Link',
namespace = 'dash_html_components',
propNames = c('children', 'id', 'accessKey', 'className', 'contentEditable', 'contextMenu', 'crossOrigin', 'dir', 'draggable', 'hidden', 'href', 'hrefLang', 'integrity', 'key', 'lang', 'loading_state', 'media', 'n_clicks', 'n_clicks_timestamp', 'referrerPolicy', 'rel', 'role', 'sizes', 'spellCheck', 'style', 'tabIndex', 'title', wildcard_names),
propNames = c('children', 'id', 'accessKey', 'className', 'contentEditable', 'contextMenu', 'crossOrigin', 'dir', 'draggable', 'hidden', 'href', 'hrefLang', 'integrity', 'key', 'lang', 'loading_state', 'media', 'n_clicks', 'n_clicks_timestamp', 'referrerPolicy', 'rel', 'role', 'sizes', 'spellCheck', 'style', 'tabIndex', 'title', 'type', wildcard_names),
package = 'dashHtmlComponents'
)

Expand Down
Loading

0 comments on commit ed1acb3

Please sign in to comment.