From e281f650293c3f5b9779298093ad7c5820ac60d3 Mon Sep 17 00:00:00 2001 From: Jake Wagoner Date: Tue, 2 Apr 2024 14:01:12 -0600 Subject: [PATCH] Update column highlight to remove on mouse leave --- packages/upset/src/components/Root.tsx | 11 ----------- packages/upset/src/components/Rows/AggregateRow.tsx | 1 - packages/upset/src/components/Rows/SubsetRow.tsx | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/packages/upset/src/components/Root.tsx b/packages/upset/src/components/Root.tsx index e3433772..fc62db7c 100644 --- a/packages/upset/src/components/Root.tsx +++ b/packages/upset/src/components/Root.tsx @@ -11,7 +11,6 @@ import { columnsAtom } from '../atoms/columnAtom'; import { itemsAtom } from '../atoms/itemsAtoms'; import { setsAtom } from '../atoms/setsAtoms'; import { dataAtom } from '../atoms/dataAtom'; -import { columnHoverAtom } from '../atoms/highlightAtom'; import { contextMenuAtom } from '../atoms/contextMenuAtom'; import { upsetConfigAtom } from '../atoms/config/upsetConfigAtoms'; import { @@ -65,7 +64,6 @@ export const Root: FC = ({ const [sets, setSets] = useRecoilState(setsAtom); const [items, setItems] = useRecoilState(itemsAtom); - const [columnHover, setColumnHover] = useRecoilState(columnHoverAtom); const setAttributeColumns = useSetRecoilState(attributeAtom); const setAllColumns = useSetRecoilState(columnsAtom); const setData = useSetRecoilState(dataAtom); @@ -103,13 +101,6 @@ export const Root: FC = ({ setData(data); }, [data]); - // remove column hover state - const removeHover = () => { - if (columnHover.length > 0) { - setColumnHover([]); - } - }; - // close all open context menus const removeContextMenu = () => { setContextMenu(null); @@ -117,10 +108,8 @@ export const Root: FC = ({ useEffect(() => { document.addEventListener('contextmenu', removeContextMenu, false); - document.addEventListener('mousemove', removeHover, false); return function removeListeners() { - document.removeEventListener('mousemove', removeHover, false); document.removeEventListener('contextmenu', removeContextMenu, false); }; }, []); diff --git a/packages/upset/src/components/Rows/AggregateRow.tsx b/packages/upset/src/components/Rows/AggregateRow.tsx index fc2ee91e..128c1843 100644 --- a/packages/upset/src/components/Rows/AggregateRow.tsx +++ b/packages/upset/src/components/Rows/AggregateRow.tsx @@ -65,7 +65,6 @@ export const AggregateRow: FC = ({ aggregateRow }) => { return ( e.stopPropagation()} onClick={() => aggregateRow && (setCurrentIntersectionAtom(aggregateRow))} css={mousePointer} > diff --git a/packages/upset/src/components/Rows/SubsetRow.tsx b/packages/upset/src/components/Rows/SubsetRow.tsx index 3fd31152..b60abef3 100644 --- a/packages/upset/src/components/Rows/SubsetRow.tsx +++ b/packages/upset/src/components/Rows/SubsetRow.tsx @@ -34,7 +34,6 @@ export const SubsetRow: FC = ({ subset }) => { return ( e.stopPropagation()} onClick={ () => { if (currentIntersection !== null && currentIntersection.id === subset.id) { // if the row is already selected, deselect it @@ -56,6 +55,7 @@ export const SubsetRow: FC = ({ subset }) => { } onMouseLeave={() => { setHover(null); + setColumnHighlight([]); }} css={mousePointer} >