From 892bd9abaaf14e62dc8c42b913b0d7849c8f6f9c Mon Sep 17 00:00:00 2001 From: Michelle Wynn Date: Sun, 12 Oct 2025 19:49:31 -0700 Subject: [PATCH 1/2] Do not merge cols when toggling from column width. --- frontend/src/core/edit-app.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/frontend/src/core/edit-app.tsx b/frontend/src/core/edit-app.tsx index 5a2549ced73..ffb56aa8ff0 100644 --- a/frontend/src/core/edit-app.tsx +++ b/frontend/src/core/edit-app.tsx @@ -1,6 +1,5 @@ /* Copyright 2024 Marimo. All rights reserved. */ -import { usePrevious } from "@dnd-kit/utilities"; import { TooltipProvider } from "@radix-ui/react-tooltip"; import { useAtomValue, useSetAtom } from "jotai"; import { useEffect } from "react"; @@ -101,13 +100,7 @@ export const EditApp: React.FC = ({ "Untitled Notebook"; }, [appConfig.app_title, filename]); - // Delete column breakpoints if app width changes from "columns" - const previousWidth = usePrevious(appConfig.width); - useEffect(() => { - if (previousWidth === "columns" && appConfig.width !== "columns") { - mergeAllColumns(); - } - }, [appConfig.width, previousWidth, mergeAllColumns, numColumns]); + const runStaleCells = useRunStaleCells(); const runAllCells = useRunAllCells(); From 9d5c6de049018db5b11dcdd0d008f3e59bc5c725 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 03:01:23 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- frontend/src/core/edit-app.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/core/edit-app.tsx b/frontend/src/core/edit-app.tsx index ffb56aa8ff0..fbee252ca2b 100644 --- a/frontend/src/core/edit-app.tsx +++ b/frontend/src/core/edit-app.tsx @@ -100,8 +100,6 @@ export const EditApp: React.FC = ({ "Untitled Notebook"; }, [appConfig.app_title, filename]); - - const runStaleCells = useRunStaleCells(); const runAllCells = useRunAllCells(); const togglePresenting = useTogglePresenting();