Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Issue 481 - Support arbitrary file extensions in component suites by Marc-Andre-Rivet · Pull Request #1078 · plotly/dash · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions @plotly/dash-generator-test-component-standard/base/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,21 @@
dict(
relative_package_path='dash_generator_test_component_standard.js',
namespace='dash_generator_test_component_standard'
),
dict(
relative_package_path='godfather.ttf',
namespace='dash_generator_test_component_standard',
dynamic=True
)
]

_css_dist = [
dict(
relative_package_path='style.css',
namespace='dash_generator_test_component_standard'
)
]

for _component in __all__:
setattr(locals()[_component], '_js_dist', _js_dist)
setattr(locals()[_component], '_css_dist', _css_dist)
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: 'godfather';
src: url(./godfather.ttf) format('truetype');
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,19 @@ import React from 'react';
/**
* MyComponent description
*/
const MyStandardComponent = ({ id, value }) => (<div id={id}>{value}</div>);
const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);

MyStandardComponent.propTypes = {
/**
* The id of the component
*/
id: PropTypes.string,

/**
* The style
*/
style: PropTypes.shape,

/**
* The value to display
*/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [UNRELEASED]
### Added
- [#1201](https://github.com/plotly/dash/pull/1201) New attribute `app.validation_layout` allows you to create a multi-page app without `suppress_callback_exceptions=True` or layout function tricks. Set this to a component layout containing the superset of all IDs on all pages in your app.
- [#1078](https://github.com/plotly/dash/pull/1078) Permit usage of arbitrary file extensions for assets within component libraries

### Fixed
- [#1201](https://github.com/plotly/dash/pull/1201) Fixes [#1193](https://github.com/plotly/dash/issues/1193) - prior to Dash 1.11, you could use `flask.has_request_context() == False` inside an `app.layout` function to provide a special layout containing all IDs for validation purposes in a multi-page app. Dash 1.11 broke this when we moved most of this validation into the renderer. This change makes it work again.
Expand DownExpand Up@@ -72,7 +73,7 @@ These functions are particularly useful for apps deployed on Dash Enterprise whe

### Changed
- [#1035](https://github.com/plotly/dash/pull/1035) Simplify our build process.
- [#1074](https://github.com/plotly/dash/pull/1045) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).
- [#1074](https://github.com/plotly/dash/pull/1074) Error messages when providing an incorrect property to a component have been improved: they now specify the component type, library, version, and ID (if available).

### Fixed
- [#1037](https://github.com/plotly/dash/pull/1037) Fix no_update test to allow copies, such as those stored and retrieved from a cache.
Expand Down
13 changes: 6 additions & 7 deletions dash/dash.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
import threading
import re
import logging
import mimetypes

from functools import wraps

Expand DownExpand Up@@ -45,6 +46,9 @@
from . import _validate
from . import _watch

# Add explicit mapping for map files
mimetypes.add_type("application/json", ".map", True)

_default_index = """<!DOCTYPE html>
<html>
<head>
Expand DownExpand Up@@ -669,13 +673,8 @@ def serve_component_suites(self, package_name, fingerprinted_path):

_validate.validate_js_path(self.registered_paths, package_name, path_in_pkg)

mimetype = (
{
"js": "application/javascript",
"css": "text/css",
"map": "application/json",
}
)[path_in_pkg.split(".")[-1]]
extension = "." + path_in_pkg.split(".")[-1]
mimetype = mimetypes.types_map.get(extension, "application/octet-stream")

package = sys.modules[package_name]
self.logger.debug(
Expand Down
2 changes: 1 addition & 1 deletion dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,7 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
for filename in filenames:
extension = os.path.splitext(filename)[1]

if extension not in [".css", ".js", ".map"]:
if extension in [".py", ".pyc", ".json"]:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pick up everything but the Python artifacts

continue

target_dirname = os.path.join(
Expand Down
43 changes: 42 additions & 1 deletion tests/integration/test_generation.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
from dash import Dash
from dash.dependencies import Input, Output
from dash.exceptions import PreventUpdate

from dash_generator_test_component_nested import MyNestedComponent
from dash_generator_test_component_standard import MyStandardComponent
from dash_html_components import Div
from dash_html_components import Button, Div

from selenium.webdriver.support.ui import WebDriverWait


def test_gene001_simple_callback(dash_duo):
Expand All@@ -18,3 +23,39 @@ def test_gene001_simple_callback(dash_duo):

assert dash_duo.wait_for_element("#standard").text == "Standard"
assert dash_duo.wait_for_element("#nested").text == "Nested"

dash_duo.percy_snapshot(name="gene001-simple-callback")


def test_gene002_arbitrary_resources(dash_duo):
app = Dash(__name__)

app.layout = Div([Button(id="btn"), Div(id="container")])

@app.callback(Output("container", "children"), [Input("btn", "n_clicks")])
def update_container(n_clicks):
if n_clicks is None:
raise PreventUpdate

return MyStandardComponent(
id="standard", value="Standard", style={"font-family": "godfather"}
)

dash_duo.start_server(app)

assert (
dash_duo.driver.execute_script("return document.fonts.check('1em godfather')")
is False
)

dash_duo.wait_for_element("#btn").click()
assert dash_duo.wait_for_element("#standard").text == "Standard"

WebDriverWait(dash_duo.driver, 10).until(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better than dash.testing.wait.until? It's barely any more complicated so fine to keep it, just curious if there's a difference.

Regardless, very nice test!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware I could do that. I thought it was either this of dash_duo._wait_for, will keep in mind for the future.

lambda _: dash_duo.driver.execute_script(
"return document.fonts.check('1em godfather')"
)
is True,
)

dash_duo.percy_snapshot(name="gene002-arbitrary-resource")