@marimo-team/islands 0.25.3-dev2 → 0.25.3-dev200

package/src/components/editor/output/console/ConsoleOutput.tsx

@@ -6,7 +6,7 @@ import {
   ChevronsUpDownIcon,
   WrapTextIcon,
 } from "lucide-react";
-import React, { useEffect, useLayoutEffect, useRef, useState } from "react";
+import React, { useEffect, useLayoutEffect, useState } from "react";
 import { ToggleButton } from "react-aria-components";
 import { DebuggerControls } from "@/components/debugger/debugger-code";
 import { CopyClipboardIcon } from "@/components/icons/copy-icon";
@@ -16,8 +16,7 @@ import { Tooltip } from "@/components/ui/tooltip";
 import type { CellId } from "@/core/cells/ids";
 import { isInternalCellName } from "@/core/cells/names";
 import { useExpandedConsoleOutput } from "@/core/cells/outputs";
-import type { WithResponse } from "@/core/cells/types";
-import type { OutputMessage } from "@/core/kernel/messages";
+import type { ConsoleOutputMessage } from "@/core/cells/types";
 import {
   type UseInputHistoryReturn,
   useInputHistory,
@@ -49,31 +48,21 @@ export const CONSOLE_CLEAR_DEBOUNCE_MS = 200;
  */
 function useDebouncedConsoleOutputs<T>(outputs: T[]): T[] {
   const [debouncedOutputs, setDebouncedOutputs] = useState(outputs);
-  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
-  // Non-empty outputs: apply immediately and cancel any pending clear
+  // Non-empty outputs: apply immediately. Effect cleanup cancels pending clears.
   if (outputs.length > 0 && debouncedOutputs !== outputs) {
-    if (timerRef.current !== null) {
-      clearTimeout(timerRef.current);
-      timerRef.current = null;
-    }
     setDebouncedOutputs(outputs);
   }
 
   // Empty outputs: delay the clear so new outputs can arrive first
   useEffect(() => {
-    if (outputs.length === 0 && timerRef.current === null) {
-      timerRef.current = setTimeout(() => {
-        timerRef.current = null;
-        setDebouncedOutputs([]);
-      }, CONSOLE_CLEAR_DEBOUNCE_MS);
+    if (outputs.length > 0) {
+      return;
     }
-    return () => {
-      if (timerRef.current !== null) {
-        clearTimeout(timerRef.current);
-        timerRef.current = null;
-      }
-    };
+    const timer = setTimeout(() => {
+      setDebouncedOutputs([]);
+    }, CONSOLE_CLEAR_DEBOUNCE_MS);
+    return () => clearTimeout(timer);
   }, [outputs]);
 
   return debouncedOutputs;
@@ -83,7 +72,7 @@ interface Props {
   cellId: CellId;
   cellName: string;
   className?: string;
-  consoleOutputs: WithResponse<OutputMessage>[];
+  consoleOutputs: ConsoleOutputMessage[];
   stale: boolean;
   interrupted: boolean;
   debuggerActive: boolean;
@@ -251,19 +240,24 @@ const ConsoleOutputInternal = (props: Props): React.ReactNode => {
             return null;
           }
 
+          const originalIdx = consoleOutputs.length - idx - 1;
+          // Outputs render in reverse, so the reversed index shifts on every
+          // new line. The assigned id survives collapse and truncation. The
+          // original position is the fallback for outputs without one.
+          const key = output.id ?? `position-${originalIdx}`;
+
           if (output.channel === "stdin") {
             invariant(
               typeof output.data === "string",
               "Expected data to be a string",
             );
 
-            const originalIdx = consoleOutputs.length - idx - 1;
             const isPassword = output.mimetype === "text/password";
 
             if (output.response == null && lastStdInputIdx === idx) {
               return (
                 <StdInput
-                  key={idx}
+                  key={key}
                   output={output.data}
                   isPdb={isPdb}
                   isPassword={isPassword}
@@ -278,7 +272,7 @@ const ConsoleOutputInternal = (props: Props): React.ReactNode => {
 
             return (
               <StdInputWithResponse
-                key={idx}
+                key={key}
                 output={output.data}
                 response={output.response}
                 isPassword={isPassword}
@@ -288,7 +282,7 @@ const ConsoleOutputInternal = (props: Props): React.ReactNode => {
           }
 
           return (
-            <React.Fragment key={idx}>
+            <React.Fragment key={key}>
               <OutputRenderer
                 cellId={cellId}
                 onRefactorWithAI={onRefactorWithAI}

package/src/components/editor/output/console/__tests__/ConsoleOutput.test.tsx

@@ -2,17 +2,29 @@
 
 import { act, fireEvent, render, screen } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createStore, Provider } from "jotai";
 import { SetupMocks } from "@/__mocks__/common";
+import { mockDocumentModel } from "@/__mocks__/document";
 import { cellId } from "@/__tests__/branded";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import type { WithResponse } from "@/core/cells/types";
+import { DocumentProvider } from "@/core/notebook/document";
 import type { OutputMessage } from "@/core/kernel/messages";
 import { CONSOLE_CLEAR_DEBOUNCE_MS, ConsoleOutput } from "../ConsoleOutput";
 
 SetupMocks.resizeObserver();
 
+const store = createStore();
+const { model } = mockDocumentModel(store, null);
+
 const renderWithProvider = (ui: React.ReactElement) => {
-  return render(<TooltipProvider>{ui}</TooltipProvider>);
+  return render(
+    <Provider store={store}>
+      <DocumentProvider model={model}>
+        <TooltipProvider>{ui}</TooltipProvider>
+      </DocumentProvider>
+    </Provider>,
+  );
 };
 
 describe("ConsoleOutput integration", () => {
@@ -104,13 +116,17 @@ describe("ConsoleOutput pdb history", () => {
     ];
 
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={outputs2}
-          onSubmitDebugger={onSubmitDebugger}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={outputs2}
+              onSubmitDebugger={onSubmitDebugger}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // New StdInput mounted — press ArrowUp to recall previous command
@@ -138,13 +154,17 @@ describe("ConsoleOutput pdb history", () => {
     fireEvent.keyDown(nameInput, { key: "Enter" });
 
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={[stdinPrompt("Name: ", "marimo"), passwordPrompt]}
-          onSubmitDebugger={onSubmitDebugger}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={[stdinPrompt("Name: ", "marimo"), passwordPrompt]}
+              onSubmitDebugger={onSubmitDebugger}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
     const input = screen.getByTestId("console-input");
     expect(input).toHaveAttribute("type", "password");
@@ -161,16 +181,20 @@ describe("ConsoleOutput pdb history", () => {
     expect(input).toHaveValue("");
 
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={[
-            stdinPrompt("Name: ", "marimo"),
-            { ...passwordPrompt, response: "" },
-            stdinPrompt("Name: "),
-          ]}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={[
+                stdinPrompt("Name: ", "marimo"),
+                { ...passwordPrompt, response: "" },
+                stdinPrompt("Name: "),
+              ]}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
     const nextInput = screen.getByTestId("console-input");
     fireEvent.keyDown(nextInput, { key: "ArrowUp" });
@@ -239,13 +263,17 @@ describe("ConsoleOutput pdb history", () => {
       stdinPrompt("(Pdb) "),
     ];
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={outputs2}
-          onSubmitDebugger={onSubmitDebugger}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={outputs2}
+              onSubmitDebugger={onSubmitDebugger}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // Submit an empty value; this should NOT enter the history stack.
@@ -258,13 +286,17 @@ describe("ConsoleOutput pdb history", () => {
       stdinPrompt("(Pdb) "),
     ];
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={outputs3}
-          onSubmitDebugger={onSubmitDebugger}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={outputs3}
+              onSubmitDebugger={onSubmitDebugger}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // ArrowUp should jump back to "step", skipping the empty submission.
@@ -299,13 +331,17 @@ describe("ConsoleOutput pdb history", () => {
     ];
 
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={outputs2}
-          onSubmitDebugger={onSubmitDebugger}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={outputs2}
+              onSubmitDebugger={onSubmitDebugger}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // Submit "print(x)"
@@ -321,13 +357,17 @@ describe("ConsoleOutput pdb history", () => {
     ];
 
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={outputs3}
-          onSubmitDebugger={onSubmitDebugger}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={outputs3}
+              onSubmitDebugger={onSubmitDebugger}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // ArrowUp should show most recent command first
@@ -370,13 +410,17 @@ describe("ConsoleOutput pdb history", () => {
     // Same outputs, but the cell isn't interrupted -- this is a real
     // bare-Enter submission, so we should render the (empty) placeholder.
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput
-          {...defaultProps}
-          consoleOutputs={interruptedOutputs}
-          interrupted={false}
-        />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput
+              {...defaultProps}
+              consoleOutputs={interruptedOutputs}
+              interrupted={false}
+            />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     expect(screen.getByLabelText("stdin response")).toBeInTheDocument();
@@ -426,9 +470,13 @@ describe("ConsoleOutput debounced clearing", () => {
 
     // Clear outputs (simulates cell re-run)
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput {...defaultProps} consoleOutputs={[]} />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput {...defaultProps} consoleOutputs={[]} />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // Old output should still be visible during debounce period
@@ -437,9 +485,13 @@ describe("ConsoleOutput debounced clearing", () => {
     // New outputs arrive before debounce fires
     const outputs2 = [createOutput("new output")];
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput {...defaultProps} consoleOutputs={outputs2} />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput {...defaultProps} consoleOutputs={outputs2} />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // New output should be shown immediately
@@ -458,9 +510,13 @@ describe("ConsoleOutput debounced clearing", () => {
 
     // Clear outputs
     rerender(
-      <TooltipProvider>
-        <ConsoleOutput {...defaultProps} consoleOutputs={[]} />
-      </TooltipProvider>,
+      <Provider store={store}>
+        <DocumentProvider model={model}>
+          <TooltipProvider>
+            <ConsoleOutput {...defaultProps} consoleOutputs={[]} />
+          </TooltipProvider>
+        </DocumentProvider>
+      </Provider>,
     );
 
     // Still visible during debounce

package/src/components/editor/package-alert.tsx

@@ -55,6 +55,7 @@ import {
   DropdownMenu,
   DropdownMenuCheckboxItem,
   DropdownMenuContent,
+  DropdownMenuItem,
   DropdownMenuTrigger,
 } from "../ui/dropdown-menu";
 import { ExternalLink } from "../ui/links";
@@ -158,6 +159,7 @@ export const PackageAlert: React.FC = () => {
               <SourceBadge source={packageAlert.source} />
             </span>
             <Button
+              aria-label="Dismiss missing packages alert"
               variant="text"
               data-testid="remove-banner-button"
               size="icon"
@@ -171,12 +173,12 @@ export const PackageAlert: React.FC = () => {
               <p>The following packages were not found:</p>
               <table className="list-disc ml-2 mt-1">
                 <tbody>
-                  {packageAlert.packages.map((pkg, index) => {
+                  {packageAlert.packages.map((pkg) => {
                     const parsed = parsePackageSpecifier(pkg);
                     const currentExtras = selectedExtras[pkg] || parsed.extras;
 
                     return (
-                      <tr className="font-mono text-sm" key={index}>
+                      <tr className="font-mono text-sm" key={pkg}>
                         <td className="pr-2 py-1 align-middle">
                           <BoxIcon size="1rem" />
                         </td>
@@ -270,6 +272,7 @@ export const PackageAlert: React.FC = () => {
               <SourceBadge source={packageAlert.source} />
             </span>
             <Button
+              aria-label={`Dismiss ${title}`}
               variant="text"
               data-testid="remove-banner-button"
               size="icon"
@@ -294,7 +297,7 @@ export const PackageAlert: React.FC = () => {
               </>
             )}
             <ul className="list-disc ml-2 mt-1">
-              {Object.entries(packageAlert.packages).map(([pkg, st], index) => (
+              {Object.entries(packageAlert.packages).map(([pkg, st]) => (
                 <li
                   className={cn(
                     "flex items-center gap-1 font-mono text-sm",
@@ -305,7 +308,7 @@ export const PackageAlert: React.FC = () => {
                       status === "failed" &&
                       "text-muted-foreground",
                   )}
-                  key={index}
+                  key={pkg}
                 >
                   <ProgressIcon status={st} />
                   {pkg}
@@ -590,14 +593,18 @@ const ExtrasSelector: React.FC<ExtrasSelectorProps> = ({
                 <div className="p-2 bg-popover border-b border-border">
                   <div className="flex flex-wrap gap-1 p-1 min-h-[24px]">
                     {selectedExtras.map((extra) => (
-                      <span
+                      <DropdownMenuItem
                         key={extra}
+                        aria-label={`Remove ${extra}`}
                         className="inline-flex items-center gap-1 px-1 py-0.5 text-sm font-mono border border-muted-foreground/30 hover:border-muted-foreground/60 rounded-sm cursor-pointer group transition-colors"
-                        onClick={() => handleExtraToggle(extra, false)}
+                        onSelect={(e) => {
+                          e.preventDefault();
+                          handleExtraToggle(extra, false);
+                        }}
                       >
                         {extra}
                         <XIcon className="w-3 h-3 opacity-60 group-hover:opacity-100" />
-                      </span>
+                      </DropdownMenuItem>
                     ))}
                   </div>
                 </div>

package/src/components/editor/renderers/cell-array.tsx

@@ -29,14 +29,10 @@ import { canInteractWithAppAtom } from "@/core/network/connection";
 import { useBoolean } from "@/hooks/useBoolean";
 import { cn } from "@/utils/cn";
 import { Functions } from "@/utils/functions";
-import type { CellColumnId } from "@/utils/id-tree";
+import { type CellColumnId, findColumn, useLayout } from "@/core/cells/layout";
 import { invariant } from "@/utils/invariant";
-import {
-  columnIdsAtom,
-  useCellActions,
-  useCellIds,
-  useScrollKey,
-} from "../../../core/cells/cells";
+import { useCellIds, useScrollKey } from "../../../core/cells/cells";
+import { useCellActions } from "../../../core/cells/actions";
 import { formatAll } from "../../../core/codemirror/format";
 import type { AppConfig, UserConfig } from "../../../core/config/config-schema";
 import type { AppMode } from "../../../core/mode";
@@ -60,7 +56,7 @@ interface CellArrayProps {
 }
 
 export const CellArray: React.FC<CellArrayProps> = (props) => {
-  const columnIds = useAtomValue(columnIdsAtom);
+  const columnIds = useLayout().columns.map((column) => column.id);
 
   // Setup context for sorting
   return (
@@ -115,7 +111,7 @@ const CellArrayInternal: React.FC<CellArrayProps> = ({
 
   const cellIds = useCellIds();
   const scrollKey = useScrollKey();
-  const columnIds = cellIds.getColumnIds();
+  const columnIds = useLayout().columns.map((column) => column.id);
 
   // Scroll to a cell targeted by a previous action
   const scrollToTarget = actions.scrollToTarget;
@@ -139,7 +135,7 @@ const CellArrayInternal: React.FC<CellArrayProps> = ({
       <StdinBlockingAlert />
       <NotebookBanner width={appConfig.width} />
       {/* Only show if not cells, otherwise running a single cell will start the connection */}
-      {cellIds.idLength === 0 && <NotStartedConnectionAlert />}
+      {cellIds.length === 0 && <NotStartedConnectionAlert />}
       <div
         className={cn(
           appConfig.width === "columns" &&
@@ -188,11 +184,11 @@ const CellColumn: React.FC<{
   hideControls,
 }) => {
   const cellIds = useCellIds();
-  const column = cellIds.get(columnId);
+  const column = findColumn(useLayout(), columnId);
   invariant(column, `Expected column for: ${columnId}`);
 
-  const hasOnlyOneCell = cellIds.hasOnlyOneId();
-  const hasSetupCell = cellIds.inOrderIds.includes(SETUP_CELL_ID);
+  const hasOnlyOneCell = cellIds.length === 1;
+  const hasSetupCell = cellIds.includes(SETUP_CELL_ID);
   const isPresenting = mode === "present";
 
   return (
@@ -218,7 +214,7 @@ const CellColumn: React.FC<{
     >
       <SortableContext
         id={`column-${index + 1}`}
-        items={column.topLevelIds}
+        items={[...column.visible]}
         strategy={verticalListSortingStrategy}
       >
         {/* Render the setup cell first, always */}
@@ -237,7 +233,7 @@ const CellColumn: React.FC<{
           />
         )}
 
-        {column.topLevelIds.map((cellId) => {
+        {column.visible.map((cellId) => {
           // Skip the setup cell later
           if (cellId === SETUP_CELL_ID) {
             return null;
@@ -252,8 +248,8 @@ const CellColumn: React.FC<{
               canDelete={!hasOnlyOneCell}
               mode={mode}
               userConfig={userConfig}
-              isCollapsed={column.isCollapsed(cellId)}
-              collapseCount={column.getCount(cellId)}
+              isCollapsed={column.folds.has(cellId)}
+              collapseCount={column.folds.get(cellId)?.length ?? 0}
               canMoveX={appConfig.width === "columns"}
             />
           );
@@ -267,7 +263,7 @@ const AddCellButtons: React.FC<{
   columnId: CellColumnId;
   className?: string;
 }> = ({ columnId, className }) => {
-  const { createNewCell } = useCellActions();
+  const { createCell } = useCellActions();
   const [isAiButtonOpen, isAiButtonOpenActions] = useBoolean(false);
   const aiEnabled = useAtomValue(aiEnabledAtom);
   const aiFeaturesEnabled = useAtomValue(aiFeaturesEnabledAtom);
@@ -291,12 +287,7 @@ const AddCellButtons: React.FC<{
           variant="text"
           size="sm"
           disabled={!canInteractWithApp}
-          onClick={() =>
-            createNewCell({
-              cellId: { type: "__end__", columnId },
-              before: false,
-            })
-          }
+          onClick={() => createCell({ endOf: columnId })}
         >
           <SquareCodeIcon className="mr-2 size-4 shrink-0" />
           Python
@@ -307,13 +298,12 @@ const AddCellButtons: React.FC<{
           size="sm"
           disabled={!canInteractWithApp}
           onClick={() => {
-            maybeAddMarimoImport({ autoInstantiate: true, createNewCell });
+            maybeAddMarimoImport({ autoInstantiate: true, createCell });
 
-            createNewCell({
-              cellId: { type: "__end__", columnId },
-              before: false,
+            createCell({
+              endOf: columnId,
               code: LanguageAdapters.markdown.defaultCode,
-              hideCode: MARKDOWN_INITIAL_HIDE_CODE,
+              config: { hide_code: MARKDOWN_INITIAL_HIDE_CODE },
             });
           }}
         >
@@ -326,11 +316,10 @@ const AddCellButtons: React.FC<{
           size="sm"
           disabled={!canInteractWithApp}
           onClick={() => {
-            maybeAddMarimoImport({ autoInstantiate: true, createNewCell });
+            maybeAddMarimoImport({ autoInstantiate: true, createCell });
 
-            createNewCell({
-              cellId: { type: "__end__", columnId },
-              before: false,
+            createCell({
+              endOf: columnId,
               code: LanguageAdapters.sql.defaultCode,
             });
           }}

package/src/components/editor/renderers/grid-layout/grid-layout.tsx

@@ -190,12 +190,18 @@ export const GridLayoutRenderer: React.FC<Props> = ({
           cells: [...cellLayouts, dropped],
         });
       }}
-      onDragStart={(_layout, _oldItem, _newItem, _placeholder, event) => {
-        dragProps.onDragStart(event);
-      }}
-      onDrag={(_layout, _oldItem, _newItem, _placeholder, event) => {
-        dragProps.onDragMove(event);
-      }}
+      onDragStart={
+        // oxlint-disable-next-line marimo/prefer-object-params -- React Grid Layout supplies the event as the fifth argument.
+        (_layout, _oldItem, _newItem, _placeholder, event) => {
+          dragProps.onDragStart(event);
+        }
+      }
+      onDrag={
+        // oxlint-disable-next-line marimo/prefer-object-params -- React Grid Layout supplies the event as the fifth argument.
+        (_layout, _oldItem, _newItem, _placeholder, event) => {
+          dragProps.onDragMove(event);
+        }
+      }
       onDragStop={() => {
         dragProps.onDragStop();
       }}

package/src/components/editor/renderers/slides-layout/__tests__/plugin.test.ts

@@ -17,7 +17,6 @@ function makeCell(id: string, code = "print('hi')"): CellData {
     lastCodeRun: null,
     lastExecutionTime: null,
     config: { hide_code: false, disabled: false, column: null },
-    serializedEditorState: null,
   };
 }
 

package/src/components/editor/renderers/slides-layout/slides-layout.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import React, { useMemo, useState } from "react";
 import { useAtomValue } from "jotai";
-import { numColumnsAtom } from "@/core/cells/cells";
+import { numColumnsAtom } from "@/core/cells/layout";
 import type { CellId } from "@/core/cells/ids";
 import { kioskModeAtom } from "@/core/mode";
 import type { ICellRendererProps } from "../types";