Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix stale display #997

Merged
merged 1 commit into from
Mar 6, 2024
Merged

fix stale display #997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 39 additions & 26 deletions src/client/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,52 @@ export function define(cell) {
cellsById.get(id)?.variables.forEach((v) => v.delete());
cellsById.set(id, {cell, variables});
const root = document.querySelector(`#cell-${id}`);
let reset = null;
const clear = () => ((root.innerHTML = ""), root.classList.remove("observablehq--loading"), (reset = null));
const display = inline
? (v) => {
reset?.();
if (isNode(v) || typeof v === "string" || !v?.[Symbol.iterator]) root.append(v);
else root.append(...v);
return v;
}
: (v) => {
reset?.();
root.append(isNode(v) ? v : inspect(v));
return v;
};
const v = main.variable(
{
_node: root, // for visibility promise
pending: () => (reset = clear),
fulfilled: () => reset?.(),
rejected: (error) => (reset?.(), console.error(error), root.append(inspectError(error)))
},
{
shadow: {
display: () => display,
view: () => (v) => Generators.input(display(v))
const rejected = (error) => (clear(root), console.error(error), root.append(inspectError(error)));
const v = main.variable({_node: root, rejected}, {shadow: {}}); // _node for visibility promise
if (inputs.includes("display") || inputs.includes("view")) {
let displayVersion = -1; // the variable._version of currently-displayed values
const display = inline ? displayInline : displayBlock;
const vd = new v.constructor(2, v._module);
vd.define(
inputs.filter((i) => i !== "display" && i !== "view"),
() => {
let version = v._version; // capture version on input change
return (value) => {
if (version < displayVersion) throw new Error("stale display");
else if (version > displayVersion) clear(root);
displayVersion = version;
display(root, value);
return value;
};
}
);
v._shadow.set("display", vd);
if (inputs.includes("view")) {
const vv = new v.constructor(2, v._module, null, {shadow: {}});
vv._shadow.set("display", vd);
vv.define(["display"], (display) => (v) => Generators.input(display(v)));
v._shadow.set("view", vv);
}
);
}
v.define(outputs.length ? `cell ${id}` : null, inputs, body);
variables.push(v);
for (const o of outputs) variables.push(main.variable(true).define(o, [`cell ${id}`], (exports) => exports[o]));
}

function clear(root) {
root.innerHTML = "";
root.classList.remove("observablehq--loading");
}

function displayInline(root, value) {
if (isNode(value) || typeof value === "string" || !value?.[Symbol.iterator]) root.append(value);
else root.append(...value);
}

function displayBlock(root, value) {
root.append(isNode(value) ? value : inspect(value));
}

export function undefine(id) {
cellsById.get(id)?.variables.forEach((v) => v.delete());
cellsById.delete(id);
Expand Down