FullscreenMap replaces LeafletMap, increasing consistency

Stassi · Nov 15, 2024 · b4eb66d · b4eb66d
1 parent 9725d8e
commit b4eb66d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/leaf/map/fullscreen/fullscreen.ts b/src/leaf/map/fullscreen/fullscreen.ts
@@ -13,8 +13,8 @@ import { controlAddedListener } from './control/control-added-listener'
 import { type ControlAnchorTitleStates } from './control/anchor/update-title'
 import { joinClassNames } from './dom-element/join-class-names'
 import {
-  type LeafletMapLifecycleEvent,
-  mapLifecycleListener,
+  type FullscreenMapLifecycleEvent,
+  fullscreenMapLifecycleListener,
 } from './map/map-lifecycle-listener'
 import {
   type ControlAnchor,
@@ -110,11 +110,11 @@ export function fullscreenMap({
     control: Control = leafletControl({ position }),
     map: Map = leafletMap(id, mapOptions),
     handleMapLifecycleChange: (
-      mapLifecycleEvents: LeafletMapLifecycleEvent,
+      mapLifecycleEvents: FullscreenMapLifecycleEvent,
     ) => () => void = (
-      mapLifecycleEvent: LeafletMapLifecycleEvent,
+      mapLifecycleEvent: FullscreenMapLifecycleEvent,
     ): (() => void) =>
-      mapLifecycleListener({
+      fullscreenMapLifecycleListener({
         document: {
           map: {
             control: {

diff --git a/src/leaf/map/fullscreen/map/map-lifecycle-listener.ts b/src/leaf/map/fullscreen/map/map-lifecycle-listener.ts
@@ -1,14 +1,14 @@
-import { DomEvent, DomUtil, type Map } from 'leaflet'
+import { type Map, DomEvent, DomUtil } from 'leaflet'
 
-import { type ControlAnchorAssign } from '../control/anchor/anchor'
 import { type UseBoolean } from '../state/use-boolean'
+import { type ControlAnchorAssign } from '../control/anchor/anchor'
 import {
   type ControlAnchorTitleStates,
   updateControlAnchorTitle,
 } from '../control/anchor/update-title'
 
-export type LeafletMapLifecycleEvent = 'ready' | 'unload'
-export type MapLifecycleListenerOptions = {
+export type FullscreenMapLifecycleEvent = 'ready' | 'unload'
+export type FullscreenMapLifecycleListenerOptions = {
   document: {
     map: {
       control: {
@@ -21,13 +21,15 @@ export type MapLifecycleListenerOptions = {
         classNames: string
         state: UseBoolean
       }
-      lifecycleEvent: LeafletMapLifecycleEvent
+      lifecycleEvent: FullscreenMapLifecycleEvent
       map: Map
     }
   }
 }
 
-export function mapLifecycleListener({
+export type FullscreenMapLifecycleListener = () => void
+
+export function fullscreenMapLifecycleListener({
   document: {
     map: {
       control: {
@@ -41,13 +43,13 @@ export function mapLifecycleListener({
       map,
     },
   },
-}: MapLifecycleListenerOptions) {
-  return function handleFullscreenMapLifecycleEvent() {
+}: FullscreenMapLifecycleListenerOptions): FullscreenMapLifecycleListener {
+  return function handleFullscreenMapLifecycleEvent(): void {
     DomEvent[mapLifecycleEvent === 'ready' ? 'on' : 'off'](
       // @ts-expect-error -- `Document` type is assignable to first DomEvent.on argument
       document,
       'fullscreenchange',
-      function handleFullscreenMapChange() {
+      function handleFullscreenMapChange(): void {
         ;(getFullscreenState() ? DomUtil.removeClass : DomUtil.addClass)(
           map.getContainer(),
           fullscreenMapClassNames,