@marimo-team/islands 0.23.15-dev32 → 0.23.15-dev4

package/src/components/editor/ai/ai-completion-editor.tsx

@@ -194,12 +194,9 @@ export const AiCompletionEditor: React.FC<Props> = ({
     setCompletion("");
   };
 
-  // Reject discards the suggestion but keeps the prompt open for refinement.
   const handleDeclineCompletion = () => {
-    stop();
+    declineChange();
     setCompletion("");
-    setShowInputPrompt(true);
-    inputRef.current?.view?.focus();
   };
 
   const showCompletionBanner =

package/src/components/editor/cell/cell-context-menu.tsx

@@ -39,18 +39,12 @@ interface Props extends Pick<
   "cellId" | "getEditorView"
 > {
   children: React.ReactNode;
-  /**
-   * If true, the custom context menu is disabled and the native one is used
-   * (e.g. while presenting).
-   */
-  disabled?: boolean;
 }
 
 export const CellActionsContextMenu = ({
   children,
   cellId,
   getEditorView,
-  disabled,
 }: Props) => {
   const cellData = useCellData(cellId);
   const cellRuntime = useCellRuntime(cellId);
@@ -193,7 +187,6 @@ export const CellActionsContextMenu = ({
   return (
     <ContextMenu>
       <ContextMenuTrigger
-        disabled={disabled}
         onContextMenu={(evt) => {
           if (evt.target instanceof HTMLImageElement) {
             setImageRightClicked(evt.target);

package/src/components/editor/chrome/panels/packages-panel.tsx

@@ -303,16 +303,6 @@ const PackagesList: React.FC<{
   onSuccess: () => void;
   packages: { name: string; version: string }[];
 }> = ({ onSuccess, packages }) => {
-  // Sort case-insensitively so packages are strictly alphabetical
-  // regardless of capitalization (package managers sort inconsistently).
-  const sortedPackages = React.useMemo(
-    () =>
-      packages.toSorted((a, b) =>
-        a.name.localeCompare(b.name, undefined, { sensitivity: "base" }),
-      ),
-    [packages],
-  );
-
   if (packages.length === 0) {
     return (
       <PanelEmptyState
@@ -333,7 +323,7 @@ const PackagesList: React.FC<{
         </TableRow>
       </TableHeader>
       <TableBody>
-        {sortedPackages.map((item) => (
+        {packages.map((item) => (
           <TableRow
             key={item.name}
             className="group"

package/src/components/editor/columns/cell-column.tsx

@@ -3,7 +3,6 @@
 import React, { memo, useRef } from "react";
 import type { AppConfig } from "@/core/config/config-schema";
 import { useResizeHandle } from "@/hooks/useResizeHandle";
-import { cn } from "@/utils/cn";
 import type { CellColumnId } from "@/utils/id-tree";
 import { SortableColumn } from "./sortable-column";
 import { storageFn } from "./storage";
@@ -18,11 +17,6 @@ interface Props {
   canDelete: boolean;
   canMoveLeft: boolean;
   canMoveRight: boolean;
-  /**
-   * If true, column chrome (drag handles, resize handles, borders) is hidden
-   * while keeping the same component tree mounted.
-   */
-  presenting?: boolean;
 }
 
 const { getColumnWidth, saveColumnWidth } = storageFn;
@@ -30,10 +24,6 @@ const { getColumnWidth, saveColumnWidth } = storageFn;
 export const Column = memo((props: Props) => {
   const columnRef = useRef<HTMLDivElement>(null);
 
-  // Published cells are not spaced apart. Set once on the column root; the
-  // CSS variable cascades to the gap-using descendants.
-  const zeroGapWhenPresenting = props.presenting && "[--notebook-cell-gap:0px]";
-
   if (props.width === "columns") {
     return (
       <SortableColumn
@@ -43,16 +33,14 @@ export const Column = memo((props: Props) => {
         columnId={props.columnId}
         canMoveLeft={props.canMoveLeft}
         canMoveRight={props.canMoveRight}
-        className={cn("group/column", zeroGapWhenPresenting)}
+        className="group/column"
         footer={props.footer}
-        presenting={props.presenting}
       >
         <ResizableComponent
           startingWidth={getColumnWidth(props.index)}
           onResize={(width: number) => {
             saveColumnWidth(props.index, width);
           }}
-          presenting={props.presenting}
         >
           {props.children}
         </ResizableComponent>
@@ -62,13 +50,7 @@ export const Column = memo((props: Props) => {
 
   return (
     <>
-      <div
-        data-testid="cell-column"
-        className={cn(
-          "flex flex-col gap-(--notebook-cell-gap)",
-          zeroGapWhenPresenting,
-        )}
-      >
+      <div data-testid="cell-column" className="flex flex-col gap-5">
         {props.children}
       </div>
       {props.footer}
@@ -82,14 +64,12 @@ interface ResizableComponentProps {
   startingWidth: number | "contentWidth";
   onResize?: (width: number) => void;
   children: React.ReactNode;
-  presenting?: boolean;
 }
 
 const ResizableComponent = ({
   startingWidth,
   onResize,
   children,
-  presenting,
 }: ResizableComponentProps) => {
   const { resizableDivRef, handleRefs, style } = useResizeHandle({
     startingWidth,
@@ -100,13 +80,11 @@ const ResizableComponent = ({
     return (
       <div
         ref={ref}
-        data-testid="column-resize-handle"
         className={`w-[3px] cursor-col-resize transition-colors duration-200 z-100
           relative before:content-[''] before:absolute before:inset-y-0 before:left-[-3px]
           before:right-[-3px] before:w-[9px] before:z-[-1]
           hover/column:bg-[var(--slate-3)] dark:hover/column:bg-[var(--slate-5)]
           hover/column:hover:bg-primary/60 dark:hover/column:hover:bg-primary/60`}
-        hidden={presenting}
       />
     );
   };
@@ -116,16 +94,8 @@ const ResizableComponent = ({
       {renderResizeHandler(handleRefs.left)}
       <div
         ref={resizableDivRef}
-        className={cn(
-          "flex flex-col gap-(--notebook-cell-gap) box-content z-1",
-          // While presenting, use the published content width instead of the
-          // editor geometry (saved pixel width, 500px minimum, gutters),
-          // which overflows narrow screens.
-          presenting
-            ? "w-(--content-width)"
-            : "min-h-[100px] px-11 pt-3 pb-6 min-w-[500px]",
-        )}
-        style={presenting ? undefined : style}
+        className="flex flex-col gap-5 box-content min-h-[100px] px-11 pt-3 pb-6 min-w-[500px] z-1"
+        style={style}
       >
         {children}
       </div>

package/src/components/editor/columns/sortable-column.tsx

@@ -30,24 +30,11 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
   canMoveLeft: boolean;
   canMoveRight: boolean;
   footer?: React.ReactNode;
-  /**
-   * If true, dragging is disabled and the column chrome is hidden
-   * (e.g. while presenting).
-   */
-  presenting?: boolean;
 }
 
 const SortableColumnInternal = React.forwardRef(
   (
-    {
-      columnId,
-      canDelete,
-      canMoveLeft,
-      canMoveRight,
-      footer,
-      presenting,
-      ...props
-    }: Props,
+    { columnId, canDelete, canMoveLeft, canMoveRight, footer, ...props }: Props,
     ref: React.Ref<HTMLDivElement>,
   ) => {
     const {
@@ -58,7 +45,7 @@ const SortableColumnInternal = React.forwardRef(
       transition,
       isDragging,
       isOver,
-    } = useSortable({ id: columnId, disabled: presenting });
+    } = useSortable({ id: columnId });
 
     const style: React.CSSProperties = {
       transform: transform
@@ -91,11 +78,7 @@ const SortableColumnInternal = React.forwardRef(
     };
 
     const dragHandle = (
-      <div
-        data-testid="column-header"
-        className="px-2 pb-0 group flex items-center overflow-hidden border-b border-(--slate-7)"
-        hidden={presenting}
-      >
+      <div className="px-2 pb-0 group flex items-center overflow-hidden border-b border-(--slate-7)">
         <Tooltip content="Move column left" side="top" delayDuration={300}>
           <Button
             variant="text"
@@ -178,10 +161,7 @@ const SortableColumnInternal = React.forwardRef(
           isOver && "bg-accent/20", // Add a background color when dragging over
         )}
       >
-        <div
-          data-testid="column-frame"
-          className={cn(!presenting && "border border-(--slate-7)")}
-        >
+        <div className="border border-(--slate-7)">
           {dragHandle}
           {props.children}
         </div>

package/src/components/editor/navigation/__tests__/navigation.test.ts

@@ -12,7 +12,6 @@ import { MockRequestClient } from "@/__mocks__/requests";
 import { aiCompletionCellAtom } from "@/core/ai/state";
 import type { CellActions } from "@/core/cells/cells";
 import { notebookAtom } from "@/core/cells/cells";
-import { signatureHintField } from "@/core/codemirror/completion/signature-hint";
 import {
   configOverridesAtom,
   platformAtom,
@@ -1826,38 +1825,6 @@ describe("useCellEditorNavigationProps", () => {
       expect(focusCell).not.toHaveBeenCalled();
     });
 
-    it("should dismiss the signature hint when Escape is pressed without exiting to command mode", () => {
-      mockSimplifySelection.mockReturnValue(false);
-      mockCompletionStatus.mockReturnValue(null);
-
-      const dispatch = vi.fn();
-      const mockEditorView = {
-        current: {
-          state: {
-            selection: { main: { from: 9, to: 9, empty: true } },
-            field: vi.fn((field: unknown) =>
-              field === signatureHintField ? { pos: 9 } : false,
-            ),
-          },
-          dispatch,
-        } as unknown as EditorView,
-      };
-
-      const { result } = renderWithProvider(() =>
-        useCellEditorNavigationProps(mockCellId, mockEditorView),
-      );
-
-      const mockEvent = Mocks.keyboardEvent({ key: "Escape" });
-
-      act(() => {
-        result.current.onKeyDown?.(mockEvent);
-      });
-
-      // The hint is dismissed (dispatch called) but we stay in edit mode.
-      expect(dispatch).toHaveBeenCalled();
-      expect(focusCell).not.toHaveBeenCalled();
-    });
-
     it("should continue propagation for other keys", () => {
       const mockEditorView = { current: null };
       const { result } = renderWithProvider(() =>

package/src/components/editor/navigation/navigation.ts

@@ -22,10 +22,6 @@ import {
 } from "@/core/cells/pending-cut-service";
 import { usePendingDeleteService } from "@/core/cells/pending-delete-service";
 import { scrollCellIntoView } from "@/core/cells/scrollCellIntoView";
-import {
-  closeSignatureHint,
-  signatureHintField,
-} from "@/core/codemirror/completion/signature-hint";
 import {
   hotkeysAtom,
   isAiFeatureEnabled,
@@ -717,9 +713,7 @@ export function useCellEditorNavigationProps(
       return;
     }
 
-    const hasSignatureHelp =
-      Boolean(state.field(signatureHelpTooltipField, false)) ||
-      Boolean(state.field(signatureHintField, false));
+    const hasSignatureHelp = state.field(signatureHelpTooltipField, false);
     const hasAutocompletePopup = completionStatus(state) !== null;
     if (hasSignatureHelp) {
       closeSignatureHelp(view);
@@ -790,5 +784,4 @@ export function closeSignatureHelp(view: EditorView) {
   if (view.state.field(signatureHelpTooltipField, false)) {
     view.dispatch({ effects: setSignatureHelpTooltip.of(null) });
   }
-  closeSignatureHint(view);
 }