Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Dash 2 layout syntax wrappers and html tags #265

Merged
merged 16 commits into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
version: 2

jobs:


"test": &test-template
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
password: $DASH_PAT_DOCKERHUB
environment:
PERCY_PARALLEL_TOTAL: '-1'
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 'True'
Expand All @@ -33,18 +31,22 @@ jobs:
- run:
name: 🚧 install R dependencies
command: |
sudo Rscript -e 'commit_hash <- readChar("commit.txt", file.info("commit.txt")$size); message("Preparing to install plotly/dashR ", commit_hash, " ..."); install.packages("remotes"); remotes::install_github("plotly/dashR", upgrade=TRUE, ref=commit_hash, force=TRUE)'
sudo Rscript -e 'commit_hash <- readChar("commit.txt", file.info("commit.txt")$size); message("Preparing to install plotly/dashR ", commit_hash, " ..."); install.packages("remotes"); remotes::install_github("plotly/dashR", upgrade=TRUE, ref=commit_hash, dependencies=TRUE, force=TRUE)'

- run:
name: ⚙️ Integration tests
command: |
curl --proto '=https' --tlsv1.2 -sSf -o rust-init.sh https://sh.rustup.rs
chmod ugo+x rust-init.sh
./rust-init.sh -y
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git dash-main
export PATH=$PATH:/home/circleci/.local/bin/:/home/circleci/.cargo/bin
export RUSTC_BOOTSTRAP=1
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml tests/integration/
- store_artifacts:
path: test-reports
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.0.0] - 2021-03-04
## [1.0.0] - UNRELEASED
### Added
- Dash 2 wrapper functions are included, which simplify the layout syntax for writing Dash apps. This includes the ability to pipe in the `app` object to layout and meta functions, as well as tags which simplify `html` component arguments and children. [#265](https://github.com/plotly/dashR/pull/265)

### Changed
- Unify the core Dash packages (dash, dashCoreComponents, dashHtmlComponents, dashTable) for streamlined maintenance and accessibility. The namespaces of these packages will be combined under the `dash` namespace, and all artifacts from the ancillary dash packages will be included with Dash for R. [#243](https://github.com/plotly/dashr/pull/243)
- Unified the core Dash packages (dash, dashCoreComponents, dashHtmlComponents, dashTable) for streamlined maintenance and accessibility. The namespaces of these packages will be combined under the `dash` namespace, and all artifacts from the ancillary dash packages will be included with Dash for R. [#243](https://github.com/plotly/dashr/pull/243)

### Fixed
- Minor fix for favicon issue continued from [#240](https://github.com/plotly/dashr/pull/240) (for more details, see [#243](https://github.com/plotly/dashR/pull/243#issuecomment-842813526)).
Expand Down
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ Imports:
mime,
crayon,
brotli,
glue
glue,
magrittr
Suggests:
testthat
License: MIT + file LICENSE
Expand Down
20 changes: 20 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
# Generated by roxygen2: do not edit by hand

S3method(print,dash_component)
export("%>%")
export(ALL)
export(ALLSMALLER)
export(Dash)
export(MATCH)
export(add_meta)
export(add_script)
export(add_stylesheet)
export(br)
export(button)
export(clientsideFunction)
export(dashNoUpdate)
export(dash_app)
export(dash_tag)
export(div)
export(h1)
export(h2)
export(h3)
export(h4)
export(html)
export(input)
export(output)
export(p)
export(run_app)
export(set_layout)
export(span)
export(state)
export(strong)
importFrom(R6,R6Class)
importFrom(assertthat,assert_that)
importFrom(base64enc,base64encode)
Expand All @@ -25,6 +44,7 @@ importFrom(htmltools,htmlDependencies)
importFrom(htmltools,htmlDependency)
importFrom(htmltools,renderDependencies)
importFrom(jsonlite,toJSON)
importFrom(magrittr,"%>%")
importFrom(reqres,default_parsers)
importFrom(routr,Route)
importFrom(routr,RouteStack)
Expand Down
135 changes: 135 additions & 0 deletions R/all_tags.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
## Generated by `scripts/generate_tags.R`; do not edit by hand
all_tags <- c(
"a",
"abbr",
"acronym",
"address",
"area",
"article",
"aside",
"audio",
"b",
"base",
"basefont",
"bdi",
"bdo",
"big",
"blink",
"blockquote",
"br",
"button",
"canvas",
"caption",
"center",
"cite",
"code",
"col",
"colgroup",
"command",
"content",
"data",
"datalist",
"dd",
"del",
"details",
"dfn",
"dialog",
"div",
"dl",
"dt",
"element",
"em",
"embed",
"fieldset",
"figcaption",
"figure",
"font",
"footer",
"form",
"frame",
"frameset",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6",
"header",
"hgroup",
"hr",
"i",
"iframe",
"img",
"ins",
"isindex",
"kbd",
"keygen",
"label",
"legend",
"li",
"link",
"listing",
"main",
"map",
"mark",
"marquee",
"meta",
"meter",
"multicol",
"nav",
"nextid",
"nobr",
"noscript",
"object",
"ol",
"optgroup",
"option",
"output",
"p",
"param",
"picture",
"plaintext",
"pre",
"progress",
"q",
"rb",
"rp",
"rt",
"rtc",
"ruby",
"s",
"samp",
"script",
"section",
"select",
"shadow",
"slot",
"small",
"source",
"spacer",
"span",
"strike",
"strong",
"sub",
"summary",
"sup",
"table",
"tbody",
"td",
"template",
"textarea",
"tfoot",
"th",
"thead",
"time",
"title",
"tr",
"track",
"u",
"ul",
"var",
"video",
"wbr",
"xmp"
)
names(all_tags) <- all_tags
Loading