A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
refactor(frontend): make CellHandle editorView nullable (#9928)
Myles Scolnick710d7563d187
diff --git a/frontend/src/components/editor/cell/code/cell-editor.tsx b/frontend/src/components/editor/cell/code/cell-editor.tsxindex e489f9c2e0..419ee9115e 100644--- a/frontend/src/components/editor/cell/code/cell-editor.tsx+++ b/frontend/src/components/editor/cell/code/cell-editor.tsx@@ -458,8 +458,11 @@ const CellEditorInternal = ({// Prioritize building this cell's editor when it scrolls into view, so the// visible region fills in first instead of waiting for the top-to-bottom// queue. The margin builds cells just before they reach the viewport.+ // uidotdev sets threshold default to 1. Set it 0 so cells are prioritized+ // at 300px.const [intersectionRef, intersection] = useIntersectionObserver({rootMargin: "300px 0px",+ threshold: 0,});useEffect(() => {if (isEditorMounted) {diff --git a/frontend/src/components/editor/notebook-cell.tsx b/frontend/src/components/editor/notebook-cell.tsxindex 376f204394..f67850cb7a 100644--- a/frontend/src/components/editor/notebook-cell.tsx+++ b/frontend/src/components/editor/notebook-cell.tsx@@ -58,7 +58,6 @@ import type { UserConfig } from "../../core/config/config-schema";import { isAppInteractionDisabled } from "../../core/websocket/connection-utils";import { useCellRenderCount } from "../../hooks/useCellRenderCount";import type { Theme } from "../../theme/useTheme";-import { derefNotNull } from "../../utils/dereference";import { Functions } from "../../utils/functions";import { Logger } from "../../utils/Logger";import { renderShortcut } from "../shortcuts/renderShortcut";@@ -233,8 +232,9 @@ export type CellComponentActions = Pick<export interface CellHandle {/*** The CodeMirror editor view.+ * TODO: merge this with editorViewOrNull*/- editorView: EditorView;+ editorView: EditorView | null;/*** The CodeMirror editor view, or null if it is not yet mounted.*/@@ -280,7 +280,7 @@ const CellComponent = (props: CellProps) => {ref,() => ({get editorView() {- return derefNotNull(editorView);+ return editorView.current;},get editorViewOrNull() {return editorView.current;diff --git a/frontend/src/core/cells/__tests__/document-changes.test.ts b/frontend/src/core/cells/__tests__/document-changes.test.tsindex dfc275d587..1a992804c5 100644--- a/frontend/src/core/cells/__tests__/document-changes.test.ts+++ b/frontend/src/core/cells/__tests__/document-changes.test.ts@@ -430,7 +430,7 @@ describe("toDocumentChanges", () => {const [a] = state.cellIds.inOrderIds;// Position cursor at end of "line1" (position 5)- const view = state.cellHandles[a].current!.editorView;+ const view = state.cellHandles[a].current!.editorView!;view.dispatch({ selection: { anchor: 5 } });const { changes } = resolve(state, {@@ -466,7 +466,7 @@ describe("toDocumentChanges", () => {const [a] = state.cellIds.inOrderIds;// Split the cell first- const view = state.cellHandles[a].current!.editorView;+ const view = state.cellHandles[a].current!.editorView!;view.dispatch({ selection: { anchor: 5 } });const snapshot = view.state.doc.toString();state = dispatch(state, {diff --git a/frontend/src/core/cells/utils.ts b/frontend/src/core/cells/utils.tsindex 42fb887cb4..cc6e860280 100644--- a/frontend/src/core/cells/utils.ts+++ b/frontend/src/core/cells/utils.ts@@ -29,7 +29,7 @@ export function notebookCells(state: NotebookState) {export function notebookCellEditorViews({ cellHandles }: NotebookState) {const views: Record<CellId, EditorView> = {};for (const [cell, ref] of Objects.entries(cellHandles)) {- if (!ref.current) {+ if (!ref.current?.editorView) {continue;}views[cell] = ref.current.editorView;diff --git a/frontend/src/core/codemirror/copilot/getCodes.ts b/frontend/src/core/codemirror/copilot/getCodes.tsindex 83d88bf5a8..d7cfbcb141 100644--- a/frontend/src/core/codemirror/copilot/getCodes.ts+++ b/frontend/src/core/codemirror/copilot/getCodes.ts@@ -47,7 +47,9 @@ const notebookCellCodes = atom((get) => {const handle = notebook.cellHandles[id];return [id,- handle?.current ? getEditorCodeAsPython(handle.current.editorView) : "",+ handle?.current?.editorView+ ? getEditorCodeAsPython(handle.current.editorView)+ : "",];}),);diff --git a/frontend/src/core/errors/errors.ts b/frontend/src/core/errors/errors.tsindex 17865381bd..3c9ff1d6cd 100644--- a/frontend/src/core/errors/errors.ts+++ b/frontend/src/core/errors/errors.ts@@ -18,7 +18,7 @@ export interface AutoFix {fixType: "manual" | "ai";onFix: (ctx: {addCodeBelow: (code: string) => void;- editor: EditorView | undefined;+ editor: EditorView | null | undefined;cellId: CellId;aiFix?: AIFix;}) => Promise<void>;