Merge pull request #336 from visdesignlab/column-highlight-removal

Update column highlight to remove on mouse leave
visdesignlab · Apr 2, 2024 · 9943aa8 · 9943aa8
2 parents 6d06f8f + e281f65
commit 9943aa8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git 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<Props> = ({
 
   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,24 +101,15 @@ export const Root: FC<Props> = ({
     setData(data);
   }, [data]);
 
-  // remove column hover state
-  const removeHover = () => {
-    if (columnHover.length > 0) {
-      setColumnHover([]);
-    }
-  };
-
   // close all open context menus
   const removeContextMenu = () => {
     setContextMenu(null);
   };
 
   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
@@ -65,7 +65,6 @@ export const AggregateRow: FC<Props> = ({ aggregateRow }) => {
 
   return (
     <g
-      onMouseMove={(e) => 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
@@ -34,7 +34,6 @@ export const SubsetRow: FC<Props> = ({ subset }) => {
 
   return (
     <g
-      onMouseMove={(e) => 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<Props> = ({ subset }) => {
       }
       onMouseLeave={() => {
         setHover(null);
+        setColumnHighlight([]);
       }}
       css={mousePointer}
     >