Skip to content

fix crash in getExpanded #1561

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

Merged
merged 1 commit into from
Aug 9, 2024
Merged

fix crash in getExpanded #1561

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
8 changes: 5 additions & 3 deletions src/client/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function define(cell) {
const root = rootsById.get(id);
const loading = findLoading(root);
root._nodes = [];
root._expanded = [];
if (mode === undefined) root._expanded = []; // only blocks have inspectors
if (loading) root._nodes.push(loading);
const pending = () => reset(root, loading);
const rejected = (error) => reject(root, error);
Expand Down Expand Up @@ -68,7 +68,8 @@ export function define(cell) {
function noop() {}

function clear(root) {
root._expanded = root._nodes.map((v) => (v.remove(), getExpanded(v)));
if (root._expanded) root._expanded = root._nodes.map(getExpanded);
root._nodes.forEach((v) => v.remove());
root._nodes.length = 0;
}

Expand Down Expand Up @@ -176,8 +177,9 @@ export function registerRoot(id, node) {
}

function getExpanded(node) {
if (node.nodeType !== 1 || !node.classList.contains("observablehq")) return; // only inspectors
const expanded = node.querySelectorAll(".observablehq--expanded");
return expanded.length ? Array.from(expanded, (e) => getNodePath(node, e)) : undefined;
if (expanded.length) return Array.from(expanded, (e) => getNodePath(node, e));
}

function getNodePath(node, descendant) {
Expand Down