Skip to content

fix: resize the map when the sidebar panel is resized #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fityannugroho merged 2 commits into from
Sep 25, 2024
Merged

fix: resize the map when the sidebar panel is resized #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
220f7a8
fix: resize map when panel resized
fityannugroho Sep 25, 2024
7654a14
fix: `MapRefSetter` component must comply the `react/display-name` rule
fityannugroho Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions components/map-dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Query, getData } from '@/lib/data'
import { Cross2Icon, ExternalLinkIcon, ReloadIcon } from '@radix-ui/react-icons'
import dynamic from 'next/dynamic'
import Link from 'next/link'
import { useEffect, useLayoutEffect, useState } from 'react'
import { forwardRef, useEffect, useLayoutEffect, useRef, useState } from 'react'
import { Button } from './ui/button'
import {
ResizableHandle,
Expand All @@ -27,7 +27,7 @@ import {
parentArea,
} from '@/lib/const'
import { Switch } from './ui/switch'
import { LatLngBounds } from 'leaflet'
import { LatLngBounds, Map as LeafletMap } from 'leaflet'
import { useMap } from 'react-leaflet'

const Map = dynamic(() => import('@/components/map'), {
Expand Down Expand Up @@ -69,6 +69,19 @@ function MapFlyToBounds({ bounds }: { bounds: LatLngBounds }) {
return null
}

const MapRefSetter = forwardRef<LeafletMap | null>((props, ref) => {
const map = useMap()

useEffect(() => {
if (map && ref && 'current' in ref) {
ref.current = map // Set the ref to the map instance
}
}, [map, ref])

return null
})
MapRefSetter.displayName = 'MapRefSetter'

type Props = {
defaultSelected?: Selected
}
Expand All @@ -90,6 +103,7 @@ export default function MapDashboard({ defaultSelected }: Props) {
const [panelDirection, setPanelDirection] = useState<
'horizontal' | 'vertical'
>('horizontal')
const mapRef = useRef<LeafletMap | null>(null)

useEffect(() => {
if (defaultSelected) {
Expand Down Expand Up @@ -161,6 +175,12 @@ export default function MapDashboard({ defaultSelected }: Props) {
return () => window.removeEventListener('resize', handleResize)
}, [])

const handleResizeMap = () => {
if (mapRef.current) {
mapRef.current.invalidateSize({ animate: true })
}
}

return (
<ResizablePanelGroup
direction={panelDirection}
Expand Down Expand Up @@ -342,10 +362,15 @@ export default function MapDashboard({ defaultSelected }: Props) {

<ResizableHandle withHandle />

<ResizablePanel defaultSize={75}>
<ResizablePanel
defaultSize={75}
onResize={debounce(handleResizeMap, 100)}
>
<Map className="h-full z-0">
{areaBounds && <MapFlyToBounds bounds={areaBounds} />}

<MapRefSetter ref={mapRef} />

{Object.entries(featureConfig).map(([area, config]) => {
const selectedArea =
selected?.[singletonArea[area as FeatureAreas] as keyof Selected]
Expand Down