Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix map on Chrome (#6037)
Artur Pata03fa17799194
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 5dd53209a5..5e0f892285 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.### Fixed- Fixed issue with all non-interactive events being counted as interactive+- Fixed countries map countries staying highlighted on Chrome## v3.2.0 - 2026-01-16diff --git a/assets/js/dashboard/stats/locations/map.tsx b/assets/js/dashboard/stats/locations/map.tsxindex cff9d702cb..6b0d3d8fd6 100644--- a/assets/js/dashboard/stats/locations/map.tsx+++ b/assets/js/dashboard/stats/locations/map.tsx@@ -20,6 +20,7 @@ import { apiPath } from '../../util/url'import { MIN_HEIGHT } from '../reports/list'import { MapTooltip } from './map-tooltip'import { GeolocationNotice } from './geolocation-notice'+import { DashboardQuery } from '../../query'const width = 475const height = 335@@ -32,6 +33,16 @@ type CountryData = {}type WorldJsonCountryData = { properties: { name: string; a3: string } }+function getMetricLabel(query: DashboardQuery) {+ if (hasConversionGoalFilter(query)) {+ return { singular: 'Conversion', plural: 'Conversions' }+ }+ if (isRealTimeDashboard(query)) {+ return { singular: 'Current visitor', plural: 'Current visitors' }+ }+ return { singular: 'Visitor', plural: 'Visitors' }+}+const WorldMap = ({onCountrySelect,afterFetchData@@ -50,15 +61,7 @@ const WorldMap = ({hoveredCountryAlpha3Code: string | null}>({ x: 0, y: 0, hoveredCountryAlpha3Code: null })- const labels = (() => {- if (hasConversionGoalFilter(query)) {- return { singular: 'Conversion', plural: 'Conversions' }- }- if (isRealTimeDashboard(query)) {- return { singular: 'Current visitor', plural: 'Current visitors' }- }- return { singular: 'Visitor', plural: 'Visitors' }- })()+ const metricLabel = useMemo(() => getMetricLabel(query), [query])const { data, refetch, isFetching, isError } = useQuery({queryKey: ['countries', 'map', query],@@ -127,7 +130,28 @@ const WorldMap = ({return}- const svg = drawInteractiveCountries(svgRef.current, setTooltip)+ const { svg, countriesSelection } = drawInteractiveCountries(svgRef.current)+ const highlightSelection = drawHighlightedCountryOutline(svgRef.current)++ countriesSelection+ .on('mouseover', function (event, country) {+ const [x, y] = d3.pointer(event, svg.node()?.parentNode)+ setTooltip({ x, y, hoveredCountryAlpha3Code: country.properties.a3 })++ highlightSelection+ .attr('d', this.getAttribute('d'))+ .attr('class', hoveredOutlineClass)+ })++ .on('mousemove', function (event) {+ const [x, y] = d3.pointer(event, svg.node()?.parentNode)+ setTooltip((currentState) => ({ ...currentState, x, y }))+ })++ .on('mouseout', function () {+ setTooltip({ x: 0, y: 0, hoveredCountryAlpha3Code: null })+ highlightSelection.attr('d', null).attr('class', initialOutlineClass)+ })return () => {svg.selectAll('*').remove()@@ -178,7 +202,9 @@ const WorldMap = ({name={hoveredCountryData.name}value={numberShortFormatter(hoveredCountryData.visitors)}label={- labels[hoveredCountryData.visitors === 1 ? 'singular' : 'plural']+ hoveredCountryData.visitors === 1+ ? metricLabel.singular+ : metricLabel.plural}/>)}@@ -201,26 +227,41 @@ const colorScales = {[UIMode.light]: ['#e0e7ff', '#818cf8'] // indigo-100, indigo-400}-const sharedCountryClass = classNames('transition-colors')+const countryElementClass = 'country'+const countrySelector = `path.${countryElementClass}`+const initialStroke = classNames(+ 'stroke-white',+ 'dark:stroke-gray-900',+ 'stroke-1px'+)+const hoveredStroke = classNames(+ 'stroke-[1.5px]',+ 'stroke-indigo-400',+ 'dark:stroke-indigo-500'+)const countryClass = classNames(- sharedCountryClass,+ countryElementClass,+ initialStroke,+ 'transition-colors','stroke-1','fill-gray-150',- 'stroke-white',- 'dark:fill-gray-750',- 'dark:stroke-gray-900'+ 'dark:fill-gray-750')-const highlightedCountryClass = classNames(- sharedCountryClass,- 'stroke-[1.5px]',- 'fill-gray-150',- 'stroke-indigo-400',- 'dark:fill-gray-750',- 'dark:stroke-indigo-500'+const sharedOutlineClass = classNames(+ 'transition-colors',+ 'fill-none',+ 'pointer-events-none')+const initialOutlineClass = classNames(+ sharedOutlineClass,+ initialStroke,+ 'opacity-0'+)+const hoveredOutlineClass = classNames(sharedOutlineClass, hoveredStroke)+/*** Used to color the countries* @returns the svg elements represeting countries@@ -239,7 +280,7 @@ function colorInCountriesWithValues(const svg = d3.select(element)return svg- .selectAll('path')+ .selectAll(countrySelector).style('fill', (countryPath) => {const country = getCountryByCountryPath(countryPath)if (!country?.visitors) {@@ -256,48 +297,25 @@ function colorInCountriesWithValues(})}+function drawHighlightedCountryOutline(element: SVGSVGElement) {+ return d3.select(element).append('path').attr('class', initialOutlineClass)+}+/** @returns the d3 selected svg element */-function drawInteractiveCountries(- element: SVGSVGElement,- setTooltip: React.Dispatch<- React.SetStateAction<{- x: number- y: number- hoveredCountryAlpha3Code: string | null- }>- >-) {+function drawInteractiveCountries(element: SVGSVGElement) {const path = setupProjetionPath()const data = parseWorldTopoJsonToGeoJsonFeatures()const svg = d3.select(element)- svg- .selectAll('path')+ const countriesSelection = svg+ .selectAll(countrySelector).data(data).enter().append('path').attr('class', countryClass).attr('d', path as never)- .on('mouseover', function (event, country) {- const [x, y] = d3.pointer(event, svg.node()?.parentNode)- setTooltip({ x, y, hoveredCountryAlpha3Code: country.properties.a3 })- // brings country to front- this.parentNode?.appendChild(this)- d3.select(this).attr('class', highlightedCountryClass)- })-- .on('mousemove', function (event) {- const [x, y] = d3.pointer(event, svg.node()?.parentNode)- setTooltip((currentState) => ({ ...currentState, x, y }))- })-- .on('mouseout', function () {- setTooltip({ x: 0, y: 0, hoveredCountryAlpha3Code: null })- d3.select(this).attr('class', countryClass)- })-- return svg+ return { svg, countriesSelection }}function setupProjetionPath() {