Merge pull request #243 from Vizzuality/SKY30-354-empty-tooltip

[SKY30-354]: hides hover tooltip when EEZ layer is not present
Vizzuality · Apr 10, 2024 · 7654280 · 7654280
2 parents c59dde1 + 76aca15
commit 7654280
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/frontend/src/containers/map/content/map/index.tsx b/frontend/src/containers/map/content/map/index.tsx
@@ -247,6 +247,10 @@ const MainMap: React.FC = () => {
 
   const disableMouseMove = popup.type === 'click' && popup.features?.length;
 
+  // ? the popup won't show up when the user is hovering a layer that is not EEZ
+  const hidePopup =
+    popup?.type === 'mousemove' && !popup.features?.some((f) => f.source === 'ezz-source');
+
   return (
     <div className="absolute left-0 h-full w-full border-r border-b border-black">
       <Map
@@ -261,7 +265,7 @@ const MainMap: React.FC = () => {
         cursor={cursor}
       >
         <>
-          <Popup />
+          {!hidePopup && <Popup />}
           <LabelsManager />
           <LayersToolbox />
           <ZoomControls />

diff --git a/frontend/src/containers/map/content/map/popup/index.tsx b/frontend/src/containers/map/content/map/popup/index.tsx
@@ -134,7 +134,7 @@ const PopupContainer = () => {
         )}
         {isHoveredTooltip && (
           <div className="font-mono text-sm text-gray-500">
-            {popup.features[0].properties?.GEONAME}
+            {popup.features.find(({ source }) => source === 'ezz-source')?.properties?.GEONAME}
           </div>
         )}
         {isClickedTooltip && selectedLayerId && <PopupItem id={selectedLayerId} />}