Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Commit baafb29

Browse files
author
Marc-André Rivet
committed
Merge remote-tracking branch 'origin/dev'
# Conflicts: # dash-info.yaml
2 parents 69f43cc + 3646cc0 commit baafb29

File tree

287 files changed

+31285
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+31285
-39
lines changed

.Rbuildignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ demo/.*\.js
2020
demo/.*\.html
2121
demo/.*\.css
2222

23-
# ignore python files/folders
23+
# ignore Python files/folders
2424
setup.py
2525
usage.py
2626
setup.py

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ jobs:
5656
python-3.6:
5757
<<: *test-template
5858
docker:
59-
- image: circleci/python:3.6-stretch-node-browsers
59+
- image: circleci/python:3.6.9-stretch-node-browsers
6060
environment:
6161
PYTHON_VERSION: py36
6262
PERCY_ENABLE: 0
6363

6464
python-3.7:
6565
<<: *test-template
6666
docker:
67-
- image: circleci/python:3.7-stretch-node-browsers
67+
- image: circleci/python:3.7.6-stretch-node-browsers
6868
environment:
6969
PYTHON_VERSION: py37
7070
PERCY_ENABLE: 0

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ lib/metadata.json
1717
/scripts/data
1818
!/scripts/data/elements.txt
1919

20-
/src
21-
22-
/build
20+
/build

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [1.1.0] - 2020-08-25
6+
### Added
7+
- [#165](https://github.com/plotly/dash-html-components/pull/165) Add support for Dash.jl Julia component generation.
8+
59
## [1.0.3] - 2020-04-01
610
### Updated
711
- Update generated props

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dashHtmlComponents
22
Title: Vanilla HTML Components for 'Dash'
3-
Version: 1.0.3
3+
Version: 1.1.0
44
Description: 'Dash' is a web application framework that provides pure Python and R abstraction around HTML, CSS, and JavaScript. Instead of writing HTML or using an HTML templating engine, you compose your layout using R functions within the 'dashHtmlComponents' package. The source for this package is on GitHub: plotly/dash-html-components.
55
Depends: R (>= 3.0.2)
66
Imports:

Project.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
name = "DashHtmlComponents"
3+
uuid = "1b08a953-4be3-4667-9a23-24100242a84a"
4+
authors = ["Chris Parmer <chris@plotly.com>"]
5+
version = "1.1.0"
6+
7+
[deps]
8+
DashBase = "03207cf0-e2b3-4b91-9ca8-690cf0fb507e"
9+
10+
[compact]
11+
julia = "1.2"
12+
DashBase = ">=0.1"

R/internal.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.dashHtmlComponents_js_metadata <- function() {
22
deps_metadata <- list(`dash_html_components` = structure(list(name = "dash_html_components",
3-
version = "1.0.3", src = list(href = NULL,
3+
version = "1.1.0", src = list(href = NULL,
44
file = "deps"), meta = NULL,
55
script = 'dash_html_components.min.js',
66
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashHtmlComponents",
77
all_files = FALSE), class = "html_dependency"),
88
`dash_html_components` = structure(list(name = "dash_html_components",
9-
version = "1.0.3", src = list(href = NULL,
9+
version = "1.1.0", src = list(href = NULL,
1010
file = "deps"), meta = NULL,
1111
script = 'dash_html_components.min.js.map',
1212
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashHtmlComponents",

dash_html_components/A.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class A(Component):
3131
- media (string; optional): Specifies a hint of the media for which the linked resource was designed.
3232
- rel (string; optional): Specifies the relationship of the target object to the link object.
3333
- shape (string; optional)
34-
- target (string; optional)
34+
- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
3535
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3636
- className (string; optional): Often used with CSS to style elements with common properties.
3737
- contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/Area.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Area(Component):
3333
- media (string; optional): Specifies a hint of the media for which the linked resource was designed.
3434
- rel (string; optional): Specifies the relationship of the target object to the link object.
3535
- shape (string; optional)
36-
- target (string; optional)
36+
- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
3737
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3838
- className (string; optional): Often used with CSS to style elements with common properties.
3939
- contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/Base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Base(Component):
2626
- data-* (string; optional): A wildcard data attribute
2727
- aria-* (string; optional): A wildcard aria attribute
2828
- href (string; optional): The URL of a linked resource.
29-
- target (string; optional)
29+
- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
3030
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3131
- className (string; optional): Often used with CSS to style elements with common properties.
3232
- contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/Form.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ class Form(Component):
2929
- acceptCharset (string; optional): List of supported charsets.
3030
- action (string; optional): The URI of a program that processes the information submitted via the form.
3131
- autoComplete (string; optional): Indicates whether controls in this form can by default have their values automatically completed by the browser.
32-
- encType (string; optional): Defines the content type of the form date when the method is POST.
32+
- encType (string; optional): Defines the content type of the form data when the method is POST.
3333
- method (string; optional): Defines which HTTP method to use when submitting the form. Can be GET (default) or POST.
3434
- name (string; optional): Name of the element. For example used by the server to identify the fields in form submits.
3535
- noValidate (a value equal to: 'noValidate', 'novalidate', 'NOVALIDATE' | boolean; optional): This attribute indicates that the form shouldn't be validated when submitted.
36-
- target (string; optional)
36+
- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
3737
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3838
- className (string; optional): Often used with CSS to style elements with common properties.
3939
- contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/dash_html_components.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dash_html_components/metadata.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"name": "string"
116116
},
117117
"required": false,
118-
"description": ""
118+
"description": "Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)"
119119
},
120120
"accessKey": {
121121
"type": {
@@ -994,7 +994,7 @@
994994
"name": "string"
995995
},
996996
"required": false,
997-
"description": ""
997+
"description": "Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)"
998998
},
999999
"accessKey": {
10001000
"type": {
@@ -2153,7 +2153,7 @@
21532153
"name": "string"
21542154
},
21552155
"required": false,
2156-
"description": ""
2156+
"description": "Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)"
21572157
},
21582158
"accessKey": {
21592159
"type": {
@@ -9922,7 +9922,7 @@
99229922
"name": "string"
99239923
},
99249924
"required": false,
9925-
"description": "Defines the content type of the form date when the method is POST."
9925+
"description": "Defines the content type of the form data when the method is POST."
99269926
},
99279927
"method": {
99289928
"type": {
@@ -9972,7 +9972,7 @@
99729972
"name": "string"
99739973
},
99749974
"required": false,
9975-
"description": ""
9975+
"description": "Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)"
99769976
},
99779977
"accessKey": {
99789978
"type": {

dash_html_components/package-info.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dash-html-components",
3-
"version": "1.0.3",
3+
"version": "1.1.0",
44
"description": "Vanilla HTML components for Dash",
55
"main": "lib/index.js",
66
"repository": {
@@ -19,8 +19,8 @@
1919
"uninstall-local": "pip uninstall dash-html-components -y",
2020
"lint": "eslint src scripts",
2121
"build:js": "webpack --mode production",
22-
"build:py_and_r": "dash-generate-components ./src/components dash_html_components -p package-info.json && cp dash_html_components_base/** dash_html_components && dash-generate-components ./src/components dash_html_components -p package-info.json --r-prefix 'html'",
23-
"build": "npm run build:js && npm run build:py_and_r",
22+
"build:backends": "dash-generate-components ./src/components dash_html_components -p package-info.json && cp dash_html_components_base/** dash_html_components && dash-generate-components ./src/components dash_html_components -p package-info.json --r-prefix 'html' --r-suggests 'dash,dashCoreComponents' --jl-prefix 'html' ",
23+
"build": "npm run build:js && npm run build:backends",
2424
"postbuild": "es-check es5 dash_html_components/*.js",
2525
"build:watch": "watch 'npm run build' src",
2626
"test:import": "python -m unittest tests.test_dash_import",

deps/dash_html_components.min.js

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

deps/dash_html_components.min.js.map

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

inst/deps/dash_html_components.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/htmlA.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ See https://reactjs.org/docs/lists-and-keys.html for more info}
5252

5353
\item{shape}{Character. }
5454

55-
\item{target}{Character. }
55+
\item{target}{Character. Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)}
5656

5757
\item{accessKey}{Character. Keyboard shortcut to activate or add focus to the element.}
5858

man/htmlArea.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ See https://reactjs.org/docs/lists-and-keys.html for more info}
5656
5757
\item{shape}{Character. }
5858
59-
\item{target}{Character. }
59+
\item{target}{Character. Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)}
6060
6161
\item{accessKey}{Character. Keyboard shortcut to activate or add focus to the element.}
6262

man/htmlBase.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ See https://reactjs.org/docs/lists-and-keys.html for more info}
4141

4242
\item{href}{Character. The URL of a linked resource.}
4343

44-
\item{target}{Character. }
44+
\item{target}{Character. Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)}
4545

4646
\item{accessKey}{Character. Keyboard shortcut to activate or add focus to the element.}
4747

man/htmlForm.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ See https://reactjs.org/docs/lists-and-keys.html for more info}
4949

5050
\item{autoComplete}{Character. Indicates whether controls in this form can by default have their values automatically completed by the browser.}
5151

52-
\item{encType}{Character. Defines the content type of the form date when the method is POST.}
52+
\item{encType}{Character. Defines the content type of the form data when the method is POST.}
5353

5454
\item{method}{Character. Defines which HTTP method to use when submitting the form. Can be GET (default) or POST.}
5555

5656
\item{name}{Character. Name of the element. For example used by the server to identify the fields in form submits.}
5757

5858
\item{noValidate}{A value equal to: 'novalidate', 'novalidate', 'novalidate' | logical. This attribute indicates that the form shouldn't be validated when submitted.}
5959
60-
\item{target}{Character. }
60+
\item{target}{Character. Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)}
6161
6262
\item{accessKey}{Character. Keyboard shortcut to activate or add focus to the element.}
6363

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dash-html-components",
3-
"version": "1.0.3",
3+
"version": "1.1.0",
44
"description": "Vanilla HTML components for Dash",
55
"main": "lib/index.js",
66
"repository": {
@@ -19,8 +19,8 @@
1919
"uninstall-local": "pip uninstall dash-html-components -y",
2020
"lint": "eslint src scripts",
2121
"build:js": "webpack --mode production",
22-
"build:py_and_r": "dash-generate-components ./src/components dash_html_components -p package-info.json && cp dash_html_components_base/** dash_html_components && dash-generate-components ./src/components dash_html_components -p package-info.json --r-prefix 'html' --r-suggests 'dash,dashCoreComponents'",
23-
"build": "npm run build:js && npm run build:py_and_r",
22+
"build:backends": "dash-generate-components ./src/components dash_html_components -p package-info.json && cp dash_html_components_base/** dash_html_components && dash-generate-components ./src/components dash_html_components -p package-info.json --r-prefix 'html' --r-suggests 'dash,dashCoreComponents' --jl-prefix 'html' ",
23+
"build": "npm run build:js && npm run build:backends",
2424
"postbuild": "es-check es5 dash_html_components/*.js",
2525
"build:watch": "watch 'npm run build' src",
2626
"test:import": "python -m unittest tests.test_dash_import",

0 commit comments

Comments
 (0)