📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Better map loader component
Blue Mouse430022fca4d1
diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsxindex 006002515..ef51313c6 100644--- a/web/app/pages/Project/View/components/InteractiveMap.tsx+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx@@ -27,6 +27,7 @@ import { Entry } from '~/lib/models/Entry'import { useTheme } from '~/providers/ThemeProvider'import Flag from '~/ui/Flag'import Spin from '~/ui/icons/Spin'+import { MapLoader } from './MapLoader'import {getTimeFromSeconds,getStringFromTime,@@ -507,13 +508,8 @@ const InteractiveMapCore = ({) : null}{dataLoading || isGeoDataLoading ? (- <div className='absolute inset-0 z-10 flex items-center justify-center rounded-md bg-slate-900/20 backdrop-blur-sm'>- <div className='flex flex-col items-center gap-2'>- <Spin />- <span className='text-sm text-slate-900 dark:text-gray-50'>- {t('project.loadingMapData')}- </span>- </div>+ <div className='absolute inset-0 z-10'>+ <MapLoader /></div>) : null}@@ -621,21 +617,8 @@ const InteractiveMap = ({onFullscreenToggle,isFullscreen,}: InteractiveMapProps) => {- const { t } = useTranslation('common')-return (- <ClientOnly- fallback={- <div className='relative flex h-full w-full items-center justify-center'>- <div className='flex flex-col items-center gap-2'>- <div className='h-8 w-8 animate-spin rounded-full border-2 border-indigo-400 border-t-transparent'></div>- <span className='text-sm text-neutral-600 dark:text-neutral-300'>- {t('project.loadingMapData')}- </span>- </div>- </div>- }- >+ <ClientOnly fallback={<MapLoader />}>{() => (<InteractiveMapCoredata={data}diff --git a/web/app/pages/Project/View/components/MapLoader.tsx b/web/app/pages/Project/View/components/MapLoader.tsxnew file mode 100644index 000000000..d48474193--- /dev/null+++ b/web/app/pages/Project/View/components/MapLoader.tsx@@ -0,0 +1,17 @@+import { useTranslation } from 'react-i18next'+import Spin from '~/ui/icons/Spin'++export const MapLoader = () => {+ const { t } = useTranslation('common')++ return (+ <div className='flex h-full w-full items-center justify-center'>+ <div className='flex flex-col items-center gap-2'>+ <Spin />+ <span className='text-sm text-slate-900 dark:text-gray-50'>+ {t('project.loadingMapData')}+ </span>+ </div>+ </div>+ )+}diff --git a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx b/web/app/pages/Project/tabs/Errors/ErrorsView.tsxindex 79baeae7d..bdcb22341 100644--- a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx+++ b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx@@ -37,6 +37,8 @@ import {type LinkProps,} from 'react-router'import { ClientOnly } from 'remix-utils/client-only'++import { MapLoader } from '~/pages/Project/View/components/MapLoader'import { toast } from 'sonner'import type {@@ -1052,18 +1054,7 @@ const ErrorsViewInner = ({ deferredData }: ErrorsViewInnerProps) => {)return (- <Suspense- fallback={- <div className='flex h-full items-center justify-center'>- <div className='flex flex-col items-center gap-2'>- <div className='h-8 w-8 animate-spin rounded-full border-2 border-blue-400 border-t-transparent'></div>- <span className='text-sm text-neutral-600 dark:text-neutral-300'>- Loading map...- </span>- </div>- </div>- }- >+ <Suspense fallback={<MapLoader />}><InteractiveMapdata={countryData}regionData={regionData}diff --git a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx b/web/app/pages/Project/tabs/Performance/PerformanceView.tsxindex 908ac0475..5bc196745 100644--- a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx+++ b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx@@ -37,6 +37,7 @@ import CCRow from '~/pages/Project/View/components/CCRow'import { ChartContextMenu } from '~/pages/Project/View/components/ChartContextMenu'import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import Filters from '~/pages/Project/View/components/Filters'+import { MapLoader } from '~/pages/Project/View/components/MapLoader'import NoEvents from '~/pages/Project/View/components/NoEvents'import { Panel } from '~/pages/Project/View/Panels'import {@@ -551,18 +552,7 @@ const PerformanceViewInner = ({)return (- <Suspense- fallback={- <div className='flex h-full items-center justify-center'>- <div className='flex flex-col items-center gap-2'>- <div className='h-8 w-8 animate-spin rounded-full border-2 border-indigo-400 border-t-transparent'></div>- <span className='text-sm text-neutral-600 dark:text-neutral-300'>- Loading map...- </span>- </div>- </div>- }- >+ <Suspense fallback={<MapLoader />}><InteractiveMapdata={countryData}regionData={regionData}diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsxindex 69e971c3d..119bd3469 100644--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx@@ -46,6 +46,7 @@ import { OverallObject } from '~/lib/models/Project'import AnnotationModal from '~/modals/AnnotationModal'import CustomEventsSubmenu from '~/pages/Project/tabs/Traffic/CustomEventsSubmenu'import CustomMetrics from '~/pages/Project/tabs/Traffic/CustomMetrics'+import { MapLoader } from '~/pages/Project/View/components/MapLoader'import {MetricCard,MetricCards,@@ -1169,18 +1170,7 @@ const TrafficViewInner = ({)return (- <Suspense- fallback={- <div className='flex h-full items-center justify-center'>- <div className='flex flex-col items-center gap-2'>- <div className='h-8 w-8 animate-spin rounded-full border-2 border-indigo-400 border-t-transparent'></div>- <span className='text-sm text-neutral-600 dark:text-neutral-300'>- Loading map...- </span>- </div>- </div>- }- >+ <Suspense fallback={<MapLoader />}><InteractiveMapdata={countryData}regionData={regionData}