anchor contains assign & titleStates

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

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/leaf/map/fullscreen/control/control-added-listener.ts b/src/leaf/map/fullscreen/control/control-added-listener.ts
@@ -13,7 +13,7 @@ export type ControlAddedListenerOptions = {
       anchor: {
         assign: UseAnchor['assign']
         onClick: UseAnchor['onClick']
-        titleStates: SetControlAnchorTitleOptions['anchorTitleStates']
+        titleStates: SetControlAnchorTitleOptions['anchor']['titleStates']
       }
       container: { element: HTMLElement }
     }
@@ -40,8 +40,10 @@ export function controlAddedListener({
 }: ControlAddedListenerOptions): ControlAddedListener {
   return function handleControlAdded(map: Map): HTMLElement {
     setControlAnchorTitle({
-      anchorAssign,
-      anchorTitleStates,
+      anchor: {
+        assign: anchorAssign,
+        titleStates: anchorTitleStates,
+      },
       fullscreen: getFullscreenState(),
     })
 

diff --git a/src/leaf/map/fullscreen/control/set-control-anchor-title.ts b/src/leaf/map/fullscreen/control/set-control-anchor-title.ts
@@ -1,20 +1,21 @@
 import { type UseAnchor } from '../state/use-anchor'
 
 export type SetControlAnchorTitleOptions = {
-  anchorAssign: UseAnchor['assign']
-  anchorTitleStates: Record<'false' | 'true', string>
+  anchor: {
+    assign: UseAnchor['assign']
+    titleStates: Record<'false' | 'true', string>
+  }
   fullscreen: boolean
 }
 
 export function setControlAnchorTitle({
-  anchorAssign,
-  anchorTitleStates,
+  anchor: { assign: anchorAssign, titleStates: anchorTitleStates },
   fullscreen,
 }: SetControlAnchorTitleOptions): HTMLElement {
   return anchorAssign({
     title:
       anchorTitleStates[
-        <keyof SetControlAnchorTitleOptions['anchorTitleStates']>(
+        <keyof SetControlAnchorTitleOptions['anchor']['titleStates']>(
           fullscreen.toString()
         )
       ],

diff --git a/src/leaf/map/fullscreen/fullscreen.ts b/src/leaf/map/fullscreen/fullscreen.ts
@@ -34,7 +34,7 @@ export type FullscreenMapOptions = MapOptions & {
         anchor: {
           attributes: Record<string, string>
           tag: string
-          titleStates: SetControlAnchorTitleOptions['anchorTitleStates']
+          titleStates: SetControlAnchorTitleOptions['anchor']['titleStates']
         }
         container: {
           tag: string

diff --git a/src/leaf/map/fullscreen/map/map-lifecycle-listener.ts b/src/leaf/map/fullscreen/map/map-lifecycle-listener.ts
@@ -12,7 +12,7 @@ export type MapLifecycleListenerOptions = {
       control: {
         anchor: {
           assign: UseAnchor['assign']
-          titleStates: SetControlAnchorTitleOptions['anchorTitleStates']
+          titleStates: SetControlAnchorTitleOptions['anchor']['titleStates']
         }
       }
       fullscreen: {
@@ -57,8 +57,7 @@ export function mapLifecycleListener({
         map.invalidateSize()
         toggleFullscreenState()
         setControlAnchorTitle({
-          anchorAssign,
-          anchorTitleStates,
+          anchor: { assign: anchorAssign, titleStates: anchorTitleStates },
           fullscreen: getFullscreenState(),
         })
       },