Skip to content

fix: cell-id logic in function-registry #6500

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 3 commits into from
Sep 24, 2025
Merged

fix: cell-id logic in function-registry #6500

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f682b9
fix: cell-id logic in function-registry
mscolnick Sep 23, 2025
20e22d1
Update frontend/src/plugins/core/registerReactComponent.tsx
mscolnick Sep 24, 2025
0323c20
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 24, 2025
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
40 changes: 21 additions & 19 deletions frontend/src/plugins/core/registerReactComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import ReactDOM, { type Root } from "react-dom/client";
import useEvent from "react-use-event-hook";
import type { ZodSchema } from "zod";
import { notebookAtom } from "@/core/cells/cells.ts";
import { findCellId } from "@/core/cells/ids.ts";
import { HTMLCellId } from "@/core/cells/ids.ts";
import { isUninstantiated } from "@/core/cells/utils";
import { createInputEvent, MarimoValueUpdateEvent } from "@/core/dom/events";
import { getUIElementObjectId } from "@/core/dom/ui-element";
Expand Down Expand Up @@ -182,24 +182,26 @@ function PluginSlotInternal<T>(
const objectId = getUIElementObjectId(hostElement);
invariant(objectId, "Object ID should exist");

const cellId = findCellId(hostElement);
invariant(cellId, "Cell ID should exist");

const notebookState = store.get(notebookAtom);
const cellRuntime = notebookState.cellRuntime[cellId];
const cellData = notebookState.cellData[cellId];

const cellNotInitialized = isUninstantiated({
executionTime:
cellRuntime.runElapsedTimeMs ?? cellData.lastExecutionTime,
status: cellRuntime.status,
errored: cellRuntime.errored,
interrupted: cellRuntime.interrupted,
stopped: cellRuntime.stopped,
});

if (cellNotInitialized) {
throw new CellNotInitializedError();
const htmlId = HTMLCellId.findElementThroughShadowDOMs(hostElement)?.id;
const cellId = htmlId ? HTMLCellId.parse(htmlId) : null;
if (cellId) {
// If the cell is not initialized, throw an error
const notebookState = store.get(notebookAtom);
const cellRuntime = notebookState.cellRuntime[cellId];
const cellData = notebookState.cellData[cellId];

const cellNotInitialized = isUninstantiated({
executionTime:
cellRuntime.runElapsedTimeMs ?? cellData.lastExecutionTime,
status: cellRuntime.status,
errored: cellRuntime.errored,
interrupted: cellRuntime.interrupted,
stopped: cellRuntime.stopped,
});

if (cellNotInitialized) {
throw new CellNotInitializedError();
}
}

const response = await FUNCTIONS_REGISTRY.request({
Expand Down
Loading