diff --git a/src/components/map/Map.tsx b/src/components/map/Map.tsx index 825cf17..60dda11 100644 --- a/src/components/map/Map.tsx +++ b/src/components/map/Map.tsx @@ -3,8 +3,10 @@ import ImageMarker from "react-image-marker"; import { MarkerComponentProps } from "react-image-marker"; import Marker from "./Marker"; import { markers } from "../../consts/markers"; +import useMarker from "../../store/useMarker"; const Map = () => { + const { hoveredMarker } = useMarker(); const imageMarkers: MarkerComponentProps[] = markers.map((marker) => { return { top: marker.top, @@ -34,7 +36,11 @@ const Map = () => { src="images/Map.jpg" markers={imageMarkers} markerComponent={Marker} + extraClass={`transition-all duration-300 ease-in-out ${ + hoveredMarker ? "brightness-[.7]" : "" + }`} /> + {/*
*/} ); diff --git a/src/components/map/Marker.tsx b/src/components/map/Marker.tsx index ce4ce6a..0faa005 100644 --- a/src/components/map/Marker.tsx +++ b/src/components/map/Marker.tsx @@ -3,12 +3,13 @@ import { markers } from "../../consts/markers"; import useMarker from "../../store/useMarker"; const Marker = (props: MarkerComponentProps) => { - const { hoveredMarker, setHoveredMarker } = useMarker(); + const { setHoveredMarker, hoveredMarker } = useMarker(); const currentMarker = markers.find( (marker) => marker.itemNumber === props.itemNumber ); const handleOnMouseEnter = () => { + console.log("first"); const hoveredMarker = currentMarker ? currentMarker : null; setHoveredMarker(hoveredMarker); }; @@ -18,18 +19,28 @@ const Marker = (props: MarkerComponentProps) => { }; return ( -
-
-
-
+
+
+
+
{currentMarker && ( - 1 + 1 )}
@@ -38,7 +49,7 @@ const Marker = (props: MarkerComponentProps) => {
- 1 + 1
); diff --git a/src/consts/markers.ts b/src/consts/markers.ts index 16399ae..db2af38 100644 --- a/src/consts/markers.ts +++ b/src/consts/markers.ts @@ -2,16 +2,18 @@ import { Marker } from "../types/marker"; const markers: Marker[] = [ { - top: 38.5, - left: 51, + top: 37.5, + left: 50, itemNumber: 0, popup: "/images/markers/popups/1.svg", + isPopupLeft: true, }, { top: 40.5, - left: 52, + left: 56, itemNumber: 1, popup: "/images/markers/popups/1.svg", + isPopupLeft: false, }, ]; diff --git a/src/types/marker.ts b/src/types/marker.ts index 13598c2..f1d618a 100644 --- a/src/types/marker.ts +++ b/src/types/marker.ts @@ -2,6 +2,7 @@ import { MarkerComponentProps } from "react-image-marker"; type Marker = MarkerComponentProps & { popup: string; + isPopupLeft: boolean; }; export type { Marker };