nest control under map

Stassi · Nov 15, 2024 · 3f4ed46 · 3f4ed46
1 parent bf7d047
commit 3f4ed46
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src/leaf/map/fullscreen/control/control-added-listener.ts b/src/leaf/map/fullscreen/control/control-added-listener.ts
@@ -8,29 +8,31 @@ import {
 } from './set-control-anchor-title'
 
 export type ControlAddedListenerOptions = {
-  control: {
-    anchor: {
-      assign: UseAnchor['assign']
-      onClick: UseAnchor['onClick']
-      titleStates: SetControlAnchorTitleOptions['anchorTitleStates']
+  map: {
+    control: {
+      anchor: {
+        assign: UseAnchor['assign']
+        onClick: UseAnchor['onClick']
+        titleStates: SetControlAnchorTitleOptions['anchorTitleStates']
+      }
+      container: { element: HTMLElement }
     }
-    container: { element: HTMLElement }
+    fullscreen: { state: { get: () => boolean } }
   }
-  map: { fullscreen: { state: { get: () => boolean } } }
 }
 
 export type ControlAddedListener = (map: Map) => HTMLElement
 
 export function controlAddedListener({
-  control: {
-    anchor: {
-      assign: anchorAssign,
-      onClick: anchorOnClick,
-      titleStates: anchorTitleStates,
-    },
-    container: { element: containerElement },
-  },
   map: {
+    control: {
+      anchor: {
+        assign: anchorAssign,
+        onClick: anchorOnClick,
+        titleStates: anchorTitleStates,
+      },
+      container: { element: containerElement },
+    },
     fullscreen: {
       state: { get: getFullscreenState },
     },

diff --git a/src/leaf/map/fullscreen/fullscreen.ts b/src/leaf/map/fullscreen/fullscreen.ts
@@ -132,15 +132,15 @@ export function fullscreenMap({
       })
 
   control.onAdd = controlAddedListener({
-    control: {
-      anchor: {
-        assign: anchorAssign,
-        onClick: anchorOnClick,
-        titleStates: anchorTitleStates,
-      },
-      container: { element: containerElement },
-    },
     map: {
+      control: {
+        anchor: {
+          assign: anchorAssign,
+          onClick: anchorOnClick,
+          titleStates: anchorTitleStates,
+        },
+        container: { element: containerElement },
+      },
       fullscreen: {
         state: { get: getFullscreenState },
       },