Skip to content

Commit 6cdb775

Browse files
committed
Merge branch 'main' of https://github.com/efdevcon/monorepo
2 parents b626a1c + e745dea commit 6cdb775

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

devconnect-app/src/app/map/venue-map/VenueMap.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,24 +192,33 @@ export const VenueMap = () => {
192192

193193
// svgElement.style.transition = 'opacity 0.5s ease-in-out';
194194
} else if (hasActiveFilters) {
195+
// Selected fallback
195196
svgElement.style.opacity = '0.15';
196197
// svgElement.style.transition = 'opacity 0.5s ease-in-out';
197198
svgElement.style.filter = 'none';
199+
} else if (hoveredElement) {
200+
// Hover fallback
201+
svgElement.style.opacity = '0.5';
202+
svgElement.style.filter = 'none';
198203
} else {
204+
// Reset fallback
199205
svgElement.style.opacity = '1';
200206
svgElement.style.filter = 'none';
201207
}
202208
});
203209
}, [currentFilters.selection, hoveredElement, hasActiveFilters]);
204210

211+
console.log(hoveredElement, 'hoveredElement');
212+
205213
const handleSVGMouseOver = (e: React.MouseEvent<HTMLDivElement>) => {
206214
const target = e.target as SVGElement;
207215

208216
if (
209217
target &&
210218
target.id &&
211219
target.tagName !== 'g' &&
212-
target.tagName !== 'svg'
220+
target.tagName !== 'svg' &&
221+
target.id !== 'venue-map'
213222
) {
214223
// target.classList.add('highlight-active');
215224
// target.classList.add(css['highlighted']);
@@ -226,7 +235,8 @@ export const VenueMap = () => {
226235
target &&
227236
target.id &&
228237
target.tagName !== 'g' &&
229-
target.tagName !== 'svg'
238+
target.tagName !== 'svg' &&
239+
target.id !== 'venue-map'
230240
) {
231241
// target.classList.remove(css['highlighted']);
232242
setHoveredElement(null);

devconnect-app/src/app/map/venue-map/map.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.map {
22

33
* {
4-
transition: opacity 0.3s ease, filter 0.3s ease;
4+
transition: opacity 0.5s ease, filter 0.5s ease;
55

66
&:not([id]) {
77
pointer-events: none;

0 commit comments

Comments
 (0)