Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading
, '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 1010 - Non-rendered async components using `asyncDecorator` lock renderer callbacks by Marc-Andre-Rivet · Pull Request #1027 · plotly/dash · GitHub
Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ clientside JavaScript callbacks via inline strings.

### Fixed
- [#1018](https://github.com/plotly/dash/pull/1006) Fix the `dash.testing` **stop** API with process application runner in Python2. Use `kill()` instead of `communicate()` to avoid hanging.
- [#1027](https://github.com/plotly/dash/pull/1027) Fix bug with renderer callback lock never resolving with non-rendered async component using the asyncDecorator

## [1.6.1] - 2019-11-14
### Fixed
Expand Down
2 changes: 0 additions & 2 deletions dash-renderer/src/APIController.react.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import {
computePaths,
hydrateInitialOutputs,
setLayout,
setAppIsReady,
} from './actions/index';
import {applyPersistence} from './persistence';
import apiThunk from './actions/api';
Expand DownExpand Up@@ -55,7 +54,6 @@ class UnconnectedContainer extends Component {
dispatch
);
dispatch(setLayout(finalLayout));
dispatch(setAppIsReady());
} else if (isNil(paths)) {
dispatch(computePaths({subTree: layout, startingPath: []}));
}
Expand Down
1 change: 0 additions & 1 deletion dash-renderer/src/actions/constants.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ const actionList = {
SET_CONFIG: 'SET_CONFIG',
ON_ERROR: 'ON_ERROR',
SET_HOOKS: 'SET_HOOKS',
SET_APP_READY: 'SET_APP_READY',
};

export const getAction = action => {
Expand Down
44 changes: 34 additions & 10 deletions dash-renderer/src/actions/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import {
slice,
sort,
type,
uniq,
view,
} from 'ramda';
import {createAction} from 'redux-actions';
Expand All@@ -33,7 +34,8 @@ import cookie from 'cookie';
import {uid, urlBase, isMultiOutputProp, parseMultipleOutputs} from '../utils';
import {STATUS} from '../constants/constants';
import {applyPersistence, prunePersistence} from '../persistence';
import setAppIsReady from './setAppReadyState';

import isAppReady from './isAppReady';

export const updateProps = createAction(getAction('ON_PROP_CHANGE'));
export const setRequestQueue = createAction(getAction('SET_REQUEST_QUEUE'));
Expand All@@ -45,8 +47,6 @@ export const setHooks = createAction(getAction('SET_HOOKS'));
export const setLayout = createAction(getAction('SET_LAYOUT'));
export const onError = createAction(getAction('ON_ERROR'));

export {setAppIsReady};

export function hydrateInitialOutputs() {
return function(dispatch, getState) {
triggerDefaultState(dispatch, getState);
Expand DownExpand Up@@ -221,11 +221,13 @@ export function notifyObservers(payload) {
return async function(dispatch, getState) {
const {id, props, excludedOutputs} = payload;

const {graphs, isAppReady, requestQueue} = getState();

if (isAppReady !== true) {
await isAppReady;
}
const {
dependenciesRequest,
graphs,
layout,
paths,
requestQueue,
} = getState();

const {InputGraph} = graphs;
/*
Expand DownExpand Up@@ -365,6 +367,30 @@ export function notifyObservers(payload) {
}
});

/**
* Determine the id of all components used as input or state in the callbacks
* triggered by the props change.
*
* Wait for all components associated to these ids to be ready before initiating
* the callbacks.
*/
const deps = queuedObservers.map(output =>
dependenciesRequest.content.find(
dependency => dependency.output === output
)
);

const ids = uniq(
flatten(
deps.map(dep => [
dep.inputs.map(input => input.id),
dep.state.map(state => state.id),
])
)
);

await isAppReady(layout, paths, ids);

/*
* record the set of output IDs that will eventually need to be
* updated in a queue. not all of these requests will be fired in this
Expand DownExpand Up@@ -950,8 +976,6 @@ function updateOutput(
);
});
}

dispatch(setAppIsReady());
}
};
if (multi) {
Expand Down
28 changes: 28 additions & 0 deletions dash-renderer/src/actions/isAppReady.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
import {path} from 'ramda';
import {isReady} from '@plotly/dash-component-plugins';

import Registry from '../registry';

export default (layout, paths, targets) => {
const promises = [];
targets.forEach(id => {
const pathOfId = paths[id];
if (!pathOfId) {
return;
}

const target = path(pathOfId, layout);
if (!target) {
return;
}

const component = Registry.resolve(target);
const ready = isReady(component);

if (ready && typeof ready.then === 'function') {
promises.push(ready);
}
});

return promises.length ? Promise.all(promises) : true;
};
77 changes: 0 additions & 77 deletions dash-renderer/src/actions/setAppReadyState.js

This file was deleted.

8 changes: 0 additions & 8 deletions dash-renderer/src/reducers/isAppReady.js

This file was deleted.

2 changes: 0 additions & 2 deletions dash-renderer/src/reducers/reducer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ import {
view,
} from 'ramda';
import {combineReducers} from 'redux';
import isAppReady from './isAppReady';
import layout from './layout';
import graphs from './dependencyGraph';
import paths from './paths';
Expand All@@ -32,7 +31,6 @@ export const apiRequests = [
function mainReducer() {
const parts = {
appLifecycle,
isAppReady,
layout,
graphs,
paths,
Expand Down
50 changes: 50 additions & 0 deletions dash-renderer/tests/isAppReady.test.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import isAppReady from "../src/actions/isAppReady";

const WAIT = 1000;

describe('isAppReady', () => {
let resolve;
beforeEach(() => {
const promise = new Promise(r => {
resolve = r;
});

window.__components = {
a: { _dashprivate_isLazyComponentReady: promise },
b: {}
};
});

it('executes if app is ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'b', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});

it('waits on app to be ready', async () => {
let done = false;
Promise.resolve(isAppReady(
[{ namespace: '__components', type: 'a', props: { id: 'comp1' } }],
{ comp1: [0] },
['comp1']
)).then(() => {
done = true
});

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(false);

resolve();

await new Promise(r => setTimeout(r, WAIT));
expect(done).toEqual(true);
});
});
66 changes: 0 additions & 66 deletions dash-renderer/tests/notifyObservers.test.js

This file was deleted.

Loading