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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## UNRELEASED
### Fixed
- [#1310](https://github.com/plotly/dash/pull/1310) Fix a regression since 1.13.0 preventing more than one loading state from being shown at a time.

## [1.13.3] - 2020-06-19

## [1.13.2] - 2020-06-18
Expand Down
19 changes: 7 additions & 12 deletions dash-renderer/src/observers/loadingMap.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
equals,
flatten,
forEach,
isEmpty,
map,
reduce
Expand DownExpand Up@@ -43,26 +42,22 @@ const observer: IStoreObserverDefinition<IStoreState> = {
const nextMap: any = isEmpty(loadingPaths) ?
null :
reduce(
(res, path) => {
(res, {id, property, path}) => {
let target = res;
const idprop = {
id: path.id,
property: path.property
};
const idprop = {id, property};

// Assign all affected props for this path and nested paths
target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);

forEach(p => {
target = (target[p] =
target[p] ??
p === 'children' ? [] : {}

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Turns out ?? has higher precedence than ? in JS 🙈 The only necessary part of this fix is the extra parentheses around this line.

Added the typeof path[i + 1] clause so that the [] vs {} distinction is correct - though it doesn't seem to actually cause problems when the container has the wrong type 🤷

)
path.forEach((p, i) => {
target = (target[p] = target[p] ??
(p === 'children' && typeof path[i + 1] === 'number' ? [] : {})
);

target.__dashprivate__idprops__ = target.__dashprivate__idprops__ || [];
target.__dashprivate__idprops__.push(idprop);
}, path.path);
});

// Assign one affected prop for this path
target.__dashprivate__idprop__ = target.__dashprivate__idprop__ || idprop;
Expand Down
169 changes: 169 additions & 0 deletions tests/integration/renderer/test_loading_states.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
from multiprocessing import Lock

import dash
from dash.dependencies import Input, Output

import dash_core_components as dcc
import dash_html_components as html


def test_rdls001_multi_loading_components(dash_duo):
lock = Lock()

app = dash.Dash(__name__)

app.layout = html.Div(
children=[
html.H3("Edit text input to see loading state"),
dcc.Input(id="input-3", value="Input triggers the loading states"),
dcc.Loading(
className="loading-1",
children=[html.Div(id="loading-output-1")],
type="default",
),
html.Div(
[
dcc.Loading(
className="loading-2",
children=[html.Div([html.Div(id="loading-output-2")])],
type="circle",
),
dcc.Loading(
className="loading-3",
children=dcc.Graph(id="graph"),
type="cube",
),
]
),
],
)

@app.callback(
[
Output("graph", "figure"),
Output("loading-output-1", "children"),
Output("loading-output-2", "children"),
],
[Input("input-3", "value")],
)
def input_triggers_nested(value):
with lock:
return dict(data=[dict(y=[1, 4, 2, 3])]), value, value

def wait_for_all_spinners():
dash_duo.find_element(".loading-1 .dash-spinner.dash-default-spinner")
dash_duo.find_element(".loading-2 .dash-spinner.dash-sk-circle")
dash_duo.find_element(".loading-3 .dash-spinner.dash-cube-container")

def wait_for_no_spinners():
dash_duo.wait_for_no_elements(".dash-spinner")

with lock:
dash_duo.start_server(app)
wait_for_all_spinners()

wait_for_no_spinners()

with lock:
dash_duo.find_element("#input-3").send_keys("X")
wait_for_all_spinners()

wait_for_no_spinners()


def test_rdls002_chained_loading_states(dash_duo):
lock1, lock2, lock34 = Lock(), Lock(), Lock()
app = dash.Dash(__name__)

def loading_wrapped_div(_id, color):
return html.Div(
dcc.Loading(
html.Div(
id=_id,
style={"width": 200, "height": 200, "backgroundColor": color},
),
className=_id,
),
style={"display": "inline-block"},
)

app.layout = html.Div(
[
html.Button(id="button", children="Start", n_clicks=0),
loading_wrapped_div("output-1", "hotpink"),
loading_wrapped_div("output-2", "rebeccapurple"),
loading_wrapped_div("output-3", "green"),
loading_wrapped_div("output-4", "#FF851B"),
]
)

@app.callback(Output("output-1", "children"), [Input("button", "n_clicks")])
def update_output_1(n_clicks):
with lock1:
return "Output 1: {}".format(n_clicks)

@app.callback(Output("output-2", "children"), [Input("output-1", "children")])
def update_output_2(children):
with lock2:
return "Output 2: {}".format(children)

@app.callback(
[Output("output-3", "children"), Output("output-4", "children")],
[Input("output-2", "children")],
)
def update_output_34(children):
with lock34:
return "Output 3: {}".format(children), "Output 4: {}".format(children)

dash_duo.start_server(app)

def find_spinners(*nums):
if not nums:
dash_duo.wait_for_no_elements(".dash-spinner")
return

for n in nums:
dash_duo.find_element(".output-{} .dash-spinner".format(n))

assert len(dash_duo.find_elements(".dash-spinner")) == len(nums)

def find_text(spec):
templates = [
"Output 1: {}",
"Output 2: Output 1: {}",
"Output 3: Output 2: Output 1: {}",
"Output 4: Output 2: Output 1: {}",
]
for n, v in spec.items():
dash_duo.wait_for_text_to_equal(
"#output-{}".format(n), templates[n - 1].format(v)
)

find_text({1: 0, 2: 0, 3: 0, 4: 0})
find_spinners()

btn = dash_duo.find_element("#button")
# Can't use lock context managers here, because we want to acquire the
# second lock before releasing the first
lock1.acquire()
btn.click()

find_spinners(1)
find_text({2: 0, 3: 0, 4: 0})

lock2.acquire()
lock1.release()

find_spinners(2)
find_text({1: 1, 3: 0, 4: 0})

lock34.acquire()
lock2.release()

find_spinners(3, 4)
find_text({1: 1, 2: 1})

lock34.release()

find_spinners()
find_text({1: 1, 2: 1, 3: 1, 4: 1})