Skip to content

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.

fix completions in slides view (#9769)

Shahmir Varqhad9ab41ab0405
diff --git a/frontend/src/components/editor/cell/code/cell-editor.tsx b/frontend/src/components/editor/cell/code/cell-editor.tsx
index ff0509f767..0a69c265c0 100644
--- a/frontend/src/components/editor/cell/code/cell-editor.tsx
+++ b/frontend/src/components/editor/cell/code/cell-editor.tsx
@@ -65,6 +65,11 @@ export interface CellEditorProps
hasOutput?: boolean;
languageAdapter: LanguageAdapterType | undefined;
showLanguageToggles?: boolean;
+ /**
+ * Override for the inline "Edit with AI" tooltip. Defaults to the user's
+ * `ai.inline_tooltip` config. Set to `false` to force-disable it.
+ */
+ inlineAiTooltip?: boolean;
setLanguageAdapter: React.Dispatch<
React.SetStateAction<LanguageAdapterType | undefined>
>;
@@ -73,6 +78,12 @@ export interface CellEditorProps
editorViewParentRef?: React.RefObject<HTMLDivElement | null>;
showHiddenCode: (opts?: { focus?: boolean }) => void;
outputArea?: "above" | "below";
+ /**
+ * CSS selector for the element that editor tooltips (completions, hover,
+ * signature help) are appended to. Useful for fullscreen/dialog containers;
+ * defaults to `#App`.
+ */
+ tooltipParentSelector?: string;
}
const CellEditorInternal = ({
@@ -94,7 +105,9 @@ const CellEditorInternal = ({
languageAdapter,
setLanguageAdapter,
showLanguageToggles = true,
+ inlineAiTooltip,
outputArea,
+ tooltipParentSelector,
}: CellEditorProps) => {
const [aiCompletionCell, setAiCompletionCell] = useAtom(aiCompletionCellAtom);
const deleteCell = useDeleteCellCallback();
@@ -224,7 +237,9 @@ const CellEditorInternal = ({
hotkeys: new OverridingHotkeyProvider(userConfig.keymap.overrides ?? {}),
diagnosticsConfig: userConfig.diagnostics,
displayConfig: userConfig.display,
- inlineAiTooltip: userConfig.ai?.inline_tooltip ?? false,
+ inlineAiTooltip:
+ inlineAiTooltip ?? userConfig.ai?.inline_tooltip ?? false,
+ tooltipParentSelector,
});
extensions.push(
@@ -274,6 +289,8 @@ const CellEditorInternal = ({
userConfig.display,
userConfig.diagnostics,
userConfig.ai?.inline_tooltip,
+ inlineAiTooltip,
+ tooltipParentSelector,
aiFeaturesEnabled,
theme,
showPlaceholder,
diff --git a/frontend/src/components/slides/slide-cell-view.tsx b/frontend/src/components/slides/slide-cell-view.tsx
index b444fdce14..296bbd775b 100644
--- a/frontend/src/components/slides/slide-cell-view.tsx
+++ b/frontend/src/components/slides/slide-cell-view.tsx
@@ -3,6 +3,7 @@
import { useMemo, useRef, useState } from "react";
import type { EditorView } from "@codemirror/view";
import { useAtomValue } from "jotai";
+import { cellDomProps } from "@/components/editor/common";
import { CellEditor } from "@/components/editor/cell/code/cell-editor";
import { CellStatusComponent } from "@/components/editor/cell/CellStatus";
import { RunButton } from "@/components/editor/cell/RunButton";
@@ -111,7 +112,10 @@ export const SlideCellView = ({ cell }: { cell: RuntimeCell }) => {
);
const editor = (
- <div className={editorWrapperClassName}>
+ <div
+ className={editorWrapperClassName}
+ {...cellDomProps(cell.id, cell.name)}
+ >
<CellEditor
theme={theme}
showPlaceholder={false}
@@ -134,7 +138,14 @@ export const SlideCellView = ({ cell }: { cell: RuntimeCell }) => {
languageAdapter={languageAdapter}
setLanguageAdapter={setLanguageAdapter}
showLanguageToggles={false}
+ // The reveal.js transforms in slides view break the inline AI
+ // tooltip's fixed positioning, so disable it here.
+ inlineAiTooltip={false}
outputArea={cellOutputPosition}
+ // Parent tooltips (completions, hover, signature help) to the Reveal
+ // viewport so they stay visible when presenting fullscreen; `#App` sits
+ // outside the fullscreened subtree and would never paint.
+ tooltipParentSelector=".reveal-viewport"
/>
{toolbar}
</div>
diff --git a/frontend/src/core/codemirror/cm.ts b/frontend/src/core/codemirror/cm.ts
index e7d7c9bd3c..2630e9abe5 100644
--- a/frontend/src/core/codemirror/cm.ts
+++ b/frontend/src/core/codemirror/cm.ts
@@ -83,6 +83,11 @@ export interface CodeMirrorSetupOpts {
diagnosticsConfig: DiagnosticsConfig;
displayConfig: Pick<DisplayConfig, "reference_highlighting">;
inlineAiTooltip: boolean;
+ /**
+ * CSS selector for the element that CodeMirror tooltips (completions, hover,
+ * signature help) should be appended to. Defaults to `#App`.
+ */
+ tooltipParentSelector?: string;
}
function getPlaceholderType(opts: CodeMirrorSetupOpts) {
@@ -90,6 +95,46 @@ function getPlaceholderType(opts: CodeMirrorSetupOpts) {
return showPlaceholder ? "marimo-import" : enableAI ? "ai" : "none";
}
+const CODEMIRROR_TOOLTIP_PORTAL_CLASS = "cm-tooltip-portal";
+
+/**
+ * Resolve the element that editor tooltips (completions, hover, signature help)
+ * should be appended to.
+ *
+ * The default `#App` parent is returned directly. Custom parents are useful
+ * when editors live inside a fullscreen subtree, dialog, or scoped typography
+ * region. In those cases we append tooltips to a dedicated `not-prose` portal
+ * inside the requested parent, reusing it across cells so surrounding typography
+ * styles don't leak into editor popups.
+ */
+function resolveCodeMirrorTooltipParent(
+ selector: string | undefined,
+): HTMLElement | undefined {
+ if (selector == null) {
+ return document.querySelector<HTMLElement>("#App") ?? undefined;
+ }
+
+ const host = document.querySelector<HTMLElement>(selector);
+ if (host == null) {
+ return undefined;
+ }
+
+ const existing = host.querySelector<HTMLElement>(
+ `:scope > .${CODEMIRROR_TOOLTIP_PORTAL_CLASS}`,
+ );
+ if (existing != null) {
+ return existing;
+ }
+
+ const portal = document.createElement("div");
+ // `not-prose` escapes scoped typography; `contents` keeps the wrapper
+ // layout-neutral. Tooltips are `position: fixed`, so the wrapper having no
+ // box doesn't affect positioning.
+ portal.className = `${CODEMIRROR_TOOLTIP_PORTAL_CLASS} not-prose contents`;
+ host.append(portal);
+ return portal;
+}
+
/**
* Setup CodeMirror for a cell
*/
@@ -180,6 +225,7 @@ export const basicBundle = (opts: CodeMirrorSetupOpts): Extension[] => {
cellId,
lspConfig,
diagnosticsConfig,
+ tooltipParentSelector,
} = opts;
const placeholderType = getPlaceholderType(opts);
const autoClosePairs = completionConfig.auto_close_pairs !== false;
@@ -200,7 +246,7 @@ export const basicBundle = (opts: CodeMirrorSetupOpts): Extension[] => {
position: "fixed",
// This the z-index multiple tooltips being stacked
// For example, if we have a hover tooltip and a completion tooltip
- parent: document.querySelector<HTMLElement>("#App") ?? undefined,
+ parent: resolveCodeMirrorTooltipParent(tooltipParentSelector),
}),
scrollActiveLineIntoViewExtension(),
theme === "dark" ? darkTheme : lightTheme,