fix: leaving a zone is not always detected

close #1474
cheminfo · Apr 13, 2022 · cd6d86e · cd6d86e
1 parent 42a20a1
commit cd6d86e
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/component/2d/zones/Signal.tsx b/src/component/2d/zones/Signal.tsx
@@ -56,30 +56,29 @@ const Signal = memo(({ signal, isVisible }: SignalProps) => {
   if (!signal) return null;
 
   return (
-    <g
-      className="zone-signal"
-      onMouseEnter={() => {
-        assignment.onMouseEnter(undefined);
-        highlight.show();
-      }}
-      onMouseLeave={() => {
-        assignment.onMouseLeave(undefined);
-        highlight.hide();
-      }}
-    >
+    <g className="zone-signal">
       {isVisible.signals && (
         <g>
+          <SignalCrosshair signal={signal} />
+
           <circle
+            onMouseEnter={() => {
+              assignment.onMouseEnter(undefined);
+              highlight.show();
+            }}
+            onMouseLeave={() => {
+              assignment.onMouseLeave(undefined);
+              highlight.hide();
+            }}
             key={signal.id}
             cx={scaleX(signal.x.delta || 0)}
             cy={scaleY(signal.y.delta || 0)}
             r={isHighlighted ? 6 : 4}
             fill={isHighlighted ? 'green' : 'darkgreen'}
           />
-          <SignalCrosshair signal={signal} />
         </g>
       )}
-      <g className="zone-signal-peak">
+      <g className="zone-signal-peak" style={{ pointerEvents: 'none' }}>
         {isVisible.peaks &&
           signal.peaks &&
           signal.peaks.map((peak, i) => (