From d8adcd44c2cce239a046cb573d78e9710cc445cd Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Sat, 18 Apr 2026 16:46:07 +0100
Subject: [PATCH] feat(base): clear row selection on view or base change

---
 apps/client/src/features/base/components/base-table.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/client/src/features/base/components/base-table.tsx b/apps/client/src/features/base/components/base-table.tsx
index a1d65c30..0315ccd5 100644
--- a/apps/client/src/features/base/components/base-table.tsx
+++ b/apps/client/src/features/base/components/base-table.tsx
@@ -17,6 +17,7 @@ import { useReorderRowMutation } from "@/features/base/queries/base-row-query";
 import { useCreateViewMutation } from "@/features/base/queries/base-view-query";
 import { activeViewIdAtom } from "@/features/base/atoms/base-atoms";
 import { useBaseTable } from "@/features/base/hooks/use-base-table";
+import { useRowSelection } from "@/features/base/hooks/use-row-selection";
 import { GridContainer } from "@/features/base/components/grid/grid-container";
 import { BaseToolbar } from "@/features/base/components/base-toolbar";
 import classes from "@/features/base/styles/grid.module.css";
@@ -56,6 +57,11 @@ export function BaseTable({ baseId }: BaseTableProps) {
     }
   }, [activeView, activeViewId, setActiveViewId]);
 
+  const { clear: clearSelection } = useRowSelection();
+  useEffect(() => {
+    clearSelection();
+  }, [baseId, activeView?.id, clearSelection]);
+
   const rows = useMemo(() => {
     const flat = flattenRows(rowsData);
     return flat.sort((a, b) => (a.position < b.position ? -1 : a.position > b.position ? 1 : 0));