📈 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
Add + / - buttons to the map fullscreen view & other full screen map improvements
Blue Mouse755fa606ebe7
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 42b074dd9..a5a410820 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -291,6 +291,15 @@ const ViewProjectContent = () => {const [isMapFullscreen, setIsMapFullscreen] = useState(false)+ useEffect(() => {+ if (!isMapFullscreen) return+ const previousOverflow = document.body.style.overflow+ document.body.style.overflow = 'hidden'+ return () => {+ document.body.style.overflow = previousOverflow+ }+ }, [isMapFullscreen])+const navigate = useNavigate()const [searchParams, setSearchParams] = useSearchParams()@@ -1415,7 +1424,7 @@ const ViewProjectContent = () => {},)}>- {!isEmbedded ? <Header /> : null}+ {!isEmbedded && !isMapFullscreen ? <Header /> : null}<div className='grid flex-1 grid-cols-1'><div@@ -1432,19 +1441,21 @@ const ViewProjectContent = () => {)}><div ref={ref} className='relative flex gap-4'>- <ProjectSidebar- tabs={tabs}- activeTab={activeTab}- onTabChange={setDashboardTab}- projectId={id}- projectName={project.name}- websiteUrl={project.websiteUrl}- dataLoading={dataLoading}- searchParams={searchParams}- allowedToManage={allowedToManage}- className='pointer-events-auto z-20 hidden md:flex'- />- {isMobileSidebarOpen ? (+ {!isMapFullscreen ? (+ <ProjectSidebar+ tabs={tabs}+ activeTab={activeTab}+ onTabChange={setDashboardTab}+ projectId={id}+ projectName={project.name}+ websiteUrl={project.websiteUrl}+ dataLoading={dataLoading}+ searchParams={searchParams}+ allowedToManage={allowedToManage}+ className='pointer-events-auto z-20 hidden md:flex'+ />+ ) : null}+ {isMobileSidebarOpen && !isMapFullscreen ? (<div className='pointer-events-auto'><ProjectSidebartabs={tabs}@@ -1472,12 +1483,14 @@ const ViewProjectContent = () => {ref={dashboardRef}><EventsRunningOutBanner />- <div className='pointer-events-auto'>- <MobileSidebarTrigger- onClick={openMobileSidebar}- activeTabLabel={activeTabLabel}- />- </div>+ {!isMapFullscreen ? (+ <div className='pointer-events-auto'>+ <MobileSidebarTrigger+ onClick={openMobileSidebar}+ activeTabLabel={activeTabLabel}+ />+ </div>+ ) : null}<AnimatePresence mode='wait'><motion.divkey={activeTab}@@ -1567,7 +1580,7 @@ const ViewProjectContent = () => {</motion.div></AnimatePresence>- {isEmbedded ? null : (+ {isEmbedded || isMapFullscreen ? null : (<><div className='flex-1' /><div className='pointer-events-auto mt-4 flex w-full items-center justify-between gap-2'>@@ -1685,7 +1698,9 @@ const ViewProjectContent = () => {</div></div>- {isEmbedded ? null : <Footer showDBIPMessage />}+ {isEmbedded || isMapFullscreen ? null : (+ <Footer showDBIPMessage />+ )}</div><ViewProjectHotkeysisOpened={isHotkeysHelpOpened}diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsxindex b1422b2c2..006002515 100644--- a/web/app/pages/Project/View/components/InteractiveMap.tsx+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx@@ -1,4 +1,9 @@-import { ArrowsOutIcon, XIcon } from '@phosphor-icons/react'+import {+ ArrowsOutIcon,+ MinusIcon,+ PlusIcon,+ XIcon,+} from '@phosphor-icons/react'import cx from 'clsx'import { scalePow, scaleThreshold } from 'd3-scale'import { Feature, GeoJsonObject } from 'geojson'@@ -14,7 +19,7 @@ import React, {useRef,} from 'react'import { useTranslation } from 'react-i18next'-import { GeoJSON, MapContainer, useMapEvent } from 'react-leaflet'+import { GeoJSON, MapContainer, useMap, useMapEvent } from 'react-leaflet'import { ClientOnly } from 'remix-utils/client-only'import { isSelfhosted, PROJECT_TABS } from '~/lib/constants'@@ -428,6 +433,35 @@ const InteractiveMapCore = ({return null}+ const MapZoomControls = ({ visible }: { visible: boolean }) => {+ const map = useMap()++ if (!visible) return null++ return (+ <div className='pointer-events-none absolute right-3 bottom-3 z-400 flex flex-col gap-1'>+ <button+ type='button'+ onClick={() => map.zoomIn()}+ className='pointer-events-auto rounded-md border border-gray-300 bg-gray-50 p-2 text-gray-700 shadow-sm transition-colors ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ aria-label='Zoom in'+ title='Zoom in'+ >+ <PlusIcon className='size-4' />+ </button>+ <button+ type='button'+ onClick={() => map.zoomOut()}+ className='pointer-events-auto rounded-md border border-gray-300 bg-gray-50 p-2 text-gray-700 shadow-sm transition-colors ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ aria-label='Zoom out'+ title='Zoom out'+ >+ <MinusIcon className='size-4' />+ </button>+ </div>+ )+ }+const handleMouseMove = useCallback((e: React.MouseEvent) => {if (!tooltipContent) return@@ -460,17 +494,15 @@ const InteractiveMapCore = ({{/* Exit fullscreen button */}{isFullscreen && onFullscreenToggle ? (- <div className='pointer-events-none absolute inset-x-0 top-3 z-50 mx-auto w-full max-w-7xl px-4 py-2 sm:px-6 lg:px-8'>- <div className='relative flex w-full justify-end'>- <button- type='button'- onClick={() => onFullscreenToggle(false)}- className='pointer-events-auto flex items-center rounded-md border border-gray-300 bg-gray-50 px-3 py-2 text-sm font-medium text-gray-700 transition-colors ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'- >- <XIcon className='mr-1.5 h-4 w-4' />- {t('common.close')}- </button>- </div>+ <div className='absolute top-3 right-3 z-50'>+ <button+ type='button'+ onClick={() => onFullscreenToggle(false)}+ className='flex items-center rounded-md border border-gray-300 bg-gray-50 px-3 py-2 text-sm font-medium text-gray-700 shadow-sm transition-colors ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ >+ <XIcon className='mr-1.5 h-4 w-4' />+ {t('common.close')}+ </button></div>) : null}@@ -534,6 +566,7 @@ const InteractiveMapCore = ({}}/>) : null}+ <MapZoomControls visible={isFullscreen} /></MapContainer>) : null}