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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")
, '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@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## [Unreleased]

### Added

- [#2009](https://github.com/plotly/dash/pull/2009) Add support for Promises within Client-side callbacks as requested in [#1364](https://github.com/plotly/dash/pull/1364).

### Fixed

- [#2015](https://github.com/plotly/dash/pull/2015) Fix bug [#1854](https://github.com/plotly/dash/issues/1854) in which the combination of row_selectable="single or multi" and filter_action="native" caused the JS error.
Expand Down
26 changes: 11 additions & 15 deletions dash/dash-renderer/src/actions/callbacks.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ const getVals = (input: any) =>
const zipIfArray = (a: any, b: any) =>
Array.isArray(a) ? zip(a, b) : [[a, b]];

function handleClientside(
async function handleClientside(
dispatch: any,
clientside_function: any,
config: any,
Expand DownExpand Up@@ -246,14 +246,12 @@ function handleClientside(
dc.callback_context.states_list = state;
dc.callback_context.states = stateDict;

const returnValue = dc[namespace][function_name](...args);
let returnValue = dc[namespace][function_name](...args);

delete dc.callback_context;

if (typeof returnValue?.then === 'function') {
throw new Error(
'The clientside function returned a Promise. ' +
'Promises are not supported in Dash clientside ' +
'right now, but may be in the future.'
);
returnValue = await returnValue;
}

zipIfArray(outputs, returnValue).forEach(([outi, reti]) => {
Expand DownExpand Up@@ -504,15 +502,13 @@ export function executeCallback(

if (clientside_function) {
try {
return {
data: handleClientside(
dispatch,
clientside_function,
config,
payload
),
const data = await handleClientside(
dispatch,
clientside_function,
config,
payload
};
);
return {data, payload};
} catch (error: any) {
return {error, payload};
}
Expand Down
24 changes: 23 additions & 1 deletion tests/integration/clientside/assets/clientside.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,5 +98,27 @@ window.dash_clientside.clientside = {
}
window.callCount += 1;
return inputValue.toString();
}
},

chained_promise: function (inputValue) {
return new Promise(function (resolve) {
setTimeout(function () {
resolve(inputValue + "-chained");
}, 100);
});
},

delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
window.callbackDone = function (deferredValue) {
resolve("clientside-" + inputValue + "-" + deferredValue);
};
});
},

non_delayed_promise: function (inputValue) {
return new Promise(function (resolve) {
resolve("clientside-" + inputValue);
});
},
};
163 changes: 138 additions & 25 deletions tests/integration/clientside/test_clientside.py
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
from multiprocessing import Value
from multiprocessing import Value, Lock

from dash import Dash, Input, Output, State, ClientsideFunction, ALL, html, dcc
from selenium.webdriver.common.keys import Keys
Expand DownExpand Up@@ -223,30 +223,6 @@ def test_clsd004_clientside_multiple_outputs(dash_duo):
dash_duo.wait_for_text_to_equal(selector, expected)


def test_clsd005_clientside_fails_when_returning_a_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children="hello"),
html.Div(id="side-effect"),
html.Div(id="output", children="output"),
]
)

app.clientside_callback(
ClientsideFunction("clientside", "side_effect_and_return_a_promise"),
Output("output", "children"),
[Input("input", "children")],
)

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#input", "hello")
dash_duo.wait_for_text_to_equal("#side-effect", "side effect")
dash_duo.wait_for_text_to_equal("#output", "output")


def test_clsd006_PreventUpdate(dash_duo):
app = Dash(__name__, assets_folder="assets")

Expand DownExpand Up@@ -716,3 +692,140 @@ def test_clsd014_input_output_callback(dash_duo):
assert call_count == 2, "initial + changed once"

assert dash_duo.get_logs() == []


def test_clsd015_clientside_chained_callbacks_returning_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="div-1"),
html.Div(id="div-2"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="chained_promise"),
Output("div-1", "children"),
Input("input", "children"),
)

@app.callback(Output("div-2", "children"), Input("div-1", "children"))
def callback(value):
return value + "-twice"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#div-1", "initial-chained")
dash_duo.wait_for_text_to_equal("#div-2", "initial-chained-twice")


def test_clsd016_serverside_clientside_shared_input_with_promise(dash_duo):
app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
return "serverside-" + value[0]

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial")
dash_duo.driver.execute_script("window.callbackDone('deferred')")
dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial-deferred")


def test_clsd017_clientside_serverside_shared_input_with_promise(dash_duo):
lock = Lock()
lock.acquire()

app = Dash(__name__, assets_folder="assets")

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="clientside-div"),
html.Div(id="serverside-div"),
]
)

app.clientside_callback(
ClientsideFunction(namespace="clientside", function_name="non_delayed_promise"),
Output("clientside-div", "children"),
Input("input", "children"),
)

@app.callback(Output("serverside-div", "children"), Input("input", "children"))
def callback(value):
with lock:
return "serverside-" + value[0] + "-deferred"

dash_duo.start_server(app)

dash_duo.wait_for_text_to_equal("#clientside-div", "clientside-initial")
lock.release()
dash_duo.wait_for_text_to_equal("#serverside-div", "serverside-initial-deferred")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
async function(input) {
return input + "-inline";
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")


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

app.layout = html.Div(
[
html.Div(id="input", children=["initial"]),
html.Div(id="output-div"),
]
)

app.clientside_callback(
"""
function(inputValue) {
return new Promise(function (resolve) {
resolve(inputValue + "-inline");
});
}
""",
Output("output-div", "children"),
Input("input", "children"),
)

dash_duo.start_server(app)
dash_duo.wait_for_text_to_equal("#output-div", "initial-inline")