From ff8d7c1547082806ecee7d8b9f5eae8565985264 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Thu, 28 Jan 2021 16:26:28 +1100
Subject: [PATCH] Moved notes to be above drawings

---
 src/components/map/Map.js        |  3 ++-
 src/components/map/MapMeasure.js |  1 -
 src/components/map/MapNotes.js   |  3 ++-
 src/components/note/Note.js      | 18 +++++++++++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index cdb7aca..975313e 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -411,6 +411,7 @@ function Map({
       onNoteDragEnd={() =>
         setNoteDraggingOptions({ ...noteDraggingOptions, dragging: false })
       }
+      fadeOnHover={selectedToolId === "drawing"}
     />
   );
 
@@ -455,8 +456,8 @@ function Map({
       disabledControls={disabledControls}
     >
       {mapGrid}
-      {mapNotes}
       {mapDrawing}
+      {mapNotes}
       {mapTokens}
       {mapFog}
       {mapPointer}
diff --git a/src/components/map/MapMeasure.js b/src/components/map/MapMeasure.js
index ae6b82b..02a5ae4 100644
--- a/src/components/map/MapMeasure.js
+++ b/src/components/map/MapMeasure.js
@@ -10,7 +10,6 @@ import {
   getUpdatedShapeData,
   getStrokeWidth,
 } from "../../helpers/drawing";
-import { getRelativePointerPositionNormalized } from "../../helpers/konva";
 import * as Vector2 from "../../helpers/vector2";
 
 function MapMeasure({ map, selectedToolSettings, active, gridSize }) {
diff --git a/src/components/map/MapNotes.js b/src/components/map/MapNotes.js
index 3c527b4..82fb68d 100644
--- a/src/components/map/MapNotes.js
+++ b/src/components/map/MapNotes.js
@@ -7,7 +7,6 @@ import MapStageContext from "../../contexts/MapStageContext";
 import AuthContext from "../../contexts/AuthContext";
 
 import { getBrushPosition } from "../../helpers/drawing";
-import { getRelativePointerPositionNormalized } from "../../helpers/konva";
 
 import Note from "../note/Note";
 
@@ -24,6 +23,7 @@ function MapNotes({
   draggable,
   onNoteDragStart,
   onNoteDragEnd,
+  fadeOnHover,
 }) {
   const { interactionEmitter } = useContext(MapInteractionContext);
   const { userId } = useContext(AuthContext);
@@ -111,6 +111,7 @@ function MapNotes({
           onNoteChange={onNoteChange}
           onNoteDragStart={onNoteDragStart}
           onNoteDragEnd={onNoteDragEnd}
+          fadeOnHover={fadeOnHover}
         />
       ))}
       <Group ref={creatingNoteRef}>
diff --git a/src/components/note/Note.js b/src/components/note/Note.js
index e3b84fa..4e6eef2 100644
--- a/src/components/note/Note.js
+++ b/src/components/note/Note.js
@@ -19,6 +19,7 @@ function Note({
   draggable,
   onNoteDragStart,
   onNoteDragEnd,
+  fadeOnHover,
 }) {
   const { userId } = useContext(AuthContext);
   const { mapWidth, mapHeight, setPreventMapInteraction } = useContext(
@@ -89,6 +90,19 @@ function Note({
     }
   }
 
+  const [noteOpacity, setNoteOpacity] = useState(1);
+  function handlePointerEnter() {
+    if (fadeOnHover) {
+      setNoteOpacity(0.5);
+    }
+  }
+
+  function handlePointerLeave() {
+    if (noteOpacity !== 1.0) {
+      setNoteOpacity(1.0);
+    }
+  }
+
   const [fontSize, setFontSize] = useState(1);
   useEffect(() => {
     const text = textRef.current;
@@ -160,7 +174,9 @@ function Note({
       onMouseUp={handlePointerUp}
       onTouchStart={handlePointerDown}
       onTouchEnd={handlePointerUp}
-      opacity={note.visible ? 1.0 : 0.5}
+      onMouseEnter={handlePointerEnter}
+      onMouseLeave={handlePointerLeave}
+      opacity={note.visible ? noteOpacity : 0.5}
     >
       {!note.textOnly && (
         <Rect